@lx-frontend/wrap-element-ui 1.0.1-beta.1 → 1.0.1-beta.3

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@lx-frontend/wrap-element-ui",
-  "version": "1.0.1-beta.1",
+  "version": "1.0.1-beta.3",
   "description": "wrap-element-ui",
   "author": "",
-  "main": "dist/index.mjs",
+  "main": "src/components/index.ts",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",
@@ -18,7 +18,6 @@
     "lint": "eslint src"
   },
   "files": [
-    "dist",
     "README.md",
     "package.json",
     "src/components"

package/src/components/EditableTable/index.less

@@ -180,6 +180,31 @@
       border-right: 2px #e4e8ef solid;
     }
   }
+
+  .el-table-filter,
+  th.el-table__cell .el-table__column-filter-trigger,
+  th.is-sortable .caret-wrapper {
+    display: none;
+  }
+
+  .el-table__body tr.current-row > td,
+  .el-table__body tr.hover-row > td {
+    background-color: #fafafa;
+  }
+
+  table tbody tr td {
+    & .el-date-editor.el-input {
+      width: 100%;
+    }
+
+    & .cell {
+      font-size: 14px;
+    }
+  }
+
+  .el-table__fixed-body-wrapper {
+    background: #fff;
+  }
 }
 
 .view-setting {
@@ -207,7 +232,7 @@
     padding: 0px;
 
     .el-dialog__body {
-      max-height: 800px;
+      max-height: 70vh;
     }
 
     .el-dialog__body {
@@ -497,6 +522,12 @@
     background-color: @--theme-blue--;
     border-color: @--theme-blue--;
   }
+
+  .el-checkbox__input.is-checked .el-checkbox__inner,
+  .el-radio__input.is-checked .el-radio__inner {
+    background: #2468f2;
+    border-color: #2468f2;
+  }
 }
 
 .btn-pointer {
@@ -576,6 +607,8 @@
   margin-top: 12px;
 
   & .el-pagination {
+    padding: 0;
+
     .el-pager li.number {
       background-color: #fff;
       border: 1px solid #d6dbe3;
@@ -605,26 +638,7 @@
   }
 }
 
-.el-table__body tr.current-row > td,
-.el-table__body tr.hover-row > td {
-  background-color: #fafafa;
-}
-
-.el-table-filter,
-th.el-table__cell .el-table__column-filter-trigger,
-th.is-sortable .caret-wrapper {
-  display: none;
-}
 
-table tbody tr td {
-  & .el-date-editor.el-input {
-    width: 100%;
-  }
-
-  & .cell {
-    font-size: 14px;
-  }
-}
 
 .editable-table {
   & table th {
@@ -674,12 +688,6 @@ table tbody tr td {
   }
 }
 
-.el-select-dropdown {
-  &__item {
-    text-align: center;
-  }
-}
-
 .el-dialog__header {
   display: flex;
   justify-content: space-between;

package/src/components/EditableTable/index.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="editable-table">
     <div class="view-setting">
-      <div class="view-setting__btn-wrapper">
+      <div
+        v-if="!hideViewSettingBtn"
+        class="view-setting__btn-wrapper"
+      >
         <div
           class="view-setting__btn btn-pointer"
           @click="handleViewSettingShow"
@@ -17,6 +20,7 @@
         title="显示设置"
         :visible.sync="viewSettingVisible"
         width="750px"
+        top="12vh"
         :close-on-click-modal="false"
         :append-to-body="true"
         custom-class="view-setting__dialog"
@@ -51,8 +55,9 @@
             <div class="view-setting__content-right-frize">
               冻结前
               <el-input
-                v-model="leftFixedColumnCount"
                 class="view-setting__content-right-input"
+                :value="tempLeftFixedColumnCount"
+                @input="handleInputTempLeftFixedColumnCount"
               />
               列
             </div>
@@ -218,7 +223,7 @@
         :key="column.prop + index"
         resizable
         class-name="editable-table__data-column"
-        :filtered-value="filteredValue[column.prop] || []"
+        :filtered-value="Array.isArray(filteredValue[column.prop]) ? filteredValue[column.prop] : []"
         v-bind="getColumnBindProps(column)"
       >
         <template
@@ -267,7 +272,7 @@
                 </div>
               </div>
               <div
-                v-if="column.isColumnSearchAble"
+                v-if="column.search && !Array.isArray(column.search)"
                 class="sort-filter__search"
               >
                 <div class="sort-filter__search-title">
@@ -279,19 +284,41 @@
                   placeholder="请输入内容"
                 />
               </div>
+
               <div
-                v-if="column.filters && column.filters.length > 0"
+                v-if="column.search && Array.isArray(column.search)"
+                class="sort-filter__search"
+                style="display: flex;flex-direction: column;gap: 12px;"
+              >
+                <div
+                  v-for="item in column.search"
+                  :key="item.prop"
+                >
+                  <div class="sort-filter__search-title">
+                    {{ item.label }}
+                  </div>
+                  <el-input
+                    v-model="tempSearchValue[item.prop]"
+                    class="sort-filter__search-input"
+                    placeholder="请输入内容"
+                  />
+                </div>
+              </div>
+
+              <div
+                v-if="column.filters && ((Array.isArray(column.filters) ? column.filters : column.filters.options).length > 0)"
                 class="sort-filter__filter"
               >
                 <div class="sort-filter__filter-title">
                   筛选
                 </div>
                 <el-checkbox-group
+                  v-if="column.filters && (Array.isArray(column.filters) || column.filters.type === 'checkbox')"
                   v-model="tempFilteredValue[column.prop]"
                   class="sort-filter__filter-checkbox-group"
                 >
                   <el-checkbox
-                    v-for="item in column.filters"
+                    v-for="item in (Array.isArray(column.filters) ? column.filters : column.filters.options)"
                     :key="item.value"
                     :label="item.value"
                     class="sort-filter__filter-checkbox"
@@ -304,6 +331,25 @@
                     </slot>
                   </el-checkbox>
                 </el-checkbox-group>
+
+                <el-radio-group
+                  v-if="column.filters && !Array.isArray(column.filters) && column.filters.type === 'radio'"
+                  v-model="tempFilteredValue[column.prop]"
+                  style="display: flex;flex-direction: column;gap: 6px;"
+                >
+                  <el-radio
+                    v-for="item in column.filters.options"
+                    :key="item.value"
+                    :label="item.value"
+                  >
+                    <slot
+                      :name="column.prop + '-filter-item'"
+                      v-bind="item"
+                    >
+                      {{ item.text }}
+                    </slot>
+                  </el-radio>
+                </el-radio-group>
               </div>
               <div
                 v-if="column.summary"
@@ -339,7 +385,7 @@
                 <el-button
                   class="sort-filter__confirm-btn"
                   type="primary"
-                  @click="handleHeaderOperationConfirm(scope)"
+                  @click="handleHeaderOperationConfirm(column, scope)"
                 >
                   确定
                 </el-button>
@@ -538,7 +584,7 @@
         :page-sizes="[10, 15, 30, 60, 100]"
         :page-size.sync="pageSize"
         :pager-count="11"
-        :current-page.sync="currentPage"
+        :current-page="currentPage"
         :total="total"
         @size-change="handlePageSizeChange"
         @current-change="handleCurrPageChange"
@@ -565,7 +611,7 @@ interface IProps {
   dataList: ITableDataItem[];
   /** 列配置 */
   columnConfig: IColumnConfig[];
-  /** 是否展示展开行 */ 
+  /** 是否展示展开行 */
   hasExpandRow?: boolean;
   /** 是否展示序号 */
   hasIndexColumn?: boolean;
@@ -585,6 +631,16 @@ interface IProps {
   dragSemiRange?: number;
   /** 是否显示加载 */
   loading?: boolean;
+  /** 是否隐藏显示设置按钮 */
+  hideViewSettingBtn?: boolean
+  /** 设置的缓存的key */
+  settingStorgeKey?: string
+  /** 前端排序，默认关闭 */
+  localSort?: boolean
+  /** 前端过滤，默认关闭 */
+  localFilter?: boolean
+  /** 页码 */
+  currentPage: number
 }
 
 interface IEmits {
@@ -606,6 +662,10 @@ interface IEmits {
   (e: 'row-edit-cancel', param: { row: any; page: number; size: number;}): void
   /** 页码改变 */
   (e: 'page-change', param: { page: number, size: number }): void
+  /** 查询 */
+  (e: 'search', param: Record<string, any>): void
+  /** 排序 */
+  (e: 'sort-change', param: { order: 'descending' | 'ascending' | null, prop: string }): void
 }
 
 const props = withDefaults(defineProps<IProps>(), {
@@ -620,7 +680,12 @@ const props = withDefaults(defineProps<IProps>(), {
   colorList: () => [],
   leftFixedCount: 1,
   dragSemiRange: 15,
-  loading: false
+  loading: false,
+  hideViewSettingBtn: false,
+  settingStorgeKey: '',
+  localSort: false,
+  localFilter: false,
+  currentPage: 1,
 })
 
 // 同defineProps一样，不支持泛型参数从外部导入
@@ -640,16 +705,14 @@ const actualColumns = computed(() => {
       isColumnSortable: rawItem.sortable,
       sortable: inSorting.value ? rawItem.sortable : false
     };
-    if (item) {
-      if (cnt > 0) {
-        item.fixed = 'left';
-        // eslint-disable-next-line no-plusplus
-        cnt--;
-      } else {
-        item.fixed = undefined;
-      }
-      res.push(item);
+    if (cnt > 0) {
+      item.fixed = 'left';
+      // eslint-disable-next-line no-plusplus
+      cnt--;
+    } else {
+      item.fixed = undefined;
     }
+    res.push(item);
   }
 
   // 使用默认操作项，添加默认操作列。该列在编辑模式下隐藏
@@ -675,9 +738,8 @@ const beforePageChange = () => {
 }
 const {
   pageSize,
-  currentPage,
   handleCurrPageChange,
-  handlePageSizeChange
+  handlePageSizeChange,
 } = usePagination({
   emit,
   beforePageChange
@@ -717,7 +779,7 @@ const {
   emit,
   tableDomRef,
   pageSize,
-  currentPage,
+  props,
   hasExpandRow: props.hasExpandRow
 })
 
@@ -727,6 +789,8 @@ const {
   columnsToBeShown,
   viewSettingVisible,
   leftFixedColumnCount,
+  tempLeftFixedColumnCount,
+  handleInputTempLeftFixedColumnCount,
   handleViewSettingShow,
   handleViewSettingClose,
   handleViewSettingConfirm
@@ -739,6 +803,9 @@ const {
 
 /************ 列头部操作相关 ************ */
 const {
+  setSort,
+  clearSort,
+  setSearchParams,
   isColumnHeadActive,
   handleSort,
   handleHeaderPopoverShow,
@@ -756,11 +823,13 @@ const {
   sortingColumn,
   isColumnFiltering,
   searchValue,
-  inSorting
+  inSorting,
 } = useColumnHeaderOperation({
   tableDomRef,
   sortFilterPopoverRef,
-  props
+  props,
+  emit,
+  showingColumns,
 })
 
 /************ 表格行拖拽和显示设置列拖拽 ************ */
@@ -787,7 +856,6 @@ useDragSort({
   props,
   viewSettingDragSortOptions,
   beforeDragStart,
-  currentPage,
   pageSize,
   currScope,
   tableDomRef,
@@ -798,18 +866,10 @@ const doTableLayout = async () => {
   tableDomRef.value?.doLayout();
 }
 
-watch(
-  () => props.columnConfig,
-  (val) => {
-    showingColumns.value = val.map(c => c.prop);
-  },
-  { immediate: true }
-)
-
 // 过滤出自定义属性，将其它属性全部透传给 el-table-column
 const getColumnBindProps = (column: IColumnConfig) => {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const { editAble, editType, slotName, inputType, options, ...rest } = column;
+  const { editAble, editType, slotName, inputType, options, filters, ...rest } = column;
   return rest;
 }
 
@@ -832,7 +892,20 @@ const handleColumnClose = (item) => {
 
 defineExpose({
   closeAllExpandedRows,
-  elTableRef: tableDomRef
+  openViewSetting: handleViewSettingShow,
+  elTableRef: tableDomRef,
+  setSort,
+  clearSort,
+  setSearchParams,
+})
+
+// loading 结束和页码变化时滚动到顶部
+watch([
+  () => props.loading,
+  () => props.currentPage,
+], ([loading]) => {
+  if (loading) return;
+  tableDomRef.value.$el.querySelector('.el-table__body-wrapper').scrollTop = 0
 })
 
 </script>

package/src/components/EditableTable/types.ts

@@ -11,24 +11,40 @@ export interface IColumnConfigRequired {
   sortable?: boolean; // 该列是否允许排序，ture则表头弹窗会显示升降序按钮
   slotName?: string; // 如果要自定义，传入 slotName
   isAlwaysShow?: boolean; // 不可隐藏，显示设置中，该列不允许隐藏
-  isColumnSearchAble?: boolean; // 列是否允许搜索，true则表头弹窗会多一个搜索框
+  /** 默认隐藏，显示设置中，该列默认隐藏 */
+  defaultHide?: boolean;
+  /** 列是否允许搜索，true则表头弹窗会多一个搜索框，一列中有多个搜索字段时传数组进行配置 */
+  search?: boolean | ISearchOptions
   summary?: boolean; // 是否可以显示该列的统计
   summaryMethod?: (values: any[]) => string | number; // 这一列的统计方法，values为该列的所有值
-  // filters?: {value: string | number; text: string; [key: string]: any}[];
+  /** 过滤，传数组时默认复选框 */
+  filters?: {
+    type?: 'checkbox' | 'radio',
+    options: FiltersOption[]
+    default?: string | number | string[] | number[]
+  } | FiltersOption[]
   // 透传el-table column有的属性， https://element.eleme.cn/#/en-US/component/table#table-column-attributes
   [key: string]: any;
 }
 
+type FiltersOption = { value: string | number; text: string; [key: string]: any }
+
+type ISearchOptions = {
+  prop: string,
+  label: string,
+  validator?: (value: string) => boolean
+}[]
+
 type IInputColumn = IColumnConfigRequired & {
   inputType: string | number;
 }
 
 type ISelectColumn = IColumnConfigRequired & {
-  options: {key: string; value: string | number; [key: string]: any}[];
+  options: { key: string; value: string | number; [key: string]: any }[];
 }
 
-type IDateOnlyColumn = IColumnConfigRequired & {}
-type IDateTimeColumn = IColumnConfigRequired & {}
+type IDateOnlyColumn = IColumnConfigRequired
+type IDateTimeColumn = IColumnConfigRequired
 
 export type IColumnConfig = IInputColumn | ISelectColumn | IDateOnlyColumn | IDateTimeColumn
 
@@ -79,16 +95,22 @@ export interface IProps {
   leftFixedCount?: number;
   dragSemiRange?: number;
   loading?: boolean;
+  settingStorgeKey?: string
+  localSort?: boolean
+  localFilter?: boolean
+  currentPage: number
 }
 
 export interface IEmits {
   (e: 'selection-change', selection: any): void
-  (e: 'row-bg-change', param: {colorId: number; row: ITableDataItem; rowIndex: number}): void
-  (e: 'row-drag-drop', param: { row: any; fromIndex: number; toIndex: number; page: number; size: number;}): void
+  (e: 'row-bg-change', param: { colorId: number; row: ITableDataItem; rowIndex: number }): void
+  (e: 'row-drag-drop', param: { row: any; fromIndex: number; toIndex: number; page: number; size: number; }): void
   (e: 'row-delete', param: { row: any; index: number; page: number; size: number; }): void
-  (e: 'row-edit', param: { row: any, index: number; page: number; size: number;}): void
-  (e: 'row-pin-to-top', param: { row: any, rawIndex: number; page: number; size: number;}): void
+  (e: 'row-edit', param: { row: any, index: number; page: number; size: number; }): void
+  (e: 'row-pin-to-top', param: { row: any, rawIndex: number; page: number; size: number; }): void
   (e: 'row-edit-save', param: { page: number; size: number; row: any; changedData: Record<string, any>; }): void
-  (e: 'row-edit-cancel', param: { row: any; page: number; size: number;}): void
+  (e: 'row-edit-cancel', param: { row: any; page: number; size: number; }): void
   (e: 'page-change', param: { page: number, size: number }): void
+  (e: 'search', param: Record<string, any>): void
+  (e: 'sort-change', param: { order: 'descending' | 'ascending' | null, prop: string }): void
 }

package/src/components/EditableTable/useColumnHeaderOperation.ts

@@ -1,13 +1,15 @@
-import { computed, ref, watch, nextTick } from "vue"
-import { IColumnConfig, IProps } from './types';
+import { computed, ref, watch, nextTick, Ref } from "vue"
+import { IColumnConfig, IEmits, IProps } from './types';
 
 interface IUseColumnHeaderOperationParams {
   props: IProps
   tableDomRef: any
   sortFilterPopoverRef: any
+  emit: IEmits;
+  showingColumns: Ref<string[]>
 }
 
-export default function useColumnHeaderOperation({props, tableDomRef, sortFilterPopoverRef}: IUseColumnHeaderOperationParams) {
+export default function useColumnHeaderOperation({ props, tableDomRef, sortFilterPopoverRef, emit, showingColumns }: IUseColumnHeaderOperationParams) {
 
   // column如果有sortable属性，点击列头部，会直接触发排序，为了在弹窗点确定时再触发排序，需要阻止点击立即排序
   // 所以，初始渲染时，将sortable设置为false，在触发排序逻辑时再设置成真实的值，再利用el-table自身的排序逻辑触发排序
@@ -22,8 +24,8 @@ export default function useColumnHeaderOperation({props, tableDomRef, sortFilter
   const tempSortingColumn = ref<IColumnConfig | null>(null);
 
   // 生效中的过滤配置 和 临时过滤配置
-  const filteredValue = ref<Record<string, string[]>>({});
-  const tempFilteredValue = ref<Record<string, string[]>>({});
+  const filteredValue = ref<Record<string, string | number | number[] | string[]>>({});
+  const tempFilteredValue = ref<Record<string, string | number | number[] | string[]>>({});
 
   // 生效中的统计配置 和 临时统计配置
   const tempSummaryList = ref<string[]>([]);
@@ -33,14 +35,17 @@ export default function useColumnHeaderOperation({props, tableDomRef, sortFilter
   const searchValue = ref<Record<string, string>>({});
   const tempSearchValue = ref<Record<string, string>>({});
 
-  const isColumnFiltering = computed(() => Object.keys(tempFilteredValue.value).some(k => tempFilteredValue.value[k]?.length));
+  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 showColumnHeadSortIcon = (column: IColumnConfig) => column.filters || column.isColumnSortable || column.isColumnSearchAble || column.summary;
+  const showColumnHeadSortIcon = (column: IColumnConfig) => column.filters || column.isColumnSortable || column.search || 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 }
@@ -63,14 +68,24 @@ export default function useColumnHeaderOperation({props, tableDomRef, sortFilter
         sums[index] = summaryMethod(values);
       }
     })
-  
+
     return sums
   }
 
   const isColumnHeadActive = (column: IColumnConfig) => {
-    return filteredValue.value[column.prop]?.length ||
+    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]
+      ) ||
       sortingColumn.value?.prop === column.prop ||
-      searchValue.value[column.prop] || 
       summaryList.value.includes(column.prop);
   }
 
@@ -82,7 +97,7 @@ export default function useColumnHeaderOperation({props, tableDomRef, sortFilter
     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) => {
@@ -98,21 +113,81 @@ export default function useColumnHeaderOperation({props, tableDomRef, sortFilter
     tempSortingColumn.value = column;
   }
 
-  const handleHeaderOperationConfirm = async (scope) => {
-    summaryList.value = [ ...tempSummaryList.value ];
-    sortingColumn.value = tempSortingColumn.value ? {...tempSortingColumn.value} : null;
+  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;
     sortType.value = tempSortType.value;
-    if (sortingColumn.value) {
-      // 恢复列配置的sortable属性，只有列配置的sortable为true，才能用下面的sort方法
-      inSorting.value = true;
-      await nextTick();
-      tableDomRef.value?.sort(sortingColumn.value.prop, sortType.value);
-      inSorting.value = false
+
+    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 });
+      }
     }
 
     filteredValue.value = { ...tempFilteredValue.value };
     searchValue.value = { ...tempSearchValue.value };
 
+    emitSearch();
+
     filterColumns(scope.store);
 
     closeSortAndFilterPopover();
@@ -120,18 +195,52 @@ export default function useColumnHeaderOperation({props, tableDomRef, sortFilter
     tableDomRef.value?.doLayout();
   }
 
-  const handleHeaderOperationReset = async (column, scope) => {
-    if (sortingColumn.value && sortingColumn.value.prop === column.prop) {
+  const clearSort = () => {
+    sortingColumn.value = null;
+    sortType.value = null;
+    if (props.localSort) { // 前端过滤
       tableDomRef.value?.clearSort();
-      sortingColumn.value = null;
-      sortType.value = null;
+    } 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) => {
+    if (sortingColumn.value && sortingColumn.value.prop === column.prop) {
+      clearSort();
     }
 
     // 合计
     summaryList.value = summaryList.value.filter(item => item !== column.prop);
 
-    filteredValue.value[column.prop] = [];
-    searchValue.value[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();
+
     filterColumns(scope.store);
 
     closeSortAndFilterPopover();
@@ -140,6 +249,7 @@ export default function useColumnHeaderOperation({props, tableDomRef, sortFilter
   }
 
   const filterColumns = (store) => {
+    if (!props.localFilter) return
     store.states.columns.forEach(column => {
       if (filteredValue.value[column.property]) {
         store.commit('filterChange', {
@@ -165,7 +275,35 @@ export default function useColumnHeaderOperation({props, tableDomRef, sortFilter
     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,
@@ -183,6 +321,6 @@ export default function useColumnHeaderOperation({props, tableDomRef, sortFilter
     sortingColumn,
     isColumnFiltering,
     searchValue,
-    inSorting
+    inSorting,
   }
 }

package/src/components/EditableTable/useDefaultOperation.ts

@@ -1,15 +1,15 @@
 import { Ref, ref } from "vue"
-import { IEmits } from "./types"
+import { IEmits, IProps } from "./types"
 
 interface IParams {
   emit: IEmits;
   pageSize: Ref<number>;
-  currentPage: Ref<number>;
+  props: IProps
   tableDomRef: Ref<any>;
   hasExpandRow: boolean
 }
 
-export default function useDefaultOperation({emit, pageSize, currentPage, tableDomRef, hasExpandRow}: IParams) {
+export default function useDefaultOperation({ emit, pageSize, props, 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, currentPage, tableD
     emit('row-delete', {
       row,
       index,
-      page: currentPage.value,
+      page: props.currentPage,
       size: pageSize.value
     })
     closeOperationPopover();
@@ -39,9 +39,9 @@ export default function useDefaultOperation({emit, pageSize, currentPage, tableD
     // 折叠所有展开的行
     closeAllExpandedRows();
     const { row, $index: index } = scope;
-    editingRowData.value = {...row};
+    editingRowData.value = { ...row };
     editingRowIndex.value = index;
-    emit('row-edit', { row, index, page: currentPage.value, size: pageSize.value});
+    emit('row-edit', { row, index, page: props.currentPage, size: pageSize.value });
     closeOperationPopover();
   }
 
@@ -52,9 +52,9 @@ export default function useDefaultOperation({emit, pageSize, currentPage, tableD
       ...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: currentPage.value, size: pageSize.value});
+    emit('row-pin-to-top', { row, rawIndex: index, page: props.currentPage, size: pageSize.value });
     closeOperationPopover();
   }
 
@@ -68,7 +68,7 @@ export default function useDefaultOperation({emit, pageSize, currentPage, tableD
     }
 
     emit('row-edit-save', {
-      page: currentPage.value,
+      page: props.currentPage,
       size: pageSize.value,
       row,
       changedData
@@ -79,7 +79,7 @@ export default function useDefaultOperation({emit, pageSize, currentPage, tableD
   const handleEditCancel = (row) => {
     editingRowIndex.value = -1;
     editingRowData.value = {};
-    emit('row-edit-cancel', { row, page: currentPage.value, size: pageSize.value});
+    emit('row-edit-cancel', { row, page: props.currentPage, size: pageSize.value });
   }
 
   return {

package/src/components/EditableTable/useDragSort.ts

@@ -8,11 +8,10 @@ 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, currentPage, pageSize, beforeDragStart, currScope, tableDomRef }: IUseDragSortParams) {
+export default function useDragSort({ props, emit, viewSettingDragSortOptions, pageSize, beforeDragStart, currScope, tableDomRef }: IUseDragSortParams) {
 
   const draggingData = ref<IDraggingData>({}); // 拖拽相关数据
   const isMouseDown = ref(false);
@@ -21,7 +20,7 @@ export default function useDragSort({props, emit, viewSettingDragSortOptions, cu
   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);
@@ -201,7 +200,7 @@ export default function useDragSort({props, emit, viewSettingDragSortOptions, cu
       row: movedRow,
       fromIndex: draggingIndex,
       toIndex: dropIndex,
-      page: currentPage.value,
+      page: props.currentPage,
       size: pageSize.value
     });
     // 清理工作
@@ -210,7 +209,7 @@ export default function useDragSort({props, emit, viewSettingDragSortOptions, cu
 
   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,29 +6,26 @@ 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: currentPage.value});
+    emit('page-change', { size, page: 1 });
   }
 
   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 } from "vue"
+import { ref, nextTick, watch, ComputedRef, Ref, onMounted, computed } from "vue"
 import { IColumnConfig, IProps } from "./types"
 
 interface IViewSettingParams {
@@ -13,12 +13,53 @@ 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 }
   )
@@ -39,6 +80,7 @@ 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;
   }
 
@@ -51,15 +93,25 @@ 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