blackteay/vant-weapp
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant-weapp.git synced 2025-04-06 03:58:05 +08:00
Code Issues Projects Releases Wiki Activity

fix(button): compatible form-field-button in low sdk version (#3229)

Browse Source
This commit is contained in:
rex 2020-06-03 11:03:28 +08:00 committed by GitHub
parent f40a5fbe97
commit 9a508de397
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
example/project.config.json
View File

@ -7,13 +7,28 @@
"urlCheck": false, "urlCheck": false,
"es6": true, "es6": true,
"postcss": true, "postcss": true,
"preloadBackgroundData": false,
"minified": true, "minified": true,
"newFeature": true, "newFeature": true,
"nodeModules": true "coverView": true,
"nodeModules": true,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"checkInvalidKey": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"useCompilerModule": false,
"userConfirmedUseCompilerModuleSwitch": false
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"cloudfunctionRoot": "functions/", "cloudfunctionRoot": "functions/",
"libVersion": "2.9.3", "libVersion": "2.3.0",
"appid": "wx1c01b35002d3ba14", "appid": "wx1c01b35002d3ba14",
"projectname": "vant-weapp", "projectname": "vant-weapp",
"debugOptions": { "debugOptions": {

8
packages/button/index.ts
View File

@ -1,9 +1,15 @@
import { VantComponent } from '../common/component'; import { VantComponent } from '../common/component';
import { button } from '../mixins/button'; import { button } from '../mixins/button';
import { openType } from '../mixins/open-type'; import { openType } from '../mixins/open-type';
import { canIUseFormFieldButton } from '../common/version';
const mixins = [button, openType];
if (canIUseFormFieldButton()) {
mixins.push('wx://form-field-button');
}
VantComponent({ VantComponent({
mixins: [button, openType, 'wx://form-field-button'], mixins,
classes: ['hover-class', 'loading-class'], classes: ['hover-class', 'loading-class'],

5
packages/common/version.ts
View File

@ -31,3 +31,8 @@ export function canIUseModel() {
const system = getSystemInfoSync(); const system = getSystemInfoSync();
return compareVersion(system.SDKVersion, '2.9.3') >= 0; return compareVersion(system.SDKVersion, '2.9.3') >= 0;
} }
export function canIUseFormFieldButton() {
const system = getSystemInfoSync();
return compareVersion(system.SDKVersion, '2.10.3') >= 0;
}