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

package/package.json

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

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

@@ -53,24 +53,32 @@ const datePickerCommonProps = {
 
 
 const pickerStartOptions = computed(() => {
-  if ('startOptions' in config.value && config.value.startOptions) {
-    return config.value.startOptions;
+  // 自定义禁用选项优先级最高
+  if ('pickerOptions' in config.value && config.value.pickerOptions?.start) {
+    return config.value.pickerOptions.start;
   }
+
+  // 限制天数范围 自动生成禁用选项
   if ('limit' in config.value) {
     return genStartDateDisabledOptions(tempFilteredValue.value[config.value.prop[1]], config.value.limit);
   }
-  // 默认，无限制
+
+  // 默认（只限制起止时间，不限制范围）
   return genStartDateDisabledOptions(tempFilteredValue.value[config.value.prop[1]]);
 });
 
 const pickerEndOptions = computed(() => {
-  if ('endOptions' in config.value && config.value.endOptions) {
-    return config.value.endOptions;
+  // 自定义禁用选项优先级最高
+  if ('pickerOptions' in config.value && config.value.pickerOptions?.end) {
+    return config.value.pickerOptions.end;
   }
+
+  // 限制天数范围 自动生成禁用选项
   if ('limit' in config.value) {
     return genEndDateDisabledOptions(tempFilteredValue.value[config.value.prop[0]], config.value.limit);
   }
-  // 默认，无限制
+
+  // 默认（只限制起止时间，不限制范围）
   return genEndDateDisabledOptions(tempFilteredValue.value[config.value.prop[0]]);
 })
 

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

@@ -43,8 +43,10 @@ export interface IFilterDoubleDatePickerBase {
 }
 
 export interface IFilterDoubleDatePicker extends IFilterDoubleDatePickerBase {
-	startOptions?: DatePicker['pickerOptions'],
-  endOptions?: DatePicker['pickerOptions'],
+  pickerOptions?: {
+    start?: DatePicker['pickerOptions']
+    end?: DatePicker['pickerOptions']
+  }
 }
 
 export interface IFilterDoubleDatePickerLimit extends IFilterDoubleDatePickerBase {

package/src/components/SearchForm/index.vue

@@ -8,7 +8,7 @@
       v-for="({
         isEmpty = true, key, type, prop, label, placeholder, candidate, filterable=false, withoutAll=false, collapseTags=false,
         clearable=false, multiple=false, multipleLimit=0, changeCb, inputLimitCallback, slotName, dateType='date',
-        doubleIsInline = true, maxlength = 255, datePickerOptions, doubleDatePickerStartOptions, doubleDatePickerEndOptions, doubleDatePickerLimit
+        doubleIsInline = true, maxlength = 255, pickerOptions, limit
       }) in config"
       :key="label"
       :label="showLabel ? label : ''"
@@ -72,7 +72,7 @@
         :placeholder="dateType == 'date' ? placeholder || '选择日期' : '选择日期范围'"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
-        :picker-options="datePickerOptions"
+        :picker-options="pickerOptions"
       />
       <div
         v-if="type === 'doubleDatePicker'"
@@ -87,7 +87,7 @@
           type="date"
           :editable="false"
           :placeholder="(placeholder || [])[0] || '开始日期'"
-          :picker-options="doubleDatePickerStartOptions || genStartDateDisabledOptions(formData[prop[1]], doubleDatePickerLimit)"
+          :picker-options="pickerOptions?.start || genStartDateDisabledOptions(formData[prop[1]], limit)"
         />
         <el-date-picker
           @input="val => handleInput(val, prop[1], '', key)"
@@ -98,7 +98,7 @@
           type="date"
           :editable="false"
           :placeholder="(placeholder || [])[1] || '结束日期'"
-          :picker-options="doubleDatePickerEndOptions || genEndDateDisabledOptions(formData[prop[0]], doubleDatePickerLimit)"
+          :picker-options="pickerOptions?.end || genEndDateDisabledOptions(formData[prop[0]], limit)"
         />
         <el-checkbox
           :value="checkedIds[key]"

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

@@ -59,12 +59,14 @@ type DoubleDatePickerOptionBase = BaseDoubleOption & {
 }
 
 type DoubleDatePickerOption = DoubleDatePickerOptionBase & {
-  doubleDatePickerStartOptions?: DatePicker['pickerOptions']
-  doubleDatePickerEndOptions?: DatePicker['pickerOptions']
+  pickerOptions?: {
+    start?: DatePicker['pickerOptions']
+    end?: DatePicker['pickerOptions']
+  }
 }
 
 type DoubleDatePickerOptionLimit = DoubleDatePickerOptionBase & {
-  doubleDatePickerLimit?: number
+  limit?: number
 }
 
 export type SearchFormConfigOption =