@tmagic/form 1.0.0-beta.6 → 1.0.0-rc.2

package/dist/tmagic-form.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue'), require('lodash-es'), require('@element-plus/icons'), require('element-plus'), require('sortablejs'), require('@tmagic/utils')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'vue', 'lodash-es', '@element-plus/icons', 'element-plus', 'sortablejs', '@tmagic/utils'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.TMagicForm = {}, global.vue, global.lodashEs, global.icons, global.elementPlus, global.Sortable, global.utils));
-})(this, (function (exports, vue, lodashEs, icons, elementPlus, Sortable, utils) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue'), require('@element-plus/icons'), require('lodash-es'), require('element-plus'), require('sortablejs'), require('@tmagic/utils')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'vue', '@element-plus/icons', 'lodash-es', 'element-plus', 'sortablejs', '@tmagic/utils'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.TMagicForm = {}, global.vue, global.icons, global.lodashEs, global.elementPlus, global.Sortable, global.utils));
+})(this, (function (exports, vue, icons, lodashEs, elementPlus, Sortable, utils) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -62,7 +62,11 @@
     asyncLoadConfig(value, initValue2, item);
     if (name && !items && typeof initValue2[name] !== "undefined") {
       if (typeof value[name] === "undefined") {
-        value[name] = typeof initValue2[name] === "object" ? lodashEs.cloneDeep(initValue2[name]) : initValue2[name];
+        if (type === "number") {
+          value[name] = Number(initValue2[name]);
+        } else {
+          value[name] = typeof initValue2[name] === "object" ? lodashEs.cloneDeep(initValue2[name]) : initValue2[name];
+        }
       }
       return value;
     }
@@ -172,8 +176,9 @@
     return target;
   };
 
-  const _sfc_main$s = vue.defineComponent({
+  const _sfc_main$t = vue.defineComponent({
     name: "m-form-container",
+    components: { WarningFilled: icons.WarningFilled },
     props: {
       labelWidth: String,
       expandMore: Boolean,
@@ -231,6 +236,7 @@
         }
         return display(mForm, props.config.display, props);
       });
+      const itemLabelWidth = vue.computed(() => props.config.labelWidth || props.labelWidth);
       vue.watchEffect(() => {
         expand.value = props.expandMore;
       });
@@ -267,9 +273,14 @@
       };
       const onChangeHandler = async function(v, key2) {
         const { filter, onChange, trim, name: name2, dynamicKey } = props.config;
-        let value = filterHandler(filter, v);
-        value = await changeHandler(onChange, value) ?? value;
-        value = trimHandler(trim, value) ?? value;
+        let value = v;
+        try {
+          value = filterHandler(filter, v);
+          value = await changeHandler(onChange, value) ?? value;
+          value = trimHandler(trim, value) ?? value;
+        } catch (e) {
+          console.error(e);
+        }
         if ((name2 || name2 === 0) && props.model !== value && (v !== value || props.model[name2] !== value)) {
           props.model[name2] = value;
         }
@@ -286,6 +297,7 @@
         itemProp,
         items,
         display: display$1,
+        itemLabelWidth,
         tagName,
         rule,
         tooltip,
@@ -296,24 +308,25 @@
       };
     }
   });
-  const _hoisted_1$g = ["innerHTML"];
+  const _hoisted_1$f = ["innerHTML"];
   const _hoisted_2$7 = ["innerHTML"];
   const _hoisted_3$7 = ["innerHTML"];
-  const _hoisted_4$6 = /* @__PURE__ */ vue.createElementVNode("i", { class: "el-icon-warning" }, null, -1);
-  const _hoisted_5$4 = ["innerHTML"];
-  const _hoisted_6$3 = {
+  const _hoisted_4$6 = ["innerHTML"];
+  const _hoisted_5$4 = {
     key: 4,
     style: { "text-align": "center" }
   };
-  function _sfc_render$p(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_m_fields_hidden = vue.resolveComponent("m-fields-hidden");
     const _component_el_tooltip = vue.resolveComponent("el-tooltip");
     const _component_el_form_item = vue.resolveComponent("el-form-item");
+    const _component_warning_filled = vue.resolveComponent("warning-filled");
+    const _component_el_icon = vue.resolveComponent("el-icon");
     const _component_m_form_container = vue.resolveComponent("m-form-container");
     const _component_el_button = vue.resolveComponent("el-button");
     return _ctx.config ? (vue.openBlock(), vue.createElementBlock("div", {
       key: 0,
-      style: vue.normalizeStyle(_ctx.config.tip ? "display: flex" : ""),
+      style: vue.normalizeStyle(_ctx.config.tip ? "display: flex;align-items: baseline;" : ""),
       class: vue.normalizeClass([_ctx.config.className, "m-form-container"])
     }, [
       _ctx.type === "hidden" ? (vue.openBlock(), vue.createBlock(_component_m_fields_hidden, {
@@ -332,19 +345,20 @@
         prop: _ctx.itemProp,
         "step-active": _ctx.stepActive,
         "expand-more": _ctx.expand,
-        "label-width": _ctx.config.labelWidth || _ctx.labelWidth,
+        "label-width": _ctx.itemLabelWidth,
         onChange: _ctx.onChangeHandler
       }, null, 8, ["size", "model", "config", "name", "prop", "step-active", "expand-more", "label-width", "onChange"])) : _ctx.type && _ctx.display ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 2 }, [
         vue.createVNode(_component_el_form_item, {
           style: vue.normalizeStyle(_ctx.config.tip ? "flex: 1" : ""),
+          class: vue.normalizeClass({ hidden: _ctx.itemLabelWidth === 0 || !_ctx.config.text }),
           prop: _ctx.itemProp,
-          "label-width": _ctx.config.text ? _ctx.config.labelWidth || _ctx.labelWidth : "0",
+          "label-width": _ctx.itemLabelWidth,
           rules: _ctx.rule
         }, {
           label: vue.withCtx(() => [
             vue.createElementVNode("span", {
               innerHTML: _ctx.type === "checkbox" ? "" : _ctx.config.text
-            }, null, 8, _hoisted_1$g)
+            }, null, 8, _hoisted_1$f)
           ]),
           default: vue.withCtx(() => [
             _ctx.tooltip ? (vue.openBlock(), vue.createBlock(_component_el_tooltip, { key: 0 }, {
@@ -381,19 +395,23 @@
             }, null, 8, _hoisted_3$7)) : vue.createCommentVNode("", true)
           ]),
           _: 1
-        }, 8, ["style", "prop", "label-width", "rules"]),
+        }, 8, ["style", "class", "prop", "label-width", "rules"]),
         _ctx.config.tip ? (vue.openBlock(), vue.createBlock(_component_el_tooltip, {
           key: 0,
-          placement: "top",
-          style: { "line-height": "40px", "margin-left": "5px" }
+          placement: "left"
         }, {
           content: vue.withCtx(() => [
             vue.createElementVNode("div", {
               innerHTML: _ctx.config.tip
-            }, null, 8, _hoisted_5$4)
+            }, null, 8, _hoisted_4$6)
           ]),
           default: vue.withCtx(() => [
-            _hoisted_4$6
+            vue.createVNode(_component_el_icon, { style: { "line-height": "40px", "margin-left": "5px" } }, {
+              default: vue.withCtx(() => [
+                vue.createVNode(_component_warning_filled)
+              ]),
+              _: 1
+            })
           ]),
           _: 1
         })) : vue.createCommentVNode("", true)
@@ -406,15 +424,15 @@
             size: _ctx.size,
             "step-active": _ctx.stepActive,
             "expand-more": _ctx.expand,
-            "label-width": _ctx.config.labelWidth || _ctx.labelWidth,
+            "label-width": _ctx.itemLabelWidth,
             prop: _ctx.itemProp,
             onChange: _ctx.onChangeHandler
           }, null, 8, ["model", "config", "size", "step-active", "expand-more", "label-width", "prop", "onChange"]);
         }), 128)) : vue.createCommentVNode("", true)
       ], 64)) : vue.createCommentVNode("", true),
-      _ctx.config.expand && _ctx.type !== "fieldset" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_6$3, [
+      _ctx.config.expand && _ctx.type !== "fieldset" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_5$4, [
         vue.createVNode(_component_el_button, {
-          type: "text",
+          text: "",
           onClick: _ctx.expandHandler
         }, {
           default: vue.withCtx(() => [
@@ -425,9 +443,9 @@
       ])) : vue.createCommentVNode("", true)
     ], 6)) : vue.createCommentVNode("", true);
   }
-  var Container = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["render", _sfc_render$p]]);
+  var Container = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["render", _sfc_render$q]]);
 
-  const _sfc_main$r = vue.defineComponent({
+  const _sfc_main$s = vue.defineComponent({
     name: "m-form-fieldset",
     props: {
       labelWidth: String,
@@ -479,7 +497,7 @@
       };
     }
   });
-  const _hoisted_1$f = ["innerHTML"];
+  const _hoisted_1$e = ["innerHTML"];
   const _hoisted_2$6 = ["innerHTML"];
   const _hoisted_3$6 = { key: 1 };
   const _hoisted_4$5 = ["innerHTML"];
@@ -493,7 +511,7 @@
   };
   const _hoisted_10$1 = { style: { "flex": "1" } };
   const _hoisted_11 = ["src"];
-  function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$p(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_el_checkbox = vue.resolveComponent("el-checkbox");
     const _component_m_form_container = vue.resolveComponent("m-form-container");
     return (_ctx.name ? _ctx.model[_ctx.name] : _ctx.model) ? (vue.openBlock(), vue.createElementBlock("fieldset", {
@@ -513,7 +531,7 @@
         default: vue.withCtx(() => [
           vue.createElementVNode("span", {
             innerHTML: _ctx.config.legend
-          }, null, 8, _hoisted_1$f),
+          }, null, 8, _hoisted_1$e),
           _ctx.config.extra ? (vue.openBlock(), vue.createElementBlock("span", {
             key: 0,
             innerHTML: _ctx.config.extra,
@@ -585,9 +603,9 @@
       }), 128)) : vue.createCommentVNode("", true)
     ], 4)) : vue.createCommentVNode("", true);
   }
-  var Fieldset = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["render", _sfc_render$o]]);
+  var Fieldset = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["render", _sfc_render$p]]);
 
-  const _sfc_main$q = vue.defineComponent({
+  const _sfc_main$r = vue.defineComponent({
     name: "m-form-group-list-item",
     components: { CaretRight: icons.CaretRight, CaretBottom: icons.CaretBottom },
     props: {
@@ -671,11 +689,11 @@
       };
     }
   });
-  const _hoisted_1$e = { class: "m-fields-group-list-item" };
+  const _hoisted_1$d = { class: "m-fields-group-list-item" };
   const _hoisted_2$5 = /* @__PURE__ */ vue.createTextVNode("\u4E0A\u79FB");
   const _hoisted_3$5 = /* @__PURE__ */ vue.createTextVNode("\u4E0B\u79FB");
   const _hoisted_4$4 = ["innerHTML"];
-  function _sfc_render$n(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_caret_bottom = vue.resolveComponent("caret-bottom");
     const _component_caret_right = vue.resolveComponent("caret-right");
     const _component_el_icon = vue.resolveComponent("el-icon");
@@ -683,7 +701,7 @@
     const _component_CaretRight = vue.resolveComponent("CaretRight");
     const _component_CaretBottom = vue.resolveComponent("CaretBottom");
     const _component_m_form_container = vue.resolveComponent("m-form-container");
-    return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$e, [
+    return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$d, [
       vue.createElementVNode("div", null, [
         vue.createVNode(_component_el_icon, {
           style: { "margin-right": "7px" },
@@ -695,7 +713,7 @@
           _: 1
         }, 8, ["onClick"]),
         vue.createVNode(_component_el_button, {
-          type: "text",
+          text: "",
           onClick: _ctx.expandHandler
         }, {
           default: vue.withCtx(() => [
@@ -704,7 +722,7 @@
           _: 1
         }, 8, ["onClick"]),
         vue.withDirectives(vue.createVNode(_component_el_button, {
-          type: "text",
+          text: "",
           icon: _ctx.Delete,
           style: { "color": "#f56c6c" },
           onClick: _ctx.removeHandler
@@ -713,7 +731,7 @@
         ]),
         _ctx.movable() ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
           vue.withDirectives(vue.createVNode(_component_el_button, {
-            type: "text",
+            text: "",
             size: "small",
             onClick: _cache[0] || (_cache[0] = ($event) => _ctx.changeOrder(-1))
           }, {
@@ -731,7 +749,7 @@
             [vue.vShow, _ctx.index !== 0]
           ]),
           vue.withDirectives(vue.createVNode(_component_el_button, {
-            type: "text",
+            text: "",
             size: "small",
             onClick: _cache[1] || (_cache[1] = ($event) => _ctx.changeOrder(1))
           }, {
@@ -766,9 +784,9 @@
       }, null, 8, ["config", "model", "labelWidth", "prop", "size", "onChange"])) : vue.createCommentVNode("", true)
     ]);
   }
-  var MFieldsGroupListItem = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["render", _sfc_render$n]]);
+  var MFieldsGroupListItem = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["render", _sfc_render$o]]);
 
-  const _sfc_main$p = vue.defineComponent({
+  const _sfc_main$q = vue.defineComponent({
     name: "m-form-group-list",
     components: { MFieldsGroupListItem },
     props: {
@@ -860,7 +878,7 @@
       };
     }
   });
-  const _hoisted_1$d = { class: "m-fields-group-list" };
+  const _hoisted_1$c = { class: "m-fields-group-list" };
   const _hoisted_2$4 = ["innerHTML"];
   const _hoisted_3$4 = {
     key: 1,
@@ -872,10 +890,10 @@
   ];
   const _hoisted_6$1 = /* @__PURE__ */ vue.createTextVNode("\u6DFB\u52A0\u7EC4");
   const _hoisted_7$1 = /* @__PURE__ */ vue.createTextVNode("\u5207\u6362\u4E3A\u8868\u683C");
-  function _sfc_render$m(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$n(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_m_fields_group_list_item = vue.resolveComponent("m-fields-group-list-item");
     const _component_el_button = vue.resolveComponent("el-button");
-    return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$d, [
+    return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$c, [
       _ctx.config.extra ? (vue.openBlock(), vue.createElementBlock("div", {
         key: 0,
         innerHTML: _ctx.config.extra,
@@ -919,9 +937,9 @@
       }, 8, ["onClick"])) : vue.createCommentVNode("", true)
     ]);
   }
-  var GroupList = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_render$m]]);
+  var GroupList = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["render", _sfc_render$n]]);
 
-  const _sfc_main$o = vue.defineComponent({
+  const _sfc_main$p = vue.defineComponent({
     name: "m-form-panel",
     components: { CaretBottom: icons.CaretBottom, CaretRight: icons.CaretRight },
     props: {
@@ -954,7 +972,7 @@
       };
     }
   });
-  const _hoisted_1$c = { class: "clearfix" };
+  const _hoisted_1$b = { class: "clearfix" };
   const _hoisted_2$3 = ["innerHTML"];
   const _hoisted_3$3 = {
     key: 0,
@@ -962,7 +980,7 @@
   };
   const _hoisted_4$2 = { style: { "flex": "1" } };
   const _hoisted_5$1 = ["src"];
-  function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$m(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_caret_bottom = vue.resolveComponent("caret-bottom");
     const _component_caret_right = vue.resolveComponent("caret-right");
     const _component_el_icon = vue.resolveComponent("el-icon");
@@ -974,7 +992,7 @@
       "body-style": { display: _ctx.expand ? "block" : "none" }
     }, {
       header: vue.withCtx(() => [
-        vue.createElementVNode("div", _hoisted_1$c, [
+        vue.createElementVNode("div", _hoisted_1$b, [
           vue.createElementVNode("a", {
             href: "javascript:",
             style: { "width": "100%", "display": "block" },
@@ -1032,10 +1050,60 @@
       _: 3
     }, 8, ["body-style"])) : vue.createCommentVNode("", true);
   }
-  var Panel = /* @__PURE__ */ _export_sfc(_sfc_main$o, [["render", _sfc_render$l]]);
+  var Panel = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_render$m]]);
+
+  const _sfc_main$o = vue.defineComponent({
+    props: {
+      labelWidth: String,
+      expandMore: Boolean,
+      span: Number,
+      model: {
+        type: Object,
+        default: () => ({})
+      },
+      config: {
+        type: Object,
+        default: () => ({})
+      },
+      prop: String,
+      size: String
+    },
+    emits: ["change"],
+    setup(props, { emit }) {
+      const mForm = vue.inject("mForm");
+      const changeHandler = () => emit("change", props.model);
+      return {
+        mForm,
+        display: vue.computed(() => display(mForm, props.config.display, props)),
+        changeHandler
+      };
+    }
+  });
+  function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
+    const _component_m_form_container = vue.resolveComponent("m-form-container");
+    const _component_el_col = vue.resolveComponent("el-col");
+    return vue.withDirectives((vue.openBlock(), vue.createBlock(_component_el_col, { span: _ctx.span }, {
+      default: vue.withCtx(() => [
+        vue.createVNode(_component_m_form_container, {
+          model: _ctx.model,
+          config: _ctx.config,
+          prop: _ctx.prop,
+          "label-width": _ctx.config.labelWidth || _ctx.labelWidth,
+          "expand-more": _ctx.expandMore,
+          size: _ctx.size,
+          onChange: _ctx.changeHandler
+        }, null, 8, ["model", "config", "prop", "label-width", "expand-more", "size", "onChange"])
+      ]),
+      _: 1
+    }, 8, ["span"])), [
+      [vue.vShow, _ctx.display && _ctx.config.type !== "hidden"]
+    ]);
+  }
+  var Col = /* @__PURE__ */ _export_sfc(_sfc_main$o, [["render", _sfc_render$l]]);
 
   const _sfc_main$n = vue.defineComponent({
     name: "m-form-row",
+    components: { Col },
     props: {
       labelWidth: String,
       expandMore: Boolean,
@@ -1057,38 +1125,27 @@
       const changeHandler = () => emit("change", props.name ? props.model[props.name] : props.model);
       return {
         mForm,
-        display(config) {
-          return display(mForm, config.display, props);
-        },
         changeHandler
       };
     }
   });
   function _sfc_render$k(_ctx, _cache, $props, $setup, $data, $options) {
-    const _component_m_form_container = vue.resolveComponent("m-form-container");
-    const _component_el_col = vue.resolveComponent("el-col");
+    const _component_Col = vue.resolveComponent("Col");
     const _component_el_row = vue.resolveComponent("el-row");
     return vue.openBlock(), vue.createBlock(_component_el_row, { gutter: 10 }, {
       default: vue.withCtx(() => [
         (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.config.items, (col, index) => {
-          return vue.openBlock(), vue.createBlock(_component_el_col, {
-            style: vue.normalizeStyle(!_ctx.display(col) || col.type === "hidden" ? "display: none" : ""),
+          return vue.openBlock(), vue.createBlock(_component_Col, {
             key: col[_ctx.mForm?.keyProp || "__key"] ?? index,
-            span: col.span || _ctx.config.span || 24 / _ctx.config.items.length
-          }, {
-            default: vue.withCtx(() => [
-              vue.createVNode(_component_m_form_container, {
-                model: _ctx.name ? _ctx.model[_ctx.name] : _ctx.model,
-                config: col,
-                prop: _ctx.prop,
-                "label-width": _ctx.config.labelWidth || _ctx.labelWidth,
-                "expand-more": _ctx.expandMore,
-                size: _ctx.size,
-                onChange: _ctx.changeHandler
-              }, null, 8, ["model", "config", "prop", "label-width", "expand-more", "size", "onChange"])
-            ]),
-            _: 2
-          }, 1032, ["style", "span"]);
+            span: col.span || _ctx.config.span || 24 / _ctx.config.items.length,
+            config: col,
+            labelWidth: _ctx.config.labelWidth || _ctx.labelWidth,
+            expandMore: _ctx.expandMore,
+            model: _ctx.name ? _ctx.model[_ctx.name] : _ctx.model,
+            prop: _ctx.prop,
+            size: _ctx.size,
+            onChange: _ctx.changeHandler
+          }, null, 8, ["span", "config", "labelWidth", "expandMore", "model", "prop", "size", "onChange"]);
         }), 128))
       ]),
       _: 1
@@ -1547,7 +1604,7 @@
       };
     }
   });
-  const _hoisted_1$b = ["innerHTML"];
+  const _hoisted_1$a = ["innerHTML"];
   const _hoisted_2$2 = { class: "el-form-item__content" };
   const _hoisted_3$2 = ["innerHTML"];
   const _hoisted_4$1 = /* @__PURE__ */ vue.createTextVNode("\u6DFB\u52A0");
@@ -1576,7 +1633,7 @@
         key: 0,
         style: { "color": "rgba(0, 0, 0, 0.45)" },
         innerHTML: _ctx.config.extra
-      }, null, 8, _hoisted_1$b)) : vue.createCommentVNode("", true),
+      }, null, 8, _hoisted_1$a)) : vue.createCommentVNode("", true),
       vue.createElementVNode("div", _hoisted_2$2, [
         vue.createVNode(_component_el_tooltip, {
           content: "\u62D6\u62FD\u53EF\u6392\u5E8F",
@@ -1617,8 +1674,8 @@
                 }, {
                   default: vue.withCtx((scope) => [
                     vue.withDirectives(vue.createVNode(_component_el_button, {
-                      style: { "color": "#f56c6c" },
-                      type: "text",
+                      type: "danger",
+                      text: "",
                       icon: _ctx.Delete,
                       onClick: ($event) => _ctx.removeHandler(scope.$index + 1 + _ctx.pagecontext * _ctx.pagesize - 1)
                     }, null, 8, ["icon", "onClick"]), [
@@ -1642,8 +1699,9 @@
                         vue.createVNode(_component_el_button, {
                           plain: "",
                           size: "small",
+                          type: "primary",
                           icon: _ctx.ArrowUp,
-                          type: "text",
+                          text: "",
                           onClick: ($event) => _ctx.upHandler(scope.$index + 1 + _ctx.pagecontext * _ctx.pagesize - 1),
                           onDblclick: ($event) => _ctx.topHandler(scope.$index + 1 + _ctx.pagecontext * _ctx.pagesize - 1)
                         }, null, 8, ["icon", "onClick", "onDblclick"])
@@ -1659,8 +1717,9 @@
                         vue.createVNode(_component_el_button, {
                           plain: "",
                           size: "small",
+                          type: "primary",
                           icon: _ctx.ArrowDown,
-                          type: "text",
+                          text: "",
                           onClick: ($event) => _ctx.downHandler(scope.$index + 1 + _ctx.pagecontext * _ctx.pagesize - 1),
                           onDblclick: ($event) => _ctx.bottomHandler(scope.$index + 1 + _ctx.pagecontext * _ctx.pagesize - 1)
                         }, null, 8, ["icon", "onClick", "onDblclick"])
@@ -1737,6 +1796,7 @@
           key: 1,
           icon: _ctx.Grid,
           size: "small",
+          type: "primary",
           onClick: _ctx.toggleMode
         }, {
           default: vue.withCtx(() => [
@@ -1748,6 +1808,7 @@
           key: 2,
           icon: _ctx.FullScreen,
           size: "small",
+          type: "primary",
           onClick: _ctx.toggleFullscreen
         }, {
           default: vue.withCtx(() => [
@@ -2098,13 +2159,13 @@
       };
     }
   });
-  const _hoisted_1$a = {
+  const _hoisted_1$9 = {
     class: "m-cascader",
     style: { "width": "100%" }
   };
   function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_el_cascader = vue.resolveComponent("el-cascader");
-    return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$a, [
+    return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$9, [
       vue.createVNode(_component_el_cascader, {
         modelValue: _ctx.model[_ctx.name],
         "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.model[_ctx.name] = $event),
@@ -2144,7 +2205,7 @@
           } else {
             return props.config.activeValue;
           }
-          return "true";
+          return void 0;
         }),
         inactiveValue: vue.computed(() => {
           if (typeof props.config.inactiveValue === "undefined") {
@@ -2154,7 +2215,7 @@
           } else {
             return props.config.inactiveValue;
           }
-          return "false";
+          return void 0;
         }),
         changeHandler(value) {
           emit("change", value);
@@ -2227,7 +2288,7 @@
   }
   var CheckboxGroup = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$e]]);
 
-  const _hoisted_1$9 = { key: 0 };
+  const _hoisted_1$8 = { key: 0 };
   const __default__$2 = vue.defineComponent({
     name: "m-fields-color-picker"
   });
@@ -2247,7 +2308,7 @@
       const changeHandler = (value) => emit("change", value);
       return (_ctx, _cache) => {
         const _component_el_color_picker = vue.resolveComponent("el-color-picker");
-        return _ctx.model ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1$9, [
+        return _ctx.model ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1$8, [
           vue.createVNode(_component_el_color_picker, {
             modelValue: _ctx.model[_ctx.name],
             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.model[_ctx.name] = $event),
@@ -2283,10 +2344,10 @@
       };
     }
   });
-  const _hoisted_1$8 = { key: 0 };
+  const _hoisted_1$7 = { key: 0 };
   function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_el_date_picker = vue.resolveComponent("el-date-picker");
-    return _ctx.model ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1$8, [
+    return _ctx.model ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1$7, [
       vue.createVNode(_component_el_date_picker, {
         modelValue: _ctx.model[_ctx.modelName],
         "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.model[_ctx.modelName] = $event),
@@ -2390,10 +2451,10 @@
       };
     }
   });
-  const _hoisted_1$7 = { key: 0 };
+  const _hoisted_1$6 = { key: 0 };
   function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_el_date_picker = vue.resolveComponent("el-date-picker");
-    return _ctx.model ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1$7, [
+    return _ctx.model ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1$6, [
       vue.createVNode(_component_el_date_picker, {
         modelValue: _ctx.model[_ctx.name],
         "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.model[_ctx.name] = $event),
@@ -2410,7 +2471,7 @@
   }
   var DateTime = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["render", _sfc_render$b]]);
 
-  const _hoisted_1$6 = { key: 0 };
+  const _hoisted_1$5 = { key: 0 };
   const __default__$1 = vue.defineComponent({
     name: "m-fields-display"
   });
@@ -2431,7 +2492,7 @@
       }
       useAddField(props.prop);
       return (_ctx, _cache) => {
-        return _ctx.model ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_1$6, vue.toDisplayString(_ctx.model[vue.unref(n)]), 1)) : vue.createCommentVNode("", true);
+        return _ctx.model ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_1$5, vue.toDisplayString(_ctx.model[vue.unref(n)]), 1)) : vue.createCommentVNode("", true);
       };
     }
   });
@@ -2501,12 +2562,12 @@
       }
     }
   });
-  const _hoisted_1$5 = { class: "m-fields-dynamic-field" };
+  const _hoisted_1$4 = { class: "m-fields-dynamic-field" };
   function _sfc_render$a(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_el_input = vue.resolveComponent("el-input");
     const _component_el_form_item = vue.resolveComponent("el-form-item");
     const _component_el_form = vue.resolveComponent("el-form");
-    return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$5, [
+    return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$4, [
       vue.createVNode(_component_el_form, { size: "small" }, {
         default: vue.withCtx(() => [
           (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(Object.keys(_ctx.fieldMap.value), (key) => {
@@ -2628,7 +2689,7 @@
       };
     }
   });
-  const _hoisted_1$4 = ["href"];
+  const _hoisted_1$3 = ["href"];
   const _hoisted_2$1 = {
     key: 2,
     class: "m-fields-link"
@@ -2642,12 +2703,13 @@
       target: "_blank",
       href: _ctx.href,
       style: vue.normalizeStyle(_ctx.config.css || {})
-    }, vue.toDisplayString(_ctx.displayText), 13, _hoisted_1$4)) : _ctx.config.href && _ctx.disabled ? (vue.openBlock(), vue.createElementBlock("span", {
+    }, vue.toDisplayString(_ctx.displayText), 13, _hoisted_1$3)) : _ctx.config.href && _ctx.disabled ? (vue.openBlock(), vue.createElementBlock("span", {
       key: 1,
       style: vue.normalizeStyle(_ctx.config.disabledCss || {})
     }, vue.toDisplayString(_ctx.displayText), 5)) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_2$1, [
       vue.createVNode(_component_el_button, {
-        type: "text",
+        text: "",
+        type: "primary",
         onClick: _ctx.editHandler
       }, {
         default: vue.withCtx(() => [
@@ -2940,6 +3002,7 @@
         vue.watch(() => mForm?.values, () => {
           typeof props.config.options === "function" && Promise.resolve(props.config.options(mForm, {
             model: props.model,
+            prop: props.prop,
             formValues: mForm?.values,
             formValue: mForm?.values
           })).then((data) => {
@@ -2989,11 +3052,11 @@
         remote,
         options,
         moreLoadingVisible,
+        popperClass: mForm?.popperClass,
+        getOptions,
         getRequestFuc() {
           return getConfig("request");
         },
-        async getInitOption() {
-        },
         changeHandler(value) {
           emit("change", value);
         },
@@ -3010,10 +3073,6 @@
             options.value = await getOptions();
           }
         },
-        async editAfterAction() {
-          pgIndex.value = 0;
-          options.value = await getOptions();
-        },
         async remoteMethod(q) {
           if (!localOptions.value.length) {
             query.value = q;
@@ -3028,7 +3087,7 @@
       };
     }
   });
-  const _hoisted_1$3 = { key: 2 };
+  const _hoisted_1$2 = { key: 2 };
   function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_el_option = vue.resolveComponent("el-option");
     const _component_el_option_group = vue.resolveComponent("el-option-group");
@@ -3042,6 +3101,7 @@
       ref: "select",
       clearable: "",
       filterable: "",
+      "popper-class": `m-select-popper ${_ctx.popperClass}`,
       size: _ctx.size,
       remote: _ctx.remote,
       placeholder: _ctx.config.placeholder,
@@ -3049,21 +3109,21 @@
       "value-key": _ctx.config.valueKey || "value",
       "allow-create": _ctx.config.allowCreate,
       disabled: _ctx.disabled,
-      "remote-method": _ctx.remoteMethod,
+      "remote-method": _ctx.config.remote && _ctx.remoteMethod,
       onChange: _ctx.changeHandler,
       onVisibleChange: _ctx.visibleHandler
     }, {
       default: vue.withCtx(() => [
         _ctx.config.group ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(_ctx.options, (group, index) => {
           return vue.openBlock(), vue.createBlock(_component_el_option_group, {
-            key: group.label + index,
+            key: index,
             label: group.label,
             disabled: group.disabled
           }, {
             default: vue.withCtx(() => [
               (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(group.options, (item, index2) => {
                 return vue.openBlock(), vue.createBlock(_component_el_option, {
-                  key: item.label + index2,
+                  key: index2,
                   label: item.label,
                   value: item.value,
                   disabled: item.disabled
@@ -3080,12 +3140,12 @@
             disabled: option.disabled
           }, null, 8, ["label", "value", "disabled"]);
         }), 128)),
-        _ctx.moreLoadingVisible ? vue.withDirectives((vue.openBlock(), vue.createElementBlock("div", _hoisted_1$3, null, 512)), [
+        _ctx.moreLoadingVisible ? vue.withDirectives((vue.openBlock(), vue.createElementBlock("div", _hoisted_1$2, null, 512)), [
           [_directive_loading, true]
         ]) : vue.createCommentVNode("", true)
       ]),
       _: 1
-    }, 8, ["modelValue", "size", "remote", "placeholder", "multiple", "value-key", "allow-create", "disabled", "remote-method", "onChange", "onVisibleChange"])), [
+    }, 8, ["modelValue", "popper-class", "size", "remote", "placeholder", "multiple", "value-key", "allow-create", "disabled", "remote-method", "onChange", "onVisibleChange"])), [
       [_directive_loading, _ctx.loading]
     ]) : vue.createCommentVNode("", true);
   }
@@ -3157,6 +3217,7 @@
     },
     emits: ["change", "input"],
     setup(props, { emit }) {
+      const mForm = vue.inject("mForm");
       useAddField(props.prop);
       const modelName = vue.computed(() => props.name || props.config.name || "");
       return {
@@ -3165,12 +3226,10 @@
           emit("change", v);
         },
         inputHandler(v) {
-          const mForm = vue.inject("mForm");
           emit("input", v);
           mForm?.$emit("field-input", props.prop, v);
         },
         buttonClickHandler() {
-          const mForm = vue.inject("mForm");
           if (typeof props.config.append === "string")
             return;
           if (props.config.append?.handler) {
@@ -3234,7 +3293,7 @@
       };
     }
   });
-  const _hoisted_1$2 = { key: 0 };
+  const _hoisted_1$1 = { key: 0 };
   function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_el_button = vue.resolveComponent("el-button");
     const _component_el_input = vue.resolveComponent("el-input");
@@ -3252,17 +3311,18 @@
       _ctx.config.append ? {
         name: "append",
         fn: vue.withCtx(() => [
-          typeof _ctx.config.append === "string" ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_1$2, vue.toDisplayString(_ctx.config.append), 1)) : vue.createCommentVNode("", true),
+          typeof _ctx.config.append === "string" ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_1$1, vue.toDisplayString(_ctx.config.append), 1)) : vue.createCommentVNode("", true),
           typeof _ctx.config.append === "object" && _ctx.config.append.type === "button" ? (vue.openBlock(), vue.createBlock(_component_el_button, {
             key: 1,
             style: { "color": "#409eff" },
-            onClick: _ctx.buttonClickHandler
+            size: _ctx.size,
+            onClick: vue.withModifiers(_ctx.buttonClickHandler, ["prevent"])
           }, {
             default: vue.withCtx(() => [
               vue.createTextVNode(vue.toDisplayString(_ctx.config.append.text), 1)
             ]),
             _: 1
-          }, 8, ["onClick"])) : vue.createCommentVNode("", true)
+          }, 8, ["size", "onClick"])) : vue.createCommentVNode("", true)
         ])
       } : void 0
     ]), 1032, ["modelValue", "size", "placeholder", "disabled", "onChange", "onInput"]);
@@ -3301,22 +3361,19 @@
       };
     }
   });
-  const _hoisted_1$1 = { key: 0 };
   function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_el_input = vue.resolveComponent("el-input");
-    return _ctx.model ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1$1, [
-      vue.createVNode(_component_el_input, {
-        modelValue: _ctx.model[_ctx.name],
-        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.model[_ctx.name] = $event),
-        type: "textarea",
-        size: _ctx.size,
-        clearable: "",
-        placeholder: _ctx.config.placeholder,
-        disabled: _ctx.disabled,
-        onChange: _ctx.changeHandler,
-        onInput: _ctx.inputHandler
-      }, null, 8, ["modelValue", "size", "placeholder", "disabled", "onChange", "onInput"])
-    ])) : vue.createCommentVNode("", true);
+    return vue.openBlock(), vue.createBlock(_component_el_input, {
+      modelValue: _ctx.model[_ctx.name],
+      "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.model[_ctx.name] = $event),
+      type: "textarea",
+      size: _ctx.size,
+      clearable: "",
+      placeholder: _ctx.config.placeholder,
+      disabled: _ctx.disabled,
+      onChange: _ctx.changeHandler,
+      onInput: _ctx.inputHandler
+    }, null, 8, ["modelValue", "size", "placeholder", "disabled", "onChange", "onInput"]);
   }
   var Textarea = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["render", _sfc_render$3]]);
 
@@ -3406,6 +3463,9 @@
       keyProp: {
         type: String,
         default: "__key"
+      },
+      popperClass: {
+        type: String
       }
     },
     emits: ["change", "field-input", "field-change"],
@@ -3417,6 +3477,7 @@
       const requestFuc = getConfig("request");
       const formState = vue.reactive({
         keyProp: props.keyProp,
+        popperClass: props.popperClass,
         config: props.config,
         initValues: props.initValues,
         parentValues: props.parentValues,
@@ -3460,7 +3521,7 @@
         submitForm: async (native) => {
           try {
             await elForm.value?.validate();
-            return native ? values.value : lodashEs.cloneDeep(values.value);
+            return native ? values.value : lodashEs.cloneDeep(vue.toRaw(values.value));
           } catch (invalidFields) {
             const error = [];
             Object.entries(invalidFields).forEach(([, ValidateError]) => {
@@ -3787,8 +3848,7 @@
   exports.initValue = initValue;
   exports.useAddField = useAddField;
 
-  Object.defineProperty(exports, '__esModule', { value: true });
-  exports[Symbol.toStringTag] = 'Module';
+  Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } });
 
 }));
 //# sourceMappingURL=tmagic-form.umd.js.map