@tmagic/form 1.7.0-beta.3 → 1.7.0-beta.5

package/dist/tmagic-form.umd.cjs

@@ -3145,7 +3145,7 @@
         newData[v][sortKey] = i;
       }
     }
-    return newData;
+    return cloneDeep(newData);
   };
   const sortChange = (data, { prop, order }) => {
     if (order === "ascending") {
@@ -3155,17 +3155,65 @@
     }
   };
 
+  const _hoisted_1$e = {
+    key: 0,
+    style: { "display": "inline-flex", "align-items": "center" }
+  };
+  const _hoisted_2$8 = ["innerHTML", "title"];
+  const _hoisted_3$6 = ["innerHTML"];
+  const _hoisted_4$5 = ["innerHTML", "title"];
+  const _sfc_main$B = /* @__PURE__ */ vue.defineComponent({
+    __name: "FormLabel",
+    props: {
+      tip: {},
+      type: {},
+      useLabel: { type: Boolean },
+      text: {},
+      labelTitle: {}
+    },
+    setup(__props) {
+      return (_ctx, _cache) => {
+        return __props.tip ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_1$e, [
+          vue.createElementVNode("span", {
+            innerHTML: __props.type === "checkbox" && !__props.useLabel ? "" : __props.text,
+            title: __props.labelTitle
+          }, null, 8, _hoisted_2$8),
+          __props.tip && (__props.type !== "checkbox" || __props.useLabel) ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicTooltip), {
+            key: 0,
+            placement: "top"
+          }, {
+            content: vue.withCtx(() => [
+              vue.createElementVNode("div", { innerHTML: __props.tip }, null, 8, _hoisted_3$6)
+            ]),
+            default: vue.withCtx(() => [
+              vue.createVNode(vue.unref(design.TMagicIcon), { style: { "margin-left": "5px", "display": "flex" } }, {
+                default: vue.withCtx(() => [
+                  vue.createVNode(vue.unref(iconsVue.WarningFilled))
+                ]),
+                _: 1
+                /* STABLE */
+              })
+            ]),
+            _: 1
+            /* STABLE */
+          })) : vue.createCommentVNode("v-if", true)
+        ])) : (vue.openBlock(), vue.createElementBlock("span", {
+          key: 1,
+          innerHTML: __props.type === "checkbox" && !__props.useLabel ? "" : __props.text,
+          title: __props.labelTitle
+        }, null, 8, _hoisted_4$5));
+      };
+    }
+  });
+
   const _hoisted_1$d = ["data-tmagic-id", "data-tmagic-form-item-prop"];
-  const _hoisted_2$7 = ["innerHTML", "title"];
+  const _hoisted_2$7 = ["innerHTML"];
   const _hoisted_3$5 = ["innerHTML"];
   const _hoisted_4$4 = ["innerHTML"];
-  const _hoisted_5$3 = ["innerHTML", "title"];
+  const _hoisted_5$3 = ["innerHTML"];
   const _hoisted_6$1 = ["innerHTML"];
   const _hoisted_7$1 = ["innerHTML"];
-  const _hoisted_8$1 = ["innerHTML", "title"];
-  const _hoisted_9 = ["innerHTML"];
-  const _hoisted_10 = ["innerHTML"];
-  const _hoisted_11 = {
+  const _hoisted_8$1 = {
     key: 5,
     style: { "text-align": "center" }
   };
@@ -3412,10 +3460,13 @@
                 class: { "tmagic-form-hidden": `${itemLabelWidth.value}` === "0" || !text.value }
               }), {
                 label: vue.withCtx(() => [
-                  vue.createElementVNode("span", {
-                    innerHTML: type.value === "checkbox" && !__props.config.useLabel ? "" : text.value,
-                    title: __props.config.labelTitle
-                  }, null, 8, _hoisted_2$7)
+                  vue.createVNode(_sfc_main$B, {
+                    tip: __props.config.tip,
+                    type: type.value,
+                    "use-label": __props.config.useLabel,
+                    "label-title": __props.config.labelTitle,
+                    text: text.value
+                  }, null, 8, ["tip", "type", "use-label", "label-title", "text"])
                 ]),
                 default: vue.withCtx(() => [
                   tooltip.value.text ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicTooltip), {
@@ -3425,36 +3476,38 @@
                     content: vue.withCtx(() => [
                       vue.createElementVNode("div", {
                         innerHTML: tooltip.value.text
-                      }, null, 8, _hoisted_3$5)
+                      }, null, 8, _hoisted_2$7)
                     ]),
                     default: vue.withCtx(() => [
                       (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(tagName.value), vue.mergeProps(fieldsProps.value, {
                         model: __props.model,
                         "last-values": __props.lastValues,
+                        "is-compare": __props.isCompare,
                         onChange: onChangeHandler,
                         onAddDiffCount
-                      }), null, 16, ["model", "last-values"]))
+                      }), null, 16, ["model", "last-values", "is-compare"]))
                     ]),
                     _: 1
                     /* STABLE */
                   }, 8, ["placement"])) : (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(tagName.value), vue.mergeProps({ key: 1 }, fieldsProps.value, {
                     model: __props.model,
                     "last-values": __props.lastValues,
+                    "is-compare": __props.isCompare,
                     onChange: onChangeHandler,
                     onAddDiffCount
-                  }), null, 16, ["model", "last-values"]))
+                  }), null, 16, ["model", "last-values", "is-compare"]))
                 ]),
                 _: 1
                 /* STABLE */
               }, 16, ["class"]),
-              __props.config.tip ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicTooltip), {
+              __props.config.tip && type.value === "checkbox" && !__props.config.useLabel ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicTooltip), {
                 key: 0,
-                placement: "left"
+                placement: "top"
               }, {
                 content: vue.withCtx(() => [
                   vue.createElementVNode("div", {
                     innerHTML: __props.config.tip
-                  }, null, 8, _hoisted_4$4)
+                  }, null, 8, _hoisted_3$5)
                 ]),
                 default: vue.withCtx(() => [
                   vue.createVNode(vue.unref(design.TMagicIcon), { style: { "line-height": "40px", "margin-left": "5px" } }, {
@@ -3481,10 +3534,13 @@
                 class: { "tmagic-form-hidden": `${itemLabelWidth.value}` === "0" || !text.value, "show-diff": true }
               }), {
                 label: vue.withCtx(() => [
-                  vue.createElementVNode("span", {
-                    innerHTML: type.value === "checkbox" ? "" : text.value,
-                    title: __props.config.labelTitle
-                  }, null, 8, _hoisted_5$3)
+                  vue.createVNode(_sfc_main$B, {
+                    tip: __props.config.tip,
+                    type: type.value,
+                    "use-label": __props.config.useLabel,
+                    "label-title": __props.config.labelTitle,
+                    text: text.value
+                  }, null, 8, ["tip", "type", "use-label", "label-title", "text"])
                 ]),
                 default: vue.withCtx(() => [
                   tooltip.value.text ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicTooltip), {
@@ -3494,7 +3550,7 @@
                     content: vue.withCtx(() => [
                       vue.createElementVNode("div", {
                         innerHTML: tooltip.value.text
-                      }, null, 8, _hoisted_6$1)
+                      }, null, 8, _hoisted_4$4)
                     ]),
                     default: vue.withCtx(() => [
                       (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(tagName.value), vue.mergeProps(fieldsProps.value, {
@@ -3512,14 +3568,14 @@
                 _: 1
                 /* STABLE */
               }, 16, ["class"]),
-              __props.config.tip ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicTooltip), {
+              __props.config.tip && type.value === "checkbox" && !__props.config.useLabel ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicTooltip), {
                 key: 0,
-                placement: "left"
+                placement: "top"
               }, {
                 content: vue.withCtx(() => [
                   vue.createElementVNode("div", {
                     innerHTML: __props.config.tip
-                  }, null, 8, _hoisted_7$1)
+                  }, null, 8, _hoisted_5$3)
                 ]),
                 default: vue.withCtx(() => [
                   vue.createVNode(vue.unref(design.TMagicIcon), { style: { "line-height": "40px", "margin-left": "5px" } }, {
@@ -3539,10 +3595,13 @@
                 class: { "tmagic-form-hidden": `${itemLabelWidth.value}` === "0" || !text.value, "show-diff": true }
               }), {
                 label: vue.withCtx(() => [
-                  vue.createElementVNode("span", {
-                    innerHTML: type.value === "checkbox" ? "" : text.value,
-                    title: __props.config.labelTitle
-                  }, null, 8, _hoisted_8$1)
+                  vue.createVNode(_sfc_main$B, {
+                    tip: __props.config.tip,
+                    type: type.value,
+                    "use-label": __props.config.useLabel,
+                    "label-title": __props.config.labelTitle,
+                    text: text.value
+                  }, null, 8, ["tip", "type", "use-label", "label-title", "text"])
                 ]),
                 default: vue.withCtx(() => [
                   tooltip.value.text ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicTooltip), {
@@ -3552,7 +3611,7 @@
                     content: vue.withCtx(() => [
                       vue.createElementVNode("div", {
                         innerHTML: tooltip.value.text
-                      }, null, 8, _hoisted_9)
+                      }, null, 8, _hoisted_6$1)
                     ]),
                     default: vue.withCtx(() => [
                       (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(tagName.value), vue.mergeProps(fieldsProps.value, {
@@ -3570,14 +3629,14 @@
                 _: 1
                 /* STABLE */
               }, 16, ["style", "class"]),
-              __props.config.tip ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicTooltip), {
+              __props.config.tip && type.value === "checkbox" && !__props.config.useLabel ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicTooltip), {
                 key: 1,
-                placement: "left"
+                placement: "top"
               }, {
                 content: vue.withCtx(() => [
                   vue.createElementVNode("div", {
                     innerHTML: __props.config.tip
-                  }, null, 8, _hoisted_10)
+                  }, null, 8, _hoisted_7$1)
                 ]),
                 default: vue.withCtx(() => [
                   vue.createVNode(vue.unref(design.TMagicIcon), { style: { "line-height": "40px", "margin-left": "5px" } }, {
@@ -3625,7 +3684,7 @@
             64
             /* STABLE_FRAGMENT */
           )) : vue.createCommentVNode("v-if", true),
-          __props.config.expand && type.value !== "fieldset" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_11, [
+          __props.config.expand && type.value !== "fieldset" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_8$1, [
             vue.createVNode(vue.unref(design.TMagicButton), {
               type: "primary",
               size: "small",
@@ -4338,23 +4397,24 @@
               /* STABLE */
             }, 8, ["icon"])) : vue.createCommentVNode("v-if", true),
             vue.createElementVNode("div", _hoisted_5$1, [
-              addable.value ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicButton), {
+              addable.value ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicButton), vue.mergeProps({
                 key: 0,
-                type: "primary",
                 size: __props.config.enableToggleMode ? "small" : "default",
+                icon: vue.unref(iconsVue.Plus)
+              }, __props.config.addButtonConfig?.props || { type: "primary" }, {
                 disabled: __props.disabled,
                 onClick: addHandler
-              }, {
-                default: vue.withCtx(() => [..._cache[3] || (_cache[3] = [
+              }), {
+                default: vue.withCtx(() => [
                   vue.createTextVNode(
-                    "新增",
-                    -1
-                    /* CACHED */
+                    vue.toDisplayString(__props.config.addButtonConfig?.text || "新增"),
+                    1
+                    /* TEXT */
                   )
-                ])]),
+                ]),
                 _: 1
                 /* STABLE */
-              }, 8, ["size", "disabled"])) : vue.createCommentVNode("v-if", true)
+              }, 16, ["size", "icon", "disabled"])) : vue.createCommentVNode("v-if", true)
             ])
           ])
         ]);
@@ -4387,7 +4447,7 @@
       disabled: { type: Boolean }
     },
     emits: ["change", "addDiffCount"],
-    setup(__props, { emit: __emit }) {
+    setup(__props, { expose: __expose, emit: __emit }) {
       const props = __props;
       const emit = __emit;
       const mForm = vue.inject("mForm");
@@ -4398,6 +4458,12 @@
         emit("change", props.model, eventData);
       };
       const onAddDiffCount = () => emit("addDiffCount");
+      __expose({
+        getExpand: () => expand.value,
+        setExpand: (v) => {
+          expand.value = v;
+        }
+      });
       return (_ctx, _cache) => {
         return items.value && items.value.length ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicCard), {
           key: 0,
@@ -4412,18 +4478,23 @@
                 icon: expand.value ? vue.unref(iconsVue.CaretBottom) : vue.unref(iconsVue.CaretRight),
                 onClick: _cache[0] || (_cache[0] = ($event) => expand.value = !expand.value)
               }, null, 8, ["icon"]),
-              __props.config && __props.config.extra ? (vue.openBlock(), vue.createElementBlock("span", {
-                key: 0,
-                innerHTML: __props.config.extra,
-                class: "m-form-tip"
-              }, null, 8, _hoisted_2$3)) : vue.createCommentVNode("v-if", true),
               vue.renderSlot(_ctx.$slots, "header", {}, () => [
-                vue.createTextVNode(
+                vue.createElementVNode(
+                  "span",
+                  {
+                    style: { "cursor": "pointer" },
+                    onClick: _cache[1] || (_cache[1] = ($event) => expand.value = !expand.value)
+                  },
                   vue.toDisplayString(filter(__props.config.title)),
                   1
                   /* TEXT */
                 )
-              ])
+              ]),
+              __props.config && __props.config.extra ? (vue.openBlock(), vue.createElementBlock("span", {
+                key: 0,
+                innerHTML: __props.config.extra,
+                class: "m-form-tip"
+              }, null, 8, _hoisted_2$3)) : vue.createCommentVNode("v-if", true)
             ])
           ]),
           default: vue.withCtx(() => [
@@ -4446,7 +4517,7 @@
                         disabled: __props.disabled,
                         "label-width": __props.config.labelWidth || __props.labelWidth,
                         onChange: changeHandler,
-                        onAddDiffCount: _cache[1] || (_cache[1] = ($event) => onAddDiffCount())
+                        onAddDiffCount: _cache[2] || (_cache[2] = ($event) => onAddDiffCount())
                       }, null, 8, ["config", "model", "lastValues", "is-compare", "prop", "size", "disabled", "label-width"]);
                     }),
                     128
@@ -4472,7 +4543,7 @@
                     disabled: __props.disabled,
                     "label-width": __props.config.labelWidth || __props.labelWidth,
                     onChange: changeHandler,
-                    onAddDiffCount: _cache[2] || (_cache[2] = ($event) => onAddDiffCount())
+                    onAddDiffCount: _cache[3] || (_cache[3] = ($event) => onAddDiffCount())
                   }, null, 8, ["config", "model", "lastValues", "is-compare", "prop", "size", "disabled", "label-width"]);
                 }),
                 128
@@ -4966,7 +5037,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -5093,7 +5165,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -5165,7 +5238,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -5238,7 +5312,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -5272,7 +5347,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -5312,7 +5388,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -5424,7 +5501,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -5478,7 +5556,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     setup(__props) {
       const props = __props;
@@ -5513,7 +5592,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -5614,7 +5694,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     setup(__props) {
       const props = __props;
@@ -5879,7 +5960,12 @@
       zIndex: {},
       size: {},
       confirmText: { default: "确定" },
-      preventSubmitDefault: { type: Boolean }
+      preventSubmitDefault: { type: Boolean },
+      closeOnClickModal: { type: Boolean, default: false },
+      closeOnPressEscape: { type: Boolean, default: false },
+      destroyOnClose: { type: Boolean, default: false },
+      showClose: { type: Boolean, default: true },
+      showCancel: { type: Boolean, default: true }
     },
     emits: ["close", "submit", "error", "change"],
     setup(__props, { expose: __expose, emit: __emit }) {
@@ -5959,7 +6045,10 @@
           width: __props.width,
           zIndex: __props.zIndex,
           fullscreen: __props.fullscreen,
-          "close-on-click-modal": false,
+          "close-on-click-modal": __props.closeOnClickModal,
+          "close-on-press-escape": __props.closeOnPressEscape,
+          "destroy-on-close": __props.destroyOnClose,
+          "show-close": __props.showClose,
           onClose: closeHandler
         }, {
           footer: vue.withCtx(() => [
@@ -5980,7 +6069,8 @@
                 vue.createVNode(vue.unref(design.TMagicCol), { span: 12 }, {
                   default: vue.withCtx(() => [
                     vue.renderSlot(_ctx.$slots, "footer", {}, () => [
-                      vue.createVNode(vue.unref(design.TMagicButton), {
+                      __props.showCancel ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicButton), {
+                        key: 0,
                         onClick: cancel,
                         size: "small"
                       }, {
@@ -5993,9 +6083,9 @@
                         ])]),
                         _: 1
                         /* STABLE */
-                      }),
+                      })) : vue.createCommentVNode("v-if", true),
                       hasStep.value && stepActive.value > 1 ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicButton), {
-                        key: 0,
+                        key: 1,
                         type: "info",
                         size: "small",
                         onClick: preStep
@@ -6011,7 +6101,7 @@
                         /* STABLE */
                       })) : vue.createCommentVNode("v-if", true),
                       hasStep.value && stepCount.value > stepActive.value ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicButton), {
-                        key: 1,
+                        key: 2,
                         type: "info",
                         size: "small",
                         onClick: nextStep
@@ -6026,7 +6116,7 @@
                         _: 1
                         /* STABLE */
                       })) : (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicButton), {
-                        key: 2,
+                        key: 3,
                         type: "primary",
                         size: "small",
                         disabled: __props.disabled,
@@ -6086,7 +6176,7 @@
           ]),
           _: 3
           /* FORWARDED */
-        }, 8, ["modelValue", "title", "width", "zIndex", "fullscreen"]);
+        }, 8, ["modelValue", "title", "width", "zIndex", "fullscreen", "close-on-click-modal", "close-on-press-escape", "destroy-on-close", "show-close"]);
       };
     }
   });
@@ -6110,7 +6200,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -6221,16 +6312,27 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change", "input"],
     setup(__props, { emit: __emit }) {
       const props = __props;
       const emit = __emit;
+      const value = vue.ref();
+      vue.watch(
+        () => props.model[props.name],
+        (v) => {
+          value.value = v;
+        },
+        {
+          immediate: true
+        }
+      );
       useAddField(props.prop);
       const mForm = vue.inject("mForm");
-      const changeHandler = (value) => {
-        emit("change", value);
+      const changeHandler = (value2) => {
+        emit("change", value2);
       };
       const inputHandler = (v) => {
         emit("input", v);
@@ -6239,7 +6341,8 @@
       return (_ctx, _cache) => {
         return __props.model ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicInputNumber), {
           key: 0,
-          "model-value": __props.model[__props.name],
+          modelValue: value.value,
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => value.value = $event),
           clearable: "",
           "controls-position": "right",
           size: __props.size,
@@ -6248,9 +6351,9 @@
           step: __props.config.step,
           placeholder: __props.config.placeholder,
           disabled: __props.disabled,
-          "onUpdate:modelValue": changeHandler,
+          onChange: changeHandler,
           onInput: inputHandler
-        }, null, 8, ["model-value", "size", "max", "min", "step", "placeholder", "disabled"])) : vue.createCommentVNode("v-if", true);
+        }, null, 8, ["modelValue", "size", "max", "min", "step", "placeholder", "disabled"])) : vue.createCommentVNode("v-if", true);
       };
     }
   });
@@ -6270,12 +6373,26 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
       const props = __props;
       const emit = __emit;
+      const firstValue = vue.ref();
+      const secondValue = vue.ref();
+      vue.watch(
+        () => props.model[props.name],
+        ([first, second]) => {
+          firstValue.value = first;
+          secondValue.value = second;
+        },
+        {
+          immediate: true,
+          deep: true
+        }
+      );
       useAddField(props.prop);
       if (!Array.isArray(props.model[props.name])) {
         props.model[props.name] = [];
@@ -6289,13 +6406,14 @@
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$4, [
           vue.createVNode(vue.unref(design.TMagicInput), {
-            "model-value": __props.model[__props.name][0],
+            modelValue: firstValue.value,
+            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => firstValue.value = $event),
             clearable: __props.config.clearable ?? true,
             size: __props.size,
             disabled: __props.disabled,
-            "onUpdate:modelValue": minChangeHandler
-          }, null, 8, ["model-value", "clearable", "size", "disabled"]),
-          _cache[0] || (_cache[0] = vue.createElementVNode(
+            onChange: minChangeHandler
+          }, null, 8, ["modelValue", "clearable", "size", "disabled"]),
+          _cache[2] || (_cache[2] = vue.createElementVNode(
             "span",
             { class: "split-tag" },
             "-",
@@ -6303,12 +6421,13 @@
             /* CACHED */
           )),
           vue.createVNode(vue.unref(design.TMagicInput), {
-            "model-value": __props.model[__props.name][1],
+            modelValue: secondValue.value,
+            "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => secondValue.value = $event),
             clearable: __props.config.clearable ?? true,
             size: __props.size,
             disabled: __props.disabled,
-            "onUpdate:modelValue": maxChangeHandler
-          }, null, 8, ["model-value", "clearable", "size", "disabled"])
+            onChange: maxChangeHandler
+          }, null, 8, ["modelValue", "clearable", "size", "disabled"])
         ]);
       };
     }
@@ -6328,7 +6447,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -6426,7 +6546,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { expose: __expose, emit: __emit }) {
@@ -6877,7 +6998,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -6937,7 +7059,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change", "input"],
     setup(__props, { emit: __emit }) {
@@ -6945,6 +7068,16 @@
       const emit = __emit;
       useAddField(props.prop);
       const mForm = vue.inject("mForm");
+      const value = vue.ref("");
+      vue.watch(
+        () => props.model[props.name],
+        (v) => {
+          value.value = v;
+        },
+        {
+          immediate: true
+        }
+      );
       const appendConfig = vue.computed(() => {
         if (typeof props.config.append === "string") {
           return {
@@ -6975,13 +7108,13 @@
         emit("change", props.model[props.name].trim() || "");
         popoverVisible.value = false;
       };
-      const checkWhiteSpace = debounce((value) => {
-        if (typeof value === "string" && !props.config.trim) {
-          popoverVisible.value = value.trim() !== value;
+      const checkWhiteSpace = debounce((value2) => {
+        if (typeof value2 === "string" && !props.config.trim) {
+          popoverVisible.value = value2.trim() !== value2;
         }
       }, 300);
-      const changeHandler = (value) => {
-        emit("change", value);
+      const changeHandler = (value2) => {
+        emit("change", value2);
       };
       const inputHandler = (v) => {
         checkWhiteSpace(v);
@@ -6992,11 +7125,11 @@
         if (!appendConfig.value) return;
         if (typeof appendConfig.value.handler === "function") {
           const newChangeRecords = [];
-          const setModel = (key, value) => {
-            newChangeRecords.push({ propPath: props.prop.replace(`${props.name}`, key), value });
+          const setModel = (key, value2) => {
+            newChangeRecords.push({ propPath: props.prop.replace(`${props.name}`, key), value: value2 });
           };
-          const setFormValue = (key, value) => {
-            newChangeRecords.push({ propPath: key, value });
+          const setFormValue = (key, value2) => {
+            newChangeRecords.push({ propPath: key, value: value2 });
           };
           appendConfig.value.handler(mForm, {
             model: props.model,
@@ -7020,13 +7153,13 @@
         if (!arrowUp && !arrowDown) {
           return;
         }
-        const value = props.model[props.name];
+        const value2 = props.model[props.name];
         let num;
         let unit;
-        if (utils.isNumber(value)) {
-          num = +value;
+        if (utils.isNumber(value2)) {
+          num = +value2;
         } else {
-          value.replace(/^([0-9.]+)([a-z%]+)$/, ($0, $1, $2) => {
+          value2.replace(/^([0-9.]+)([a-z%]+)$/, ($0, $1, $2) => {
             num = +$1;
             unit = $2;
           });
@@ -7088,16 +7221,17 @@
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$2, [
           vue.createVNode(vue.unref(design.TMagicInput), {
-            "model-value": __props.model[__props.name],
+            modelValue: value.value,
+            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => value.value = $event),
             ref_key: "input",
             ref: input,
             clearable: "",
             size: __props.size,
             placeholder: __props.config.placeholder,
             disabled: __props.disabled,
-            "onUpdate:modelValue": changeHandler,
+            onChange: changeHandler,
             onInput: inputHandler,
-            onKeyup: _cache[0] || (_cache[0] = ($event) => keyUpHandler($event))
+            onKeyup: _cache[1] || (_cache[1] = ($event) => keyUpHandler($event))
           }, vue.createSlots({
             _: 2
             /* DYNAMIC */
@@ -7143,7 +7277,7 @@
               ]),
               key: "1"
             } : void 0
-          ]), 1032, ["model-value", "size", "placeholder", "disabled"]),
+          ]), 1032, ["modelValue", "size", "placeholder", "disabled"]),
           (vue.openBlock(), vue.createBlock(vue.Teleport, { to: "body" }, [
             popoverVisible.value ? (vue.openBlock(), vue.createElementBlock(
               "div",
@@ -7154,7 +7288,7 @@
                 ref: popoverEl
               },
               [
-                _cache[4] || (_cache[4] = vue.createElementVNode(
+                _cache[5] || (_cache[5] = vue.createElementVNode(
                   "div",
                   { class: "m-form-validate__warning" },
                   "输入内容前后有空格，是否移除空格？",
@@ -7165,9 +7299,9 @@
                   vue.createVNode(vue.unref(design.TMagicButton), {
                     link: "",
                     size: "small",
-                    onClick: _cache[1] || (_cache[1] = ($event) => popoverVisible.value = false)
+                    onClick: _cache[2] || (_cache[2] = ($event) => popoverVisible.value = false)
                   }, {
-                    default: vue.withCtx(() => [..._cache[2] || (_cache[2] = [
+                    default: vue.withCtx(() => [..._cache[3] || (_cache[3] = [
                       vue.createTextVNode(
                         "保持原样",
                         -1
@@ -7182,7 +7316,7 @@
                     size: "small",
                     onClick: confirmTrimHandler
                   }, {
-                    default: vue.withCtx(() => [..._cache[3] || (_cache[3] = [
+                    default: vue.withCtx(() => [..._cache[4] || (_cache[4] = [
                       vue.createTextVNode(
                         "移除空格",
                         -1
@@ -7193,7 +7327,7 @@
                     /* STABLE */
                   })
                 ]),
-                _cache[5] || (_cache[5] = vue.createElementVNode(
+                _cache[6] || (_cache[6] = vue.createElementVNode(
                   "span",
                   {
                     class: "tmagic-form-text-popper-arrow",
@@ -7227,16 +7361,27 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change", "input"],
     setup(__props, { emit: __emit }) {
       const props = __props;
       const emit = __emit;
+      const value = vue.ref("");
+      vue.watch(
+        () => props.model[props.name],
+        (v) => {
+          value.value = v;
+        },
+        {
+          immediate: true
+        }
+      );
       useAddField(props.prop);
       const mForm = vue.inject("mForm");
-      const changeHandler = (value) => {
-        emit("change", value);
+      const changeHandler = (value2) => {
+        emit("change", value2);
       };
       const inputHandler = (v) => {
         emit("input", v);
@@ -7244,16 +7389,17 @@
       };
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createBlock(vue.unref(design.TMagicInput), {
-          "model-value": __props.model[__props.name],
+          modelValue: value.value,
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => value.value = $event),
           type: "textarea",
           size: __props.size,
           clearable: "",
           placeholder: __props.config.placeholder,
           disabled: __props.disabled,
           rows: __props.config.rows,
-          "onUpdate:modelValue": changeHandler,
+          onChange: changeHandler,
           onInput: inputHandler
-        }, null, 8, ["model-value", "size", "placeholder", "disabled", "rows"]);
+        }, null, 8, ["modelValue", "size", "placeholder", "disabled", "rows"]);
       };
     }
   });
@@ -7272,7 +7418,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -7310,7 +7457,8 @@
       prop: {},
       disabled: { type: Boolean },
       size: {},
-      lastValues: {}
+      lastValues: {},
+      isCompare: { type: Boolean }
     },
     emits: ["change"],
     setup(__props, { emit: __emit }) {
@@ -7571,7 +7719,7 @@
     const rowDrop = () => {
       sortable?.destroy();
       const tableEl = tMagicTableRef.value?.getEl();
-      const tBodyEl = tableEl?.querySelector(".el-table__body > tbody");
+      const tBodyEl = tableEl?.querySelector(".el-table__body > tbody") || tableEl?.querySelector(".t-table__body");
       if (!tBodyEl) {
         return;
       }
@@ -7818,6 +7966,17 @@
       }
       return fuc;
     };
+    const titleTip = (fuc) => {
+      if (typeof fuc === "function") {
+        return fuc(mForm, {
+          values: mForm?.initValues,
+          model: props.model,
+          formValue: mForm ? mForm.values : props.model,
+          prop: props.prop
+        });
+      }
+      return fuc;
+    };
     const selection = vue.computed(() => {
       if (typeof props.config.selection === "function") {
         return props.config.selection(mForm, { model: props.model[modelName.value] });
@@ -7854,10 +8013,14 @@
           })
         });
       }
-      columns2.push({
+      let actionFixed = props.config.fixed === false ? void 0 : "left";
+      if (typeof props.config.fixed === "string" && ["left", "right"].includes(props.config.fixed)) {
+        actionFixed = props.config.fixed;
+      }
+      const actionClumn = {
         props: {
           label: "操作",
-          fixed: props.config.fixed === false ? void 0 : "left",
+          fixed: actionFixed,
           width: props.config.operateColWidth || 112,
           align: "center"
         },
@@ -7876,7 +8039,10 @@
             emit("change", v);
           }
         })
-      });
+      };
+      if (actionFixed !== "right") {
+        columns2.push(actionClumn);
+      }
       if (props.sort && props.model[modelName.value] && props.model[modelName.value].length > 1) {
         columns2.push({
           props: {
@@ -7919,6 +8085,7 @@
       }
       for (const column of props.config.items) {
         if (column.type !== "hidden" && display$1(column.display)) {
+          const titleTipValue = titleTip(column.titleTip);
           columns2.push({
             props: {
               prop: column.name,
@@ -7940,10 +8107,33 @@
               size: props.size,
               onChange: changeHandler,
               onAddDiffCount
-            })
+            }),
+            title: titleTipValue ? () => vue.h(
+              design.TMagicTooltip,
+              { placement: "top" },
+              {
+                default: () => vue.h(
+                  "span",
+                  {
+                    style: {
+                      display: "inline-flex",
+                      alignItems: "center",
+                      gap: "5px"
+                    }
+                  },
+                  [vue.h("span", column.label), vue.h(design.TMagicIcon, {}, { default: () => vue.h(iconsVue.WarningFilled) })]
+                ),
+                content: () => vue.h("div", {
+                  innerHTML: titleTipValue
+                })
+              }
+            ) : void 0
           });
         }
       }
+      if (actionFixed === "right") {
+        columns2.push(actionClumn);
+      }
       return columns2;
     });
     return {
@@ -8158,24 +8348,26 @@
                         /* STABLE */
                       }, 8, ["disabled", "onClick"])) : vue.createCommentVNode("v-if", true)
                     ]),
-                    vue.unref(addable) ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicButton), {
+                    vue.unref(addable) ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicButton), vue.mergeProps({
                       key: 0,
+                      class: "m-form-table-add-button",
                       size: "small",
-                      type: "primary",
-                      disabled: __props.disabled,
                       plain: "",
+                      icon: vue.unref(iconsVue.Plus)
+                    }, __props.config.addButtonConfig?.props || { type: "primary" }, {
+                      disabled: __props.disabled,
                       onClick: _cache[0] || (_cache[0] = ($event) => vue.unref(newHandler)())
-                    }, {
-                      default: vue.withCtx(() => [..._cache[4] || (_cache[4] = [
+                    }), {
+                      default: vue.withCtx(() => [
                         vue.createTextVNode(
-                          "新增一行",
-                          -1
-                          /* CACHED */
+                          vue.toDisplayString(__props.config.addButtonConfig?.text || "新增一行"),
+                          1
+                          /* TEXT */
                         )
-                      ])]),
+                      ]),
                       _: 1
                       /* STABLE */
-                    }, 8, ["disabled"])) : vue.createCommentVNode("v-if", true)
+                    }, 16, ["icon", "disabled"])) : vue.createCommentVNode("v-if", true)
                   ]),
                   __props.config.pagination ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_4, [
                     vue.createVNode(vue.unref(design.TMagicPagination), {