@tmagic/form 1.2.8 → 1.2.10

package/dist/style.css

@@ -166,17 +166,15 @@ fieldset.m-fieldset .m-form-tip {
 }
 
 .magic-form-dynamic-tab .el-tabs__header.is-top {
-  display: flex;
-  flex-direction: row-reverse;
   padding-right: 8px;
 }
 .magic-form-dynamic-tab .el-tabs__header.is-top .el-tabs__new-tab {
   margin-right: auto;
-  min-width: 36px;
+  min-width: 50px;
   outline: none;
   border-color: #409eff;
   color: #409eff;
-  width: 36px;
+  width: 10px;
 }
 .magic-form-dynamic-tab .el-tabs__header.is-top .el-tabs__new-tab::before {
   content: "添加";

package/dist/tmagic-form.js

@@ -1,6 +1,6 @@
 import { toRaw, defineComponent, inject, ref, computed, resolveComponent, watchEffect, watch, openBlock, createElementBlock, normalizeStyle, normalizeClass, unref, createBlock, resolveDynamicComponent, Fragment, createVNode, withCtx, createElementVNode, createCommentVNode, renderList, createTextVNode, toDisplayString, withDirectives, vShow, renderSlot, onMounted, toRefs, getCurrentInstance, reactive, onBeforeUnmount, vModelText, provide, onBeforeMount, resolveDirective, createSlots, withModifiers } from 'vue';
 import { WarningFilled, CaretBottom, CaretRight, Delete, CaretTop, Grid, ArrowUp, ArrowDown, FullScreen } from '@element-plus/icons-vue';
-import { cloneDeep, isEqual } from 'lodash-es';
+import { cloneDeep, isEqual, isEmpty } from 'lodash-es';
 import { TMagicFormItem, TMagicTooltip, TMagicIcon, TMagicButton, TMagicCheckbox, TMagicCard, TMagicCol, TMagicRow, TMagicSteps, TMagicStep, TMagicTable, TMagicTableColumn, TMagicUpload, TMagicPagination, tMagicMessage, getConfig as getConfig$1, TMagicTabs, TMagicCascader, TMagicCheckboxGroup, TMagicColorPicker, TMagicDatePicker, TMagicForm, TMagicInput, TMagicDialog, TMagicInputNumber, TMagicRadioGroup, TMagicRadio, TMagicOptionGroup, TMagicOption, TMagicSelect, TMagicSwitch, TMagicTimePicker } from '@tmagic/design';
 import Sortable from 'sortablejs';
 import { asyncLoadJs, sleep, datetimeFormatter, isNumber } from '@tmagic/utils';
@@ -166,7 +166,7 @@ const initValue = async (mForm, { initValues, config }) => {
   return valuesTmp || {};
 };
 
-const _hoisted_1$c = ["innerHTML"];
+const _hoisted_1$b = ["innerHTML"];
 const _hoisted_2$7 = ["innerHTML"];
 const _hoisted_3$7 = ["innerHTML"];
 const _hoisted_4$6 = ["innerHTML"];
@@ -365,7 +365,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
             label: withCtx(() => [
               createElementVNode("span", {
                 innerHTML: unref(type) === "checkbox" ? "" : __props.config.text
-              }, null, 8, _hoisted_1$c)
+              }, null, 8, _hoisted_1$b)
             ]),
             default: withCtx(() => [
               unref(tooltip) ? (openBlock(), createBlock(unref(TMagicTooltip), { key: 0 }, {
@@ -377,26 +377,28 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
                     key: key(__props.config),
                     size: __props.size,
                     model: __props.model,
+                    "last-values": __props.lastValues,
                     config: __props.config,
                     name: unref(name),
                     disabled: unref(disabled),
                     prop: unref(itemProp),
                     onChange: onChangeHandler,
                     onAddDiffCount
-                  }, null, 40, ["size", "model", "config", "name", "disabled", "prop"]))
+                  }, null, 40, ["size", "model", "last-values", "config", "name", "disabled", "prop"]))
                 ]),
                 _: 1
               })) : (openBlock(), createBlock(resolveDynamicComponent(unref(tagName)), {
                 key: key(__props.config),
                 size: __props.size,
                 model: __props.model,
+                "last-values": __props.lastValues,
                 config: __props.config,
                 name: unref(name),
                 disabled: unref(disabled),
                 prop: unref(itemProp),
                 onChange: onChangeHandler,
                 onAddDiffCount
-              }, null, 40, ["size", "model", "config", "name", "disabled", "prop"])),
+              }, null, 40, ["size", "model", "last-values", "config", "name", "disabled", "prop"])),
               unref(extra) ? (openBlock(), createElementBlock("div", {
                 key: 2,
                 innerHTML: unref(extra),
@@ -564,7 +566,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
             return openBlock(), createBlock(_component_Container, {
               key: key(item),
               model: unref(name) || unref(name) === 0 ? __props.model[unref(name)] : __props.model,
-              "last-values": unref(name) || unref(name) === 0 ? __props.lastValues[unref(name)] : __props.lastValues,
+              "last-values": unref(name) || unref(name) === 0 ? __props.lastValues[unref(name)] || {} : __props.lastValues,
               "is-compare": __props.isCompare,
               config: item,
               size: __props.size,
@@ -597,7 +599,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$b = ["innerHTML"];
+const _hoisted_1$a = ["innerHTML"];
 const _hoisted_2$6 = ["innerHTML"];
 const _hoisted_3$6 = { key: 1 };
 const _hoisted_4$5 = ["innerHTML"];
@@ -672,7 +674,7 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createElementVNode("span", {
                   innerHTML: __props.config.legend
-                }, null, 8, _hoisted_1$b),
+                }, null, 8, _hoisted_1$a),
                 __props.config.extra ? (openBlock(), createElementBlock("span", {
                   key: 0,
                   innerHTML: __props.config.extra,
@@ -737,7 +739,7 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$a = { class: "m-fields-group-list-item" };
+const _hoisted_1$9 = { class: "m-fields-group-list-item" };
 const _hoisted_2$5 = /* @__PURE__ */ createTextVNode("\u4E0A\u79FB");
 const _hoisted_3$5 = /* @__PURE__ */ createTextVNode("\u4E0B\u79FB");
 const _hoisted_4$4 = ["innerHTML"];
@@ -805,7 +807,7 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
     };
     const onAddDiffCount = () => emit("addDiffCount");
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1$a, [
+      return openBlock(), createElementBlock("div", _hoisted_1$9, [
         createElementVNode("div", null, [
           createVNode(unref(TMagicIcon), {
             style: { "margin-right": "7px" },
@@ -899,7 +901,7 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$9 = { class: "m-fields-group-list" };
+const _hoisted_1$8 = { class: "m-fields-group-list" };
 const _hoisted_2$4 = ["innerHTML"];
 const _hoisted_3$4 = {
   key: 1,
@@ -994,7 +996,7 @@ const _sfc_main$s = /* @__PURE__ */ defineComponent({
     const onAddDiffCount = () => emit("addDiffCount");
     const getLastValues = (item, index) => item?.[index] || {};
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1$9, [
+      return openBlock(), createElementBlock("div", _hoisted_1$8, [
         __props.config.extra ? (openBlock(), createElementBlock("div", {
           key: 0,
           innerHTML: __props.config.extra,
@@ -1046,7 +1048,7 @@ const _sfc_main$s = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$8 = { class: "clearfix" };
+const _hoisted_1$7 = { class: "clearfix" };
 const _hoisted_2$3 = ["innerHTML"];
 const _hoisted_3$3 = {
   key: 0,
@@ -1086,7 +1088,7 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
         "body-style": { display: expand.value ? "block" : "none" }
       }, {
         header: withCtx(() => [
-          createElementVNode("div", _hoisted_1$8, [
+          createElementVNode("div", _hoisted_1$7, [
             createElementVNode("a", {
               href: "javascript:",
               style: { "width": "100%", "display": "block" },
@@ -1332,7 +1334,7 @@ const _sfc_main$o = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$7 = ["innerHTML"];
+const _hoisted_1$6 = ["innerHTML"];
 const _hoisted_2$2 = { class: "el-form-item__content" };
 const _hoisted_3$2 = ["innerHTML"];
 const _hoisted_4$1 = /* @__PURE__ */ createTextVNode("\u6DFB\u52A0");
@@ -1705,7 +1707,7 @@ const _sfc_main$n = /* @__PURE__ */ defineComponent({
           key: 0,
           style: { "color": "rgba(0, 0, 0, 0.45)" },
           innerHTML: __props.config.extra
-        }, null, 8, _hoisted_1$7)) : createCommentVNode("", true),
+        }, null, 8, _hoisted_1$6)) : createCommentVNode("", true),
         createElementVNode("div", _hoisted_2$2, [
           createVNode(unref(TMagicTooltip), {
             content: "\u62D6\u62FD\u53EF\u6392\u5E8F",
@@ -1961,7 +1963,6 @@ const _sfc_main$n = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$6 = { class: "custom-tabs-label" };
 const __default__$m = defineComponent({
   name: "MFormTabs"
 });
@@ -2070,17 +2071,6 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
         props.config.onChange(mForm, { model: props.model, prop: props.prop, config: props.config });
       }
     };
-    const getValues = (model, tabIndex, tab) => {
-      const tabName = props.config.dynamic ? (model[props?.name] || model)[tabIndex] : tab.name;
-      let propName = props.name;
-      if (tabName) {
-        propName = (model[props?.name] || model)[tab.name];
-      }
-      if (propName) {
-        return model[props.name];
-      }
-      return model;
-    };
     const onAddDiffCount = (tabIndex) => {
       if (!diffCount.value[tabIndex]) {
         diffCount.value[tabIndex] = 1;
@@ -2108,11 +2098,10 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
               display$1(tab.display) && tabItems(tab).length ? (openBlock(), createBlock(resolveDynamicComponent(unref(uiComponent).component), {
                 key: tab[unref(mForm)?.keyProp || "__key"] ?? tabIndex,
                 name: filter(tab.status) || tabIndex.toString(),
-                label: filter(tab.title),
                 lazy: tab.lazy || false
               }, {
                 label: withCtx(() => [
-                  createElementVNode("span", _hoisted_1$6, [
+                  createElementVNode("span", null, [
                     createTextVNode(toDisplayString(filter(tab.title)), 1),
                     createVNode(_component_el_badge, {
                       hidden: !diffCount.value[tabIndex],
@@ -2127,8 +2116,8 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
                       key: item[unref(mForm)?.keyProp || "__key"],
                       config: item,
                       disabled: __props.disabled,
-                      model: getValues(__props.model, tabIndex, tab),
-                      "last-values": getValues(__props.lastValues, tabIndex, tab),
+                      model: __props.config.dynamic ? (__props.name ? __props.model[__props.name] : __props.model)[tabIndex] : tab.name ? (__props.name ? __props.model[__props.name] : __props.model)[tab.name] : __props.name ? __props.model[__props.name] : __props.model,
+                      "last-values": unref(isEmpty)(__props.lastValues) ? {} : __props.config.dynamic ? (__props.name ? __props.lastValues[__props.name] : __props.lastValues)[tabIndex] : tab.name ? (__props.name ? __props.lastValues[__props.name] : __props.lastValues)[tab.name] : __props.name ? __props.lastValues[__props.name] : __props.lastValues,
                       "is-compare": __props.isCompare,
                       prop: __props.config.dynamic ? `${__props.prop}${__props.prop ? "." : ""}${String(tabIndex)}` : __props.prop,
                       size: __props.size,
@@ -2140,7 +2129,7 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
                   }), 128))
                 ]),
                 _: 2
-              }, 1032, ["name", "label", "lazy"])) : createCommentVNode("", true)
+              }, 1032, ["name", "lazy"])) : createCommentVNode("", true)
             ], 64);
           }), 256))
         ]),