@lx-frontend/wrap-element-ui 1.0.0-beta.7 → 1.0.1-beta.2

package/src/components/EditableTable/useColumnHeaderOperation.ts

@@ -1,15 +1,13 @@
-import { computed, ref, watch, nextTick, Ref } from "vue"
-import { IColumnConfig, IEmits, IProps } from './types';
+import { computed, ref, watch, nextTick } from "vue"
+import { IColumnConfig, IProps } from './types';
 
 interface IUseColumnHeaderOperationParams {
   props: IProps
   tableDomRef: any
   sortFilterPopoverRef: any
-  emit: IEmits;
-  showingColumns: Ref<string[]>
 }
 
-export default function useColumnHeaderOperation({ props, tableDomRef, sortFilterPopoverRef, emit, showingColumns }: IUseColumnHeaderOperationParams) {
+export default function useColumnHeaderOperation({props, tableDomRef, sortFilterPopoverRef}: IUseColumnHeaderOperationParams) {
 
   // column如果有sortable属性，点击列头部，会直接触发排序，为了在弹窗点确定时再触发排序，需要阻止点击立即排序
   // 所以，初始渲染时，将sortable设置为false，在触发排序逻辑时再设置成真实的值，再利用el-table自身的排序逻辑触发排序
@@ -24,8 +22,8 @@ export default function useColumnHeaderOperation({ props, tableDomRef, sortFilte
   const tempSortingColumn = ref<IColumnConfig | null>(null);
 
   // 生效中的过滤配置 和 临时过滤配置
-  const filteredValue = ref<Record<string, string | number | number[] | string[]>>({});
-  const tempFilteredValue = ref<Record<string, string | number | number[] | string[]>>({});
+  const filteredValue = ref<Record<string, string[]>>({});
+  const tempFilteredValue = ref<Record<string, string[]>>({});
 
   // 生效中的统计配置 和 临时统计配置
   const tempSummaryList = ref<string[]>([]);
@@ -35,17 +33,14 @@ export default function useColumnHeaderOperation({ props, tableDomRef, sortFilte
   const searchValue = ref<Record<string, string>>({});
   const tempSearchValue = ref<Record<string, string>>({});
 
-  const isColumnFiltering = computed(() => Object.keys(tempFilteredValue.value).some(k => {
-    if (!Array.isArray(tempFilteredValue.value[k])) return tempFilteredValue.value[k]
-    return tempFilteredValue.value[k]?.length;
-  }));
+  const isColumnFiltering = computed(() => Object.keys(tempFilteredValue.value).some(k => tempFilteredValue.value[k]?.length));
 
-  const showColumnHeadSortIcon = (column: IColumnConfig) => column.filters || column.isColumnSortable || column.search || column.summary;
+  const showColumnHeadSortIcon = (column: IColumnConfig) => column.filters || column.isColumnSortable || column.isColumnSearchAble || column.summary;
 
   watch(
     () => props.columnConfig,
     (val) => {
-      filteredValue.value = val.reduce((prev, curr) => ({ ...prev, [curr.prop]: [] }), {});
+      filteredValue.value = val.reduce((prev, curr) => ({...prev, [curr.prop]: []}), {});
       tempFilteredValue.value = { ...filteredValue.value };
     },
     { immediate: true }
@@ -68,24 +63,14 @@ export default function useColumnHeaderOperation({ props, tableDomRef, sortFilte
         sums[index] = summaryMethod(values);
       }
     })
-
+  
     return sums
   }
 
   const isColumnHeadActive = (column: IColumnConfig) => {
-    return (
-      column.filters && (Array.isArray(column.filters)
-        ? (filteredValue.value[column.prop] as any[]).length
-        : column.filters.type === 'radio'
-          ? filteredValue.value[column.prop]
-          : (filteredValue.value[column.prop] as any[]).length)
-      ) ||
-      (
-        column.search
-        ? Array.isArray(column.search) && column.search?.some(v => searchValue.value[v.prop])
-        : searchValue.value[column.prop]
-      ) ||
+    return filteredValue.value[column.prop]?.length ||
       sortingColumn.value?.prop === column.prop ||
+      searchValue.value[column.prop] || 
       summaryList.value.includes(column.prop);
   }
 
@@ -97,7 +82,7 @@ export default function useColumnHeaderOperation({ props, tableDomRef, sortFilte
     tempSortType.value = sortType.value;
     tempSortingColumn.value = sortingColumn.value ? { ...sortingColumn.value } as IColumnConfig : null;
     // 临时合计项设置成实际的合计项
-    tempSummaryList.value = [...summaryList.value];
+    tempSummaryList.value = [ ...summaryList.value ];
   }
 
   const closeSortAndFilterPopover = (exceptProp?: string) => {
@@ -113,81 +98,21 @@ export default function useColumnHeaderOperation({ props, tableDomRef, sortFilte
     tempSortingColumn.value = column;
   }
 
-  const columnMap = computed(() => {
-    const obj: Record<string, IColumnConfig> = {}
-    props.columnConfig.forEach(column => {
-      obj[column.prop] = column
-    })
-    return obj
-  })
-
-  const emitSearch = () => {
-    const params: Record<string, any> = {};
-    // 仅提交显示的列的相关数据
-    showingColumns.value.forEach(prop => {
-      const column = columnMap.value[prop]
-      if (column.filters) {
-        params[prop] = filteredValue.value[prop]
-      }
-      if (column.search) {
-        if (Array.isArray(column.search)) {
-          column.search.forEach(v => {
-            params[v.prop] = searchValue.value[v.prop]
-          })
-        } else {
-          params[prop] = searchValue.value[prop]
-        }
-      }
-    })
-
-    Object.keys(params).forEach(key => {
-      if (params[key] === undefined) delete params[key]
-    })
-
-    emit('search', params);
-  };
-
-  const handleHeaderOperationConfirm = async (column: IColumnConfig, scope) => {
-    if (column.search) {
-      // 校验
-      if (Array.isArray(column.search)) {
-        let validate = true;
-        column.search.forEach(v => {
-          if (!tempSearchValue.value[v.prop]) tempSearchValue.value[v.prop] = ''
-          if (!validate) return
-          if (v.validator) {
-            const result = v.validator(tempSearchValue.value[v.prop]);
-            if (validate && !result) validate = false;
-          }
-        })
-        // 校验未通过
-        if (!validate) return
-      } else {
-        if (!tempSearchValue.value[column.prop]) tempSearchValue.value[column.prop] = ''
-      }
-    }
-
-    summaryList.value = [...tempSummaryList.value];
-    sortingColumn.value = tempSortingColumn.value ? { ...tempSortingColumn.value } : null;
+  const handleHeaderOperationConfirm = async (scope) => {
+    summaryList.value = [ ...tempSummaryList.value ];
+    sortingColumn.value = tempSortingColumn.value ? {...tempSortingColumn.value} : null;
     sortType.value = tempSortType.value;
-
-    if (sortingColumn.value) { // 确认时提交排序
-      if (props.localSort) {
-        // 恢复列配置的sortable属性，只有列配置的sortable为true，才能用下面的sort方法
-        inSorting.value = true;
-        await nextTick();
-        tableDomRef.value?.sort(sortingColumn.value.prop, sortType.value);
-        inSorting.value = false
-      } else {
-        emit('sort-change', { order: sortType.value, prop: sortingColumn.value.prop });
-      }
+    if (sortingColumn.value) {
+      // 恢复列配置的sortable属性，只有列配置的sortable为true，才能用下面的sort方法
+      inSorting.value = true;
+      await nextTick();
+      tableDomRef.value?.sort(sortingColumn.value.prop, sortType.value);
+      inSorting.value = false
     }
 
     filteredValue.value = { ...tempFilteredValue.value };
     searchValue.value = { ...tempSearchValue.value };
 
-    emitSearch();
-
     filterColumns(scope.store);
 
     closeSortAndFilterPopover();
@@ -195,52 +120,18 @@ export default function useColumnHeaderOperation({ props, tableDomRef, sortFilte
     tableDomRef.value?.doLayout();
   }
 
-  const clearSort = () => {
-    sortingColumn.value = null;
-    sortType.value = null;
-    if (props.localSort) { // 前端过滤
-      tableDomRef.value?.clearSort();
-    } else { // 接口过滤
-      emit('sort-change', { order: null, prop: '' });
-    }
-  }
-
-  const setSort = (params: { order: 'ascending' | 'descending', prop: string }) => {
-    const column = props.columnConfig.find(c => c.prop === params.prop);
-    if (column) {
-      sortingColumn.value = column;
-      sortType.value = params.order;
-      if (props.localSort) {
-        tableDomRef.value?.sort(params.prop, params.order);
-      }
-    }
-  }
-
-  const handleHeaderOperationReset = async (column: IColumnConfig, scope) => {
+  const handleHeaderOperationReset = async (column, scope) => {
     if (sortingColumn.value && sortingColumn.value.prop === column.prop) {
-      clearSort();
+      tableDomRef.value?.clearSort();
+      sortingColumn.value = null;
+      sortType.value = null;
     }
 
     // 合计
     summaryList.value = summaryList.value.filter(item => item !== column.prop);
 
-    if (column.filters) {
-      filteredValue.value[column.prop] = Array.isArray(column.filters)
-        ? []
-        : column.filters.default ?? []
-    }
-    if (column.search) {
-      if (!Array.isArray(column.search)) {
-        searchValue.value[column.prop] = '';
-      } else {
-        column.search.forEach(v => {
-          searchValue.value[v.prop] = '';
-        })
-      }
-    }
-
-    emitSearch();
-
+    filteredValue.value[column.prop] = [];
+    searchValue.value[column.prop] = '';
     filterColumns(scope.store);
 
     closeSortAndFilterPopover();
@@ -249,7 +140,6 @@ export default function useColumnHeaderOperation({ props, tableDomRef, sortFilte
   }
 
   const filterColumns = (store) => {
-    if (!props.localFilter) return
     store.states.columns.forEach(column => {
       if (filteredValue.value[column.property]) {
         store.commit('filterChange', {
@@ -275,35 +165,7 @@ export default function useColumnHeaderOperation({ props, tableDomRef, sortFilte
     store.states.data = data;
   }
 
-  const setSearchParams = (params: Record<string, any>) => {
-    const _searchValue = {};
-    const _filteredValue = {};
-
-    // 设置搜索和过滤参数时，如果使用 showingColumns 遍历，会导致通过外部设置未显示的列的搜索和过滤参数丢失
-    props.columnConfig.forEach(column => {
-      if (column.search) {
-        if (Array.isArray(column.search)) {
-          column.search.forEach(v => {
-            _searchValue[v.prop] = params[v.prop];
-          });
-        } else {
-          _searchValue[column.prop] = params[column.prop] ?? '';
-        }
-      }
-      if (column.filters) {
-        const value = params[column.prop] ?? (Array.isArray(column.filters) ? [] : column.filters.default);
-        _filteredValue[column.prop] = value;
-      }
-    })
-
-    searchValue.value = { ...searchValue.value, ..._searchValue }
-    filteredValue.value = { ...filteredValue.value, ..._filteredValue }
-  }
-
   return {
-    setSort,
-    clearSort,
-    setSearchParams,
     isColumnHeadActive,
     handleHeaderPopoverShow,
     handleSort,
@@ -321,6 +183,6 @@ export default function useColumnHeaderOperation({ props, tableDomRef, sortFilte
     sortingColumn,
     isColumnFiltering,
     searchValue,
-    inSorting,
+    inSorting
   }
 }

package/src/components/EditableTable/useDefaultOperation.ts

@@ -1,15 +1,15 @@
 import { Ref, ref } from "vue"
-import { IEmits, IProps } from "./types"
+import { IEmits } from "./types"
 
 interface IParams {
   emit: IEmits;
   pageSize: Ref<number>;
-  props: IProps
+  currentPage: Ref<number>;
   tableDomRef: Ref<any>;
   hasExpandRow: boolean
 }
 
-export default function useDefaultOperation({ emit, pageSize, props, tableDomRef, hasExpandRow }: IParams) {
+export default function useDefaultOperation({emit, pageSize, currentPage, tableDomRef, hasExpandRow}: IParams) {
   const operationPopoverRef = ref<any>(null);
   const editingRowData = ref<Record<string, any>>({});
   const editingRowIndex = ref<number>(-1);
@@ -18,7 +18,7 @@ export default function useDefaultOperation({ emit, pageSize, props, tableDomRef
     emit('row-delete', {
       row,
       index,
-      page: props.currentPage,
+      page: currentPage.value,
       size: pageSize.value
     })
     closeOperationPopover();
@@ -39,9 +39,9 @@ export default function useDefaultOperation({ emit, pageSize, props, tableDomRef
     // 折叠所有展开的行
     closeAllExpandedRows();
     const { row, $index: index } = scope;
-    editingRowData.value = { ...row };
+    editingRowData.value = {...row};
     editingRowIndex.value = index;
-    emit('row-edit', { row, index, page: props.currentPage, size: pageSize.value });
+    emit('row-edit', { row, index, page: currentPage.value, size: pageSize.value});
     closeOperationPopover();
   }
 
@@ -52,9 +52,9 @@ export default function useDefaultOperation({ emit, pageSize, props, tableDomRef
       ...dataList.slice(0, index),
       ...dataList.slice(index + 1)
     ];
-    newList.unshift({ ...row, isPinned: true });
+    newList.unshift({...row, isPinned: true});
     store.states.data = newList;
-    emit('row-pin-to-top', { row, rawIndex: index, page: props.currentPage, size: pageSize.value });
+    emit('row-pin-to-top', { row, rawIndex: index, page: currentPage.value, size: pageSize.value});
     closeOperationPopover();
   }
 
@@ -68,7 +68,7 @@ export default function useDefaultOperation({ emit, pageSize, props, tableDomRef
     }
 
     emit('row-edit-save', {
-      page: props.currentPage,
+      page: currentPage.value,
       size: pageSize.value,
       row,
       changedData
@@ -79,7 +79,7 @@ export default function useDefaultOperation({ emit, pageSize, props, tableDomRef
   const handleEditCancel = (row) => {
     editingRowIndex.value = -1;
     editingRowData.value = {};
-    emit('row-edit-cancel', { row, page: props.currentPage, size: pageSize.value });
+    emit('row-edit-cancel', { row, page: currentPage.value, size: pageSize.value});
   }
 
   return {

package/src/components/EditableTable/useDragSort.ts

@@ -8,10 +8,11 @@ interface IUseDragSortParams {
   viewSettingDragSortOptions: Ref<IColumnConfig[]>
   beforeDragStart: () => boolean
   currScope: Ref<any>
+  currentPage: Ref<number>
   pageSize: Ref<number>
   tableDomRef: Ref<any>
 }
-export default function useDragSort({ props, emit, viewSettingDragSortOptions, pageSize, beforeDragStart, currScope, tableDomRef }: IUseDragSortParams) {
+export default function useDragSort({props, emit, viewSettingDragSortOptions, currentPage, pageSize, beforeDragStart, currScope, tableDomRef }: IUseDragSortParams) {
 
   const draggingData = ref<IDraggingData>({}); // 拖拽相关数据
   const isMouseDown = ref(false);
@@ -20,7 +21,7 @@ export default function useDragSort({ props, emit, viewSettingDragSortOptions, p
   const isOperating = ref(false);
 
   onMounted(() => {
-    tableDomRef.value.$el.addEventListener('mousedown', () => { isOperating.value = true });
+    tableDomRef.value.$el.addEventListener('mousedown', () => {isOperating.value = true});
     document.addEventListener('mousedown', handleDocumentMouseDown);
     document.addEventListener('mousemove', handleDocumentMouseMove);
     document.addEventListener('mouseup', handleDocumentMouseUp);
@@ -200,7 +201,7 @@ export default function useDragSort({ props, emit, viewSettingDragSortOptions, p
       row: movedRow,
       fromIndex: draggingIndex,
       toIndex: dropIndex,
-      page: props.currentPage,
+      page: currentPage.value,
       size: pageSize.value
     });
     // 清理工作
@@ -209,7 +210,7 @@ export default function useDragSort({ props, emit, viewSettingDragSortOptions, p
 
   const handleViewSettingDragMouseDown = (event, index) => {
     const rowDoms = [...document.getElementsByClassName('view-setting-draggable-item')]
-      .reduce((pre, item, index) => ({ ...pre, [index]: [item] }), {});
+      .reduce((pre, item, index) => ({...pre, [index]: [item]}), {});
     draggingData.value.isDragging = true;
     draggingData.value.rowDoms = rowDoms;
     draggingData.value.draggingIndex = +index;

package/src/components/EditableTable/usePagination.ts

@@ -6,26 +6,29 @@ interface IParams {
   beforePageChange: () => void
 }
 
-export default function usePagination({ emit, beforePageChange }: IParams) {
+export default function usePagination({emit, beforePageChange}: IParams) {
 
   const pageSize = ref(10);
+  const currentPage = ref(1);
 
   const handlePageSizeChange = (size: number) => {
     pageSize.value = size;
+    currentPage.value = 1;
     // searchValue.value = {};
     beforePageChange();
-    emit('page-change', { size, page: 1 });
+    emit('page-change', {size, page: currentPage.value});
   }
 
   const handleCurrPageChange = (curr: number) => {
     // searchValue.value = {};
     beforePageChange();
-    emit('page-change', { size: pageSize.value, page: curr });
+    emit('page-change', {size: pageSize.value, page: curr});
   }
 
   return {
     pageSize,
+    currentPage,
     handlePageSizeChange,
-    handleCurrPageChange,
+    handleCurrPageChange
   }
 }

package/src/components/EditableTable/useRowBgColor.ts

@@ -6,7 +6,7 @@ interface IUseRowBgColorParams {
   emit: IEmits;
 }
 
-export default function useRowBgColor({ colorList, emit }: IUseRowBgColorParams) {
+export default function useRowBgColor({colorList, emit}: IUseRowBgColorParams) {
   const colorPopoverRef = ref<any>(null);
 
   const isDefaultColor = (id: number) => {
@@ -31,11 +31,11 @@ export default function useRowBgColor({ colorList, emit }: IUseRowBgColorParams)
   const handleColorChange = async (colorId: number, scope) => {
     const { row, $index: rowIndex, store } = scope;
     const dataList = store.states.data;
-    const curRow = { ...dataList[rowIndex], colorId: +colorId };
+    const curRow = {...dataList[rowIndex], colorId: +colorId};
     const newList = [...dataList];
     newList.splice(rowIndex, 1, curRow);
     store.states.data = newList;
-    emit('row-bg-change', { colorId, row, rowIndex });
+    emit('row-bg-change', {colorId, row, rowIndex});
     await nextTick();
     // TODO: 为什么不是数组？为什么关闭弹窗不生效了？
     colorPopoverRef.value?.doClose();

package/src/components/EditableTable/useViewSetting.ts

@@ -1,4 +1,4 @@
-import { ref, nextTick, watch, ComputedRef, Ref, onMounted, computed } from "vue"
+import { ref, nextTick, watch, ComputedRef, Ref, onMounted } from "vue"
 import { IColumnConfig, IProps } from "./types"
 
 interface IViewSettingParams {
@@ -13,53 +13,12 @@ export default function useViewSetting({ tableDomRef, showingColumns, actualColu
   const columnsToBeShown = ref<string[]>([]); // 显示设置弹窗中勾选的列
   const viewSettingVisible = ref(false);
   const leftFixedColumnCount = ref(0);
-  const tempLeftFixedColumnCount = ref(0);
-
-  const storageKey = computed(() => `@lx-frontend/wrap-element-ui/table_setting_cloumns/${props.settingStorgeKey || (location.pathname === '/' ? location.hash : location.pathname)}`);
-
-  const saveSettingToStorge = () => localStorage.setItem(storageKey.value, JSON.stringify({
-    showingColumns: showingColumns.value,
-    leftFixedColumnCount: leftFixedColumnCount.value
-  }));
-
-  watch(
-    () => props.columnConfig,
-    (val) => {
-      const _keys = new Set(props.columnConfig.map(c => (c.prop)));
-      const _cache = localStorage.getItem(storageKey.value);
-      const setColumns = () => (showingColumns.value = val.filter(v => !v.defaultHide).map(c => c.prop));
-      if (!_cache) {
-        setColumns();
-        leftFixedColumnCount.value = props.leftFixedCount as number;
-      } else {
-        try {
-          // 缓存数据字段可能随着更新导致对不上，清理无效数据，防止出问题
-          const cache = JSON.parse(_cache);
-          if (!cache.showingColumns || !Array.isArray(cache.showingColumns)) {
-            setColumns();
-          } else {
-            showingColumns.value = cache.showingColumns.filter(key => _keys.has(key));
-          }
-          const _leftFixedColumnCount = Number(cache?.leftFixedColumnCount)
-          leftFixedColumnCount.value = isNaN(_leftFixedColumnCount) ? (props.leftFixedCount as number) : _leftFixedColumnCount;
-          // 写入清理后的数据
-          saveSettingToStorge();
-        } catch (error) {
-          console.error(error);
-          localStorage.removeItem(storageKey.value);
-          setColumns();
-        }
-      }
-    },
-    { immediate: true }
-  )
 
   watch(
     () => columnsToBeShown.value,
     (val) => {
       viewSettingDragSortOptions.value = props.columnConfig
         .filter(c => val.includes(c.prop));
-      if (tempLeftFixedColumnCount.value > val.length) tempLeftFixedColumnCount.value = val.length
     },
     { immediate: true }
   )
@@ -80,7 +39,6 @@ export default function useViewSetting({ tableDomRef, showingColumns, actualColu
   const handleViewSettingShow = () => {
     viewSettingDragSortOptions.value = actualColumns.value
       .filter(c => columnsToBeShown.value.includes(c.prop));
-    tempLeftFixedColumnCount.value = leftFixedColumnCount.value;
     viewSettingVisible.value = true;
   }
 
@@ -93,25 +51,15 @@ export default function useViewSetting({ tableDomRef, showingColumns, actualColu
   const handleViewSettingConfirm = async () => {
     viewSettingVisible.value = false;
     showingColumns.value = viewSettingDragSortOptions.value.map(c => c.prop);
-    leftFixedColumnCount.value = tempLeftFixedColumnCount.value;
-    saveSettingToStorge()
     await nextTick();
     tableDomRef.value?.doLayout();
   }
 
-  const handleInputTempLeftFixedColumnCount = (value: string) => {
-    const _value = Number(value)
-    if (isNaN(_value)) return
-    tempLeftFixedColumnCount.value = Math.max(0, Math.min(columnsToBeShown.value.length, Math.floor(_value)))
-  }
-
   return {
     viewSettingDragSortOptions,
     columnsToBeShown,
     viewSettingVisible,
     leftFixedColumnCount,
-    tempLeftFixedColumnCount,
-    handleInputTempLeftFixedColumnCount,
     handleViewSettingShow,
     handleViewSettingClose,
     handleViewSettingConfirm