@fecp/designer 5.5.113 → 5.5.115

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

@@ -1,9 +1,24 @@
-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 { ref, getCurrentInstance, computed, watch, onMounted, nextTick, provide, resolveComponent, createElementBlock, openBlock, Fragment, createBlock, createCommentVNode, createElementVNode, normalizeProps, mergeProps, unref, normalizeStyle, createVNode, guardReactiveProps, isRef, withCtx, resolveDynamicComponent } from "vue";
+import homeBg from "./assets/images/home-bg.png.mjs";
 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";
+import hooks from "../../../node_modules/moment/dist/moment.mjs";
+import { parseSingleParamValue } from "./utils/parseRouteParams.mjs";
+/* empty css                                                       */
+/* empty css                                                             */
+/* empty css                                                           */
+/* empty css                                                             */
+import { cloneDeep, isEqual } from "./utils/common.mjs";
+import "./utils/eventBus.mjs";
+/* empty css                                                           */
+/* empty css                                                            */
+/* empty css                                                             */
+/* empty css                                                                 */
+import { useEventFlow } from "./utils/eventFlow/eventFlowHandler.mjs";
+import { checkFilterMatch, checkFieldInFilterConfig, checkFieldInResultConfig } from "./utils/parseFilterConfig.mjs";
+import { calculate } from "./utils/formulajs/calculate.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";
@@ -37,20 +52,6 @@ const _sfc_main = {
       return all[type];
     }
     const gridLayout = ref();
-    const layoutData = computed(() => {
-      var _a2;
-      if (Array.isArray(props.parentPage.layoutData)) {
-        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;
-        })) || [];
-      }
-      return props.parentPage.layoutData;
-    });
     const tabbarActive = ref(0);
     const childPage = ref(null);
     function onTabbarChange(pageId) {
@@ -60,8 +61,11 @@ const _sfc_main = {
       const page = props.parentPage.children.find((item) => item.id == pageId);
       if (!page) ;
       else {
-        childPage.value = page;
-        pageHistory.replace(page);
+        childPage.value = null;
+        nextTick(() => {
+          childPage.value = page;
+        });
+        pageHistory.replace(page, props.params);
       }
       console.log("🚀 ~ onTabbarChange ~ page:", page);
     }
@@ -90,10 +94,33 @@ const _sfc_main = {
       })) || [];
     }
     const loadFormData = (state) => {
-      formData.value = props.params;
+      const defaultData = { ...props.params };
+      if (hiddenFields.value && hiddenFields.value.length > 0) {
+        hiddenFields.value.forEach((field) => {
+          if (field.fieldName) {
+            if (typeof field.value == "object") {
+              const value = parseSingleParamValue(
+                field.value || field.defaultValue,
+                defaultData,
+                [...fieldsData.value, ...hiddenFields.value]
+              );
+              if (value) {
+                defaultData[field.fieldName] = value;
+              }
+            } else if (field.value) {
+              defaultData[field.fieldName] = field.value;
+            }
+          }
+        });
+      }
+      formData.value = { ...defaultData };
       console.log("初始化赋值", formData.value);
     };
+    const prevFormData = ref({});
+    let linkaged = false;
     onMounted(async () => {
+      prevFormData.value = {};
+      linkaged = false;
       loadFormData();
       const pageEvents = usePageEvents(() => ({
         pageEventConfig: props.parentPage.pageEventConfig,
@@ -121,8 +148,252 @@ const _sfc_main = {
           }
         }
       }
+      loadEventFlow();
+      initGridLayoutDataConfig();
+      initLinkage();
       configLoading.value = false;
     });
+    const gridLayoutFieldsData = ref([]);
+    const oriGridLayoutData = ref([]);
+    function initGridLayoutDataConfig() {
+      if (!Array.isArray(props.parentPage.layoutData)) {
+        gridLayoutFieldsData.value = props.parentPage.layoutData;
+        return;
+      }
+      let gridLayoutData = cloneDeep(props.parentPage.layoutData || []);
+      gridLayoutData = gridLayoutData.map((item) => {
+        var _a2, _b;
+        item.isResizable = false;
+        if ((_b = (_a2 = item.component) == null ? void 0 : _a2.props) == null ? void 0 : _b.autoHeight) {
+          item.class = "isAutoHeight";
+        }
+        return item;
+      }) || [];
+      oriGridLayoutData.value = gridLayoutData;
+    }
+    function initLinkage() {
+      if (!Array.isArray(props.parentPage.layoutData)) {
+        linkaged = true;
+        return;
+      }
+      const changedFields = findChangedFields(formData.value, prevFormData.value);
+      applyLinkageEffectsForChangedFields(changedFields);
+      prevFormData.value = { ...formData.value };
+      linkaged = true;
+    }
+    watch(
+      formData,
+      (newVal, oldVal) => {
+        if (!linkaged) {
+          return;
+        }
+        const lastValue = { ...prevFormData.value };
+        if (isEqual(newVal, lastValue)) {
+          return;
+        }
+        const changedFields = findChangedFields(newVal, lastValue);
+        applyLinkageEffectsForChangedFields(changedFields);
+        prevFormData.value = { ...formData.value };
+      },
+      { deep: true }
+    );
+    const applyLinkageEffectsForChangedFields = (changedFieldNames) => {
+      const linkedConfig = props.parentPage.linkedConfig || {};
+      const fields = [...fieldsData.value, ...hiddenFields.value];
+      const relevantConfigs = filterRelevantLinkageConfigs(
+        changedFieldNames,
+        linkedConfig,
+        fields
+      );
+      relevantConfigs.dataLink.forEach((item) => {
+        if (checkFilterMatch(item.filterConfig, formData.value, fields)) {
+          const fieldAssignments = item.fieldAssignments || [];
+          fieldAssignments.forEach((assignment) => {
+            var _a2, _b;
+            const fieldId = assignment.fieldId;
+            const formulaText = (_b = (_a2 = assignment.formula) == null ? void 0 : _a2.value) == null ? void 0 : _b.text;
+            const field = fields.find((f) => f.id == fieldId);
+            if (field && formulaText) {
+              const calcResult = calculate({
+                text: formulaText,
+                value: formData.value,
+                fieldsList: fields
+              });
+              formData.value[field.fieldName] = calcResult;
+            }
+          });
+        }
+      });
+      const updatedLayoutData = cloneDeep(oriGridLayoutData.value || []);
+      relevantConfigs.visibility.forEach((item) => {
+        const dataLinkFieldList = item.dataLinkFieldList || [];
+        dataLinkFieldList.forEach((fieldId) => {
+          const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+          if (layoutFieldItem) {
+            layoutFieldItem.hidden = true;
+          }
+        });
+        if (checkFilterMatch(item.filterConfig, formData.value, fields)) {
+          dataLinkFieldList.forEach((fieldId) => {
+            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+            if (layoutFieldItem) {
+              layoutFieldItem.hidden = false;
+            }
+          });
+        }
+      });
+      relevantConfigs.required.forEach((item) => {
+        const dataLinkFieldList = item.dataLinkFieldList || [];
+        dataLinkFieldList.forEach((fieldId) => {
+          const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+          if (layoutFieldItem) {
+            layoutFieldItem.component.props.required = false;
+          }
+        });
+        if (checkFilterMatch(item.filterConfig, formData.value, fields)) {
+          dataLinkFieldList.forEach((fieldId) => {
+            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+            if (layoutFieldItem) {
+              layoutFieldItem.component.props.required = true;
+            }
+          });
+        }
+      });
+      relevantConfigs.disabled.forEach((item) => {
+        const dataLinkFieldList = item.dataLinkFieldList || [];
+        dataLinkFieldList.forEach((fieldId) => {
+          const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+          if (layoutFieldItem) {
+            layoutFieldItem.component.props.disabled = false;
+            layoutFieldItem.component.props.readOnly = false;
+          }
+        });
+        if (checkFilterMatch(item.filterConfig, formData.value, fields)) {
+          dataLinkFieldList.forEach((fieldId) => {
+            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+            if (layoutFieldItem) {
+              layoutFieldItem.component.props.disabled = true;
+              layoutFieldItem.component.props.readOnly = true;
+            }
+          });
+        }
+      });
+      const fieldsConfigArr = updatedLayoutData.filter((item) => !item.hidden);
+      gridLayoutFieldsData.value = sortLayoutItems(fieldsConfigArr);
+      nextTick(() => {
+        var _a2;
+        gridLayoutFieldsData.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 == null ? void 0 : gridLayout.value) == null ? void 0 : _a2.resizeEvent();
+      });
+    };
+    function sortLayoutItems(arr) {
+      return [...arr].sort((a, b) => {
+        if (a.y !== b.y) {
+          return a.y - b.y;
+        }
+        return a.x - b.x;
+      });
+    }
+    const filterRelevantLinkageConfigs = (changedFieldNames, linkedConfig, fields) => {
+      const result = {
+        dataLink: [],
+        visibility: [],
+        required: [],
+        readonly: [],
+        disabled: [],
+        options: []
+      };
+      if (!linkedConfig) {
+        return result;
+      }
+      if (changedFieldNames.length === 0) {
+        return { ...result, ...linkedConfig };
+      }
+      const changedFieldIds = changedFieldNames.map((fieldName) => {
+        const field = fields.find((f) => f.fieldName == fieldName);
+        return field ? field.id : null;
+      }).filter((id) => id !== null);
+      if (linkedConfig.dataLink) {
+        result.dataLink = linkedConfig.dataLink.filter((item) => {
+          return changedFieldIds.some(
+            (fieldId) => checkFieldInFilterConfig(item.filterConfig, fieldId) || checkFieldInResultConfig(item.fieldAssignments, fieldId, fields)
+          );
+        });
+      }
+      if (linkedConfig.options) {
+        result.options = linkedConfig.options.filter((item) => {
+          return changedFieldIds.some(
+            (fieldId) => checkFieldInFilterConfig(item.filterConfig, fieldId)
+          );
+        });
+      }
+      if (linkedConfig.visibility) {
+        result.visibility = linkedConfig.visibility;
+      }
+      if (linkedConfig.required) {
+        result.required = linkedConfig.required;
+      }
+      if (linkedConfig.readonly) {
+        result.readonly = linkedConfig.readonly;
+      }
+      if (linkedConfig.disabled) {
+        result.disabled = linkedConfig.disabled;
+      }
+      return result;
+    };
+    const findChangedFields = (newData, oldData) => {
+      const changedFields = [];
+      const allKeys = /* @__PURE__ */ new Set([
+        ...Object.keys(newData || {}),
+        ...Object.keys(oldData || {})
+      ]);
+      let initFlag = false;
+      if (Object.keys(oldData || {}).length === 0) {
+        initFlag = true;
+      }
+      for (const key of allKeys) {
+        if (initFlag) {
+          changedFields.push(key);
+          continue;
+        }
+        const hasKeyInNew = newData && Object.prototype.hasOwnProperty.call(newData, key);
+        const hasKeyInOld = oldData && Object.prototype.hasOwnProperty.call(oldData, key);
+        if (!hasKeyInNew && !hasKeyInOld) {
+          continue;
+        }
+        const newVal = hasKeyInNew ? newData[key] : void 0;
+        const oldVal = hasKeyInOld ? oldData[key] : void 0;
+        if (!newVal && !oldVal && Object.keys(oldData || {}).length === 0) {
+          continue;
+        }
+        if (JSON.stringify(newVal) != JSON.stringify(oldVal)) {
+          changedFields.push(key);
+        }
+      }
+      return changedFields;
+    };
+    const handleEvent = ref(null);
+    function loadEventFlow() {
+      const {
+        handleEvent: createHandleEvent
+      } = useEventFlow({
+        fields: [...fieldsData.value, ...hiddenFields.value],
+        instance,
+        localConfig: props.parentPage,
+        components: {
+          form: ctx
+        }
+      });
+      handleEvent.value = createHandleEvent;
+    }
     const valueFormatMap = {
       date: "YYYYMMDD",
       week: "YYYYMMDD",
@@ -232,20 +503,9 @@ const _sfc_main = {
         });
       }
       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();
-      });
     };
+    provide("handleEvent", handleEvent);
+    provide("formData", formData);
     __expose({
       setFormData,
       getFormData
@@ -253,11 +513,14 @@ const _sfc_main = {
     return (_ctx, _cache) => {
       const _component_FecMobileNavBar = resolveComponent("FecMobileNavBar");
       const _component_page = resolveComponent("page", true);
+      const _component_FecMobileHomeHeader = resolveComponent("FecMobileHomeHeader");
       const _component_FecMobileMenuGrid = resolveComponent("FecMobileMenuGrid");
-      const _component_FecMobileNoticeBar = resolveComponent("FecMobileNoticeBar");
+      const _component_FecMobileHomeTools = resolveComponent("FecMobileHomeTools");
       const _component_FecMobileDataStat = resolveComponent("FecMobileDataStat");
       const _component_FecMobileAppDetail = resolveComponent("FecMobileAppDetail");
       const _component_FecMobileApprovalList = resolveComponent("FecMobileApprovalList");
+      const _component_FecMobileRentCalcResult = resolveComponent("FecMobileRentCalcResult");
+      const _component_FecMobileMine = resolveComponent("FecMobileMine");
       const _component_FecMobileTabbar = resolveComponent("FecMobileTabbar");
       const _component_FecMobileActionBar = resolveComponent("FecMobileActionBar");
       return openBlock(), createElementBlock(Fragment, null, [
@@ -269,26 +532,41 @@ const _sfc_main = {
               parentPage: unref(childPage)
             }, null, 8, ["parentPage"])) : createCommentVNode("", true)
           ], 64)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-            __props.parentPage.type == "home" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+            __props.parentPage.type == "home" ? (openBlock(), createElementBlock("div", {
+              key: 0,
+              class: "home-page",
+              style: normalizeStyle({
+                backgroundImage: `url(${unref(homeBg)})`,
+                backgroundRepeat: "no-repeat",
+                backgroundSize: "100%",
+                backgroundPosition: "center -20px",
+                backgroundColor: "#f7f8fa",
+                height: "100%"
+              })
+            }, [
+              createVNode(_component_FecMobileHomeHeader, normalizeProps(guardReactiveProps(__props.parentPage.layoutData.homeHeader)), null, 16),
               createVNode(_component_FecMobileMenuGrid, normalizeProps(guardReactiveProps(__props.parentPage.layoutData.menuGridProps)), null, 16),
-              createVNode(_component_FecMobileNoticeBar),
+              createVNode(_component_FecMobileHomeTools, normalizeProps(guardReactiveProps(__props.parentPage.layoutData.homeTools)), null, 16),
               createVNode(_component_FecMobileDataStat)
-            ], 64)) : __props.parentPage.type == "approval" ? (openBlock(), createBlock(_component_FecMobileAppDetail, mergeProps({ key: 1 }, __props.parentPage.layoutData.appDetailProps, {
+            ], 4)) : __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"])) : __props.parentPage.type == "flowList" ? (openBlock(), createBlock(_component_FecMobileApprovalList, normalizeProps(mergeProps({ key: 2 }, __props.parentPage.layoutData.approvalListProps)), null, 16)) : (openBlock(), createBlock(unref(De), {
+            }), null, 16, ["actionBar", "params"])) : __props.parentPage.type == "flowList" ? (openBlock(), createBlock(_component_FecMobileApprovalList, normalizeProps(mergeProps({ key: 2 }, __props.parentPage.layoutData.approvalListProps)), null, 16)) : __props.parentPage.type == "rentCalcResult" ? (openBlock(), createBlock(_component_FecMobileRentCalcResult, {
               key: 3,
+              params: __props.params
+            }, null, 8, ["params"])) : __props.parentPage.type == "mine" ? (openBlock(), createBlock(_component_FecMobileMine, { key: 4 })) : (openBlock(), createBlock(unref(De), {
+              key: 5,
               ref_key: "gridLayout",
               ref: gridLayout,
-              layout: unref(layoutData),
-              "onUpdate:layout": _cache[0] || (_cache[0] = ($event) => isRef(layoutData) ? layoutData.value = $event : null),
+              layout: unref(gridLayoutFieldsData),
+              "onUpdate:layout": _cache[0] || (_cache[0] = ($event) => isRef(gridLayoutFieldsData) ? gridLayoutFieldsData.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%" }
+              style: { "height": "100%", "width": "100%" }
             }, {
               item: withCtx(({ item: { component } }) => [
                 createElementVNode("div", _hoisted_2, [
@@ -298,8 +576,9 @@ const _sfc_main = {
                     dataSources: unref(currentPage).dataSources,
                     formData: unref(formData),
                     compId: component.id,
-                    fields: [...unref(fieldsData), ...unref(hiddenFields)]
-                  }), null, 16, ["modelValue", "onUpdate:modelValue", "dataSources", "formData", "compId", "fields"]))
+                    fields: [...unref(fieldsData), ...unref(hiddenFields)],
+                    params: __props.params
+                  }), null, 16, ["modelValue", "onUpdate:modelValue", "dataSources", "formData", "compId", "fields", "params"]))
                 ])
               ]),
               _: 1
@@ -316,7 +595,7 @@ const _sfc_main = {
     };
   }
 };
-const MobilePage = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-aed6b9dc"]]);
+const MobilePage = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ce6e3f7e"]]);
 export {
   MobilePage as default
 };

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

@@ -1,7 +1,11 @@
 import cloneDeep$1 from "../../../../node_modules/lodash-es/cloneDeep.mjs";
+import isEqual$1 from "../../../../node_modules/lodash-es/isEqual.mjs";
 function cloneDeep(data) {
   return cloneDeep$1(data);
 }
+function isEqual(data1, data2) {
+  return isEqual$1(data1, data2);
+}
 function removeEmptyValues(data) {
   if (typeof data !== "object" || data === null) {
     return data;
@@ -39,5 +43,6 @@ const findPageById = (pageList, pageId) => {
 export {
   cloneDeep,
   findPageById,
+  isEqual,
   removeEmptyValues
 };

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

@@ -1,12 +1,12 @@
 import { reactive } from "vue";
 import { parseRouteParams } from "./parseRouteParams.mjs";
-import "../../../../node_modules/element-plus/es/index.mjs";
+import { ElLoading } from "../../../../node_modules/element-plus/es/components/loading/index.mjs";
+import { ElMessage } from "../../../../node_modules/element-plus/es/components/message/index.mjs";
+import "../../../../_virtual/dayjs.min.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 = {}) {
     this.templateId = options.templateId;
@@ -21,7 +21,7 @@ class DataSourceManager {
       JSON.stringify(options.sortRules || [])
     );
     this.showSuccessMessage = options.showSuccessMessage || false;
-    this.loading = false;
+    this.loading = options.loading ?? true;
     this.error = null;
     this.data = reactive({});
     this.contextData = options.data || null;
@@ -130,18 +130,19 @@ class DataSourceManager {
       console.warn("未配置 HTTP 实例");
       return;
     }
-    this.loading = true;
     this.error = null;
-    this.LoadingInstance.count++;
-    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"
-      });
+    if (this.loading) {
+      this.LoadingInstance.count++;
+      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);
@@ -295,12 +296,14 @@ class DataSourceManager {
     return this.loading;
   }
   closeLoading() {
-    if (this.LoadingInstance.count > 0) {
-      this.LoadingInstance.count--;
-    }
-    if (this.LoadingInstance.count === 0 && this.LoadingInstance.target) {
-      this.LoadingInstance.target.close();
-      this.LoadingInstance.target = null;
+    if (this.loading) {
+      if (this.LoadingInstance.count > 0) {
+        this.LoadingInstance.count--;
+      }
+      if (this.LoadingInstance.count === 0 && this.LoadingInstance.target) {
+        this.LoadingInstance.target.close();
+        this.LoadingInstance.target = null;
+      }
     }
   }
   /**