mooho-base-admin-plus 2.7.6 → 2.8.0

package/history.md

@@ -139,3 +139,4 @@ mooho-base-admin-plus@2.7.3 - 修复公式最后一位为)时的bug
 mooho-base-admin-plus@2.7.4 - 修复全选的bug
 mooho-base-admin-plus@2.7.5 - 将List组件改为后端分页
 mooho-base-admin-plus@2.7.6 - 修复审批后没有刷新的bug
+mooho-base-admin-plus@2.7.7 - 增加自定义显示格式

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

@@ -11045,15 +11045,21 @@ const saveAs = /* @__PURE__ */ getDefaultExportFromCjs(FileSaver_minExports), mo
       }
     });
   },
-  query(r, a, o, s) {
-    return (o == null || o == "") && (o = "query"), (s == null || s == "") && (s = "post"), a.isGroupBy ? (a.modelName = r, service({
+  query(r, a, o, s, l, u) {
+    (l == null || l == "") && (l = "query"), (u == null || u == "") && (u = "post");
+    let c = {
+      ...a,
+      columns: o,
+      viewCode: s ? s.code : null
+    };
+    return a.isGroupBy ? (c.modelName = r, service({
       url: "api/Model/group",
       method: "post",
-      data: a
+      data: c
     })) : service({
-      url: `api/${r}/${o}`,
-      method: s,
-      data: a
+      url: `api/${r}/${l}`,
+      method: u,
+      data: c
     });
   },
   async exportExcel(r, a) {
@@ -16660,7 +16666,7 @@ const initRouter = (r, a) => {
   }), router.afterEach((o) => {
     Setting.showProgressBar && ViewUIPlus.LoadingBar.finish(), setting.layout.tabs && store.dispatch("admin/page/open", o), window.document.title = window.$app.$t(o.meta.title) + " - " + Setting.info.title, window.scrollTo(0, 0);
   });
-}, router$1 = router, mixinPage = {
+}, router$1 = router, showFormat = {}, mixinPage = {
   data() {
     return {
       grid4: {
@@ -16822,6 +16828,11 @@ const initRouter = (r, a) => {
       let d = this.parseData(r, o);
       if (d == null)
         return null;
+      if (showFormat.customFormat) {
+        let f = showFormat.customFormat(r, a);
+        if (f != null)
+          return f;
+      }
       if (s === "DateTime")
         return (l || "").trim() ? format$4(new Date(d), l) : format$4(new Date(d), "yyyy-MM-dd");
       if (s === "Integer")
@@ -21613,21 +21624,23 @@ const processType = /* @__PURE__ */ _export_sfc(_sfc_main$10, [["render", _sfc_r
       }
     });
   },
-  query(r, a) {
-    let o = a.isGroupBy ? "group" : "query";
+  query(r, a, o, s) {
+    let l = a.isGroupBy ? "group" : "query", u = {
+      modelName: r,
+      ...a,
+      columns: o,
+      viewCode: s ? s.code : null
+    };
     return service({
-      url: `api/${res$8}/${o}`,
+      url: `api/${res$8}/${l}`,
       method: "post",
-      data: {
-        ...a,
-        modelName: r
-      }
+      data: u
     });
   },
   async exportExcel(r, a) {
     let o = {
-      ...a,
       modelName: r.model,
+      ...a,
       per: r.maxExportCount == null ? 1e6 : r.maxExportCount,
       returnType: 1,
       viewCode: (r.exportDataViewCode || "").trim() ? r.exportDataViewCode : r.code
@@ -21650,8 +21663,8 @@ const processType = /* @__PURE__ */ _export_sfc(_sfc_main$10, [["render", _sfc_r
   },
   async exportPdf(r, a) {
     let o = {
-      ...a,
       modelName: r.model,
+      ...a,
       per: 1e5,
       returnType: 3,
       viewCode: (r.exportDataViewCode || "").trim() ? r.exportDataViewCode : r.code
@@ -25797,7 +25810,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) : o = await modelApi.query(r.source, a), o.data.forEach((s) => {
+      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._dataSource.push({
           id: (r.sourceDataCode || "").trim() ? this.parseData(s, r.sourceDataCode) : s.id,
           name: this.parseData(s, r.sourceDisplayCode)
@@ -26471,22 +26484,23 @@ const processPage = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["render", _sfc_re
   default: processPage
 }, Symbol.toStringTag, { value: "Module" })), res$1 = "DataSource", dataSourceApi = {
   query(r, a) {
+    let o = {
+      dataSource: r,
+      ...a
+    };
     return service({
       url: `api/${res$1}/query`,
       method: "post",
-      data: {
-        ...a,
-        dataSource: r
-      }
+      data: o
     });
   },
   async exportExcel(r, a, o = "query") {
     let s = {
+      dataSource: r.dataSource,
       ...a,
       per: r.maxExportCount == null ? 1e6 : r.maxExportCount,
       returnType: 1,
-      viewCode: (r.exportDataViewCode || "").trim() ? r.exportDataViewCode : r.code,
-      dataSource: r.dataSource
+      viewCode: (r.exportDataViewCode || "").trim() ? r.exportDataViewCode : r.code
     };
     const l = await service({
       url: `api/${res$1}/${o}`,
@@ -26500,11 +26514,11 @@ const processPage = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["render", _sfc_re
   },
   async exportPdf(r, a, o = "query") {
     let s = {
+      dataSource: r.dataSource,
       ...a,
       per: 1e5,
       returnType: 3,
-      viewCode: (r.exportDataViewCode || "").trim() ? r.exportDataViewCode : r.code,
-      dataSource: r.dataSource
+      viewCode: (r.exportDataViewCode || "").trim() ? r.exportDataViewCode : r.code
     };
     const l = await service({
       url: `api/${res$1}/${o}`,
@@ -26632,7 +26646,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, this.tableView.functionName, this.tableView.functionType);
+          let o = await modelApi.query(this.tableView.model, a, null, null, this.tableView.functionName, this.tableView.functionType);
           this.total = o.totalCount, this.data = o.data;
         }
       }
@@ -27305,7 +27319,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) : s = await modelApi.query(this.column.source, o), s.data.forEach((l) => {
+            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) => {
               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);
@@ -27464,13 +27478,13 @@ const comboSelect = /* @__PURE__ */ _export_sfc(_sfc_main$H, [["render", _sfc_re
         };
         r[this.sourceDataCode] = JSON.parse(this.modelValue).join(","), this.loadDataView(this.source).then(async (a) => {
           if (a.dataView.isCustom) {
-            let o = await customModelApi.query(a.dataView.model, r);
+            let o = await customModelApi.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);
           } else if (a.dataView.isDataSource) {
             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);
+            let o = await modelApi.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);
           }
         });
@@ -35228,7 +35242,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, [a.sourceDataCode, a.sourceDisplayCode]) : l = await modelApi.query(a.source, o, [a.sourceDataCode, a.sourceDisplayCode]), 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),
@@ -35286,7 +35300,7 @@ const draggable = /* @__PURE__ */ getDefaultExportFromCjs(vuedraggable_umdExport
             (u || "").trim() && (o = {
               ...o,
               ...JSON.parse(u)
-            }), a.isSourceCustom ? s = await customModelApi.query(a.sourceModel, o) : s = await modelApi.query(a.sourceModel, o, 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.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;
@@ -35420,7 +35434,7 @@ const draggable = /* @__PURE__ */ getDefaultExportFromCjs(vuedraggable_umdExport
             let u = this.getParam(r, a);
             u[a.sourceDataCode] = l.map((d) => d.value).join(",");
             let c;
-            a.isSourceCustom ? c = await customModelApi.query(a.source, u) : c = await modelApi.query(a.source, u), c.data.forEach((d) => {
+            a.isSourceCustom ? c = await customModelApi.query(a.source, u, [a.sourceDataCode, a.sourceDisplayCode]) : c = await modelApi.query(a.source, u, [a.sourceDataCode, a.sourceDisplayCode]), c.data.forEach((d) => {
               let f = this.parseData(d, a.sourceDataCode), p = this.parseData(d, a.sourceDisplayCode);
               a.controlType == "ComboSelect";
               let v = l.find((g) => g.value == f);
@@ -38375,7 +38389,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, [a.sourceDataCode, a.sourceDisplayCode]) : l = await modelApi.query(a.source, o, [a.sourceDataCode, a.sourceDisplayCode]), 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),
@@ -39583,7 +39597,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) : a = await modelApi.query(r.sourceModel, o, 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.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));
       });
@@ -39875,7 +39889,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, [a.sourceDataCode, a.sourceDisplayCode]) : l = await modelApi.query(a.source, o, [a.sourceDataCode, a.sourceDisplayCode]), 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),
@@ -41054,13 +41068,20 @@ const _sfc_main$n = {
             orderBy: this.orderBy
           };
           if (this.tableView.isGroupBy && (a.isGroupBy = !0, a.groupColumn = JSON.parse(this.tableView.groupColumn), a.groupMethod = JSON.parse(this.tableView.groupMethod)), this.tableView.isCustom) {
-            let o = await customModelApi.query(this.tableView.model, a);
+            let o = await customModelApi.query(this.tableView.model, a, null, this.tableView.isReturnSimple ? this.tableView : null);
             this.total = o.totalCount, this.data = o.data;
           } else if (this.tableView.isDataSource) {
             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, this.tableView.functionName, this.tableView.functionType);
+            let o = await modelApi.query(
+              this.tableView.model,
+              a,
+              null,
+              this.tableView.isReturnSimple ? this.tableView : null,
+              this.tableView.functionName,
+              this.tableView.functionType
+            );
             this.total = o.totalCount, this.data = o.data;
           }
           if (this.tableView.isDynamicColumn && (this.columns = this.columns.filter((o) => o.slot != "normal"), this.data.length > 0)) {
@@ -41108,8 +41129,9 @@ const _sfc_main$n = {
      * @param {int} index 行序号
      * @public
      */
-    edit(r, a) {
-      this.$emit("edit", { row: r, index: a });
+    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 });
     },
     /**
      * 查看项
@@ -41118,8 +41140,9 @@ const _sfc_main$n = {
      * @param {int} index 行序号
      * @public
      */
-    show(r, a) {
-      this.$emit("show", { row: r, index: a });
+    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 });
     },
     /**
      * 删除项
@@ -41346,7 +41369,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, [a.sourceDataCode, a.sourceDisplayCode]) : s = await modelApi.query(a.source, o, [a.sourceDataCode, a.sourceDisplayCode]), 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)) {
@@ -41759,7 +41782,7 @@ const _sfc_main$n = {
           let c = this.getParam(r, a);
           c[a.sourceDataCode] = u.map((f) => f.value).join(",");
           let d;
-          a.isSourceCustom ? d = await customModelApi.query(a.source, c) : d = await modelApi.query(a.source, c), d.data.forEach((f) => {
+          a.isSourceCustom ? d = await customModelApi.query(a.source, c, [a.sourceDataCode, a.sourceDisplayCode]) : d = await modelApi.query(a.source, c, [a.sourceDataCode, a.sourceDisplayCode]), d.data.forEach((f) => {
             let p = this.parseData(f, a.sourceDataCode), v = this.parseData(f, a.sourceDisplayCode);
             a.controlType == "ComboSelect";
             let g = u.find((y) => y.value == p);
@@ -42526,7 +42549,7 @@ function _sfc_render$n(r, a, o, s, l, u) {
     ], 2)
   ], 2);
 }
-const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-38e40259"]]), __vite_glob_1_32 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-da194f9d"]]), __vite_glob_1_32 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: viewTable
 }, Symbol.toStringTag, { value: "Module" })), _sfc_main$m = {
@@ -89973,6 +89996,7 @@ export {
   service as request,
   router$1 as router,
   Setting as setting,
+  showFormat,
   store,
   taskApi,
   util$2 as util