@juzhenfe/page-model 3.14.2 → 3.14.3

package/dist/components/table/utils/use-column-drag.d.ts

@@ -1,8 +1,7 @@
 export declare const useColumnDrag: () => {
     initTableDrag: (opt: {
         element: HTMLDivElement;
-        getEls: () => any[];
-        cb: (newList: any[]) => void;
+        cb: (oldIndex: number, newIndex: number) => void;
     }) => void;
     destroyTableDrag(): void;
 };

package/dist/index.es.js

@@ -8561,12 +8561,7 @@ const useColumnDrag = () => {
         if (oldDraggableIndex === newDraggableIndex) {
           return;
         }
-        const _list = jsonClone(opt.getEls());
-        const [spliceItem] = _list.splice(oldDraggableIndex, 1);
-        let insertIndex;
-        insertIndex = newDraggableIndex;
-        _list.splice(insertIndex, 0, spliceItem);
-        opt.cb(_list);
+        opt.cb(oldDraggableIndex, newDraggableIndex);
       }
     });
   };
@@ -8731,10 +8726,18 @@ const _sfc_main$k = defineComponent({
       if (tableManager.table.dragable) {
         initTableDrag({
           element: tableRef.value.$el.querySelector(".el-table__header thead tr"),
-          getEls() {
-            return renderedTableEls.value;
-          },
-          cb(newList) {
+          cb(oldIndex, newIndex) {
+            const oldItem = renderedTableEls.value[oldIndex];
+            const newItem = renderedTableEls.value[newIndex];
+            const newList = jsonClone(filteredUserEls.value);
+            const realOldItemIndex = newList.findIndex(
+              (a) => a.prop === oldItem.prop && a.label === oldItem.label
+            );
+            const realNewIemndex = newList.findIndex(
+              (a) => a.prop === newItem.prop && a.label === newItem.label
+            );
+            const [spliceItem] = newList.splice(realOldItemIndex, 1);
+            newList.splice(realNewIemndex, 0, spliceItem);
             onSaveColumns(newList);
           }
         });
@@ -8747,20 +8750,7 @@ const _sfc_main$k = defineComponent({
       if (newWidth === oldWidth) {
         return false;
       }
-      const originTableEls = table.value.els;
-      const userConfig = getUserConfig(originTableEls) || {};
-      const filteredUserEls2 = tableManager.saveContent.map((item) => {
-        const fItem = originTableEls[item.index];
-        fItem.userConfigShow = !!item.show;
-        fItem.showSummary = item.sum;
-        fItem.userLabel = item.ul;
-        fItem.width = item.w || void 0;
-        fItem.minWidth = item.mw || void 0;
-        fItem.fixed = item.fix || void 0;
-        fItem.showRowNumbers = userConfig.showRowNumbers;
-        return fItem;
-      });
-      const newList = jsonClone(filteredUserEls2);
+      const newList = jsonClone(filteredUserEls.value);
       const _column = newList.find(
         (item) => item.label === column.label && item.prop === column.property
       );
@@ -12937,7 +12927,7 @@ const defineEditableTable = function(config) {
 };
 var iconfont = "";
 const name = "@juzhenfe/page-model";
-const version = "3.14.2";
+const version = "3.14.3";
 const types = "dist/main.d.ts";
 const main = "dist/index.umd.js";
 const keywords = [