@fecp/designer 5.5.100 → 5.5.102

package/lib/packages/mobile/src/components/form/fieldArea/FieldArea.vue.js

@@ -139,7 +139,7 @@ const _sfc_main = {
       return Vue.openBlock(), Vue.createBlock(Vue.unref(index$1.MobileField), Vue.mergeProps(_ctx.$attrs, {
         modelValue: Vue.unref(fieldTextValue),
         "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => Vue.isRef(fieldTextValue) ? fieldTextValue.value = $event : null),
-        isLink: __props.readonly ? false : true,
+        isLink: __props.readonly || __props.disabled ? false : true,
         readonly: "",
         disabled: __props.disabled,
         onOpenPicker: _cache[5] || (_cache[5] = () => {
@@ -160,11 +160,13 @@ const _sfc_main = {
               Vue.createVNode(_component_van_cascader, Vue.mergeProps(_ctx.$attrs, {
                 modelValue: Vue.unref(pickerValue),
                 "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => Vue.isRef(pickerValue) ? pickerValue.value = $event : null),
+                title: `${_ctx.$attrs.label}`,
                 options: Vue.unref(finalOptions),
+                "field-names": __props.treeOptionsFieldNames,
                 placeholder: "请选择",
                 onFinish,
                 onClose: _cache[2] || (_cache[2] = ($event) => showPicker.value = false)
-              }), null, 16, ["modelValue", "options"])
+              }), null, 16, ["modelValue", "title", "options", "field-names"])
             ]),
             _: 1
           }, 8, ["show"])

package/lib/packages/mobile/src/components/form/fieldCalendarPicker/FieldCalendarPicker.vue.js

@@ -139,7 +139,7 @@ const _sfc_main = {
       return Vue.openBlock(), Vue.createBlock(Vue.unref(index.MobileField), Vue.mergeProps(_ctx.$attrs, {
         modelValue: Vue.unref(fieldTextValue),
         "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => Vue.isRef(fieldTextValue) ? fieldTextValue.value = $event : null),
-        isLink: __props.readonly ? false : true,
+        isLink: __props.readonly || __props.disabled ? false : true,
         readonly: "",
         disabled: __props.disabled,
         onOpenPicker: _cache[3] || (_cache[3] = () => {

package/lib/packages/mobile/src/components/form/fieldCascaderPicker/fieldCascaderPicker.vue.js

@@ -134,7 +134,7 @@ const _sfc_main = {
       return Vue.openBlock(), Vue.createBlock(Vue.unref(index.MobileField), Vue.mergeProps(_ctx.$attrs, {
         modelValue: Vue.unref(fieldTextValue),
         "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => Vue.isRef(fieldTextValue) ? fieldTextValue.value = $event : null),
-        isLink: __props.readonly ? false : true,
+        isLink: __props.readonly || __props.disabled ? false : true,
         readonly: "",
         disabled: __props.disabled,
         onOpenPicker: _cache[5] || (_cache[5] = () => {

package/lib/packages/mobile/src/components/form/fieldDatePicker/FieldDatePicker.vue.js

@@ -125,7 +125,7 @@ const _sfc_main = {
       return Vue.openBlock(), Vue.createBlock(Vue.unref(index.MobileField), Vue.mergeProps(_ctx.$attrs, {
         modelValue: Vue.unref(fieldTextValue),
         "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => Vue.isRef(fieldTextValue) ? fieldTextValue.value = $event : null),
-        isLink: __props.readonly ? false : true,
+        isLink: __props.readonly || __props.disabled ? false : true,
         readonly: "",
         disabled: __props.disabled,
         onOpenPicker: _cache[5] || (_cache[5] = () => {

package/lib/packages/mobile/src/components/form/fieldDateTimePicker/FieldDateTimePicker.vue.js

@@ -124,7 +124,7 @@ const _sfc_main = {
       return Vue.openBlock(), Vue.createBlock(Vue.unref(index.MobileField), Vue.mergeProps(_ctx.$attrs, {
         modelValue: Vue.unref(fieldTextValue),
         "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => Vue.isRef(fieldTextValue) ? fieldTextValue.value = $event : null),
-        isLink: __props.readonly ? false : true,
+        isLink: __props.readonly || __props.disabled ? false : true,
         readonly: "",
         disabled: __props.disabled,
         onOpenPicker: _cache[6] || (_cache[6] = () => {

package/lib/packages/mobile/src/components/form/fieldIndustry/FieldIndustry.vue.js

@@ -80,21 +80,24 @@ const _sfc_main = {
       }
       return data.map((node) => processNode(node, 0));
     }
-    const fieldTextValue = Vue.ref("");
     const showPicker = Vue.ref(false);
     const emit = __emit;
     const pickerValue = Vue.computed(() => {
-      const value = props.modelValue.split("/");
-      return value[value.length - 1];
+      const value = props.modelValue;
+      let val = value[value.length - 1];
+      if (val.length > 1) {
+        return val.substring(1);
+      }
+      return val;
     });
     function getDisplayValue(options, fieldNames, modelValue) {
-      const { label, value, children } = fieldNames;
-      const values = modelValue.split("/");
+      const { text, value, children } = fieldNames;
+      const values = modelValue;
       const displayValues = [];
       function findValueInOptions(currentOptions, targetValue) {
         for (const option of currentOptions) {
           if (option[value] === targetValue) {
-            return option[label];
+            return option[text];
           }
           if (option[children] && option[children].length > 0) {
             const result = findValueInOptions(option[children], targetValue);
@@ -105,7 +108,11 @@ const _sfc_main = {
         }
         return null;
       }
-      for (const val of values) {
+      for (let i = 0; i < values.length; i++) {
+        let val = values[i];
+        if (i > 0) {
+          val = val.substring(1);
+        }
         const displayValue = findValueInOptions(options, val);
         if (displayValue) {
           displayValues.push(displayValue);
@@ -113,24 +120,26 @@ const _sfc_main = {
       }
       return displayValues.join("/");
     }
-    Vue.watch(
-      [() => props.modelValue, finalOptions],
-      ([value, options]) => {
-        if (!value) {
-          fieldTextValue.value = "";
-          return;
-        }
-        fieldTextValue.value = getDisplayValue(
-          options,
-          props.treeOptionsFieldNames,
-          value
-        );
-      },
-      { immediate: true }
-    );
+    const fieldTextValue = Vue.computed(() => {
+      return getDisplayValue(
+        finalOptions.value,
+        props.treeOptionsFieldNames,
+        props.modelValue
+      );
+    });
     const onFinish = ({ selectedOptions }) => {
-      const value = selectedOptions.map((option) => option[props.treeOptionsFieldNames.value]).join("/");
-      emit("update:modelValue", value);
+      const value = selectedOptions.map(
+        (option) => option[props.treeOptionsFieldNames.value]
+      );
+      const realValue = [];
+      for (let i = 0; i < value.length; i++) {
+        if (i > 0) {
+          realValue.push(value[0] + value[i]);
+        } else {
+          realValue.push(value[i]);
+        }
+      }
+      emit("update:modelValue", realValue);
       showPicker.value = false;
     };
     return (_ctx, _cache) => {
@@ -140,7 +149,7 @@ const _sfc_main = {
       return Vue.openBlock(), Vue.createBlock(Vue.unref(index.MobileField), Vue.mergeProps(_ctx.$attrs, {
         modelValue: Vue.unref(fieldTextValue),
         "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => Vue.isRef(fieldTextValue) ? fieldTextValue.value = $event : null),
-        isLink: __props.readonly ? false : true,
+        isLink: __props.readonly || __props.disabled ? false : true,
         readonly: "",
         disabled: __props.disabled,
         onOpenPicker: _cache[5] || (_cache[5] = () => {
@@ -161,11 +170,13 @@ const _sfc_main = {
               Vue.createVNode(_component_van_cascader, Vue.mergeProps(_ctx.$attrs, {
                 modelValue: Vue.unref(pickerValue),
                 "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => Vue.isRef(pickerValue) ? pickerValue.value = $event : null),
+                title: `${_ctx.$attrs.label}`,
                 options: Vue.unref(finalOptions),
+                "field-names": __props.treeOptionsFieldNames,
                 placeholder: "请选择",
                 onFinish,
                 onClose: _cache[2] || (_cache[2] = ($event) => showPicker.value = false)
-              }), null, 16, ["modelValue", "options"])
+              }), null, 16, ["modelValue", "title", "options", "field-names"])
             ]),
             _: 1
           }, 8, ["show"])

package/lib/packages/mobile/src/components/form/fieldPicker/FieldPicker.vue.js

@@ -15,33 +15,14 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 ;/* empty css                                                 */
 const Vue = require("vue");
 const index = require("../field/index.js");
-require("../../../utils/optionUtil.js");
+const optionUtil = require("../../../utils/optionUtil.js");
+const common = require("../../../utils/common.js");
 const index$2 = require("../../../../node_modules/vant/es/picker/index.js");
 const index$1 = require("../../../../node_modules/vant/es/popup/index.js");
 const index$3 = require("../../../../node_modules/vant/es/icon/index.js");
 const _sfc_main = {
   __name: "FieldPicker",
   props: {
-    // optionType: {
-    //   type: String,
-    //   default: "static",
-    // },
-    // dicKey: {
-    //   type: String,
-    //   default: "",
-    // },
-    // dicList: {
-    //   type: Array,
-    //   default: [],
-    // },
-    // dataSource: {
-    //   type: String,
-    //   default: "",
-    // },
-    // dataSourceParams: {
-    //   type: Object,
-    //   default: {},
-    // },
     pickerOptions: {
       type: Array,
       default: []
@@ -65,39 +46,69 @@ const _sfc_main = {
       type: Boolean,
       default: false
     },
-    "is-link": false
+    "is-link": false,
+    optionConfig: {
+      type: Object,
+      default: () => ({})
+    },
+    dataSources: {
+      type: Array,
+      default: () => []
+    },
+    formData: {
+      type: Object,
+      default: () => {
+      }
+    },
+    fields: {
+      type: Array,
+      default: () => []
+    }
   },
   emits: ["update:modelValue"],
   setup(__props, { emit: __emit }) {
+    const currentInstance = Vue.getCurrentInstance();
+    const ctx = currentInstance.proxy;
     const props = __props;
     Vue.useAttrs();
     const finalOptions = Vue.ref([]);
-    const fieldTextValue = Vue.ref("");
+    Vue.watch(
+      () => common.cloneDeep(props.optionConfig),
+      (val) => {
+        optionUtil.getOptions({
+          ctx,
+          dataSources: props.dataSources,
+          formData: props.formData,
+          fields: props.fields,
+          ...props.optionConfig
+        }).then((data) => {
+          finalOptions.value = data;
+        });
+      },
+      {
+        deep: true,
+        immediate: true
+      }
+    );
     const showPicker = Vue.ref(false);
     const emit = __emit;
     const pickerValue = Vue.computed({
       get: () => {
         const value = props.modelValue;
-        return [value];
+        return value.split(",");
       },
       set: (val) => {
-        emit("update:modelValue", val);
+        emit("update:modelValue", val.join(","));
       }
     });
-    Vue.watch(
-      [() => props.modelValue, finalOptions],
-      ([value, options]) => {
-        if (!value) {
-          fieldTextValue.value = "";
-          return;
-        }
-        const optionItem = options.find((item) => item.value == value);
-        fieldTextValue.value = optionItem == null ? void 0 : optionItem.text;
-      },
-      { immediate: true }
-    );
+    const fieldTextValue = Vue.computed(() => {
+      const selectedOption = finalOptions.value.find(
+        (option) => option.value == pickerValue.value.join(",")
+      );
+      return selectedOption ? selectedOption.label : "";
+    });
     const onConfirm = ({ selectedValues, selectedOptions }) => {
-      pickerValue.value = selectedValues[0];
+      pickerValue.value = selectedValues;
       showPicker.value = false;
     };
     return (_ctx, _cache) => {
@@ -107,7 +118,7 @@ const _sfc_main = {
       return Vue.openBlock(), Vue.createBlock(Vue.unref(index.MobileField), Vue.mergeProps(_ctx.$attrs, {
         modelValue: Vue.unref(fieldTextValue),
         "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => Vue.isRef(fieldTextValue) ? fieldTextValue.value = $event : null),
-        isLink: __props.readonly ? false : true,
+        isLink: __props.readonly || __props.disabled ? false : true,
         readonly: "",
         disabled: __props.disabled,
         onOpenPicker: _cache[4] || (_cache[4] = () => {
@@ -126,12 +137,18 @@ const _sfc_main = {
           }, {
             default: Vue.withCtx(() => [
               Vue.createVNode(_component_van_picker, Vue.mergeProps(_ctx.$attrs, {
+                title: `${_ctx.$attrs.label}`,
                 columns: Vue.unref(finalOptions),
+                "columns-field-names": {
+                  text: "label",
+                  value: "value",
+                  children: "children"
+                },
                 "model-value": Vue.unref(pickerValue),
                 readonly: false,
                 onConfirm,
                 onCancel: _cache[1] || (_cache[1] = ($event) => showPicker.value = false)
-              }), null, 16, ["columns", "model-value"])
+              }), null, 16, ["title", "columns", "model-value"])
             ]),
             _: 1
           }, 8, ["show"])

package/lib/packages/mobile/src/components/form/fieldTimePicker/FieldTimePicker.vue.js

@@ -127,7 +127,7 @@ const _sfc_main = {
       return Vue.openBlock(), Vue.createBlock(Vue.unref(index.MobileField), Vue.mergeProps(_ctx.$attrs, {
         modelValue: Vue.unref(fieldTextValue),
         "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => Vue.isRef(fieldTextValue) ? fieldTextValue.value = $event : null),
-        isLink: __props.readonly ? false : true,
+        isLink: __props.readonly || __props.disabled ? false : true,
         readonly: "",
         disabled: __props.disabled,
         onOpenPicker: _cache[5] || (_cache[5] = () => {

package/lib/packages/mobile/src/components/navigation/tabs/Tabs.vue.js

@@ -8,13 +8,20 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 ;/* empty css                                                     */
 ;/* empty css                                              */
 const Vue = require("vue");
+const common = require("../../../utils/common.js");
+const page = require("../../../page.vue.js");
 ;/* empty css           */
 const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
 const index = require("../../../../node_modules/vant/es/tabs/index.js");
 const index$1 = require("../../../../node_modules/vant/es/tab/index.js");
+const _hoisted_1 = { class: "fec-tab-content" };
 const _sfc_main = {
   __name: "Tabs",
   props: {
+    params: {
+      type: Object,
+      default: {}
+    },
     modelValue: {
       type: String,
       default: ""
@@ -38,6 +45,7 @@ const _sfc_main = {
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
+    const pageList = Vue.inject("pageList");
     const activeName = Vue.computed({
       get: () => {
         return props.modelValue;
@@ -53,6 +61,19 @@ const _sfc_main = {
         return props.height + "px";
       }
     });
+    const pageCache = Vue.computed(() => {
+      const cache = {};
+      props.options.forEach((item) => {
+        if (item.pageId) {
+          cache[item.pageId] = common.findPageById(pageList.value, item.pageId);
+        }
+      });
+      console.log("🚀 ~ cache:", cache);
+      return cache;
+    });
+    const getPage = (pageId) => {
+      return pageCache.value[pageId] || null;
+    };
     return (_ctx, _cache) => {
       const _component_van_tab = index$1.Tab;
       const _component_van_tabs = index.Tabs;
@@ -64,19 +85,27 @@ const _sfc_main = {
           sticky: "",
           class: "fec-tabs",
           active: Vue.unref(activeName),
-          "onUpdate:active": _cache[0] || (_cache[0] = ($event) => Vue.isRef(activeName) ? activeName.value = $event : null)
+          "onUpdate:active": _cache[0] || (_cache[0] = ($event) => Vue.isRef(activeName) ? activeName.value = $event : null),
+          "lazy-render": ""
         }, {
           default: Vue.withCtx(() => [
             (Vue.openBlock(true), Vue.createElementBlock(Vue.Fragment, null, Vue.renderList(__props.options, (item) => {
               return Vue.openBlock(), Vue.createBlock(_component_van_tab, Vue.mergeProps({ ref_for: true }, item, {
+                name: item.id,
                 replace: "",
                 "show-zero-badge": false
               }), {
                 default: Vue.withCtx(() => [
-                  Vue.createTextVNode(Vue.toDisplayString(item.title), 1)
+                  Vue.createElementVNode("div", _hoisted_1, [
+                    item.pageId && getPage(item.pageId) ? (Vue.openBlock(), Vue.createBlock(page.default, {
+                      key: 0,
+                      parentPage: getPage(item.pageId),
+                      params: __props.params
+                    }, null, 8, ["parentPage", "params"])) : Vue.createCommentVNode("", true)
+                  ])
                 ]),
                 _: 2
-              }, 1040);
+              }, 1040, ["name"]);
             }), 256))
           ]),
           _: 1
@@ -85,5 +114,5 @@ const _sfc_main = {
     };
   }
 };
-const _Tabs = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-b46f66e8"]]);
+const _Tabs = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-3ac885e8"]]);
 exports.default = _Tabs;

package/lib/packages/mobile/src/composables/usePageEvents.js

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const Vue = require("vue");
+;/* empty css                                                          */
+;/* empty css                                                                */
+;/* empty css                                                              */
+;/* empty css                                                                */
+;/* empty css                                                              */
+;/* empty css                                                               */
+;/* empty css                                                                */
+;/* empty css                                                                    */
+const eventFlowHandler = require("../utils/eventFlow/eventFlowHandler.js");
+function usePageEvents(getOptions) {
+  if (typeof getOptions !== "function") {
+    const staticOptions = getOptions;
+    getOptions = () => staticOptions;
+  }
+  const executeEvent = async (eventName) => {
+    const options = getOptions();
+    const { pageEventConfig, instance, formData, localConfig, components, fields, initSearchData } = options;
+    if (!pageEventConfig || !Array.isArray(pageEventConfig) || pageEventConfig.length === 0) {
+      console.log(`页面事件 ${eventName} 未配置或配置未加载完成，跳过执行`);
+      return;
+    }
+    const eventConfig = pageEventConfig.find((e) => e.name === eventName);
+    if (!eventConfig || !eventConfig.eventFlow) {
+      console.log(`页面事件 ${eventName} 未找到事件流配置，跳过执行`);
+      return;
+    }
+    const { getEventHandlers: createEventHandlers } = eventFlowHandler.useEventFlow({
+      fields: fields || [],
+      instance,
+      localConfig: localConfig || {},
+      components: components || {},
+      metadata: {
+        initSearchData
+      }
+    });
+    const handler = createEventHandlers(
+      {},
+      formData || {},
+      [eventConfig]
+    );
+    const eventKeys = Object.keys(handler);
+    if (eventKeys.length > 0) {
+      console.log(`执行页面事件 ${eventName}`);
+      await handler[eventKeys[0]]();
+    }
+  };
+  const handleCreated = (checkConfigLoaded) => {
+    console.log("🚀 页面 onCreated 事件处理器已注册（将在配置加载完成后触发）");
+  };
+  const handleMounted = (checkConfigLoaded) => {
+    Vue.onMounted(() => {
+      console.log("🚀 页面 onMounted 事件触发");
+      executeEvent("onMounted");
+    });
+  };
+  const handleBeforeUnmount = () => {
+    Vue.onBeforeUnmount(() => {
+      console.log("🧹 页面 onBeforeUnmount 事件触发");
+      executeEvent("onBeforeUnmount");
+    });
+  };
+  const handleUnmounted = () => {
+    Vue.onUnmounted(() => {
+      console.log("✅ 页面 onUnmounted 事件触发");
+      executeEvent("onUnmounted");
+    });
+  };
+  return {
+    handleCreated,
+    handleMounted,
+    handleBeforeUnmount,
+    handleUnmounted,
+    executeEvent
+    // 导出 executeEvent 方法，方便在配置加载完成后立即触发 onCreated
+  };
+}
+exports.usePageEvents = usePageEvents;

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

@@ -14,6 +14,7 @@ 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");
+const common = require("./utils/common.js");
 ;/* empty css                                                           */
 ;/* empty css                                                             */
 ;/* empty css            */
@@ -50,7 +51,6 @@ const _sfc_main = {
         let option = await index$2.default.getAppById(ctx.$http, props.appId);
         pageList.value = ((_a = JSON.parse(option.pageConfig)) == null ? void 0 : _a.pageConfig) || [];
         pageHistory.pageHistory.clear();
-        console.log("🚀 ~ pageList ~ pageList.value:", pageList.value);
         let homePage;
         if (props.pageKey) {
           homePage = pageList.value.find((page2) => page2.isHome);
@@ -76,12 +76,13 @@ const _sfc_main = {
       }
     };
     const currentPage = Vue.ref(null);
+    const routePage = Vue.ref(null);
     function loadPage(pageId) {
       var _a;
       if (((_a = currentPage.value) == null ? void 0 : _a.id) == pageId) {
         return;
       }
-      const targetPage = findPageById(pageList.value, pageId);
+      const targetPage = common.findPageById(pageList.value, pageId);
       if (targetPage) {
         if (targetPage.parentPage) {
           currentPage.value = targetPage.parentPage;
@@ -98,24 +99,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 = Vue.ref(null);
-    eventBus.default.on("loadPage", (pageId) => {
+    const pageParams = Vue.ref({});
+    eventBus.default.on("loadPage", (pageId, params) => {
       loadPage(pageId);
+      pageParams.value = params || { applyId: "7a16522c29e047d1be80e884773a87ac" };
     });
+    Vue.provide("pageList", pageList);
     Vue.onMounted(() => {
       loadConfig();
     });
@@ -132,8 +121,9 @@ const _sfc_main = {
           !Vue.unref(noTargetPage) ? (Vue.openBlock(), Vue.createBlock(Vue.unref(page.default), {
             key: 0,
             parentPage: Vue.unref(currentPage),
-            routePage: Vue.unref(routePage)
-          }, null, 8, ["parentPage", "routePage"])) : (Vue.openBlock(), Vue.createBlock(_component_van_empty, {
+            routePage: Vue.unref(routePage),
+            params: Vue.unref(pageParams)
+          }, null, 8, ["parentPage", "routePage", "params"])) : (Vue.openBlock(), Vue.createBlock(_component_van_empty, {
             key: 1,
             image: "search",
             description: "页面找不到了"
@@ -144,5 +134,5 @@ const _sfc_main = {
     };
   }
 };
-const MobileApp = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-67de5a65"]]);
+const MobileApp = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-4e4cf5f1"]]);
 exports.default = MobileApp;