@ibiz-template/runtime 0.1.38 → 0.2.1

package/dist/index.esm.js

@@ -20490,7 +20490,7 @@ async function handleAllSettled(values, isThrow = true) {
 
 // src/command/app/open-app-view/open-app-view.ts
 import { ModelError as ModelError14, RuntimeError as RuntimeError17 } from "@ibiz-template/core";
-import { clone as clone12 } from "ramda";
+import { clone as clone13 } from "ramda";
 
 // src/service/utils/de-dq-cond/ps-de-dq-cond-engine.ts
 import { isEmpty as isEmpty3 } from "ramda";
@@ -21679,20 +21679,27 @@ var DynamicCodeListCache = class {
       appDEDataSetId,
       minorSortAppDEFieldId,
       minorSortDir,
-      pvalueAppDEFieldId
+      pvalueAppDEFieldId,
+      customCond
     } = this.codeList;
-    if (!params.size) {
-      params = { ...params, size: 1e4 };
-    }
+    const tempParams = { ...params };
     if (minorSortAppDEFieldId && minorSortDir) {
-      Object.assign(params, {
+      Object.assign(tempParams, {
         sort: "".concat(minorSortAppDEFieldId.toLowerCase(), ",").concat(minorSortDir.toLowerCase())
       });
     }
+    if (customCond) {
+      const navParams = ScriptFactory.execSingleLine(customCond);
+      const addParams = convertNavData(navParams, tempParams, context);
+      Object.assign(tempParams, addParams);
+    }
+    if (!tempParams.size) {
+      tempParams.size = 1e4;
+    }
     if (this.isPredefined) {
       const res2 = await app.net.get(
         "/dictionaries/codelist/".concat(this.codeList.codeName),
-        params
+        tempParams
       );
       return Object.freeze(res2.data.items);
     }
@@ -21706,8 +21713,8 @@ var DynamicCodeListCache = class {
       appDataEntityId,
       appDEDataSetId,
       context,
-      {},
-      params
+      void 0,
+      tempParams
     );
     let resultItems = [];
     if (res.data.length) {
@@ -23948,14 +23955,18 @@ function handleSrcVal(ctx, srcValParams) {
   }
   if (value && srcField) {
     try {
-      value = ScriptFactory.execScriptFn(
-        { srcValue: value },
-        "srcValue.".concat(srcField),
-        {
-          singleRowReturn: true,
-          isAsync: false
-        }
-      );
+      if (Array.isArray(value)) {
+        value = value[Number(srcField)];
+      } else {
+        value = ScriptFactory.execScriptFn(
+          { srcValue: value },
+          "srcValue.".concat(srcField),
+          {
+            singleRowReturn: true,
+            isAsync: false
+          }
+        );
+      }
     } catch (error) {
       ibiz.log.error("\u4ECE\u6E90\u53C2\u6570\u53D6\u5C5E\u6027".concat(srcField, "\u62A5\u9519\uFF0C\u6E90\u53C2\u6570\uFF1A"), value);
       throw error;
@@ -24595,7 +24606,7 @@ var DEActionMethod = class extends Method {
    */
   async inputHandle(context, data) {
     if (isArray6(data)) {
-      return Promise.all(data.map((item) => this.input.handle(context, item)));
+      return data;
     }
     return this.input.handle(context, data);
   }
@@ -25265,82 +25276,12 @@ var DEService = class {
   }
 };
 
+// src/service/service/control/control.service.ts
+import { clone as clone12 } from "ramda";
+
 // src/service/vo/control.vo.ts
 import { clone as clone11, isNil as isNil10 } from "ramda";
 var ControlVO = class _ControlVO {
-  /**
-   * 是否是新建数据，0为新建
-   *
-   * @author lxm
-   * @date 2022-09-06 22:09:24
-   * @type {Srfuf}
-   */
-  get srfuf() {
-    if (isNil10(this.$origin.srfuf)) {
-      return this.srfkey ? 1 /* UPDATE */ : 0 /* CREATE */;
-    }
-    return this.$origin.srfuf;
-  }
-  /**
-   * 主键
-   *
-   * @author lxm
-   * @date 2022-09-07 19:09:42
-   * @type {string}
-   */
-  get srfkey() {
-    return this.$origin.srfkey;
-  }
-  /**
-   * 主信息
-   *
-   * @author lxm
-   * @date 2022-09-07 19:09:42
-   * @type {string}
-   */
-  get srfmajortext() {
-    return this.$origin.srfmajortext;
-  }
-  /**
-   * 实体模型标识
-   *
-   * @author lxm
-   * @date 2022-09-07 19:09:42
-   * @type {string}
-   */
-  get srfdeid() {
-    return this.$origin.srfdeid;
-  }
-  /**
-   * 实体模型代码名称
-   *
-   * @author lxm
-   * @date 2022-09-07 19:09:42
-   * @type {string}
-   */
-  get srfdecodename() {
-    return this.$origin.srfdecodename;
-  }
-  /**
-   * 实体主键属性
-   *
-   * @author lxm
-   * @date 2022-09-07 19:09:42
-   * @type {string}
-   */
-  get srfkeyfile() {
-    return this.$origin.srfkeyfile;
-  }
-  /**
-   * 实体主信息属性
-   *
-   * @author lxm
-   * @date 2022-09-07 19:09:42
-   * @type {string}
-   */
-  get srfmajorfile() {
-    return this.$origin.srfmajorfile;
-  }
   /**
    * Creates an instance of ControlVO.
    * @author lxm
@@ -25359,6 +25300,58 @@ var ControlVO = class _ControlVO {
       configurable: true,
       value: $dataUIMap || /* @__PURE__ */ new Map()
     });
+    Object.defineProperty(this, "srfuf", {
+      get() {
+        if (isNil10(this.$origin.srfuf)) {
+          return this.srfkey ? 1 /* UPDATE */ : 0 /* CREATE */;
+        }
+        return this.$origin.srfuf;
+      },
+      enumerable: false,
+      configurable: true
+    });
+    Object.defineProperty(this, "srfkey", {
+      get() {
+        return this.$origin.srfkey;
+      },
+      enumerable: false,
+      configurable: true
+    });
+    Object.defineProperty(this, "srfmajortext", {
+      get() {
+        return this.$origin.srfmajortext;
+      },
+      enumerable: false,
+      configurable: true
+    });
+    Object.defineProperty(this, "srfdeid", {
+      get() {
+        return this.$origin.srfdeid;
+      },
+      enumerable: false,
+      configurable: true
+    });
+    Object.defineProperty(this, "srfdecodename", {
+      get() {
+        return this.$origin.srfdecodename;
+      },
+      enumerable: false,
+      configurable: true
+    });
+    Object.defineProperty(this, "srfkeyfile", {
+      get() {
+        return this.$origin.srfkeyfile;
+      },
+      enumerable: false,
+      configurable: true
+    });
+    Object.defineProperty(this, "srfmajorfile", {
+      get() {
+        return this.$origin.srfmajorfile;
+      },
+      enumerable: false,
+      configurable: true
+    });
     this.$dataUIMap.forEach((mapField, key) => {
       const value = mapField.dataKey;
       this.linkProperty(key, value, mapField);
@@ -25511,7 +25504,7 @@ var ControlService = class {
    * @returns {*}  {IHttpResponse}
    */
   handleResponse(res) {
-    return res;
+    return clone12(res);
   }
   /**
    * 实体数据转ui数据
@@ -26397,7 +26390,7 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
    * @return {*}  {(Promise<IModalData | void>)}
    */
   async exec(appViewId, _context, params = {}, opts = {}) {
-    const context = clone12(_context);
+    const context = clone13(_context);
     const appView = await ibiz.hub.config.view.get(appViewId);
     if (!appView) {
       throw new RuntimeError17("\u5E94\u7528\u89C6\u56FE[".concat(appViewId, "]\u4E0D\u5B58\u5728"));
@@ -26716,7 +26709,7 @@ var Application = class {
   async init() {
     await this.authority.init();
     await this.loadAppModelStyle();
-    if (ibiz.env.enableMqtt) {
+    if (ibiz.env.enableMqtt && ibiz.appData) {
       this.mqtt = new MqttService(
         ibiz.appData.mqtttopic,
         getToken(),
@@ -29723,7 +29716,7 @@ import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
 import quarterOfYear from "dayjs/plugin/quarterOfYear";
 import weekOfYear from "dayjs/plugin/weekOfYear";
 import isoWeek from "dayjs/plugin/isoWeek";
-import { clone as clone13, isNil as isNil19, mergeDeepRight } from "ramda";
+import { clone as clone14, isNil as isNil19, mergeDeepRight } from "ramda";
 dayjs3.extend(minMax);
 dayjs3.extend(isSameOrBefore);
 dayjs3.extend(quarterOfYear);
@@ -29946,7 +29939,7 @@ var BaseSeriesGenerator = class {
   dataPreprocess(data) {
     const tempData = [];
     data.forEach((singleData) => {
-      tempData.push(clone13(singleData));
+      tempData.push(clone14(singleData));
     });
     const { groupMode } = this.model;
     if (groupMode) {
@@ -30966,7 +30959,7 @@ import { ModelError as ModelError18, RuntimeModelError as RuntimeModelError28 }
 
 // src/ui-logic/utils/handle-src-val.ts
 import { ModelError as ModelError17 } from "@ibiz-template/core";
-import { clone as clone14 } from "ramda";
+import { clone as clone15 } from "ramda";
 function handleSrcVal2(ctx, srcValParams) {
   const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
   const srcValueType = srcValParams.srcValueType || "SRCDLPARAM";
@@ -30993,21 +30986,25 @@ function handleSrcVal2(ctx, srcValParams) {
       value = ctx.parameters.context;
       break;
     case "ENVPARAM":
-      value = clone14(ibiz.env);
+      value = clone15(ibiz.env);
       break;
     default:
       throw new ModelError17(srcValParams, "\u6682\u672A\u652F\u6301\u6E90\u503C\u7C7B\u578B".concat(srcValueType));
   }
   if (value && srcField) {
     try {
-      value = ScriptFactory.execScriptFn(
-        { srcValue: value },
-        "srcValue.".concat(srcField),
-        {
-          singleRowReturn: true,
-          isAsync: false
-        }
-      );
+      if (Array.isArray(value)) {
+        value = value[Number(srcField)];
+      } else {
+        value = ScriptFactory.execScriptFn(
+          { srcValue: value },
+          "srcValue.".concat(srcField),
+          {
+            singleRowReturn: true,
+            isAsync: false
+          }
+        );
+      }
     } catch (error) {
       ibiz.log.error("\u4ECE\u6E90\u53C2\u6570\u53D6\u5C5E\u6027".concat(srcField, "\u62A5\u9519\uFF0C\u6E90\u53C2\u6570\uFF1A"), value);
       throw error;
@@ -31344,7 +31341,7 @@ var EndNode2 = class extends UILogicNode {
 
 // src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts
 import { ModelError as ModelError21, RuntimeError as RuntimeError32 } from "@ibiz-template/core";
-import { clone as clone15 } from "ramda";
+import { clone as clone16 } from "ramda";
 var PrepareJSParamNode = class extends UILogicNode {
   async exec(ctx) {
     const nodeParams = this.model.deuilogicNodeParams;
@@ -31433,7 +31430,7 @@ var PrepareJSParamNode = class extends UILogicNode {
   copyParam(nodeParam, ctx) {
     const { dstDEUILogicParamId } = nodeParam;
     const srcVal = handleSrcVal2(ctx, nodeParam);
-    ctx.params[dstDEUILogicParamId] = clone15(srcVal);
+    ctx.params[dstDEUILogicParamId] = clone16(srcVal);
   }
   /**
    * 绑定参数
@@ -31650,7 +31647,7 @@ var ResetParamNode2 = class extends UILogicNode {
 
 // src/ui-logic/ui-logic-node/copy-param-node/copy-param-node.ts
 import { RuntimeModelError as RuntimeModelError37 } from "@ibiz-template/core";
-import { clone as clone16 } from "ramda";
+import { clone as clone17 } from "ramda";
 var CopyParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
@@ -31661,7 +31658,7 @@ var CopyParamNode2 = class extends UILogicNode {
       );
     }
     const srcVal = handleSrcVal2(ctx, this.model);
-    ctx.params[dstDEUILogicParamId] = clone16(srcVal);
+    ctx.params[dstDEUILogicParamId] = clone17(srcVal);
   }
 };
 
@@ -32299,6 +32296,11 @@ var UIActionProviderBase = class {
   async handleParams(action, context, data, params) {
     let resultData = [];
     const deName = calcDeCodeNameById(action.appDataEntityId);
+    const entity = await ibiz.hub.getAppDataEntity(
+      action.appDataEntityId,
+      context.srfappid
+    );
+    const keyField = entity.keyAppDEFieldId;
     switch (action.actionTarget) {
       case "NONE":
         resultData = [];
@@ -32310,12 +32312,12 @@ var UIActionProviderBase = class {
         resultData = data;
         break;
       case "MULTIKEY":
-        resultData = deName && data.length > 0 ? data.map((item) => ({ [deName]: item.srfkey || item[deName] })) : [{}];
+        resultData = deName && data.length > 0 ? data.map((item) => ({ [keyField]: item.srfkey || item[keyField] })) : [{}];
         break;
       case "SINGLEKEY":
         {
           const originData = data[0] || {};
-          resultData = deName ? [{ [deName]: originData.srfkey || originData[deName] }] : [{}];
+          resultData = deName ? [{ [keyField]: originData.srfkey || originData[keyField] }] : [{}];
         }
         break;
       default:
@@ -33249,6 +33251,7 @@ var DataViewControlController = class extends MDControlController {
     this.state.noSort = this.model.noSort === true;
     this.state.size = this.model.pagingSize || 20;
     this.state.singleSelect = this.model.singleSelect === true;
+    this.state.sortItems = [];
   }
   /**
    * 初始化
@@ -33260,6 +33263,7 @@ var DataViewControlController = class extends MDControlController {
   async onCreated() {
     await super.onCreated();
     await this.initControlService();
+    this.initSortItems();
   }
   /**
    * 初始化部件服务
@@ -33608,6 +33612,44 @@ var DataViewControlController = class extends MDControlController {
       event
     });
   }
+  /**
+   * 初始化排序项集合
+   * @author lxm
+   * @date 2023-10-24 06:11:02
+   * @return {*}  {void}
+   */
+  initSortItems() {
+    var _a;
+    if (!((_a = this.model.dedataViewItems) == null ? void 0 : _a.length)) {
+      return;
+    }
+    const sortItems = [];
+    const { minorSortAppDEFieldId, minorSortDir } = this.model;
+    const hasDefaultSort = minorSortAppDEFieldId && minorSortDir;
+    this.model.dedataViewItems.forEach((item) => {
+      if (!item.enableSort) {
+        return;
+      }
+      let { caption } = item;
+      if (item.capLanguageRes) {
+        caption = ibiz.i18n.t(item.capLanguageRes.lanResTag, item.caption);
+      }
+      if (!item.appDEFieldId) {
+        throw new RuntimeModelError48(item, "\u542F\u7528\u6392\u5E8F\u7684\u9879\u5FC5\u987B\u5173\u8054\u5B9E\u4F53\u5C5E\u6027");
+      }
+      const tempItem = {
+        caption,
+        key: item.appDEFieldId
+      };
+      if (hasDefaultSort && minorSortAppDEFieldId === item.appDEFieldId) {
+        tempItem.order = minorSortDir.toLowerCase();
+      }
+      sortItems.push(tempItem);
+    });
+    if (sortItems.length > 0) {
+      this.state.sortItems = sortItems;
+    }
+  }
 };
 
 // src/controller/control/exp-bar/calendar-exp-bar.controller.ts
@@ -35736,7 +35778,7 @@ import {
   mergeDefaultInLeft as mergeDefaultInLeft2
 } from "@ibiz-template/core";
 import { debounce } from "lodash-es";
-import { clone as clone17 } from "ramda";
+import { clone as clone18 } from "ramda";
 
 // src/controller/control/form/edit-form/edit-form.service.ts
 import {
@@ -36083,8 +36125,8 @@ var EditFormController = class extends FormController {
    * @return {*}  {Promise<IData>}
    */
   async copy() {
-    const context = clone17(this.context);
-    const queryParams = clone17(this.params);
+    const context = clone18(this.context);
+    const queryParams = clone18(this.params);
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId
     );
@@ -36139,7 +36181,7 @@ var EditFormController = class extends FormController {
       return this.loadDraft();
     }
     const { context, params } = this.handlerAbilityParams(args);
-    const queryParams = clone17(params);
+    const queryParams = clone18(params);
     let res;
     try {
       await this.startLoading();
@@ -37403,7 +37445,7 @@ import {
   RuntimeError as RuntimeError45,
   RuntimeModelError as RuntimeModelError53
 } from "@ibiz-template/core";
-import { clone as clone18 } from "ramda";
+import { clone as clone19 } from "ramda";
 
 // src/controller/control/grid/grid/grid.service.ts
 var GridService = class extends MDControlService {
@@ -38068,7 +38110,7 @@ var GridController = class extends MDControlController {
         throw new RuntimeError45("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
       }
       if (row.data.srfuf === 1 /* UPDATE */) {
-        row.cacheData = clone18(row.data);
+        row.cacheData = clone19(row.data);
         const defaultVal = this.calcDefaultValue(row.data, false);
         Object.assign(row.data, defaultVal);
       }
@@ -38185,7 +38227,7 @@ var GridController = class extends MDControlController {
           codeListMap.set(key, items[key].codeListItems);
         }
       });
-      const cloneData = clone18(
+      const cloneData = clone19(
         data2.map((item) => {
           return item.getOrigin();
         })
@@ -38296,7 +38338,7 @@ var GridController = class extends MDControlController {
 import { DataTypes as DataTypes3, ModelError as ModelError26 } from "@ibiz-template/core";
 import dayjs4 from "dayjs";
 import { debounce as debounce2 } from "lodash-es";
-import { clone as clone19, isNil as isNil21 } from "ramda";
+import { clone as clone20, isNil as isNil21 } from "ramda";
 var GridFieldColumnController = class extends GridColumnController {
   constructor() {
     super(...arguments);
@@ -38331,10 +38373,10 @@ var GridFieldColumnController = class extends GridColumnController {
   }
   async onInit() {
     await super.onInit();
-    this.loadCodeList = debounce2(
-      this.loadCodeList,
-      300
-    );
+    this.loadCodeList = debounce2(this.loadCodeList, 300, {
+      leading: true,
+      trailing: false
+    });
     this.loadCodeList();
   }
   /**
@@ -38400,7 +38442,7 @@ var GridFieldColumnController = class extends GridColumnController {
       srfkey: value,
       ...wfContext
     });
-    const tempParams = clone19(this.params);
+    const tempParams = clone20(this.params);
     const { context: newContext, params: newParams } = this.handlePublicParams(
       row.data,
       tempContext,
@@ -42834,7 +42876,7 @@ var ViewEngineBase = class {
 
 // src/engine/md-view.engine.ts
 import { RuntimeModelError as RuntimeModelError58 } from "@ibiz-template/core";
-import { clone as clone20 } from "ramda";
+import { clone as clone21 } from "ramda";
 var MDViewEngine = class extends ViewEngineBase {
   /**
    * 多数据部件名称
@@ -43031,7 +43073,7 @@ var MDViewEngine = class extends ViewEngineBase {
     if (!openAppViewLogic) {
       throw new RuntimeModelError58(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     }
-    const params = clone20(this.view.params);
+    const params = clone21(this.view.params);
     if (copyMode) {
       params.srfcopymode = copyMode;
     }