mooho-base-admin-plus 2.8.9 → 2.8.10

package/history.md

@@ -150,3 +150,4 @@ mooho-base-admin-plus@2.8.6 - 公式计算后增加change事件
 mooho-base-admin-plus@2.8.7 - 增加密码加密，增加文件类型验证
 mooho-base-admin-plus@2.8.8 - 下拉框等返回所有数据，避免联动失效
 mooho-base-admin-plus@2.8.9 - 增加流程页面模板插槽
+mooho-base-admin-plus@2.8.10 - 流程页面模板优化

package/package/mooho-base-admin-plus.min.esm.js

@@ -12964,7 +12964,7 @@ var FileSaver_min = { exports: {} };
   });
 })(FileSaver_min);
 var FileSaver_minExports = FileSaver_min.exports;
-const saveAs = /* @__PURE__ */ getDefaultExportFromCjs(FileSaver_minExports), modelApi = {
+const saveAs = /* @__PURE__ */ getDefaultExportFromCjs(FileSaver_minExports), modelApi$1 = {
   add(r, a) {
     return service({
       url: `api/${r}/add`,
@@ -13129,7 +13129,7 @@ const saveAs = /* @__PURE__ */ getDefaultExportFromCjs(FileSaver_minExports), mo
       if (!(a in r.caches)) {
         r.caches[a] = [];
         try {
-          let o = await modelApi.query(a, {});
+          let o = await modelApi$1.query(a, {});
           r.caches[a] = o.data;
         } catch (o) {
           throw delete r.caches[a], o;
@@ -13145,7 +13145,7 @@ const saveAs = /* @__PURE__ */ getDefaultExportFromCjs(FileSaver_minExports), mo
       if (!(a in r.dicts)) {
         r.dicts[a] = {};
         try {
-          (await modelApi.query("Dict", { type: a })).data.forEach((s) => {
+          (await modelApi$1.query("Dict", { type: a })).data.forEach((s) => {
             r.dicts[a][s.id] = s.displayName;
           });
         } catch (o) {
@@ -19815,7 +19815,7 @@ const home = /* @__PURE__ */ _export_sfc(_sfc_main$1r, [["render", _sfc_render$1
   created() {
     setTimeout(async () => {
       if (this.$route.query.id != null) {
-        const r = await modelApi.get("Task", this.$route.query.id);
+        const r = await modelApi$1.get("Task", this.$route.query.id);
         this.$refs.taskForm.open(r);
       }
     });
@@ -20408,7 +20408,7 @@ const columnCheck = /* @__PURE__ */ _export_sfc(_sfc_main$1n, [["render", _sfc_r
     async save() {
       await this.$refs.form.validate() ? this.confirm("Front_Msg_Sure_To_Save", async () => {
         let a = this.$refs.form.getFullData();
-        a.processProperty = JSON.stringify(this.$refs.propertyTable.data), a.id ? await modelApi.update("ApplicationType", a) : await modelApi.add("ApplicationType", a), this.success("Front_Msg_Success", () => {
+        a.processProperty = JSON.stringify(this.$refs.propertyTable.data), a.id ? await modelApi$1.update("ApplicationType", a) : await modelApi$1.add("ApplicationType", a), this.success("Front_Msg_Success", () => {
           this.$refs.form.close(), this.$refs.table.loadData();
         });
       }) : this.error("Front_Msg_Form_Validate_Fail");
@@ -20422,7 +20422,7 @@ const columnCheck = /* @__PURE__ */ _export_sfc(_sfc_main$1n, [["render", _sfc_r
     async initPropertyData() {
       let r = this.$refs.form.data.processID, a = this.$refs.form.data.processProperty;
       if (this.processProperties = [], r != null) {
-        let s = (await modelApi.query("ProcessProperty", { processID: r })).data, l = [];
+        let s = (await modelApi$1.query("ProcessProperty", { processID: r })).data, l = [];
         a != null && (l = JSON.parse(a)), this.processProperties = s.map((u) => {
           let c = l.find((d) => d.propertyCode == u.propertyCode);
           return {
@@ -20444,7 +20444,7 @@ const columnCheck = /* @__PURE__ */ _export_sfc(_sfc_main$1n, [["render", _sfc_r
     async saveSetting() {
       await this.$refs.notificationSettingForm.validate() ? this.confirm("Front_Msg_Sure_To_Save", async () => {
         let a = this.$refs.notificationSettingForm.getFullData();
-        this.applicationType.notificationSetting = JSON.stringify(a), await modelApi.update("ApplicationType", this.applicationType), this.success("Front_Msg_Success", () => {
+        this.applicationType.notificationSetting = JSON.stringify(a), await modelApi$1.update("ApplicationType", this.applicationType), this.success("Front_Msg_Success", () => {
           this.$refs.notificationSettingForm.close(), this.$refs.table.loadData();
         });
       }) : this.error("Front_Msg_Form_Validate_Fail");
@@ -20760,7 +20760,7 @@ const customPage = /* @__PURE__ */ _export_sfc(_sfc_main$1l, [["render", _sfc_re
     remove(r) {
       this.confirm("Front_Msg_Sure_To_Delete_Item", () => {
         this.confirm("Front_Msg_Sure_To_Delete_Column", async () => {
-          await modelApi.remove("CustomColumn", r.id), this.success("Front_Msg_Success", () => {
+          await modelApi$1.remove("CustomColumn", r.id), this.success("Front_Msg_Success", () => {
             this.$refs.columnTable.loadData();
           });
         });
@@ -21108,7 +21108,7 @@ const _404 = /* @__PURE__ */ _export_sfc(_sfc_main$1g, [["render", _sfc_render$1
     remove(r) {
       this.confirm("Front_Msg_Sure_To_Delete_Item", () => {
         this.confirm("Front_Msg_Sure_To_Delete_Column", async () => {
-          await modelApi.remove("ExtendColumn", r.id), this.success("Front_Msg_Success", () => {
+          await modelApi$1.remove("ExtendColumn", r.id), this.success("Front_Msg_Success", () => {
             this.$refs.columnTable.loadData();
           });
         });
@@ -21410,7 +21410,7 @@ const formView = /* @__PURE__ */ _export_sfc(_sfc_main$1e, [["render", _sfc_rend
     },
     async remove(r) {
       this.confirm("Front_Msg_Sure_To_Delete_Item", async () => {
-        await modelApi.remove("I18nText", r.id), this.success("Front_Msg_Success", () => {
+        await modelApi$1.remove("I18nText", r.id), this.success("Front_Msg_Success", () => {
           this.loadData();
         });
       });
@@ -21977,7 +21977,7 @@ const openUser = /* @__PURE__ */ _export_sfc(_sfc_main$18, [["render", _sfc_rend
   methods: {
     // 树展开
     async onTreeLoad(r) {
-      let a = await modelApi.query("Organization", {
+      let a = await modelApi$1.query("Organization", {
         parentID: r.id,
         page: 1,
         per: 1e3,
@@ -22155,7 +22155,7 @@ const organizationType = /* @__PURE__ */ _export_sfc(_sfc_main$16, [["render", _
     },
     // 树展开
     async onTreeLoad(r) {
-      let a = await modelApi.query("Permission", {
+      let a = await modelApi$1.query("Permission", {
         parentID: r.id,
         page: 1,
         per: 1e3,
@@ -22211,7 +22211,7 @@ const organizationType = /* @__PURE__ */ _export_sfc(_sfc_main$16, [["render", _
     },
     async loadParentData(r, a) {
       if (a.push(r), r.parentID && !a.some((o) => o.id == r.parentID)) {
-        let o = await modelApi.query("Permission", {
+        let o = await modelApi$1.query("Permission", {
           id: r.parentID,
           page: 1,
           per: 1
@@ -22752,7 +22752,7 @@ const printTemplate = /* @__PURE__ */ _export_sfc(_sfc_main$13, [["render", _sfc
     async interactiveFormChange(r) {
       if (r && r.code == "destinationRoleID")
         if (this.$refs.interactiveForm.data.destinationRoleID) {
-          let o = (await modelApi.query("RoleProperty", { roleID: this.$refs.interactiveForm.data.destinationRoleID })).data.map((s) => ({
+          let o = (await modelApi$1.query("RoleProperty", { roleID: this.$refs.interactiveForm.data.destinationRoleID })).data.map((s) => ({
             rolePropertyCode: s.propertyCode,
             name: s.propertyName,
             processPropertyCode: null
@@ -23855,7 +23855,7 @@ const processType = /* @__PURE__ */ _export_sfc(_sfc_main$10, [["render", _sfc_r
     // 确认
     async save() {
       await this.$refs.form.validate() ? this.confirm("Front_Msg_Sure_To_Save", async () => {
-        this.data.id ? await modelApi.update("RoleProperty", this.data) : await modelApi.add("RoleProperty", this.data), this.success("Front_Msg_Success"), this.callback(), this.opened = !1;
+        this.data.id ? await modelApi$1.update("RoleProperty", this.data) : await modelApi$1.add("RoleProperty", this.data), this.success("Front_Msg_Success"), this.callback(), this.opened = !1;
       }) : this.error("Front_Msg_Form_Validate_Fail");
     },
     // 打开字段选择界面
@@ -24572,7 +24572,7 @@ const _sfc_main$_ = {
   },
   computed: {},
   async created() {
-    const r = await modelApi.query("Dict", { "type.code": "ClientType" });
+    const r = await modelApi$1.query("Dict", { "type.code": "ClientType" });
     this.clientTypes = r.data, this.clientType = this.clientTypes[0].code;
   },
   methods: {
@@ -24598,7 +24598,7 @@ const _sfc_main$_ = {
     async addUserRole() {
       this.$refs.userRoleForm.columns.find((o) => o.code == "userID").isReadonly = !1;
       let r = this.$refs.userRoleTable.param.roleID;
-      const a = await modelApi.query("RoleProperty", { roleID: r });
+      const a = await modelApi$1.query("RoleProperty", { roleID: r });
       this.roleProperties = a.data.map((o) => ({
         ...o,
         propertyValue: null
@@ -24607,8 +24607,8 @@ const _sfc_main$_ = {
     // 用户角色编辑
     async editUserRole(r) {
       this.$refs.userRoleForm.columns.find((u) => u.code == "userID").isReadonly = !0;
-      let a = r.roleID, o = await modelApi.query("RoleProperty", { roleID: a }), s = o.data, l = [];
-      o = await modelApi.query("UserRoleData", { userID: r.userID, roleID: r.roleID }), l = o.data, this.roleProperties = s.map((u) => {
+      let a = r.roleID, o = await modelApi$1.query("RoleProperty", { roleID: a }), s = o.data, l = [];
+      o = await modelApi$1.query("UserRoleData", { userID: r.userID, roleID: r.roleID }), l = o.data, this.roleProperties = s.map((u) => {
         let c = l.find((d) => d.propertyCode == u.propertyCode);
         return {
           ...u,
@@ -24630,7 +24630,7 @@ const _sfc_main$_ = {
     // 填充数据源
     async fillDataSource(r, a) {
       let o;
-      r.isSourceCustom ? o = await customModelApi.query(r.source, a) : o = await modelApi.query(r.source, a), o.data.forEach((s) => {
+      r.isSourceCustom ? o = await customModelApi.query(r.source, a) : o = await modelApi$1.query(r.source, a), o.data.forEach((s) => {
         r._dataSource.push({
           id: (r.sourceDataCode || "").trim() ? this.parseData(s, r.sourceDataCode) : s.id,
           name: this.parseData(s, r.sourceDisplayCode)
@@ -24667,7 +24667,7 @@ const _sfc_main$_ = {
           userRole: a,
           userRoleDatas: o
         };
-        a.id ? await modelApi.update("UserRole", s) : await modelApi.add("UserRole", s), this.success("Front_Msg_Success", () => {
+        a.id ? await modelApi$1.update("UserRole", s) : await modelApi$1.add("UserRole", s), this.success("Front_Msg_Success", () => {
           this.$refs.userRoleDataTable.loadData([]), this.$refs.userRoleTable.loadData(), this.$refs.userRoleForm.close();
         });
       }) : this.error("Front_Msg_Form_Validate_Fail");
@@ -27659,7 +27659,7 @@ const tableView = /* @__PURE__ */ _export_sfc(_sfc_main$Q, [["render", _sfc_rend
       });
     },
     async openRequest(r) {
-      const a = await modelApi.get("ApiOutLog", r.apiOutLogID);
+      const a = await modelApi$1.get("ApiOutLog", r.apiOutLogID);
       try {
         this.json = JSON.stringify(JSON.parse(a.requestBody), null, 2);
       } catch {
@@ -27668,7 +27668,7 @@ const tableView = /* @__PURE__ */ _export_sfc(_sfc_main$Q, [["render", _sfc_rend
       this.title = this.$t("Front_Label_Request"), this.description = this.$t("Front_Label_Request_Desc"), this.isShow = !0;
     },
     async openResponse(r) {
-      const a = await modelApi.get("ApiOutLog", r.apiOutLogID);
+      const a = await modelApi$1.get("ApiOutLog", r.apiOutLogID);
       try {
         this.json = JSON.stringify(JSON.parse(a.responseBody), null, 2);
       } catch {
@@ -27846,7 +27846,7 @@ const taskQueue = /* @__PURE__ */ _export_sfc(_sfc_main$P, [["render", _sfc_rend
     // 填充数据源
     async fillDataSource(r, a) {
       let o;
-      r.isSourceCustom ? o = await customModelApi.query(r.source, a, [r.sourceDataCode, r.sourceDisplayCode]) : o = await modelApi.query(r.source, a, [r.sourceDataCode, r.sourceDisplayCode]), o.data.forEach((s) => {
+      r.isSourceCustom ? o = await customModelApi.query(r.source, a, [r.sourceDataCode, r.sourceDisplayCode]) : o = await modelApi$1.query(r.source, a, [r.sourceDataCode, r.sourceDisplayCode]), o.data.forEach((s) => {
         r._dataSource.push({
           id: (r.sourceDataCode || "").trim() ? this.parseData(s, r.sourceDataCode) : s.id,
           name: this.parseData(s, r.sourceDisplayCode)
@@ -27883,7 +27883,7 @@ const taskQueue = /* @__PURE__ */ _export_sfc(_sfc_main$P, [["render", _sfc_rend
           userRole: a,
           userRoleDatas: o
         };
-        a.id ? await modelApi.update("UserRole", s) : await modelApi.add("UserRole", s), this.success("Front_Msg_Success", () => {
+        a.id ? await modelApi$1.update("UserRole", s) : await modelApi$1.add("UserRole", s), this.success("Front_Msg_Success", () => {
           this.$refs.userRoleDataTable.loadData([]), this.$refs.userRoleTable.loadData(), this.$refs.userRoleForm.close();
         });
       }) : this.error("Front_Msg_Form_Validate_Fail");
@@ -27897,8 +27897,8 @@ const taskQueue = /* @__PURE__ */ _export_sfc(_sfc_main$P, [["render", _sfc_rend
     },
     // 初始化用户角色数据
     async initUserRoleData(r, a) {
-      let o = await modelApi.query("RoleProperty", { roleID: a }), s = o.data, l = [];
-      this.$refs.userRoleForm.data.id && (o = await modelApi.query("UserRoleData", { userID: r, roleID: a }), l = o.data), this.roleProperties = s.map((u) => {
+      let o = await modelApi$1.query("RoleProperty", { roleID: a }), s = o.data, l = [];
+      this.$refs.userRoleForm.data.id && (o = await modelApi$1.query("UserRoleData", { userID: r, roleID: a }), l = o.data), this.roleProperties = s.map((u) => {
         let c = l.find((d) => d.propertyCode == u.propertyCode);
         return {
           ...u,
@@ -27923,7 +27923,7 @@ const taskQueue = /* @__PURE__ */ _export_sfc(_sfc_main$P, [["render", _sfc_rend
       for (let a in r)
         typeof r[a] == "object" && delete r[a];
       this.user.dataPermission = JSON.stringify(r), this.confirm("Front_Msg_Sure_To_Save", async () => {
-        await modelApi.update("User", this.user), this.success("Front_Msg_Success"), this.$refs.dataPermissionForm.close();
+        await modelApi$1.update("User", this.user), this.success("Front_Msg_Success"), this.$refs.dataPermissionForm.close();
       });
     }
   }
@@ -28207,7 +28207,6 @@ const user = /* @__PURE__ */ _export_sfc(_sfc_main$O, [["render", _sfc_render$O]
   data() {
     return {
       filter: {},
-      applicationType: {},
       page: {},
       messageData: {
         message: null
@@ -28215,9 +28214,38 @@ const user = /* @__PURE__ */ _export_sfc(_sfc_main$O, [["render", _sfc_render$O]
       messageOpened: !1
     };
   },
+  props: {
+    // 表格视图
+    tableViewCode: {
+      type: String
+    },
+    // 表单视图
+    formViewCode: {
+      type: String
+    },
+    // 查看表单视图
+    showViewCode: {
+      type: String
+    },
+    // 申请类别
+    applicationTypeCode: {
+      type: String
+    }
+  },
   computed: {},
   async mounted() {
-    this.init(this.$route.meta.data.id);
+    if (this.$route.meta.data.id) {
+      let r = await this.loadPage(this.$route.meta.data.id);
+      this.page = r.customPage, this.init();
+    } else if (this.applicationTypeCode) {
+      let r = await modelApi.query("ApplicationType", { code: this.applicationTypeCode });
+      r.data.length > 0 && (this.page = {
+        tableViewCode,
+        formViewCode,
+        showViewCode,
+        applicationType: r.data[0]
+      }, this.init());
+    }
   },
   // watch: {
   //   $route() {
@@ -28229,9 +28257,8 @@ const user = /* @__PURE__ */ _export_sfc(_sfc_main$O, [["render", _sfc_render$O]
   methods: {
     ...mapActions("admin/viewPage", { loadPage: "load" }),
     // 初始化
-    async init(r) {
-      let a = await this.loadPage(r);
-      this.page = a.customPage, setTimeout(() => {
+    async init() {
+      setTimeout(() => {
         this.allow("all") || (this.filter.createUserID = this.info.id), this.$refs.table.init(this.page.tableViewCode, () => {
           this.$refs.table.tableView.autoLoadDisable || this.$refs.table.loadData();
         }), (this.page.formViewCode || "").trim() && this.$refs.form.init(this.page.formViewCode), ((this.page.formViewCode || "").trim() || (this.page.showViewCode || "").trim()) && this.$refs.showForm.init((this.page.showViewCode || "").trim() ? this.page.showViewCode : this.page.formViewCode);
@@ -28689,7 +28716,7 @@ const processPage = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["render", _sfc_re
           let o = await dataSourceApi.query(this.tableView.dataSource, a);
           this.total = o.totalCount, this.data = o.table;
         } else {
-          let o = await modelApi.query(this.tableView.model, a, null, null, this.tableView.functionName, this.tableView.functionType);
+          let o = await modelApi$1.query(this.tableView.model, a, null, null, this.tableView.functionName, this.tableView.functionType);
           this.total = o.totalCount, this.data = o.data;
         }
       }
@@ -29362,7 +29389,7 @@ const CheckGroup = /* @__PURE__ */ _export_sfc(_sfc_main$I, [["render", _sfc_ren
             let o = this.param;
             o[this.column.sourceDataCode] = a.map((l) => l.value).join(",");
             let s;
-            this.column.isSourceCustom ? s = await customModelApi.query(this.column.source, o, [this.column.sourceDataCode, this.column.sourceDisplayCode]) : s = await modelApi.query(this.column.source, o, [this.column.sourceDataCode, this.column.sourceDisplayCode]), s.data.forEach((l) => {
+            this.column.isSourceCustom ? s = await customModelApi.query(this.column.source, o, [this.column.sourceDataCode, this.column.sourceDisplayCode]) : s = await modelApi$1.query(this.column.source, o, [this.column.sourceDataCode, this.column.sourceDisplayCode]), s.data.forEach((l) => {
               let u = this.parseData(l, this.column.sourceDataCode), c = this.parseData(l, this.column.sourceDisplayCode);
               this.multi || (this.$refs.select.query = c);
               let d = a.find((f) => f.value == u);
@@ -29527,7 +29554,7 @@ const comboSelect = /* @__PURE__ */ _export_sfc(_sfc_main$H, [["render", _sfc_re
             let o = await dataSourceApi.query(a.dataView.dataSource, r);
             o.table.length > 0 && (this.selected = o.table.map((s) => this.parseData(s, this.sourceDisplayCode)).join(","), this.selectedData = o.table);
           } else {
-            let o = await modelApi.query(a.dataView.model, r, [this.sourceDataCode, this.sourceDisplayCode]);
+            let o = await modelApi$1.query(a.dataView.model, r, [this.sourceDataCode, this.sourceDisplayCode]);
             o.data.length > 0 && (this.selected = o.data.map((s) => this.parseData(s, this.sourceDisplayCode)).join(","), this.selectedData = o.data);
           }
         });
@@ -29544,7 +29571,7 @@ const comboSelect = /* @__PURE__ */ _export_sfc(_sfc_main$H, [["render", _sfc_re
             let o = await dataSourceApi.query(a.dataView.dataSource, r);
             o.table.length > 0 && (this.selected = this.parseData(o.table[0], this.sourceDisplayCode), this.selectedData = o.table[0]);
           } else {
-            let o = await modelApi.query(a.dataView.model, r);
+            let o = await modelApi$1.query(a.dataView.model, r);
             o.data.length > 0 && (this.selected = this.parseData(o.data[0], this.sourceDisplayCode), this.selectedData = o.data[0]);
           }
         });
@@ -30786,7 +30813,7 @@ const uploadImage = /* @__PURE__ */ _export_sfc(_sfc_main$z, [["render", _sfc_re
     };
   },
   async created() {
-    let r = await modelApi.query("DisplayFormat", {});
+    let r = await modelApi$1.query("DisplayFormat", {});
     this.displayFormats = r.data;
   },
   props: {
@@ -37288,7 +37315,7 @@ const draggable = /* @__PURE__ */ getDefaultExportFromCjs(vuedraggable_umdExport
       let s;
       (a.controlType === "TreeSelect" || a.controlType === "MultiTreeSelect") && (s = this.parseTreeData(r, a.code), a.dataSource = null), (a.controlType === "ComboSelect" || a.controlType === "MultiComboSelect") && (o.per = 20), this.disableLoader();
       let l;
-      if (a.isSourceCustom ? l = await customModelApi.query(a.source, o) : l = await modelApi.query(a.source, o), this.enableLoader(), a.rawData = l.data, a.controlType === "TreeSelect" || a.controlType === "MultiTreeSelect") {
+      if (a.isSourceCustom ? l = await customModelApi.query(a.source, o) : l = await modelApi$1.query(a.source, o), this.enableLoader(), a.rawData = l.data, a.controlType === "TreeSelect" || a.controlType === "MultiTreeSelect") {
         let u = l.data.map((c) => ({
           id: (a.sourceDataCode || "").trim() ? this.parseData(c, a.sourceDataCode) : c.id,
           name: this.parseData(c, a.sourceDisplayCode),
@@ -37346,7 +37373,7 @@ const draggable = /* @__PURE__ */ getDefaultExportFromCjs(vuedraggable_umdExport
             (u || "").trim() && (o = {
               ...o,
               ...JSON.parse(u)
-            }), a.isSourceCustom ? s = await customModelApi.query(a.sourceModel, o, null, l.isReturnSimple ? l : null) : s = await modelApi.query(a.sourceModel, o, null, l.isReturnSimple ? l : null, l.functionName, l.functionType), this.$refs["list_" + a.code][0].loadData(s.data);
+            }), a.isSourceCustom ? s = await customModelApi.query(a.sourceModel, o, null, l.isReturnSimple ? l : null) : s = await modelApi$1.query(a.sourceModel, o, null, l.isReturnSimple ? l : null, l.functionName, l.functionType), this.$refs["list_" + a.code][0].loadData(s.data);
           }
         }
         a.needClear = !1, a.needRefresh = !1;
@@ -39552,7 +39579,7 @@ const modalFormSort = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["render", _sfc_
         if (!a)
           return;
         this.confirm("Front_Msg_Sure_To_Save", async () => {
-          this.formView.isCustom ? a.id ? await customModelApi.update(this.formView.model, a) : await customModelApi.add(this.formView.model, a) : a.id ? await modelApi.update(this.formView.model, a) : await modelApi.add(this.formView.model, a), this.success("Front_Msg_Success", () => {
+          this.formView.isCustom ? a.id ? await customModelApi.update(this.formView.model, a) : await customModelApi.add(this.formView.model, a) : a.id ? await modelApi$1.update(this.formView.model, a) : await modelApi$1.add(this.formView.model, a), this.success("Front_Msg_Success", () => {
             this.$refs.form.data = {}, this.$emit("on-after-save", a), this.close();
           });
         });
@@ -40394,7 +40421,7 @@ const modalTable = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["render", _sfc_ren
       let s;
       (a.controlType === "TreeSelect" || a.controlType === "MultiTreeSelect") && (s = this.parseTreeFilterData(r, a), a.dataSource = null), (a.controlType === "ComboSelect" || a.controlType === "MultiComboSelect") && (o.per = 20), this.disableLoader();
       let l;
-      if (a.isSourceCustom ? l = await customModelApi.query(a.source, o) : l = await modelApi.query(a.source, o), this.enableLoader(), a.rawData = l.data, a.controlType === "TreeSelect" || a.controlType === "MultiTreeSelect") {
+      if (a.isSourceCustom ? l = await customModelApi.query(a.source, o) : l = await modelApi$1.query(a.source, o), this.enableLoader(), a.rawData = l.data, a.controlType === "TreeSelect" || a.controlType === "MultiTreeSelect") {
         let u = l.data.map((c) => ({
           id: (a.sourceDataCode || "").trim() ? this.parseData(c, a.sourceDataCode) : c.id,
           name: this.parseData(c, a.sourceDisplayCode),
@@ -41602,7 +41629,7 @@ const tableSetting = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_r
             a ? this.$refs["table_" + r.code][0].loadData(JSON.parse(a)) : this.$refs["table_" + r.code][0].loadData([]);
           } else if (this.data.id) {
             let a, o = {}, s = this.$refs["table_" + r.code][0].tableView, l = s.filtering;
-            (l || "").trim() && (o = JSON.parse(l)), o[r.sourceDataCode] = this.data.id, r.isSourceCustom ? a = await customModelApi.query(r.sourceModel, o, null, s.isReturnSimple ? s : null) : a = await modelApi.query(r.sourceModel, o, null, s.isReturnSimple ? s : null, s.functionName, s.functionType), this.$refs["table_" + r.code][0].loadData(a.data);
+            (l || "").trim() && (o = JSON.parse(l)), o[r.sourceDataCode] = this.data.id, r.isSourceCustom ? a = await customModelApi.query(r.sourceModel, o, null, s.isReturnSimple ? s : null) : a = await modelApi$1.query(r.sourceModel, o, null, s.isReturnSimple ? s : null, s.functionName, s.functionType), this.$refs["table_" + r.code][0].loadData(a.data);
           }
         }) : r.controlType == "Attachment" && this.$refs["attachment_" + r.code] && this.$refs["attachment_" + r.code][0].setData(this.parseData(this.data, r.code));
       });
@@ -41894,7 +41921,7 @@ const tableSetting = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_r
       let s;
       (a.controlType === "TreeSelect" || a.controlType === "MultiTreeSelect") && (s = this.parseTreeData(r, a.code), a.dataSource = null), (a.controlType === "ComboSelect" || a.controlType === "MultiComboSelect") && (o.per = 20), this.disableLoader();
       let l;
-      if (a.isSourceCustom ? l = await customModelApi.query(a.source, o) : l = await modelApi.query(a.source, o), this.enableLoader(), a.rawData = l.data, a.controlType === "TreeSelect" || a.controlType === "MultiTreeSelect") {
+      if (a.isSourceCustom ? l = await customModelApi.query(a.source, o) : l = await modelApi$1.query(a.source, o), this.enableLoader(), a.rawData = l.data, a.controlType === "TreeSelect" || a.controlType === "MultiTreeSelect") {
         let u = l.data.map((c) => ({
           id: (a.sourceDataCode || "").trim() ? this.parseData(c, a.sourceDataCode) : c.id,
           name: this.parseData(c, a.sourceDisplayCode),
@@ -43094,7 +43121,7 @@ const _sfc_main$n = {
             let o = await dataSourceApi.query(this.tableView.dataSource, a);
             this.total = o.totalCount, this.data = o.table;
           } else {
-            let o = await modelApi.query(
+            let o = await modelApi$1.query(
               this.tableView.model,
               a,
               this.tableView.isReturnSimple ? this.returnColumns : null,
@@ -43151,7 +43178,7 @@ const _sfc_main$n = {
      */
     async edit(r, a) {
       let o = r;
-      this.tableView.isCustom ? o = await customModelApi.get(this.tableView.model, r.id) : this.tableView.isDataSource || (o = await modelApi.get(this.tableView.model, r.id)), this.$emit("edit", { row: o, index: a });
+      this.tableView.isCustom ? o = await customModelApi.get(this.tableView.model, r.id) : this.tableView.isDataSource || (o = await modelApi$1.get(this.tableView.model, r.id)), this.$emit("edit", { row: o, index: a });
     },
     /**
      * 查看项
@@ -43162,7 +43189,7 @@ const _sfc_main$n = {
      */
     async show(r, a) {
       let o = r;
-      this.tableView.isCustom ? o = await customModelApi.get(this.tableView.model, r.id) : this.tableView.isDataSource || (o = await modelApi.get(this.tableView.model, r.id)), this.$emit("show", { row: o, index: a });
+      this.tableView.isCustom ? o = await customModelApi.get(this.tableView.model, r.id) : this.tableView.isDataSource || (o = await modelApi$1.get(this.tableView.model, r.id)), this.$emit("show", { row: o, index: a });
     },
     /**
      * 删除项
@@ -43173,7 +43200,7 @@ const _sfc_main$n = {
      */
     remove(r, a) {
       this.confirm("Front_Msg_Sure_To_Delete_Item", async () => {
-        this.embedded ? (this.staticData.splice((this.current - 1) * this.size + a, 1), this.loadData(), this.$emit("on-change", r)) : (this.tableView.isCustom ? await customModelApi.remove(this.tableView.model, r.id) : await modelApi.remove(this.tableView.model, r.id), this.success("Front_Msg_Success", () => {
+        this.embedded ? (this.staticData.splice((this.current - 1) * this.size + a, 1), this.loadData(), this.$emit("on-change", r)) : (this.tableView.isCustom ? await customModelApi.remove(this.tableView.model, r.id) : await modelApi$1.remove(this.tableView.model, r.id), this.success("Front_Msg_Success", () => {
           this.loadData();
         }));
       });
@@ -43302,7 +43329,7 @@ const _sfc_main$n = {
         this.columns.filter((a) => a.slot == "normal")
       ) : r === "batchEdit" && this.error("Front_Msg_Not_Supported") : r === "exportExcel" ? this.exportExcel() : r === "exportPdf" ? this.exportPdf() : r === "print" ? this.print() : r === "batchEdit" && this.$refs.batchEditTable.init(this.tableView.batchEditView, async () => {
         let a;
-        this.tableView.isCustom ? a = await customModelApi.query(this.tableView.model, {}) : a = await modelApi.query(this.tableView.model, {}), this.$refs.batchEditTable.loadData(a.data), this.$refs.batchEditTable.open();
+        this.tableView.isCustom ? a = await customModelApi.query(this.tableView.model, {}) : a = await modelApi$1.query(this.tableView.model, {}), this.$refs.batchEditTable.loadData(a.data), this.$refs.batchEditTable.open();
       }));
     },
     // 导出Excel
@@ -43311,7 +43338,7 @@ const _sfc_main$n = {
         ...this.getAllFilter(),
         orderBy: this.orderBy
       };
-      this.tableView.isCustom ? customModelApi.exportExcel(this.tableView, r) : this.tableView.isDataSource ? dataSourceApi.exportExcel(this.tableView, r) : modelApi.exportExcel(this.tableView, r);
+      this.tableView.isCustom ? customModelApi.exportExcel(this.tableView, r) : this.tableView.isDataSource ? dataSourceApi.exportExcel(this.tableView, r) : modelApi$1.exportExcel(this.tableView, r);
     },
     // 导出PDF
     exportPdf() {
@@ -43319,7 +43346,7 @@ const _sfc_main$n = {
         ...this.getAllFilter(),
         orderBy: this.orderBy
       };
-      this.tableView.isCustom ? customModelApi.exportPdf(this.tableView, r) : this.tableView.isDataSource ? dataSourceApi.exportPdf(this.tableView, r) : modelApi.exportPdf(this.tableView, r);
+      this.tableView.isCustom ? customModelApi.exportPdf(this.tableView, r) : this.tableView.isDataSource ? dataSourceApi.exportPdf(this.tableView, r) : modelApi$1.exportPdf(this.tableView, r);
     },
     // 打印
     print() {
@@ -43327,7 +43354,7 @@ const _sfc_main$n = {
         ...this.getAllFilter(),
         orderBy: this.orderBy
       };
-      this.tableView.isCustom ? customModelApi.printList(this.tableView, r) : this.tableView.isDataSource ? dataSourceApi.printList(this.tableView, r) : modelApi.printList(this.tableView, r);
+      this.tableView.isCustom ? customModelApi.printList(this.tableView, r) : this.tableView.isDataSource ? dataSourceApi.printList(this.tableView, r) : modelApi$1.printList(this.tableView, r);
     },
     // 加载数据源
     initDataSource() {
@@ -43393,7 +43420,7 @@ const _sfc_main$n = {
     async fillDataSource(r, a, o) {
       r._dataSource || (r._dataSource = {}, r._rawData = {}, r._needRefresh = {}, r._needClear = {}), (a.controlType === "ComboSelect" || a.controlType === "MultiComboSelect") && (o.per = 20), this.disableLoader();
       let s;
-      if (a.isSourceCustom ? s = await customModelApi.query(a.source, o) : s = await modelApi.query(a.source, o), this.enableLoader(), r._rawData[a.code] = s.data, r._dataSource[a.code] = s.data.map((l) => ({
+      if (a.isSourceCustom ? s = await customModelApi.query(a.source, o) : s = await modelApi$1.query(a.source, o), this.enableLoader(), r._rawData[a.code] = s.data, r._dataSource[a.code] = s.data.map((l) => ({
         id: (a.sourceDataCode || "").trim() ? this.parseData(l, a.sourceDataCode) : l.id,
         name: this.parseData(l, a.sourceDisplayCode)
       })), r && this.parseData(r, a.code) == null && a.isDefaultFirst && s.data.length > 0 && (this.setData(r, a.code, this.parseData(s.data[0], a.sourceDataCode)), a.sourceDataCode == "id" && a.code.length > 2)) {
@@ -43685,7 +43712,7 @@ const _sfc_main$n = {
     batchSave() {
       this.$refs.batchEditTable.validate() && this.confirm("Front_Msg_Sure_To_Save", async () => {
         let r = this.$refs.batchEditTable.data;
-        this.tableView.isCustom ? await customModelApi.batchSave(this.tableView.model, r) : await modelApi.batchSave(this.tableView.model, r), this.success("Front_Msg_Success", () => {
+        this.tableView.isCustom ? await customModelApi.batchSave(this.tableView.model, r) : await modelApi$1.batchSave(this.tableView.model, r), this.success("Front_Msg_Success", () => {
           this.$refs.batchEditTable.close(), this.loadData();
         });
       });
@@ -44576,11 +44603,11 @@ const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_rend
           return;
         } else if (this.task.activityInst.activity.pageMode == "Component")
           this.readonly = !this.task.activityInst.activity.isEditable || this.task.status != "Pending", this.customComponent = markRaw(this.$pages[this.task.activityInst.activity.templateUrl]), this.isCustom = !0, setTimeout(async () => {
-            a.isCustom ? this.model = await customModelApi.get(a.model, r.processInst.modelID) : this.model = await modelApi.get(a.model, r.processInst.modelID), this.customComponentReady(), this.opened = !0;
+            a.isCustom ? this.model = await customModelApi.get(a.model, r.processInst.modelID) : this.model = await modelApi$1.get(a.model, r.processInst.modelID), this.customComponentReady(), this.opened = !0;
           });
         else if (this.task.activityInst.activity.pageMode == "Form")
           this.form = this.$refs.form, this.readonly = !this.task.activityInst.activity.isEditable || this.task.status != "Pending", this.form.init(this.task.activityInst.activity.formViewCode, async (o) => {
-            o.dataView.isCustom ? this.model = await customModelApi.get(a.model, r.processInst.modelID) : this.model = await modelApi.get(a.model, r.processInst.modelID), this.width = this.form.formView.width || "800", this.name = this.form.formView.name, this.description = this.form.formView.description, this.form.data = this.model, setTimeout(async () => {
+            o.dataView.isCustom ? this.model = await customModelApi.get(a.model, r.processInst.modelID) : this.model = await modelApi$1.get(a.model, r.processInst.modelID), this.width = this.form.formView.width || "800", this.name = this.form.formView.name, this.description = this.form.formView.description, this.form.data = this.model, setTimeout(async () => {
               this.form.onDataChange(), this.form.clearValidate(), this.opened = !0;
             });
           });
@@ -44589,11 +44616,11 @@ const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_rend
           return;
         } else if (a.pageMode == "Component")
           this.readonly = !this.task.activityInst.activity.isEditable || this.task.status != "Pending", this.customComponent = markRaw(this.$pages[a.templateUrl]), this.isCustom = !0, setTimeout(async () => {
-            a.isCustom ? this.model = await customModelApi.get(a.model, r.processInst.modelID) : this.model = await modelApi.get(a.model, r.processInst.modelID), this.customComponentReady(), this.opened = !0;
+            a.isCustom ? this.model = await customModelApi.get(a.model, r.processInst.modelID) : this.model = await modelApi$1.get(a.model, r.processInst.modelID), this.customComponentReady(), this.opened = !0;
           });
         else if (a.pageMode == "Form")
           this.form = this.$refs.form, this.readonly = !this.task.activityInst.activity.isEditable || this.task.status != "Pending", this.form.init(a.formViewCode, async (o) => {
-            o.dataView.isCustom ? this.model = await customModelApi.get(a.model, r.processInst.modelID) : this.model = await modelApi.get(a.model, r.processInst.modelID), this.width = this.form.formView.width || "800", this.name = this.form.formView.name, this.description = this.form.formView.description, this.form.data = this.model, setTimeout(() => {
+            o.dataView.isCustom ? this.model = await customModelApi.get(a.model, r.processInst.modelID) : this.model = await modelApi$1.get(a.model, r.processInst.modelID), this.width = this.form.formView.width || "800", this.name = this.form.formView.name, this.description = this.form.formView.description, this.form.data = this.model, setTimeout(() => {
               this.form.onDataChange(), this.form.clearValidate(), this.opened = !0;
             });
           });
@@ -44602,7 +44629,7 @@ const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_rend
           return;
         }
         if (this.task.status == "Pending") {
-          let o = await modelApi.query("Outcome", { activityFromID: r.activityInst.activityID });
+          let o = await modelApi$1.query("Outcome", { activityFromID: r.activityInst.activityID });
           this.outcomes = o.data;
         }
       });
@@ -91975,7 +92002,7 @@ export {
   initRouter,
   lodop,
   mixinPage,
-  modelApi,
+  modelApi$1 as modelApi,
   pages,
   service as request,
   router$1 as router,