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

package/dist/tmagic-form.js

@@ -1,7 +1,7 @@
-import { toRaw, defineComponent, inject, ref, computed, watchEffect, watch, resolveComponent, createElementBlock, openBlock, normalizeStyle, normalizeClass, createBlock, createCommentVNode, mergeProps, resolveDynamicComponent, Fragment, createVNode, unref, withCtx, createElementVNode, renderList, createTextVNode, toDisplayString, readonly, withDirectives, vShow, renderSlot, getCurrentInstance, createSlots, onUnmounted, reactive, onBeforeUnmount, vModelText, useTemplateRef, provide, shallowRef, onBeforeMount, nextTick, resolveDirective, withModifiers, Teleport, h } from 'vue';
-import { WarningFilled, CaretBottom, CaretRight, Delete, DocumentCopy, CaretTop, Position, Grid, ArrowUp, ArrowDown, FullScreen } from '@element-plus/icons-vue';
+import { toRaw, defineComponent, createElementBlock, openBlock, createElementVNode, createBlock, createCommentVNode, unref, withCtx, createVNode, inject, ref, computed, watchEffect, watch, resolveComponent, normalizeStyle, normalizeClass, mergeProps, resolveDynamicComponent, Fragment, renderList, createTextVNode, toDisplayString, readonly, withDirectives, vShow, renderSlot, getCurrentInstance, createSlots, onUnmounted, reactive, onBeforeUnmount, vModelText, useTemplateRef, provide, shallowRef, onBeforeMount, nextTick, resolveDirective, withModifiers, Teleport, h } from 'vue';
+import { WarningFilled, CaretBottom, CaretRight, Delete, DocumentCopy, CaretTop, Position, Grid, Plus, ArrowUp, ArrowDown, FullScreen } from '@element-plus/icons-vue';
 import { cloneDeep, isEqual, isEmpty, debounce } from 'lodash-es';
-import { TMagicFormItem, TMagicTooltip, TMagicIcon, TMagicButton, TMagicCheckbox, TMagicCard, TMagicPopover, TMagicInputNumber, TMagicCol, TMagicRow, TMagicSteps, TMagicStep, getDesignConfig, TMagicBadge, TMagicCascader, TMagicCheckboxGroup, TMagicColorPicker, TMagicDatePicker, TMagicForm, TMagicInput, tMagicMessage, tMagicMessageBox, TMagicDialog, TMagicRadioButton, TMagicRadio, TMagicRadioGroup, TMagicSelect, TMagicSwitch, TMagicTimePicker, useZIndex, TMagicTable, TMagicUpload, TMagicPagination, TMagicDrawer, TMagicScrollbar } from '@tmagic/design';
+import { TMagicTooltip, TMagicIcon, TMagicFormItem, TMagicButton, TMagicCheckbox, TMagicCard, TMagicPopover, TMagicInputNumber, TMagicCol, TMagicRow, TMagicSteps, TMagicStep, getDesignConfig, TMagicBadge, TMagicCascader, TMagicCheckboxGroup, TMagicColorPicker, TMagicDatePicker, TMagicForm, TMagicInput, tMagicMessage, tMagicMessageBox, TMagicDialog, TMagicRadioButton, TMagicRadio, TMagicRadioGroup, TMagicSelect, TMagicSwitch, TMagicTimePicker, useZIndex, TMagicTable, TMagicUpload, TMagicPagination, TMagicDrawer, TMagicScrollbar } from '@tmagic/design';
 import { getValueByKeyPath, setValueByKeyPath, isNumber, asyncLoadJs } from '@tmagic/utils';
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
@@ -215,7 +215,7 @@ const sortArray = (data, newIndex, oldIndex, sortKey) => {
       newData[v][sortKey] = i;
     }
   }
-  return newData;
+  return cloneDeep(newData);
 };
 const sortChange = (data, { prop, order }) => {
   if (order === "ascending") {
@@ -225,17 +225,65 @@ const sortChange = (data, { prop, order }) => {
   }
 };
 
+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__ */ defineComponent({
+  __name: "FormLabel",
+  props: {
+    tip: {},
+    type: {},
+    useLabel: { type: Boolean },
+    text: {},
+    labelTitle: {}
+  },
+  setup(__props) {
+    return (_ctx, _cache) => {
+      return __props.tip ? (openBlock(), createElementBlock("span", _hoisted_1$e, [
+        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) ? (openBlock(), createBlock(unref(TMagicTooltip), {
+          key: 0,
+          placement: "top"
+        }, {
+          content: withCtx(() => [
+            createElementVNode("div", { innerHTML: __props.tip }, null, 8, _hoisted_3$6)
+          ]),
+          default: withCtx(() => [
+            createVNode(unref(TMagicIcon), { style: { "margin-left": "5px", "display": "flex" } }, {
+              default: withCtx(() => [
+                createVNode(unref(WarningFilled))
+              ]),
+              _: 1
+              /* STABLE */
+            })
+          ]),
+          _: 1
+          /* STABLE */
+        })) : createCommentVNode("v-if", true)
+      ])) : (openBlock(), 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" }
 };
@@ -482,10 +530,13 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
               class: { "tmagic-form-hidden": `${itemLabelWidth.value}` === "0" || !text.value }
             }), {
               label: withCtx(() => [
-                createElementVNode("span", {
-                  innerHTML: type.value === "checkbox" && !__props.config.useLabel ? "" : text.value,
-                  title: __props.config.labelTitle
-                }, null, 8, _hoisted_2$7)
+                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: withCtx(() => [
                 tooltip.value.text ? (openBlock(), createBlock(unref(TMagicTooltip), {
@@ -495,36 +546,38 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
                   content: withCtx(() => [
                     createElementVNode("div", {
                       innerHTML: tooltip.value.text
-                    }, null, 8, _hoisted_3$5)
+                    }, null, 8, _hoisted_2$7)
                   ]),
                   default: withCtx(() => [
                     (openBlock(), createBlock(resolveDynamicComponent(tagName.value), 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"])) : (openBlock(), createBlock(resolveDynamicComponent(tagName.value), 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 ? (openBlock(), createBlock(unref(TMagicTooltip), {
+            __props.config.tip && type.value === "checkbox" && !__props.config.useLabel ? (openBlock(), createBlock(unref(TMagicTooltip), {
               key: 0,
-              placement: "left"
+              placement: "top"
             }, {
               content: withCtx(() => [
                 createElementVNode("div", {
                   innerHTML: __props.config.tip
-                }, null, 8, _hoisted_4$4)
+                }, null, 8, _hoisted_3$5)
               ]),
               default: withCtx(() => [
                 createVNode(unref(TMagicIcon), { style: { "line-height": "40px", "margin-left": "5px" } }, {
@@ -551,10 +604,13 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
               class: { "tmagic-form-hidden": `${itemLabelWidth.value}` === "0" || !text.value, "show-diff": true }
             }), {
               label: withCtx(() => [
-                createElementVNode("span", {
-                  innerHTML: type.value === "checkbox" ? "" : text.value,
-                  title: __props.config.labelTitle
-                }, null, 8, _hoisted_5$3)
+                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: withCtx(() => [
                 tooltip.value.text ? (openBlock(), createBlock(unref(TMagicTooltip), {
@@ -564,7 +620,7 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
                   content: withCtx(() => [
                     createElementVNode("div", {
                       innerHTML: tooltip.value.text
-                    }, null, 8, _hoisted_6$1)
+                    }, null, 8, _hoisted_4$4)
                   ]),
                   default: withCtx(() => [
                     (openBlock(), createBlock(resolveDynamicComponent(tagName.value), mergeProps(fieldsProps.value, {
@@ -582,14 +638,14 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
               _: 1
               /* STABLE */
             }, 16, ["class"]),
-            __props.config.tip ? (openBlock(), createBlock(unref(TMagicTooltip), {
+            __props.config.tip && type.value === "checkbox" && !__props.config.useLabel ? (openBlock(), createBlock(unref(TMagicTooltip), {
               key: 0,
-              placement: "left"
+              placement: "top"
             }, {
               content: withCtx(() => [
                 createElementVNode("div", {
                   innerHTML: __props.config.tip
-                }, null, 8, _hoisted_7$1)
+                }, null, 8, _hoisted_5$3)
               ]),
               default: withCtx(() => [
                 createVNode(unref(TMagicIcon), { style: { "line-height": "40px", "margin-left": "5px" } }, {
@@ -609,10 +665,13 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
               class: { "tmagic-form-hidden": `${itemLabelWidth.value}` === "0" || !text.value, "show-diff": true }
             }), {
               label: withCtx(() => [
-                createElementVNode("span", {
-                  innerHTML: type.value === "checkbox" ? "" : text.value,
-                  title: __props.config.labelTitle
-                }, null, 8, _hoisted_8$1)
+                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: withCtx(() => [
                 tooltip.value.text ? (openBlock(), createBlock(unref(TMagicTooltip), {
@@ -622,7 +681,7 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
                   content: withCtx(() => [
                     createElementVNode("div", {
                       innerHTML: tooltip.value.text
-                    }, null, 8, _hoisted_9)
+                    }, null, 8, _hoisted_6$1)
                   ]),
                   default: withCtx(() => [
                     (openBlock(), createBlock(resolveDynamicComponent(tagName.value), mergeProps(fieldsProps.value, {
@@ -640,14 +699,14 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
               _: 1
               /* STABLE */
             }, 16, ["style", "class"]),
-            __props.config.tip ? (openBlock(), createBlock(unref(TMagicTooltip), {
+            __props.config.tip && type.value === "checkbox" && !__props.config.useLabel ? (openBlock(), createBlock(unref(TMagicTooltip), {
               key: 1,
-              placement: "left"
+              placement: "top"
             }, {
               content: withCtx(() => [
                 createElementVNode("div", {
                   innerHTML: __props.config.tip
-                }, null, 8, _hoisted_10)
+                }, null, 8, _hoisted_7$1)
               ]),
               default: withCtx(() => [
                 createVNode(unref(TMagicIcon), { style: { "line-height": "40px", "margin-left": "5px" } }, {
@@ -695,7 +754,7 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
           64
           /* STABLE_FRAGMENT */
         )) : createCommentVNode("v-if", true),
-        __props.config.expand && type.value !== "fieldset" ? (openBlock(), createElementBlock("div", _hoisted_11, [
+        __props.config.expand && type.value !== "fieldset" ? (openBlock(), createElementBlock("div", _hoisted_8$1, [
           createVNode(unref(TMagicButton), {
             type: "primary",
             size: "small",
@@ -1408,23 +1467,24 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
             /* STABLE */
           }, 8, ["icon"])) : createCommentVNode("v-if", true),
           createElementVNode("div", _hoisted_5$1, [
-            addable.value ? (openBlock(), createBlock(unref(TMagicButton), {
+            addable.value ? (openBlock(), createBlock(unref(TMagicButton), mergeProps({
               key: 0,
-              type: "primary",
               size: __props.config.enableToggleMode ? "small" : "default",
+              icon: unref(Plus)
+            }, __props.config.addButtonConfig?.props || { type: "primary" }, {
               disabled: __props.disabled,
               onClick: addHandler
-            }, {
-              default: withCtx(() => [..._cache[3] || (_cache[3] = [
+            }), {
+              default: withCtx(() => [
                 createTextVNode(
-                  "新增",
-                  -1
-                  /* CACHED */
+                  toDisplayString(__props.config.addButtonConfig?.text || "新增"),
+                  1
+                  /* TEXT */
                 )
-              ])]),
+              ]),
               _: 1
               /* STABLE */
-            }, 8, ["size", "disabled"])) : createCommentVNode("v-if", true)
+            }, 16, ["size", "icon", "disabled"])) : createCommentVNode("v-if", true)
           ])
         ])
       ]);
@@ -1457,7 +1517,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
     disabled: { type: Boolean }
   },
   emits: ["change", "addDiffCount"],
-  setup(__props, { emit: __emit }) {
+  setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emit = __emit;
     const mForm = inject("mForm");
@@ -1468,6 +1528,12 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
       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 ? (openBlock(), createBlock(unref(TMagicCard), {
         key: 0,
@@ -1482,18 +1548,23 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
               icon: expand.value ? unref(CaretBottom) : unref(CaretRight),
               onClick: _cache[0] || (_cache[0] = ($event) => expand.value = !expand.value)
             }, null, 8, ["icon"]),
-            __props.config && __props.config.extra ? (openBlock(), createElementBlock("span", {
-              key: 0,
-              innerHTML: __props.config.extra,
-              class: "m-form-tip"
-            }, null, 8, _hoisted_2$3)) : createCommentVNode("v-if", true),
             renderSlot(_ctx.$slots, "header", {}, () => [
-              createTextVNode(
+              createElementVNode(
+                "span",
+                {
+                  style: { "cursor": "pointer" },
+                  onClick: _cache[1] || (_cache[1] = ($event) => expand.value = !expand.value)
+                },
                 toDisplayString(filter(__props.config.title)),
                 1
                 /* TEXT */
               )
-            ])
+            ]),
+            __props.config && __props.config.extra ? (openBlock(), createElementBlock("span", {
+              key: 0,
+              innerHTML: __props.config.extra,
+              class: "m-form-tip"
+            }, null, 8, _hoisted_2$3)) : createCommentVNode("v-if", true)
           ])
         ]),
         default: withCtx(() => [
@@ -1516,7 +1587,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
                       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
@@ -1542,7 +1613,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
                   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
@@ -2036,7 +2107,8 @@ const _sfc_main$q = /* @__PURE__ */ defineComponent({
     prop: {},
     disabled: { type: Boolean },
     size: {},
-    lastValues: {}
+    lastValues: {},
+    isCompare: { type: Boolean }
   },
   emits: ["change"],
   setup(__props, { emit: __emit }) {
@@ -2163,7 +2235,8 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
     prop: {},
     disabled: { type: Boolean },
     size: {},
-    lastValues: {}
+    lastValues: {},
+    isCompare: { type: Boolean }
   },
   emits: ["change"],
   setup(__props, { emit: __emit }) {
@@ -2235,7 +2308,8 @@ const _sfc_main$o = /* @__PURE__ */ defineComponent({
     prop: {},
     disabled: { type: Boolean },
     size: {},
-    lastValues: {}
+    lastValues: {},
+    isCompare: { type: Boolean }
   },
   emits: ["change"],
   setup(__props, { emit: __emit }) {
@@ -2308,7 +2382,8 @@ const _sfc_main$n = /* @__PURE__ */ defineComponent({
     prop: {},
     disabled: { type: Boolean },
     size: {},
-    lastValues: {}
+    lastValues: {},
+    isCompare: { type: Boolean }
   },
   emits: ["change"],
   setup(__props, { emit: __emit }) {
@@ -2342,7 +2417,8 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
     prop: {},
     disabled: { type: Boolean },
     size: {},
-    lastValues: {}
+    lastValues: {},
+    isCompare: { type: Boolean }
   },
   emits: ["change"],
   setup(__props, { emit: __emit }) {
@@ -2382,7 +2458,8 @@ const _sfc_main$l = /* @__PURE__ */ defineComponent({
     prop: {},
     disabled: { type: Boolean },
     size: {},
-    lastValues: {}
+    lastValues: {},
+    isCompare: { type: Boolean }
   },
   emits: ["change"],
   setup(__props, { emit: __emit }) {
@@ -2494,7 +2571,8 @@ const _sfc_main$k = /* @__PURE__ */ defineComponent({
     prop: {},
     disabled: { type: Boolean },
     size: {},
-    lastValues: {}
+    lastValues: {},
+    isCompare: { type: Boolean }
   },
   emits: ["change"],
   setup(__props, { emit: __emit }) {
@@ -2548,7 +2626,8 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
     prop: {},
     disabled: { type: Boolean },
     size: {},
-    lastValues: {}
+    lastValues: {},
+    isCompare: { type: Boolean }
   },
   setup(__props) {
     const props = __props;
@@ -2583,7 +2662,8 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
     prop: {},
     disabled: { type: Boolean },
     size: {},
-    lastValues: {}
+    lastValues: {},
+    isCompare: { type: Boolean }
   },
   emits: ["change"],
   setup(__props, { emit: __emit }) {
@@ -2684,7 +2764,8 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
     prop: {},
     disabled: { type: Boolean },
     size: {},
-    lastValues: {}
+    lastValues: {},
+    isCompare: { type: Boolean }
   },
   setup(__props) {
     const props = __props;
@@ -2949,7 +3030,12 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
     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 }) {
@@ -3029,7 +3115,10 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
         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: withCtx(() => [
@@ -3050,7 +3139,8 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
               createVNode(unref(TMagicCol), { span: 12 }, {
                 default: withCtx(() => [
                   renderSlot(_ctx.$slots, "footer", {}, () => [
-                    createVNode(unref(TMagicButton), {
+                    __props.showCancel ? (openBlock(), createBlock(unref(TMagicButton), {
+                      key: 0,
                       onClick: cancel,
                       size: "small"
                     }, {
@@ -3063,9 +3153,9 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
                       ])]),
                       _: 1
                       /* STABLE */
-                    }),
+                    })) : createCommentVNode("v-if", true),
                     hasStep.value && stepActive.value > 1 ? (openBlock(), createBlock(unref(TMagicButton), {
-                      key: 0,
+                      key: 1,
                       type: "info",
                       size: "small",
                       onClick: preStep
@@ -3081,7 +3171,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
                       /* STABLE */
                     })) : createCommentVNode("v-if", true),
                     hasStep.value && stepCount.value > stepActive.value ? (openBlock(), createBlock(unref(TMagicButton), {
-                      key: 1,
+                      key: 2,
                       type: "info",
                       size: "small",
                       onClick: nextStep
@@ -3096,7 +3186,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
                       _: 1
                       /* STABLE */
                     })) : (openBlock(), createBlock(unref(TMagicButton), {
-                      key: 2,
+                      key: 3,
                       type: "primary",
                       size: "small",
                       disabled: __props.disabled,
@@ -3156,7 +3246,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
         ]),
         _: 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"]);
     };
   }
 });
@@ -3180,7 +3270,8 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
     prop: {},
     disabled: { type: Boolean },
     size: {},
-    lastValues: {}
+    lastValues: {},
+    isCompare: { type: Boolean }
   },
   emits: ["change"],
   setup(__props, { emit: __emit }) {
@@ -3291,16 +3382,27 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
     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 = ref();
+    watch(
+      () => props.model[props.name],
+      (v) => {
+        value.value = v;
+      },
+      {
+        immediate: true
+      }
+    );
     useAddField(props.prop);
     const mForm = inject("mForm");
-    const changeHandler = (value) => {
-      emit("change", value);
+    const changeHandler = (value2) => {
+      emit("change", value2);
     };
     const inputHandler = (v) => {
       emit("input", v);
@@ -3309,7 +3411,8 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return __props.model ? (openBlock(), createBlock(unref(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,
@@ -3318,9 +3421,9 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
         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"])) : createCommentVNode("v-if", true);
+      }, null, 8, ["modelValue", "size", "max", "min", "step", "placeholder", "disabled"])) : createCommentVNode("v-if", true);
     };
   }
 });
@@ -3340,12 +3443,26 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
     prop: {},
     disabled: { type: Boolean },
     size: {},
-    lastValues: {}
+    lastValues: {},
+    isCompare: { type: Boolean }
   },
   emits: ["change"],
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
+    const firstValue = ref();
+    const secondValue = ref();
+    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] = [];
@@ -3359,13 +3476,14 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1$4, [
         createVNode(unref(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] = createElementVNode(
+          onChange: minChangeHandler
+        }, null, 8, ["modelValue", "clearable", "size", "disabled"]),
+        _cache[2] || (_cache[2] = createElementVNode(
           "span",
           { class: "split-tag" },
           "-",
@@ -3373,12 +3491,13 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
           /* CACHED */
         )),
         createVNode(unref(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"])
       ]);
     };
   }
@@ -3398,7 +3517,8 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
     prop: {},
     disabled: { type: Boolean },
     size: {},
-    lastValues: {}
+    lastValues: {},
+    isCompare: { type: Boolean }
   },
   emits: ["change"],
   setup(__props, { emit: __emit }) {
@@ -3496,7 +3616,8 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
     prop: {},
     disabled: { type: Boolean },
     size: {},
-    lastValues: {}
+    lastValues: {},
+    isCompare: { type: Boolean }
   },
   emits: ["change"],
   setup(__props, { expose: __expose, emit: __emit }) {
@@ -3947,7 +4068,8 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     prop: {},
     disabled: { type: Boolean },
     size: {},
-    lastValues: {}
+    lastValues: {},
+    isCompare: { type: Boolean }
   },
   emits: ["change"],
   setup(__props, { emit: __emit }) {
@@ -4007,7 +4129,8 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
     prop: {},
     disabled: { type: Boolean },
     size: {},
-    lastValues: {}
+    lastValues: {},
+    isCompare: { type: Boolean }
   },
   emits: ["change", "input"],
   setup(__props, { emit: __emit }) {
@@ -4015,6 +4138,16 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
     const emit = __emit;
     useAddField(props.prop);
     const mForm = inject("mForm");
+    const value = ref("");
+    watch(
+      () => props.model[props.name],
+      (v) => {
+        value.value = v;
+      },
+      {
+        immediate: true
+      }
+    );
     const appendConfig = computed(() => {
       if (typeof props.config.append === "string") {
         return {
@@ -4045,13 +4178,13 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
       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);
@@ -4062,11 +4195,11 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
       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,
@@ -4090,13 +4223,13 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
       if (!arrowUp && !arrowDown) {
         return;
       }
-      const value = props.model[props.name];
+      const value2 = props.model[props.name];
       let num;
       let unit;
-      if (isNumber(value)) {
-        num = +value;
+      if (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;
         });
@@ -4158,16 +4291,17 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1$2, [
         createVNode(unref(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))
         }, createSlots({
           _: 2
           /* DYNAMIC */
@@ -4213,7 +4347,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
             ]),
             key: "1"
           } : void 0
-        ]), 1032, ["model-value", "size", "placeholder", "disabled"]),
+        ]), 1032, ["modelValue", "size", "placeholder", "disabled"]),
         (openBlock(), createBlock(Teleport, { to: "body" }, [
           popoverVisible.value ? (openBlock(), createElementBlock(
             "div",
@@ -4224,7 +4358,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
               ref: popoverEl
             },
             [
-              _cache[4] || (_cache[4] = createElementVNode(
+              _cache[5] || (_cache[5] = createElementVNode(
                 "div",
                 { class: "m-form-validate__warning" },
                 "输入内容前后有空格，是否移除空格？",
@@ -4235,9 +4369,9 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
                 createVNode(unref(TMagicButton), {
                   link: "",
                   size: "small",
-                  onClick: _cache[1] || (_cache[1] = ($event) => popoverVisible.value = false)
+                  onClick: _cache[2] || (_cache[2] = ($event) => popoverVisible.value = false)
                 }, {
-                  default: withCtx(() => [..._cache[2] || (_cache[2] = [
+                  default: withCtx(() => [..._cache[3] || (_cache[3] = [
                     createTextVNode(
                       "保持原样",
                       -1
@@ -4252,7 +4386,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
                   size: "small",
                   onClick: confirmTrimHandler
                 }, {
-                  default: withCtx(() => [..._cache[3] || (_cache[3] = [
+                  default: withCtx(() => [..._cache[4] || (_cache[4] = [
                     createTextVNode(
                       "移除空格",
                       -1
@@ -4263,7 +4397,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
                   /* STABLE */
                 })
               ]),
-              _cache[5] || (_cache[5] = createElementVNode(
+              _cache[6] || (_cache[6] = createElementVNode(
                 "span",
                 {
                   class: "tmagic-form-text-popper-arrow",
@@ -4297,16 +4431,27 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     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 = ref("");
+    watch(
+      () => props.model[props.name],
+      (v) => {
+        value.value = v;
+      },
+      {
+        immediate: true
+      }
+    );
     useAddField(props.prop);
     const mForm = inject("mForm");
-    const changeHandler = (value) => {
-      emit("change", value);
+    const changeHandler = (value2) => {
+      emit("change", value2);
     };
     const inputHandler = (v) => {
       emit("input", v);
@@ -4314,16 +4459,17 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     };
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(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"]);
     };
   }
 });
@@ -4342,7 +4488,8 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     prop: {},
     disabled: { type: Boolean },
     size: {},
-    lastValues: {}
+    lastValues: {},
+    isCompare: { type: Boolean }
   },
   emits: ["change"],
   setup(__props, { emit: __emit }) {
@@ -4380,7 +4527,8 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     prop: {},
     disabled: { type: Boolean },
     size: {},
-    lastValues: {}
+    lastValues: {},
+    isCompare: { type: Boolean }
   },
   emits: ["change"],
   setup(__props, { emit: __emit }) {
@@ -4641,7 +4789,7 @@ const useSortable = (props, emit, tMagicTableRef, modelName) => {
   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;
     }
@@ -4888,6 +5036,17 @@ const useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
     }
     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 = computed(() => {
     if (typeof props.config.selection === "function") {
       return props.config.selection(mForm, { model: props.model[modelName.value] });
@@ -4924,10 +5083,14 @@ const useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
         })
       });
     }
-    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"
       },
@@ -4946,7 +5109,10 @@ const useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
           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: {
@@ -4989,6 +5155,7 @@ const useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
     }
     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,
@@ -5010,10 +5177,33 @@ const useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
             size: props.size,
             onChange: changeHandler,
             onAddDiffCount
-          })
+          }),
+          title: titleTipValue ? () => h(
+            TMagicTooltip,
+            { placement: "top" },
+            {
+              default: () => h(
+                "span",
+                {
+                  style: {
+                    display: "inline-flex",
+                    alignItems: "center",
+                    gap: "5px"
+                  }
+                },
+                [h("span", column.label), h(TMagicIcon, {}, { default: () => h(WarningFilled) })]
+              ),
+              content: () => h("div", {
+                innerHTML: titleTipValue
+              })
+            }
+          ) : void 0
         });
       }
     }
+    if (actionFixed === "right") {
+      columns2.push(actionClumn);
+    }
     return columns2;
   });
   return {
@@ -5228,24 +5418,26 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                       /* STABLE */
                     }, 8, ["disabled", "onClick"])) : createCommentVNode("v-if", true)
                   ]),
-                  unref(addable) ? (openBlock(), createBlock(unref(TMagicButton), {
+                  unref(addable) ? (openBlock(), createBlock(unref(TMagicButton), mergeProps({
                     key: 0,
+                    class: "m-form-table-add-button",
                     size: "small",
-                    type: "primary",
-                    disabled: __props.disabled,
                     plain: "",
+                    icon: unref(Plus)
+                  }, __props.config.addButtonConfig?.props || { type: "primary" }, {
+                    disabled: __props.disabled,
                     onClick: _cache[0] || (_cache[0] = ($event) => unref(newHandler)())
-                  }, {
-                    default: withCtx(() => [..._cache[4] || (_cache[4] = [
+                  }), {
+                    default: withCtx(() => [
                       createTextVNode(
-                        "新增一行",
-                        -1
-                        /* CACHED */
+                        toDisplayString(__props.config.addButtonConfig?.text || "新增一行"),
+                        1
+                        /* TEXT */
                       )
-                    ])]),
+                    ]),
                     _: 1
                     /* STABLE */
-                  }, 8, ["disabled"])) : createCommentVNode("v-if", true)
+                  }, 16, ["icon", "disabled"])) : createCommentVNode("v-if", true)
                 ]),
                 __props.config.pagination ? (openBlock(), createElementBlock("div", _hoisted_4, [
                   createVNode(unref(TMagicPagination), {