@tmagic/form 1.7.0-beta.5 → 1.7.0

package/dist/style.css

@@ -269,6 +269,9 @@ fieldset.m-fieldset .m-form-tip {
 .m-fields-table .el-form-item {
   margin-bottom: 0;
 }
+.m-fields-table .tmagic-form-table-drag-target {
+  cursor: move;
+}
 
 .m-select {
   width: 100%;

package/dist/tmagic-form.js

@@ -1,5 +1,5 @@
-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 { defineComponent, createElementBlock, openBlock, createElementVNode, createBlock, createCommentVNode, unref, withCtx, createVNode, inject, ref, computed, watchEffect, watch, resolveComponent, normalizeStyle, normalizeClass, mergeProps, resolveDynamicComponent, Fragment, renderList, createTextVNode, toDisplayString, toRaw, 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, Sort, ArrowUp, ArrowDown, FullScreen } from '@element-plus/icons-vue';
 import { cloneDeep, isEqual, isEmpty, debounce } from 'lodash-es';
 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';
@@ -54,12 +54,12 @@ const initValueItem = function(mForm, item, initValue2, value) {
     return value;
   }
   asyncLoadConfig(value, initValue2, item);
-  if (name && !items && typeof initValue2[name] !== "undefined") {
+  if (name && !items && typeof initValue2?.[name] !== "undefined") {
     if (typeof value[name] === "undefined") {
       if (type === "number") {
         value[name] = Number(initValue2[name]);
       } else {
-        value[name] = typeof initValue2[name] === "object" ? cloneDeep(initValue2[name]) : initValue2[name];
+        value[name] = typeof initValue2[name] === "object" ? initValue2[name] : initValue2[name];
       }
     }
     return value;
@@ -171,12 +171,13 @@ const getRules = function(mForm, rules = [], props) {
 };
 const initValue = async (mForm, { initValues, config }) => {
   if (!Array.isArray(config)) throw new Error("config应该为数组");
-  let valuesTmp = createValues(mForm, config, toRaw(initValues), {});
+  const initValuesCopy = cloneDeep(initValues);
+  let valuesTmp = createValues(mForm, config, initValuesCopy, {});
   const [firstForm] = config;
   if (firstForm && typeof firstForm.onInitValue === "function") {
     valuesTmp = await firstForm.onInitValue(mForm, {
       formValue: valuesTmp,
-      initValue: initValues
+      initValue: initValuesCopy
     });
   }
   return valuesTmp || {};
@@ -185,7 +186,7 @@ const datetimeFormatter = (v, defaultValue = "-", format = "YYYY-MM-DD HH:mm:ss"
   if (v) {
     let time;
     if (["x", "timestamp"].includes(format)) {
-      time = dayjs(v).valueOf();
+      time = dayjs(Number.isNaN(Number(v)) ? v : Number(v)).valueOf();
     } else if (typeof v === "string" && v.includes("Z") || v.constructor === Date) {
       dayjs.extend(utc);
       time = dayjs(v).utcOffset(8).format(format);
@@ -4783,7 +4784,7 @@ const useSelection = (props, emit, tMagicTableRef) => {
   };
 };
 
-const useSortable = (props, emit, tMagicTableRef, modelName) => {
+const useSortable = (props, emit, tMagicTableRef, modelName, updateKey) => {
   const mForm = inject("mForm");
   let sortable;
   const rowDrop = () => {
@@ -4800,12 +4801,18 @@ const useSortable = (props, emit, tMagicTableRef, modelName) => {
       preventOnFilter: false,
       // 允许选字
       direction: "vertical",
+      handle: props.config.dropSortHandle ? ".tmagic-form-table-drag-target" : void 0,
       onEnd: ({ newIndex, oldIndex }) => {
         if (typeof newIndex === "undefined") return;
         if (typeof oldIndex === "undefined") return;
         const newData = sortArray(props.model[modelName.value], newIndex, oldIndex, props.sortKey);
         emit("change", newData);
         mForm?.$emit("field-change", newData);
+        nextTick(() => {
+          sortable?.destroy();
+          sortable = void 0;
+          updateKey.value += 1;
+        });
       }
     });
   };
@@ -4884,23 +4891,39 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
           renderSlot(_ctx.$slots, "operateCol", {
             scope: { $index: __props.index, row: __props.row }
           }),
+          __props.config.dropSort && __props.config.dropSortHandle ? (openBlock(), createBlock(unref(TMagicTooltip), {
+            key: 0,
+            content: "拖动排序",
+            placement: "left-start"
+          }, {
+            default: withCtx(() => [
+              createVNode(unref(TMagicButton), {
+                size: "small",
+                link: "",
+                class: normalizeClass({ "tmagic-form-table-drag-target": __props.config.dropSortHandle }),
+                icon: __props.config.dropActionButtonIcon || unref(Sort)
+              }, null, 8, ["class", "icon"])
+            ]),
+            _: 1
+            /* STABLE */
+          })) : createCommentVNode("v-if", true),
           withDirectives(createVNode(unref(TMagicButton), {
             size: "small",
             type: "danger",
             link: "",
             title: "删除",
-            icon: unref(Delete),
+            icon: __props.config.deleteActionButtonIcon || unref(Delete),
             onClick: _cache[0] || (_cache[0] = ($event) => removeHandler(__props.index + 1 + __props.currentPage * __props.pageSize - 1))
           }, null, 8, ["icon"]), [
             [vShow, showDelete(__props.index + 1 + __props.currentPage * __props.pageSize - 1)]
           ]),
           copyable(__props.index + 1 + __props.currentPage * __props.pageSize - 1) ? (openBlock(), createBlock(unref(TMagicButton), {
-            key: 0,
+            key: 1,
             link: "",
             size: "small",
             type: "primary",
             title: "复制",
-            icon: unref(DocumentCopy),
+            icon: __props.config.copyActionButtonIcon || unref(DocumentCopy),
             disabled: __props.disabled,
             onClick: _cache[1] || (_cache[1] = ($event) => copyHandler(__props.index + 1 + __props.currentPage * __props.pageSize - 1))
           }, null, 8, ["icon", "disabled"])) : createCommentVNode("v-if", true)
@@ -5087,11 +5110,11 @@ const useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
     if (typeof props.config.fixed === "string" && ["left", "right"].includes(props.config.fixed)) {
       actionFixed = props.config.fixed;
     }
-    const actionClumn = {
+    const actionColumn = {
       props: {
         label: "操作",
         fixed: actionFixed,
-        width: props.config.operateColWidth || 112,
+        width: props.config.operateColWidth ?? (props.config.dropSortHandle && props.config.dropSort ? 132 : 112),
         align: "center"
       },
       cell: ({ row, $index }) => h(_sfc_main$4, {
@@ -5111,7 +5134,7 @@ const useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
       })
     };
     if (actionFixed !== "right") {
-      columns2.push(actionClumn);
+      columns2.push(actionColumn);
     }
     if (props.sort && props.model[modelName.value] && props.model[modelName.value].length > 1) {
       columns2.push({
@@ -5202,7 +5225,7 @@ const useTableColumns = (props, emit, currentPage, pageSize, modelName) => {
       }
     }
     if (actionFixed === "right") {
-      columns2.push(actionClumn);
+      columns2.push(actionColumn);
     }
     return columns2;
   });
@@ -5251,13 +5274,13 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       modelName
     );
     const { nextZIndex } = useZIndex();
+    const updateKey = ref(1);
     const { addable, newHandler } = useAdd(props, emit);
     const { columns } = useTableColumns(props, emit, currentPage, pageSize, modelName);
-    useSortable(props, emit, tMagicTableRef, modelName);
+    useSortable(props, emit, tMagicTableRef, modelName, updateKey);
     const { isFullscreen, toggleFullscreen } = useFullscreen();
     const { importable, excelHandler, clearHandler } = useImport(props, emit, newHandler);
     const { selectHandle, toggleRowSelection } = useSelection(props, emit, tMagicTableRef);
-    const updateKey = ref(1);
     const data = computed(() => props.config.pagination ? paginationData.value : props.model[modelName.value]);
     const toggleMode = () => {
       const calcLabelWidth = (label) => {
@@ -5313,7 +5336,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                 createVNode(unref(TMagicTooltip), {
                   content: "拖拽可排序",
                   placement: "left-start",
-                  disabled: __props.config.dropSort !== true
+                  disabled: __props.config.dropSort !== true || __props.config.dropSortHandle
                 }, {
                   default: withCtx(() => [
                     __props.model[modelName.value] ? (openBlock(), createBlock(unref(TMagicTable), {

package/dist/tmagic-form.umd.cjs

@@ -2984,12 +2984,12 @@
       return value;
     }
     asyncLoadConfig(value, initValue2, item);
-    if (name && !items && typeof initValue2[name] !== "undefined") {
+    if (name && !items && typeof initValue2?.[name] !== "undefined") {
       if (typeof value[name] === "undefined") {
         if (type === "number") {
           value[name] = Number(initValue2[name]);
         } else {
-          value[name] = typeof initValue2[name] === "object" ? cloneDeep(initValue2[name]) : initValue2[name];
+          value[name] = typeof initValue2[name] === "object" ? initValue2[name] : initValue2[name];
         }
       }
       return value;
@@ -3101,12 +3101,13 @@
   };
   const initValue = async (mForm, { initValues, config }) => {
     if (!Array.isArray(config)) throw new Error("config应该为数组");
-    let valuesTmp = createValues(mForm, config, vue.toRaw(initValues), {});
+    const initValuesCopy = cloneDeep(initValues);
+    let valuesTmp = createValues(mForm, config, initValuesCopy, {});
     const [firstForm] = config;
     if (firstForm && typeof firstForm.onInitValue === "function") {
       valuesTmp = await firstForm.onInitValue(mForm, {
         formValue: valuesTmp,
-        initValue: initValues
+        initValue: initValuesCopy
       });
     }
     return valuesTmp || {};
@@ -3115,7 +3116,7 @@
     if (v) {
       let time;
       if (["x", "timestamp"].includes(format)) {
-        time = dayjs(v).valueOf();
+        time = dayjs(Number.isNaN(Number(v)) ? v : Number(v)).valueOf();
       } else if (typeof v === "string" && v.includes("Z") || v.constructor === Date) {
         dayjs.extend(utc);
         time = dayjs(v).utcOffset(8).format(format);
@@ -7713,7 +7714,7 @@
     };
   };
 
-  const useSortable = (props, emit, tMagicTableRef, modelName) => {
+  const useSortable = (props, emit, tMagicTableRef, modelName, updateKey) => {
     const mForm = vue.inject("mForm");
     let sortable;
     const rowDrop = () => {
@@ -7730,12 +7731,18 @@
         preventOnFilter: false,
         // 允许选字
         direction: "vertical",
+        handle: props.config.dropSortHandle ? ".tmagic-form-table-drag-target" : void 0,
         onEnd: ({ newIndex, oldIndex }) => {
           if (typeof newIndex === "undefined") return;
           if (typeof oldIndex === "undefined") return;
           const newData = sortArray(props.model[modelName.value], newIndex, oldIndex, props.sortKey);
           emit("change", newData);
           mForm?.$emit("field-change", newData);
+          vue.nextTick(() => {
+            sortable?.destroy();
+            sortable = void 0;
+            updateKey.value += 1;
+          });
         }
       });
     };
@@ -7814,23 +7821,39 @@
             vue.renderSlot(_ctx.$slots, "operateCol", {
               scope: { $index: __props.index, row: __props.row }
             }),
+            __props.config.dropSort && __props.config.dropSortHandle ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicTooltip), {
+              key: 0,
+              content: "拖动排序",
+              placement: "left-start"
+            }, {
+              default: vue.withCtx(() => [
+                vue.createVNode(vue.unref(design.TMagicButton), {
+                  size: "small",
+                  link: "",
+                  class: vue.normalizeClass({ "tmagic-form-table-drag-target": __props.config.dropSortHandle }),
+                  icon: __props.config.dropActionButtonIcon || vue.unref(iconsVue.Sort)
+                }, null, 8, ["class", "icon"])
+              ]),
+              _: 1
+              /* STABLE */
+            })) : vue.createCommentVNode("v-if", true),
             vue.withDirectives(vue.createVNode(vue.unref(design.TMagicButton), {
               size: "small",
               type: "danger",
               link: "",
               title: "删除",
-              icon: vue.unref(iconsVue.Delete),
+              icon: __props.config.deleteActionButtonIcon || vue.unref(iconsVue.Delete),
               onClick: _cache[0] || (_cache[0] = ($event) => removeHandler(__props.index + 1 + __props.currentPage * __props.pageSize - 1))
             }, null, 8, ["icon"]), [
               [vue.vShow, showDelete(__props.index + 1 + __props.currentPage * __props.pageSize - 1)]
             ]),
             copyable(__props.index + 1 + __props.currentPage * __props.pageSize - 1) ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicButton), {
-              key: 0,
+              key: 1,
               link: "",
               size: "small",
               type: "primary",
               title: "复制",
-              icon: vue.unref(iconsVue.DocumentCopy),
+              icon: __props.config.copyActionButtonIcon || vue.unref(iconsVue.DocumentCopy),
               disabled: __props.disabled,
               onClick: _cache[1] || (_cache[1] = ($event) => copyHandler(__props.index + 1 + __props.currentPage * __props.pageSize - 1))
             }, null, 8, ["icon", "disabled"])) : vue.createCommentVNode("v-if", true)
@@ -8017,11 +8040,11 @@
       if (typeof props.config.fixed === "string" && ["left", "right"].includes(props.config.fixed)) {
         actionFixed = props.config.fixed;
       }
-      const actionClumn = {
+      const actionColumn = {
         props: {
           label: "操作",
           fixed: actionFixed,
-          width: props.config.operateColWidth || 112,
+          width: props.config.operateColWidth ?? (props.config.dropSortHandle && props.config.dropSort ? 132 : 112),
           align: "center"
         },
         cell: ({ row, $index }) => vue.h(_sfc_main$4, {
@@ -8041,7 +8064,7 @@
         })
       };
       if (actionFixed !== "right") {
-        columns2.push(actionClumn);
+        columns2.push(actionColumn);
       }
       if (props.sort && props.model[modelName.value] && props.model[modelName.value].length > 1) {
         columns2.push({
@@ -8132,7 +8155,7 @@
         }
       }
       if (actionFixed === "right") {
-        columns2.push(actionClumn);
+        columns2.push(actionColumn);
       }
       return columns2;
     });
@@ -8181,13 +8204,13 @@
         modelName
       );
       const { nextZIndex } = design.useZIndex();
+      const updateKey = vue.ref(1);
       const { addable, newHandler } = useAdd(props, emit);
       const { columns } = useTableColumns(props, emit, currentPage, pageSize, modelName);
-      useSortable(props, emit, tMagicTableRef, modelName);
+      useSortable(props, emit, tMagicTableRef, modelName, updateKey);
       const { isFullscreen, toggleFullscreen } = useFullscreen();
       const { importable, excelHandler, clearHandler } = useImport(props, emit, newHandler);
       const { selectHandle, toggleRowSelection } = useSelection(props, emit, tMagicTableRef);
-      const updateKey = vue.ref(1);
       const data = vue.computed(() => props.config.pagination ? paginationData.value : props.model[modelName.value]);
       const toggleMode = () => {
         const calcLabelWidth = (label) => {
@@ -8243,7 +8266,7 @@
                   vue.createVNode(vue.unref(design.TMagicTooltip), {
                     content: "拖拽可排序",
                     placement: "left-start",
-                    disabled: __props.config.dropSort !== true
+                    disabled: __props.config.dropSort !== true || __props.config.dropSortHandle
                   }, {
                     default: vue.withCtx(() => [
                       __props.model[modelName.value] ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicTable), {

package/package.json

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

package/src/table/ActionsColumn.vue

@@ -1,12 +1,21 @@
 <template>
   <slot name="operateCol" :scope="{ $index: index, row: row }"></slot>
+  <TMagicTooltip v-if="config.dropSort && config.dropSortHandle" content="拖动排序" placement="left-start">
+    <TMagicButton
+      size="small"
+      link
+      :class="{ 'tmagic-form-table-drag-target': config.dropSortHandle }"
+      :icon="config.dropActionButtonIcon || Sort"
+    >
+    </TMagicButton>
+  </TMagicTooltip>
   <TMagicButton
     v-show="showDelete(index + 1 + currentPage * pageSize - 1)"
     size="small"
     type="danger"
     link
     title="删除"
-    :icon="Delete"
+    :icon="config.deleteActionButtonIcon || Delete"
     @click="removeHandler(index + 1 + currentPage * pageSize - 1)"
   ></TMagicButton>
 
@@ -16,7 +25,7 @@
     size="small"
     type="primary"
     title="复制"
-    :icon="DocumentCopy"
+    :icon="config.copyActionButtonIcon || DocumentCopy"
     :disabled="disabled"
     @click="copyHandler(index + 1 + currentPage * pageSize - 1)"
   ></TMagicButton>
@@ -24,10 +33,10 @@
 
 <script setup lang="ts">
 import { inject } from 'vue';
-import { Delete, DocumentCopy } from '@element-plus/icons-vue';
+import { Delete, DocumentCopy, Sort } from '@element-plus/icons-vue';
 import { cloneDeep } from 'lodash-es';
 
-import { TMagicButton } from '@tmagic/design';
+import { TMagicButton, TMagicTooltip } from '@tmagic/design';
 
 import type { FormState, TableConfig } from '../schema';
 

package/src/table/Table.vue

@@ -8,7 +8,11 @@
     >
       <div class="m-fields-table" :class="{ 'm-fields-table-item-extra': config.itemExtra }">
         <span v-if="config.extra" style="color: rgba(0, 0, 0, 0.45)" v-html="config.extra"></span>
-        <TMagicTooltip content="拖拽可排序" placement="left-start" :disabled="config.dropSort !== true">
+        <TMagicTooltip
+          content="拖拽可排序"
+          placement="left-start"
+          :disabled="config.dropSort !== true || config.dropSortHandle"
+        >
           <TMagicTable
             v-if="model[modelName]"
             ref="tMagicTable"
@@ -133,16 +137,15 @@ const { pageSize, currentPage, paginationData, handleSizeChange, handleCurrentCh
 );
 
 const { nextZIndex } = useZIndex();
+const updateKey = ref(1);
 
 const { addable, newHandler } = useAdd(props, emit);
 const { columns } = useTableColumns(props, emit, currentPage, pageSize, modelName);
-useSortable(props, emit, tMagicTableRef, modelName);
+useSortable(props, emit, tMagicTableRef, modelName, updateKey);
 const { isFullscreen, toggleFullscreen } = useFullscreen();
 const { importable, excelHandler, clearHandler } = useImport(props, emit, newHandler);
 const { selectHandle, toggleRowSelection } = useSelection(props, emit, tMagicTableRef);
 
-const updateKey = ref(1);
-
 const data = computed(() => (props.config.pagination ? paginationData.value : props.model[modelName.value]));
 
 const toggleMode = () => {

package/src/table/useSortable.ts

@@ -1,4 +1,4 @@
-import { inject, type Ref, type ShallowRef, watchEffect } from 'vue';
+import { inject, nextTick, type Ref, type ShallowRef, watchEffect } from 'vue';
 import Sortable, { type SortableEvent } from 'sortablejs';
 
 import { type TMagicTable } from '@tmagic/design';
@@ -13,6 +13,7 @@ export const useSortable = (
   emit: (event: 'select' | 'change' | 'addDiffCount', ...args: any[]) => void,
   tMagicTableRef: ShallowRef<InstanceType<typeof TMagicTable> | null>,
   modelName: Ref<string | number>,
+  updateKey: Ref<number>,
 ) => {
   const mForm = inject<FormState | undefined>('mForm');
 
@@ -29,6 +30,7 @@ export const useSortable = (
       filter: 'input', // 表单组件选字操作和触发拖拽会冲突，优先保证选字操作
       preventOnFilter: false, // 允许选字
       direction: 'vertical',
+      handle: props.config.dropSortHandle ? '.tmagic-form-table-drag-target' : undefined,
       onEnd: ({ newIndex, oldIndex }: SortableEvent) => {
         if (typeof newIndex === 'undefined') return;
         if (typeof oldIndex === 'undefined') return;
@@ -36,6 +38,12 @@ export const useSortable = (
 
         emit('change', newData);
         mForm?.$emit('field-change', newData);
+
+        nextTick(() => {
+          sortable?.destroy();
+          sortable = undefined;
+          updateKey.value += 1;
+        });
       },
     });
   };

package/src/table/useTableColumns.ts

@@ -107,11 +107,11 @@ export const useTableColumns = (
       actionFixed = props.config.fixed;
     }
 
-    const actionClumn = {
+    const actionColumn = {
       props: {
         label: '操作',
         fixed: actionFixed,
-        width: props.config.operateColWidth || 112,
+        width: props.config.operateColWidth ?? (props.config.dropSortHandle && props.config.dropSort ? 132 : 112),
         align: 'center',
       },
       cell: ({ row, $index }: any) =>
@@ -133,7 +133,7 @@ export const useTableColumns = (
     };
 
     if (actionFixed !== 'right') {
-      columns.push(actionClumn);
+      columns.push(actionColumn);
     }
 
     if (props.sort && props.model[modelName.value] && props.model[modelName.value].length > 1) {
@@ -237,7 +237,7 @@ export const useTableColumns = (
     }
 
     if (actionFixed === 'right') {
-      columns.push(actionClumn);
+      columns.push(actionColumn);
     }
 
     return columns;

package/src/theme/table.scss

@@ -65,4 +65,8 @@
   .el-form-item {
     margin-bottom: 0;
   }
+
+  .tmagic-form-table-drag-target {
+    cursor: move;
+  }
 }

package/src/utils/form.ts

@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-import { toRaw } from 'vue';
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
 import { cloneDeep } from 'lodash-es';
@@ -121,12 +120,12 @@ const initValueItem = function (
   asyncLoadConfig(value, initValue, item as HtmlField);
 
   // 这种情况比较多，提前结束
-  if (name && !items && typeof initValue[name] !== 'undefined') {
+  if (name && !items && typeof initValue?.[name] !== 'undefined') {
     if (typeof value[name] === 'undefined') {
       if (type === 'number') {
         value[name] = Number(initValue[name]);
       } else {
-        value[name] = typeof initValue[name] === 'object' ? cloneDeep(initValue[name]) : initValue[name];
+        value[name] = typeof initValue[name] === 'object' ? initValue[name] : initValue[name];
       }
     }
 
@@ -281,13 +280,15 @@ export const initValue = async (
 ) => {
   if (!Array.isArray(config)) throw new Error('config应该为数组');
 
-  let valuesTmp = createValues(mForm, config, toRaw(initValues), {});
+  const initValuesCopy = cloneDeep(initValues);
+
+  let valuesTmp = createValues(mForm, config, initValuesCopy, {});
 
   const [firstForm] = config as [ContainerCommonConfig];
   if (firstForm && typeof firstForm.onInitValue === 'function') {
     valuesTmp = await firstForm.onInitValue(mForm, {
       formValue: valuesTmp,
-      initValue: initValues,
+      initValue: initValuesCopy,
     });
   }
 
@@ -302,7 +303,7 @@ export const datetimeFormatter = (
   if (v) {
     let time: string | number;
     if (['x', 'timestamp'].includes(format)) {
-      time = dayjs(v).valueOf();
+      time = dayjs(Number.isNaN(Number(v)) ? v : Number(v)).valueOf();
     } else if ((typeof v === 'string' && v.includes('Z')) || v.constructor === Date) {
       dayjs.extend(utc);
       // UTC字符串时间或Date对象格式化为北京时间