@ibiz-template/runtime 0.5.3-beta.4 → 0.5.3-beta.6

package/out/service/dto/method.dto.js

@@ -27,15 +27,6 @@ export class MethodDto {
         this.dto = dto;
         this.inSelfLoop = inSelfLoop;
         this.dtoMap = 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 || [];
@@ -168,7 +159,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
                 .filter(field => field.type === 'DTOS')
@@ -184,7 +180,7 @@ export class MethodDto {
                     }
                     const dto = await this.getFieldDto(context, field);
                     const items = datum[key];
-                    if (items) {
+                    if (items && items.length > 0) {
                         const pKey = datum[this.entity.keyAppDEFieldId];
                         if (field.refPickupAppDEFieldId) {
                             // 特殊处理，在子包内设置父对象标识
@@ -222,10 +218,9 @@ export class MethodDto {
      * @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');

package/out/service/service/entity/method/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,OAAO,EAAgB,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC7B,MAAM,EAAE,aAAa,CAAC;IAExB,IAAI,CACR,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IAoDvC;;;;;;;;;OASG;IACG,WAAW,CACf,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC;IAwCzB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;CAkBlC"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,OAAO,EAAgB,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC7B,MAAM,EAAE,aAAa,CAAC;IAExB,IAAI,CACR,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IAqDvC;;;;;;;;;OASG;IACG,WAAW,CACf,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC;IAwCzB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;CAkBlC"}

package/out/service/service/entity/method/fetch.js

@@ -18,31 +18,33 @@ export class FetchMethod extends Method {
     async exec(context, params, params2) {
         // 过滤参数，必须是对象
         const searchParams = params && !isArray(params) ? params : params2 || {};
+        // 根据数据集合来源查询数据
+        let res;
         if (this.isLocalMode) {
             const cond = DEDQCondUtil.getCond(this.method);
             const items = await this.searchLocal(cond, new SearchFilter(context, searchParams));
-            return new HttpResponse(items, 200);
+            res = new HttpResponse(items, 200);
         }
-        // 根据数据集合来源查询数据
-        let res;
-        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}暂未支持`);
+        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}暂未支持`);
+            }
+            // 转换实体对象
+            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, 'compute', context, res.data, searchParams);

package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts

@@ -112,7 +112,7 @@ export declare class DynamicCodeListCache {
      *
      * @return {codeListItem[] | undefined}
      */
-    protected prepareTreeData(items: IData[], pValue?: string | number): CodeListItem[] | undefined;
+    protected prepareTreeData(items: IData[]): CodeListItem[] | undefined;
     /**
      * 获取动态的代码项
      *

package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE1B,QAAQ,EAAE,YAAY;IAIlC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IA6DhD;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAuE1B;;;;OAIG;IACH,SAAS,CAAC,eAAe,CACvB,KAAK,EAAE,KAAK,EAAE,EACd,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GACvB,YAAY,EAAE,GAAG,SAAS;IAwB7B;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAyC5E"}
+{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE1B,QAAQ,EAAE,YAAY;IAIlC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IA6DhD;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAuE1B;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,SAAS;IAmBrE;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAyC5E"}

package/out/service/utils/dynamic-code-list/dynamic-code-list.js

@@ -154,17 +154,17 @@ export class DynamicCodeListCache {
         const res = await app.deService.exec(appDataEntityId, appDEDataSetId, context, undefined, tempParams);
         let resultItems = [];
         if (res.data.length) {
-            res.data.forEach((item) => {
-                if (pvalueAppDEFieldId) {
-                    const tempItems = this.prepareTreeData(res.data);
-                    if (tempItems) {
-                        resultItems = tempItems;
-                    }
+            if (pvalueAppDEFieldId) {
+                const tempItems = this.prepareTreeData(res.data);
+                if (tempItems) {
+                    resultItems = tempItems;
                 }
-                else {
+            }
+            else {
+                res.data.forEach((item) => {
                     resultItems.push(this.convertData(item));
-                }
-            });
+                });
+            }
         }
         return Object.freeze(resultItems);
     }
@@ -173,25 +173,24 @@ export class DynamicCodeListCache {
      *
      * @return {codeListItem[] | undefined}
      */
-    prepareTreeData(items, pValue) {
-        const { pvalueAppDEFieldId } = this.codeList;
-        let filteredData = [];
-        filteredData = items.filter(item => {
-            if (pValue) {
-                // 有传父value去后台数据里找出来子项pValue等于父value的
-                return item[pvalueAppDEFieldId] === pValue;
-            }
-            // 没有传父value，只需要找出来没有父值属性的
-            return !item[pvalueAppDEFieldId];
+    prepareTreeData(items) {
+        const { valueAppDEFieldId, pvalueAppDEFieldId } = this.codeList;
+        const map = {};
+        const nestedList = [];
+        items.forEach((data) => {
+            map[data[valueAppDEFieldId]] = this.convertData(data);
         });
-        if (filteredData.length === 0) {
-            return;
-        }
-        return filteredData.map(data => {
-            const tempCodeListItem = this.convertData(data);
-            tempCodeListItem.children = this.prepareTreeData(items, tempCodeListItem.value);
-            return tempCodeListItem;
+        items.forEach((data) => {
+            const parent = map[data[pvalueAppDEFieldId]];
+            if (parent) {
+                parent.children = parent.children || [];
+                parent.children.push(map[data[valueAppDEFieldId]]);
+            }
+            else {
+                nestedList.push(map[data[valueAppDEFieldId]]);
+            }
         });
+        return nestedList;
     }
     /**
      * 获取动态的代码项

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

@@ -14,6 +14,12 @@ export declare class TreeDataSetNodeData extends TreeNodeData implements ITreeNo
     _id: string;
     _value: string;
     _deData: IData;
+    /**
+     * 克隆方法
+     * @author lxm
+     * @date 2024-01-12 02:37:46
+     */
+    clone: () => TreeDataSetNodeData;
     constructor(model: IDETreeDataSetNode, parentNodeData: ITreeNodeData | undefined, opts: {
         data: IData;
         leaf: boolean;

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":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAG3E,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,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAG,MAAM,CAAC;IAEb,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,KAAK,CAAC;gBAGb,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;IAqHH,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;AAG3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAMhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IACpE,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAE,MAAM,CAAC;IAEZ,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;OAIG;IACK,KAAK,EAAE,MAAM,mBAAmB,CAAC;gBAGvC,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;IA4KH,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,9 +1,11 @@
 import { updateKeyDefine } from '@ibiz-template/core';
-import { isNil } from 'ramda';
+import { clone, isNil } from 'ramda';
 import { calcDeCodeNameById } from '../../../model';
 import { ScriptFactory } from '../../../utils';
 import { TreeNodeData } from './tree-node-data';
 import { fieldValueToBoolean } from '../../utils';
+/** 克隆时赋值排除的字段 */
+const CloneExcludeKeys = ['_id', '_value', '_text', '_deData', 'clone'];
 /**
  * 实体数据集树节点数据
  *
@@ -18,12 +20,6 @@ export class TreeDataSetNodeData extends TreeNodeData {
         super(model, parentNodeData, opts);
         const { data } = opts;
         this._deData = data;
-        this._text = model.textAppDEFieldId
-            ? data[model.textAppDEFieldId]
-            : data.srfmajortext;
-        this._value = model.idAppDEFieldId
-            ? data[model.idAppDEFieldId]
-            : data.srfkey;
         // id小写
         const selfId = `${model.id}@${data.srfkey}`.toLowerCase();
         Object.defineProperty(this, '_id', {
@@ -33,6 +29,24 @@ export class TreeDataSetNodeData extends TreeNodeData {
             enumerable: true,
             configurable: true,
         });
+        // 文本值
+        Object.defineProperty(this, '_text', {
+            get() {
+                return model.textAppDEFieldId
+                    ? data[model.textAppDEFieldId]
+                    : data.srfmajortext;
+            },
+            enumerable: true,
+            configurable: true,
+        });
+        // value值
+        Object.defineProperty(this, '_value', {
+            get() {
+                return model.idAppDEFieldId ? data[model.idAppDEFieldId] : data.srfkey;
+            },
+            enumerable: true,
+            configurable: true,
+        });
         // 实体节点额外添加上自己的实体上下文
         if (model.appDataEntityId) {
             const deName = calcDeCodeNameById(model.appDataEntityId);
@@ -48,19 +62,18 @@ export class TreeDataSetNodeData extends TreeNodeData {
         }
         /** 数据项和实体属性映射 */
         const dataItemKeyMap = new Map();
-        dataItemKeyMap.set('srfkey', 'srfkey');
-        dataItemKeyMap.set('srfmajortext', 'srfmajortext');
+        const dataItemDefaultMap = new Map();
         (_a = model.detreeNodeDataItems) === null || _a === void 0 ? void 0 : _a.forEach(dataItem => {
-            const uiKey = dataItem.id.toLowerCase();
-            // 后台实体属性
+            const dataItemKey = dataItem.id.toLowerCase();
+            // *后台实体属性
             const deFieldKey = dataItem.appDEFieldId.toLowerCase();
-            dataItemKeyMap.set(uiKey, deFieldKey);
+            dataItemKeyMap.set(dataItemKey, deFieldKey);
             // *设置默认值
-            if (dataItem.defaultValue && isNil(data[deFieldKey])) {
-                data[deFieldKey] = dataItem.defaultValue;
+            if (dataItem.defaultValue) {
+                dataItemDefaultMap.set(dataItemKey, dataItem.defaultValue);
             }
         });
-        /** 表格列和数据项的映射从而算出实体属性的映射 */
+        /** 表格列和数据项的映射 */
         const nodeColumnKeyMap = new Map();
         (_b = model.detreeNodeColumns) === null || _b === void 0 ? void 0 : _b.forEach(column => {
             const columnKey = column.detreeColumnId; // 不配树表格列不会有这个模型
@@ -69,22 +82,69 @@ export class TreeDataSetNodeData extends TreeNodeData {
                 ibiz.log.error('模型异常缺少detreeColumnId或者dataItemName', column);
             }
             else {
-                nodeColumnKeyMap.set(columnKey, dataItemKeyMap.get(dataItemKey));
+                nodeColumnKeyMap.set(columnKey, dataItemKey);
             }
         });
+        /**
+         * 获取对应key最终映射的实体属性字段，undefined就是没有映射实体属性
+         * @author lxm
+         * @date 2024-01-12 01:48:09
+         * @param {(string | symbol)} key
+         * @return {*}  {(string | symbol | undefined)}
+         */
+        const getDeKey = (key) => {
+            // 表格列映射的实体数据属性名称
+            if (nodeColumnKeyMap.has(key)) {
+                return dataItemKeyMap.get(nodeColumnKeyMap.get(key));
+            }
+            // 数据项映射的实体数据属性名称
+            if (dataItemKeyMap.has(key)) {
+                return dataItemKeyMap.get(key);
+            }
+            // 实体属性上可枚举的属性，返回该属性名称
+            if (Object.prototype.hasOwnProperty.call(this._deData, key)) {
+                return key;
+            }
+        };
+        /**
+         * 获取对应属性的默认值，纯显示用的
+         * @author lxm
+         * @date 2024-01-12 02:36:53
+         * @param {(string | symbol)} key
+         * @return {*}  {unknown}
+         */
+        const getKeyDefault = (key) => {
+            // 表格列映射的数据项的默认值
+            if (nodeColumnKeyMap.has(key)) {
+                return dataItemDefaultMap.get(nodeColumnKeyMap.get(key));
+            }
+            // 数据项映射的默认值
+            if (dataItemDefaultMap.has(key)) {
+                return dataItemDefaultMap.get(key);
+            }
+        };
+        this.clone = () => {
+            const cloneData = clone(this._deData);
+            const cloneNodeData = new TreeDataSetNodeData(model, this._parent, {
+                data: cloneData,
+                leaf: this._leaf,
+                navContext: this._context,
+                navParams: this._params,
+            });
+            Object.keys(this).forEach(key => {
+                const deKey = getDeKey(key);
+                // 非实体的映射属性，且不是排除的属性时，从原来那边赋值过来
+                if (isNil(deKey) && !CloneExcludeKeys.includes(key)) {
+                    cloneNodeData[key] = this[key];
+                }
+            });
+            return cloneNodeData;
+        };
         return new Proxy(this, {
             set(target, p, value) {
-                if (nodeColumnKeyMap.has(p)) {
-                    // 通过树表格列标识设置
-                    target._deData[nodeColumnKeyMap.get(p)] = value;
-                }
-                else if (dataItemKeyMap.has(p)) {
-                    // 通过树节点数据项标识设置
-                    target._deData[dataItemKeyMap.get(p)] = value;
-                }
-                else if (Object.prototype.hasOwnProperty.call(target._deData, p)) {
-                    // 通过实体数据属性标识设置
-                    target._deData[p] = value;
+                const deKey = getDeKey(p);
+                if (!isNil(deKey)) {
+                    target._deData[deKey] = value;
                 }
                 else {
                     target[p] = value;
@@ -92,21 +152,13 @@ export class TreeDataSetNodeData extends TreeNodeData {
                 return true;
             },
             get(target, p, _receiver) {
-                if (target[p] !== undefined) {
-                    return target[p];
-                }
-                // 通过树表格列标识获取
-                if (nodeColumnKeyMap.has(p)) {
-                    return target._deData[nodeColumnKeyMap.get(p)];
-                }
-                // 通过树节点数据项标识获取
-                if (dataItemKeyMap.has(p)) {
-                    return target._deData[dataItemKeyMap.get(p)];
-                }
-                // 通过实体数据属性标识获取
-                if (target._deData[p] !== undefined) {
-                    return target._deData[p];
+                const deKey = getDeKey(p);
+                if (!isNil(deKey)) {
+                    return isNil(target._deData[deKey])
+                        ? getKeyDefault(p)
+                        : target._deData[deKey];
                 }
+                return target[p];
             },
             ownKeys(target) {
                 // 整合所有并排除重复

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

@@ -17,14 +17,33 @@ 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[]>;
     /**
      * Creates an instance of UIDomain.
      *
@@ -39,19 +58,26 @@ 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-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;AAG5C;;;;;;;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;;;;;;;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;;;;;OAKG;IACH,YAAY,IAAI,IAAI;IAepB;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAWhB"}

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,46 @@ 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);
+            });
+        });
+        console.log(Array.from(this.rs2Map.values()));
+    }
     /**
      * 界面域销毁
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.5.3-beta.4",
+  "version": "0.5.3-beta.6",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -30,7 +30,7 @@
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/core": "^0.5.2",
-    "@ibiz/model-core": "^0.1.2",
+    "@ibiz/model-core": "^0.1.3",
     "@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.3",
     "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": "ed060fe1367c03eb252f52ac33a93ee7350733e3"
+  "gitHead": "fd9a03832183acb0fbdfc3592b1ff820257c2783"
 }

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

@@ -73,9 +73,9 @@ export class OpenAppViewCommand {
     const { openMode = 'INDEXVIEWTAB' } = appView;
     const viewOpenMode = opts.openMode || openMode;
     if (viewOpenMode !== undefined && viewOpenMode !== 'INDEXVIEWTAB') {
-      // 除了走路由的，其他情况全删了toRouteDepth，避免影响后续操作
+      // 除了走路由的，其他情况toRouteDepth转为undefined，避免影响后续操作
       if (context.toRouteDepth) {
-        delete context.toRouteDepth;
+        context.toRouteDepth = undefined;
       }
     }
     switch (viewOpenMode) {