@ibiz-template/runtime 0.4.16 → 0.4.17-dev.1

package/out/service/utils/search-filter/search-filter.d.ts

@@ -12,7 +12,7 @@ export declare class SearchFilter {
      * @date 2022-08-17 22:08:24
      * @type {IParams}
      */
-    readonly context: IParams;
+    readonly context: IContext;
     /**
      * 父关系实体
      *
@@ -77,7 +77,7 @@ export declare class SearchFilter {
      * @param {*} [data]
      * @memberof SearchFilter
      */
-    constructor(context: IParams, data?: IData);
+    constructor(context: IContext, data?: IData);
     /**
      * 获取条件值
      *

package/out/service/utils/search-filter/search-filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search-filter.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/search-filter/search-filter.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,qBAAa,YAAY;IACvB;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B;;;;;OAKG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAElC;;;;;OAKG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,KAAK;IAElB;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,QAAQ;IAErB;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,EAAG,MAAM,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAM;IAE1B;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,mBAAmB;IAErC;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,EAAE,KAAK,GAAG,MAAM,CAAS;IAE1C;;;;;;OAMG;gBACS,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,KAAK;IAqC1C;;;;;;;OAOG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;CAM/B"}
+{"version":3,"file":"search-filter.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/search-filter/search-filter.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,qBAAa,YAAY;IACvB;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;IAE3B;;;;;OAKG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAElC;;;;;OAKG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,KAAK;IAElB;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,QAAQ;IAErB;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,EAAG,MAAM,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAM;IAE1B;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,mBAAmB;IAErC;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,EAAE,KAAK,GAAG,MAAM,CAAS;IAE1C;;;;;;OAMG;gBACS,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,KAAK;IAqC3C;;;;;;;OAOG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;CAM/B"}

package/out/service/utils/service-exist-util/service-exist-util.d.ts

@@ -13,8 +13,8 @@ export declare function isExistSrfKey(funcName: string, entity: IDataEntity): bo
  *
  * @export
  * @param {string} funcName 执行方法名称
- * @param {IParams} context 上下文
+ * @param {IContext} context 上下文
  * @return {*}  {boolean}
  */
-export declare function isExistSessionId(funcName: string, context: IParams): boolean;
+export declare function isExistSessionId(funcName: string, context: IContext): boolean;
 //# sourceMappingURL=service-exist-util.d.ts.map

package/out/service/utils/service-exist-util/service-exist-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-exist-util.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/service-exist-util/service-exist-util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAQ5E;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAM5E"}
+{"version":3,"file":"service-exist-util.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/service-exist-util/service-exist-util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAQ5E;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,OAAO,CAM7E"}

package/out/service/utils/service-exist-util/service-exist-util.js

@@ -22,7 +22,7 @@ export function isExistSrfKey(funcName, entity) {
  *
  * @export
  * @param {string} funcName 执行方法名称
- * @param {IParams} context 上下文
+ * @param {IContext} context 上下文
  * @return {*}  {boolean}
  */
 export function isExistSessionId(funcName, context) {

package/out/service/vo/tree-node-data/tree-data-set-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-data-set-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IAC5E,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,EAAE,MAAM,CAAC;IAEd,MAAM,EAAE,KAAK,CAAC;gBAGZ,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IA0CH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,GAAG,SAAS;IAiBhE;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,CAC1B,QAAQ,EAAE,mBAAmB,GAC5B,MAAM,GAAG,SAAS;IAYrB;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS;CAStE"}
+{"version":3,"file":"tree-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-data-set-node-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IAC5E,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,EAAE,MAAM,CAAC;IAEd,MAAM,EAAE,KAAK,CAAC;gBAGZ,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IA6FH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,GAAG,SAAS;IAiBhE;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,CAC1B,QAAQ,EAAE,mBAAmB,GAC5B,MAAM,GAAG,SAAS;IAYrB;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS;CAStE"}

package/out/service/vo/tree-node-data/tree-data-set-node-data.js

@@ -1,3 +1,4 @@
+import { updateKeyDefine } from '@ibiz-template/core';
 import { calcDeCodeNameById } from '../../../model';
 import { ScriptFactory } from '../../../utils';
 import { TreeNodeData } from './tree-node-data';
@@ -12,6 +13,7 @@ import { fieldValueToBoolean } from '../../utils';
  */
 export class TreeDataSetNodeData extends TreeNodeData {
     constructor(model, parentNodeData, opts) {
+        var _a;
         super(model, parentNodeData, opts);
         const { data } = opts;
         this.deData = data;
@@ -45,6 +47,55 @@ export class TreeDataSetNodeData extends TreeNodeData {
         if (model.leafFlagAppDEFieldId) {
             this.leaf = fieldValueToBoolean(data[model.leafFlagAppDEFieldId]);
         }
+        /** 数据项映射 */
+        const dataItemkeyMap = new Map();
+        const dataItemDefaults = {};
+        (_a = model.detreeNodeDataItems) === null || _a === void 0 ? void 0 : _a.forEach(dataItem => {
+            const uiKey = dataItem.id.toLowerCase();
+            // 后台实体属性
+            const deFieldKey = dataItem.appDEFieldId.toLowerCase();
+            dataItemkeyMap.set(uiKey, deFieldKey);
+            if (dataItem.defaultValue) {
+                dataItemDefaults[uiKey] = dataItem.defaultValue;
+            }
+        });
+        return new Proxy(this, {
+            set(target, p, value) {
+                if (Object.prototype.hasOwnProperty.call(target.deData, p)) {
+                    target.deData[p] = value;
+                }
+                else if (dataItemkeyMap.has(p)) {
+                    target.deData[dataItemkeyMap.get(p)] = value;
+                }
+                else {
+                    target[p] = value;
+                }
+                return true;
+            },
+            get(target, p, _receiver) {
+                if (target[p] !== undefined) {
+                    return target[p];
+                }
+                if (dataItemkeyMap.has(p)) {
+                    return target.deData[dataItemkeyMap.get(p)] || dataItemDefaults[p];
+                }
+                if (target.deData[p] !== undefined) {
+                    return target.deData[p];
+                }
+            },
+            ownKeys(target) {
+                // 整合所有并排除重复
+                const allKeys = [
+                    ...new Set([
+                        ...Object.keys(target),
+                        ...dataItemkeyMap.keys(),
+                        ...Object.keys(target.deData),
+                    ]),
+                ];
+                updateKeyDefine(target, allKeys);
+                return allKeys;
+            },
+        });
     }
     calcIcon(model) {
         const icon = super.calcIcon(model) || {};

package/out/service/vo/tree-node-data/tree-node-data.d.ts

@@ -9,6 +9,7 @@ import { IIcon, ITreeNodeData } from '../../../interface';
  */
 export declare abstract class TreeNodeData implements ITreeNodeData {
     _uuid: string;
+    _nodeType: string;
     id: string;
     value?: string | undefined;
     text: string;
@@ -23,6 +24,7 @@ export declare abstract class TreeNodeData implements ITreeNodeData {
     parent?: ITreeNodeData;
     icon?: IIcon;
     textHtml?: string;
+    [key: string | symbol]: any;
     constructor(model: IDETreeNode, parentNodeData: ITreeNodeData | undefined, opts: {
         leaf: boolean;
         navContext?: IParams;

package/out/service/vo/tree-node-data/tree-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;;;;GAMG;AACH,8BAAsB,YAAa,YAAW,aAAa;IACzD,KAAK,EAAE,MAAM,CAAgB;IAE7B,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE3B,IAAI,EAAG,MAAM,CAAC;IAEd,QAAQ,CAAC,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAEvC,MAAM,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAE3B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAElC,MAAM,EAAE,MAAM,CAAC;IAEf,IAAI,EAAE,OAAO,CAAS;IAEtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,MAAM,CAAC,EAAE,aAAa,CAAC;IAEvB,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb,QAAQ,CAAC,EAAE,MAAM,CAAC;gBAGhB,KAAK,EAAE,WAAW,EAClB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE;IAsBpE;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,KAAK,GAAG,SAAS;CAa1D"}
+{"version":3,"file":"tree-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;;;;GAMG;AACH,8BAAsB,YAAa,YAAW,aAAa;IACzD,KAAK,EAAE,MAAM,CAAgB;IAE7B,SAAS,EAAE,MAAM,CAAC;IAElB,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE3B,IAAI,EAAG,MAAM,CAAC;IAEd,QAAQ,CAAC,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAEvC,MAAM,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAE3B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAElC,MAAM,EAAE,MAAM,CAAC;IAEf,IAAI,EAAE,OAAO,CAAS;IAEtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,MAAM,CAAC,EAAE,aAAa,CAAC;IAEvB,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAGlB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;gBAG1B,KAAK,EAAE,WAAW,EAClB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE;IAuBpE;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,KAAK,GAAG,SAAS;CAa1D"}

package/out/service/vo/tree-node-data/tree-node-data.js

@@ -12,6 +12,7 @@ export class TreeNodeData {
         this.leaf = false;
         this.leaf = opts.leaf === true;
         this.parent = parentNodeData;
+        this._nodeType = model.treeNodeType;
         // 所有节点都要继承父的上下文，如果父存在则复制父的资源上下文，否则返回空对象。
         if (this.parent) {
             this.context = Object.assign({}, this.parent.context);

package/out/types.d.ts

@@ -4,6 +4,7 @@ import { GlobalUtil } from './global';
 import { IMessageUtil, INotificationUtil, IOpenViewUtil, IModalUtil, IConfirmUtil, ILoadingUtil, IPluginFactory, IOverlayController, IGlobalConfig, IAppHubService, IAuthService, IAsyncActionService, IPlatformProvider } from './interface';
 import { LogicSchedulerCenter } from './logic-scheduler';
 import { RegisterCenter } from './register/register-center';
+import { UIDomainManager } from './utils';
 declare module '@ibiz-template/core' {
     interface IBizSys {
         /**
@@ -154,6 +155,14 @@ declare module '@ibiz-template/core' {
          * @memberof IBizSys
          */
         platform: IPlatformProvider;
+        /**
+         * UI域管理器
+         *
+         * @author chitanda
+         * @date 2023-12-22 15:12:41
+         * @type {UIDomainManager}
+         */
+        uiDomainManager: UIDomainManager;
     }
     interface IEnvironment {
         /**

package/out/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;;;WAMG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;WAMG;QACH,GAAG,EAAE,cAAc,CAAC;QAEpB;;;;;;;WAOG;QACH,KAAK,EAAE,UAAU,CAAC;QAElB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,YAAY,EAAE,iBAAiB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,aAAa,CAAC;QAExB;;;;;;WAMG;QACH,OAAO,EAAE,kBAAkB,CAAC;QAE5B;;;;;;WAMG;QACH,MAAM,EAAE,cAAc,CAAC;QAEvB;;;;;;WAMG;QACH,QAAQ,EAAE,cAAc,CAAC;QAEzB;;;;;;WAMG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,YAAY,CAAC;QAEnB;;;;;;WAMG;QACH,WAAW,EAAE,mBAAmB,CAAC;QAEjC;;;;;WAKG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,UAAU,CAAC;QAEjB;;;;;;WAMG;QACH,IAAI,EAAE,IAAI,CAAC;QAEX;;;;;WAKG;QACH,SAAS,EAAE,oBAAoB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,iBAAiB,CAAC;KAC7B;IAED,UAAU,YAAY;QACpB;;;;;;;WAOG;QACH,YAAY,CAAC,EAAE,aAAa,CAAC;KAC9B;CACF"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;;;WAMG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;WAMG;QACH,GAAG,EAAE,cAAc,CAAC;QAEpB;;;;;;;WAOG;QACH,KAAK,EAAE,UAAU,CAAC;QAElB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,YAAY,EAAE,iBAAiB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,aAAa,CAAC;QAExB;;;;;;WAMG;QACH,OAAO,EAAE,kBAAkB,CAAC;QAE5B;;;;;;WAMG;QACH,MAAM,EAAE,cAAc,CAAC;QAEvB;;;;;;WAMG;QACH,QAAQ,EAAE,cAAc,CAAC;QAEzB;;;;;;WAMG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,YAAY,CAAC;QAEnB;;;;;;WAMG;QACH,WAAW,EAAE,mBAAmB,CAAC;QAEjC;;;;;WAKG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,UAAU,CAAC;QAEjB;;;;;;WAMG;QACH,IAAI,EAAE,IAAI,CAAC;QAEX;;;;;WAKG;QACH,SAAS,EAAE,oBAAoB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,iBAAiB,CAAC;QAE5B;;;;;;WAMG;QACH,eAAe,EAAE,eAAe,CAAC;KAClC;IAED,UAAU,YAAY;QACpB;;;;;;;WAOG;QACH,YAAY,CAAC,EAAE,aAAa,CAAC;KAC9B;CACF"}

package/out/ui-logic/ui-logic-param/ui-logic-param.js

@@ -30,7 +30,7 @@ export class UILogicParam {
         const m = this.model;
         const { parameters } = ctx;
         const { context, params, data } = parameters;
-        const app = ibiz.hub.getApp(context.srfappid);
+        const app = ibiz.hub.getApp(m.appId);
         // 特殊变量的特殊处理
         if (m.codeName === 'layoutPanel') {
             ctx.params[tag] = parameters.view.layoutPanel.panelItems;

package/out/utils/index.d.ts

@@ -10,6 +10,8 @@ export * from './value-rule/value-rule';
 export * from './script/index';
 export { TextUtil } from './text-util/text-util';
 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 { 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,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,GACjB,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,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,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,GACjB,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"}

package/out/utils/index.js

@@ -10,5 +10,7 @@ export * from './value-rule/value-rule';
 export * from './script/index';
 export { TextUtil } from './text-util/text-util';
 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 { handleAllSettled } from './promise/promise';

package/out/utils/nav-params/calc-nav-params.d.ts

@@ -13,7 +13,7 @@ import { INavigateParam } from '@ibiz/model-core';
  *   })} model
  * @param {{
  *     derValue?: string; 关系父实体的主键值
- *     context: IParams; 上下文
+ *     context: IContext; 上下文
  *     params: IParams; 视图参数
  *     data: IData; 关系父的数据
  *   }} originParams
@@ -33,7 +33,7 @@ export declare function calcNavParams(model: {
      * 关系父主键值
      */
     derValue?: string;
-    context: IParams;
+    context: IContext;
     params: IParams;
     data: IData;
 }): {

package/out/utils/nav-params/calc-nav-params.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calc-nav-params.d.ts","sourceRoot":"","sources":["../../../src/utils/nav-params/calc-nav-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE;IACL;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,WAAW,CAAC,EAAE,cAAc,EAAE,GAAG,IAAI,GAAG,SAAS,CAAC;IAClD,SAAS,CAAC,EAAE,cAAc,EAAE,GAAG,IAAI,GAAG,SAAS,CAAC;CACjD,EACD,YAAY,EAAE;IACZ;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,KAAK,CAAC;CACb,GACA;IAAE,aAAa,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,OAAO,CAAA;CAAE,CA6BnD"}
+{"version":3,"file":"calc-nav-params.d.ts","sourceRoot":"","sources":["../../../src/utils/nav-params/calc-nav-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE;IACL;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,WAAW,CAAC,EAAE,cAAc,EAAE,GAAG,IAAI,GAAG,SAAS,CAAC;IAClD,SAAS,CAAC,EAAE,cAAc,EAAE,GAAG,IAAI,GAAG,SAAS,CAAC;CACjD,EACD,YAAY,EAAE;IACZ;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,QAAQ,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,KAAK,CAAC;CACb,GACA;IAAE,aAAa,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,OAAO,CAAA;CAAE,CA6BnD"}

package/out/utils/nav-params/calc-nav-params.js

@@ -13,7 +13,7 @@ import { convertNavData } from './nav-params';
  *   })} model
  * @param {{
  *     derValue?: string; 关系父实体的主键值
- *     context: IParams; 上下文
+ *     context: IContext; 上下文
  *     params: IParams; 视图参数
  *     data: IData; 关系父的数据
  *   }} originParams

package/out/utils/open-redirect-view/open-redirect-view.js

@@ -98,7 +98,7 @@ export async function openDERedirectView(appView, context, params = {}, opts = {
     // 实体重定向视图获取数据行为
     const actionId = appView.getDataAppDEActionId;
     const app = ibiz.hub.getApp(appView.appId);
-    const service = await app.deService.getService(entityId);
+    const service = await app.deService.getService(context, entityId);
     ibiz.loading.showRedirect();
     try {
         // 获取数据，未配置行为时，默认走 Get 行为

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

@@ -0,0 +1,35 @@
+/**
+ * 界面域
+ *
+ * @author chitanda
+ * @date 2023-12-22 15:12:07
+ * @export
+ * @class UIDomain
+ */
+export declare class UIDomain {
+    /**
+     * 唯一域标识
+     *
+     * @author chitanda
+     * @date 2023-12-22 15:12:12
+     * @type {string}
+     */
+    readonly id: string;
+    /**
+     * Creates an instance of UIDomain.
+     *
+     * @author chitanda
+     * @date 2023-12-22 16:12:03
+     * @param {string} appId
+     * @param {string} [id]
+     */
+    constructor(id?: string);
+    /**
+     * 界面域销毁
+     *
+     * @author chitanda
+     * @date 2023-12-22 15:12:49
+     */
+    destroy(): void;
+}
+//# sourceMappingURL=ui-domain.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ui-domain.d.ts","sourceRoot":"","sources":["../../../src/utils/ui-domain/ui-domain.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,qBAAa,QAAQ;IACnB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB;;;;;;;OAOG;gBACS,EAAE,CAAC,EAAE,MAAM;IAQvB;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAShB"}

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

@@ -0,0 +1,42 @@
+import { createUUID } from 'qx-util';
+/**
+ * 界面域
+ *
+ * @author chitanda
+ * @date 2023-12-22 15:12:07
+ * @export
+ * @class UIDomain
+ */
+export class UIDomain {
+    /**
+     * Creates an instance of UIDomain.
+     *
+     * @author chitanda
+     * @date 2023-12-22 16:12:03
+     * @param {string} appId
+     * @param {string} [id]
+     */
+    constructor(id) {
+        if (id) {
+            this.id = id;
+        }
+        else {
+            this.id = createUUID();
+        }
+    }
+    /**
+     * 界面域销毁
+     *
+     * @author chitanda
+     * @date 2023-12-22 15:12:49
+     */
+    destroy() {
+        const apps = ibiz.hub.getAllApps();
+        apps.forEach(app => {
+            app.deService.reset({
+                srfappid: app.appId,
+                srfsessionid: this.id,
+            });
+        });
+    }
+}

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

@@ -0,0 +1,47 @@
+import { UIDomain } from '../ui-domain/ui-domain';
+/**
+ * 界面域管理器
+ *
+ * @author chitanda
+ * @date 2023-12-22 15:12:10
+ * @export
+ * @class UIDomainManager
+ */
+export declare class UIDomainManager {
+    /**
+     * 界面域实例缓存
+     *
+     * @author chitanda
+     * @date 2023-12-22 15:12:53
+     * @protected
+     * @type {Map<string, UIDomain>}
+     */
+    protected domainMap: Map<string, UIDomain>;
+    /**
+     * 创建域
+     *
+     * @author chitanda
+     * @date 2023-12-22 16:12:44
+     * @param {string} [id] 可选，不传则自动生成
+     * @return {*}  {UIDomain}
+     */
+    create(id?: string): UIDomain;
+    /**
+     * 获取域
+     *
+     * @author chitanda
+     * @date 2023-12-22 15:12:17
+     * @param {string} id
+     * @return {*}  {UIDomain}
+     */
+    get(id: string): UIDomain;
+    /**
+     * 销毁域
+     *
+     * @author chitanda
+     * @date 2023-12-22 15:12:03
+     * @param {string} id
+     */
+    destroy(id: string): void;
+}
+//# sourceMappingURL=ui-domain-manager.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ui-domain-manager.d.ts","sourceRoot":"","sources":["../../../src/utils/ui-domain-manager/ui-domain-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAElD;;;;;;;GAOG;AACH,qBAAa,eAAe;IAC1B;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,QAAQ;IAM7B;;;;;;;OAOG;IACH,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ;IAOzB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;CAM1B"}

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

@@ -0,0 +1,62 @@
+import { UIDomain } from '../ui-domain/ui-domain';
+/**
+ * 界面域管理器
+ *
+ * @author chitanda
+ * @date 2023-12-22 15:12:10
+ * @export
+ * @class UIDomainManager
+ */
+export class UIDomainManager {
+    constructor() {
+        /**
+         * 界面域实例缓存
+         *
+         * @author chitanda
+         * @date 2023-12-22 15:12:53
+         * @protected
+         * @type {Map<string, UIDomain>}
+         */
+        this.domainMap = new Map();
+    }
+    /**
+     * 创建域
+     *
+     * @author chitanda
+     * @date 2023-12-22 16:12:44
+     * @param {string} [id] 可选，不传则自动生成
+     * @return {*}  {UIDomain}
+     */
+    create(id) {
+        const domain = new UIDomain(id);
+        this.domainMap.set(domain.id, domain);
+        return domain;
+    }
+    /**
+     * 获取域
+     *
+     * @author chitanda
+     * @date 2023-12-22 15:12:17
+     * @param {string} id
+     * @return {*}  {UIDomain}
+     */
+    get(id) {
+        if (this.domainMap.has(id)) {
+            return this.domainMap.get(id);
+        }
+        throw new Error(`无效的界面域标识[${id}]`);
+    }
+    /**
+     * 销毁域
+     *
+     * @author chitanda
+     * @date 2023-12-22 15:12:03
+     * @param {string} id
+     */
+    destroy(id) {
+        if (this.domainMap.has(id)) {
+            this.domainMap.get(id).destroy();
+            this.domainMap.delete(id);
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.4.16",
+  "version": "0.4.17-dev.1",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.4.12",
+    "@ibiz-template/core": "^0.4.17-dev.1",
     "@ibiz/model-core": "^0.0.28",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.10",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "8f0562310f54da8e772ff6a534a6f8eaf68e71f7"
+  "gitHead": "aabc8a7a92e6715602b803977fd9d2516955d902"
 }

package/src/app-hub.ts

@@ -331,4 +331,18 @@ export class AppHub implements IAppHubService {
     }
     return this.appMap.get(key!)!;
   }
+
+  /**
+   * 获取所有应用实例
+   *
+   * @author chitanda
+   * @date 2023-12-22 16:12:28
+   * @return {*}  {IAppService[]}
+   */
+  getAllApps(): IAppService[] {
+    if (this.appMap.size > 0) {
+      return Array.from(this.appMap.values());
+    }
+    return [];
+  }
 }

package/src/controller/common/base.controller.ts

@@ -1,4 +1,5 @@
 import { IModelObject } from '@ibiz/model-core';
+import { createUUID } from 'qx-util';
 import { CTX } from '../ctx';
 import {
   EventBase,
@@ -24,6 +25,8 @@ export class BaseController<
   E extends IComponentEvent = IComponentEvent,
 > implements IController<T, S, E>
 {
+  id: string = createUUID();
+
   /**
    * 中间层的基类才会使用，用于在内部使用自身的事件，事件类型不是泛型用evt就能正确推导出来。
    * @author lxm

package/src/controller/common/view/view.controller.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { createUUID, notNilEmpty } from 'qx-util';
+import { notNilEmpty } from 'qx-util';
 import { IBizContext, RuntimeError } from '@ibiz-template/core';
 import { IAppView } from '@ibiz/model-core';
 import { isEmpty, isNil, isNotNil } from 'ramda';
@@ -320,11 +320,15 @@ export class ViewController<
       await Promise.all(this.engines.map(engine => engine.onDestroyed()));
     }
     this.ctx.destroy();
-    this.context.destroy();
     this.engines = [];
     if (this.scheduler) {
       this.scheduler.destroy();
     }
+    // 销毁界面域，谁创建谁销毁
+    if (this.id === this.context.srfsessionid) {
+      ibiz.uiDomainManager.destroy(this.context.srfsessionid);
+    }
+    this.context.destroy();
     ibiz.log.debug(`视图[${this.model.name}](${this.model.id})销毁`);
   }
 
@@ -343,7 +347,9 @@ export class ViewController<
       isNil(this.context.srfsessionid) ||
       isEmpty(this.context.srfsessionid)
     ) {
-      this.context.srfsessionid = createUUID();
+      // 生成一个界面域，界面域标识为当前控制器实例的标识
+      const domain = ibiz.uiDomainManager.create(this.id);
+      this.context.srfsessionid = domain.id;
     }
 
     // 处理自定义导航上下文

package/src/controller/common/view/wf-step-trace-view.controller.ts

@@ -22,9 +22,11 @@ export class WFStepTraceViewController<
   protected async onCreated(): Promise<void> {
     await super.onCreated();
     const app = ibiz.hub.getApp(this.context.srfappid);
-    if (this.ctx.parent?.view.model.appDataEntityId) {
+    const view = this.ctx.parent?.view;
+    if (view && view.model.appDataEntityId) {
       const entityService = await app.deService.getService(
-        this.ctx.parent.view.model.appDataEntityId,
+        view.context,
+        view.model.appDataEntityId,
       );
       const params = Object.assign(this.context.clone(), this.params);
       const res = await entityService.wf.getWFHistory(params);

package/src/controller/control/calendar/calendar.service.ts

@@ -18,13 +18,13 @@ export class CalendarService extends MDControlService<ISysCalendar> {
    *
    * @author zk
    * @date 2023-08-08 10:08:47
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} [params={}]
    * @return {*}  Promise<ICalendarItemData[]>
    * @memberof CalendarService
    */
   async search(
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<ICalendarItemData[]> {
     const { sysCalendarItems } = this.model;
@@ -86,7 +86,7 @@ export class CalendarService extends MDControlService<ISysCalendar> {
    * @author zk
    * @date 2023-08-08 06:08:49
    * @param {string} methodName
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IData} [data={}]
    * @param {IParams} [params={}]
    * @param {string} [appDataEntityId=this.model.appDataEntityId!]
@@ -95,7 +95,7 @@ export class CalendarService extends MDControlService<ISysCalendar> {
    */
   private async exec2(
     methodName: string,
-    context: IParams,
+    context: IContext,
     data: IData = {},
     params: IParams = {},
     appDataEntityId: string = this.model.appDataEntityId!,