@fecp/designer 5.5.99 → 5.5.101

package/lib/packages/mobile/src/components/base/card/Card.vue.js

@@ -8,13 +8,13 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 ;/* empty css                                                  */
 ;/* empty css                                                 */
 const Vue = require("vue");
+;/* empty css           */
+const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
 ;/* empty css                                                     */
 ;/* empty css                                                            */
 ;/* empty css                                                  */
 ;/* empty css                                                */
 ;/* empty css                                                 */
-;/* empty css           */
-const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
 const index$1 = require("../../../../node_modules/vant/es/swipe-cell/index.js");
 const functionCall = require("../../../../node_modules/vant/es/dialog/function-call.js");
 require("../../../../node_modules/vant/es/dialog/index.js");

package/lib/packages/mobile/src/components/custom/appDetail/AppDetail.vue.js

@@ -3,31 +3,67 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const Vue = require("vue");
 ;/* empty css                */
 const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
-const _hoisted_1 = {
-  key: 0,
-  class: "route-wrapper"
-};
 const _sfc_main = {
   __name: "AppDetail",
   props: {
-    isDev: {
+    baseInfoPageSource: {
+      type: String,
+      default: "dynamic"
+    },
+    baseInfoPageId: {
+      type: String,
+      default: ""
+    },
+    options: {
+      type: Array,
+      default: []
+    },
+    document: {
       type: Boolean,
       default: false
     },
-    //任务对象+流程变量
-    data: {
-      type: Object,
-      default: {}
+    approvalHistory: {
+      type: Boolean,
+      default: false
     }
   },
   setup(__props) {
+    const props = __props;
+    const activeName = Vue.ref("tab_base_info");
+    const baseInfoPageId = Vue.ref("");
+    if (props.baseInfoPageSource == "dynamic") ;
+    else {
+      baseInfoPageId.value = props.baseInfoPageId;
+    }
+    const tabsOptions = Vue.computed(() => {
+      const tabs = [
+        {
+          id: "tab_base_info",
+          title: "基本信息",
+          pageId: baseInfoPageId.value
+        },
+        ...props.options || []
+      ];
+      if (props.document) {
+        tabs.push({ id: "tab_doc_info", title: "要件信息" });
+      }
+      if (props.approvalHistory) {
+        tabs.push({ id: "tab_timeline_info", title: "审批历史" });
+      }
+      return tabs;
+    });
+    Vue.computed(() => {
+      return tabsOptions.value.find((item) => item.id == activeName.value);
+    });
     return (_ctx, _cache) => {
-      return __props.isDev ? (Vue.openBlock(), Vue.createElementBlock("div", _hoisted_1, _cache[0] || (_cache[0] = [
-        Vue.createElementVNode("div", { class: "route-hint" }, "根据配置动态显示审批详情页面", -1),
-        Vue.createElementVNode("div", { class: "route-hint" }, "传递 任务对象+流程变量 到页面中", -1)
-      ]))) : Vue.createCommentVNode("", true);
+      const _component_FecMobileTabs = Vue.resolveComponent("FecMobileTabs");
+      return Vue.openBlock(), Vue.createBlock(_component_FecMobileTabs, {
+        modelValue: Vue.unref(activeName),
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => Vue.isRef(activeName) ? activeName.value = $event : null),
+        options: Vue.unref(tabsOptions)
+      }, null, 8, ["modelValue", "options"]);
     };
   }
 };
-const _AppDetail = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-6cf862c9"]]);
+const _AppDetail = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-9a63b182"]]);
 exports.default = _AppDetail;

package/lib/packages/mobile/src/components/dataDisplay/table/Table.vue.js

@@ -58,7 +58,7 @@ const _sfc_main = {
     autoHeight: {
       //高度自适应
       type: Boolean,
-      default: true
+      default: false
     },
     height: {
       //高度
@@ -346,7 +346,7 @@ const _sfc_main = {
       dataSourceManager.value.on("error", (err) => {
         emit("data-error", err);
       });
-      if (dataSourceManager.value && isDesigner) {
+      if (dataSourceManager.value) {
         tableData.value = [];
         if (props.isFixedHead) {
           initLoading.value = true;
@@ -576,5 +576,5 @@ const _sfc_main = {
     };
   }
 };
-const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-ee91bb34"]]);
+const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-16d68bd3"]]);
 exports.default = _Table;

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

@@ -8,6 +8,8 @@ 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");
@@ -39,6 +41,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;
@@ -54,6 +57,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;
@@ -65,24 +81,33 @@ 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
-              }), null, 16);
+              }), {
+                default: Vue.withCtx(() => [
+                  Vue.createElementVNode("div", _hoisted_1, [
+                    item.pageId && getPage(item.pageId) ? (Vue.openBlock(), Vue.createBlock(page.default, {
+                      key: 0,
+                      parentPage: getPage(item.pageId)
+                    }, null, 8, ["parentPage"])) : Vue.createCommentVNode("", true)
+                  ])
+                ]),
+                _: 2
+              }, 1040, ["name"]);
             }), 256))
           ]),
           _: 1
-        }, 8, ["active"]),
-        Vue.createElementVNode("div", _hoisted_1, [
-          Vue.renderSlot(_ctx.$slots, "default", {}, void 0, true)
-        ])
+        }, 8, ["active"])
       ], 4);
     };
   }
 };
-const _Tabs = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-a014f592"]]);
+const _Tabs = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-ed4e81a9"]]);
 exports.default = _Tabs;

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);
@@ -81,7 +81,7 @@ const _sfc_main = {
       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 +98,11 @@ 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) => {
       loadPage(pageId);
     });
+    Vue.provide("pageList", pageList);
     Vue.onMounted(() => {
       loadConfig();
     });
@@ -144,5 +131,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-aa5e6078"]]);
 exports.default = MobileApp;

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

@@ -32,10 +32,15 @@ const _sfc_main = {
       var _a;
       if (Array.isArray(props.parentPage.layoutData)) {
         return ((_a = props.parentPage.layoutData) == null ? void 0 : _a.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;
         })) || [];
       }
+      autoHeight;
       return props.parentPage.layoutData;
     });
     const tabbarActive = Vue.ref(0);
@@ -74,8 +79,9 @@ const _sfc_main = {
       const _component_FecMobileMenuGrid = Vue.resolveComponent("FecMobileMenuGrid");
       const _component_FecMobileNoticeBar = Vue.resolveComponent("FecMobileNoticeBar");
       const _component_FecMobileDataStat = Vue.resolveComponent("FecMobileDataStat");
-      const _component_FecMobileTabbar = Vue.resolveComponent("FecMobileTabbar");
+      const _component_FecMobileAppDetail = Vue.resolveComponent("FecMobileAppDetail");
       const _component_FecMobileActionBar = Vue.resolveComponent("FecMobileActionBar");
+      const _component_FecMobileTabbar = Vue.resolveComponent("FecMobileTabbar");
       return Vue.openBlock(), Vue.createElementBlock(Vue.Fragment, null, [
         __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, [
@@ -89,7 +95,10 @@ const _sfc_main = {
               Vue.createVNode(_component_FecMobileMenuGrid, Vue.normalizeProps(Vue.guardReactiveProps(__props.parentPage.layoutData.menuGridProps)), null, 16),
               Vue.createVNode(_component_FecMobileNoticeBar),
               Vue.createVNode(_component_FecMobileDataStat)
-            ], 64)) : __props.parentPage.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 }, [
+              Vue.createVNode(_component_FecMobileAppDetail, Vue.normalizeProps(Vue.guardReactiveProps(__props.parentPage.layoutData.appDetailProps)), null, 16),
+              Vue.createVNode(_component_FecMobileActionBar, Vue.normalizeProps(Vue.guardReactiveProps(__props.parentPage.layoutData.actionBar)), null, 16)
+            ], 64)) : (Vue.openBlock(), Vue.createBlock(Vue.unref(gridLayout_vue.default), {
               key: 2,
               ref: "gridLayout",
               layout: Vue.unref(layoutData),
@@ -127,5 +136,5 @@ const _sfc_main = {
     };
   }
 };
-const MobilePage = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-71059c96"]]);
+const MobilePage = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-afadefa2"]]);
 exports.default = MobilePage;

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

@@ -24,5 +24,20 @@ 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;
+};
 exports.cloneDeep = cloneDeep;
+exports.findPageById = findPageById;
 exports.removeEmptyValues = removeEmptyValues;

package/lib/packages/vue/src/components/forms/form/Form.vue.js

@@ -560,6 +560,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         }
       });
     }
+    function handleLabelLink(config) {
+      var _a;
+      handleEvent.value(
+        getFormData(),
+        config,
+        (_a = config.labelLinkEventConfig) == null ? void 0 : _a.find((item) => item.name == "Click")
+      );
+    }
     const gridLayoutFieldsData = Vue.ref([]);
     const oriGridLayoutData = Vue.ref([]);
     const formItemRefs = Vue.ref(/* @__PURE__ */ new Map());
@@ -1230,7 +1238,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                             error: getFieldError(component.fieldName),
                             formRef: formRef.value,
                             formMode: formMode.value,
-                            onChange: handleFieldChange
+                            onChange: handleFieldChange,
+                            onLabelLink: handleLabelLink
                           }, null, 8, ["modelValue", "onUpdate:modelValue", "config", "localConfig", "error", "formRef", "formMode"])
                         ]),
                         _: 1
@@ -1282,5 +1291,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-045897e3"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-ae7b77e4"]]);
 exports.default = _Form;

package/lib/packages/vue/src/components/forms/formItem/FormItem.vue.js

@@ -5,6 +5,7 @@ require("../../../../../../node_modules/element-plus/es/index.js");
 ;/* empty css                                                                        */
 ;/* empty css                                                                     */
 require("../../../../../../node_modules/element-plus/theme-chalk/el-tooltip.css.js");
+;/* empty css                                                                   */
 const Vue = require("vue");
 const debounce = require("../form/debounce.js");
 const index$3 = require("../subTitle/index.js");
@@ -19,7 +20,8 @@ const index = require("../../bus/index.js");
 ;/* empty css               */
 const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
 const index$9 = require("../../../../../../node_modules/element-plus/es/components/form/index.js");
-const index$a = require("../../../../../../node_modules/element-plus/es/components/tooltip/index.js");
+const index$a = require("../../../../../../node_modules/element-plus/es/components/link/index.js");
+const index$b = require("../../../../../../node_modules/element-plus/es/components/tooltip/index.js");
 const _hoisted_1 = {
   key: 0,
   class: "iconfont icon-iconZheng credit-icon"
@@ -28,6 +30,7 @@ const _hoisted_2 = {
   key: 1,
   class: "iconfont icon-iconJian regulation-icon"
 };
+const _hoisted_3 = { key: 3 };
 const _sfc_main = /* @__PURE__ */ Object.assign({
   inheritAttrs: false
 }, {
@@ -58,7 +61,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       default: ""
     }
   },
-  emits: ["update:modelValue", "change"],
+  emits: ["update:modelValue", "change", "labelLink"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emit = __emit;
@@ -103,6 +106,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         }
       }
     });
+    function handleLabelLink() {
+      emit("labelLink", props.config);
+    }
     const getInnerComponentRef = () => {
       return innerComponentRef.value;
     };
@@ -111,7 +117,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       getInnerComponentRef
     });
     return (_ctx, _cache) => {
-      const _component_el_tooltip = index$a.ElTooltip;
+      const _component_el_link = index$a.ElLink;
+      const _component_el_tooltip = index$b.ElTooltip;
       const _component_el_form_item = index$9.ElFormItem;
       return __props.config.fieldType == "h2" ? (Vue.openBlock(), Vue.createBlock(Vue.unref(index$2.H2), {
         key: 0,
@@ -189,9 +196,19 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             return [
               __props.config.credit ? (Vue.openBlock(), Vue.createElementBlock("i", _hoisted_1)) : Vue.createCommentVNode("", true),
               __props.config.regulation ? (Vue.openBlock(), Vue.createElementBlock("i", _hoisted_2)) : Vue.createCommentVNode("", true),
-              Vue.createElementVNode("span", null, Vue.toDisplayString(__props.config.label), 1),
-              ((_a = __props.config.tooltip) == null ? void 0 : _a.trim()) ? (Vue.openBlock(), Vue.createBlock(_component_el_tooltip, {
+              __props.config.labelLink ? (Vue.openBlock(), Vue.createBlock(_component_el_link, {
                 key: 2,
+                type: "primary",
+                style: { "pointer-events": "all" },
+                onClick: Vue.withModifiers(handleLabelLink, ["prevent"])
+              }, {
+                default: Vue.withCtx(() => [
+                  Vue.createTextVNode(Vue.toDisplayString(__props.config.label), 1)
+                ]),
+                _: 1
+              })) : (Vue.openBlock(), Vue.createElementBlock("span", _hoisted_3, Vue.toDisplayString(__props.config.label), 1)),
+              ((_a = __props.config.tooltip) == null ? void 0 : _a.trim()) ? (Vue.openBlock(), Vue.createBlock(_component_el_tooltip, {
+                key: 4,
                 content: __props.config.tooltip,
                 placement: "top"
               }, {
@@ -208,5 +225,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _FormItem = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-08a3d7ce"]]);
+const _FormItem = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-ebc3ff2b"]]);
 exports.default = _FormItem;

package/lib/packages/vue/src/components/forms/subTable/SubTable.vue.js

@@ -33,7 +33,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
   },
   setup(__props, { expose: __expose }) {
     const props = __props;
-    const formData = Vue.inject("formData");
+    const getFormData = Vue.inject("getFormData");
+    const formData = Vue.ref(getFormData());
     Vue.inject("rowHeight");
     Vue.inject("gridLayout");
     const setFormItemHeight = Vue.inject("setFormItemHeight");
@@ -68,7 +69,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         ...props.localConfig.hiddenFields
       ];
     });
-    const initSearchData = Vue.computed(() => {
+    const initHiddenData = Vue.computed(() => {
       if (props.config.dataSourceFrom == "self") {
         const params = parseRouteParams.parseRouteParams(
           props.config.subTableParams,
@@ -93,7 +94,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         if (!item.showCondition) return true;
         return parseFilterConfig.checkFilterMatch(
           item.showCondition,
-          initSearchData.value,
+          initHiddenData.value,
           subTableFieldsData.value
         );
       });
@@ -104,7 +105,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         if (!item.showCondition) return true;
         return parseFilterConfig.checkFilterMatch(
           item.showCondition,
-          initSearchData.value,
+          initHiddenData.value,
           subTableFieldsData.value
         );
       });
@@ -200,12 +201,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           height: __props.config.subTableHeight,
           maxHeight: __props.config.subTableMaxHeight,
           tableData: Vue.unref(subTableData),
-          initSearchData: Vue.unref(initSearchData),
+          initHiddenData: Vue.unref(initHiddenData),
           canLoadBySearchData: __props.config.reloadOnParamsChange,
           readonly: __props.config.isSubTableReadOnly || __props.formMode == "query",
           btnRollbackEvent: Vue.unref(btnRollbackEvent),
           subTableConfig: __props.config
-        }, null, 8, ["templateKey", "mode", "titleMode", "hasPagination", "heightMode", "height", "maxHeight", "tableData", "initSearchData", "canLoadBySearchData", "readonly", "btnRollbackEvent", "subTableConfig"])
+        }, null, 8, ["templateKey", "mode", "titleMode", "hasPagination", "heightMode", "height", "maxHeight", "tableData", "initHiddenData", "canLoadBySearchData", "readonly", "btnRollbackEvent", "subTableConfig"])
       ], 64);
     };
   }

package/package.json

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