@ibiz-template/runtime 0.5.3-beta.1 → 0.5.3-beta.11

package/out/utils/index.d.ts

@@ -14,5 +14,6 @@ export { ThemeUtil } from './theme-util/theme-util';
 export { UIDomain } from './ui-domain/ui-domain';
 export { UIDomainManager } from './ui-domain-manager/ui-domain-manager';
 export { RawValueUtil } from './raw-value-util/raw-value-util';
+export { ViewStack } from './view-stack/view-stack';
 export { handleAllSettled } from './promise/promise';
 //# sourceMappingURL=index.d.ts.map

package/out/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,yCAAyC,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,yCAAyC,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC"}

package/out/utils/index.js

@@ -14,4 +14,5 @@ export { ThemeUtil } from './theme-util/theme-util';
 export { UIDomain } from './ui-domain/ui-domain';
 export { UIDomainManager } from './ui-domain-manager/ui-domain-manager';
 export { RawValueUtil } from './raw-value-util/raw-value-util';
+export { ViewStack } from './view-stack/view-stack';
 export { handleAllSettled } from './promise/promise';

package/out/utils/script/script-function.js

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

package/out/utils/ui-domain/transaction.d.ts

@@ -0,0 +1,66 @@
+import { ITransaction, ITransactionState } from '../../interface';
+/**
+ * 界面域下简单数据事务
+ *
+ * @author chitanda
+ * @date 2024-01-17 15:01:39
+ * @export
+ * @class Transaction
+ */
+export declare class Transaction implements ITransaction {
+    /**
+     * 待提交队列
+     *
+     * @author chitanda
+     * @date 2024-01-17 15:01:38
+     * @protected
+     */
+    protected commitQueue: Map<string, () => void>;
+    /**
+     * 事务状态
+     *
+     * @author chitanda
+     * @date 2024-01-17 15:01:45
+     * @type {ITransactionState}
+     */
+    readonly state: ITransactionState;
+    /**
+     * 开启事务
+     *
+     * @description 事务开启后，所有的数据操作都会被缓存，直到事务提交或者回滚
+     * @author chitanda
+     * @date 2024-01-17 15:01:46
+     */
+    open(): void;
+    /**
+     * 新增变更事务回调，事务提交时会按照添加顺序倒序执行
+     *
+     * @author chitanda
+     * @date 2024-01-17 16:01:50
+     * @param {string} id 回调标识，用于去重。一个数据只能有一个回调
+     * @param {() => void} commit
+     */
+    change(id: string, commit: () => void): void;
+    /**
+     * 提交事务
+     *
+     * @author chitanda
+     * @date 2024-01-17 15:01:05
+     */
+    commit(): void;
+    /**
+     * 回滚事务
+     *
+     * @author chitanda
+     * @date 2024-01-17 19:01:43
+     */
+    rollback(): void;
+    /**
+     * 关闭事务
+     *
+     * @author chitanda
+     * @date 2024-01-17 15:01:02
+     */
+    close(): void;
+}
+//# sourceMappingURL=transaction.d.ts.map

package/out/utils/ui-domain/transaction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../../src/utils/ui-domain/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAElE;;;;;;;GAOG;AACH,qBAAa,WAAY,YAAW,YAAY;IAC9C;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,CAAa;IAE3D;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAG/B;IAEF;;;;;;OAMG;IACH,IAAI,IAAI,IAAI;IAQZ;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,GAAG,IAAI;IAK5C;;;;;OAKG;IACH,MAAM,IAAI,IAAI;IAUd;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAKhB;;;;;OAKG;IACH,KAAK,IAAI,IAAI;CAMd"}

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

@@ -0,0 +1,94 @@
+/**
+ * 界面域下简单数据事务
+ *
+ * @author chitanda
+ * @date 2024-01-17 15:01:39
+ * @export
+ * @class Transaction
+ */
+export class Transaction {
+    constructor() {
+        /**
+         * 待提交队列
+         *
+         * @author chitanda
+         * @date 2024-01-17 15:01:38
+         * @protected
+         */
+        this.commitQueue = new Map();
+        /**
+         * 事务状态
+         *
+         * @author chitanda
+         * @date 2024-01-17 15:01:45
+         * @type {ITransactionState}
+         */
+        this.state = {
+            isOpen: false,
+            isChange: false,
+        };
+    }
+    /**
+     * 开启事务
+     *
+     * @description 事务开启后，所有的数据操作都会被缓存，直到事务提交或者回滚
+     * @author chitanda
+     * @date 2024-01-17 15:01:46
+     */
+    open() {
+        if (this.state.isOpen) {
+            ibiz.log.warn('事务已经开启, 单个界面域只能开启一个事务');
+            return;
+        }
+        this.state.isOpen = true;
+    }
+    /**
+     * 新增变更事务回调，事务提交时会按照添加顺序倒序执行
+     *
+     * @author chitanda
+     * @date 2024-01-17 16:01:50
+     * @param {string} id 回调标识，用于去重。一个数据只能有一个回调
+     * @param {() => void} commit
+     */
+    change(id, commit) {
+        this.state.isChange = true;
+        this.commitQueue.set(id, commit);
+    }
+    /**
+     * 提交事务
+     *
+     * @author chitanda
+     * @date 2024-01-17 15:01:05
+     */
+    commit() {
+        // 倒序提交
+        const commitQueue = Array.from(this.commitQueue.values()).reverse();
+        for (const commit of commitQueue) {
+            commit();
+        }
+        this.commitQueue.clear();
+        this.state.isChange = false;
+    }
+    /**
+     * 回滚事务
+     *
+     * @author chitanda
+     * @date 2024-01-17 19:01:43
+     */
+    rollback() {
+        this.commitQueue.clear();
+        this.state.isChange = false;
+    }
+    /**
+     * 关闭事务
+     *
+     * @author chitanda
+     * @date 2024-01-17 15:01:02
+     */
+    close() {
+        if (this.state.isChange) {
+            throw new Error('当前事务未提交，不可以直接关闭事务');
+        }
+        this.state.isOpen = false;
+    }
+}

package/out/utils/ui-domain/ui-domain.d.ts

@@ -1,4 +1,5 @@
 import { IAppDERS } from '@ibiz/model-core';
+import { Transaction } from './transaction';
 /**
  * 界面域
  *
@@ -17,14 +18,41 @@ export declare class UIDomain {
      */
     readonly id: string;
     /**
-     * DTO 父子关系映射
+     * 状态
+     *
+     * @author chitanda
+     * @date 2024-01-15 19:01:51
+     * @type {{ rsInit: boolean }} 关系是否已经初始化
+     */
+    readonly state: {
+        rsInit: boolean;
+    };
+    /**
+     * 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[]>;
+    /**
+     * DTO 父子关系映射
+     *
+     * @author chitanda
+     * @date 2024-01-15 17:01:42
+     * @protected
+     * @type {Map<string, IAppDERS[]>}
+     */
+    protected rs2Map: Map<string, IAppDERS[]>;
+    /**
+     * 当前界面域下唯一事务
+     *
+     * @author chitanda
+     * @date 2024-01-17 15:01:07
+     * @type {Transaction}
+     */
+    readonly transaction: Transaction;
     /**
      * Creates an instance of UIDomain.
      *
@@ -39,19 +67,35 @@ export declare 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;
+    setDERConfig(appDataEntityId: string, configs: IAppDERS[]): void;
     /**
      * 获取当前界面域下，具体实体的关系(在数据加载完成之后才有值)
      *
      * @author chitanda
      * @date 2023-12-26 16:12:07
-     * @param {string} deCodeName
+     * @param {string} appDataEntityId
      * @return {*}  {IAppDERS[]}
      */
-    getDERConfig(deCodeName: string): IAppDERS[];
+    getDERConfig(appDataEntityId: string): IAppDERS[];
+    /**
+     * 查询指定主实体下的所有子实体关系
+     *
+     * @author chitanda
+     * @date 2024-01-17 16:01:21
+     * @param {string} appDataEntityId
+     * @return {*}  {IAppDERS[]}
+     */
+    getDERConfigByMajor(appDataEntityId: string): IAppDERS[];
+    /**
+     * 根据模型给的子实体中的父关系模型，计算每个实体的子关系模型
+     *
+     * @author chitanda
+     * @date 2024-01-15 19:01:49
+     */
+    calcParentRs(): void;
     /**
      * 界面域销毁
      *

package/out/utils/ui-domain/ui-domain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-domain.d.ts","sourceRoot":"","sources":["../../../src/utils/ui-domain/ui-domain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C;;;;;;;GAOG;AACH,qBAAa,QAAQ;IACnB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAa;IAErD;;;;;;;OAOG;gBACS,EAAE,CAAC,EAAE,MAAM;IAQvB;;;;;;;OAOG;IACH,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI;IAI3D;;;;;;;OAOG;IACH,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,EAAE;IAO5C;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAWhB"}
+{"version":3,"file":"ui-domain.d.ts","sourceRoot":"","sources":["../../../src/utils/ui-domain/ui-domain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C;;;;;;;GAOG;AACH,qBAAa,QAAQ;IACnB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE;QAAE,MAAM,EAAE,OAAO,CAAA;KAAE,CAAqB;IAExD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAa;IAErD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAa;IAEtD;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAqB;IAEtD;;;;;;;OAOG;gBACS,EAAE,CAAC,EAAE,MAAM;IAQvB;;;;;;;OAOG;IACH,YAAY,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI;IAIhE;;;;;;;OAOG;IACH,YAAY,CAAC,eAAe,EAAE,MAAM,GAAG,QAAQ,EAAE;IAOjD;;;;;;;OAOG;IACH,mBAAmB,CAAC,eAAe,EAAE,MAAM,GAAG,QAAQ,EAAE;IAOxD;;;;;OAKG;IACH,YAAY,IAAI,IAAI;IAcpB;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAWhB"}

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

@@ -1,4 +1,5 @@
 import { createUUID } from 'qx-util';
+import { Transaction } from './transaction';
 /**
  * 界面域
  *
@@ -18,14 +19,39 @@ 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();
+        /**
+         * 当前界面域下唯一事务
+         *
+         * @author chitanda
+         * @date 2024-01-17 15:01:07
+         * @type {Transaction}
+         */
+        this.transaction = new Transaction();
         if (id) {
             this.id = id;
         }
@@ -38,26 +64,59 @@ 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(appDataEntityId) {
+        if (this.rsMap.has(appDataEntityId)) {
+            return this.rsMap.get(appDataEntityId);
+        }
+        return [];
+    }
+    /**
+     * 查询指定主实体下的所有子实体关系
+     *
+     * @author chitanda
+     * @date 2024-01-17 16:01:21
+     * @param {string} appDataEntityId
      * @return {*}  {IAppDERS[]}
      */
-    getDERConfig(deCodeName) {
-        if (this.rsMap.has(deCodeName)) {
-            return this.rsMap.get(deCodeName);
+    getDERConfigByMajor(appDataEntityId) {
+        if (this.rs2Map.has(appDataEntityId)) {
+            return this.rs2Map.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/out/utils/view-stack/view-stack.d.ts

@@ -0,0 +1,29 @@
+import { IAppView } from '@ibiz/model-core';
+import { IViewController, IViewEvent, IViewStack, IViewState } from '../../interface';
+/**
+ * 视图堆栈
+ *
+ * @author chitanda
+ * @date 2024-01-18 10:01:47
+ * @export
+ * @class ViewStack
+ */
+export declare class ViewStack implements IViewStack {
+    private stackMap;
+    private stack;
+    private activeStack;
+    add(id: string, view: IViewController<IAppView, IViewState, IViewEvent>): void;
+    remove(id: string): void;
+    getActives(): IViewController[];
+    active(_id: string): void;
+    deactivate(_id: string): void;
+    /**
+     * 重新计算激活视图堆栈
+     *
+     * @author chitanda
+     * @date 2024-01-18 14:01:23
+     * @protected
+     */
+    protected recalculateActiveStack(): void;
+}
+//# sourceMappingURL=view-stack.d.ts.map

package/out/utils/view-stack/view-stack.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"view-stack.d.ts","sourceRoot":"","sources":["../../../src/utils/view-stack/view-stack.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACL,eAAe,EACf,UAAU,EACV,UAAU,EACV,UAAU,EACX,MAAM,iBAAiB,CAAC;AAEzB;;;;;;;GAOG;AACH,qBAAa,SAAU,YAAW,UAAU;IAC1C,OAAO,CAAC,QAAQ,CAA2C;IAE3D,OAAO,CAAC,KAAK,CAAyB;IAEtC,OAAO,CAAC,WAAW,CAAyB;IAE5C,GAAG,CACD,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,eAAe,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC,GACtD,IAAI;IAMP,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IASxB,UAAU,IAAI,eAAe,EAAE;IAI/B,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIzB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI7B;;;;;;OAMG;IACH,SAAS,CAAC,sBAAsB,IAAI,IAAI;CAGzC"}

package/out/utils/view-stack/view-stack.js

@@ -0,0 +1,47 @@
+/**
+ * 视图堆栈
+ *
+ * @author chitanda
+ * @date 2024-01-18 10:01:47
+ * @export
+ * @class ViewStack
+ */
+export class ViewStack {
+    constructor() {
+        this.stackMap = new Map();
+        this.stack = [];
+        this.activeStack = [];
+    }
+    add(id, view) {
+        this.stack.push(view);
+        this.stackMap.set(id, view);
+        this.recalculateActiveStack();
+    }
+    remove(id) {
+        const view = this.stackMap.get(id);
+        if (view) {
+            this.stack.splice(this.stack.indexOf(view), 1);
+            this.stackMap.delete(id);
+            this.recalculateActiveStack();
+        }
+    }
+    getActives() {
+        return this.activeStack;
+    }
+    active(_id) {
+        this.recalculateActiveStack();
+    }
+    deactivate(_id) {
+        this.recalculateActiveStack();
+    }
+    /**
+     * 重新计算激活视图堆栈
+     *
+     * @author chitanda
+     * @date 2024-01-18 14:01:23
+     * @protected
+     */
+    recalculateActiveStack() {
+        this.activeStack = this.stack.filter(item => item.isActive === true);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.5.3-beta.1",
+  "version": "0.5.3-beta.11",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,8 +29,8 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.5.2",
-    "@ibiz/model-core": "^0.1.2",
+    "@ibiz-template/core": "^0.5.3-beta.11",
+    "@ibiz/model-core": "^0.1.5",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
     "@types/systemjs": "^6.13.5",
@@ -47,7 +47,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.5.0-beta.0",
-    "@ibiz/model-core": "^0.1.2",
+    "@ibiz/model-core": "^0.1.5",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "abce1a3f4ba865163181e1e3f33e688726fcddc9"
+  "gitHead": "776931de0bca05f5e83edb1d584e155374776374"
 }

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/command/app/open-app-view/open-app-view.ts

@@ -71,7 +71,14 @@ export class OpenAppViewCommand {
       );
     }
     const { openMode = 'INDEXVIEWTAB' } = appView;
-    switch (opts.openMode || openMode) {
+    const viewOpenMode = opts.openMode || openMode;
+    if (viewOpenMode !== undefined && viewOpenMode !== 'INDEXVIEWTAB') {
+      // 除了走路由的，其他情况toRouteDepth转为undefined，避免影响后续操作
+      if (context.toRouteDepth) {
+        context.toRouteDepth = undefined;
+      }
+    }
+    switch (viewOpenMode) {
       case 'INDEXVIEWTAB':
         if (opts.noWaitRoute) {
           this.openIndexViewTab(appView, context, params);

package/src/controller/common/editor/editor.controller.ts

@@ -1,10 +1,13 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { IEditor, INavigateParamContainer } from '@ibiz/model-core';
+import { DataTypes } from '@ibiz-template/core';
+import dayjs from 'dayjs';
 import { convertNavData } from '../../../utils';
 import {
   IEditorContainerController,
   IEditorController,
 } from '../../../interface/controller';
+import { ValueExUtil } from '../../utils';
 
 /**
  * 编辑器控制器基类
@@ -88,6 +91,28 @@ export class EditorController<T extends IEditor = IEditor>
     return !!this.model.readOnly;
   }
 
+  /**
+   * 值格式化
+   * @author lxm
+   * @date 2024-01-11 10:18:33
+   * @readonly
+   * @type {(string | undefined)}
+   */
+  get valueFormat(): string | undefined {
+    return this.parent.valueFormat;
+  }
+
+  /**
+   * 数据类型
+   * @author lxm
+   * @date 2024-01-11 10:18:55
+   * @readonly
+   * @type {(number  | undefined)}
+   */
+  get dataType(): number | undefined {
+    return this.parent.dataType;
+  }
+
   /**
    * Creates an instance of EditorController.
    * @author lxm
@@ -195,4 +220,33 @@ export class EditorController<T extends IEditor = IEditor>
   toBoolean(value: string): boolean {
     return Object.is('true', value);
   }
+
+  /**
+   * 值格式化
+   * @author lxm
+   * @date 2023-08-25 05:18:11
+   * @param {unknown} value
+   * @return {*}  {string}
+   */
+  formatValue(value: unknown = ''): string {
+    // 根据数据类型增强转换显示文本
+    if (this.model.valueType !== 'SIMPLE') {
+      return ValueExUtil.toText(this.model, value);
+    }
+
+    // 根据格式化配置格式化显示
+    const strVal = `${value}`;
+    if (!this.valueFormat) {
+      return strVal;
+    }
+    const isDate = DataTypes.isDate(this.dataType!);
+    if (isDate) {
+      const formatVal = dayjs(strVal).format(this.valueFormat);
+      if (formatVal !== 'Invalid Date') {
+        return formatVal;
+      }
+      return strVal;
+    }
+    return ibiz.util.text.format(strVal, this.valueFormat);
+  }
 }