@tmagic/form 1.7.2 → 1.7.4

package/dist/tmagic-form.js

@@ -231,7 +231,7 @@ const _hoisted_1$e = {
   style: { "display": "inline-flex", "align-items": "center" }
 };
 const _hoisted_2$8 = ["innerHTML", "title"];
-const _hoisted_3$6 = ["innerHTML"];
+const _hoisted_3$7 = ["innerHTML"];
 const _hoisted_4$5 = ["innerHTML", "title"];
 const _sfc_main$B = /* @__PURE__ */ defineComponent({
   __name: "FormLabel",
@@ -254,7 +254,7 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
           placement: "top"
         }, {
           content: withCtx(() => [
-            createElementVNode("div", { innerHTML: __props.tip }, null, 8, _hoisted_3$6)
+            createElementVNode("div", { innerHTML: __props.tip }, null, 8, _hoisted_3$7)
           ]),
           default: withCtx(() => [
             createVNode(unref(TMagicIcon), { style: { "margin-left": "5px", "display": "flex" } }, {
@@ -279,7 +279,7 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
 
 const _hoisted_1$d = ["data-tmagic-id", "data-tmagic-form-item-prop"];
 const _hoisted_2$7 = ["innerHTML"];
-const _hoisted_3$5 = ["innerHTML"];
+const _hoisted_3$6 = ["innerHTML"];
 const _hoisted_4$4 = ["innerHTML"];
 const _hoisted_5$3 = ["innerHTML"];
 const _hoisted_6$1 = ["innerHTML"];
@@ -578,7 +578,7 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
               content: withCtx(() => [
                 createElementVNode("div", {
                   innerHTML: __props.config.tip
-                }, null, 8, _hoisted_3$5)
+                }, null, 8, _hoisted_3$6)
               ]),
               default: withCtx(() => [
                 createVNode(unref(TMagicIcon), { style: { "line-height": "40px", "margin-left": "5px" } }, {
@@ -781,7 +781,7 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
 
 const _hoisted_1$c = ["innerHTML"];
 const _hoisted_2$6 = ["innerHTML"];
-const _hoisted_3$4 = { key: 1 };
+const _hoisted_3$5 = { key: 1 };
 const _hoisted_4$3 = ["innerHTML"];
 const _hoisted_5$2 = ["innerHTML"];
 const _hoisted_6 = {
@@ -882,7 +882,7 @@ const _sfc_main$z = /* @__PURE__ */ defineComponent({
             ]),
             _: 1
             /* STABLE */
-          })) : (openBlock(), createElementBlock("legend", _hoisted_3$4, [
+          })) : (openBlock(), createElementBlock("legend", _hoisted_3$5, [
             createElementVNode("span", {
               innerHTML: __props.config.legend
             }, null, 8, _hoisted_4$3),
@@ -1014,8 +1014,9 @@ const _sfc_main$y = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$b = { style: { "text-align": "right", "margin-top": "20px" } };
-const _hoisted_2$5 = ["innerHTML"];
+const _hoisted_1$b = ["innerHTML"];
+const _hoisted_2$5 = { style: { "text-align": "right", "margin-top": "20px" } };
+const _hoisted_3$4 = ["innerHTML"];
 const _sfc_main$x = /* @__PURE__ */ defineComponent({
   ...{
     name: "MFormGroupListItem"
@@ -1113,11 +1114,7 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
                   _: 1
                   /* STABLE */
                 }),
-                createTextVNode(
-                  toDisplayString(title.value),
-                  1
-                  /* TEXT */
-                )
+                createElementVNode("span", { innerHTML: title.value }, null, 8, _hoisted_1$b)
               ]),
               _: 1
               /* STABLE */
@@ -1246,7 +1243,7 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
                       /* CACHED */
                     ))
                   ]),
-                  createElementVNode("div", _hoisted_1$b, [
+                  createElementVNode("div", _hoisted_2$5, [
                     createVNode(unref(TMagicButton), {
                       size: "small",
                       text: "",
@@ -1287,7 +1284,7 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
               key: 3,
               innerHTML: itemExtra.value,
               class: "m-form-tip"
-            }, null, 8, _hoisted_2$5)) : createCommentVNode("v-if", true)
+            }, null, 8, _hoisted_3$4)) : createCommentVNode("v-if", true)
           ])
         ]),
         default: withCtx(() => [
@@ -1431,11 +1428,11 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
             return openBlock(), createBlock(_sfc_main$x, {
               key: index,
               model: item,
-              lastValues: getLastValues(__props.lastValues[__props.name], index),
+              lastValues: getLastValues(__props.lastValues[__props.name], Number(index)),
               "is-compare": __props.isCompare,
               config: __props.config,
               prop: __props.prop,
-              index,
+              index: Number(index),
               "label-width": __props.labelWidth,
               size: __props.size,
               disabled: __props.disabled,
@@ -1932,7 +1929,7 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
           prop: props.prop,
           config: props.config
         });
-        emit("change", props.model);
+        emit("change", props.model[props.name]);
       } else {
         const newObj = await initValue(mForm, {
           config: props.config.items,
@@ -1966,11 +1963,11 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
           tabClick(mForm, { name: activeTabName.value }, props);
         }
       }
-      emit("change", props.model);
+      emit("change", props.model[props.name]);
       mForm?.$emit("field-change", props.prop, props.model[props.name]);
     };
     const changeHandler = (v, eventData) => {
-      emit("change", props.model, eventData);
+      emit("change", props.name ? props.model[props.name] : props.model, eventData);
     };
     const onAddDiffCount = (tabIndex) => {
       if (!diffCount.value[tabIndex]) {
@@ -2021,8 +2018,8 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
                         /* TEXT */
                       ),
                       createVNode(unref(TMagicBadge), {
-                        hidden: !diffCount.value[tabIndex],
-                        value: diffCount.value[tabIndex],
+                        hidden: !diffCount.value[Number(tabIndex)],
+                        value: diffCount.value[Number(tabIndex)],
                         class: "diff-count-badge"
                       }, null, 8, ["hidden", "value"])
                     ])
@@ -2044,7 +2041,7 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
                           "label-width": tab.labelWidth || __props.labelWidth,
                           "expand-more": __props.expandMore,
                           onChange: changeHandler,
-                          onAddDiffCount: ($event) => onAddDiffCount(tabIndex)
+                          onAddDiffCount: ($event) => onAddDiffCount(Number(tabIndex))
                         }, null, 8, ["config", "disabled", "model", "last-values", "is-compare", "prop", "size", "label-width", "expand-more", "onAddDiffCount"]);
                       }),
                       128
@@ -4296,7 +4293,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => value.value = $event),
           ref_key: "input",
           ref: input,
-          clearable: "",
+          clearable: __props.config.clearable ?? true,
           size: __props.size,
           placeholder: __props.config.placeholder,
           disabled: __props.disabled,
@@ -4348,7 +4345,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
             ]),
             key: "1"
           } : void 0
-        ]), 1032, ["modelValue", "size", "placeholder", "disabled"]),
+        ]), 1032, ["modelValue", "clearable", "size", "placeholder", "disabled"]),
         (openBlock(), createBlock(Teleport, { to: "body" }, [
           popoverVisible.value ? (openBlock(), createElementBlock(
             "div",
@@ -4847,7 +4844,16 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
       emit("change", props.model[props.name].toSpliced(index, 1));
     };
     const copyHandler = (index) => {
-      const inputs = cloneDeep(props.model[props.name][index]);
+      let inputs = cloneDeep(props.model[props.name][index]);
+      if (typeof props.config.copyHandler === "function") {
+        const modelName = props.name || props.config.name || "";
+        inputs = props.config.copyHandler(mForm, {
+          model: props.model[modelName],
+          prop: props.prop,
+          formValue: mForm?.values,
+          inputs
+        });
+      }
       const { length } = props.model[props.name];
       if (props.sortKey && length) {
         inputs[props.sortKey] = props.model[props.name][length - 1][props.sortKey] - 1;
@@ -5106,6 +5112,16 @@ const useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
         })
       });
     }
+    if (selection.value) {
+      columns2.push({
+        props: {
+          align: "center",
+          headerAlign: "center",
+          type: "selection",
+          width: 45
+        }
+      });
+    }
     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;
@@ -5157,16 +5173,6 @@ const useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
         })
       });
     }
-    if (selection.value) {
-      columns2.push({
-        props: {
-          align: "center",
-          headerAlign: "center",
-          type: "selection",
-          width: 45
-        }
-      });
-    }
     if (props.showIndex && props.config.showIndex) {
       columns2.push({
         props: {

package/dist/tmagic-form.umd.cjs

@@ -3161,7 +3161,7 @@
     style: { "display": "inline-flex", "align-items": "center" }
   };
   const _hoisted_2$8 = ["innerHTML", "title"];
-  const _hoisted_3$6 = ["innerHTML"];
+  const _hoisted_3$7 = ["innerHTML"];
   const _hoisted_4$5 = ["innerHTML", "title"];
   const _sfc_main$B = /* @__PURE__ */ vue.defineComponent({
     __name: "FormLabel",
@@ -3184,7 +3184,7 @@
             placement: "top"
           }, {
             content: vue.withCtx(() => [
-              vue.createElementVNode("div", { innerHTML: __props.tip }, null, 8, _hoisted_3$6)
+              vue.createElementVNode("div", { innerHTML: __props.tip }, null, 8, _hoisted_3$7)
             ]),
             default: vue.withCtx(() => [
               vue.createVNode(vue.unref(design.TMagicIcon), { style: { "margin-left": "5px", "display": "flex" } }, {
@@ -3209,7 +3209,7 @@
 
   const _hoisted_1$d = ["data-tmagic-id", "data-tmagic-form-item-prop"];
   const _hoisted_2$7 = ["innerHTML"];
-  const _hoisted_3$5 = ["innerHTML"];
+  const _hoisted_3$6 = ["innerHTML"];
   const _hoisted_4$4 = ["innerHTML"];
   const _hoisted_5$3 = ["innerHTML"];
   const _hoisted_6$1 = ["innerHTML"];
@@ -3508,7 +3508,7 @@
                 content: vue.withCtx(() => [
                   vue.createElementVNode("div", {
                     innerHTML: __props.config.tip
-                  }, null, 8, _hoisted_3$5)
+                  }, null, 8, _hoisted_3$6)
                 ]),
                 default: vue.withCtx(() => [
                   vue.createVNode(vue.unref(design.TMagicIcon), { style: { "line-height": "40px", "margin-left": "5px" } }, {
@@ -3711,7 +3711,7 @@
 
   const _hoisted_1$c = ["innerHTML"];
   const _hoisted_2$6 = ["innerHTML"];
-  const _hoisted_3$4 = { key: 1 };
+  const _hoisted_3$5 = { key: 1 };
   const _hoisted_4$3 = ["innerHTML"];
   const _hoisted_5$2 = ["innerHTML"];
   const _hoisted_6 = {
@@ -3812,7 +3812,7 @@
               ]),
               _: 1
               /* STABLE */
-            })) : (vue.openBlock(), vue.createElementBlock("legend", _hoisted_3$4, [
+            })) : (vue.openBlock(), vue.createElementBlock("legend", _hoisted_3$5, [
               vue.createElementVNode("span", {
                 innerHTML: __props.config.legend
               }, null, 8, _hoisted_4$3),
@@ -3944,8 +3944,9 @@
     }
   });
 
-  const _hoisted_1$b = { style: { "text-align": "right", "margin-top": "20px" } };
-  const _hoisted_2$5 = ["innerHTML"];
+  const _hoisted_1$b = ["innerHTML"];
+  const _hoisted_2$5 = { style: { "text-align": "right", "margin-top": "20px" } };
+  const _hoisted_3$4 = ["innerHTML"];
   const _sfc_main$x = /* @__PURE__ */ vue.defineComponent({
     ...{
       name: "MFormGroupListItem"
@@ -4043,11 +4044,7 @@
                     _: 1
                     /* STABLE */
                   }),
-                  vue.createTextVNode(
-                    vue.toDisplayString(title.value),
-                    1
-                    /* TEXT */
-                  )
+                  vue.createElementVNode("span", { innerHTML: title.value }, null, 8, _hoisted_1$b)
                 ]),
                 _: 1
                 /* STABLE */
@@ -4176,7 +4173,7 @@
                         /* CACHED */
                       ))
                     ]),
-                    vue.createElementVNode("div", _hoisted_1$b, [
+                    vue.createElementVNode("div", _hoisted_2$5, [
                       vue.createVNode(vue.unref(design.TMagicButton), {
                         size: "small",
                         text: "",
@@ -4217,7 +4214,7 @@
                 key: 3,
                 innerHTML: itemExtra.value,
                 class: "m-form-tip"
-              }, null, 8, _hoisted_2$5)) : vue.createCommentVNode("v-if", true)
+              }, null, 8, _hoisted_3$4)) : vue.createCommentVNode("v-if", true)
             ])
           ]),
           default: vue.withCtx(() => [
@@ -4361,11 +4358,11 @@
               return vue.openBlock(), vue.createBlock(_sfc_main$x, {
                 key: index,
                 model: item,
-                lastValues: getLastValues(__props.lastValues[__props.name], index),
+                lastValues: getLastValues(__props.lastValues[__props.name], Number(index)),
                 "is-compare": __props.isCompare,
                 config: __props.config,
                 prop: __props.prop,
-                index,
+                index: Number(index),
                 "label-width": __props.labelWidth,
                 size: __props.size,
                 disabled: __props.disabled,
@@ -4862,7 +4859,7 @@
             prop: props.prop,
             config: props.config
           });
-          emit("change", props.model);
+          emit("change", props.model[props.name]);
         } else {
           const newObj = await initValue(mForm, {
             config: props.config.items,
@@ -4896,11 +4893,11 @@
             tabClick(mForm, { name: activeTabName.value }, props);
           }
         }
-        emit("change", props.model);
+        emit("change", props.model[props.name]);
         mForm?.$emit("field-change", props.prop, props.model[props.name]);
       };
       const changeHandler = (v, eventData) => {
-        emit("change", props.model, eventData);
+        emit("change", props.name ? props.model[props.name] : props.model, eventData);
       };
       const onAddDiffCount = (tabIndex) => {
         if (!diffCount.value[tabIndex]) {
@@ -4951,8 +4948,8 @@
                           /* TEXT */
                         ),
                         vue.createVNode(vue.unref(design.TMagicBadge), {
-                          hidden: !diffCount.value[tabIndex],
-                          value: diffCount.value[tabIndex],
+                          hidden: !diffCount.value[Number(tabIndex)],
+                          value: diffCount.value[Number(tabIndex)],
                           class: "diff-count-badge"
                         }, null, 8, ["hidden", "value"])
                       ])
@@ -4974,7 +4971,7 @@
                             "label-width": tab.labelWidth || __props.labelWidth,
                             "expand-more": __props.expandMore,
                             onChange: changeHandler,
-                            onAddDiffCount: ($event) => onAddDiffCount(tabIndex)
+                            onAddDiffCount: ($event) => onAddDiffCount(Number(tabIndex))
                           }, null, 8, ["config", "disabled", "model", "last-values", "is-compare", "prop", "size", "label-width", "expand-more", "onAddDiffCount"]);
                         }),
                         128
@@ -7226,7 +7223,7 @@
             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => value.value = $event),
             ref_key: "input",
             ref: input,
-            clearable: "",
+            clearable: __props.config.clearable ?? true,
             size: __props.size,
             placeholder: __props.config.placeholder,
             disabled: __props.disabled,
@@ -7278,7 +7275,7 @@
               ]),
               key: "1"
             } : void 0
-          ]), 1032, ["modelValue", "size", "placeholder", "disabled"]),
+          ]), 1032, ["modelValue", "clearable", "size", "placeholder", "disabled"]),
           (vue.openBlock(), vue.createBlock(vue.Teleport, { to: "body" }, [
             popoverVisible.value ? (vue.openBlock(), vue.createElementBlock(
               "div",
@@ -7777,7 +7774,16 @@
         emit("change", props.model[props.name].toSpliced(index, 1));
       };
       const copyHandler = (index) => {
-        const inputs = cloneDeep(props.model[props.name][index]);
+        let inputs = cloneDeep(props.model[props.name][index]);
+        if (typeof props.config.copyHandler === "function") {
+          const modelName = props.name || props.config.name || "";
+          inputs = props.config.copyHandler(mForm, {
+            model: props.model[modelName],
+            prop: props.prop,
+            formValue: mForm?.values,
+            inputs
+          });
+        }
         const { length } = props.model[props.name];
         if (props.sortKey && length) {
           inputs[props.sortKey] = props.model[props.name][length - 1][props.sortKey] - 1;
@@ -8036,6 +8042,16 @@
           })
         });
       }
+      if (selection.value) {
+        columns2.push({
+          props: {
+            align: "center",
+            headerAlign: "center",
+            type: "selection",
+            width: 45
+          }
+        });
+      }
       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;
@@ -8087,16 +8103,6 @@
           })
         });
       }
-      if (selection.value) {
-        columns2.push({
-          props: {
-            align: "center",
-            headerAlign: "center",
-            type: "selection",
-            width: 45
-          }
-        });
-      }
       if (props.showIndex && props.config.showIndex) {
         columns2.push({
           props: {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.2",
+  "version": "1.7.4",
   "name": "@tmagic/form",
   "type": "module",
   "sideEffects": [
@@ -51,9 +51,9 @@
   "peerDependencies": {
     "vue": "^3.5.24",
     "typescript": "^5.9.3",
-    "@tmagic/form-schema": "1.7.2",
-    "@tmagic/utils": "1.7.2",
-    "@tmagic/design": "1.7.2"
+    "@tmagic/design": "1.7.4",
+    "@tmagic/form-schema": "1.7.4",
+    "@tmagic/utils": "1.7.4"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/containers/GroupList.vue

@@ -10,11 +10,11 @@
       v-for="(item, index) in model[name]"
       :key="index"
       :model="item"
-      :lastValues="getLastValues(lastValues[name], index)"
+      :lastValues="getLastValues(lastValues[name], Number(index))"
       :is-compare="isCompare"
       :config="config"
       :prop="prop"
-      :index="index"
+      :index="Number(index)"
       :label-width="labelWidth"
       :size="size"
       :disabled="disabled"

package/src/containers/GroupListItem.vue

@@ -3,7 +3,7 @@
     <template #header>
       <div>
         <TMagicButton link :disabled="disabled" @click="expandHandler">
-          <TMagicIcon><CaretBottom v-if="expand" /><CaretRight v-else /></TMagicIcon>{{ title }}
+          <TMagicIcon><CaretBottom v-if="expand" /><CaretRight v-else /></TMagicIcon><span v-html="title"></span>
         </TMagicButton>
 
         <TMagicButton

package/src/containers/Tabs.vue

@@ -26,8 +26,8 @@
         <span>
           {{ filter(tab.title)
           }}<TMagicBadge
-            :hidden="!diffCount[tabIndex]"
-            :value="diffCount[tabIndex]"
+            :hidden="!diffCount[Number(tabIndex)]"
+            :value="diffCount[Number(tabIndex)]"
             class="diff-count-badge"
           ></TMagicBadge>
         </span>
@@ -69,7 +69,7 @@
         :label-width="tab.labelWidth || labelWidth"
         :expand-more="expandMore"
         @change="changeHandler"
-        @addDiffCount="onAddDiffCount(tabIndex)"
+        @addDiffCount="onAddDiffCount(Number(tabIndex))"
       ></Container>
     </component>
   </component>
@@ -195,7 +195,7 @@ const onTabAdd = async () => {
       prop: props.prop,
       config: props.config,
     });
-    emit('change', props.model);
+    emit('change', props.model[props.name]);
   } else {
     const newObj = await initValue(mForm, {
       config: props.config.items,
@@ -237,12 +237,12 @@ const onTabRemove = (tabName: string) => {
       tabClick(mForm, { name: activeTabName.value }, props);
     }
   }
-  emit('change', props.model);
+  emit('change', props.model[props.name]);
   mForm?.$emit('field-change', props.prop, props.model[props.name]);
 };
 
 const changeHandler = (v: any, eventData: ContainerChangeEventData) => {
-  emit('change', props.model, eventData);
+  emit('change', props.name ? props.model[props.name] : props.model, eventData);
 };
 
 // 在tabs组件中收集事件触发次数，即该tab下的差异数

package/src/fields/Text.vue

@@ -3,7 +3,7 @@
     <TMagicInput
       v-model="value"
       ref="input"
-      clearable
+      :clearable="config.clearable ?? true"
       :size="size"
       :placeholder="config.placeholder"
       :disabled="disabled"

package/src/table/ActionsColumn.vue

@@ -63,7 +63,18 @@ const removeHandler = (index: number) => {
 };
 
 const copyHandler = (index: number) => {
-  const inputs = cloneDeep(props.model[props.name][index]);
+  let inputs = cloneDeep(props.model[props.name][index]);
+
+  if (typeof props.config.copyHandler === 'function') {
+    const modelName = props.name || props.config.name || '';
+    inputs = props.config.copyHandler(mForm, {
+      model: props.model[modelName],
+      prop: props.prop,
+      formValue: mForm?.values,
+      inputs,
+    });
+  }
+
   const { length } = props.model[props.name];
   if (props.sortKey && length) {
     inputs[props.sortKey] = props.model[props.name][length - 1][props.sortKey] - 1;

package/src/table/useTableColumns.ts

@@ -101,6 +101,17 @@ export const useTableColumns = (
       });
     }
 
+    if (selection.value) {
+      columns.push({
+        props: {
+          align: 'center',
+          headerAlign: 'center',
+          type: 'selection',
+          width: 45,
+        },
+      });
+    }
+
     let actionFixed: 'left' | 'right' | undefined = props.config.fixed === false ? undefined : 'left';
 
     if (typeof props.config.fixed === 'string' && ['left', 'right'].includes(props.config.fixed)) {
@@ -159,17 +170,6 @@ export const useTableColumns = (
       });
     }
 
-    if (selection.value) {
-      columns.push({
-        props: {
-          align: 'center',
-          headerAlign: 'center',
-          type: 'selection',
-          width: 45,
-        },
-      });
-    }
-
     if (props.showIndex && props.config.showIndex) {
       columns.push({
         props: {