diff --git a/dist/checkbox/index.wxml b/dist/checkbox/index.wxml index d320d0f3..dcc47d56 100644 --- a/dist/checkbox/index.wxml +++ b/dist/checkbox/index.wxml @@ -1,7 +1,13 @@ - + diff --git a/dist/field/index.js b/dist/field/index.js index 01934046..756f8ed2 100644 --- a/dist/field/index.js +++ b/dist/field/index.js @@ -24,7 +24,7 @@ VantComponent({ customStyle: String, useIconSlot: Boolean, useButtonSlot: Boolean, - placeholderClass: String, + placeholderStyle: String, cursorSpacing: { type: Number, value: 50 diff --git a/dist/field/index.wxml b/dist/field/index.wxml index 75f98e55..97223b3d 100644 --- a/dist/field/index.wxml +++ b/dist/field/index.wxml @@ -16,12 +16,12 @@ class="{{ inputClass }}" focus="{{ focus }}" value="{{ value }}" - disabled="{{ disabled }}" - readonly="{{ readonly }}" + disabled="{{ disabled || readonly }}" maxlength="{{ maxlength }}" - placeholder="{{ placeholder }}" auto-height="{{ autosize }}" - placeholder-class="{{ placeholderClass }} {{ error ? 'van-field--error' : '' }}" + placeholder="{{ placeholder }}" + placeholder-style="{{ placeholderStyle }} " + placeholder-class="{{ error ? 'van-field--error' : '' }}" cursor-spacing="{{ cursorSpacing }}" bindinput="onInput" bind:blur="onBlur" @@ -34,11 +34,11 @@ type="{{ type }}" focus="{{ focus }}" value="{{ value }}" - disabled="{{ disabled }}" - readonly="{{ readonly }}" + disabled="{{ disabled || readonly }}" maxlength="{{ maxlength }}" placeholder="{{ placeholder }}" - placeholder-class="{{ placeholderClass }} {{ error ? 'van-field--error' : '' }}" + placeholder-style="{{ placeholderStyle }} " + placeholder-class="{{ error ? 'van-field--error' : '' }}" confirm-type="{{ confirmType }}" cursor-spacing="{{ cursorSpacing }}" bindinput="onInput" diff --git a/dist/icon/index.js b/dist/icon/index.js index b59cda11..b31a3003 100644 --- a/dist/icon/index.js +++ b/dist/icon/index.js @@ -5,6 +5,7 @@ VantComponent({ name: String, size: String, color: String, + customStyle: String, classPrefix: { type: String, value: 'van-icon' diff --git a/dist/icon/index.wxml b/dist/icon/index.wxml index 2ea3e9fb..87553bae 100644 --- a/dist/icon/index.wxml +++ b/dist/icon/index.wxml @@ -1,6 +1,6 @@ {{ info }}