cloud-web-corejs 1.0.54-dev.633 → 1.0.54-dev.634

package/src/components/table/index.js

@@ -50,10 +50,10 @@ function collectTopRootIndex(collectColumn, leaf) {
 async function initVxeTable(option) {
   let tableName = option.tableName;
   if (
-    !configUtil.tableConfig.disableTableName &&
-    option.tableNameRequired !== false &&
-    !tableName &&
-    settingConfig.tableStorageDisabled !== true
+    !configUtil.tableConfig.disableTableName
+    && option.tableNameRequired !== false
+    && !tableName
+    && settingConfig.tableStorageDisabled !== true
   ) {
     return false;
   }
@@ -171,8 +171,8 @@ async function initVxeTable(option) {
 function handleToolbar($grid, option) {
   let selfConfig = getSelfConfig();
   if (
-    option.bindToolbar ||
-    (option.bindToolbar !== false && selfConfig.bindToolbar)
+    option.bindToolbar
+    || (option.bindToolbar !== false && selfConfig.bindToolbar)
   ) {
     let loopDo = function (children) {
       if (children && children.length) {
@@ -195,17 +195,17 @@ function handleToolbar($grid, option) {
 function handleCustomAlign(option) {
   let selfConfig = getSelfConfig();
   // let customAlign = option.customAlign || selfConfig.customAlign || "right";
-  let customAlign =
-    selfConfig.customAlign === false
+  let customAlign
+    = selfConfig.customAlign === false
       ? false
       : selfConfig.customAlign || "right";
-  customAlign =
-    option.customAlign === false ? false : option.customAlign || customAlign;
+  customAlign
+    = option.customAlign === false ? false : option.customAlign || customAlign;
 
-  let customColumnWidth =
-    option.customColumnWidth || selfConfig.customColumnWidth || 47;
-  let checkBoxColumnWidth =
-    option.checkBoxColumnWidth || selfConfig.checkBoxColumnWidth || 48;
+  let customColumnWidth
+    = option.customColumnWidth || selfConfig.customColumnWidth || 47;
+  let checkBoxColumnWidth
+    = option.checkBoxColumnWidth || selfConfig.checkBoxColumnWidth || 48;
 
   let checkBoxRequired = selfConfig.checkBoxRequired !== false;
   if (option.checkBoxRequired === false) {
@@ -273,46 +273,53 @@ function columnDrop(t, tableName, tableRef) {
     $table.sortable.destroy();
     $table.sortable = null;
   }
-
-  let draggedColId = null;
-  let relatedColId = null;
+  let dragStartIndex = -1;
+  let dragEndIndex = -1;
   $table.sortable = configUtil.Sortable.create(
     $table.$el.querySelector(
       ".body--wrapper>.vxe-table--header .vxe-header--row"
     ),
     {
       handle: ".vxe-header--column:not(.col--fixed)",
-      onMove: ({ dragged, related }) => {
-        let tableColumn = $table.getTableColumn().tableColumn;
-        draggedColId = dragged.getAttribute("colid");
-        relatedColId = related.getAttribute("colid");
-      },
-      onEnd: ({ item }) => {
-        const { fullColumn, tableColumn, collectColumn } =
-          $table.getTableColumn();
-        const targetThElem = item;
-        const wrapperElem = targetThElem.parentNode;
+      onMove: (a, b, c) => {
+        let { dragged, related } = a;
+        // dragStartIndex = getElementIndex(dragged);
+        // dragEndIndex = getElementIndex(related);
 
-        // 叶子在 fullColumn 中的下标，与 collectColumn 顶层结构的下标不能直接混用
-        const oldColumnIndex = fullColumn.findIndex(
+        let tableColumn = $table.getTableColumn().tableColumn;
+        let draggedColId = dragged.getAttribute("colid");
+        let relatedColId = related.getAttribute("colid");
+        dragStartIndex = tableColumn.findIndex(
           (item) => item.id === draggedColId
         );
-        const newColumnIndex = fullColumn.findIndex(
+        dragEndIndex = tableColumn.findIndex(
           (item) => item.id === relatedColId
         );
-        const oldLeafColumn = fullColumn[oldColumnIndex];
-        const newLeafColumn = fullColumn[newColumnIndex];
+      },
+      onEnd: (dropParam) => {
+        let { item } = dropParam;
+        let oldIndex = dragStartIndex;
+        let newIndex = dragEndIndex;
+        if(newIndex < 0) newIndex = dropParam.newIndex;
+        const { fullColumn, tableColumn, collectColumn }
+          = $table.getTableColumn();
+        const targetThElem = item;
+        const wrapperElem = targetThElem.parentNode;
+        let oldColumn = tableColumn[oldIndex];
+        let oldTitle = oldColumn.title;
 
-        if (newLeafColumn.fixed) {
+        const newColumn = tableColumn[newIndex];
+        let newTitle = newColumn.title;
+        if (newColumn.fixed) {
           // 错误的移动
-          if (newColumnIndex > oldColumnIndex) {
+          if (newIndex > oldIndex) {
             wrapperElem.insertBefore(
               targetThElem,
-              wrapperElem.children[oldColumnIndex]
+              wrapperElem.children[oldIndex]
             );
           } else {
             wrapperElem.insertBefore(
-              wrapperElem.children[oldColumnIndex],
+              wrapperElem.children[oldIndex],
               targetThElem
             );
           }
@@ -322,9 +329,17 @@ function columnDrop(t, tableName, tableRef) {
           status: 'error'
         }) */
         }
-
-        // let oldLeafTitle = oldLeafColumn.title;
-        // let newLeafTitle = newLeafColumn.title;
+        // 叶子在 fullColumn 中的下标，与 collectColumn 顶层结构的下标不能直接混用
+        const oldColumnIndex = fullColumn.findIndex(
+          (item) => item.id === oldColumn.id
+        );
+        const newColumnIndex = fullColumn.findIndex(
+          (item) => item.id === newColumn.id
+        );
+        const oldLeafColumn = fullColumn[oldColumnIndex];
+        const newLeafColumn = fullColumn[newColumnIndex];
+        let oldLeafTitle = oldLeafColumn.title;
+        let newLeafTitle = newLeafColumn.title;
         if (oldColumnIndex === newColumnIndex) {
           return;
         }
@@ -357,25 +372,25 @@ function getSelfConfig() {
 function initColumnDefaulAttrs(columns, opts) {
   let tableConfig = configUtil.tableConfig || {};
   let selfConfig = getSelfConfig();
-  let lockCheckboxWidth =
-    opts.lockCheckboxWidth !== false
+  let lockCheckboxWidth
+    = opts.lockCheckboxWidth !== false
       ? opts.lockCheckboxWidth || selfConfig.lockCheckboxWidth
       : null;
-  let filterType =
-    opts.filterType !== false && !opts.treeNodeUrl
+  let filterType
+    = opts.filterType !== false && !opts.treeNodeUrl
       ? opts.filterType || selfConfig.filterType || "filterContent"
       : null;
-  let sortAll =
-    opts.sortAll === true || (opts.sortAll !== false && !opts.treeNodeUrl);
+  let sortAll
+    = opts.sortAll === true || (opts.sortAll !== false && !opts.treeNodeUrl);
 
   columns.forEach((column) => {
     // 只有最底层的列（没有 children）才设置默认属性
     if (!column.children || column.children.length === 0) {
       // 设置 sortable
       if (
-        sortAll &&
-        column.title &&
-        (column.sortable === null || column.sortable === undefined)
+        sortAll
+        && column.title
+        && (column.sortable === null || column.sortable === undefined)
       ) {
         column.sortable = true;
       }
@@ -383,9 +398,9 @@ function initColumnDefaulAttrs(columns, opts) {
       // 设置过滤器
       if (filterType && column.title && column.field) {
         if (
-          column.filterType === "filterContent" ||
-          ((column.filterType === null || column.filterType === undefined) &&
-            filterType === "filterContent")
+          column.filterType === "filterContent"
+          || ((column.filterType === null || column.filterType === undefined)
+            && filterType === "filterContent")
         ) {
           if (!column.filters) {
             column.filters = [
@@ -400,9 +415,9 @@ function initColumnDefaulAttrs(columns, opts) {
             };
           }
         } else if (
-          column.filterType === "filterInput" ||
-          ((column.filterType === null || column.filterType === undefined) &&
-            filterType === "filterInput")
+          column.filterType === "filterInput"
+          || ((column.filterType === null || column.filterType === undefined)
+            && filterType === "filterInput")
         ) {
           if (!column.filters) {
             column.filters = [
@@ -551,8 +566,8 @@ function initOption(opts) {
     },*/
     columns: columns,
   };
-  let tableDefaultConfig =
-    corejsConfig?.componentConfig?.table?.defaultConfig || {};
+  let tableDefaultConfig
+    = corejsConfig?.componentConfig?.table?.defaultConfig || {};
   defaultOptions = configUtil.extendDeeply(defaultOptions, tableConfig);
   defaultOptions = configUtil.extendDeeply(defaultOptions, customConfig);
   defaultOptions = configUtil.extendDeeply(defaultOptions, tableDefaultConfig);
@@ -602,12 +617,12 @@ function initOption(opts) {
               }
 
               let reqPath = typeof path === "function" ? path() : path;
-              let addUserForTableEnabled =
-                settingConfig.addUserForTableDisabled !== true;
-              let addCreateInfo =
-                opts.addCreateInfo === true || addUserForTableEnabled;
-              let queryCreateInfo =
-                opts.queryCreateInfo === true || addUserForTableEnabled;
+              let addUserForTableEnabled
+                = settingConfig.addUserForTableDisabled !== true;
+              let addCreateInfo
+                = opts.addCreateInfo === true || addUserForTableEnabled;
+              let queryCreateInfo
+                = opts.queryCreateInfo === true || addUserForTableEnabled;
               let reqData = queryParams;
               if (opts.paramHandle) {
                 reqData = opts.paramHandle
@@ -634,10 +649,10 @@ function initOption(opts) {
                           .treeConditions || ["enabled"];
                         let treeFiled = Object.keys(formData).some((key) => {
                           return (
-                            !treeConditions.includes(key) &&
-                            formData[key] !== null &&
-                            formData[key] !== undefined &&
-                            formData[key] !== ""
+                            !treeConditions.includes(key)
+                            && formData[key] !== null
+                            && formData[key] !== undefined
+                            && formData[key] !== ""
                           );
                         });
                         if (treeFiled) {
@@ -646,8 +661,8 @@ function initOption(opts) {
                               let isLazy = $t.treeConfig.lazy;
                               $t.treeConfig.lazy = false;
                               $t.setAllTreeExpand(true).then(() => {
-                                let fullAllDataRowMap =
-                                  $t.$refs.xTable.fullAllDataRowMap;
+                                let fullAllDataRowMap
+                                  = $t.$refs.xTable.fullAllDataRowMap;
                                 let fullData = $t.getTableData().fullData;
                                 fullData.forEach((lineData) => {
                                   if (
@@ -803,8 +818,8 @@ function initOption(opts) {
 
 function getTableJson(tableName, that, success) {
   if (
-    configUtil.tableConfig.disableTableName ||
-    settingConfig.tableStorageDisabled
+    configUtil.tableConfig.disableTableName
+    || settingConfig.tableStorageDisabled
   )
     return false;
   if (!tableName) return;
@@ -825,8 +840,8 @@ function addTableExportJson() {}
 
 function addTableJson(that, $grid, tableName, columns, success) {
   if (
-    configUtil.tableConfig.disableTableName ||
-    settingConfig.tableStorageDisabled
+    configUtil.tableConfig.disableTableName
+    || settingConfig.tableStorageDisabled
   )
     return false;
   if (!tableName) return;
@@ -927,8 +942,8 @@ function initColumn(option, syncColumns) {
       if (!oldColumn) return;
       matchedOld.add(oldColumn);
       if (!oldColumn.params) oldColumn.params = {};
-      const visibleSync =
-        option.visibleSync !== false && oldColumn.visibleSync !== false;
+      const visibleSync
+        = option.visibleSync !== false && oldColumn.visibleSync !== false;
       if (visibleSync) {
         oldColumn.visible = syncColumn.visible;
       }
@@ -952,9 +967,9 @@ function initColumn(option, syncColumns) {
             return syncCol.field === newColumn.field;
           });
           if (
-            syncParentColumn &&
-            syncParentColumn.children &&
-            syncParentColumn.children.length > 0
+            syncParentColumn
+            && syncParentColumn.children
+            && syncParentColumn.children.length > 0
           ) {
             // 递归处理 children
             newColumn.children = initColumn(
@@ -1089,8 +1104,8 @@ function changeSelectCount(checked) {
 
 function getTableData(that, tableRef, type, success) {
   if (
-    configUtil.tableConfig.disableTableName ||
-    settingConfig.tableStorageDisabled
+    configUtil.tableConfig.disableTableName
+    || settingConfig.tableStorageDisabled
   )
     return false;
   let $grid = getGrid(that, tableRef);
@@ -1112,8 +1127,8 @@ function getTableData(that, tableRef, type, success) {
 
 function addTableData(that, tableRef, value, success) {
   if (
-    configUtil.tableConfig.disableTableName ||
-    settingConfig.tableStorageDisabled
+    configUtil.tableConfig.disableTableName
+    || settingConfig.tableStorageDisabled
   )
     return false;
   let $grid = getGrid(that, tableRef);