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

package/out/utils/ui-domain/ui-domain.js

@@ -18,14 +18,31 @@ export class UIDomain {
      */
     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 = new Map();
+        /**
+         * DTO 父子关系映射
+         *
+         * @author chitanda
+         * @date 2024-01-15 17:01:42
+         * @protected
+         * @type {Map<string, IAppDERS[]>}
+         */
+        this.rs2Map = new Map();
         if (id) {
             this.id = id;
         }
@@ -38,26 +55,45 @@ export class UIDomain {
      *
      * @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);
+            });
+        });
+    }
     /**
      * 界面域销毁
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.5.3-beta.5",
+  "version": "0.5.3-beta.7",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.5.2",
+    "@ibiz-template/core": "^0.5.3-beta.7",
     "@ibiz/model-core": "^0.1.3",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "5e76e5c131a8b28decd6af541137e756e2ca8c77"
+  "gitHead": "8a6d086ba278298213201f71876fc18d1a1995c3"
 }

package/src/app-hub.ts

@@ -66,6 +66,16 @@ export class AppHub implements IAppHubService {
    */
   protected view2appMap: Map<string, string> = new Map();
 
+  /**
+   * 当前注册的应用视图优先级
+   *
+   * @author chitanda
+   * @date 2024-01-15 15:01:57
+   * @protected
+   * @type {Map<string, number>}
+   */
+  protected view2appPriorityMap: Map<string, number> = new Map();
+
   /**
    * 实例化的应用视图模型
    *
@@ -176,13 +186,28 @@ export class AppHub implements IAppHubService {
    * 设置应用视图所属应用
    *
    * @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: string, appId: string = ibiz.env.appId): void {
+  setAppView(
+    tag: string,
+    appId: string = ibiz.env.appId,
+    priority: number = -1,
+  ): void {
     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, appId);
+    if (priority !== -1) {
+      this.view2appPriorityMap.set(id, priority);
+    }
   }
 
   /**

package/src/application.ts

@@ -130,7 +130,7 @@ export class Application implements IAppService {
   async init(): Promise<void> {
     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()!,

package/src/de-logic/utils/handle-src-val.ts

@@ -20,6 +20,24 @@ type SrcValParams = {
    * 源参数对象id
    */
   srcDELogicParamId?: string;
+
+  /**
+   * 目标逻辑参数
+   *
+   */
+  dstDELogicParamId?: string;
+
+  /**
+   * 目标属性名称
+   *
+   */
+  dstFieldName?: string;
+
+  /**
+   * 表达式
+   *
+   */
+  expression?: string;
 };
 
 /**
@@ -35,7 +53,8 @@ export function handleSrcVal(
   ctx: DELogicContext,
   srcValParams: SrcValParams,
 ): unknown {
-  const { srcDELogicParamId, srcFieldName, srcValue } = srcValParams;
+  const { srcDELogicParamId, srcFieldName, srcValue, expression } =
+    srcValParams;
   // 没有源值类型就是逻辑参数
   const srcValueType = srcValParams.srcValueType || 'SRCDLPARAM';
   // 取属性值
@@ -74,6 +93,15 @@ export function handleSrcVal(
     case 'ENVPARAM':
       value = clone(ibiz.env);
       break;
+    case 'EXPRESSION':
+      if (!expression) {
+        throw new ModelError(srcValParams, `表达式为空`);
+      }
+      value = ScriptFactory.execScriptFn(ctx, expression!, {
+        singleRowReturn: true,
+        isAsync: false,
+      });
+      break;
     default:
       throw new ModelError(srcValParams, `暂未支持源值类型${srcValueType}`);
   }

package/src/interface/common/i-app-hub-service/i-app-hub-service.ts

@@ -90,11 +90,12 @@ export interface IAppHubService {
    * 设置应用视图所属应用，兼容识别视图 codeName 或 id
    *
    * @author chitanda
-   * @date 2023-04-23 15:04:56
+   * @date 2024-01-15 15:01:39
    * @param {string} tag
-   * @param {string} [appId=ibiz.env.appId]
+   * @param {string} [appId]
+   * @param {number} [priority]
    */
-  setAppView(tag: string, appId?: string): void;
+  setAppView(tag: string, appId?: string, priority?: number): void;
 
   /**
    * 应用视图是否已注册

package/src/register/helper/panel-item-register.ts

@@ -46,7 +46,8 @@ export async function getPanelItemProvider(
   model: IPanelItem,
 ): Promise<IPanelItemProvider | undefined> {
   let provider: IPanelItemProvider | undefined;
-  const { itemType, sysPFPluginId, appId } = model as Required<IPanelItem>;
+  const { itemType, sysPFPluginId, appId, controlRenders } =
+    model as Required<IPanelItem>;
 
   // 找插件适配器
   if (sysPFPluginId) {
@@ -60,50 +61,55 @@ export async function getPanelItemProvider(
       return provider;
     }
   }
-
-  // 特殊容器类型
-  if (itemType === 'CONTAINER') {
-    const predefinedType =
-      (model as IPanelContainer).predefinedType || 'DEFAULT';
-    const key = `CONTAINER_${predefinedType}`;
-    provider = getProvider(key);
-    if (!provider) {
-      ibiz.log.error(
-        `找不到面板容器预置类型为${predefinedType}的适配器，注册key为${key}`,
-      );
-    } else {
-      return provider;
-    }
-  }
-
-  // 特殊直接内容类型
-  if (itemType === 'RAWITEM') {
-    const predefinedType =
-      (model as IPanelRawItem).rawItem?.predefinedType || 'DEFAULT';
-    const key = `RAWITEM_${predefinedType}`;
-    provider = getProvider(key);
-    if (!provider) {
-      ibiz.log.error(
-        `找不到面板成员直接内容预置类型为${predefinedType}的适配器，注册key为${key}`,
-      );
-    } else {
-      return provider;
+  if (controlRenders && controlRenders.length > 0) {
+    // 默认预定义 绘制器
+    provider = getProvider('PREDEFINE_RENDER');
+  } else {
+    // 特殊容器类型
+    if (itemType === 'CONTAINER') {
+      const predefinedType =
+        (model as IPanelContainer).predefinedType || 'DEFAULT';
+      const key = `CONTAINER_${predefinedType}`;
+      provider = getProvider(key);
+      if (!provider) {
+        ibiz.log.error(
+          `找不到面板容器预置类型为${predefinedType}的适配器，注册key为${key}`,
+        );
+      } else {
+        return provider;
+      }
     }
-  }
 
-  if (itemType === 'FIELD') {
-    const { editor } = model as IPanelField;
-    if (editor && editor.predefinedType) {
-      const key = `FIELD_${editor.predefinedType.toUpperCase()}`;
+    // 特殊直接内容类型
+    if (itemType === 'RAWITEM') {
+      const predefinedType =
+        (model as IPanelRawItem).rawItem?.predefinedType || 'DEFAULT';
+      const key = `RAWITEM_${predefinedType}`;
       provider = getProvider(key);
-      if (provider) {
+      if (!provider) {
+        ibiz.log.error(
+          `找不到面板成员直接内容预置类型为${predefinedType}的适配器，注册key为${key}`,
+        );
+      } else {
         return provider;
       }
     }
+
+    if (itemType === 'FIELD') {
+      const { editor } = model as IPanelField;
+      if (editor && editor.predefinedType) {
+        const key = `FIELD_${editor.predefinedType.toUpperCase()}`;
+        provider = getProvider(key);
+        if (provider) {
+          return provider;
+        }
+      }
+    }
+
+    // 找面板成员类型
+    provider = getProvider(itemType);
   }
 
-  // 找面板成员类型
-  provider = getProvider(itemType);
   if (!provider) {
     ibiz.log.error(`找不到面板成员类型${itemType}对应的适配器`);
   } else {

package/src/service/dto/method.dto.ts

@@ -28,16 +28,6 @@ export class MethodDto {
 
   protected dtoMap: Map<string, MethodDto> = new Map();
 
-  /**
-   * 当前 DTO 是否已经计算过关系相关逻辑
-   *
-   * @link this.calcRs
-   * @author chitanda
-   * @date 2023-12-26 16:12:18
-   * @protected
-   */
-  protected isCalcRs = false;
-
   /**
    * Creates an instance of MethodDto.
    * @author lxm
@@ -208,7 +198,12 @@ export class MethodDto {
     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
@@ -263,10 +258,9 @@ export class MethodDto {
    * @return {*}  {Promise<void>}
    */
   protected async calcRs(context: IContext, depth: number = 0): Promise<void> {
-    if (this.isCalcRs || depth > 10) {
+    if (depth > 10) {
       return;
     }
-    this.isCalcRs = true;
     depth += 1;
 
     const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);

package/src/service/mqtt/mqtt.service.ts

@@ -99,10 +99,10 @@ export class MqttService {
       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');
     });
   }
 

package/src/service/service/auth/v7-auth.service.ts

@@ -82,6 +82,8 @@ export class V7AuthService implements IAuthService {
       clearCookie(CoreConst.TOKEN_EXPIRES);
       clearCookie(CoreConst.TOKEN_REMEMBER);
       clearCookie(CoreConst.IS_ANONYMOUS);
+      ibiz.appData = undefined;
+      ibiz.orgData = undefined;
       return true;
     } catch (err: unknown) {
       ibiz.notification.error({

package/src/service/service/entity/method/fetch.ts

@@ -32,40 +32,41 @@ export class FetchMethod extends Method {
     // 过滤参数，必须是对象
     const searchParams = params && !isArray(params) ? params : params2 || {};
 
+    // 根据数据集合来源查询数据
+    let res: HttpResponse<IData[]>;
+
     if (this.isLocalMode) {
       const cond = DEDQCondUtil.getCond(this.method);
       const items = await this.searchLocal(
         cond,
         new SearchFilter(context, searchParams),
       );
-      return new HttpResponse<IDataEntity[]>(items, 200);
-    }
+      res = new HttpResponse<IDataEntity[]>(items, 200);
+    } else {
+      switch (this.method.dataSetType) {
+        case 'INDEXDE':
+        case 'CODELIST':
+        case 'MULTIFORM':
+          res = await this.fetchCodeListSet(context, searchParams);
+          break;
+        case 'REMOTE':
+          {
+            const path = this.calcPath(context);
+            res = await this.request(path, context, params, params2);
+          }
+          break;
+        default:
+          throw new ModelError(
+            this.method,
+            `数据来源类型${this.method.dataSetType}暂未支持`,
+          );
+      }
 
-    // 根据数据集合来源查询数据
-    let res: HttpResponse<IData[]>;
-    switch (this.method.dataSetType) {
-      case 'INDEXDE':
-      case 'CODELIST':
-      case 'MULTIFORM':
-        res = await this.fetchCodeListSet(context, searchParams);
-        break;
-      case 'REMOTE':
-        {
-          const path = this.calcPath(context);
-          res = await this.request(path, context, params, params2);
-        }
-        break;
-      default:
-        throw new ModelError(
-          this.method,
-          `数据来源类型${this.method.dataSetType}暂未支持`,
-        );
+      // 转换实体对象
+      const items: IData[] = res.data || [];
+      res.data = items.map(item => this.createEntity(item));
     }
 
-    // 转换实体对象
-    const items: IData[] = res.data || [];
-    res.data = items.map(item => this.createEntity(item));
-
     // 计算属性逻辑,每条数据走一遍
     if (res.data) {
       await execFieldLogics(

package/src/service/utils/dynamic-code-list/dynamic-code-list.ts

@@ -262,16 +262,16 @@ export class DynamicCodeListCache {
     );
     let resultItems: CodeListItem[] = [];
     if (res.data.length) {
-      res.data.forEach((item: IData) => {
-        if (pvalueAppDEFieldId) {
-          const tempItems = this.prepareTreeData(res.data as IData[]);
-          if (tempItems) {
-            resultItems = tempItems;
-          }
-        } else {
-          resultItems.push(this.convertData(item));
+      if (pvalueAppDEFieldId) {
+        const tempItems = this.prepareTreeData(res.data as IData[]);
+        if (tempItems) {
+          resultItems = tempItems;
         }
-      });
+      } else {
+        res.data.forEach((item: IData) => {
+          resultItems.push(this.convertData(item));
+        });
+      }
     }
     return Object.freeze(resultItems) as CodeListItem[];
   }

package/src/service/utils/res-path/res-path.ts

@@ -12,12 +12,12 @@ const reg = /\$\{(.*?)\}/g;
  * @author lxm
  * @date 2023-07-12 07:02:52
  * @export
- * @param {IContext} context
+ * @param {IParams} context
  * @param {IAppDataEntity} entity
  * @return {*}  {({ path: string; keys: string[] } | undefined)}
  */
 export function getMatchResPath(
-  context: IContext,
+  context: IParams,
   entity: IAppDataEntity,
 ): { path: string; keys: string[] } | undefined {
   const pathItems = entity.requestPaths || [];

package/src/ui-logic/ui-logic-node/debug-param-node/debug-param-node.ts

@@ -21,6 +21,6 @@ export class DebugParamNode extends UILogicNode {
       throw new RuntimeModelError(this.model, '缺少目标参数对象配置');
     }
     const param = ctx.params[dstDEUILogicParamId];
-    console.log(`逻辑节点${name}操作参数值:`, param);
+    ibiz.log.debug(`逻辑节点${name}操作参数值:`, param);
   }
 }

package/src/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.ts

@@ -7,7 +7,6 @@ export class RawJSCodeNode extends UILogicNode {
   declare model: IDEUIRawCodeLogic;
 
   async exec(ctx: UILogicContext): Promise<void> {
-    console.log(ctx);
     ScriptFactory.execScriptFn(
       {
         view: ctx.view,

package/src/utils/script/script-function.ts

@@ -31,7 +31,7 @@ export class ScriptFunction {
       try {
         return fn.apply({}, args);
       } catch (error) {
-        console.log('报错脚本', code);
+        ibiz.log.error('报错脚本', code);
         throw error;
       }
     };

package/src/utils/ui-domain/ui-domain.ts

@@ -20,15 +20,34 @@ export class UIDomain {
   readonly id: string;
 
   /**
-   * DTO 父子关系映射
+   * 状态
+   *
+   * @author chitanda
+   * @date 2024-01-15 19:01:51
+   * @type {{ rsInit: boolean }} 关系是否已经初始化
+   */
+  readonly state: { rsInit: boolean } = { rsInit: false };
+
+  /**
+   * DTO 子父关系映射
    *
    * @author chitanda
    * @date 2023-12-26 15:12:13
    * @protected
-   * @type {Map<string, IAppDERS[]>}
+   * @type {Map<string, IAppDERS[]>} Map<子实体, 当前实体的父关系>
    */
   protected rsMap: Map<string, IAppDERS[]> = new Map();
 
+  /**
+   * DTO 父子关系映射
+   *
+   * @author chitanda
+   * @date 2024-01-15 17:01:42
+   * @protected
+   * @type {Map<string, IAppDERS[]>}
+   */
+  protected rs2Map: Map<string, IAppDERS[]> = new Map();
+
   /**
    * Creates an instance of UIDomain.
    *
@@ -50,11 +69,11 @@ export class UIDomain {
    *
    * @author chitanda
    * @date 2023-12-26 15:12:31
-   * @param {string} entity
+   * @param {string} appDataEntityId
    * @param {IAppDERS} configs
    */
-  setDERConfig(deCodeName: string, configs: IAppDERS[]): void {
-    this.rsMap.set(deCodeName, configs);
+  setDERConfig(appDataEntityId: string, configs: IAppDERS[]): void {
+    this.rsMap.set(appDataEntityId, configs);
   }
 
   /**
@@ -62,16 +81,36 @@ export class UIDomain {
    *
    * @author chitanda
    * @date 2023-12-26 16:12:07
-   * @param {string} deCodeName
+   * @param {string} appDataEntityId
    * @return {*}  {IAppDERS[]}
    */
-  getDERConfig(deCodeName: string): IAppDERS[] {
-    if (this.rsMap.has(deCodeName)) {
-      return this.rsMap.get(deCodeName)!;
+  getDERConfig(appDataEntityId: string): IAppDERS[] {
+    if (this.rsMap.has(appDataEntityId)) {
+      return this.rsMap.get(appDataEntityId)!;
     }
     return [];
   }
 
+  /**
+   * 根据模型给的子实体中的父关系模型，计算每个实体的子关系模型
+   *
+   * @author chitanda
+   * @date 2024-01-15 19:01:49
+   */
+  calcParentRs(): void {
+    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);
+      });
+    });
+  }
+
   /**
    * 界面域销毁
    *