@ibiz-template/runtime 0.7.41-alpha.77 → 0.7.41-alpha.79

package/dist/index.esm.js

@@ -19367,7 +19367,8 @@ var GlobalConfig = class {
       mobShowViewHeader: true,
       timeoutDuration: 5 * 60 * 1e3,
       onlyShowDataInfo: false,
-      viewAccUserMode: 3
+      viewAccUserMode: 3,
+      loadingText: ""
     };
     // 全局表格配置
     this.grid = {
@@ -25380,6 +25381,12 @@ var TreeCodeListNodeData = class extends TreeNodeData {
       }
     });
   }
+  /**
+   * 获取原始数据
+   */
+  getOrigin() {
+    return this._deData;
+  }
 };
 
 // src/service/vo/tree-node-data/tree-data-set-node-data.ts
@@ -25647,6 +25654,12 @@ var TreeDataSetNodeData = class _TreeDataSetNodeData extends TreeNodeData {
     }
     return html;
   }
+  /**
+   * 获取原始数据
+   */
+  getOrigin() {
+    return this._deData;
+  }
 };
 
 // src/service/vo/tree-node-data/tree-static-node-data.ts
@@ -35597,11 +35610,11 @@ var CTX = class {
    * @author lxm
    * @date 2023-03-27 01:59:22
    */
-  startLoading() {
+  startLoading(loadingText) {
     if (this.isDestroyed) {
       return;
     }
-    this.view.startLoading();
+    this.view.startLoading(loadingText);
   }
   /**
    * 关闭视图加载
@@ -37735,6 +37748,7 @@ var ViewController = class extends BaseController {
     super.initState();
     this.state.activated = true;
     this.state.isLoading = false;
+    this.state.loadingText = "";
     this.state.caption = this.model.caption;
     this.state.srfactiveviewdata = null;
     this.state.viewMessages = {};
@@ -37744,6 +37758,12 @@ var ViewController = class extends BaseController {
     this.state.presetClassList = [];
   }
   async onCreated() {
+    var _a3;
+    const { appViewParams } = this.model;
+    const LoaddingTextValue = (_a3 = appViewParams == null ? void 0 : appViewParams.find(
+      (item) => item.id.toLowerCase() === "srfloadingtext"
+    )) == null ? void 0 : _a3.value;
+    this.state.loadingText = LoaddingTextValue || ibiz.config.view.loadingText;
     this.state.isLoading = true;
     await super.onCreated();
     this.modal.hooks.beforeDismiss.tapPromise(async (modalData) => {
@@ -37929,9 +37949,19 @@ var ViewController = class extends BaseController {
   redrawView(redrawData) {
     this._evt.emit("onRedrawView", { redrawData });
   }
-  startLoading() {
+  startLoading(loadingText) {
+    var _a3;
     this.viewLoading.begin();
     this.state.isLoading = this.viewLoading.isLoading;
+    if (isNotNil2(loadingText)) {
+      this.state.loadingText = loadingText;
+    } else {
+      const { appViewParams } = this.model;
+      const LoaddingTextValue = (_a3 = appViewParams == null ? void 0 : appViewParams.find(
+        (item) => item.id.toLowerCase() === "srfloadingtext"
+      )) == null ? void 0 : _a3.value;
+      this.state.loadingText = LoaddingTextValue || ibiz.config.view.loadingText;
+    }
   }
   endLoading() {
     this.viewLoading.end();
@@ -38682,7 +38712,7 @@ import {
   NoticeError as NoticeError2,
   RuntimeError as RuntimeError31
 } from "@ibiz-template/core";
-import { clone as clone20, isNil as isNil26 } from "ramda";
+import { clone as clone20, isNil as isNil26, isNotNil as isNotNil3 } from "ramda";
 import { notNilEmpty as notNilEmpty9 } from "qx-util";
 var ControlController = class extends BaseController {
   /**
@@ -38806,6 +38836,7 @@ var ControlController = class extends BaseController {
     super.initState();
     this.state.activated = true;
     this.state.isLoading = false;
+    this.state.loadingText = "";
     this.state.disabled = false;
     this.state.maskOption = { mode: "BLANK" };
     this.state.zIndex = void 0;
@@ -38814,6 +38845,9 @@ var ControlController = class extends BaseController {
   async onCreated() {
     var _a3;
     await super.onCreated();
+    if (isNotNil3(ibiz.config.view.loadingText)) {
+      this.state.loadingText = ibiz.config.view.loadingText;
+    }
     if (this.controlPanel) {
       this.childNames.push(this.controlPanel.name);
       const provider = await getControlProvider(this.controlPanel);
@@ -38904,9 +38938,16 @@ var ControlController = class extends BaseController {
    * @date 2022-09-21 15:09:18
    * @return {*}  {Promise<void>}
    */
-  async startLoading() {
+  async startLoading(loadingText) {
     this.state.isLoading = true;
-    this.ctx.startLoading();
+    if (isNotNil3(loadingText)) {
+      this.state.loadingText = loadingText;
+    } else if (isNotNil3(ibiz.config.view.loadingText)) {
+      this.state.loadingText = ibiz.config.view.loadingText;
+    } else {
+      this.state.loadingText = "";
+    }
+    this.ctx.startLoading(loadingText);
   }
   /**
    * 加载完毕
@@ -43491,7 +43532,8 @@ import {
   StringUtil as StringUtil4,
   RuntimeModelError as RuntimeModelError47,
   ModelError as ModelError24,
-  RuntimeError as RuntimeError43
+  RuntimeError as RuntimeError43,
+  calcMimeByFileName
 } from "@ibiz-template/core";
 import { clone as clone26, mergeRight as mergeRight4 } from "ramda";
 var FrontUIActionProvider = class extends UIActionProviderBase {
@@ -43655,12 +43697,17 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       } else {
         throw new RuntimeError43(ibiz.i18n.t("runtime.uiAction.dataPrimaryKey"));
       }
+      let printTag = "";
+      if (resultContext.srfdynaprinttag) {
+        printTag += "".concat(resultContext.srfdynaprinttag, "@");
+      }
+      printTag += appDEPrint.codeName;
       const app = await ibiz.hub.getAppAsync(action.appId);
       const res = await app.net.request(requestUrl, {
         method: "get",
         responseType: "blob",
         params: {
-          srfprinttag: appDEPrint.codeName,
+          srfprinttag: printTag,
           ...resultParams
         }
       });
@@ -43782,8 +43829,9 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
         return;
       if (res.status === 200) {
         const fileName = ibiz.util.file.getFileName(res);
+        const type = calcMimeByFileName(fileName);
         const blob = new Blob([res.data], {
-          type: "application/vnd.ms-excel"
+          type
         });
         const elink = document.createElement("a");
         elink.download = fileName;
@@ -51423,11 +51471,12 @@ var FilterPortletController = class extends PortletPartController {
               childrenFields: ["searchconds"]
             }
           );
-          this.state.filterNode = SearchCondEx2filterNode({
+          this.searchConds = {
             condop: "AND",
             condtype: "GROUP",
             searchconds: tempFieldSearchConds
-          });
+          };
+          this.state.filterNode = SearchCondEx2filterNode(this.searchConds);
         }
       }
     }
@@ -51719,7 +51768,7 @@ import {
   isElementSame as isElementSame2,
   RuntimeModelError as RuntimeModelError57
 } from "@ibiz-template/core";
-import { isNil as isNil31, isNotNil as isNotNil3 } from "ramda";
+import { isNil as isNil31, isNotNil as isNotNil4 } from "ramda";
 import { createUUID as createUUID14, isBoolean } from "qx-util";
 
 // src/controller/control/data-view/data-view.service.ts
@@ -52324,7 +52373,7 @@ var DataViewControlController = class extends MDControlController {
    */
   onClickNew(event, group) {
     const params = { ...this.params };
-    if (isNotNil3(group)) {
+    if (isNotNil4(group)) {
       Object.assign(params, { srfgroup: group });
     }
     UIActionUtil.execAndResolved(
@@ -54260,7 +54309,7 @@ import { recursiveIterate as recursiveIterate8 } from "@ibiz-template/core";
 
 // src/controller/control/form/form/form.service.ts
 import { recursiveIterate as recursiveIterate7 } from "@ibiz-template/core";
-import { clone as clone38, isNil as isNil32, isNotNil as isNotNil4 } from "ramda";
+import { clone as clone38, isNil as isNil32, isNotNil as isNotNil5 } from "ramda";
 var FormService = class extends ControlService {
   constructor() {
     super(...arguments);
@@ -54305,7 +54354,7 @@ var FormService = class extends ControlService {
           if (defaultVal !== void 0) {
             data[name2] = defaultVal;
           }
-          if (isNil32(data[name2]) && isNotNil4(defaultData[name2])) {
+          if (isNil32(data[name2]) && isNotNil5(defaultData[name2])) {
             data[name2] = defaultData[name2];
           }
         }
@@ -55828,11 +55877,15 @@ var FormDRUIPartController = class extends FormDetailController {
 // src/controller/control/form/form-detail/form-group-panel/form-group-panel.controller.ts
 import { clone as clone39 } from "ramda";
 
+// src/controller/control/form/form-detail/form-container/form-container.controller.ts
+import { isNotNil as isNotNil6 } from "ramda";
+
 // src/controller/control/form/form-detail/form-container/form-container.state.ts
 var FormContainerState = class extends FormDetailState {
   constructor() {
     super(...arguments);
     this.loading = false;
+    this.loadingText = "";
   }
 };
 
@@ -55850,10 +55903,16 @@ var FormContainerController = class extends FormDetailController {
   }
   /**
    * @description 开始加载中
+   * @param {(string | undefined)} [loadingText] 加载提示文本
    * @memberof FormContainerController
    */
-  startLoading() {
+  startLoading(loadingText) {
     this.state.loading = true;
+    if (isNotNil6(loadingText)) {
+      this.state.loadingText = loadingText;
+    } else {
+      this.state.loadingText = "";
+    }
   }
   /**
    * @description 结束加载中
@@ -61133,7 +61192,20 @@ var GridController = class extends MDControlController {
           value = ValueExUtil.toText(fieldColumnC.model, value);
         }
         if (this.allExportCodelistMap.get(key)) {
-          value = ((_b2 = this.allExportCodelistMap.get(key).find((x) => x.value === item[key])) == null ? void 0 : _b2.text) || value;
+          const codelist = fieldColumnC.codeList;
+          const getVal2 = (val) => {
+            var _a4;
+            return ((_a4 = this.allExportCodelistMap.get(key).find((x) => x.value == val)) == null ? void 0 : _a4.text) || val;
+          };
+          if (codelist && codelist.valueSeparator) {
+            const textSeparator = codelist.textSeparator || codelist.valueSeparator || ",";
+            const values = (_b2 = item[key]) == null ? void 0 : _b2.split(
+              codelist.valueSeparator
+            );
+            value = values == null ? void 0 : values.map((v) => getVal2(v)).join(textSeparator);
+          } else {
+            value = getVal2(item[key]);
+          }
         } else {
           value = this.formatValue(isDate, format, value) + unitName;
         }
@@ -64037,6 +64109,9 @@ var PanelItemController = class {
   }
 };
 
+// src/controller/control/panel/panel-container/panel-container.controller.ts
+import { isNotNil as isNotNil7 } from "ramda";
+
 // src/controller/control/panel/panel-container/panel-container.state.ts
 var PanelContainerState = class extends PanelItemState {
   constructor() {
@@ -64048,6 +64123,13 @@ var PanelContainerState = class extends PanelItemState {
      * @memberof PanelContainerState
      */
     this.loading = false;
+    /**
+     * @description 加载提示文本
+     * @exposedoc
+     * @type {string}
+     * @memberof PanelContainerState
+     */
+    this.loadingText = "";
   }
 };
 
@@ -64066,10 +64148,16 @@ var PanelContainerController = class extends PanelItemController {
   /**
    * @description 开始加载中
    * @exposedoc
+   * @param {string} [loadingText] 加载提示文本
    * @memberof PanelContainerController
    */
-  startLoading() {
+  startLoading(loadingText) {
     this.state.loading = true;
+    if (isNotNil7(loadingText)) {
+      this.state.loadingText = loadingText;
+    } else {
+      this.state.loadingText = "";
+    }
   }
   /**
    * @description 结束加载中
@@ -66983,8 +67071,12 @@ var WizardPanelController = class extends ControlController {
 };
 
 // src/controller/control/md-ctrl/md-ctrl.controller.ts
-import { RuntimeError as RuntimeError60, RuntimeModelError as RuntimeModelError67 } from "@ibiz-template/core";
-import { clone as clone47, isNil as isNil38, isNotNil as isNotNil5 } from "ramda";
+import {
+  calcMimeByFileName as calcMimeByFileName2,
+  RuntimeError as RuntimeError60,
+  RuntimeModelError as RuntimeModelError67
+} from "@ibiz-template/core";
+import { clone as clone47, isNil as isNil38, isNotNil as isNotNil8 } from "ramda";
 import { createUUID as createUUID20 } from "qx-util";
 
 // src/controller/control/md-ctrl/md-ctrl.service.ts
@@ -67469,7 +67561,7 @@ var MDCtrlController = class extends MDControlController {
    */
   onClickNew(event, group) {
     const params = { ...this.params };
-    if (isNotNil5(group)) {
+    if (isNotNil8(group)) {
       Object.assign(params, { srfgroup: group });
     }
     UIActionUtil.execAndResolved(
@@ -67630,7 +67722,23 @@ var MDCtrlController = class extends MDControlController {
         var _a3;
         let value = item[key];
         if (this.allExportCodelistMap.get(key)) {
-          value = ((_a3 = this.allExportCodelistMap.get(key).find((x) => x.value === item[key])) == null ? void 0 : _a3.text) || value;
+          const getVal2 = (val) => {
+            var _a4;
+            return ((_a4 = this.allExportCodelistMap.get(key).find((x) => x.value == val)) == null ? void 0 : _a4.text) || val;
+          };
+          const currentColumn = this.allExportColumns.find((exportColumn) => {
+            return exportColumn.appDEFieldId === key;
+          });
+          const codelist = currentColumn == null ? void 0 : currentColumn.codeList;
+          if (codelist && codelist.valueSeparator) {
+            const textSeparator = codelist.textSeparator || codelist.valueSeparator || ",";
+            const values = (_a3 = item[key]) == null ? void 0 : _a3.split(
+              codelist.valueSeparator
+            );
+            value = values == null ? void 0 : values.map((v) => getVal2(v)).join(textSeparator);
+          } else {
+            value = getVal2(item[key]);
+          }
         } else {
           value = "".concat(value != null ? value : "");
         }
@@ -67684,8 +67792,9 @@ var MDCtrlController = class extends MDControlController {
     );
     if (res.status === 200) {
       const fileName = ibiz.util.file.getFileName(res);
+      const filetype = calcMimeByFileName2(fileName);
       const blob = new Blob([res.data], {
-        type: "application/vnd.ms-excel"
+        type: filetype
       });
       const elink = document.createElement("a");
       elink.download = fileName;