@lx-frontend/wrap-element-ui 1.0.7-beta.2 → 1.0.7-beta.4

package/package.json

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

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

@@ -166,7 +166,7 @@ export function useColumnHeaderOperation({ props, tableDomRef, sortFilterPopover
           if (!tempSearchValue.value[v.prop]) tempSearchValue.value[v.prop] = ''
           if (!validate) return
           if (v.validator) {
-            const result = v.validator(tempSearchValue.value[v.prop]);
+            const result = v.validator(tempSearchValue.value[v.prop]?.trim());
             if (validate && !result) validate = false;
           }
         })
@@ -194,7 +194,10 @@ export function useColumnHeaderOperation({ props, tableDomRef, sortFilterPopover
     }
 
     filteredValue.value = { ...tempFilteredValue.value };
-    searchValue.value = { ...tempSearchValue.value };
+    searchValue.value = Object.keys(tempSearchValue.value).reduce((pre, key) => {
+      pre[key] = tempSearchValue.value[key]?.trim() ?? '';
+      return pre;
+    }, {});
 
     emitSearch();
 

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

@@ -88,7 +88,7 @@
           style="display: flex;flex-direction: column;gap: 12px;"
         >
           <el-date-picker
-            @input="val => emit('update:tempSearchValue', column.doubleDatePicker.props[0], val)"
+            @input="val => emit('update:tempSearchValue', column.doubleDatePicker.props[0], val || '')"
             :value="tempSearchValue[column.doubleDatePicker.props[0]]"
             value-format="yyyy-MM-dd"
             format="yyyy-MM-dd"
@@ -97,7 +97,7 @@
             placeholder="开始日期"
           />
           <el-date-picker
-            @input="val => emit('update:tempSearchValue', column.doubleDatePicker.props[1], val)"
+            @input="val => emit('update:tempSearchValue', column.doubleDatePicker.props[1], val || '')"
             :value="tempSearchValue[column.doubleDatePicker.props[1]]"
             value-format="yyyy-MM-dd"
             format="yyyy-MM-dd"

package/src/components/EditableTable/index.vue

@@ -284,7 +284,7 @@
       <el-pagination
         background
         layout="sizes, prev, pager, next, jumper"
-        :page-sizes="[10, 15, 30, 60, 100]"
+        :page-sizes="pageSizes"
         :page-size.sync="pageSize"
         :pager-count="11"
         :current-page="currentPage"
@@ -353,6 +353,7 @@ interface IProps {
   localFilter?: boolean
   /** 页码 */
   currentPage: number
+  pageSizes?: number[]
 }
 
 interface IEmits {
@@ -398,6 +399,7 @@ const props = withDefaults(defineProps<IProps>(), {
   localSort: false,
   localFilter: false,
   currentPage: 1,
+  pageSizes: () => [10, 15, 30, 60, 100],
 });
 
 // 同defineProps一样，不支持泛型参数从外部导入
@@ -514,7 +516,7 @@ const {
   tempSortType,
   sortingColumn,
   isColumnFiltering,
-  // searchValue,
+  searchValue,
   inSorting,
 } = useColumnHeaderOperation({
   tableDomRef,
@@ -561,7 +563,7 @@ const doTableLayout = async () => {
 // 过滤出自定义属性，将其它属性全部透传给 el-table-column
 const getColumnBindProps = (column: IColumnConfig) => {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const { editAble, editType, slotName, inputType, options, filters, ...rest } = column;
+  const { editType, slotName, inputType, options, filters, ...rest } = column;
   return rest;
 };
 
@@ -593,6 +595,7 @@ defineExpose({
 watch([
   () => props.loading,
   () => props.currentPage,
+  () => pageSize,
 ], ([loading]) => {
   if (loading) return;
   tableDomRef.value.$el.querySelector('.el-table__body-wrapper').scrollTop = 0;

package/src/components/SearchForm/index.vue

@@ -54,7 +54,7 @@
         />
         <el-option
           v-for="({name, value, code, id}) in candidate"
-          :key="id || name"
+          :key="value || code || id"
           :value="value || code || id"
           :label="name"
         />