Merge branch 'dev'

FEMessage · Aug 10, 2021 · db20ce0 · db20ce0
2 parents c268647 + 93129f3
commit db20ce0
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/el-data-table.vue b/src/el-data-table.vue
@@ -267,7 +267,7 @@
         :new-title="dialogNewTitle"
         :edit-title="dialogEditTitle"
         :view-title="dialogViewTitle"
-        :form="form"
+        :form="dialogForm || form"
         :form-attrs="formAttrs"
         :dialog-attrs="dialogAttrs"
         :button-size="buttonSize"
@@ -693,15 +693,25 @@ export default {
       }
     },
     /**
-     * 弹窗表单, 用于新增与修改, 详情配置参考el-form-renderer
-     * @link https://femessage.github.io/el-form-renderer/
+     * @deprecated
      */
     form: {
       type: Array,
       default() {
         return []
       }
     },
+    /**
+     * 弹窗表单, 用于新增与修改, 详情配置参考 el-form-renderer
+     * 为了 api 更符合直觉而设置
+     * @link https://femessage.github.io/el-form-renderer/
+     */
+    dialogForm: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
     /**
      * 弹窗表单属性设置, 详情配置参考element-ui官网
      * @link https://element.eleme.cn/2.4/#/zh-CN/component/form#form-attributes