@ibiz-template/runtime 0.5.0-beta.5 → 0.5.0

package/dist/index.esm.js

@@ -6898,8 +6898,8 @@ var AuthorityService = class {
 import { CoreConst } from "@ibiz-template/core";
 import { clearCookie, getCookie, setCookie } from "qx-util";
 var V7AuthService = class {
-  constructor() {
-    this.isAnonymous = false;
+  get isAnonymous() {
+    return getCookie(CoreConst.IS_ANONYMOUS) === "1";
   }
   async anonymousLogin() {
     const { anonymousUser, anonymousPwd } = ibiz.env;
@@ -6909,7 +6909,13 @@ var V7AuthService = class {
     }
     const result = await this.login(anonymousUser, anonymousPwd);
     if (result) {
-      this.isAnonymous = true;
+      setCookie(CoreConst.IS_ANONYMOUS, "1", 0, true);
+      const token = getCookie(CoreConst.TOKEN);
+      const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
+      const remember = getCookie(CoreConst.TOKEN_REMEMBER);
+      setCookie(CoreConst.TOKEN, token, 0, true);
+      setCookie(CoreConst.TOKEN_EXPIRES, expirein, 0, true);
+      setCookie(CoreConst.TOKEN_REMEMBER, remember, 0, true);
     }
     return result;
   }
@@ -6933,6 +6939,7 @@ var V7AuthService = class {
           remember ? 7 : 0,
           true
         );
+        clearCookie(CoreConst.IS_ANONYMOUS);
       }
       return true;
     } catch (err) {
@@ -6949,6 +6956,7 @@ var V7AuthService = class {
       clearCookie(CoreConst.TOKEN);
       clearCookie(CoreConst.TOKEN_EXPIRES);
       clearCookie(CoreConst.TOKEN_REMEMBER);
+      clearCookie(CoreConst.IS_ANONYMOUS);
       return true;
     } catch (err) {
       ibiz.notification.error({
@@ -6959,6 +6967,9 @@ var V7AuthService = class {
     return false;
   }
   async extendLogin() {
+    if (this.isAnonymous) {
+      return;
+    }
     const token = getCookie(CoreConst.TOKEN);
     const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
     const remember = getCookie(CoreConst.TOKEN_REMEMBER);
@@ -6982,6 +6993,14 @@ var V7AuthService = class {
       }, wait);
     }
   }
+  getAuthInfo() {
+    const token = getCookie(CoreConst.TOKEN);
+    const isAnonymous = !!getCookie(CoreConst.IS_ANONYMOUS);
+    return token ? {
+      token,
+      isAnonymous
+    } : void 0;
+  }
 };
 
 // src/service/service/async-action/async-action.service.ts
@@ -8837,6 +8856,7 @@ var DEActionMethod = class extends Method {
     try {
       let key = null;
       if (params) {
+        key = params[this.entity.keyAppDEFieldId.toLowerCase()];
       }
       if (!key && context) {
         key = context[this.entity.codeName.toLowerCase()];
@@ -8896,6 +8916,7 @@ var DEActionMethod = class extends Method {
     try {
       let key = null;
       if (params) {
+        key = params[this.entity.keyAppDEFieldId.toLowerCase()];
       }
       if (!key && context) {
         key = context[this.entity.codeName.toLowerCase()];
@@ -8939,7 +8960,7 @@ var DEActionMethod = class extends Method {
         const majorLowerCodeName = majorDECodeName.toLowerCase();
         const pickupLowerDEFName = pickupDEFName.toLowerCase();
         const majorkey = context[majorLowerCodeName];
-        if (majorkey) {
+        if (majorkey && majorkey !== data.srfkey) {
           data[pickupLowerDEFName] = majorkey;
         }
       });
@@ -22406,6 +22427,9 @@ var GridController = class extends MDControlController {
      */
     this.aggTitle = "\u5408\u8BA1";
   }
+  get _evt() {
+    return this.evt;
+  }
   /**
    * 分组代码表项集合
    * @author lxm
@@ -22775,7 +22799,7 @@ var GridController = class extends MDControlController {
     try {
       res = isCreate ? await this.service.create(tempContext, data) : await this.service.update(tempContext, data);
     } catch (error) {
-      await this.evt.emit("onSaveError", void 0);
+      await this._evt.emit("onSaveError", void 0);
       this.actionNotification("".concat(isCreate ? "CREATE" : "UPDATE", "ERROR"), {
         error,
         data: rowState.data
@@ -22787,7 +22811,7 @@ var GridController = class extends MDControlController {
     rowState.data = res.data;
     rowState.modified = false;
     this.gridStateNotify(rowState, "SAVE" /* SAVE */);
-    await this.evt.emit("onSaveSuccess", void 0);
+    await this._evt.emit("onSaveSuccess", void 0);
   }
   async saveAll() {
     const needSaveData = this.state.rows.filter((row) => row.modified).map((row) => row.data);
@@ -22912,7 +22936,7 @@ var GridController = class extends MDControlController {
     row.processing = true;
     try {
       await this.dataChangeNotify(row, [name]);
-      await this.evt.emit("onGridDataChange", {
+      await this._evt.emit("onGridDataChange", {
         data: this.state.rows.map((_row) => {
           return _row.data;
         })
@@ -22987,7 +23011,7 @@ var GridController = class extends MDControlController {
         await this.save(row.data);
       } else if (row.data.srfuf === 0 /* CREATE */) {
         row.showRowEdit = false;
-        this.evt.emit("onRowEditChange", { row });
+        this._evt.emit("onRowEditChange", { row });
         return this.remove({ data: [row.data], silent: true });
       } else if (row.cacheData) {
         row.data = row.cacheData;
@@ -23008,7 +23032,7 @@ var GridController = class extends MDControlController {
     Object.values(this.editColumns).forEach((column) => {
       row.editColStates[column.fieldName].editable = toState;
     });
-    this.evt.emit("onRowEditChange", { row });
+    this._evt.emit("onRowEditChange", { row });
   }
   /**
    * 获取部件默认排序模型
@@ -26674,7 +26698,7 @@ var TreeController = class extends MDControlController {
     if (refreshParent) {
       const { parent } = currentNode;
       if (!parent || !this.model.rootVisible && this.state.rootNodes.includes(parent)) {
-        this.refresh();
+        await this.refresh();
         return;
       }
     }
@@ -28451,7 +28475,67 @@ var TreeGridExUAColumnController = class extends TreeGridExColumnController {
 };
 
 // src/controller/control/tree-grid/tree-grid.controller.ts
+import { RuntimeModelError as RuntimeModelError65 } from "@ibiz-template/core";
 var TreeGridController = class extends GridController {
+  constructor() {
+    super(...arguments);
+    /**
+     * 树表格值属性名称
+     *
+     */
+    this.treeGridValueField = "";
+    /**
+     * 树表格父属性名称
+     *
+     */
+    this.treeGridParentField = "";
+  }
+  initState() {
+    super.initState();
+    this.state.showTreeGrid = true;
+  }
+  /**
+   * 初始化方法
+   *
+   * @author lxm
+   * @date 2022-08-18 22:08:17
+   * @protected
+   * @returns {*}  {Promise<void>}
+   */
+  async onCreated() {
+    await super.onCreated();
+    this.initTreeGridField();
+  }
+  /**
+   * 初始化树表格字段
+   * @return {*}
+   * @author: zhujiamin
+   */
+  initTreeGridField() {
+    var _a, _b;
+    const treeGridParent = (_a = this.model.degridColumns) == null ? void 0 : _a.find((item) => {
+      return item.treeColumnMode === 4 || item.treeColumnMode === 12;
+    });
+    const treeGridValue = (_b = this.model.degridColumns) == null ? void 0 : _b.find((item) => {
+      return item.treeColumnMode === 2 || item.treeColumnMode === 3;
+    });
+    if (!treeGridParent) {
+      throw new RuntimeModelError65(this.model, "\u6811\u8868\u683C\u65E0\u503C\u5217\u6A21\u5F0F");
+    }
+    if (!treeGridValue) {
+      throw new RuntimeModelError65(this.model, "\u6811\u8868\u683C\u65E0\u7236\u503C\u5217\u6A21\u5F0F");
+    }
+    this.treeGridValueField = treeGridValue.appDEFieldId.toLowerCase();
+    this.treeGridParentField = treeGridParent.appDEFieldId.toLowerCase();
+  }
+  /**
+   * 切换树表格显示
+   * @return {*}
+   * @author: zhujiamin
+   */
+  switchTreeGridShow() {
+    this.state.showTreeGrid = !this.state.showTreeGrid;
+  }
 };
 
 // src/controller/control/tree-grid/tree-grid.service.ts
@@ -29845,6 +29929,10 @@ var AppHub = class {
     }
     return [];
   }
+  reset() {
+    this.appMap.clear();
+    this.configCache = void 0;
+  }
 };
 
 // src/engine/engine-factory.ts
@@ -30106,7 +30194,7 @@ var ViewEngineBase = class {
 };
 
 // src/engine/md-view.engine.ts
-import { RuntimeModelError as RuntimeModelError65 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError66 } from "@ibiz-template/core";
 import { clone as clone24 } from "ramda";
 var MDViewEngine = class extends ViewEngineBase {
   /**
@@ -30290,7 +30378,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError65(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError66(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     } else {
       return {
         cancel: !result.ok
@@ -30313,7 +30401,7 @@ var MDViewEngine = class extends ViewEngineBase {
       (item) => item.id === "newdata"
     );
     if (!openAppViewLogic) {
-      throw new RuntimeModelError65(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError66(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     }
     const params = clone24(this.view.params);
     if (copyMode) {
@@ -30327,7 +30415,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError65(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError66(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     } else {
       return {
         cancel: !result.ok
@@ -30638,13 +30726,13 @@ var ScriptExecutor = class extends LogicExecutor {
 };
 
 // src/logic-scheduler/executor/app-de-ui-logic-executor.ts
-import { RuntimeModelError as RuntimeModelError66 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError67 } from "@ibiz-template/core";
 var AppDEUILogicExecutor = class extends LogicExecutor {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(executeParams) {
     const { appDEUILogicId, appDataEntityId } = this.logic;
     if (!appDEUILogicId) {
-      throw new RuntimeModelError66(this.logic, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
+      throw new RuntimeModelError67(this.logic, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
     }
     execUILogic(appDEUILogicId, appDataEntityId, executeParams);
   }
@@ -31102,7 +31190,7 @@ var ItemDynaLogicTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/timer-trigger.ts
-import { RuntimeError as RuntimeError66, RuntimeModelError as RuntimeModelError67 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError66, RuntimeModelError as RuntimeModelError68 } from "@ibiz-template/core";
 var TimerTrigger = class extends LogicTrigger {
   constructor() {
     super(...arguments);
@@ -31110,7 +31198,7 @@ var TimerTrigger = class extends LogicTrigger {
   }
   start() {
     if (!this.logic.timer) {
-      throw new RuntimeModelError67(this.logic, "\u5B9A\u65F6\u5668\u7F3A\u5C11\u5B9A\u65F6\u95F4\u9694");
+      throw new RuntimeModelError68(this.logic, "\u5B9A\u65F6\u5668\u7F3A\u5C11\u5B9A\u65F6\u95F4\u9694");
     }
     this.timer = setInterval(() => {
       if (!this.scheduler.defaultParamsCb) {
@@ -31132,7 +31220,7 @@ var TimerTrigger = class extends LogicTrigger {
 import {
   ModelError as ModelError34,
   RuntimeError as RuntimeError67,
-  RuntimeModelError as RuntimeModelError68
+  RuntimeModelError as RuntimeModelError69
 } from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty9 } from "qx-util";
 var AppUILogicExecutor = class extends LogicExecutor {
@@ -31178,7 +31266,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       openViewRef = appUILogic.openDataAppView;
       if (!openViewRef) {
-        throw new RuntimeModelError68(
+        throw new RuntimeModelError69(
           appUILogic,
           "opendata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE"
         );
@@ -31186,7 +31274,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const openView = openViewRef.refAppViewId;
     if (!openView) {
-      throw new RuntimeModelError68(
+      throw new RuntimeModelError69(
         appUILogic,
         "opendata\u89C6\u56FE\u903B\u8F91\u7684\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE\u6CA1\u6709\u5B9E\u9645\u5F15\u7528\u89C6\u56FE"
       );
@@ -31216,7 +31304,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     );
     const typeFileName = appDataEntity.formTypeAppDEFieldId || appDataEntity.dataTypeAppDEFieldId;
     if (!typeFileName) {
-      throw new RuntimeModelError68(
+      throw new RuntimeModelError69(
         appUILogic,
         "".concat(appDataEntity.codeName, "[\u591A\u8868\u5355\u5B9E\u4F53] or [\u7D22\u5F15\u5B9E\u4F53]\u7F3A\u5C11\u7C7B\u578B\u5C5E\u6027\u914D\u7F6E")
       );
@@ -31224,7 +31312,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { data } = parameters;
     const formTypeValue = data[0][typeFileName];
     if (!formTypeValue) {
-      throw new RuntimeModelError68(appUILogic, "\u6570\u636E\u6E90\u65E0\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027\u503C");
+      throw new RuntimeModelError69(appUILogic, "\u6570\u636E\u6E90\u65E0\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027\u503C");
     }
     const openViewRefs = appUILogic.openDataAppViews;
     const findView = openViewRefs == null ? void 0 : openViewRefs.find((item) => item.refMode === formTypeValue);
@@ -31266,7 +31354,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
         return viewRef.refMode.toLowerCase() !== parentDeName;
       });
       if (!newViewRef) {
-        throw new RuntimeModelError68(
+        throw new RuntimeModelError69(
           appUILogic,
           "\u6CA1\u6709\u627E\u5230\u6279\u6DFB\u52A0\u9700\u8981\u6253\u5F00\u7684\u9009\u62E9\u89C6\u56FE"
         );
@@ -31276,7 +31364,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       newViewRef = newDataAppView;
       if (!newViewRef || !newViewRef.refAppViewId) {
-        throw new RuntimeModelError68(
+        throw new RuntimeModelError69(
           appUILogic,
           "newdata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u65B0\u5EFA\u6570\u636E\u89C6\u56FE"
         );
@@ -31334,7 +31422,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { wizardAppView, newDataAppViews } = appUILogic;
     const { context, params, ...rest } = parameters;
     if (!wizardAppView || !wizardAppView.refAppViewId) {
-      throw new RuntimeModelError68(appUILogic, "\u7F3A\u5C11\u9ED8\u8BA4\u7D22\u5F15\u5B9E\u4F53\u9009\u62E9\u89C6\u56FE");
+      throw new RuntimeModelError69(appUILogic, "\u7F3A\u5C11\u9ED8\u8BA4\u7D22\u5F15\u5B9E\u4F53\u9009\u62E9\u89C6\u56FE");
     }
     const result = await ibiz.commands.execute(
       OpenAppViewCommand.TAG,
@@ -31385,7 +31473,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       const minorDERs = selfDe.minorAppDERSs;
       const pickParentDeName = newViewRef.refMode.toLowerCase();
       if (!minorDERs) {
-        throw new RuntimeModelError68(selfDe, "\u5B9E\u4F53\u6CA1\u6709\u4ECE\u5173\u7CFB\u96C6\u5408\uFF01");
+        throw new RuntimeModelError69(selfDe, "\u5B9E\u4F53\u6CA1\u6709\u4ECE\u5173\u7CFB\u96C6\u5408\uFF01");
       }
       let pickParentFieldName;
       minorDERs == null ? void 0 : minorDERs.forEach((item) => {
@@ -31484,12 +31572,12 @@ var ControlEventTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/executor/app-ui-action-executor.ts
-import { RuntimeModelError as RuntimeModelError69 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError70 } from "@ibiz-template/core";
 var AppDEUIActionExecutor = class extends LogicExecutor {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(executeParams) {
     if (!this.logic.appDEUIActionId) {
-      throw new RuntimeModelError69(
+      throw new RuntimeModelError70(
         this.logic,
         "\u903B\u8F91\u4E2D\u7F3A\u5C11\u89E6\u53D1\u5E94\u7528\u5B9E\u4F53\u754C\u9762\u884C\u4E3Aid"
       );