@ibiz-template/runtime 0.4.11 → 0.4.13

package/out/service/service/entity/de.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"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"}

package/out/service/service/entity/de.service.js

@@ -1,4 +1,6 @@
 import { ModelError, RuntimeError, } from '@ibiz-template/core';
+import { equals, isEmpty, where } from 'ramda';
+import { ascSort } from 'qx-util';
 import { DECache, calcResPath } from '../../utils';
 import { WorkFlowService } from '../work-flow/work-flow.service';
 import { FileService } from '../file/file.service';
@@ -116,6 +118,73 @@ export class DEService {
     fetchTempDefault(context, params, params2) {
         return this.exec('FetchTempDefault', context, params, params2);
     }
+    /**
+     * 查询本地数据，根据属性
+     *
+     * @param {IParams} context
+     * @param {IParams} params 根据多实体属性查找，例：{ name: '张三', age: 18, parent: null }
+     * @return {*}  {Promise<IDataEntity[]>}
+     */
+    async selectLocal(context, params = {}) {
+        let items = this.local.getList(context);
+        items = ascSort(items, 'srfordervalue');
+        // 查询数据条件集
+        const data = {};
+        // if (notNilEmpty(context)) {
+        //   const map = this.entity.majorKeyMap;
+        //   if (map) {
+        //     for (const key in map) {
+        //       if (Object.prototype.hasOwnProperty.call(map, key)) {
+        //         const val = map[key];
+        //         if (notNilEmpty(context[key])) {
+        //           data[val] = equals(context[key]);
+        //         }
+        //       }
+        //     }
+        //   }
+        // }
+        const nullData = {};
+        const undefinedData = {};
+        const emptyData = {};
+        if (params.srfkey) {
+            data.srfkey = equals(params.srfkey);
+            delete params.srfkey;
+        }
+        for (const key in params) {
+            if (Object.prototype.hasOwnProperty.call(params, key)) {
+                const val = params[key];
+                if (val == null) {
+                    nullData[key] = equals(null);
+                    undefinedData[key] = equals(undefined);
+                    emptyData[key] = equals('');
+                }
+                else {
+                    data[key] = equals(val);
+                }
+            }
+        }
+        if (!isEmpty(data)) {
+            // 返回柯里化函数，用于判断数据是否满足要求
+            const pred = where(data);
+            const nullPred = where(nullData);
+            const undefinedPred = where(undefinedData);
+            const emptyPred = where(emptyData);
+            items = items.filter(obj => {
+                if (isEmpty(nullData)) {
+                    if (pred(obj)) {
+                        return true;
+                    }
+                }
+                else if (pred(obj) &&
+                    (nullPred(obj) || undefinedPred(obj) || emptyPred(obj))) {
+                    return true;
+                }
+                return false;
+            });
+        }
+        const list = items.map(obj => obj.clone());
+        return list;
+    }
     /**
      * 执行服务方法 ac 模式
      *

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

@@ -16,24 +16,17 @@ export declare class FetchMethod extends Method {
     method: IAppDEDataSet;
     protected get isLocalMode(): boolean;
     exec(context: IParams, params?: IData | IData[], params2?: IParams): Promise<HttpResponse<IDataEntity[]>>;
-    /**
-     * 查询本地数据，根据属性
-     *
-     * @param {IParams} context
-     * @param {IParams} params 根据多实体属性查找，例：{ name: '张三', age: 18, parent: null }
-     * @return {*}  {Promise<IDataEntity[]>}
-     */
-    protected selectLocal(context: IParams, params?: IParams): Promise<IDataEntity[]>;
     /**
      * 搜索本地数据
      *
-     * @protected
-     * @param {PSDEDQCondEngine | null} cond 查询实例
+     * @author chitanda
+     * @date 2023-12-18 11:12:27
+     * @param {(PSDEDQCondEngine | null)} cond 查询实例
      * @param {SearchFilter} filter 过滤对象
-     * @param {string[]} [queryParamKeys=this.entity.quickSearchKeys] 当前实体支持快速搜索的属性
+     * @param {string[]} [queryParamKeys=this.entity.quickSearchAppDEFieldIds!] 当前实体支持快速搜索的属性
      * @return {*}  {Promise<IDataEntity[]>}
      */
-    protected searchLocal(cond: PSDEDQCondEngine | null, filter: SearchFilter, queryParamKeys?: string[]): Promise<IDataEntity[]>;
+    searchLocal(cond: PSDEDQCondEngine | null, filter: SearchFilter, queryParamKeys?: string[]): Promise<IDataEntity[]>;
     /**
      * 获取代码表数据来源的集合
      * @author lxm

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;AAG7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC7B,MAAM,EAAE,aAAa,CAAC;IAE9B,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAEK,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IAoDvC;;;;;;OAMG;cACa,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,WAAW,EAAE,CAAC;IA8DzB;;;;;;;;OAQG;cACa,WAAW,CACzB,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC;IA6CzB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,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,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC7B,MAAM,EAAE,aAAa,CAAC;IAE9B,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAEK,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,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;IA6CzB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;CAkBlC"}

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

@@ -1,7 +1,7 @@
 import { HttpResponse, ModelError, RuntimeModelError, } from '@ibiz-template/core';
-import { ascSort, descSort } from 'qx-util';
-import { clone, equals, isEmpty, isNil, where } from 'ramda';
 import { isArray } from 'lodash-es';
+import { clone, isEmpty, isNil } from 'ramda';
+import { ascSort, descSort } from 'qx-util';
 import { SearchFilter } from '../../../utils';
 import { Method } from './method';
 import { execFieldLogics } from '../../../../de-logic';
@@ -53,81 +53,14 @@ export class FetchMethod extends Method {
         }
         return res;
     }
-    /**
-     * 查询本地数据，根据属性
-     *
-     * @param {IParams} context
-     * @param {IParams} params 根据多实体属性查找，例：{ name: '张三', age: 18, parent: null }
-     * @return {*}  {Promise<IDataEntity[]>}
-     */
-    async selectLocal(context, params = {}) {
-        const service = await this.getService();
-        let items = service.local.getList(context);
-        items = ascSort(items, 'srfordervalue');
-        // 查询数据条件集
-        const data = {};
-        // if (notNilEmpty(context)) {
-        //   const map = this.entity.majorKeyMap;
-        //   if (map) {
-        //     for (const key in map) {
-        //       if (Object.prototype.hasOwnProperty.call(map, key)) {
-        //         const val = map[key];
-        //         if (notNilEmpty(context[key])) {
-        //           data[val] = equals(context[key]);
-        //         }
-        //       }
-        //     }
-        //   }
-        // }
-        const nullData = {};
-        const undefinedData = {};
-        const emptyData = {};
-        if (params.srfkey) {
-            data.srfkey = equals(params.srfkey);
-            delete params.srfkey;
-        }
-        for (const key in params) {
-            if (Object.prototype.hasOwnProperty.call(params, key)) {
-                const val = params[key];
-                if (val == null) {
-                    nullData[key] = equals(null);
-                    undefinedData[key] = equals(undefined);
-                    emptyData[key] = equals('');
-                }
-                else {
-                    data[key] = equals(val);
-                }
-            }
-        }
-        if (!isEmpty(data)) {
-            // 返回柯里化函数，用于判断数据是否满足要求
-            const pred = where(data);
-            const nullPred = where(nullData);
-            const undefinedPred = where(undefinedData);
-            const emptyPred = where(emptyData);
-            items = items.filter(obj => {
-                if (isEmpty(nullData)) {
-                    if (pred(obj)) {
-                        return true;
-                    }
-                }
-                else if (pred(obj) &&
-                    (nullPred(obj) || undefinedPred(obj) || emptyPred(obj))) {
-                    return true;
-                }
-                return false;
-            });
-        }
-        const list = items.map(obj => obj.clone());
-        return list;
-    }
     /**
      * 搜索本地数据
      *
-     * @protected
-     * @param {PSDEDQCondEngine | null} cond 查询实例
+     * @author chitanda
+     * @date 2023-12-18 11:12:27
+     * @param {(PSDEDQCondEngine | null)} cond 查询实例
      * @param {SearchFilter} filter 过滤对象
-     * @param {string[]} [queryParamKeys=this.entity.quickSearchKeys] 当前实体支持快速搜索的属性
+     * @param {string[]} [queryParamKeys=this.entity.quickSearchAppDEFieldIds!] 当前实体支持快速搜索的属性
      * @return {*}  {Promise<IDataEntity[]>}
      */
     async searchLocal(cond, filter, queryParamKeys = this.entity.quickSearchAppDEFieldIds) {
@@ -141,7 +74,7 @@ export class FetchMethod extends Method {
             }
         }
         else {
-            list = await this.selectLocal(filter.context, filter.data);
+            list = await service.selectLocal(filter.context, filter.data);
             if (list.length > 0) {
                 if (filter.query && filter.query !== '') {
                     if (queryParamKeys) {

package/out/service/utils/de-cache/de-cache.js

@@ -397,10 +397,10 @@ export class DECache {
         });
         const unionValues = unionKeys.map(key => {
             if (isNil(data[key])) {
-                throw new RuntimeError(`联合键值计算异常，${key}属性为空值！`);
+                return `__empty__`;
             }
             return data[key];
         });
-        data.srfkey = unionValues.join('');
+        data.srfkey = unionValues.join('||');
     }
 }

package/out/service/vo/gantt-node-data/gantt-code-list-node-data.d.ts

@@ -9,6 +9,7 @@ export declare class GanttCodeListNodeData extends TreeCodeListNodeData implemen
     finishDataItemValue: string | number;
     totalDataItemValue: string | number;
     children?: IGanttNodeData[] | undefined;
+    parent?: IGanttNodeData;
     constructor(model: IDEGantt, nodeModel: IDETreeDataSetNode, parentNodeData: IGanttNodeData | undefined, opts: {
         data: CodeListItem;
         leaf: boolean;

package/out/service/vo/gantt-node-data/gantt-code-list-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gantt-code-list-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-code-list-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,qBAAa,qBACX,SAAQ,oBACR,YAAW,cAAc;IAEzB,cAAc,EAAE,MAAM,CAAC;IAEvB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,gBAAgB,EAAE,MAAM,CAAC;IAEzB,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,QAAQ,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;gBAGtC,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY,CAAC;QACnB,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;CAmCJ"}
+{"version":3,"file":"gantt-code-list-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-code-list-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,qBAAa,qBACX,SAAQ,oBACR,YAAW,cAAc;IAEzB,cAAc,EAAE,MAAM,CAAC;IAEvB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,gBAAgB,EAAE,MAAM,CAAC;IAEzB,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,QAAQ,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IAExC,MAAM,CAAC,EAAE,cAAc,CAAC;gBAGtB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY,CAAC;QACnB,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;CAmCJ"}

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

@@ -9,6 +9,8 @@ export declare class GanttDataSetNodeData extends TreeDataSetNodeData implements
     finishDataItemValue: string | number;
     totalDataItemValue: string | number;
     children?: IGanttNodeData[] | undefined;
+    parent?: IGanttNodeData;
+    nodeDataItem: IData;
     constructor(model: IDEGantt, nodeModel: IDETreeDataSetNode, parentNodeData: IGanttNodeData | undefined, opts: {
         data: IData;
         leaf: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"gantt-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-data-set-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAGxD,qBAAa,oBACX,SAAQ,mBACR,YAAW,cAAc;IAEzB,cAAc,EAAE,MAAM,CAAC;IAEvB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,gBAAgB,EAAE,MAAM,CAAC;IAEzB,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,QAAQ,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;gBAGtC,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,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;CAmCJ"}
+{"version":3,"file":"gantt-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-data-set-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAGxD,qBAAa,oBACX,SAAQ,mBACR,YAAW,cAAc;IAEzB,cAAc,EAAE,MAAM,CAAC;IAEvB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,gBAAgB,EAAE,MAAM,CAAC;IAEzB,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,QAAQ,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IAExC,MAAM,CAAC,EAAE,cAAc,CAAC;IAExB,YAAY,EAAE,KAAK,CAAC;gBAGlB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,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;CAoCJ"}

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

@@ -1,5 +1,5 @@
 import { TreeDataSetNodeData } from '../tree-node-data';
-import { calcDataItemValue } from './gantt-node-data-util';
+import { calcDataItemValue, calcNodeDataItem } from './gantt-node-data-util';
 export class GanttDataSetNodeData extends TreeDataSetNodeData {
     constructor(model, nodeModel, parentNodeData, opts) {
         super(nodeModel, parentNodeData, opts);
@@ -10,5 +10,6 @@ export class GanttDataSetNodeData extends TreeDataSetNodeData {
         this.prevDataItemValue = calcDataItemValue(model.prevDataItemName, nodeModel, data);
         this.finishDataItemValue = calcDataItemValue(model.finishDataItemName, nodeModel, data);
         this.totalDataItemValue = calcDataItemValue(model.totalDataItemName, nodeModel, data);
+        this.nodeDataItem = calcNodeDataItem(nodeModel, data);
     }
 }

package/out/service/vo/gantt-node-data/gantt-node-data-util.d.ts

@@ -6,4 +6,11 @@ import { IDETreeNode } from '@ibiz/model-core';
  * @returns
  */
 export declare const calcDataItemValue: (fieldCodeName: string | undefined, nodeModel: IDETreeNode, data?: IData) => string;
+/**
+ * 计算数据项
+ * @param nodeModel 节点模型
+ * @param data 数据
+ * @returns
+ */
+export declare const calcNodeDataItem: (nodeModel: IDETreeNode, data: IData) => IData;
 //# sourceMappingURL=gantt-node-data-util.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"gantt-node-data-util.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-node-data-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAuB,MAAM,kBAAkB,CAAC;AAEpE;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,kBACb,MAAM,GAAG,SAAS,aACtB,WAAW,SAChB,KAAK,KACV,MAaF,CAAC"}
+{"version":3,"file":"gantt-node-data-util.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-node-data-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAuB,MAAM,kBAAkB,CAAC;AAEpE;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,kBACb,MAAM,GAAG,SAAS,aACtB,WAAW,SAChB,KAAK,KACV,MAaF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,cAChB,WAAW,QAChB,KAAK,KACV,KAUF,CAAC"}

package/out/service/vo/gantt-node-data/gantt-node-data-util.js

@@ -17,3 +17,21 @@ export const calcDataItemValue = (fieldCodeName, nodeModel, data = {}) => {
     }
     return result;
 };
+/**
+ * 计算数据项
+ * @param nodeModel 节点模型
+ * @param data 数据
+ * @returns
+ */
+export const calcNodeDataItem = (nodeModel, data) => {
+    var _a;
+    const dataItem = {};
+    (_a = nodeModel.detreeNodeDataItems) === null || _a === void 0 ? void 0 : _a.forEach(item => {
+        if (item.id && item.appDEFieldId) {
+            Object.assign(dataItem, {
+                [item.id.toLowerCase()]: data[item.appDEFieldId.toLowerCase()],
+            });
+        }
+    });
+    return dataItem;
+};

package/out/service/vo/gantt-node-data/gantt-static-node-data.d.ts

@@ -9,6 +9,7 @@ export declare class GanttStaticNodeData extends TreeStaticNodeData implements I
     finishDataItemValue: string | number;
     totalDataItemValue: string | number;
     children?: IGanttNodeData[] | undefined;
+    parent?: IGanttNodeData;
     constructor(model: IDEGantt, nodeModel: IDETreeNode, parentNodeData: IGanttNodeData | undefined, opts: {
         parentValueLevel?: number;
         leaf: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"gantt-static-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-static-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGvD,qBAAa,mBACX,SAAQ,kBACR,YAAW,cAAc;IAEzB,cAAc,EAAE,MAAM,CAAC;IAEvB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,gBAAgB,EAAE,MAAM,CAAC;IAEzB,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,QAAQ,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;gBAGtC,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,WAAW,EACtB,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE;CAsBrD"}
+{"version":3,"file":"gantt-static-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-static-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGvD,qBAAa,mBACX,SAAQ,kBACR,YAAW,cAAc;IAEzB,cAAc,EAAE,MAAM,CAAC;IAEvB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,gBAAgB,EAAE,MAAM,CAAC;IAEzB,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,QAAQ,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IAExC,MAAM,CAAC,EAAE,cAAc,CAAC;gBAGtB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,WAAW,EACtB,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE;CAsBrD"}

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

@@ -1 +1 @@
-{"version":3,"file":"tree-code-list-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-code-list-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,oBACX,SAAQ,YACR,YAAW,aAAa;IAExB,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,EAAE,MAAM,CAAC;gBAGZ,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY,CAAC;QACnB,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;CAyBJ"}
+{"version":3,"file":"tree-code-list-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-code-list-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,oBACX,SAAQ,YACR,YAAW,aAAa;IAExB,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,EAAE,MAAM,CAAC;gBAGZ,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY,CAAC;QACnB,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;CA8BJ"}

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

@@ -14,11 +14,15 @@ export class TreeCodeListNodeData extends TreeNodeData {
         const { data } = opts;
         this.text = data.text;
         this.value = data.value;
-        this.id = parentNodeData
-            ? `${parentNodeData.id}:${model.id}@${this.value}`
-            : model.id + this.value;
         // id小写
-        this.id = this.id.toLowerCase();
+        const selfId = `${model.id}@${this.value}`.toLowerCase();
+        Object.defineProperty(this, 'id', {
+            get() {
+                return this.parent ? `${this.parent.id}:${selfId}` : selfId;
+            },
+            enumerable: true,
+            configurable: true,
+        });
         // 实体节点额外添加上自己的实体上下文
         if (model.appDataEntityId) {
             const deName = calcDeCodeNameById(model.appDataEntityId);

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,EAAE,MAAM,CAAC;IAEX,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;IAqCH,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":"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"}

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

@@ -21,11 +21,15 @@ export class TreeDataSetNodeData extends TreeNodeData {
         this.value = model.idAppDEFieldId
             ? data[model.idAppDEFieldId]
             : data.srfkey;
-        this.id = parentNodeData
-            ? `${parentNodeData.id}:${model.id}@${data.srfkey}`
-            : model.id + data.srfkey;
         // id小写
-        this.id = this.id.toLowerCase();
+        const selfId = `${model.id}@${data.srfkey}`.toLowerCase();
+        Object.defineProperty(this, 'id', {
+            get() {
+                return this.parent ? `${this.parent.id}:${selfId}` : selfId;
+            },
+            enumerable: true,
+            configurable: true,
+        });
         // 实体节点额外添加上自己的实体上下文
         if (model.appDataEntityId) {
             const deName = calcDeCodeNameById(model.appDataEntityId);

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

@@ -8,6 +8,7 @@ import { IIcon, ITreeNodeData } from '../../../interface';
  * @class TreeNodeData
  */
 export declare abstract class TreeNodeData implements ITreeNodeData {
+    _uuid: string;
     id: string;
     value?: string | undefined;
     text: string;

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;AAC/C,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;;;;GAMG;AACH,8BAAsB,YAAa,YAAW,aAAa;IACzD,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,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"}

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

@@ -1,3 +1,4 @@
+import { createUUID } from 'qx-util';
 /**
  * 树节点数据基类
  *
@@ -7,6 +8,7 @@
  */
 export class TreeNodeData {
     constructor(model, parentNodeData, opts) {
+        this._uuid = createUUID();
         this.leaf = false;
         this.leaf = opts.leaf === true;
         this.parent = parentNodeData;

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

@@ -1 +1 @@
-{"version":3,"file":"tree-static-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-static-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,YAAa,YAAW,aAAa;IAC3E,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,EAAE,KAAK,CAAC;gBAGb,KAAK,EAAE,iBAAiB,EACxB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE;CA+BrD"}
+{"version":3,"file":"tree-static-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-static-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,YAAa,YAAW,aAAa;IAC3E,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,EAAE,KAAK,CAAC;gBAGb,KAAK,EAAE,iBAAiB,EACxB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE;CAsCrD"}

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

@@ -13,9 +13,15 @@ export class TreeStaticNodeData extends TreeNodeData {
         super(model, parentNodeData, opts);
         // !!根节点的默认节点值root排除掉
         const nodeValue = model.nodeValue === 'root' ? undefined : model.nodeValue;
-        this.id = parentNodeData ? `${parentNodeData.id}:${model.id}` : model.id;
         // id小写
-        this.id = this.id.toLowerCase();
+        const selfId = `${model.id}`.toLowerCase();
+        Object.defineProperty(this, 'id', {
+            get() {
+                return this.parent ? `${this.parent.id}:${selfId}` : selfId;
+            },
+            enumerable: true,
+            configurable: true,
+        });
         this.text = model.text;
         this.value = nodeValue;
         // 静态节点数据去对应级别的父节点数据

package/out/utils/layout-panel-util/layout-panel-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout-panel-util.d.ts","sourceRoot":"","sources":["../../../src/utils/layout-panel-util/layout-panel-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAG7E;;;;;;;GAOG;AACH,qBAAa,eAAe;IAC1B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAa;IAE3D;;;;;;;OAOG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAIpD;;;;;;OAMG;IACH,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS;IAI9C;;;;;;;OAOG;IACH,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,QAAQ;IAgCnC;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CAAC,SAAS,EAAE,QAAQ,GAAG,MAAM;IAUpD;;;;;;;;OAQG;IACH,SAAS,CAAC,sBAAsB,CAAC,SAAS,EAAE,aAAa,GAAG,MAAM;CAcnE"}
+{"version":3,"file":"layout-panel-util.d.ts","sourceRoot":"","sources":["../../../src/utils/layout-panel-util/layout-panel-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAG7E;;;;;;;GAOG;AACH,qBAAa,eAAe;IAC1B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAa;IAE3D;;;;;;;OAOG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAIpD;;;;;;OAMG;IACH,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS;IAI9C;;;;;;;OAOG;IACH,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,QAAQ;IAgCnC;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CAAC,SAAS,EAAE,QAAQ,GAAG,MAAM;IAUpD;;;;;;;;OAQG;IACH,SAAS,CAAC,sBAAsB,CAAC,SAAS,EAAE,aAAa,GAAG,MAAM;CA6BnE"}

package/out/utils/layout-panel-util/layout-panel-util.js

@@ -116,9 +116,23 @@ export class LayoutPanelUtil {
         else if (mainMenuAlign) {
             exTag = mainMenuAlign.toUpperCase();
         }
+        // 计算面板标识
+        let key = '';
         if (exTag !== '') {
-            return `${viewType}_${viewStyle}_${exTag}`;
+            key = `${viewType}_${viewStyle}_${exTag}`;
         }
-        return `${viewType}_${viewStyle}`;
+        else {
+            key = `${viewType}_${viewStyle}`;
+        }
+        // 首页不采用分页导航
+        if (ibiz.config.view.disableHomeTabs &&
+            [
+                'APPINDEXVIEW_DEFAULT',
+                'APPINDEXVIEW_DEFAULT_LEFT',
+                'APPINDEXVIEW_DEFAULT_TOP',
+            ].includes(key)) {
+            key += '_NO_NAV';
+        }
+        return key;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.4.11",
+  "version": "0.4.13",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.4.11",
+    "@ibiz-template/core": "^0.4.12",
     "@ibiz/model-core": "^0.0.27",
     "@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": "b2512a91986d2e5fea22610a8148ab8f405ecb4e"
+  "gitHead": "f0dbdad04a472e40eeb8bc2073d6e6c1120b720b"
 }

package/src/config/global-config.ts

@@ -21,6 +21,7 @@ export class GlobalConfig implements IGlobalConfig {
   view: IGlobalViewConfig = {
     enableDataInfoBar: true,
     expCacheMode: 'TABEXPPANEL:',
+    disableHomeTabs: false,
   };
 
   // 全局表格配置

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

@@ -59,6 +59,7 @@ export class BaseController<
   ) {
     this.name = model.name || model.id!;
     this.initState();
+    this.convertMultipleLanguages();
   }
 
   /**
@@ -252,4 +253,14 @@ export class BaseController<
   listenNewController(cb: (name: string, c: IController) => void): void {
     this.ctx.evt.on('onRegister', cb);
   }
+
+  /**
+   * 转换各类多语言
+   *
+   * @date 2023-05-18 02:57:00
+   * @protected
+   */
+  protected convertMultipleLanguages(): void {
+    // 子类重写
+  }
 }

package/src/controller/common/control/control.controller.ts

@@ -149,6 +149,7 @@ export class ControlController<
 
   protected initState(): void {
     super.initState();
+    this.state.activated = true;
     this.state.isLoading = false;
   }
 
@@ -269,6 +270,28 @@ export class ControlController<
     this.ctx.endLoading();
   }
 
+  /**
+   * 部件重新激活
+   *
+   * @author chitanda
+   * @date 2023-07-12 17:07:55
+   */
+  onActivated(): void {
+    this.state.activated = true;
+    ibiz.log.debug(`视图[${this.model.name}](${this.model.id})激活`);
+  }
+
+  /**
+   * 部件暂时停用
+   *
+   * @author chitanda
+   * @date 2023-07-12 17:07:06
+   */
+  onDeactivated(): void {
+    this.state.activated = false;
+    ibiz.log.debug(`视图[${this.model.name}](${this.model.id})暂停`);
+  }
+
   /**
    * 处理数据能力方法通用参数，返回能力执行最终使用的参数
    * @author lxm

package/src/controller/common/control/md-control.controller.ts

@@ -42,6 +42,15 @@ export class MDControlController<
    */
   service!: MDControlService;
 
+  /**
+   * 在未激活时记录是否有 command 数据变更事件，有就记录。等待激活时刷新
+   *
+   * @author chitanda
+   * @date 2023-12-13 11:12:19
+   * @protected
+   */
+  protected commandDataChange = false;
+
   protected get _evt(): ControllerEvent<IMDControlEvent> {
     return this.evt;
   }
@@ -127,7 +136,19 @@ export class MDControlController<
    */
   protected onDataChange(msg: IData): void {
     if (msg.data && msg.data.srfdecodename === this.dataEntity.codeName) {
+      if (this.state.activated) {
+        this.refresh();
+      } else {
+        this.commandDataChange = true;
+      }
+    }
+  }
+
+  onActivated(): void {
+    super.onActivated();
+    if (this.commandDataChange) {
       this.refresh();
+      this.commandDataChange = false;
     }
   }