Merge branch '2.x' into dev

2020-12-30 17:40:52 +08:00
parent 149cde1ce1 3e09154f75
commit 54d2717267
5 changed files with 14 additions and 14 deletions
@@ -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: '',