Merge branch '2.x' into dev

src/datetime-picker/README.md

@@ -237,7 +237,7 @@ export default {
 <van-datetime-picker
   v-model="currentDate"
   type="date"
-  title="自定义列排序"
+  title="Columns Order"
   :columns-order="['month', 'day', 'year']"
   :formatter="formatter"
 />

src/field/index.js

@@ -40,14 +40,6 @@ export default createComponent({
     rows: [Number, String],
     name: String,
     rules: Array,
-    disabled: {
-      type: Boolean,
-      default: null,
-    },
-    readonly: {
-      type: Boolean,
-      default: null,
-    },
     autosize: [Boolean, Object],
     leftIcon: String,
     rightIcon: String,
@@ -74,6 +66,14 @@ export default createComponent({
       type: Boolean,
       default: null,
     },
+    disabled: {
+      type: Boolean,
+      default: null,
+    },
+    readonly: {
+      type: Boolean,
+      default: null,
+    },
     modelValue: {
       type: [String, Number],
       default: '',

src/form/README.md

@@ -471,14 +471,14 @@ export default {
 
 | Attribute | Description | Type | Default |
 | --- | --- | --- | --- |
-| disabled | Whether to disable field | _boolean_ | `false` |
-| readonly | Whether to be readonly | _boolean_ | `false` |
 | label-width | Field label width | _number \| string_ | `6.2em` |
 | label-align | Field label align, can be set to `center` `right` | _string_ | `left` |
 | input-align | Field input align, can be set to `center` `right` | _string_ | `left` |
 | error-message-align | Error message align, can be set to `center` `right` | _string_ | `left` |
 | validate-trigger `v2.5.2` | When to validate the form，can be set to `onChange`、`onSubmit` | _string_ | `onBlur` |
 | colon | Whether to display colon after label | _boolean_ | `false` |
+| disabled `v2.12.2` | Whether to disable form | _boolean_ | `false` |
+| readonly `v2.12.2` | Whether to be readonly | _boolean_ | `false` |
 | validate-first | Whether to stop the validation when a rule fails | _boolean_ | `false` |
 | scroll-to-error `v2.5.2` | Whether to scroll to the error field when validation failed | _boolean_ | `false` |
 | show-error `v2.6.0` | Whether to highlight input when validation failed | _boolean_ | `true` |

src/form/README.zh-CN.md

@@ -504,14 +504,14 @@ export default {
 
 | 参数 | 说明 | 类型 | 默认值 |
 | --- | --- | --- | --- |
-| disabled | 是否禁用输入框 | _boolean_ | `false` |
-| readonly | 是否只读 | _boolean_ | `false` |
 | label-width | 表单项 label 宽度，默认单位为`px` | _number \| string_ | `6.2em` |
 | label-align |  表单项 label 对齐方式，可选值为 `center` `right` | _string_ | `left` |
 | input-align | 输入框对齐方式，可选值为 `center` `right` | _string_ | `left` |
 | error-message-align | 错误提示文案对齐方式，可选值为 `center` `right` | _string_ | `left` |
 | validate-trigger `v2.5.2` | 表单校验触发时机，可选值为 `onChange`、`onSubmit`，详见下表 | _string_ | `onBlur` |
 | colon | 是否在 label 后面添加冒号 | _boolean_ | `false` |
+| disabled `v2.12.2` | 是否禁用表单中的所有输入框 | _boolean_ | `false` |
+| readonly `v2.12.2` | 是否将表单中的所有输入框设置为只读 | _boolean_ | `false` |
 | validate-first | 是否在某一项校验不通过时停止校验 | _boolean_ | `false` |
 | scroll-to-error `v2.5.2` | 是否在提交表单且校验不通过时滚动至错误的表单项 | _boolean_ | `false` |
 | show-error `v2.6.0` | 是否在校验不通过时标红输入框 | _boolean_ | `true` |

src/form/index.js

@@ -7,9 +7,9 @@ const [createComponent, bem] = createNamespace('form');
 
 export default createComponent({
   props: {
+    colon: Boolean,
     disabled: Boolean,
     readonly: Boolean,
-    colon: Boolean,
     labelWidth: [Number, String],
     labelAlign: String,
     inputAlign: String,