@lx-frontend/wrap-element-ui 1.0.19-beta.0 → 1.0.19-beta.2

package/package.json

@@ -1,10 +1,22 @@
 {
   "name": "@lx-frontend/wrap-element-ui",
-  "version": "1.0.19-beta.0",
+  "version": "1.0.19-beta.2",
   "description": "wrap-element-ui",
   "author": "",
   "main": "src/components/index.ts",
   "private": false,
+  "scripts": {
+    "clean": "rimraf dist",
+    "dev": "cross-env MODE=development storybook dev -p 6006",
+    "dist": "cross-env MODE=production pnpm build:lib && storybook dev -p 6006",
+    "build:lib": "pnpm clean && vite build",
+    "build:sb": "cross-env MODE=production rimraf storybook-static && pnpm build:lib && storybook build",
+    "preview": "serve ./storybook-static",
+    "publish:dev": "npm publish --access public --tag beta",
+    "publish:prod": "npm publish --access public",
+    "cdn": "gulp oss",
+    "lint": "eslint src"
+  },
   "files": [
     "README.md",
     "package.json",
@@ -57,17 +69,5 @@
     "vite-plugin-lib-inject-css": "^2.1.1",
     "vite-tsconfig-paths": "^4.3.2",
     "vue-template-compiler": "^2.6.10"
-  },
-  "scripts": {
-    "clean": "rimraf dist",
-    "dev": "cross-env MODE=development storybook dev -p 6006",
-    "dist": "cross-env MODE=production pnpm build:lib && storybook dev -p 6006",
-    "build:lib": "pnpm clean && vite build",
-    "build:sb": "cross-env MODE=production rimraf storybook-static && pnpm build:lib && storybook build",
-    "preview": "serve ./storybook-static",
-    "publish:dev": "npm publish --access public --tag beta",
-    "publish:prod": "npm publish --access public",
-    "cdn": "gulp oss",
-    "lint": "eslint src"
   }
 }

package/src/components/EditableTable/index.vue

@@ -562,7 +562,6 @@ const beforeDragStart = () => {
   return true;
 };
 
-// @ts-ignore
 useDragSort({
   emit,
   props,

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

@@ -88,7 +88,6 @@ type _IColumnConfigRequired = {
   /** 自定义颜色表头label */
   customColorLabel?: boolean;
   filters?: FilterListType;
-  selectOptions?: any
 }
 
 export type IColumnConfigRequired = _IColumnConfigRequired & Partial<Omit<TableColumn, keyof _IColumnConfigRequired>>

package/src/components/SearchForm/helper.ts

@@ -0,0 +1,25 @@
+import dayjs from "dayjs";
+
+/** 开始日期禁用配置 */
+export function genStartDateDisabledOptions(endDate: string, limit: number = 0) {
+  return {
+    disabledDate: (time: Date) => {
+      if (!endDate) return false;
+      
+      const currentDate = dayjs(time);
+      return currentDate.isAfter(dayjs(endDate).add(limit, 'day'), 'day');
+    }
+  };
+}
+
+/** 结束日期禁用配置 */
+export function genEndDateDisabledOptions(startDate: string, limit: number = 0) {
+  return {
+    disabledDate: (time: Date) => {
+      if (!startDate) return false;
+      
+      const currentDate = dayjs(time);
+      return currentDate.isBefore(dayjs(startDate).subtract(limit, 'day'), 'day');
+    }
+  };
+}

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,
+        doubleIsInline = true, maxlength = 255, doubleDatePickerLimit,
       }) in config"
       :key="label"
       :label="showLabel ? label : ''"
@@ -85,6 +85,7 @@
           format="yyyy-MM-dd"
           type="date"
           :placeholder="(placeholder || [])[0] || '开始日期'"
+          :picker-options="genStartDateDisabledOptions(formData[prop[1]], doubleDatePickerLimit)"
         />
         <el-date-picker
           @input="val => handleInput(val, prop[1], '', key)"
@@ -94,6 +95,7 @@
           format="yyyy-MM-dd"
           type="date"
           :placeholder="(placeholder || [])[1] || '结束日期'"
+          :picker-options="genEndDateDisabledOptions(formData[prop[0]], doubleDatePickerLimit)"
         />
         <el-checkbox
           :value="checkedIds[key]"
@@ -124,6 +126,8 @@
 </template>
 
 <script>
+import { genStartDateDisabledOptions, genEndDateDisabledOptions } from './helper';
+
 export default {
   name: 'SearchForm',
   props: {
@@ -187,6 +191,8 @@ export default {
     this.initialData = Object.freeze({ ...this.formData })
   },
   methods: {
+    genStartDateDisabledOptions,
+    genEndDateDisabledOptions,
     handleInput (val, prop, inputLimitCallback, key) {
       if (inputLimitCallback && !inputLimitCallback(val)) return false
       if (val) {