@lx-frontend/wrap-element-ui 1.0.2 → 1.0.3-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lx-frontend/wrap-element-ui",
-  "version": "1.0.2",
+  "version": "1.0.3-beta.2",
   "description": "wrap-element-ui",
   "author": "",
   "main": "src/components/index.ts",

package/src/components/EditableTable/bizHooks/useViewSetting.ts

@@ -39,7 +39,7 @@ export function useViewSetting({
   };
 
   const handleViewSettingShow = () => {
-    emit('update:viewSettingDragSortOptions', [...actualColumns.value]);
+    emit('update:viewSettingDragSortOptions', [...actualColumns.value.filter(v => v?.prop !== '$$operation')]);
     tempLeftFixedColumnCount.value = leftFixedColumnCount.value;
     viewSettingVisible.value = true;
     columnsToBeShown.value = [...showingColumns.value];
@@ -95,7 +95,8 @@ export function useViewSetting({
     { immediate: true }
   )
 
-  watch(columnsToBeShown, (val) => {
+  watch(columnsToBeShown, (val, oldVal) => {
+    if (val.length === oldVal?.length) return // 排序调整时不做处理，避免出现死循环
     const _map = new Map<string, IColumnConfig>()
     props.columnConfig.forEach(c => _map.set(c.prop, c))
     // 展示时保留顺序
@@ -103,6 +104,12 @@ export function useViewSetting({
     if (tempLeftFixedColumnCount.value > val.length) tempLeftFixedColumnCount.value = val.length
   }, { immediate: true })
 
+  // 拖拽调整排序时，同时更新勾选数组的顺序，避免出现拖拽排序操作过程后再勾选新列时被还原成拖拽前的顺序的问题
+  watch(viewSettingDragSortOptions, (val, oldVal) => {
+    if (!val.length || val.length !== oldVal?.length) return // 不是排序调整
+    columnsToBeShown.value = val.map(c => c.prop)
+  }, { deep: true })
+
   watch(leftFixedColumnCount, (val) => emit('update:leftFixedColumnCount', val), { immediate: true });
 
   return {