@fecp/designer 5.5.64 → 5.5.66

package/lib/packages/mobile/src/components/navigation/tabbar/Tabbar.vue.js

@@ -6,6 +6,8 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 ;/* empty css                                               */
 ;/* empty css                                                      */
 const Vue = require("vue");
+;/* empty css             */
+const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
 const index = require("../../../../node_modules/vant/es/tabbar/index.js");
 const index$1 = require("../../../../node_modules/vant/es/tabbar-item/index.js");
 const _sfc_main = {
@@ -44,19 +46,21 @@ const _sfc_main = {
         default: Vue.withCtx(() => [
           (Vue.openBlock(true), Vue.createElementBlock(Vue.Fragment, null, Vue.renderList(__props.tabbarOptions, (item) => {
             return Vue.openBlock(), Vue.createBlock(_component_van_tabbar_item, {
-              icon: item.icon
+              icon: item.icon,
+              name: item.pageId
             }, {
               default: Vue.withCtx(() => [
                 Vue.createTextVNode(Vue.toDisplayString(item.title), 1)
               ]),
               _: 2
-            }, 1032, ["icon"]);
+            }, 1032, ["icon", "name"]);
           }), 256)),
-          Vue.renderSlot(_ctx.$slots, "default")
+          Vue.renderSlot(_ctx.$slots, "default", {}, void 0, true)
         ]),
         _: 3
       }, 16, ["modelValue"]);
     };
   }
 };
-exports.default = _sfc_main;
+const _Tabbar = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-04abcf62"]]);
+exports.default = _Tabbar;

package/lib/packages/mobile/src/index.vue.js

@@ -0,0 +1,138 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+require("../../../node_modules/element-plus/es/index.js");
+;/* empty css                                                       */
+;/* empty css                                                           */
+;/* empty css                                                               */
+;/* empty css                                                            */
+;/* empty css                                                            */
+;/* empty css                                                          */
+;/* empty css                                      */
+;/* empty css                                       */
+const Vue = require("vue");
+const page = require("./page.vue.js");
+const index$2 = require("./api/index.js");
+const eventBus = require("./utils/eventBus.js");
+const pageHistory = require("./utils/pageHistory.js");
+;/* empty css                                                           */
+;/* empty css                                                             */
+;/* empty css            */
+const _pluginVue_exportHelper = require("../../../_virtual/_plugin-vue_export-helper.js");
+const index = require("../../../node_modules/element-plus/es/components/container/index.js");
+const index$3 = require("../../../node_modules/element-plus/es/components/message/index.js");
+const index$1 = require("../node_modules/vant/es/empty/index.js");
+const _sfc_main = {
+  __name: "index",
+  props: {
+    appId: {
+      type: String,
+      default: ""
+    }
+  },
+  setup(__props) {
+    const props = __props;
+    const currentInstance = Vue.getCurrentInstance();
+    const ctx = currentInstance.proxy;
+    const pageList = Vue.ref({});
+    const layoutData = Vue.ref([]);
+    const configLoading = Vue.ref(true);
+    const loadConfig = async () => {
+      var _a, _b;
+      if (!props.appId) {
+        return;
+      }
+      configLoading.value = true;
+      try {
+        let option = await index$2.default.getAppById(ctx.$http, props.appId);
+        pageList.value = ((_a = JSON.parse(option.pageConfig)) == null ? void 0 : _a.pageConfig) || [];
+        let homePage = pageList.value.find((page2) => page2.isHome);
+        if (!homePage) {
+          homePage = (_b = pageList.value) == null ? void 0 : _b[0];
+        }
+        console.log("🚀 ~ pageList ~ pageList.value:", pageList.value);
+        loadPage(homePage);
+        pageHistory.pageHistory.init(homePage);
+      } catch (error) {
+        console.error("加载配置失败:", error);
+        index$3.ElMessage.error("加载配置失败");
+      } finally {
+        configLoading.value = false;
+      }
+    };
+    const currentPage = Vue.ref({});
+    function loadPage(page2) {
+      currentPage.value = { ...page2 };
+      layoutData.value = [...page2.layoutData].sort((a, b) => {
+        if (a.y !== b.y) {
+          return a.y - b.y;
+        }
+        return a.x - b.x;
+      });
+      layoutData.value.forEach((item) => item.isResizable = false);
+    }
+    function findPageById(pageList2, pageId) {
+      for (const item of pageList2) {
+        if (item.id == pageId) {
+          return item;
+        }
+        if (item.children && item.children.length > 0) {
+          const found = findPageById(item.children, pageId);
+          if (found) {
+            found.parentPage = item;
+            return found;
+          }
+        }
+      }
+      return null;
+    }
+    const routePage = Vue.ref(null);
+    eventBus.default.on("loadPage", (pageId) => {
+      var _a;
+      if (((_a = currentPage.value) == null ? void 0 : _a.id) == pageId) {
+        return;
+      }
+      const targetPage = findPageById(pageList.value, pageId);
+      if (targetPage) {
+        if (targetPage.parentPage) {
+          currentPage.value = targetPage.parentPage;
+          routePage.value = targetPage;
+        } else {
+          currentPage.value = targetPage;
+          routePage.value = null;
+        }
+        pageHistory.pageHistory.push(targetPage);
+      } else {
+        currentPage.value = null;
+        routePage.value = null;
+      }
+    });
+    Vue.onMounted(() => {
+      loadConfig();
+    });
+    return (_ctx, _cache) => {
+      const _component_van_empty = index$1.Empty;
+      const _component_el_container = index.ElContainer;
+      return !Vue.unref(configLoading) ? (Vue.openBlock(), Vue.createBlock(_component_el_container, {
+        key: 0,
+        direction: "vertical",
+        class: "fec-mobile-app",
+        ref: "fecMobileAppRef"
+      }, {
+        default: Vue.withCtx(() => [
+          Vue.unref(currentPage) ? (Vue.openBlock(), Vue.createBlock(Vue.unref(page.default), {
+            key: 0,
+            currentPage: Vue.unref(currentPage),
+            routePage: Vue.unref(routePage)
+          }, null, 8, ["currentPage", "routePage"])) : (Vue.openBlock(), Vue.createBlock(_component_van_empty, {
+            key: 1,
+            image: "search",
+            description: "页面找不到了"
+          }))
+        ]),
+        _: 1
+      }, 512)) : Vue.createCommentVNode("", true);
+    };
+  }
+};
+const MobileApp = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-78e0cbef"]]);
+exports.default = MobileApp;

package/lib/packages/mobile/src/page.vue.js

@@ -0,0 +1,117 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const Vue = require("vue");
+require("../../../node_modules/grid-layout-plus/es/index.js");
+const all = require("./components/all.js");
+;/* empty css           */
+const _pluginVue_exportHelper = require("../../../_virtual/_plugin-vue_export-helper.js");
+const gridLayout_vue = require("../../../node_modules/grid-layout-plus/es/components/grid-layout.vue.js");
+const _hoisted_1 = { class: "grid-wrapper no-scrollbar" };
+const _hoisted_2 = { class: "component-content" };
+const colNum = 24;
+const rowHeight = 10;
+const _sfc_main = {
+  __name: "page",
+  props: {
+    currentPage: {
+      type: Object,
+      required: true
+    },
+    routePage: {
+      type: Object
+    }
+  },
+  setup(__props) {
+    const props = __props;
+    const formData = Vue.ref({});
+    function getComp(type) {
+      return all[type];
+    }
+    const layoutData = Vue.computed(() => {
+      var _a;
+      if (Array.isArray(props.currentPage.layoutData)) {
+        return ((_a = props.currentPage.layoutData) == null ? void 0 : _a.map((item) => {
+          item.isResizable = false;
+          return item;
+        })) || [];
+      }
+      return props.currentPage.layoutData;
+    });
+    const tabbarActive = Vue.ref(0);
+    const childPage = Vue.ref(null);
+    function onTabbarChange(pageId) {
+      if (!pageId) {
+        return;
+      }
+      const page = props.currentPage.children.find((item) => item.id == pageId);
+      if (!page) ;
+      else {
+        childPage.value = page;
+      }
+      console.log("🚀 ~ onTabbarChange ~ page:", page);
+    }
+    Vue.onMounted(() => {
+      if (props.currentPage.footerType == "tabbar") {
+        tabbarActive.value = props.currentPage.tabbarConfig.tabbarOptions[0].pageId;
+        onTabbarChange(tabbarActive.value);
+      }
+    });
+    return (_ctx, _cache) => {
+      const _component_FecMobileNavBar = Vue.resolveComponent("FecMobileNavBar");
+      const _component_page = Vue.resolveComponent("page", true);
+      const _component_FecMobileMenuGrid = Vue.resolveComponent("FecMobileMenuGrid");
+      const _component_FecMobileNoticeBar = Vue.resolveComponent("FecMobileNoticeBar");
+      const _component_FecMobileDataStat = Vue.resolveComponent("FecMobileDataStat");
+      const _component_FecMobileTabbar = Vue.resolveComponent("FecMobileTabbar");
+      const _component_FecMobileActionBar = Vue.resolveComponent("FecMobileActionBar");
+      return Vue.openBlock(), Vue.createElementBlock(Vue.Fragment, null, [
+        __props.currentPage.isNavBar ? (Vue.openBlock(), Vue.createBlock(_component_FecMobileNavBar, Vue.normalizeProps(Vue.mergeProps({ key: 0 }, __props.currentPage.navBarConfig)), null, 16)) : Vue.createCommentVNode("", true),
+        Vue.createElementVNode("div", _hoisted_1, [
+          __props.currentPage.footerType == "tabbar" ? (Vue.openBlock(), Vue.createElementBlock(Vue.Fragment, { key: 0 }, [
+            __props.routePage || Vue.unref(childPage) ? (Vue.openBlock(), Vue.createBlock(_component_page, {
+              key: 0,
+              currentPage: __props.routePage || Vue.unref(childPage)
+            }, null, 8, ["currentPage"])) : Vue.createCommentVNode("", true)
+          ], 64)) : (Vue.openBlock(), Vue.createElementBlock(Vue.Fragment, { key: 1 }, [
+            __props.currentPage.type == "home" ? (Vue.openBlock(), Vue.createElementBlock(Vue.Fragment, { key: 0 }, [
+              Vue.createVNode(_component_FecMobileMenuGrid, Vue.normalizeProps(Vue.guardReactiveProps(__props.currentPage.layoutData.menuGridProps)), null, 16),
+              Vue.createVNode(_component_FecMobileNoticeBar),
+              Vue.createVNode(_component_FecMobileDataStat)
+            ], 64)) : __props.currentPage.type == "approval" ? (Vue.openBlock(), Vue.createElementBlock(Vue.Fragment, { key: 1 }, [], 64)) : (Vue.openBlock(), Vue.createBlock(Vue.unref(gridLayout_vue.default), {
+              key: 2,
+              ref: "gridLayout",
+              layout: Vue.unref(layoutData),
+              "onUpdate:layout": _cache[0] || (_cache[0] = ($event) => Vue.isRef(layoutData) ? layoutData.value = $event : null),
+              "row-height": rowHeight,
+              margin: [0, 0],
+              "col-num": colNum,
+              "use-css-transforms": false,
+              "is-draggable": false,
+              "is-resizable": false,
+              style: { "height": "100%" }
+            }, {
+              item: Vue.withCtx(({ item: { component } }) => [
+                Vue.createElementVNode("div", _hoisted_2, [
+                  (Vue.openBlock(), Vue.createBlock(Vue.resolveDynamicComponent(getComp(component.fieldType)), Vue.mergeProps(component.props, {
+                    modelValue: Vue.unref(formData)[component.props.fieldName],
+                    "onUpdate:modelValue": ($event) => Vue.unref(formData)[component.props.fieldName] = $event,
+                    dataSources: _ctx.dataSources
+                  }), null, 16, ["modelValue", "onUpdate:modelValue", "dataSources"]))
+                ])
+              ]),
+              _: 1
+            }, 8, ["layout"]))
+          ], 64))
+        ]),
+        __props.currentPage.footerType == "tabbar" ? (Vue.openBlock(), Vue.createBlock(_component_FecMobileTabbar, Vue.mergeProps({
+          key: 1,
+          modelValue: Vue.unref(tabbarActive),
+          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => Vue.isRef(tabbarActive) ? tabbarActive.value = $event : null)
+        }, __props.currentPage.tabbarConfig, { onChange: onTabbarChange }), null, 16, ["modelValue"])) : Vue.createCommentVNode("", true),
+        __props.currentPage.footerType == "actionBar" ? (Vue.openBlock(), Vue.createBlock(_component_FecMobileActionBar, Vue.normalizeProps(Vue.mergeProps({ key: 2 }, __props.currentPage.actionBarConfig)), null, 16)) : Vue.createCommentVNode("", true)
+      ], 64);
+    };
+  }
+};
+const MobilePage = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-08632dac"]]);
+exports.default = MobilePage;

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

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const mitt = require("../../../../node_modules/mitt/dist/mitt.js");
+const emitter = mitt.default();
+exports.default = emitter;

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/details/footer/Footer.vue.js

@@ -34,7 +34,8 @@ const _sfc_main = {
     };
     const showFooter = Vue.ref(true);
     Vue.onMounted(() => {
-      const layoutDom = formDetailsFooterRef.value.$el.closest(".fec-layout-row");
+      var _a;
+      const layoutDom = (_a = formDetailsFooterRef.value) == null ? void 0 : _a.$el.closest(".fec-layout-row");
       if (layoutDom && props.formMode == "query") {
         showFooter.value = false;
       }
@@ -75,5 +76,5 @@ const _sfc_main = {
     };
   }
 };
-const component = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-69e1a97b"]]);
+const component = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-deabd2d2"]]);
 exports.default = component;

package/lib/packages/vue/src/components/forms/cascader/Cascader.vue.js

@@ -109,7 +109,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           textArr.push(label);
         }
       });
-      return textArr.join("|");
+      return textArr.join(" / ");
     };
     const options = Vue.computed(() => {
       if (!props.optionConfig) return [];

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.64",
+  "version": "5.5.66",
   "main": "lib/designer/index.js",
   "module": "es/designer/index.mjs",
   "files": [