@fecp/designer 5.5.69 → 5.5.70

package/lib/packages/mobile/src/components/dataDisplay/cardList/CardList.vue.js

@@ -9,9 +9,17 @@ const VueRender = require("../../../utils/idea/VueRender.vue.js");
 ;/* empty css               */
 const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
 const index = require("../../../../node_modules/vant/es/list/index.js");
-const _sfc_main = {
+const _sfc_main = /* @__PURE__ */ Object.assign({
+  inheritAttrs: false
+}, {
   __name: "CardList",
   props: {
+    compId: {
+      type: String
+    },
+    currentPage: {
+      type: Object
+    },
     modelValue: {
       type: Array,
       default: []
@@ -63,6 +71,10 @@ const _sfc_main = {
     quickFilter: {
       type: Array,
       default: []
+    },
+    autoHeight: {
+      type: Boolean,
+      default: false
     }
   },
   setup(__props) {
@@ -70,14 +82,23 @@ const _sfc_main = {
     const currentInstance = Vue.getCurrentInstance();
     const ctx = currentInstance.proxy;
     const listRef = Vue.ref();
-    let isDesigner = false;
     Vue.onMounted(() => {
-      var _a, _b;
-      const device = (_b = (_a = listRef.value) == null ? void 0 : _a.$el) == null ? void 0 : _b.closest(".device-content");
-      if (device) {
-        isDesigner = true;
-      }
+      var _a, _b, _c, _d, _e;
+      (_b = (_a = listRef.value) == null ? void 0 : _a.$el) == null ? void 0 : _b.closest(".device-content");
       initDataSourceManager();
+      if (props.compId) {
+        if (props.autoHeight) {
+          const component = (_c = props.currentPage.layoutData) == null ? void 0 : _c.find(
+            (f) => {
+              var _a2;
+              return ((_a2 = f.component) == null ? void 0 : _a2.id) == props.compId;
+            }
+          );
+          const wrapperDom = (_e = (_d = listRef.value) == null ? void 0 : _d.$el) == null ? void 0 : _e.closest(".grid-wrapper");
+          const wrapperHeight = wrapperDom.offsetHeight;
+          component.h = wrapperHeight / 10;
+        }
+      }
     });
     function eventHandler(funcName, rowData) {
       console.log("🚀 ~ eventHandler ~ funcName, rowData:", funcName, rowData);
@@ -106,7 +127,7 @@ const _sfc_main = {
       });
       dataSourceManager.value.on("error", (err) => {
       });
-      if (dataSourceManager.value && isDesigner) {
+      if (dataSourceManager.value) {
         tableData.value = [];
         if (props.disabledLoad) {
           tableData.value = [];
@@ -119,7 +140,7 @@ const _sfc_main = {
       }
     }
     function onLoad() {
-      if (dataSourceManager.value && isDesigner) {
+      if (dataSourceManager.value) {
         loading.value = true;
         pageNo++;
         call();
@@ -199,6 +220,6 @@ const _sfc_main = {
       ], 64);
     };
   }
-};
-const _CardList = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-77da18e2"]]);
+});
+const _CardList = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-20941c4a"]]);
 exports.default = _CardList;

package/lib/packages/mobile/src/components/dataDisplay/menuGrid/MenuGrid.vue.js

@@ -119,5 +119,5 @@ const _sfc_main = {
     };
   }
 };
-const _MenuGrid = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-bde7e748"]]);
+const _MenuGrid = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-cf276af8"]]);
 exports.default = _MenuGrid;

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

@@ -34,7 +34,6 @@ const _sfc_main = {
     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;
@@ -49,9 +48,13 @@ const _sfc_main = {
         if (!homePage) {
           homePage = (_b = pageList.value) == null ? void 0 : _b[0];
         }
+        pageHistory.pageHistory.clear();
         console.log("🚀 ~ pageList ~ pageList.value:", pageList.value);
-        loadPage(homePage);
-        pageHistory.pageHistory.init(homePage);
+        let pageId = homePage.id;
+        if (homePage.footerType == "tabbar") {
+          pageId = homePage.tabbarConfig.tabbarOptions[0].pageId;
+        }
+        loadPage(pageId);
       } catch (error) {
         console.error("加载配置失败:", error);
         index$3.ElMessage.error("加载配置失败");
@@ -59,34 +62,8 @@ const _sfc_main = {
         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) => {
+    const currentPage = Vue.ref(null);
+    function loadPage(pageId) {
       var _a;
       if (((_a = currentPage.value) == null ? void 0 : _a.id) == pageId) {
         return;
@@ -105,6 +82,24 @@ const _sfc_main = {
         currentPage.value = null;
         routePage.value = null;
       }
+    }
+    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) {
+            return { ...found, parentPage: item };
+          }
+        }
+      }
+      return null;
+    }
+    const routePage = Vue.ref(null);
+    eventBus.default.on("loadPage", (pageId) => {
+      loadPage(pageId);
     });
     Vue.onMounted(() => {
       loadConfig();
@@ -121,9 +116,9 @@ const _sfc_main = {
         default: Vue.withCtx(() => [
           Vue.unref(currentPage) ? (Vue.openBlock(), Vue.createBlock(Vue.unref(page.default), {
             key: 0,
-            currentPage: Vue.unref(currentPage),
+            parentPage: Vue.unref(currentPage),
             routePage: Vue.unref(routePage)
-          }, null, 8, ["currentPage", "routePage"])) : (Vue.openBlock(), Vue.createBlock(_component_van_empty, {
+          }, null, 8, ["parentPage", "routePage"])) : (Vue.openBlock(), Vue.createBlock(_component_van_empty, {
             key: 1,
             image: "search",
             description: "页面找不到了"
@@ -134,5 +129,5 @@ const _sfc_main = {
     };
   }
 };
-const MobileApp = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-78e0cbef"]]);
+const MobileApp = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-e580f40a"]]);
 exports.default = MobileApp;

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

@@ -3,6 +3,7 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const Vue = require("vue");
 require("../../../node_modules/grid-layout-plus/es/index.js");
 const all = require("./components/all.js");
+const pageHistory = require("./utils/pageHistory.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");
@@ -13,7 +14,7 @@ const rowHeight = 10;
 const _sfc_main = {
   __name: "page",
   props: {
-    currentPage: {
+    parentPage: {
       type: Object,
       required: true
     },
@@ -29,13 +30,13 @@ const _sfc_main = {
     }
     const layoutData = Vue.computed(() => {
       var _a;
-      if (Array.isArray(props.currentPage.layoutData)) {
-        return ((_a = props.currentPage.layoutData) == null ? void 0 : _a.map((item) => {
+      if (Array.isArray(props.parentPage.layoutData)) {
+        return ((_a = props.parentPage.layoutData) == null ? void 0 : _a.map((item) => {
           item.isResizable = false;
           return item;
         })) || [];
       }
-      return props.currentPage.layoutData;
+      return props.parentPage.layoutData;
     });
     const tabbarActive = Vue.ref(0);
     const childPage = Vue.ref(null);
@@ -43,19 +44,30 @@ const _sfc_main = {
       if (!pageId) {
         return;
       }
-      const page = props.currentPage.children.find((item) => item.id == pageId);
+      const page = props.parentPage.children.find((item) => item.id == pageId);
       if (!page) ;
       else {
         childPage.value = page;
+        pageHistory.pageHistory.replace(page);
       }
       console.log("🚀 ~ onTabbarChange ~ page:", page);
     }
-    Vue.onMounted(() => {
-      if (props.currentPage.footerType == "tabbar") {
-        tabbarActive.value = props.currentPage.tabbarConfig.tabbarOptions[0].pageId;
-        onTabbarChange(tabbarActive.value);
-      }
+    const currentPage = Vue.computed(() => {
+      return childPage.value || props.parentPage || {};
     });
+    Vue.watch(
+      [() => props.parentPage, () => props.routePage],
+      () => {
+        var _a;
+        childPage.value = props.routePage;
+        if (props.parentPage.footerType == "tabbar") {
+          tabbarActive.value = ((_a = props.routePage) == null ? void 0 : _a.id) || props.parentPage.tabbarConfig.tabbarOptions[0].pageId;
+        }
+      },
+      {
+        immediate: true
+      }
+    );
     return (_ctx, _cache) => {
       const _component_FecMobileNavBar = Vue.resolveComponent("FecMobileNavBar");
       const _component_page = Vue.resolveComponent("page", true);
@@ -65,19 +77,19 @@ const _sfc_main = {
       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),
+        __props.parentPage.isNavBar ? (Vue.openBlock(), Vue.createBlock(_component_FecMobileNavBar, Vue.normalizeProps(Vue.mergeProps({ key: 0 }, __props.parentPage.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, {
+          __props.parentPage.footerType == "tabbar" ? (Vue.openBlock(), Vue.createElementBlock(Vue.Fragment, { key: 0 }, [
+            Vue.unref(childPage) ? (Vue.openBlock(), Vue.createBlock(_component_page, {
               key: 0,
-              currentPage: __props.routePage || Vue.unref(childPage)
-            }, null, 8, ["currentPage"])) : Vue.createCommentVNode("", true)
+              parentPage: Vue.unref(childPage)
+            }, null, 8, ["parentPage"])) : 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),
+            __props.parentPage.type == "home" ? (Vue.openBlock(), Vue.createElementBlock(Vue.Fragment, { key: 0 }, [
+              Vue.createVNode(_component_FecMobileMenuGrid, Vue.normalizeProps(Vue.guardReactiveProps(__props.parentPage.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), {
+            ], 64)) : __props.parentPage.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),
@@ -95,23 +107,25 @@ const _sfc_main = {
                   (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"]))
+                    dataSources: Vue.unref(currentPage).dataSources,
+                    compId: component.id,
+                    currentPage: Vue.unref(currentPage)
+                  }), null, 16, ["modelValue", "onUpdate:modelValue", "dataSources", "compId", "currentPage"]))
                 ])
               ]),
               _: 1
             }, 8, ["layout"]))
           ], 64))
         ]),
-        __props.currentPage.footerType == "tabbar" ? (Vue.openBlock(), Vue.createBlock(_component_FecMobileTabbar, Vue.mergeProps({
+        __props.parentPage.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)
+        }, __props.parentPage.tabbarConfig, { onChange: onTabbarChange }), null, 16, ["modelValue"])) : Vue.createCommentVNode("", true),
+        __props.parentPage.footerType == "actionBar" ? (Vue.openBlock(), Vue.createBlock(_component_FecMobileActionBar, Vue.normalizeProps(Vue.mergeProps({ key: 2 }, __props.parentPage.actionBarConfig)), null, 16)) : Vue.createCommentVNode("", true)
       ], 64);
     };
   }
 };
-const MobilePage = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-08632dac"]]);
+const MobilePage = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-71059c96"]]);
 exports.default = MobilePage;

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

@@ -51,6 +51,23 @@ class PageHistory {
     }
     this.saveHistory();
   }
+  replace(page) {
+    if (!page || !page.id) {
+      console.warn("页面配置无效，无法替换");
+      return;
+    }
+    if (this.history.length === 0) {
+      this.push(page);
+      return;
+    }
+    this.history[this.history.length - 1] = {
+      id: page.id,
+      name: page.name || "",
+      timestamp: Date.now(),
+      data: page
+    };
+    this.saveHistory();
+  }
   /**
    * 后退到上一个页面
    * @returns {Object|null} 返回上一个页面的配置，如果无法后退则返回 null
@@ -95,16 +112,6 @@ class PageHistory {
     this.history = [];
     this.saveHistory();
   }
-  /**
-   * 初始化或重置历史记录（仅包含首页）
-   * @param {Object} homePage - 首页配置
-   */
-  init(homePage) {
-    this.clear();
-    if (homePage) {
-      this.push(homePage);
-    }
-  }
 }
 const pageHistory = new PageHistory();
 exports.default = pageHistory;

package/lib/packages/vue/src/utils/eventFlow/actionHandlers.js

@@ -183,7 +183,7 @@ async function handleApiCall(node, data, fields, context, params) {
       success: false,
       message: error.message || "API调用失败",
       error,
-      shouldShowError: true
+      shouldShowError: false
       // API 调用失败需要提示错误
     };
   } finally {
@@ -777,7 +777,7 @@ async function handleUpload(node, data, fields, context) {
     return {
       success: false,
       message: "上传失败",
-      shouldShowError: true
+      shouldShowError: false
     };
   }
 }

package/package.json

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