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

package/package.json

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

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

@@ -80,10 +80,10 @@ export function useColumnHeaderOperation({ props, tableDomRef, emit, showingColu
 
     return (
       !!(column.filters && (Array.isArray(column.filters)
-        ? ((filteredValue.value[column.prop] as any[]).length)
+        ? ((filteredValue.value[column.filters.prop || column.prop] as any[]).length)
         : column.filters.type === 'radio'
-          ? filteredValue.value[column.prop]
-          : (filteredValue.value[column.prop] as any[]).length))
+          ? filteredValue.value[column.filters.prop || column.prop]
+          : (filteredValue.value[column.filters.prop || column.prop] as any[]).length))
     ) || (
       !!(column.search
         ? Array.isArray(column.search) && column.search?.some(v => searchValue.value[v.prop])
@@ -130,7 +130,7 @@ export function useColumnHeaderOperation({ props, tableDomRef, emit, showingColu
     showingColumns.value.forEach(prop => {
       const column = columnMap.value[prop]
       if (column.filters) {
-        params[prop] = filteredValue.value[prop]
+        params[column.filters.prop || prop] = filteredValue.value[column.filters.prop || prop]
       }
       if (column.search) {
         if (Array.isArray(column.search)) {
@@ -237,11 +237,11 @@ export function useColumnHeaderOperation({ props, tableDomRef, emit, showingColu
   function handleResetFilterValue (column: IColumnConfig) {
     if (column.filters) {
       if (Array.isArray(column.filters)) {
-        filteredValue.value[column.prop] = []
+        filteredValue.value[column.filters.prop || column.prop] = []
       } else if (column.filters.default) {
-        filteredValue.value[column.prop] = column.filters.default
+        filteredValue.value[column.filters.prop || column.prop] = column.filters.default
       } else {
-        filteredValue.value[column.prop] = column.filters.type === 'radio' ? '' : []
+        filteredValue.value[column.filters.prop || column.prop] = column.filters.type === 'radio' ? '' : []
       }
     }
   }
@@ -321,8 +321,8 @@ export function useColumnHeaderOperation({ props, tableDomRef, emit, showingColu
         }
       }
       if (column.filters) {
-        const value = params[column.prop] ?? (Array.isArray(column.filters) ? [] : column.filters.default);
-        _filteredValue[column.prop] = value;
+        const value = params[column.filters.prop || column.prop] ?? (Array.isArray(column.filters) ? [] : column.filters.default);
+        _filteredValue[column.filters.prop || column.prop] = value;
       }
       if (column.doubleDatePicker) {
         _searchValue[column.doubleDatePicker.props[0]] = params[column.doubleDatePicker.props[0]] ?? '';

package/src/components/EditableTable/features/bizTableHeaderPopover.vue

@@ -126,8 +126,8 @@
         <el-checkbox-group
           v-if="column.filters && (Array.isArray(column.filters) || column.filters.type === 'checkbox')"
           class="editable-table-sort-filter__filter-checkbox-group"
-          :value="tempFilteredValue[column.prop]"
-          @input="val => emit('update:tempFilteredValue', column.prop, val)"
+          :value="tempFilteredValue[column.filters.prop || column.prop]"
+          @input="val => emit('update:tempFilteredValue', column.filters?.prop || column.prop, val)"
         >
           <el-checkbox
             v-for="item in (Array.isArray(column.filters) ? column.filters : column.filters.options)"
@@ -148,8 +148,8 @@
         <el-radio-group
           v-if="column.filters && !Array.isArray(column.filters) && column.filters.type === 'radio'"
           style="display: flex;flex-direction: column;gap: 6px;"
-          :value="tempFilteredValue[column.prop]"
-          @input="val => emit('update:tempFilteredValue', column.prop, val)"
+          :value="tempFilteredValue[column.filters.prop || column.prop]"
+          @input="val => emit('update:tempFilteredValue', column.filters?.prop || column.prop, val)"
         >
           <el-radio
             v-for="item in column.filters.options"

package/src/components/EditableTable/index.vue

@@ -105,37 +105,36 @@
         :filtered-value="filteredValue[colorFilterConfig?.prop]"
       >
         <template #header="scope">
-          <div v-if="colorFilterConfig">
-            <biz-table-header-popover
-              :head-active="isColumnHeadActive(colorFilterConfig)"
-              :column="colorFilterConfig"
-              :showing-columns="showingColumns"
-              :temp-summary-list="tempSummaryList"
-              :temp-sorting-column="tempSortingColumn"
-              :temp-sort-type="tempSortType"
-              :temp-filtered-value="tempFilteredValue"
-              :temp-search-value="tempSearchValue"
-              @update:tempSummaryList="val => { tempSummaryList = val }"
-              @update:tempFilteredValue="(key, value) => { $set(tempFilteredValue, key, value) }"
-              @update:tempSearchValue="(key, value) => { $set(tempSearchValue, key, value) }"
-              @popover-show="() => handleHeaderPopoverShow(colorFilterConfig)"
-              @update:sort="(type) => handleSort(type, colorFilterConfig)"
-              @reset="() => handleHeaderOperationReset(colorFilterConfig, scope)"
-              @confirm="() => handleHeaderOperationConfirm(colorFilterConfig, scope)"
-            >
-              <template #custom>
-                <div class="editable-table__color-icon" />
-              </template>
-              <template #filter-item="item">
-                <slot
-                  :name="colorFilterConfig.prop + '-filter-item'"
-                  v-bind="item"
-                >
-                  {{ item.text }}
-                </slot>
-              </template>
-            </biz-table-header-popover>
-          </div>
+          <biz-table-header-popover
+            v-if="colorFilterConfig"
+            :head-active="isColumnHeadActive(colorFilterConfig)"
+            :column="colorFilterConfig"
+            :showing-columns="showingColumns"
+            :temp-summary-list="tempSummaryList"
+            :temp-sorting-column="tempSortingColumn"
+            :temp-sort-type="tempSortType"
+            :temp-filtered-value="tempFilteredValue"
+            :temp-search-value="tempSearchValue"
+            @update:tempSummaryList="val => { tempSummaryList = val }"
+            @update:tempFilteredValue="(key, value) => { $set(tempFilteredValue, key, value) }"
+            @update:tempSearchValue="(key, value) => { $set(tempSearchValue, key, value) }"
+            @popover-show="() => handleHeaderPopoverShow(colorFilterConfig)"
+            @update:sort="(type) => handleSort(type, colorFilterConfig)"
+            @reset="() => handleHeaderOperationReset(colorFilterConfig, scope)"
+            @confirm="() => handleHeaderOperationConfirm(colorFilterConfig, scope)"
+          >
+            <template #custom>
+              <div class="editable-table__color-icon" />
+            </template>
+            <template #filter-item="item">
+              <slot
+                :name="colorFilterConfig.prop + '-filter-item'"
+                v-bind="item"
+              >
+                {{ item.text }}
+              </slot>
+            </template>
+          </biz-table-header-popover>
           <div
             v-else
             class="editable-table__color-icon"

package/src/components/EditableTable/types/index.ts

@@ -27,7 +27,9 @@ type _IColumnConfigRequired = {
   filters?: {
     type?: 'checkbox' | 'radio',
     options: FiltersOption[]
-    default?: string | number | string[] | number[]
+    default?: string | number | string[] | number[],
+    /** 自定义参数 优先于最外层的prop */
+    prop?: string
   } | FiltersOption[]
   /** 格式化函数，用于自定义渲染 */
   formatter?: (row: any, column: IColumnConfig, value: any, index: number) => string | number;