@lx-frontend/wrap-element-ui 1.0.19-beta.9 → 1.0.20-beta.1

package/package.json

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

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

@@ -93,7 +93,7 @@ export function useColumnHeaderOperation({ props, tableDomRef, emit, showingColu
         }
 
         if (item.type === 'slot') {
-          return item.active
+          return item.active()
         }
 
         return !!filteredValue.value[item.prop]

package/src/components/EditableTable/index.vue

@@ -163,8 +163,8 @@
             @update:tempFilteredValue="(key, value) => { $set(tempFilteredValue, key, value) }"
             @popover-show="() => handleOpenFilter(column)"
             @update:sort="handleSort"
-            @reset="() => handleHeaderOperationReset(column)"
-            @confirm="() => handleHeaderOperationConfirm(column)"
+            @reset="() => handleResetFilter(column)"
+            @confirm="() => handleConfirmFilter(column)"
           >
             <template #summay-item>
               <slot
@@ -405,7 +405,11 @@ interface IEmits {
   /** 排序 */
   (e: 'sort-change', param: { order: 'descending' | 'ascending' | null, prop: string }): void
   /** 筛选条件打开 */
-  (e: 'open-filter'): void
+  (e: 'open-filter', prop: string): void
+  /** 重置筛选 */
+  (e: 'reset-filter', prop: string): void
+  /** 筛选条件确认 */
+  (e: 'confirm-filter', prop: string): void
 }
 
 const props = withDefaults(defineProps<IProps>(), {
@@ -613,9 +617,25 @@ const handleSelectionChange = (e) => {
   emit('selection-change', e);
 };
 
-const handleOpenFilter = (column: any) => {
-  handleHeaderPopoverShow(column)
-  emit('open-filter');
+const handleOpenFilter = (column: IColumnConfig) => {
+  emit('open-filter', column.prop);
+  nextTick(() => {
+    handleHeaderPopoverShow(column)
+  })
+}
+
+const handleResetFilter = (column: IColumnConfig) => {
+  emit('reset-filter', column.prop);
+  nextTick(() => {
+    handleHeaderOperationReset(column)
+  })
+}
+
+const handleConfirmFilter = (column: IColumnConfig) => {
+  emit('confirm-filter', column.prop);
+  nextTick(() => {
+    handleHeaderOperationConfirm(column)
+  })
 }
 
 const bizViewSettingDialogRef = ref(null as unknown as InstanceType<typeof BizViewSettingDialog>)

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

@@ -63,7 +63,7 @@ export interface IFilterColorRadio {
 export interface IFilterSolt {
   type: 'slot',
   slotName: string,
-  active: boolean
+  active: () => boolean
 }
 
 export type FilterItem = IFilterInput | IFilterSelect | IFilterDoubleDatePicker | IFilterMonthDayPicker | IFilterColorRadio | IFilterSolt