fast-element-plus 1.0.10 → 1.0.12

package/dist/index.full.js

@@ -18332,7 +18332,7 @@
      * @param {String} prop 当前 prop
      */
     handleRowAccordingToProp(row, prop) {
-      if (!prop.includes(".")) return row[prop] ?? null;
+      if (!prop.includes(".")) return row[prop];
       prop.split(".").forEach((item) => row = row[item]);
       return row;
     },
@@ -18698,31 +18698,60 @@
       } else {
         const end = /* @__PURE__ */ new Date();
         const start = /* @__PURE__ */ new Date();
-        switch (props.dataSearchRange) {
-          case "Past1D":
-            start.setDate(start.getDate() - 1);
-            break;
-          case "Past3D":
-            start.setDate(start.getDate() - 3);
-            break;
-          case "Past1W":
-            start.setDate(start.getDate() - 7);
-            break;
-          case "Past1M":
-            start.setMonth(start.getMonth() - 1);
-            break;
-          case "Past3M":
-            start.setMonth(start.getMonth() - 3);
-            break;
-          case "Past6M":
-            start.setMonth(start.getMonth() - 6);
-            break;
-          case "Past1Y":
-            start.setFullYear(start.getFullYear() - 1);
-            break;
-          case "Past3Y":
-            start.setFullYear(start.getFullYear() - 3);
-            break;
+        if (props.futureSearchTime) {
+          switch (props.dataSearchRange) {
+            case "Past1D":
+              end.setDate(end.getDate() + 1);
+              break;
+            case "Past3D":
+              end.setDate(end.getDate() + 3);
+              break;
+            case "Past1W":
+              end.setDate(end.getDate() + 7);
+              break;
+            case "Past1M":
+              end.setMonth(end.getMonth() + 1);
+              break;
+            case "Past3M":
+              end.setMonth(end.getMonth() + 3);
+              break;
+            case "Past6M":
+              end.setMonth(end.getMonth() + 6);
+              break;
+            case "Past1Y":
+              end.setFullYear(end.getFullYear() + 1);
+              break;
+            case "Past3Y":
+              end.setFullYear(end.getFullYear() + 3);
+              break;
+          }
+        } else {
+          switch (props.dataSearchRange) {
+            case "Past1D":
+              start.setDate(start.getDate() - 1);
+              break;
+            case "Past3D":
+              start.setDate(start.getDate() - 3);
+              break;
+            case "Past1W":
+              start.setDate(start.getDate() - 7);
+              break;
+            case "Past1M":
+              start.setMonth(start.getMonth() - 1);
+              break;
+            case "Past3M":
+              start.setMonth(start.getMonth() - 3);
+              break;
+            case "Past6M":
+              start.setMonth(start.getMonth() - 6);
+              break;
+            case "Past1Y":
+              start.setFullYear(start.getFullYear() - 1);
+              break;
+            case "Past3Y":
+              start.setFullYear(start.getFullYear() - 3);
+              break;
+          }
         }
         state.searchParam.searchTimeList = [ElementPlus.dayjs(start).format("YYYY-MM-DD 00:00:00"), ElementPlus.dayjs(end).format("YYYY-MM-DD 23:59:59")];
       }
@@ -19021,7 +19050,7 @@
       tag: Boolean,
       /** @description 枚举类型（渲染值的字典） */
       enum: {
-        type: utils.definePropType([Array, Function])
+        type: utils.definePropType([String, Array, Function])
       },
       /** @description 数据删除字段，如果为 true 会显示遮罩层 */
       dataDeleteField: String,
@@ -19196,10 +19225,17 @@
           row
         }), $index);
         let enumKey = props.prop;
+        let enumData;
         if (isString(props.enum)) {
           enumKey = props.enum;
+          enumData = enumMap.get(enumKey);
+        } else if (isArray(props.enum)) {
+          enumData = props.enum;
+        } else if (isFunction(props.enum)) {
+          enumData = props.enum({
+            row
+          });
         }
-        const enumData = enumMap.get(enumKey);
         const type = tableUtil.filterEnum(tableUtil.handleRowAccordingToProp(row, props.prop), enumData, null, "tag");
         return vue.createVNode(vue.Fragment, null, [copyRender(renderValue), renderValue ? vue.createVNode(ElementPlus.ElTag, {
           "type": type
@@ -23310,6 +23346,8 @@
     },
     /** @description 隐藏搜索时间 */
     hideSearchTime: Boolean,
+    /** @description 未来搜索时间 */
+    futureSearchTime: Boolean,
     /** @description 搜索时间范围 */
     dataSearchRange: {
       type: utils.definePropType(String),
@@ -23779,10 +23817,9 @@
         "type": "daterange",
         "modelValue": state.searchParam.searchTimeList,
         "onUpdate:modelValue": ($event) => state.searchParam.searchTimeList = $event,
-        "defaultTime": utils.dateUtil.getDefaultTime(),
-        "shortcuts": utils.dateUtil.getShortcuts(),
+        "defaultTime": utils.dateUtil.getDefaultTime(props.futureSearchTime),
+        "shortcuts": utils.dateUtil.getShortcuts(props.futureSearchTime),
         "valueFormat": "YYYY-MM-DD HH:mm:ss",
-        "disabledDate": utils.dateUtil.getDisabledDate,
         "clearable": false,
         "teleported": false,
         "unlinkPanels": true,
@@ -24454,6 +24491,14 @@
   const faTreeSelectProps = {
     ...SelectProps,
     ...treeProps,
+    /**
+     * 懒加载节点的缓存数据，结构与数据相同，用于获取未加载数据的标签
+     * @description The cached data of the lazy node, the structure is the same as the data, used to get the label of the unloaded data
+     */
+    cacheData: {
+      type: utils.definePropType(Array),
+      default: []
+    },
     /** @description whether Select is disabled 重载使其支持 ElForm*/
     disabled: {
       type: Boolean,
@@ -24508,14 +24553,6 @@
     expandOnClickNode: Boolean,
     /** @description 点击折叠节点，需要开启 'expandOnClickNode' */
     collapseOnClickNode: Boolean,
-    /**
-     * 懒加载节点的缓存数据，结构与数据相同，用于获取未加载数据的标签
-     * @description The cached data of the lazy node, the structure is the same as the data, used to get the label of the unloaded data
-     */
-    cacheData: {
-      type: utils.definePropType(Array),
-      default: []
-    },
     /** @description v-model绑定值 */
     modelValue: {
       type: utils.definePropType([String, Number, Boolean, Object, Array]),
@@ -24776,7 +24813,7 @@
       const elTreeSelectProps = utils.useProps(props, {
         ...SelectProps,
         ...treeProps
-      }, ["modelValue", "popperClass", "loading", "expandOnClickNode", "filterNodeMethod"]);
+      }, ["modelValue", "popperClass", "lazy", "loading", "expandOnClickNode", "filterNodeMethod"]);
       const elTreeSelectEmits = utils.useEmits({
         ...ElementPlus.selectEmits,
         ...ElementPlus.treeEmits
@@ -24790,6 +24827,7 @@
         },
         "modelValue": state.value,
         "onUpdate:modelValue": ($event) => state.value = $event,
+        "lazy": false,
         "loading": state.loading,
         "data": state.selectorData,
         "expandOnClickNode": props.checkOnClickNode ? false : props.expandOnClickNode,
@@ -28296,7 +28334,7 @@
     }
     app.use(ElementPlus);
   };
-  const version$1 = "1.0.10";
+  const version$1 = "1.0.12";
   const INSTALLED_KEY = /* @__PURE__ */ Symbol("INSTALLED_KEY");
   const makeInstaller = () => {
     const install2 = (app) => {