@ibiz-template/runtime 0.5.3-beta.5 → 0.5.3-beta.7

package/dist/index.esm.js

@@ -1501,7 +1501,7 @@ var ScriptFunction = class {
       try {
         return fn.apply({}, args);
       } catch (error) {
-        console.log("\u62A5\u9519\u811A\u672C", code);
+        ibiz.log.error("\u62A5\u9519\u811A\u672C", code);
         throw error;
       }
     };
@@ -2861,14 +2861,31 @@ var UIDomain = class {
    */
   constructor(id) {
     /**
-     * DTO 父子关系映射
+     * 状态
+     *
+     * @author chitanda
+     * @date 2024-01-15 19:01:51
+     * @type {{ rsInit: boolean }} 关系是否已经初始化
+     */
+    this.state = { rsInit: false };
+    /**
+     * DTO 子父关系映射
      *
      * @author chitanda
      * @date 2023-12-26 15:12:13
      * @protected
-     * @type {Map<string, IAppDERS[]>}
+     * @type {Map<string, IAppDERS[]>} Map<子实体, 当前实体的父关系>
      */
     this.rsMap = /* @__PURE__ */ new Map();
+    /**
+     * DTO 父子关系映射
+     *
+     * @author chitanda
+     * @date 2024-01-15 17:01:42
+     * @protected
+     * @type {Map<string, IAppDERS[]>}
+     */
+    this.rs2Map = /* @__PURE__ */ new Map();
     if (id) {
       this.id = id;
     } else {
@@ -2880,26 +2897,45 @@ var UIDomain = class {
    *
    * @author chitanda
    * @date 2023-12-26 15:12:31
-   * @param {string} entity
+   * @param {string} appDataEntityId
    * @param {IAppDERS} configs
    */
-  setDERConfig(deCodeName, configs) {
-    this.rsMap.set(deCodeName, configs);
+  setDERConfig(appDataEntityId, configs) {
+    this.rsMap.set(appDataEntityId, configs);
   }
   /**
    * 获取当前界面域下，具体实体的关系(在数据加载完成之后才有值)
    *
    * @author chitanda
    * @date 2023-12-26 16:12:07
-   * @param {string} deCodeName
+   * @param {string} appDataEntityId
    * @return {*}  {IAppDERS[]}
    */
-  getDERConfig(deCodeName) {
-    if (this.rsMap.has(deCodeName)) {
-      return this.rsMap.get(deCodeName);
+  getDERConfig(appDataEntityId) {
+    if (this.rsMap.has(appDataEntityId)) {
+      return this.rsMap.get(appDataEntityId);
     }
     return [];
   }
+  /**
+   * 根据模型给的子实体中的父关系模型，计算每个实体的子关系模型
+   *
+   * @author chitanda
+   * @date 2024-01-15 19:01:49
+   */
+  calcParentRs() {
+    this.rs2Map.clear();
+    this.rsMap.forEach((configs, appDataEntityId) => {
+      configs.forEach((config) => {
+        config.minorAppDataEntityId = appDataEntityId;
+        const major = config.majorAppDataEntityId;
+        if (!this.rs2Map.has(major)) {
+          this.rs2Map.set(major, []);
+        }
+        this.rs2Map.get(major).push(config);
+      });
+    });
+  }
   /**
    * 界面域销毁
    *
@@ -3652,7 +3688,7 @@ function getProvider6(key) {
 async function getPanelItemProvider(model) {
   var _a;
   let provider;
-  const { itemType, sysPFPluginId, appId: appId2 } = model;
+  const { itemType, sysPFPluginId, appId: appId2, controlRenders } = model;
   if (sysPFPluginId) {
     const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId2);
     if (pluginKey) {
@@ -3664,41 +3700,45 @@ async function getPanelItemProvider(model) {
       return provider;
     }
   }
-  if (itemType === "CONTAINER") {
-    const predefinedType = model.predefinedType || "DEFAULT";
-    const key = "CONTAINER_".concat(predefinedType);
-    provider = getProvider6(key);
-    if (!provider) {
-      ibiz.log.error(
-        "\u627E\u4E0D\u5230\u9762\u677F\u5BB9\u5668\u9884\u7F6E\u7C7B\u578B\u4E3A".concat(predefinedType, "\u7684\u9002\u914D\u5668\uFF0C\u6CE8\u518Ckey\u4E3A").concat(key)
-      );
-    } else {
-      return provider;
-    }
-  }
-  if (itemType === "RAWITEM") {
-    const predefinedType = ((_a = model.rawItem) == null ? void 0 : _a.predefinedType) || "DEFAULT";
-    const key = "RAWITEM_".concat(predefinedType);
-    provider = getProvider6(key);
-    if (!provider) {
-      ibiz.log.error(
-        "\u627E\u4E0D\u5230\u9762\u677F\u6210\u5458\u76F4\u63A5\u5185\u5BB9\u9884\u7F6E\u7C7B\u578B\u4E3A".concat(predefinedType, "\u7684\u9002\u914D\u5668\uFF0C\u6CE8\u518Ckey\u4E3A").concat(key)
-      );
-    } else {
-      return provider;
+  if (controlRenders && controlRenders.length > 0) {
+    provider = getProvider6("PREDEFINE_RENDER");
+  } else {
+    if (itemType === "CONTAINER") {
+      const predefinedType = model.predefinedType || "DEFAULT";
+      const key = "CONTAINER_".concat(predefinedType);
+      provider = getProvider6(key);
+      if (!provider) {
+        ibiz.log.error(
+          "\u627E\u4E0D\u5230\u9762\u677F\u5BB9\u5668\u9884\u7F6E\u7C7B\u578B\u4E3A".concat(predefinedType, "\u7684\u9002\u914D\u5668\uFF0C\u6CE8\u518Ckey\u4E3A").concat(key)
+        );
+      } else {
+        return provider;
+      }
     }
-  }
-  if (itemType === "FIELD") {
-    const { editor } = model;
-    if (editor && editor.predefinedType) {
-      const key = "FIELD_".concat(editor.predefinedType.toUpperCase());
+    if (itemType === "RAWITEM") {
+      const predefinedType = ((_a = model.rawItem) == null ? void 0 : _a.predefinedType) || "DEFAULT";
+      const key = "RAWITEM_".concat(predefinedType);
       provider = getProvider6(key);
-      if (provider) {
+      if (!provider) {
+        ibiz.log.error(
+          "\u627E\u4E0D\u5230\u9762\u677F\u6210\u5458\u76F4\u63A5\u5185\u5BB9\u9884\u7F6E\u7C7B\u578B\u4E3A".concat(predefinedType, "\u7684\u9002\u914D\u5668\uFF0C\u6CE8\u518Ckey\u4E3A").concat(key)
+        );
+      } else {
         return provider;
       }
     }
+    if (itemType === "FIELD") {
+      const { editor } = model;
+      if (editor && editor.predefinedType) {
+        const key = "FIELD_".concat(editor.predefinedType.toUpperCase());
+        provider = getProvider6(key);
+        if (provider) {
+          return provider;
+        }
+      }
+    }
+    provider = getProvider6(itemType);
   }
-  provider = getProvider6(itemType);
   if (!provider) {
     ibiz.log.error("\u627E\u4E0D\u5230\u9762\u677F\u6210\u5458\u7C7B\u578B".concat(itemType, "\u5BF9\u5E94\u7684\u9002\u914D\u5668"));
   } else {
@@ -4528,16 +4568,16 @@ var DynamicCodeListCache = class {
     );
     let resultItems = [];
     if (res.data.length) {
-      res.data.forEach((item) => {
-        if (pvalueAppDEFieldId) {
-          const tempItems = this.prepareTreeData(res.data);
-          if (tempItems) {
-            resultItems = tempItems;
-          }
-        } else {
-          resultItems.push(this.convertData(item));
+      if (pvalueAppDEFieldId) {
+        const tempItems = this.prepareTreeData(res.data);
+        if (tempItems) {
+          resultItems = tempItems;
         }
-      });
+      } else {
+        res.data.forEach((item) => {
+          resultItems.push(this.convertData(item));
+        });
+      }
     }
     return Object.freeze(resultItems);
   }
@@ -5982,15 +6022,6 @@ var MethodDto = class {
     this.dto = dto;
     this.inSelfLoop = inSelfLoop;
     this.dtoMap = /* @__PURE__ */ new Map();
-    /**
-     * 当前 DTO 是否已经计算过关系相关逻辑
-     *
-     * @link this.calcRs
-     * @author chitanda
-     * @date 2023-12-26 16:12:18
-     * @protected
-     */
-    this.isCalcRs = false;
     if (dto) {
       this.app = ibiz.hub.getApp(entity.appId);
       this.fields = dto.appDEMethodDTOFields || [];
@@ -6122,7 +6153,12 @@ var MethodDto = class {
     if (this.isLocalMode && !this.inSelfLoop) {
       this.service.local.clear();
     }
-    await this.calcRs(context);
+    const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+    if (uiDomain && uiDomain.state.rsInit !== true) {
+      await this.calcRs(context);
+      uiDomain.calcParentRs();
+      uiDomain.state.rsInit = true;
+    }
     return Promise.all(
       data.map(async (datum) => {
         const all = this.fields.filter((field) => field.type === "DTOS").map(async (field) => {
@@ -6170,10 +6206,9 @@ var MethodDto = class {
    * @return {*}  {Promise<void>}
    */
   async calcRs(context, depth = 0) {
-    if (this.isCalcRs || depth > 10) {
+    if (depth > 10) {
       return;
     }
-    this.isCalcRs = true;
     depth += 1;
     const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
     const dtoFields = this.fields.filter((field) => field.type === "DTOS");
@@ -7194,6 +7229,8 @@ var V7AuthService = class {
       clearCookie(CoreConst.TOKEN_EXPIRES);
       clearCookie(CoreConst.TOKEN_REMEMBER);
       clearCookie(CoreConst.IS_ANONYMOUS);
+      ibiz.appData = void 0;
+      ibiz.orgData = void 0;
       return true;
     } catch (err) {
       ibiz.notification.error({
@@ -7926,7 +7963,7 @@ import { clone as clone10 } from "ramda";
 import { ModelError as ModelError10 } from "@ibiz-template/core";
 import { clone as clone9 } from "ramda";
 function handleSrcVal(ctx, srcValParams) {
-  const { srcDELogicParamId, srcFieldName, srcValue } = srcValParams;
+  const { srcDELogicParamId, srcFieldName, srcValue, expression } = srcValParams;
   const srcValueType = srcValParams.srcValueType || "SRCDLPARAM";
   let srcField = srcFieldName;
   let value;
@@ -7956,6 +7993,15 @@ function handleSrcVal(ctx, srcValParams) {
     case "ENVPARAM":
       value = clone9(ibiz.env);
       break;
+    case "EXPRESSION":
+      if (!expression) {
+        throw new ModelError10(srcValParams, "\u8868\u8FBE\u5F0F\u4E3A\u7A7A");
+      }
+      value = ScriptFactory.execScriptFn(ctx, expression, {
+        singleRowReturn: true,
+        isAsync: false
+      });
+      break;
     default:
       throw new ModelError10(srcValParams, "\u6682\u672A\u652F\u6301\u6E90\u503C\u7C7B\u578B".concat(srcValueType));
   }
@@ -8982,35 +9028,36 @@ import { ascSort, descSort } from "qx-util";
 var FetchMethod = class extends Method {
   async exec(context, params, params2) {
     const searchParams = params && !isArray7(params) ? params : params2 || {};
+    let res;
     if (this.isLocalMode) {
       const cond = DEDQCondUtil.getCond(this.method);
-      const items2 = await this.searchLocal(
+      const items = await this.searchLocal(
         cond,
         new SearchFilter(context, searchParams)
       );
-      return new HttpResponse4(items2, 200);
-    }
-    let res;
-    switch (this.method.dataSetType) {
-      case "INDEXDE":
-      case "CODELIST":
-      case "MULTIFORM":
-        res = await this.fetchCodeListSet(context, searchParams);
-        break;
-      case "REMOTE":
-        {
-          const path2 = this.calcPath(context);
-          res = await this.request(path2, context, params, params2);
-        }
-        break;
-      default:
-        throw new ModelError14(
-          this.method,
-          "\u6570\u636E\u6765\u6E90\u7C7B\u578B".concat(this.method.dataSetType, "\u6682\u672A\u652F\u6301")
-        );
+      res = new HttpResponse4(items, 200);
+    } else {
+      switch (this.method.dataSetType) {
+        case "INDEXDE":
+        case "CODELIST":
+        case "MULTIFORM":
+          res = await this.fetchCodeListSet(context, searchParams);
+          break;
+        case "REMOTE":
+          {
+            const path2 = this.calcPath(context);
+            res = await this.request(path2, context, params, params2);
+          }
+          break;
+        default:
+          throw new ModelError14(
+            this.method,
+            "\u6570\u636E\u6765\u6E90\u7C7B\u578B".concat(this.method.dataSetType, "\u6682\u672A\u652F\u6301")
+          );
+      }
+      const items = res.data || [];
+      res.data = items.map((item) => this.createEntity(item));
     }
-    const items = res.data || [];
-    res.data = items.map((item) => this.createEntity(item));
     if (res.data) {
       await execFieldLogics(
         this.entity,
@@ -9927,10 +9974,10 @@ var MqttService = class {
       ibiz.log.debug("mqtt message", topic, payload.toString());
     });
     this.client.on("reconnect", () => {
-      ibiz.log.debug("mqtt reconnect");
+      ibiz.log.warn("mqtt reconnect");
     });
     this.client.on("close", () => {
-      console.debug("mqtt close");
+      ibiz.log.warn("mqtt close");
     });
   }
   /**
@@ -10418,7 +10465,7 @@ var Application = class {
   async init() {
     await this.authority.init();
     await this.loadAppModelStyle();
-    if (ibiz.env.enableMqtt && ibiz.appData) {
+    if (ibiz.env.enableMqtt && ibiz.appData && ibiz.auth.isAnonymous !== true) {
       this.mqtt = new MqttService(
         ibiz.appData.mqtttopic,
         getToken(),
@@ -15980,7 +16027,7 @@ var DebugParamNode = class extends UILogicNode {
       throw new RuntimeModelError38(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
     }
     const param = ctx.params[dstDEUILogicParamId];
-    console.log("\u903B\u8F91\u8282\u70B9".concat(name, "\u64CD\u4F5C\u53C2\u6570\u503C:"), param);
+    ibiz.log.debug("\u903B\u8F91\u8282\u70B9".concat(name, "\u64CD\u4F5C\u53C2\u6570\u503C:"), param);
   }
 };
 
@@ -16172,7 +16219,6 @@ var ExecuteDELogicNode = class extends UILogicNode {
 // src/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.ts
 var RawJSCodeNode = class extends UILogicNode {
   async exec(ctx) {
-    console.log(ctx);
     ScriptFactory.execScriptFn(
       {
         view: ctx.view,
@@ -30587,6 +30633,15 @@ var AppHub = class {
      * @type {Map<string, string>} Map<视图 id, 视图所属应用>
      */
     this.view2appMap = /* @__PURE__ */ new Map();
+    /**
+     * 当前注册的应用视图优先级
+     *
+     * @author chitanda
+     * @date 2024-01-15 15:01:57
+     * @protected
+     * @type {Map<string, number>}
+     */
+    this.view2appPriorityMap = /* @__PURE__ */ new Map();
     /**
      * 实例化的应用视图模型
      *
@@ -30678,13 +30733,23 @@ var AppHub = class {
    * 设置应用视图所属应用
    *
    * @author chitanda
-   * @date 2023-04-17 23:04:37
+   * @date 2024-01-15 15:01:41
    * @param {string} tag 视图 codeName 或者视图 id
    * @param {string} [appId=ibiz.env.appId]
+   * @param {number} [priority=-1] 视图的优先级，值越小优先级越高。1为最高优先级
    */
-  setAppView(tag, appId2 = ibiz.env.appId) {
+  setAppView(tag, appId2 = ibiz.env.appId, priority = -1) {
     const id = this.calcAppViewId(tag);
+    if (this.view2appMap.has(id)) {
+      const _priority = this.view2appPriorityMap.get(id);
+      if (_priority && _priority < priority) {
+        return;
+      }
+    }
     this.view2appMap.set(id, appId2);
+    if (priority !== -1) {
+      this.view2appPriorityMap.set(id, priority);
+    }
   }
   /**
    * 判断应用视图是否存在