@ibiz-template/runtime 0.7.23 → 0.7.24-alpha.1

package/dist/index.esm.js

@@ -7911,9 +7911,9 @@ var DeAuthorityService = class {
       return result;
     }
     const appDataEntity = this.entityModel;
-    if (!appDataEntity.enableDEMainState) {
+    if (!appDataEntity.enableDEMainState || !appDataEntity.demainStates) {
       ibiz.log.debug(
-        ibiz.i18n.t("runtime.service.masterState", {
+        ibiz.i18n.t("runtime.service.mainState", {
           codeName: appDataEntity.codeName
         })
       );
@@ -15661,9 +15661,9 @@ var AppViewConfigService = class {
    * @param {string} tag
    * @return {*}  {string}
    */
-  calcAppViewId(tag) {
+  calcAppViewId(tag = "") {
     let id = "";
-    if (tag.indexOf(".") !== -1) {
+    if (tag && tag.indexOf(".") !== -1) {
       const ids = tag.split(".");
       id = ids[ids.length - 1];
     } else {
@@ -19064,6 +19064,18 @@ var MDControlController = class extends ControlController {
     }
     return resultParams;
   }
+  /**
+   * 加载更多
+   *
+   * @author zhanghengfeng
+   * @date 2024-06-11 19:06:15
+   * @return {*}  {Promise<void>}
+   */
+  async loadMore() {
+    if (this.state.total > this.state.items.length) {
+      await this.load({ isLoadMore: true });
+    }
+  }
   /**
    * 部件加载数据行为
    *
@@ -25358,17 +25370,6 @@ var DataViewControlController = class extends MDControlController {
       }
     }
   }
-  /**
-   * 加载更多
-   *
-   * @return {*}  {Promise<void>}
-   * @memberof DataViewControlController
-   */
-  async loadMore() {
-    if (this.state.total > this.state.items.length) {
-      await this.load({ isLoadMore: true });
-    }
-  }
   /**
    * 计算表格展示模式
    * @author fzh
@@ -27176,6 +27177,14 @@ var FormDetailState = class {
      * @type {boolean}
      */
     this.readonly = false;
+    /**
+     * 是否识别srfreadonly
+     *
+     * @author zhanghengfeng
+     * @date 2024-06-13 13:06:50
+     * @type {boolean}
+     */
+    this.enableReadonly = true;
     let $visible = true;
     Object.defineProperty(this, "visible", {
       enumerable: true,
@@ -27222,7 +27231,7 @@ var FormDetailState = class {
         if ($readonly !== void 0) {
           return $readonly;
         }
-        if (this.context) {
+        if (this.context && this.enableReadonly) {
           return !!(this.context.srfreadonly === true || this.context.srfreadonly === "true");
         }
         return false;
@@ -28027,6 +28036,7 @@ var FormItemController = class extends FormDetailController {
      * @type {IData[]}
      */
     this.rules = [];
+    this.state.enableReadonly = this.form.getControlType() !== "SEARCHFORM" /* SEARCHFORM */;
   }
   createState() {
     var _a;
@@ -30795,15 +30805,20 @@ var GridController = class extends MDControlController {
       }),
       false
     );
-    this.state.rows = items.map((item) => {
+    const rows = items.map((item) => {
       const row = new GridRowState(item, this);
       this.gridStateNotify(row, "LOAD" /* LOAD */);
       return row;
     });
+    if (args.isLoadMore) {
+      this.state.rows.push(...rows);
+    } else {
+      this.state.rows = rows;
+    }
     await this.updateRows(this.state.rows);
-    this.calcGroupData(items);
-    this.calcAggResult(items);
-    this.calcShowMode(items);
+    this.calcGroupData(this.state.items);
+    this.calcAggResult(this.state.items);
+    this.calcShowMode(this.state.items);
     return items;
   }
   /**
@@ -32471,17 +32486,6 @@ var ListController = class extends MDControlController {
       minorSortDir: this.model.minorSortDir
     };
   }
-  /**
-   * 加载更多
-   * @author lxm
-   * @date 2023-05-22 07:33:59
-   * @return {*}  {Promise<void>}
-   */
-  async loadMore() {
-    if (this.state.total > this.state.items.length) {
-      await this.load({ isLoadMore: true });
-    }
-  }
   /**
    * 计算表格展示模式
    * @author fzh
@@ -35359,7 +35363,7 @@ var TreeService = class extends MDControlService {
     if (parentData) {
       data = parentData._deData || {};
       const parentNodeModel = getTreeNode(this.model, parentData._nodeId);
-      if (parentNodeModel.appDataEntityId) {
+      if (parentNodeModel && parentNodeModel.appDataEntityId) {
         deName = calcDeCodeNameById(parentNodeModel.appDataEntityId);
       }
       derValue = parentData._value;
@@ -41053,9 +41057,9 @@ var AppHub = class {
    * @param {string} tag
    * @return {*}  {string}
    */
-  calcAppViewId(tag) {
+  calcAppViewId(tag = "") {
     let id = "";
-    if (tag.indexOf(".") !== -1) {
+    if (tag && tag.indexOf(".") !== -1) {
       const ids = tag.split(".");
       id = ids[ids.length - 1];
     } else {
@@ -42127,7 +42131,7 @@ var MDViewEngine = class extends ViewEngineBase {
       event,
       view: this.view
     }));
-    if (result === -1) {
+    if (result === -1 || !result) {
       throw new RuntimeModelError73(
         this.view.model,
         ibiz.i18n.t("runtime.engine.logicOpendata")
@@ -44081,7 +44085,7 @@ var en = {
       loginFailure: "Login Failure",
       logoutFailure: "Logout failure",
       noFound: "Application entity not found [{id}]",
-      masterState: "{codeName} entity does not exist or is enabled for master state, return true",
+      mainState: "{codeName} entity does not exist, the main state is not enabled, or the main state collection is empty, return true",
       operationIdentifier: "Operation identifier {dataAccessAction} main state calculation started",
       matchMasterState: "Match master state",
       masterStatePermissions: "Collection of allowed master state permissions",
@@ -44657,7 +44661,7 @@ var zhCn = {
       loginFailure: "\u767B\u5F55\u5931\u8D25",
       logoutFailure: "\u767B\u51FA\u5931\u8D25",
       noFound: "\u672A\u627E\u5230\u5E94\u7528\u5B9E\u4F53[{id}]",
-      masterState: "{codeName}\u5B9E\u4F53\u4E0D\u5B58\u5728\u6216\u8005\u4E3A\u542F\u7528\u4E3B\u72B6\u6001\uFF0C\u8FD4\u56DEtrue",
+      mainState: "{codeName}\u5B9E\u4F53\u4E0D\u5B58\u5728\u3001\u672A\u542F\u7528\u4E3B\u72B6\u6001\u6216\u8005\u4E3B\u72B6\u6001\u96C6\u5408\u4E3A\u7A7A\uFF0C\u8FD4\u56DEtrue",
       operationIdentifier: "\u64CD\u4F5C\u6807\u8BC6{dataAccessAction}\u4E3B\u72B6\u6001\u8BA1\u7B97\u5F00\u59CB",
       matchMasterState: "\u5339\u914D\u4E3B\u72B6\u6001",
       masterStatePermissions: "\u5141\u8BB8\u7684\u4E3B\u72B6\u6001\u6743\u9650\u96C6\u5408",