evui 3.4.49 → 3.4.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evui",
-  "version": "3.4.49",
+  "version": "3.4.51",
   "description": "A EXEM Library project",
   "author": "exem <dev_client@ex-em.com>",
   "license": "MIT",

package/src/components/grid/Grid.vue

@@ -615,6 +615,7 @@ import {
   pagingEvent,
   columnSettingEvent,
   dragEvent,
+  getUpdatedColumns,
 } from './uses';
 
 export default {
@@ -775,24 +776,7 @@ export default {
           ? stores.movedColumns : stores.originColumns;
         return stores.filteredColumns.length ? stores.filteredColumns : columns;
       }),
-      updatedColumns: computed(() => {
-        if (stores.movedColumns?.length) {
-          const orderedColumnsIndexes = stores.orderedColumns?.map(column => column.index);
-          const extraColumns = stores.originColumns?.filter(
-              column => !orderedColumnsIndexes.includes(column.index),
-          );
-          const copyOrderedColumns = stores.orderedColumns;
-          return [...copyOrderedColumns, ...extraColumns];
-        }
-        const { originColumns, filteredColumns } = stores;
-        return originColumns.map((col) => {
-          const changedCol = filteredColumns.find(fcol => fcol.index === col.index) ?? {};
-          return {
-            ...col,
-            ...changedCol,
-          };
-        });
-      }),
+      updatedColumns: computed(() => getUpdatedColumns(stores)),
     });
     const pageInfo = reactive({
       usePage: computed(() => (props.option.page?.use || false)),

package/src/components/grid/GridColumnSetting.vue

@@ -183,15 +183,7 @@ export default {
     };
     const onApplyColumn = () => {
       applyColumnList.value = originColumnList.value
-        .filter((col) => {
-          if (checkColumnGroup.value.includes(col.text)) {
-            if (col?.checked) {
-              col.checked = false;
-            }
-            return true;
-          }
-          return false;
-        });
+        .filter(col => checkColumnGroup.value.includes(col.text));
       const checkedColumns = applyColumnList.value.map(col => col.text);
 
       emit('apply-column', checkedColumns);
@@ -290,7 +282,7 @@ export default {
     watch(() => props.hiddenColumn, (value) => {
       const filterColumns = applyColumnList.value.length
         ? applyColumnList.value.filter(col => col.text !== value)
-        : originColumnList.value.filter(col => (col.text !== value && !col.checked));
+        : originColumnList.value.filter(col => (col.text !== value && col.checked));
 
       applyColumnList.value = filterColumns;
       checkColumnGroup.value = filterColumns.map(col => col.text);

package/src/components/grid/uses.js

@@ -77,6 +77,25 @@ export const commonFunctions = () => {
   };
 };
 
+export const getUpdatedColumns = (stores) => {
+  if (stores.movedColumns?.length) {
+    const orderedColumnsIndexes = stores.orderedColumns?.map(column => column.index);
+    const extraColumns = stores.originColumns?.filter(
+      column => !orderedColumnsIndexes.includes(column.index),
+    );
+    const copyOrderedColumns = stores.orderedColumns;
+    return [...copyOrderedColumns, ...extraColumns];
+  }
+  const { originColumns, filteredColumns } = stores;
+  return originColumns.map((col) => {
+    const changedCol = filteredColumns.find(fcol => fcol.index === col.index) ?? {};
+    return {
+      ...col,
+      ...changedCol,
+    };
+  });
+};
+
 export const scrollEvent = (params) => {
   const {
     scrollInfo,
@@ -348,14 +367,14 @@ export const resizeEvent = (params) => {
       document.removeEventListener('mousemove', handleMouseMove);
       onResize();
 
+      const updatedColumns = getUpdatedColumns(stores);
       emit('resize-column', {
         column: stores.orderedColumns[columnIndex],
-        columns: stores.updatedColumns,
+        columns: updatedColumns,
       });
-
       emit('change-column-info', {
         type: 'resize',
-        columns: stores.updatedColumns,
+        columns: updatedColumns,
       });
     };
 

package/src/components/treeGrid/TreeGrid.vue

@@ -275,6 +275,7 @@ import {
   treeEvent,
   filterEvent,
   pagingEvent,
+  getUpdatedColumns,
 } from './uses';
 import {
   columnSettingEvent,
@@ -393,16 +394,7 @@ export default {
       }))),
       orderedColumns: computed(() => (stores.filteredColumns.length
         ? stores.filteredColumns : stores.originColumns)),
-      updatedColumns: computed(() => {
-        const { originColumns, filteredColumns } = stores;
-        return originColumns.map((col) => {
-          const changedCol = filteredColumns.find(fcol => fcol.index === col.index) ?? {};
-          return {
-            ...col,
-            ...changedCol,
-          };
-        });
-      }),
+      updatedColumns: computed(() => getUpdatedColumns(stores)),
     });
     const pageInfo = reactive({
       usePage: computed(() => (props.option.page?.use || false)),

package/src/components/treeGrid/uses.js

@@ -86,6 +86,17 @@ export const commonFunctions = (params) => {
   };
 };
 
+export const getUpdatedColumns = (stores) => {
+  const { originColumns, filteredColumns } = stores;
+  return originColumns.map((col) => {
+    const changedCol = filteredColumns.find(fcol => fcol.index === col.index) ?? {};
+    return {
+      ...col,
+      ...changedCol,
+    };
+  });
+};
+
 export const scrollEvent = (params) => {
   const {
     scrollInfo,
@@ -342,13 +353,15 @@ export const resizeEvent = (params) => {
       resizeInfo.showResizeLine = false;
       document.removeEventListener('mousemove', handleMouseMove);
       onResize();
+
+      const updatedColumns = getUpdatedColumns(stores);
       emit('resize-column', {
         column: stores.orderedColumns[columnIndex],
-        columns: stores.updatedColumns,
+        columns: updatedColumns,
       });
       emit('change-column-info', {
         type: 'resize',
-        columns: stores.updatedColumns,
+        columns: updatedColumns,
       });
     };