@fecp/designer 5.5.91 → 5.5.93

package/es/packages/mobile/index.mjs

@@ -70,6 +70,7 @@ import { MobileTabbarItem } from "./src/components/navigation/tabbarItem/index.m
 import { MobileTreeSelect } from "./src/components/navigation/treeSelect/index.mjs";
 import { MobileLayout } from "./src/components/layout/layout/index.mjs";
 import { MobileTimeLineFilter } from "./src/components/custom/timeLineFilter/index.mjs";
+import { MobileAppDetail } from "./src/components/custom/appDetail/index.mjs";
 import { closeDialog, showConfirmDialog, showDialog } from "./node_modules/vant/es/dialog/function-call.mjs";
 import { showImagePreview } from "./node_modules/vant/es/image-preview/function-call.mjs";
 import { closeNotify, showNotify } from "./node_modules/vant/es/notify/function-call.mjs";
@@ -85,6 +86,7 @@ const index = {
 export {
   MobileActionBar,
   MobileActionSheet,
+  MobileAppDetail,
   MobileBackTop,
   MobileButton,
   MobileCard,

package/es/packages/mobile/src/components/all.mjs

@@ -66,9 +66,11 @@ import { MobileTabbarItem } from "./navigation/tabbarItem/index.mjs";
 import { MobileTreeSelect } from "./navigation/treeSelect/index.mjs";
 import { MobileLayout } from "./layout/layout/index.mjs";
 import { MobileTimeLineFilter } from "./custom/timeLineFilter/index.mjs";
+import { MobileAppDetail } from "./custom/appDetail/index.mjs";
 export {
   MobileActionBar,
   MobileActionSheet,
+  MobileAppDetail,
   MobileBackTop,
   MobileButton,
   MobileCard,

package/es/packages/mobile/src/components/custom/appDetail/AppDetail.vue.mjs

@@ -0,0 +1,33 @@
+import { createElementBlock, createCommentVNode, openBlock, createElementVNode } from "vue";
+/* empty css                */
+import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
+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 ? (openBlock(), createElementBlock("div", _hoisted_1, _cache[0] || (_cache[0] = [
+        createElementVNode("div", { class: "route-hint" }, "根据配置动态显示审批详情页面", -1),
+        createElementVNode("div", { class: "route-hint" }, "传递 任务对象+流程变量 到页面中", -1)
+      ]))) : createCommentVNode("", true);
+    };
+  }
+};
+const _AppDetail = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-6cf862c9"]]);
+export {
+  _AppDetail as default
+};

package/es/packages/mobile/src/components/custom/appDetail/index.mjs

@@ -0,0 +1,10 @@
+import _AppDetail from "./AppDetail.vue.mjs";
+import install from "../../../utils/install.mjs";
+const MobileAppDetail = install.withInstall(
+  "MobileAppDetail",
+  _AppDetail
+);
+export {
+  MobileAppDetail,
+  MobileAppDetail as default
+};

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

@@ -5,7 +5,7 @@
 /* empty css                                                */
 /* empty css                                                     */
 /* empty css                                              */
-import { computed, createElementBlock, openBlock, normalizeStyle, unref, createVNode, createElementVNode, mergeProps, isRef, withCtx, Fragment, renderList, createBlock, renderSlot } from "vue";
+import { computed, createElementBlock, openBlock, normalizeStyle, unref, createVNode, createElementVNode, isRef, withCtx, Fragment, renderList, createBlock, mergeProps, renderSlot } from "vue";
 /* empty css           */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
 import { Tabs } from "../../../../node_modules/vant/es/tabs/index.mjs";
@@ -59,23 +59,22 @@ const _sfc_main = {
         class: "fec-tabs-container",
         style: normalizeStyle("height:" + unref(compHeight))
       }, [
-        createVNode(_component_van_tabs, mergeProps(_ctx.$attrs, {
+        createVNode(_component_van_tabs, {
+          sticky: "",
           class: "fec-tabs",
           active: unref(activeName),
-          "onUpdate:active": _cache[0] || (_cache[0] = ($event) => isRef(activeName) ? activeName.value = $event : null),
-          animated: "",
-          ellipsis: ""
-        }), {
+          "onUpdate:active": _cache[0] || (_cache[0] = ($event) => isRef(activeName) ? activeName.value = $event : null)
+        }, {
           default: withCtx(() => [
             (openBlock(true), createElementBlock(Fragment, null, renderList(__props.options, (item) => {
               return openBlock(), createBlock(_component_van_tab, mergeProps({ ref_for: true }, item, {
-                "show-zero-badge": false,
-                replace: ""
+                replace: "",
+                "show-zero-badge": false
               }), null, 16);
             }), 256))
           ]),
           _: 1
-        }, 16, ["active"]),
+        }, 8, ["active"]),
         createElementVNode("div", _hoisted_1, [
           renderSlot(_ctx.$slots, "default", {}, void 0, true)
         ])
@@ -83,7 +82,7 @@ const _sfc_main = {
     };
   }
 };
-const _Tabs = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-aa810b00"]]);
+const _Tabs = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a014f592"]]);
 export {
   _Tabs as default
 };

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

@@ -25,6 +25,10 @@ const _sfc_main = {
     appId: {
       type: String,
       default: ""
+    },
+    pageKey: {
+      type: String,
+      default: ""
     }
   },
   setup(__props) {
@@ -33,6 +37,7 @@ const _sfc_main = {
     const ctx = currentInstance.proxy;
     const pageList = ref({});
     const configLoading = ref(true);
+    const noTargetPage = ref(false);
     const loadConfig = async () => {
       var _a, _b;
       if (!props.appId) {
@@ -42,12 +47,20 @@ const _sfc_main = {
       try {
         let option = await api.getAppById(ctx.$http, props.appId);
         pageList.value = ((_a = JSON.parse(option.pageConfig)) == null ? void 0 : _a.pageConfig) || [];
-        let homePage = pageList.value.find((page) => page.isHome);
-        if (!homePage) {
-          homePage = (_b = pageList.value) == null ? void 0 : _b[0];
-        }
         pageHistory.clear();
         console.log("🚀 ~ pageList ~ pageList.value:", pageList.value);
+        let homePage;
+        if (props.pageKey) {
+          homePage = pageList.value.find((page) => page.isHome);
+          if (!homePage) {
+            noTargetPage.value = true;
+          }
+        } else {
+          homePage = pageList.value.find((page) => page.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;
@@ -76,7 +89,9 @@ const _sfc_main = {
           routePage.value = null;
         }
         pageHistory.push(targetPage);
+        noTargetPage.value = false;
       } else {
+        noTargetPage.value = true;
         currentPage.value = null;
         routePage.value = null;
       }
@@ -112,7 +127,7 @@ const _sfc_main = {
         ref: "fecMobileAppRef"
       }, {
         default: withCtx(() => [
-          unref(currentPage) ? (openBlock(), createBlock(unref(MobilePage), {
+          !unref(noTargetPage) ? (openBlock(), createBlock(unref(MobilePage), {
             key: 0,
             parentPage: unref(currentPage),
             routePage: unref(routePage)
@@ -127,7 +142,7 @@ const _sfc_main = {
     };
   }
 };
-const MobileApp = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-e580f40a"]]);
+const MobileApp = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-67de5a65"]]);
 export {
   MobileApp as default
 };

package/es/packages/vue/src/components/dialog/DialogRenderer.vue2.mjs

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

package/es/packages/vue/src/components/forms/form/Form.vue.mjs

@@ -865,7 +865,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         });
       }
       if (linkedConfig.options) {
-        result.options = linkedConfig.options;
+        result.options = linkedConfig.options.filter((item) => {
+          return changedFieldIds.some(
+            (fieldId) => checkFieldInFilterConfig(item.filterConfig, fieldId)
+          );
+        });
       }
       if (linkedConfig.visibility) {
         result.visibility = linkedConfig.visibility;
@@ -923,7 +927,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
               layoutFieldItem.component.optionConfig.options = oriOptions.filter(
                 (item2) => optionsOpt.includes(item2.value)
               );
-              formData.value[layoutFieldItem.component.fieldName] = "";
             }
           });
         }
@@ -1271,7 +1274,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-fda7f229"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-d12d82a2"]]);
 export {
   _Form as default
 };

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

@@ -26,6 +26,7 @@ class DataSourceManager {
     this.data = reactive({});
     this.contextData = options.data || null;
     this.fields = options.fields || [];
+    this.notShowMessage = options.notShowMessage || false;
     this.events = {
       loaded: [],
       error: []
@@ -153,21 +154,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/es/packages/vue/src/utils/eventFlow/actionHandlers.mjs

@@ -142,8 +142,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,
@@ -165,7 +168,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/es/packages/vue/src/utils/eventFlow/eventFlowHandler.mjs

@@ -9,7 +9,6 @@ async function executeEventFlow(params) {
     onSuccess,
     onError,
     row,
-    item,
     metadata
   } = params;
   if (!eventFlow) {
@@ -50,7 +49,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,
@@ -61,13 +60,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;
@@ -75,7 +73,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;
 }
@@ -83,7 +81,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)
   };
 }
 export {

package/lib/designer/package.json.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const version = "5.5.91";
+const version = "5.5.93";
 const packageJson = {
   version
 };