@fecp/designer 5.5.100 → 5.5.102

package/es/packages/mobile/src/index.vue.mjs

@@ -7,11 +7,12 @@ import "../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                          */
 /* empty css                                      */
 /* empty css                                       */
-import { getCurrentInstance, ref, onMounted, createBlock, createCommentVNode, unref, openBlock, withCtx } from "vue";
+import { getCurrentInstance, ref, provide, onMounted, createBlock, createCommentVNode, unref, openBlock, withCtx } from "vue";
 import MobilePage from "./page.vue.mjs";
 import api from "./api/index.mjs";
 import emitter from "./utils/eventBus.mjs";
 import { pageHistory } from "./utils/pageHistory.mjs";
+import { findPageById } from "./utils/common.mjs";
 /* empty css                                                           */
 /* empty css                                                             */
 /* empty css            */
@@ -48,7 +49,6 @@ const _sfc_main = {
         let option = await api.getAppById(ctx.$http, props.appId);
         pageList.value = ((_a = JSON.parse(option.pageConfig)) == null ? void 0 : _a.pageConfig) || [];
         pageHistory.clear();
-        console.log("🚀 ~ pageList ~ pageList.value:", pageList.value);
         let homePage;
         if (props.pageKey) {
           homePage = pageList.value.find((page) => page.isHome);
@@ -74,6 +74,7 @@ const _sfc_main = {
       }
     };
     const currentPage = ref(null);
+    const routePage = ref(null);
     function loadPage(pageId) {
       var _a;
       if (((_a = currentPage.value) == null ? void 0 : _a.id) == pageId) {
@@ -96,24 +97,12 @@ const _sfc_main = {
         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 = ref(null);
-    emitter.on("loadPage", (pageId) => {
+    const pageParams = ref({});
+    emitter.on("loadPage", (pageId, params) => {
       loadPage(pageId);
+      pageParams.value = params || { applyId: "7a16522c29e047d1be80e884773a87ac" };
     });
+    provide("pageList", pageList);
     onMounted(() => {
       loadConfig();
     });
@@ -130,8 +119,9 @@ const _sfc_main = {
           !unref(noTargetPage) ? (openBlock(), createBlock(unref(MobilePage), {
             key: 0,
             parentPage: unref(currentPage),
-            routePage: unref(routePage)
-          }, null, 8, ["parentPage", "routePage"])) : (openBlock(), createBlock(_component_van_empty, {
+            routePage: unref(routePage),
+            params: unref(pageParams)
+          }, null, 8, ["parentPage", "routePage", "params"])) : (openBlock(), createBlock(_component_van_empty, {
             key: 1,
             image: "search",
             description: "页面找不到了"
@@ -142,7 +132,7 @@ const _sfc_main = {
     };
   }
 };
-const MobileApp = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-67de5a65"]]);
+const MobileApp = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-4e4cf5f1"]]);
 export {
   MobileApp as default
 };

package/es/packages/mobile/src/page.vue.mjs

@@ -1,7 +1,9 @@
-import { ref, computed, watch, resolveComponent, createElementBlock, openBlock, Fragment, createBlock, createCommentVNode, createElementVNode, normalizeProps, mergeProps, unref, createVNode, guardReactiveProps, isRef, withCtx, resolveDynamicComponent } from "vue";
+import { ref, getCurrentInstance, computed, watch, onMounted, resolveComponent, createElementBlock, openBlock, Fragment, createBlock, createCommentVNode, createElementVNode, normalizeProps, mergeProps, unref, createVNode, guardReactiveProps, isRef, withCtx, resolveDynamicComponent, nextTick } from "vue";
 import "../../../node_modules/grid-layout-plus/es/index.mjs";
 import * as all from "./components/all.mjs";
 import { pageHistory } from "./utils/pageHistory.mjs";
+import { usePageEvents } from "./composables/usePageEvents.mjs";
+import hooks from "../node_modules/moment/dist/moment.mjs";
 /* empty css           */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.mjs";
 import De from "../../../node_modules/grid-layout-plus/es/components/grid-layout.vue.mjs";
@@ -18,19 +20,32 @@ const _sfc_main = {
     },
     routePage: {
       type: Object
+    },
+    params: {
+      type: Object,
+      default: {}
     }
   },
-  setup(__props) {
+  setup(__props, { expose: __expose }) {
+    var _a;
     const props = __props;
-    const formData = ref({});
+    const configLoading = ref(true);
+    const instance = getCurrentInstance();
+    const ctx = instance.proxy;
+    const formData = ref(props.params);
     function getComp(type) {
       return all[type];
     }
+    const gridLayout = ref();
     const layoutData = computed(() => {
-      var _a;
+      var _a2;
       if (Array.isArray(props.parentPage.layoutData)) {
-        return ((_a = props.parentPage.layoutData) == null ? void 0 : _a.map((item) => {
+        return ((_a2 = props.parentPage.layoutData) == null ? void 0 : _a2.map((item) => {
+          var _a3, _b;
           item.isResizable = false;
+          if ((_b = (_a3 = item.component) == null ? void 0 : _a3.props) == null ? void 0 : _b.autoHeight) {
+            item.class = "isAutoHeight";
+          }
           return item;
         })) || [];
       }
@@ -56,22 +71,142 @@ const _sfc_main = {
     watch(
       [() => props.parentPage, () => props.routePage],
       () => {
-        var _a;
+        var _a2;
         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;
+          tabbarActive.value = ((_a2 = props.routePage) == null ? void 0 : _a2.id) || props.parentPage.tabbarConfig.tabbarOptions[0].pageId;
         }
       },
       {
         immediate: true
       }
     );
+    const fieldsData = ref([]);
+    const hiddenFields = ref(props.parentPage.hiddenFields || []);
+    if (Array.isArray(props.parentPage.layoutData)) {
+      fieldsData.value = ((_a = props.parentPage.layoutData) == null ? void 0 : _a.map((item) => {
+        var _a2;
+        return { id: item.component.id, ...(_a2 = item.component) == null ? void 0 : _a2.props };
+      })) || [];
+    }
+    const loadFormData = (state) => {
+      formData.value = props.params;
+      console.log("初始化赋值", formData.value);
+    };
+    onMounted(async () => {
+      loadFormData();
+      const pageEvents = usePageEvents(() => ({
+        pageEventConfig: props.parentPage.pageEventConfig,
+        fields: [...fieldsData.value, ...hiddenFields.value],
+        instance,
+        formData: formData.value,
+        localConfig: props.parentPage,
+        components: {
+          form: ctx
+        }
+      }));
+      if (pageEvents) {
+        pageEvents.handleBeforeUnmount();
+        pageEvents.handleUnmounted();
+        if (props.parentPage.pageEventConfig) {
+          const onCreatedEvent = props.parentPage.pageEventConfig.find(
+            (e) => e.name === "onCreated"
+          );
+          if (onCreatedEvent) {
+            console.log("🚀 页面 onCreated 事件触发");
+            try {
+              await pageEvents.executeEvent("onCreated");
+            } catch (error) {
+            }
+          }
+        }
+      }
+      configLoading.value = false;
+    });
+    const valueFormatMap = {
+      date: "YYYYMMDD",
+      week: "YYYYMMDD",
+      month: "YYYYMM",
+      year: "YYYY",
+      datetime: "YYYYMMDDHHmmss"
+    };
+    const formValueFormatMap = {
+      date: "YYYY/MM/DD",
+      week: "YYYY/MM/DD",
+      month: "YYYY/MM",
+      year: "YYYY",
+      datetime: "YYYY/MM/DD HH:mm:ss"
+    };
+    const setFormData = (data) => {
+      const processedData = { ...data };
+      const processField = (field) => {
+        const fieldName = field.fieldName;
+        const fieldType = field.fieldType;
+        if (!processedData.hasOwnProperty(fieldName)) {
+          return;
+        }
+        const value = processedData[fieldName];
+        if (fieldName && (fieldType === "checkbox" || fieldType === "multipleSelection" || fieldType === "cascader" || fieldType === "area" || fieldType === "industry")) {
+          let splitStr = "|";
+          if (fieldType === "cascader" || fieldType === "area" || fieldType === "industry") {
+            splitStr = ",";
+          }
+          if (typeof value === "string" && value.includes(splitStr)) {
+            processedData[fieldName] = value.split(splitStr);
+          } else if (typeof value === "string" && value !== "") {
+            processedData[fieldName] = [value];
+          } else if (value === "" || value === null || value === void 0) {
+            processedData[fieldName] = [];
+          }
+          processedData[fieldName] = processedData[fieldName].map((item) => {
+            if (item.indexOf(",") > -1) {
+              return item.split(",");
+            }
+            return item;
+          });
+        } else if (fieldName && fieldType === "date" && value) {
+          const valueFormat = valueFormatMap[field.dateType] || "YYYYMMDD";
+          const formValueFormat = formValueFormatMap[field.dateType] || "YYYY/MM/DD";
+          processedData[fieldName] = hooks(value, valueFormat).format(
+            formValueFormat
+          );
+        }
+      };
+      if (fieldsData.value) {
+        fieldsData.value.forEach((component) => {
+          processField(component);
+        });
+      }
+      if (hiddenFields.value && hiddenFields.value.length > 0) {
+        hiddenFields.value.forEach((field) => {
+          processField(field);
+        });
+      }
+      formData.value = { ...formData.value, ...processedData };
+      nextTick(() => {
+        var _a2;
+        layoutData.value.forEach((item) => {
+          const id = item.component.id;
+          const dom = document.getElementById(id);
+          const labelDom = dom == null ? void 0 : dom.querySelector(".van-field__label");
+          if (labelDom) {
+            let height = labelDom.offsetHeight + 20;
+            item.h = height / 10;
+          }
+        });
+        (_a2 = gridLayout.value) == null ? void 0 : _a2.resizeEvent();
+      });
+    };
+    __expose({
+      setFormData
+    });
     return (_ctx, _cache) => {
       const _component_FecMobileNavBar = resolveComponent("FecMobileNavBar");
       const _component_page = resolveComponent("page", true);
       const _component_FecMobileMenuGrid = resolveComponent("FecMobileMenuGrid");
       const _component_FecMobileNoticeBar = resolveComponent("FecMobileNoticeBar");
       const _component_FecMobileDataStat = resolveComponent("FecMobileDataStat");
+      const _component_FecMobileAppDetail = resolveComponent("FecMobileAppDetail");
       const _component_FecMobileTabbar = resolveComponent("FecMobileTabbar");
       const _component_FecMobileActionBar = resolveComponent("FecMobileActionBar");
       return openBlock(), createElementBlock(Fragment, null, [
@@ -87,9 +222,13 @@ const _sfc_main = {
               createVNode(_component_FecMobileMenuGrid, normalizeProps(guardReactiveProps(__props.parentPage.layoutData.menuGridProps)), null, 16),
               createVNode(_component_FecMobileNoticeBar),
               createVNode(_component_FecMobileDataStat)
-            ], 64)) : __props.parentPage.type == "approval" ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [], 64)) : (openBlock(), createBlock(unref(De), {
+            ], 64)) : __props.parentPage.type == "approval" ? (openBlock(), createBlock(_component_FecMobileAppDetail, mergeProps({ key: 1 }, __props.parentPage.layoutData.appDetailProps, {
+              actionBar: __props.parentPage.layoutData.actionBar,
+              params: __props.params
+            }), null, 16, ["actionBar", "params"])) : (openBlock(), createBlock(unref(De), {
               key: 2,
-              ref: "gridLayout",
+              ref_key: "gridLayout",
+              ref: gridLayout,
               layout: unref(layoutData),
               "onUpdate:layout": _cache[0] || (_cache[0] = ($event) => isRef(layoutData) ? layoutData.value = $event : null),
               "row-height": rowHeight,
@@ -106,9 +245,10 @@ const _sfc_main = {
                     modelValue: unref(formData)[component.props.fieldName],
                     "onUpdate:modelValue": ($event) => unref(formData)[component.props.fieldName] = $event,
                     dataSources: unref(currentPage).dataSources,
+                    formData: unref(formData),
                     compId: component.id,
-                    currentPage: unref(currentPage)
-                  }), null, 16, ["modelValue", "onUpdate:modelValue", "dataSources", "compId", "currentPage"]))
+                    fields: [...unref(fieldsData), ...unref(hiddenFields)]
+                  }), null, 16, ["modelValue", "onUpdate:modelValue", "dataSources", "formData", "compId", "fields"]))
                 ])
               ]),
               _: 1
@@ -125,7 +265,7 @@ const _sfc_main = {
     };
   }
 };
-const MobilePage = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-71059c96"]]);
+const MobilePage = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-726a6dad"]]);
 export {
   MobilePage as default
 };

package/es/packages/mobile/src/utils/common.mjs

@@ -22,7 +22,22 @@ function removeEmptyValues(data) {
   }
   return result;
 }
+const findPageById = (pageList, pageId) => {
+  for (const item of pageList) {
+    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;
+};
 export {
   cloneDeep,
+  findPageById,
   removeEmptyValues
 };

package/es/packages/mobile/src/utils/datasource.mjs

@@ -2,8 +2,10 @@ import { reactive } from "vue";
 import { parseRouteParams } from "./parseRouteParams.mjs";
 import "../../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                          */
+/* empty css                                                                */
 /* empty css                                                              */
 /* empty css                                                                */
+import { ElLoading } from "../../../../node_modules/element-plus/es/components/loading/index.mjs";
 import { ElMessage } from "../../../../node_modules/element-plus/es/components/message/index.mjs";
 class DataSourceManager {
   constructor(options = {}) {
@@ -131,7 +133,16 @@ class DataSourceManager {
     this.loading = true;
     this.error = null;
     this.LoadingInstance.count++;
-    if (this.LoadingInstance.count === 1) ;
+    if (this.LoadingInstance.count === 1) {
+      this.LoadingInstance.target = ElLoading.service({
+        fullscreen: true,
+        lock: true,
+        text: "拼命加载中",
+        // spinner: loadingSvg,
+        background: "rgba(0, 0, 0, 0)",
+        customClass: "h-loading"
+      });
+    }
     try {
       const params = this.buildRequestParams(extraParams);
       const requestConfig = this.getRequestConfig();