@fecp/designer 5.5.91 → 5.5.93

package/lib/packages/mobile/index.js

@@ -3,7 +3,7 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const all = require("./src/components/all.js");
 require("./node_modules/@vant/touch-emulator/dist/index.js");
 ;/* empty css                     */
-const index$15 = ;/* empty css               */
+const index$16 = ;/* empty css               */
 const index$1 = require("./src/components/base/button/index.js");
 const index$2 = require("./src/components/base/icon/index.js");
 const index$3 = require("./src/components/base/cell/index.js");
@@ -72,6 +72,7 @@ const index$11 = require("./src/components/navigation/tabbarItem/index.js");
 const index$12 = require("./src/components/navigation/treeSelect/index.js");
 const index$13 = require("./src/components/layout/layout/index.js");
 const index$14 = require("./src/components/custom/timeLineFilter/index.js");
+const index$15 = require("./src/components/custom/appDetail/index.js");
 const functionCall = require("./node_modules/vant/es/dialog/function-call.js");
 const functionCall$1 = require("./node_modules/vant/es/image-preview/function-call.js");
 const functionCall$2 = require("./node_modules/vant/es/notify/function-call.js");
@@ -81,7 +82,7 @@ const index = {
     for (let c in all) {
       app.use(all[c]);
     }
-    app.component("FecMobileApp", index$15.default);
+    app.component("FecMobileApp", index$16.default);
   }
 };
 exports.MobileButton = index$1.MobileButton;
@@ -152,6 +153,7 @@ exports.MobileTabbarItem = index$11.MobileTabbarItem;
 exports.MobileTreeSelect = index$12.MobileTreeSelect;
 exports.MobileLayout = index$13.MobileLayout;
 exports.MobileTimeLineFilter = index$14.MobileTimeLineFilter;
+exports.MobileAppDetail = index$15.MobileAppDetail;
 exports.closeDialog = functionCall.closeDialog;
 exports.showConfirmDialog = functionCall.showConfirmDialog;
 exports.showDialog = functionCall.showDialog;

package/lib/packages/mobile/src/components/all.js

@@ -68,6 +68,7 @@ const index$10 = require("./navigation/tabbarItem/index.js");
 const index$11 = require("./navigation/treeSelect/index.js");
 const index$12 = require("./layout/layout/index.js");
 const index$13 = require("./custom/timeLineFilter/index.js");
+const index$14 = require("./custom/appDetail/index.js");
 exports.MobileButton = index.MobileButton;
 exports.MobileIcon = index$1.MobileIcon;
 exports.MobileCell = index$2.MobileCell;
@@ -136,3 +137,4 @@ exports.MobileTabbarItem = index$10.MobileTabbarItem;
 exports.MobileTreeSelect = index$11.MobileTreeSelect;
 exports.MobileLayout = index$12.MobileLayout;
 exports.MobileTimeLineFilter = index$13.MobileTimeLineFilter;
+exports.MobileAppDetail = index$14.MobileAppDetail;

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

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+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: {
+      type: Boolean,
+      default: false
+    },
+    //任务对象+流程变量
+    data: {
+      type: Object,
+      default: {}
+    }
+  },
+  setup(__props) {
+    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 _AppDetail = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-6cf862c9"]]);
+exports.default = _AppDetail;

package/lib/packages/mobile/src/components/custom/appDetail/index.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const AppDetail = require("./AppDetail.vue.js");
+const install = require("../../../utils/install.js");
+const MobileAppDetail = install.default.withInstall(
+  "MobileAppDetail",
+  AppDetail.default
+);
+exports.MobileAppDetail = MobileAppDetail;
+exports.default = MobileAppDetail;

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

@@ -61,23 +61,22 @@ const _sfc_main = {
         class: "fec-tabs-container",
         style: Vue.normalizeStyle("height:" + Vue.unref(compHeight))
       }, [
-        Vue.createVNode(_component_van_tabs, Vue.mergeProps(_ctx.$attrs, {
+        Vue.createVNode(_component_van_tabs, {
+          sticky: "",
           class: "fec-tabs",
           active: Vue.unref(activeName),
-          "onUpdate:active": _cache[0] || (_cache[0] = ($event) => Vue.isRef(activeName) ? activeName.value = $event : null),
-          animated: "",
-          ellipsis: ""
-        }), {
+          "onUpdate:active": _cache[0] || (_cache[0] = ($event) => Vue.isRef(activeName) ? activeName.value = $event : null)
+        }, {
           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, {
-                "show-zero-badge": false,
-                replace: ""
+                replace: "",
+                "show-zero-badge": false
               }), null, 16);
             }), 256))
           ]),
           _: 1
-        }, 16, ["active"]),
+        }, 8, ["active"]),
         Vue.createElementVNode("div", _hoisted_1, [
           Vue.renderSlot(_ctx.$slots, "default", {}, void 0, true)
         ])
@@ -85,5 +84,5 @@ const _sfc_main = {
     };
   }
 };
-const _Tabs = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-aa810b00"]]);
+const _Tabs = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-a014f592"]]);
 exports.default = _Tabs;

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

@@ -27,6 +27,10 @@ const _sfc_main = {
     appId: {
       type: String,
       default: ""
+    },
+    pageKey: {
+      type: String,
+      default: ""
     }
   },
   setup(__props) {
@@ -35,6 +39,7 @@ const _sfc_main = {
     const ctx = currentInstance.proxy;
     const pageList = Vue.ref({});
     const configLoading = Vue.ref(true);
+    const noTargetPage = Vue.ref(false);
     const loadConfig = async () => {
       var _a, _b;
       if (!props.appId) {
@@ -44,12 +49,20 @@ const _sfc_main = {
       try {
         let option = await index$2.default.getAppById(ctx.$http, props.appId);
         pageList.value = ((_a = JSON.parse(option.pageConfig)) == null ? void 0 : _a.pageConfig) || [];
-        let homePage = pageList.value.find((page2) => page2.isHome);
-        if (!homePage) {
-          homePage = (_b = pageList.value) == null ? void 0 : _b[0];
-        }
         pageHistory.pageHistory.clear();
         console.log("🚀 ~ pageList ~ pageList.value:", pageList.value);
+        let homePage;
+        if (props.pageKey) {
+          homePage = pageList.value.find((page2) => page2.isHome);
+          if (!homePage) {
+            noTargetPage.value = true;
+          }
+        } else {
+          homePage = pageList.value.find((page2) => page2.isHome);
+          if (!homePage) {
+            homePage = (_b = pageList.value) == null ? void 0 : _b[0];
+          }
+        }
         let pageId = homePage.id;
         if (homePage.footerType == "tabbar") {
           pageId = homePage.tabbarConfig.tabbarOptions[0].pageId;
@@ -78,7 +91,9 @@ const _sfc_main = {
           routePage.value = null;
         }
         pageHistory.pageHistory.push(targetPage);
+        noTargetPage.value = false;
       } else {
+        noTargetPage.value = true;
         currentPage.value = null;
         routePage.value = null;
       }
@@ -114,7 +129,7 @@ const _sfc_main = {
         ref: "fecMobileAppRef"
       }, {
         default: Vue.withCtx(() => [
-          Vue.unref(currentPage) ? (Vue.openBlock(), Vue.createBlock(Vue.unref(page.default), {
+          !Vue.unref(noTargetPage) ? (Vue.openBlock(), Vue.createBlock(Vue.unref(page.default), {
             key: 0,
             parentPage: Vue.unref(currentPage),
             routePage: Vue.unref(routePage)
@@ -129,5 +144,5 @@ const _sfc_main = {
     };
   }
 };
-const MobileApp = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-e580f40a"]]);
+const MobileApp = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-67de5a65"]]);
 exports.default = MobileApp;

package/lib/packages/vue/src/components/dialog/DialogRenderer.vue2.js

@@ -215,8 +215,7 @@ const _sfc_main = {
               form: props.componentCtx,
               table: props.componentCtx
             },
-            row: props.formData,
-            item: {}
+            row: props.formData
           });
         }
         emit("confirm", tableSelectionRows.value);

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

@@ -867,7 +867,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         });
       }
       if (linkedConfig.options) {
-        result.options = linkedConfig.options;
+        result.options = linkedConfig.options.filter((item) => {
+          return changedFieldIds.some(
+            (fieldId) => parseFilterConfig.checkFieldInFilterConfig(item.filterConfig, fieldId)
+          );
+        });
       }
       if (linkedConfig.visibility) {
         result.visibility = linkedConfig.visibility;
@@ -925,7 +929,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
               layoutFieldItem.component.optionConfig.options = oriOptions.filter(
                 (item2) => optionsOpt.includes(item2.value)
               );
-              formData.value[layoutFieldItem.component.fieldName] = "";
             }
           });
         }
@@ -1273,5 +1276,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-fda7f229"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-d12d82a2"]]);
 exports.default = _Form;

package/lib/packages/vue/src/utils/datasource.js

@@ -28,6 +28,7 @@ class DataSourceManager {
     this.data = Vue.reactive({});
     this.contextData = options.data || null;
     this.fields = options.fields || [];
+    this.notShowMessage = options.notShowMessage || false;
     this.events = {
       loaded: [],
       error: []
@@ -155,21 +156,23 @@ class DataSourceManager {
           response = await this.http.get(url, { params });
           break;
         case "post":
-          if (currentDs.contentType === "formData") {
-            response = await this.http.postForm(url, params, requestConfig);
+          if (this.notShowMessage) {
+            response = await this.http.postNoMessage(url, params);
+          } else if (currentDs.contentType === "formData") {
+            response = await this.http.postForm(url, params);
           } else if (currentDs.contentType === "download") {
-            await this.http.download(url, params, requestConfig);
+            await this.http.download(url, params);
           } else if (currentDs.contentType === "upload") {
-            response = await this.http.upload(url, params, requestConfig);
+            response = await this.http.upload(url, params);
           } else {
-            response = await this.http.post(url, params, requestConfig);
+            response = await this.http.post(url, params);
           }
           break;
         case "put":
           if (currentDs.contentType === "formData") {
-            response = await this.http.putForm(url, params, requestConfig);
+            response = await this.http.putForm(url, params);
           } else {
-            response = await this.http.put(url, params, requestConfig);
+            response = await this.http.put(url, params);
           }
           break;
         case "delete":

package/lib/packages/vue/src/utils/eventFlow/actionHandlers.js

@@ -144,8 +144,11 @@ async function handlePageGoBack(node, data, fields, context) {
   }
 }
 async function handleApiCall(node, data, fields, context, params) {
+  var _a;
   console.log("[EventFlow] 执行API调用:", node.basic);
   const basic = node.basic || {};
+  const metadata = context.metadata || {};
+  const isApproval = ((_a = metadata == null ? void 0 : metadata.item) == null ? void 0 : _a.isApproval) || false;
   if (!basic.dataSourceId) {
     return {
       success: false,
@@ -167,7 +170,8 @@ async function handleApiCall(node, data, fields, context, params) {
     currentDataSourceId: basic.dataSourceId,
     showSuccessMessage: basic.showSuccessMessage,
     data,
-    fields
+    fields,
+    notShowMessage: isApproval
   });
   try {
     const result = await dataSourceManager.fetch();

package/lib/packages/vue/src/utils/eventFlow/eventFlowHandler.js

@@ -11,7 +11,6 @@ async function executeEventFlow(params) {
     onSuccess,
     onError,
     row,
-    item,
     metadata
   } = params;
   if (!eventFlow) {
@@ -52,7 +51,7 @@ function createEventFlowHandler(options = {}) {
     components = {},
     metadata = {}
   } = options;
-  return async function handleEvent(row, item, eventConfig) {
+  return async function handleEvent(row, item2, eventConfig) {
     if (eventConfig && eventConfig.eventFlow) {
       return await executeEventFlow({
         eventFlow: eventConfig.eventFlow,
@@ -63,13 +62,12 @@ function createEventFlowHandler(options = {}) {
         onSuccess,
         onError,
         row,
-        item,
-        metadata
+        metadata: { ...metadata, item: item2 }
       });
     }
   };
 }
-function getEventHandlers(item, row, eventHandler, eventConfigs) {
+function getEventHandlers(item2, row, eventHandler, eventConfigs) {
   const handlers = {};
   if (!eventConfigs) {
     return handlers;
@@ -77,7 +75,7 @@ function getEventHandlers(item, row, eventHandler, eventConfigs) {
   eventConfigs.forEach((eventConfig) => {
     if (!eventConfig.name) return;
     const eventName = eventConfig.name.toLowerCase();
-    handlers[eventName] = () => eventHandler(row, item, eventConfig);
+    handlers[eventName] = () => eventHandler(row, item2, eventConfig);
   });
   return handlers;
 }
@@ -85,7 +83,7 @@ function useEventFlow(options = {}) {
   const handleEvent = createEventFlowHandler(options);
   return {
     handleEvent,
-    getEventHandlers: (item, row, eventConfig) => getEventHandlers(item, row, handleEvent, eventConfig)
+    getEventHandlers: (item2, row, eventConfig) => getEventHandlers(item2, row, handleEvent, eventConfig)
   };
 }
 exports.createEventFlowHandler = createEventFlowHandler;

package/package.json

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