@fecp/designer 5.5.65 → 5.5.67

package/lib/packages/mobile/src/utils/pageHistory.js

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const HISTORY_KEY = "mobile_page_history";
+const MAX_HISTORY_SIZE = 20;
+class PageHistory {
+  constructor() {
+    this.history = this.loadHistory();
+  }
+  /**
+   * 从 sessionStorage 加载历史记录
+   */
+  loadHistory() {
+    try {
+      const data = sessionStorage.getItem(HISTORY_KEY);
+      return data ? JSON.parse(data) : [];
+    } catch (e) {
+      console.error("加载页面历史失败:", e);
+      return [];
+    }
+  }
+  /**
+   * 保存历史记录到 sessionStorage
+   */
+  saveHistory() {
+    try {
+      sessionStorage.setItem(HISTORY_KEY, JSON.stringify(this.history));
+    } catch (e) {
+      console.error("保存页面历史失败:", e);
+    }
+  }
+  /**
+   * 添加页面到历史
+   * @param {Object} page - 页面配置对象，需包含 id
+   */
+  push(page) {
+    if (!page || !page.id) {
+      console.warn("页面配置无效，无法添加到历史");
+      return;
+    }
+    if (this.history.length > 0 && this.history[this.history.length - 1].id == page.id) {
+      return;
+    }
+    this.history.push({
+      id: page.id,
+      name: page.name || "",
+      timestamp: Date.now(),
+      data: page
+    });
+    if (this.history.length > MAX_HISTORY_SIZE) {
+      this.history.shift();
+    }
+    this.saveHistory();
+  }
+  /**
+   * 后退到上一个页面
+   * @returns {Object|null} 返回上一个页面的配置，如果无法后退则返回 null
+   */
+  back() {
+    if (this.history.length <= 1) {
+      return null;
+    }
+    this.history.pop();
+    this.saveHistory();
+    const prevPage = this.history[this.history.length - 1];
+    return prevPage ? prevPage.data : null;
+  }
+  /**
+   * 获取当前页面
+   * @returns {Object|null}
+   */
+  getCurrentPage() {
+    if (this.history.length == 0) {
+      return null;
+    }
+    return this.history[this.history.length - 1].data;
+  }
+  /**
+   * 判断是否可以后退
+   * @returns {Boolean}
+   */
+  canBack() {
+    return this.history.length > 1;
+  }
+  /**
+   * 获取历史记录数量
+   * @returns {Number}
+   */
+  getLength() {
+    return this.history.length;
+  }
+  /**
+   * 清空历史记录
+   */
+  clear() {
+    this.history = [];
+    this.saveHistory();
+  }
+  /**
+   * 初始化或重置历史记录（仅包含首页）
+   * @param {Object} homePage - 首页配置
+   */
+  init(homePage) {
+    this.clear();
+    if (homePage) {
+      this.push(homePage);
+    }
+  }
+}
+const pageHistory = new PageHistory();
+exports.default = pageHistory;
+exports.pageHistory = pageHistory;

package/lib/packages/vue/src/components/forms/date/Date.vue.js

@@ -56,6 +56,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     endDate: {
       type: String,
       default: ""
+    },
+    dateRange: {
+      type: String,
+      default: ""
     }
   },
   emits: ["update:modelValue", "change"],
@@ -89,6 +93,21 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         emit("change", val);
       }
     });
+    const disabledDate = (date) => {
+      if (!props.dateRange) return false;
+      debugger;
+      const today = /* @__PURE__ */ new Date();
+      today.setHours(0, 0, 0, 0);
+      const targetDate = new Date(date);
+      targetDate.setHours(0, 0, 0, 0);
+      if (props.dateRange === "beforeToday") {
+        return targetDate > today;
+      }
+      if (props.dateRange === "afterToday") {
+        return targetDate < today;
+      }
+      return false;
+    };
     return (_ctx, _cache) => {
       const _component_el_date_picker = index.ElDatePicker;
       return Vue.openBlock(), Vue.createElementBlock("div", _hoisted_1, [
@@ -102,6 +121,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           readonly: __props.readonly,
           format: computedFormat.value,
           "value-format": computedValueFormat.value,
+          "disabled-date": disabledDate,
           clearable: "",
           style: { "width": "100%" }
         }), null, 16, ["modelValue", "type", "placeholder", "disabled", "readonly", "format", "value-format"])

package/lib/packages/vue/src/components/forms/form/validation.js

@@ -78,7 +78,7 @@ function generateFieldRules(component, formData, fields) {
         };
         rules.push({
           validator,
-          trigger: "blur"
+          trigger: "change"
         });
       } catch (e) {
         console.error("Invalid validation pattern:", component.validationPattern, e);

package/lib/packages/vue/src/utils/parseFilterConfig.js

@@ -1,6 +1,13 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const parseRouteParams = require("./parseRouteParams.js");
+function isDateString(value) {
+  if (typeof value !== "string") return false;
+  return /^\d{4}\/\d{2}\/\d{2}$/.test(value);
+}
+function compareDate(a, b) {
+  return a.localeCompare(b);
+}
 function checkFilterMatch(filterConfig, data, fields = []) {
   if (!filterConfig || !data) {
     return false;
@@ -32,21 +39,39 @@ function checkConditionMatch(condition, data, fields) {
   const fieldName = (fieldInfo == null ? void 0 : fieldInfo.fieldName) || field;
   const dataValue = data[fieldName];
   const parsedValue = parseRouteParams.parseSingleParamValue(value, data, fields);
+  if ("null" == (dataValue ?? "null") || "null" == (parsedValue ?? "null")) {
+    return true;
+  }
   switch (operator) {
     case "eq":
       return dataValue == parsedValue;
     case "ne":
       return dataValue != parsedValue;
     case "gt":
+      if (isDateString(dataValue) && isDateString(parsedValue)) {
+        return compareDate(dataValue, parsedValue) > 0;
+      }
       return Number(dataValue) > Number(parsedValue);
     case "gte":
+      if (isDateString(dataValue) && isDateString(parsedValue)) {
+        return compareDate(dataValue, parsedValue) >= 0;
+      }
       return Number(dataValue) >= Number(parsedValue);
     case "lt":
+      if (isDateString(dataValue) && isDateString(parsedValue)) {
+        return compareDate(dataValue, parsedValue) < 0;
+      }
       return Number(dataValue) < Number(parsedValue);
     case "lte":
+      if (isDateString(dataValue) && isDateString(parsedValue)) {
+        return compareDate(dataValue, parsedValue) <= 0;
+      }
       return Number(dataValue) <= Number(parsedValue);
     case "range":
       if (!parsedValue || parsedValue.min == null || parsedValue.max == null) return false;
+      if (isDateString(dataValue) && isDateString(parsedValue.min) && isDateString(parsedValue.max)) {
+        return compareDate(dataValue, parsedValue.min) >= 0 && compareDate(dataValue, parsedValue.max) <= 0;
+      }
       const numValue = Number(dataValue);
       return numValue >= Number(parsedValue.min) && numValue <= Number(parsedValue.max);
     case "contains":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecp/designer",
-  "version": "5.5.65",
+  "version": "5.5.67",
   "main": "lib/designer/index.js",
   "module": "es/designer/index.mjs",
   "files": [