@tmagic/form 1.5.12 → 1.5.14

package/dist/tmagic-form.js

@@ -1,11 +1,11 @@
-import { toRaw, defineComponent, inject, ref, computed, watchEffect, watch, resolveComponent, openBlock, createElementBlock, normalizeStyle, normalizeClass, createBlock, resolveDynamicComponent, Fragment, createVNode, unref, withCtx, createElementVNode, createCommentVNode, renderList, createTextVNode, toDisplayString, withDirectives, vShow, renderSlot, onMounted, Teleport, toRefs, mergeProps, getCurrentInstance, reactive, onBeforeUnmount, vModelText, provide, shallowRef, withModifiers, onBeforeMount, nextTick, resolveDirective, createSlots } from 'vue';
+import { toRaw, defineComponent, inject, ref, computed, watchEffect, watch, resolveComponent, createElementBlock, createCommentVNode, openBlock, normalizeClass, normalizeStyle, createBlock, resolveDynamicComponent, Fragment, createVNode, unref, withCtx, createElementVNode, renderList, createTextVNode, toDisplayString, withDirectives, vShow, renderSlot, onMounted, Teleport, toRefs, mergeProps, getCurrentInstance, reactive, onBeforeUnmount, vModelText, provide, shallowRef, withModifiers, onBeforeMount, nextTick, resolveDirective, createSlots } from 'vue';
 import { WarningFilled, CaretBottom, CaretRight, Delete, DocumentCopy, CaretTop, Position, Grid, ArrowUp, ArrowDown, FullScreen } from '@element-plus/icons-vue';
 import { cloneDeep, isEqual, isEmpty, debounce } from 'lodash-es';
 import { TMagicFormItem, TMagicTooltip, TMagicIcon, TMagicButton, TMagicCheckbox, TMagicPopover, TMagicInputNumber, TMagicCard, TMagicCol, TMagicRow, TMagicSteps, TMagicStep, useZIndex, TMagicTable, TMagicTableColumn, TMagicUpload, TMagicPagination, tMagicMessage, getDesignConfig, TMagicBadge, TMagicCascader, TMagicCheckboxGroup, TMagicColorPicker, TMagicDatePicker, TMagicForm, TMagicInput, tMagicMessageBox, TMagicDialog, TMagicRadioButton, TMagicRadio, TMagicRadioGroup, TMagicSelect, TMagicSwitch, TMagicTimePicker, TMagicDrawer, TMagicScrollbar } from '@tmagic/design';
+import { setValueByKeyPath, asyncLoadJs, getValueByKeyPath, isNumber } from '@tmagic/utils';
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
 import Sortable from 'sortablejs';
-import { asyncLoadJs, getValueByKeyPath, isNumber } from '@tmagic/utils';
 import { createPopper } from '@popperjs/core';
 
 const isTableSelect = (type) => typeof type === "string" && ["table-select", "tableSelect"].includes(type);
@@ -83,7 +83,7 @@ const getDefaultValue = function(mForm, { defaultValue, type, filter, multiple }
     return defaultValue(mForm);
   }
   if (defaultValue === "undefined") {
-    return undefined;
+    return void 0;
   }
   if (typeof defaultValue !== "undefined") {
     return defaultValue;
@@ -342,7 +342,13 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
             formValue: mForm?.values,
             prop: itemProp.value,
             config: props.config,
-            changeRecords: newChangeRecords
+            changeRecords: newChangeRecords,
+            setModel: (key2, value2) => {
+              setValueByKeyPath(key2, value2, props.model);
+              if (props.config.name) {
+                newChangeRecords.push({ propPath: itemProp.value.replace(`${props.config.name}`, key2), value: value2 });
+              }
+            }
           }) ?? value;
         }
         value = trimHandler(trim, value) ?? value;
@@ -742,7 +748,7 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
       if (props.config.items) {
         return props.config.labelWidth || props.labelWidth;
       }
-      return props.config.labelWidth || props.labelWidth || (props.config.text ? undefined : "0");
+      return props.config.labelWidth || props.labelWidth || (props.config.text ? void 0 : "0");
     });
     const valueChangeHandler = (value) => {
       emit("change", value, { modifyKey: "value" });
@@ -918,7 +924,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
     const changeOrder = (offset = 0) => emit("swap-item", props.index, props.index + offset);
     const movable = computed(() => {
       const { movable: movable2 } = props.config;
-      if (movable2 === undefined) return true;
+      if (movable2 === void 0) return true;
       if (typeof movable2 === "function") {
         return movable2(mForm, props.index || 0, props.model, props.groupModel);
       }
@@ -1672,15 +1678,13 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
     const updateKey = ref(1);
     const isFullscreen = ref(false);
     const modelName = computed(() => props.name || props.config.name || "");
-    const data = computed(
-      () => props.config.pagination ? (props.model[modelName.value] || []).filter(
-        (item, index) => index >= pagecontext.value * pagesize.value && index + 1 <= (pagecontext.value + 1) * pagesize.value
-      ) : props.model[modelName.value]
+    const getDataByPage = (data2 = []) => data2.filter(
+      (item, index) => index >= pagecontext.value * pagesize.value && index + 1 <= (pagecontext.value + 1) * pagesize.value
     );
+    const pageinationData = computed(() => getDataByPage(props.model[modelName.value]));
+    const data = computed(() => props.config.pagination ? pageinationData.value : props.model[modelName.value]);
     const lastData = computed(
-      () => props.config.pagination ? (props.lastValues[modelName.value] || []).filter(
-        (item, index) => index >= pagecontext.value * pagesize.value && index + 1 <= (pagecontext.value + 1) * pagesize.value
-      ) : props.lastValues[modelName.value] || []
+      () => props.config.pagination ? getDataByPage(props.lastValues[modelName.value]) : props.lastValues[modelName.value] || []
     );
     const sortChange = ({ prop, order }) => {
       if (order === "ascending") {
@@ -1708,6 +1712,10 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
       }
       sortable = Sortable.create(tBodyEl, {
         draggable: ".tmagic-design-table-row",
+        filter: "input",
+        // 表单组件选字操作和触发拖拽会冲突，优先保证选字操作
+        preventOnFilter: false,
+        // 允许选字
         direction: "vertical",
         onEnd: ({ newIndex, oldIndex }) => {
           if (typeof newIndex === "undefined") return;
@@ -1872,7 +1880,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
       }
       timer = setTimeout(() => {
         swapArray(index, index - 1);
-        timer = undefined;
+        timer = void 0;
       }, 300);
     };
     const topHandler = (index) => {
@@ -1891,7 +1899,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
       }
       timer = setTimeout(() => {
         swapArray(index, index + 1);
-        timer = undefined;
+        timer = void 0;
       }, 300);
     };
     const bottomHandler = (index) => {
@@ -2068,7 +2076,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
                         label: "操作",
                         width: _ctx.config.operateColWidth || 100,
                         align: "center",
-                        fixed: _ctx.config.fixed === false ? undefined : "left"
+                        fixed: _ctx.config.fixed === false ? void 0 : "left"
                       }, {
                         default: withCtx((scope) => [
                           renderSlot(_ctx.$slots, "operateCol", { scope }),
@@ -2727,7 +2735,7 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
       } else {
         return props.config.activeValue;
       }
-      return undefined;
+      return void 0;
     });
     const inactiveValue = computed(() => {
       if (typeof props.config.inactiveValue === "undefined") {
@@ -2737,7 +2745,7 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
       } else {
         return props.config.inactiveValue;
       }
-      return undefined;
+      return void 0;
     });
     const changeHandler = (value) => {
       emit("change", value);
@@ -2939,7 +2947,7 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
     useAddField(props.prop);
     const { names } = props.config;
     const value = ref([]);
-    if (props.model !== undefined) {
+    if (props.model !== void 0) {
       if (names?.length) {
         watch(
           [() => props.model[names[0]], () => props.model[names[1]]],
@@ -2963,7 +2971,7 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
             const format = `${props.config.dateFormat || "YYYY/MM/DD"} ${props.config.timeFormat || "HH:mm:ss"}`;
             if (start !== preStart)
               value.value = start.map(
-                (item) => item ? datetimeFormatter(item, "", format) : undefined
+                (item) => item ? datetimeFormatter(item, "", format) : void 0
               );
           },
           {
@@ -2980,7 +2988,7 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
         if (Array.isArray(v)) {
           props.model[item] = v[index];
         } else {
-          props.model[item] = undefined;
+          props.model[item] = void 0;
         }
       });
     };
@@ -3140,9 +3148,9 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
       fieldMap.value = {};
       fieldLabelMap.value = {};
       fields.forEach((v) => {
-        if (typeof v !== "object" || v.name === undefined) return;
+        if (typeof v !== "object" || v.name === void 0) return;
         let oldVal = props.model?.[v.name] || "";
-        if (!oldVal && v.defaultValue !== undefined) {
+        if (!oldVal && v.defaultValue !== void 0) {
           oldVal = v.defaultValue;
           emit("change", oldVal, { modifyKey: v.name });
         }
@@ -4520,7 +4528,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
         return {
           text: props.config.append,
           type: "button",
-          handler: undefined
+          handler: void 0
         };
       }
       if (props.config.append && typeof props.config.append === "object") {
@@ -4577,7 +4585,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
           unit = $2;
         });
       }
-      if (num === undefined) {
+      if (num === void 0) {
         return;
       }
       const ctrl = navigator.platform.match("Mac") ? $event.metaKey : $event.ctrlKey;
@@ -4629,7 +4637,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     const destroyPopover = () => {
       if (!instanceRef.value) return;
       instanceRef.value.destroy();
-      instanceRef.value = undefined;
+      instanceRef.value = void 0;
     };
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1$1, [
@@ -4670,7 +4678,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
               }, 8, ["size"])) : createCommentVNode("v-if", true)
             ]),
             key: "0"
-          } : undefined
+          } : void 0
         ]), 1032, ["modelValue", "size", "placeholder", "disabled"]),
         (openBlock(), createBlock(Teleport, { to: "body" }, [
           popoverVisible.value ? (openBlock(), createElementBlock(
@@ -4840,7 +4848,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     useAddField(props.prop);
     const { names } = props.config;
     const value = ref([]);
-    if (props.model !== undefined && names?.length) {
+    if (props.model !== void 0 && names?.length) {
       watch(
         [() => props.model[names[0]], () => props.model[names[1]]],
         ([start, end], [preStart, preEnd]) => {
@@ -4864,7 +4872,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
         if (Array.isArray(v)) {
           props.model[item] = v[index];
         } else {
-          props.model[item] = undefined;
+          props.model[item] = void 0;
         }
       });
     };