@fecp/designer 5.5.120 → 5.5.121

package/es/packages/mobile/src/components/form/fieldIndustry/FieldIndustry.vue.mjs

@@ -81,16 +81,13 @@ const _sfc_main = {
     const showPicker = ref(false);
     const emit = __emit;
     const pickerValue = computed(() => {
-      const value = props.modelValue;
-      let val = value[value.length - 1];
-      if (val.length > 1) {
-        return val.substring(1);
-      }
-      return val;
+      var _a;
+      const value = ((_a = props.modelValue) == null ? void 0 : _a.split(",")) || [];
+      return value[value.length - 1];
     });
     function getDisplayValue(options, fieldNames, modelValue) {
       const { text, value, children } = fieldNames;
-      const values = modelValue;
+      const values = modelValue || [];
       const displayValues = [];
       function findValueInOptions(currentOptions, targetValue) {
         for (const option of currentOptions) {
@@ -126,18 +123,8 @@ const _sfc_main = {
       );
     });
     const onFinish = ({ selectedOptions }) => {
-      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);
+      const value = selectedOptions.map((option) => option[props.treeOptionsFieldNames.value]).join(",");
+      emit("update:modelValue", value);
       showPicker.value = false;
     };
     return (_ctx, _cache) => {

package/es/packages/mobile/src/components/form/fieldPicker/FieldPicker.vue.mjs

@@ -11,10 +11,9 @@
 /* empty css                                                    */
 /* empty css                                                             */
 /* empty css                                                       */
-import { getCurrentInstance, useAttrs, ref, watch, computed, createBlock, openBlock, unref, mergeProps, isRef, createSlots, withCtx, createVNode, withModifiers } from "vue";
+import { getCurrentInstance, useAttrs, computed, ref, createBlock, openBlock, unref, mergeProps, isRef, createSlots, withCtx, createVNode, withModifiers } from "vue";
 import { MobileField } from "../field/index.mjs";
-import { getOptions } from "../../../utils/optionUtil.mjs";
-import { cloneDeep } from "../../../utils/common.mjs";
+import "../../../utils/optionUtil.mjs";
 import { Picker } from "../../../../../../node_modules/vant/es/picker/index.mjs";
 import { Popup } from "../../../../../../node_modules/vant/es/popup/index.mjs";
 import { Icon } from "../../../../../../node_modules/vant/es/icon/index.mjs";
@@ -66,34 +65,19 @@ const _sfc_main = {
   emits: ["update:modelValue"],
   setup(__props, { emit: __emit }) {
     const currentInstance = getCurrentInstance();
-    const ctx = currentInstance.proxy;
+    currentInstance.proxy;
     const props = __props;
     useAttrs();
-    const finalOptions = ref([]);
-    watch(
-      () => cloneDeep(props.optionConfig),
-      (val) => {
-        getOptions({
-          ctx,
-          dataSources: props.dataSources,
-          formData: props.formData,
-          fields: props.fields,
-          ...props.optionConfig
-        }).then((data) => {
-          finalOptions.value = data;
-        });
-      },
-      {
-        deep: true,
-        immediate: true
-      }
-    );
+    const finalOptions = computed(() => {
+      if (!props.optionConfig) return [];
+      return props.optionConfig.options || [];
+    });
     const showPicker = ref(false);
     const emit = __emit;
     const pickerValue = computed({
       get: () => {
         const value = props.modelValue;
-        return value.split(",");
+        return (value == null ? void 0 : value.split(",")) || [];
       },
       set: (val) => {
         emit("update:modelValue", val.join(","));
@@ -103,7 +87,7 @@ const _sfc_main = {
       const selectedOption = finalOptions.value.find(
         (option) => option.value == pickerValue.value.join(",")
       );
-      return selectedOption ? selectedOption.label : "";
+      return selectedOption ? selectedOption.label : pickerValue.value.join(",");
     });
     const onConfirm = ({ selectedValues, selectedOptions }) => {
       pickerValue.value = selectedValues;

package/es/packages/mobile/src/components/form/fieldRadio/FieldRadio.vue.mjs

@@ -1,8 +1,7 @@
-import { getCurrentInstance, useAttrs, ref, watch, computed, createBlock, openBlock, unref, mergeProps, isRef, withCtx, createElementBlock, toDisplayString } from "vue";
+import { getCurrentInstance, useAttrs, computed, createBlock, openBlock, unref, mergeProps, isRef, withCtx, createElementBlock, toDisplayString } from "vue";
 import { MobileField } from "../field/index.mjs";
-import { getOptions } from "../../../utils/optionUtil.mjs";
+import "../../../utils/optionUtil.mjs";
 import { MobileRadioGroup } from "../radioGroup/index.mjs";
-import { cloneDeep } from "../../../utils/common.mjs";
 const _hoisted_1 = { key: 1 };
 const _sfc_main = {
   __name: "FieldRadio",
@@ -36,28 +35,13 @@ const _sfc_main = {
   emits: ["update:modelValue"],
   setup(__props, { emit: __emit }) {
     const currentInstance = getCurrentInstance();
-    const ctx = currentInstance.proxy;
+    currentInstance.proxy;
     const props = __props;
     useAttrs();
-    const finalOptions = ref([]);
-    watch(
-      () => cloneDeep(props.optionConfig),
-      (val) => {
-        getOptions({
-          ctx,
-          dataSources: props.dataSources,
-          formData: props.formData,
-          fields: props.fields,
-          ...props.optionConfig
-        }).then((data) => {
-          finalOptions.value = data;
-        });
-      },
-      {
-        deep: true,
-        immediate: true
-      }
-    );
+    const finalOptions = computed(() => {
+      if (!props.optionConfig) return [];
+      return props.optionConfig.options || [];
+    });
     const emit = __emit;
     const compValue = computed({
       get: () => {
@@ -71,7 +55,7 @@ const _sfc_main = {
       const selectedOption = finalOptions.value.find(
         (option) => option.value === compValue.value
       );
-      return selectedOption ? selectedOption.label : "";
+      return selectedOption ? selectedOption.label : compValue.value;
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(MobileField), mergeProps(_ctx.$attrs, {

package/es/packages/mobile/src/components/form/search/Search.vue.mjs

@@ -37,12 +37,19 @@ const _sfc_main = {
     const searchData = ref("");
     function onClickFilter() {
     }
+    const filters = ref({});
     function onSearch() {
-      console.log("🚀 ~ onSearch ~ searchData.value:", searchData.value);
+      filters.value.dynamicFilter = searchData.value;
+      emit("filterChange", filters.value);
     }
     function onQuickFilterChange(result) {
-      console.log("筛选数据:", result);
-      emit("filterChange", result);
+      filters.value = {
+        dynamicFilter: searchData.value
+      };
+      result.forEach((item) => {
+        filters.value[item.fieldName] = item.values.join("|");
+      });
+      emit("filterChange", filters.value);
     }
     const filterData = ref([]);
     const fieldDataSources = /* @__PURE__ */ new Set();
@@ -67,7 +74,8 @@ const _sfc_main = {
           const dsManager = createDataSource({
             http: ctx.$http,
             dataSources: props.dataSources,
-            currentDataSourceId: dataSourceId
+            currentDataSourceId: dataSourceId,
+            loading: false
           });
           const data = await dsManager.fetch();
           let options = [];
@@ -85,11 +93,12 @@ const _sfc_main = {
       if (dictionaryKeys.size > 0) {
         try {
           const keyName = Array.from(dictionaryKeys).join(",");
-          const response = await ctx.$http.postForm(
+          const response = await ctx.$http.postFormMobile(
             "/base-server/parm/sysParmDic/getDicListByKey",
             {
               keyName
-            }
+            },
+            false
           );
           const dictionaryData = response;
           if (typeof dictionaryData === "object") {

package/es/packages/mobile/src/components/form/uploader/Uploader.vue.mjs

@@ -75,7 +75,7 @@ const _sfc_main = {
     const emit = __emit;
     const fileList = computed({
       get: () => {
-        return props.modelValue;
+        return props.modelValue || [];
       },
       set: (val) => {
         emit("update:modelValue", val);
@@ -219,7 +219,7 @@ const _sfc_main = {
     };
   }
 };
-const _Uploader = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-67b22b6d"]]);
+const _Uploader = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-c9dede2d"]]);
 export {
   _Uploader as default
 };

package/es/packages/mobile/src/components/navigation/tabbar/Tabbar.vue.mjs

@@ -52,7 +52,7 @@ const _sfc_main = {
       });
     });
     function getFlowCutNum() {
-      ctx.$http.post("/base-server/flow/workbench/getTaskCutByUser").then((data) => {
+      ctx.$http.postMobile("/base-server/flow/workbench/getTaskCutByUser", null, false).then((data) => {
         flowMsgNum.value = data;
       });
     }
@@ -61,9 +61,13 @@ const _sfc_main = {
       getFlowCutNum();
     });
     function getMessageCutNum() {
-      ctx.$http.postForm("/base-server/msgMessages/initMsgUnReadNum", {
-        opNo: store.getters.user.opNo
-      }).then((data) => {
+      ctx.$http.postFormMobile(
+        "/base-server/msgMessages/initMsgUnReadNum",
+        {
+          opNo: store.getters.user.opNo
+        },
+        false
+      ).then((data) => {
         msgNum.value = data;
       });
     }
@@ -110,7 +114,7 @@ const _sfc_main = {
     };
   }
 };
-const _Tabbar = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-1f859803"]]);
+const _Tabbar = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-5e9f5a59"]]);
 export {
   _Tabbar as default
 };

package/es/packages/mobile/src/components/navigation/tabs/Tabs.vue.mjs

@@ -5,18 +5,14 @@
 /* empty css                                                      */
 /* empty css                                                           */
 /* empty css                                                    */
-/* empty css                                                     */
-/* empty css                                                     */
-/* empty css                                                      */
-/* empty css                                                       */
-import { inject, ref, computed, onMounted, createElementBlock, openBlock, normalizeStyle, normalizeClass, unref, createBlock, createCommentVNode, createVNode, isRef, withCtx, Fragment, renderList, mergeProps, createElementVNode, resolveDynamicComponent } from "vue";
+import { inject, ref, computed, onMounted, resolveComponent, createElementBlock, openBlock, normalizeStyle, normalizeClass, unref, createBlock, createCommentVNode, createVNode, isRef, withCtx, Fragment, renderList, mergeProps, createElementVNode, resolveDynamicComponent } from "vue";
 import { findPageById } from "../../../utils/common.mjs";
 import MobilePage from "../../../page.vue.mjs";
 import { MobileTimeLineFilter } from "../../custom/appTimeLine/index.mjs";
 import { MobileDocument } from "../../custom/document/index.mjs";
+import { checkFilterMatch } from "../../../utils/parseFilterConfig.mjs";
 /* empty css           */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
-import { Search } from "../../../../../../node_modules/vant/es/search/index.mjs";
 import { Tabs } from "../../../../../../node_modules/vant/es/tabs/index.mjs";
 import { Tab } from "../../../../../../node_modules/vant/es/tab/index.mjs";
 const _hoisted_1 = { class: "fec-tab-content" };
@@ -68,6 +64,22 @@ const _sfc_main = {
     busPkField: {
       type: String,
       default: ""
+    },
+    formData: {
+      type: Object,
+      default: {}
+    },
+    fields: {
+      type: Array,
+      default: []
+    },
+    isDev: {
+      type: Boolean,
+      default: false
+    },
+    dynamicInputFilter: {
+      type: Array,
+      default: []
     }
   },
   emits: ["update:modelValue"],
@@ -77,11 +89,27 @@ const _sfc_main = {
     const pageList = inject("pageList");
     const activeName = ref(((_a = props.options[0]) == null ? void 0 : _a.id) || "");
     const tabsOptions = computed(() => {
-      const tabs = [...props.options || []];
+      const tabs = [...props.options || []].filter((item) => {
+        if (!item.showCondition || props.isDev) return true;
+        return checkFilterMatch(item.showCondition, props.formData, props.fields);
+      });
+      tabs.forEach((tab) => {
+        const params = {};
+        const fieldMapping = tab.fieldMapping;
+        if (fieldMapping && Array.isArray(fieldMapping)) {
+          fieldMapping.forEach((item) => {
+            const field = props.fields.find((field2) => field2.id == item.field);
+            if (field) {
+              params[item.value] = props.formData[field.fieldName];
+            }
+          });
+        }
+        tab.params = { ...props.formData, ...params };
+      });
       if (props.document) {
         tabs.push({ id: "tab_doc_info", title: "要件信息", component: MobileDocument });
       }
-      if (props.approvalHistory) {
+      if (props.approvalHistory && props.formData.approveSts != "00") {
         tabs.push({
           id: "tab_timeline_info",
           title: "审批历史",
@@ -93,10 +121,10 @@ const _sfc_main = {
     const componentParams = computed(() => {
       let traceNo = props.params.traceNo;
       if (props.busPkField) {
-        traceNo = props.params[props.busPkField];
+        traceNo = props.formData[props.busPkField];
       }
       return {
-        ...props.params,
+        ...props.formData,
         traceNo
       };
     });
@@ -122,32 +150,34 @@ const _sfc_main = {
     const getPage = (pageId) => {
       return pageCache.value[pageId] || null;
     };
+    const setPageRef = (id, el) => {
+    };
     const searchData = ref("");
-    function onSearch() {
-      console.log("搜索:", searchData.value);
+    function onFilterChange(filter) {
+      const dynamicFilterFieldName = props.dynamicInputFilter.map((item) => item.fieldName).join(",");
+      searchData.value = {
+        filters: JSON.stringify({ ...filter, dynamicFilterFieldName })
+      };
     }
     return (_ctx, _cache) => {
-      const _component_van_search = Search;
+      const _component_fec_mobile_search = resolveComponent("fec-mobile-search");
       const _component_van_tab = Tab;
       const _component_van_tabs = Tabs;
       return openBlock(), createElementBlock("div", {
         class: normalizeClass(["fec-tabs-container", { isAutoHeight: props.autoHeight }]),
         style: normalizeStyle("height:" + unref(compHeight))
       }, [
-        __props.enableFilter ? (openBlock(), createBlock(_component_van_search, {
+        __props.enableFilter ? (openBlock(), createBlock(_component_fec_mobile_search, {
           key: 0,
-          modelValue: unref(searchData),
-          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(searchData) ? searchData.value = $event : null),
-          shape: "round",
           placeholder: __props.filterPlaceholder,
-          clearable: "",
-          onSearch
-        }, null, 8, ["modelValue", "placeholder"])) : createCommentVNode("", true),
+          onFilterChange
+        }, null, 8, ["placeholder"])) : createCommentVNode("", true),
         createVNode(_component_van_tabs, {
           class: "fec-tabs",
           active: unref(activeName),
-          "onUpdate:active": _cache[1] || (_cache[1] = ($event) => isRef(activeName) ? activeName.value = $event : null),
-          swipeable: unref(tabSwipeable)
+          "onUpdate:active": _cache[0] || (_cache[0] = ($event) => isRef(activeName) ? activeName.value = $event : null),
+          swipeable: unref(tabSwipeable),
+          "swipe-threshold": 4
         }, {
           default: withCtx(() => [
             (openBlock(true), createElementBlock(Fragment, null, renderList(unref(tabsOptions), (item) => {
@@ -160,9 +190,12 @@ const _sfc_main = {
                   createElementVNode("div", _hoisted_1, [
                     item.pageId && getPage(item.pageId) ? (openBlock(), createBlock(MobilePage, {
                       key: 0,
+                      ref_for: true,
+                      ref: (el) => setPageRef(item.id),
                       parentPage: getPage(item.pageId),
-                      params: __props.params
-                    }, null, 8, ["parentPage", "params"])) : item.component ? (openBlock(), createBlock(resolveDynamicComponent(item.component), mergeProps({
+                      params: item.params,
+                      initSearchData: unref(searchData)
+                    }, null, 8, ["parentPage", "params", "initSearchData"])) : item.component ? (openBlock(), createBlock(resolveDynamicComponent(item.component), mergeProps({
                       key: 1,
                       ref_for: true
                     }, unref(componentParams)), null, 16)) : createCommentVNode("", true)
@@ -178,7 +211,7 @@ const _sfc_main = {
     };
   }
 };
-const _Tabs = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-2dd78d51"]]);
+const _Tabs = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-217113cd"]]);
 export {
   _Tabs as default
 };

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

@@ -12,7 +12,7 @@ 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";
+import { findPageById, findPageByKey } from "./utils/common.mjs";
 import { useStore } from "../../../node_modules/vuex/dist/vuex.esm-bundler.mjs";
 /* empty css                                                           */
 /* empty css                                                             */
@@ -31,6 +31,10 @@ const _sfc_main = {
     pageKey: {
       type: String,
       default: ""
+    },
+    queryParams: {
+      type: Object,
+      default: {}
     }
   },
   setup(__props) {
@@ -54,7 +58,7 @@ const _sfc_main = {
         pageHistory.clear();
         let homePage;
         if (props.pageKey) {
-          homePage = pageList.value.find((page) => page.isHome);
+          homePage = findPageByKey(pageList.value, props.pageKey);
           if (!homePage) {
             noTargetPage.value = true;
           }
@@ -112,7 +116,7 @@ const _sfc_main = {
         routePage.value = null;
       }
     }
-    const pageParams = ref({});
+    const pageParams = ref(props.queryParams);
     emitter.on("loadPage", ({ pageId, params }) => {
       loadPage(pageId);
       pageParams.value = params;
@@ -126,6 +130,19 @@ const _sfc_main = {
     });
     provide("pageList", pageList);
     onMounted(() => {
+      const search = new URLSearchParams(location.search);
+      if (search.get("safeTop") || search.get("safeBottom")) {
+        const top = search.get("safeTop") || 0;
+        const bottom = search.get("safeBottom") || 0;
+        document.documentElement.style.setProperty(
+          "--safe-area-inset-top",
+          `${top}px`
+        );
+        document.documentElement.style.setProperty(
+          "--safe-area-inset-bottom",
+          `${bottom}px`
+        );
+      }
       loadConfig();
     });
     return (_ctx, _cache) => {
@@ -154,7 +171,7 @@ const _sfc_main = {
     };
   }
 };
-const MobileApp = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-65074c8b"]]);
+const MobileApp = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b26c4347"]]);
 export {
   MobileApp as default
 };