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

package/package.json

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

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

@@ -92,10 +92,6 @@ export function useColumnHeaderOperation({ props, tableDomRef, emit, showingColu
           return !!(filteredValue.value[item.prop] as any[]).length
         }
 
-        if (item.type === 'slot') {
-          return item.active()
-        }
-
         return !!filteredValue.value[item.prop]
       }
     )
@@ -143,17 +139,15 @@ export function useColumnHeaderOperation({ props, tableDomRef, emit, showingColu
     const params: Record<string, any> = {};
 
     const processFilter = (filters: FilterListType) => {
-      filters
-        .filter(item => item.type !== 'slot')
-        .forEach((item) => {
-          if (item.type === 'doubleDatePicker' || item.type === 'monthDayPicker') {
-            const [start, end] = item.prop
-            params[start] = filteredValue.value[start];
-            params[end] = filteredValue.value[end];
-          } else {
-            params[item.prop] = filteredValue.value[item.prop];
-          }
-        });
+      filters.forEach((item) => {
+        if (item.type === 'doubleDatePicker' || item.type === 'monthDayPicker') {
+          const [start, end] = item.prop
+          params[start] = filteredValue.value[start];
+          params[end] = filteredValue.value[end];
+        } else {
+          params[item.prop] = filteredValue.value[item.prop];
+        }
+      });
     }
 
     // 仅提交显示的列的相关数据
@@ -248,7 +242,6 @@ export function useColumnHeaderOperation({ props, tableDomRef, emit, showingColu
 
   function handleResetFilterValue (column: IColumnConfig) {
     (column.filters || [])
-      .filter(item => item.type !== 'slot')
       .forEach(
         (item) => {
           if (item.type === 'radio' || item.type === 'checkbox') {
@@ -294,7 +287,6 @@ export function useColumnHeaderOperation({ props, tableDomRef, emit, showingColu
     // 设置搜索和过滤参数时，如果使用 showingColumns 遍历，会导致通过外部设置未显示的列的搜索和过滤参数丢失
     [props.colorFilterConfig, ...props.columnConfig].forEach(column => {
       (column?.filters ?? [])
-        .filter(item => item.type !== 'slot')
         .forEach(
           (item) => {
             if (item.type === 'doubleDatePicker' || item.type === 'monthDayPicker') {

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

@@ -40,12 +40,7 @@
           :key="index"
           class="editable-table-sort-filter__item editable-table__filter-group__filter"
         >
-          <slot
-            v-if="filterItem.type === 'slot'"
-            :name="filterItem.slotName"
-          />
           <component
-            v-else
             :is="componentMap[filterItem.type]"
             :config="filterItem"
             :temp-filtered-value="tempFilteredValue"
@@ -130,7 +125,7 @@ const emit = defineEmits<{
 }>()
 
 // 把 filterItem.type 映射到组件
-const componentMap: Record<Exclude<FilterItem['type'], 'slot'>, any> = {
+const componentMap: Record<FilterItem['type'], any> = {
   /** 输入框 */
   input: BizInputFilter,
   /** 日期范围 */

package/src/components/EditableTable/index.vue

@@ -44,6 +44,7 @@
       @selection-change="handleSelectionChange"
       @cell-mouse-enter="debouncedHoverHandler"
       @header-dragend="doTableLayout"
+      @row-dblclick="handleRowDblClick"
     >
       <el-table-column
         v-if="rowDragAble"
@@ -161,10 +162,10 @@
             :temp-filtered-value="tempFilteredValue"
             @update:tempSummaryList="val => { tempSummaryList = val }"
             @update:tempFilteredValue="(key, value) => { $set(tempFilteredValue, key, value) }"
-            @popover-show="() => handleOpenFilter(column)"
+            @popover-show="() => handleHeaderPopoverShow(column)"
             @update:sort="handleSort"
-            @reset="() => handleResetFilter(column)"
-            @confirm="() => handleConfirmFilter(column)"
+            @reset="() => handleHeaderOperationReset(column)"
+            @confirm="() => handleHeaderOperationConfirm(column)"
           >
             <template #summay-item>
               <slot
@@ -174,16 +175,6 @@
                 {{ column.label }}
               </slot>
             </template>
-            <!-- 动态地将父组件传递的所有slot下发给孙子组件（biz-table-header-popover），以实现slot的透传 -->
-            <template
-              v-for="(_, name) in $slots"
-              #[name]="slotProps"
-            >
-              <slot
-                :name="name"
-                v-bind="slotProps || column"
-              />
-            </template>
           </biz-table-header-popover>
         </template>
         <!-- 默认操作按钮，defaultOperations属性不为空数组时展示。编辑状态下隐藏 -->
@@ -404,12 +395,8 @@ interface IEmits {
   (e: 'search', param: Record<string, any>): void
   /** 排序 */
   (e: 'sort-change', param: { order: 'descending' | 'ascending' | null, prop: string }): void
-  /** 筛选条件打开 */
-  (e: 'open-filter', prop: string): void
-  /** 重置筛选 */
-  (e: 'reset-filter', prop: string): void
-  /** 筛选条件确认 */
-  (e: 'confirm-filter', prop: string): void
+  /** 双击某一行 */
+  (e: 'row-dblclick', param: any): void
 }
 
 const props = withDefaults(defineProps<IProps>(), {
@@ -578,6 +565,7 @@ const beforeDragStart = () => {
   return true;
 };
 
+// @ts-ignore
 useDragSort({
   emit,
   props,
@@ -617,26 +605,9 @@ const handleSelectionChange = (e) => {
   emit('selection-change', e);
 };
 
-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 handleRowDblClick = (e) => {
+  emit('row-dblclick', e);
+};
 
 const bizViewSettingDialogRef = ref(null as unknown as InstanceType<typeof BizViewSettingDialog>)
 const handleViewSettingShow = () => bizViewSettingDialogRef.value.open()

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

@@ -60,13 +60,7 @@ export interface IFilterColorRadio {
   options: Array<IFilterSelectOptions & { color: string }>
 }
 
-export interface IFilterSolt {
-  type: 'slot',
-  slotName: string,
-  active: () => boolean
-}
-
-export type FilterItem = IFilterInput | IFilterSelect | IFilterDoubleDatePicker | IFilterMonthDayPicker | IFilterColorRadio | IFilterSolt
+export type FilterItem = IFilterInput | IFilterSelect | IFilterDoubleDatePicker | IFilterMonthDayPicker | IFilterColorRadio
 
 /** 筛选组件类型 */
 export type FilterListType = Array<FilterItem>
@@ -94,6 +88,7 @@ type _IColumnConfigRequired = {
   /** 自定义颜色表头label */
   customColorLabel?: boolean;
   filters?: FilterListType;
+  selectOptions?: any
 }
 
 export type IColumnConfigRequired = _IColumnConfigRequired & Partial<Omit<TableColumn, keyof _IColumnConfigRequired>>