@ibiz-template/runtime 0.4.9 → 0.4.11

package/out/service/utils/de-cache/de-cache.d.ts

@@ -1,3 +1,4 @@
+import { IAppDataEntity } from '@ibiz/model-core';
 import { IDataEntity } from '../../../interface';
 /**
  * 实体缓存工具类
@@ -8,6 +9,17 @@ import { IDataEntity } from '../../../interface';
  * @class DECache
  */
 export declare class DECache {
+    protected entity: IAppDataEntity;
+    /**
+     * 是否是联合主键
+     * @author lxm
+     * @date 2023-12-12 02:47:18
+     * @readonly
+     * @protected
+     * @type {boolean}
+     */
+    protected get isUnionKey(): boolean;
+    constructor(entity: IAppDataEntity);
     /**
      * 数据缓存
      *
@@ -155,5 +167,12 @@ export declare class DECache {
      * @return {*}  {Map<string, IDataEntity>}
      */
     private getCacheByTag;
+    /**
+     * 根据联合键值计算主键并赋值
+     * @author lxm
+     * @date 2023-12-12 03:06:30
+     * @param {(IDataEntity | IDataEntity[])} data 需要计算的数据或数据集合
+     */
+    protected calcUnionKey(data: IDataEntity): void;
 }
 //# sourceMappingURL=de-cache.d.ts.map

package/out/service/utils/de-cache/de-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-cache.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-cache/de-cache.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,OAAO;IAClB;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAa;IAErE;;;;;;;OAOG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IASrD;;;;;;;OAOG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAMxD;;;;;;;OAOG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAMnD;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IAiB9D;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAazD;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IAoBjE;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAmB5D;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IAsBrE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IA2BrE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IA4B1D;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAMpD;;;;;;;OAOG;IACH,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,WAAW,EAAE;IAexC;;;;;;;OAOG;IACH,YAAY,CAAC,MAAM,GAAE,OAAY,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO;IAgB9D;;;;;;OAMG;IACH,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAO7B;;;;;;;;OAQG;IACH,OAAO,CAAC,aAAa;CAOtB"}
+{"version":3,"file":"de-cache.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-cache/de-cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAMlD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD;;;;;;;GAOG;AACH,qBAAa,OAAO;IAaN,SAAS,CAAC,MAAM,EAAE,cAAc;IAZ5C;;;;;;;OAOG;IACH,SAAS,KAAK,UAAU,IAAI,OAAO,CAElC;gBAEqB,MAAM,EAAE,cAAc;IAE5C;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAa;IAErE;;;;;;;OAOG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IASrD;;;;;;;OAOG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAMxD;;;;;;;OAOG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAMnD;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IA2B9D;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAazD;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IAgCjE;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAmB5D;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IAsBrE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IA2BrE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IA4B1D;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAMpD;;;;;;;OAOG;IACH,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,WAAW,EAAE;IAexC;;;;;;;OAOG;IACH,YAAY,CAAC,MAAM,GAAE,OAAY,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO;IAgB9D;;;;;;OAMG;IACH,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAO7B;;;;;;;;OAQG;IACH,OAAO,CAAC,aAAa;IAQrB;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;CAehD"}

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

@@ -1,6 +1,8 @@
 import { where, equals, clone, isNil, isEmpty } from 'ramda';
 import { createUUID } from 'qx-util';
+import { RuntimeError } from '@ibiz-template/core';
 import { isExistSessionId, isExistSrfKey, } from '../service-exist-util/service-exist-util';
+import { findModelChild } from '../../../model';
 /**
  * 实体缓存工具类
  *
@@ -10,7 +12,20 @@ import { isExistSessionId, isExistSrfKey, } from '../service-exist-util/service-
  * @class DECache
  */
 export class DECache {
-    constructor() {
+    /**
+     * 是否是联合主键
+     * @author lxm
+     * @date 2023-12-12 02:47:18
+     * @readonly
+     * @protected
+     * @type {boolean}
+     */
+    get isUnionKey() {
+        var _a;
+        return !!((_a = this.entity.unionKeyValueAppDEFieldIds) === null || _a === void 0 ? void 0 : _a.length);
+    }
+    constructor(entity) {
+        this.entity = entity;
         /**
          * 数据缓存
          *
@@ -71,6 +86,13 @@ export class DECache {
      * @memberof EntityCache
      */
     add(context, entity) {
+        // 联合主键相关数据处理
+        if (this.isUnionKey) {
+            this.calcUnionKey(entity);
+            if (this.checkData(context, entity.srfkey)) {
+                throw new RuntimeError(`新建联合主键数据失败，已有主键为${entity.srfkey}的数据`);
+            }
+        }
         try {
             isExistSessionId('add', context);
             if (isNil(entity.srfkey) || isEmpty(entity.srfkey)) {
@@ -117,16 +139,25 @@ export class DECache {
      * @memberof EntityCache
      */
     update(context, entity) {
+        const oldKey = entity.srfkey;
+        // 联合主键相关数据处理
+        if (this.isUnionKey) {
+            this.calcUnionKey(entity);
+            // 主键改变的时候，检测变更之后的主键是否已经存在
+            if (oldKey !== entity.srfkey && this.checkData(context, entity.srfkey)) {
+                throw new RuntimeError(`更新联合主键数据失败，已有主键为${entity.srfkey}的数据`);
+            }
+        }
         try {
             isExistSessionId('update', context);
             isExistSrfKey('update', entity);
             entity.srftempdate = new Date().getTime();
             const map = this.getCacheByTag(context);
-            const data = map.get(entity.srfkey);
+            const data = map.get(oldKey);
             if (data) {
                 data.assign(entity);
-                map.set(entity.srfkey, data);
-                ibiz.log.warn('update', entity.srfkey, entity);
+                map.set(oldKey, data);
+                ibiz.log.warn('update', oldKey, entity);
                 return clone(data);
             }
             throw new Error('数据不存在，无法更新!');
@@ -353,4 +384,23 @@ export class DECache {
         }
         return this.cacheMap.get(tag);
     }
+    /**
+     * 根据联合键值计算主键并赋值
+     * @author lxm
+     * @date 2023-12-12 03:06:30
+     * @param {(IDataEntity | IDataEntity[])} data 需要计算的数据或数据集合
+     */
+    calcUnionKey(data) {
+        const unionKeys = this.entity.unionKeyValueAppDEFieldIds.map(id => {
+            const appField = findModelChild(this.entity.appDEFields || [], id);
+            return appField.codeName.toLowerCase();
+        });
+        const unionValues = unionKeys.map(key => {
+            if (isNil(data[key])) {
+                throw new RuntimeError(`联合键值计算异常，${key}属性为空值！`);
+            }
+            return data[key];
+        });
+        data.srfkey = unionValues.join('');
+    }
 }

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

@@ -0,0 +1,19 @@
+import { IDEGantt, IDETreeDataSetNode } from '@ibiz/model-core';
+import { CodeListItem, IGanttNodeData } from '../../../interface';
+import { TreeCodeListNodeData } from '../tree-node-data';
+export declare class GanttCodeListNodeData extends TreeCodeListNodeData implements IGanttNodeData {
+    sndataIteValue: string;
+    beginDataItemValue: string;
+    endDataItemValue: string;
+    prevDataItemValue: string | number;
+    finishDataItemValue: string | number;
+    totalDataItemValue: string | number;
+    children?: IGanttNodeData[] | undefined;
+    constructor(model: IDEGantt, nodeModel: IDETreeDataSetNode, parentNodeData: IGanttNodeData | undefined, opts: {
+        data: CodeListItem;
+        leaf: boolean;
+        navContext?: IParams;
+        navParams?: IParams;
+    });
+}
+//# sourceMappingURL=gantt-code-list-node-data.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,14 @@
+import { TreeCodeListNodeData } from '../tree-node-data';
+import { calcDataItemValue } from './gantt-node-data-util';
+export class GanttCodeListNodeData extends TreeCodeListNodeData {
+    constructor(model, nodeModel, parentNodeData, opts) {
+        super(nodeModel, parentNodeData, opts);
+        const { data } = opts;
+        this.sndataIteValue = calcDataItemValue(model.sndataItemName, nodeModel, data);
+        this.beginDataItemValue = calcDataItemValue(model.beginDataItemName, nodeModel, data);
+        this.endDataItemValue = calcDataItemValue(model.endDataItemName, nodeModel, data);
+        this.prevDataItemValue = calcDataItemValue(model.prevDataItemName, nodeModel, data);
+        this.finishDataItemValue = calcDataItemValue(model.finishDataItemName, nodeModel, data);
+        this.totalDataItemValue = calcDataItemValue(model.totalDataItemName, nodeModel, data);
+    }
+}

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

@@ -0,0 +1,19 @@
+import { IDEGantt, IDETreeDataSetNode } from '@ibiz/model-core';
+import { IGanttNodeData } from '../../../interface';
+import { TreeDataSetNodeData } from '../tree-node-data';
+export declare class GanttDataSetNodeData extends TreeDataSetNodeData implements IGanttNodeData {
+    sndataIteValue: string;
+    beginDataItemValue: string;
+    endDataItemValue: string;
+    prevDataItemValue: string | number;
+    finishDataItemValue: string | number;
+    totalDataItemValue: string | number;
+    children?: IGanttNodeData[] | undefined;
+    constructor(model: IDEGantt, nodeModel: IDETreeDataSetNode, parentNodeData: IGanttNodeData | undefined, opts: {
+        data: IData;
+        leaf: boolean;
+        navContext?: IParams;
+        navParams?: IParams;
+    });
+}
+//# sourceMappingURL=gantt-data-set-node-data.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,14 @@
+import { TreeDataSetNodeData } from '../tree-node-data';
+import { calcDataItemValue } from './gantt-node-data-util';
+export class GanttDataSetNodeData extends TreeDataSetNodeData {
+    constructor(model, nodeModel, parentNodeData, opts) {
+        super(nodeModel, parentNodeData, opts);
+        const { data } = opts;
+        this.sndataIteValue = calcDataItemValue(model.sndataItemName, nodeModel, data);
+        this.beginDataItemValue = calcDataItemValue(model.beginDataItemName, nodeModel, data);
+        this.endDataItemValue = calcDataItemValue(model.endDataItemName, nodeModel, data);
+        this.prevDataItemValue = calcDataItemValue(model.prevDataItemName, nodeModel, data);
+        this.finishDataItemValue = calcDataItemValue(model.finishDataItemName, nodeModel, data);
+        this.totalDataItemValue = calcDataItemValue(model.totalDataItemName, nodeModel, data);
+    }
+}

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

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

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

@@ -0,0 +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"}

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

@@ -0,0 +1,19 @@
+/**
+ * 计算数据项
+ * @param nodeModel
+ * @param fieldCodeName
+ * @returns
+ */
+export const calcDataItemValue = (fieldCodeName, nodeModel, data = {}) => {
+    let result = '';
+    if (!fieldCodeName || !nodeModel.detreeNodeDataItems) {
+        return result;
+    }
+    const targetTreeNodeDataItem = nodeModel.detreeNodeDataItems.find((nodeDataItem) => {
+        return nodeDataItem.id === fieldCodeName;
+    });
+    if (targetTreeNodeDataItem && targetTreeNodeDataItem.appDEFieldId) {
+        result = data[targetTreeNodeDataItem.appDEFieldId];
+    }
+    return result;
+};

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

@@ -0,0 +1,17 @@
+import { IDEGantt, IDETreeNode } from '@ibiz/model-core';
+import { IGanttNodeData } from '../../../interface';
+import { TreeStaticNodeData } from '../tree-node-data';
+export declare class GanttStaticNodeData extends TreeStaticNodeData implements IGanttNodeData {
+    sndataIteValue: string;
+    beginDataItemValue: string;
+    endDataItemValue: string;
+    prevDataItemValue: string | number;
+    finishDataItemValue: string | number;
+    totalDataItemValue: string | number;
+    children?: IGanttNodeData[] | undefined;
+    constructor(model: IDEGantt, nodeModel: IDETreeNode, parentNodeData: IGanttNodeData | undefined, opts: {
+        parentValueLevel?: number;
+        leaf: boolean;
+    });
+}
+//# sourceMappingURL=gantt-static-node-data.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,13 @@
+import { TreeStaticNodeData } from '../tree-node-data';
+import { calcDataItemValue } from './gantt-node-data-util';
+export class GanttStaticNodeData extends TreeStaticNodeData {
+    constructor(model, nodeModel, parentNodeData, opts) {
+        super(nodeModel, parentNodeData, opts);
+        this.sndataIteValue = calcDataItemValue(model.sndataItemName, nodeModel);
+        this.beginDataItemValue = calcDataItemValue(model.beginDataItemName, nodeModel);
+        this.endDataItemValue = calcDataItemValue(model.endDataItemName, nodeModel);
+        this.prevDataItemValue = calcDataItemValue(model.prevDataItemName, nodeModel);
+        this.finishDataItemValue = calcDataItemValue(model.finishDataItemName, nodeModel);
+        this.totalDataItemValue = calcDataItemValue(model.totalDataItemName, nodeModel);
+    }
+}

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

@@ -0,0 +1,4 @@
+export { GanttStaticNodeData } from './gantt-static-node-data';
+export { GanttDataSetNodeData } from './gantt-data-set-node-data';
+export { GanttCodeListNodeData } from './gantt-code-list-node-data';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC"}

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

@@ -0,0 +1,3 @@
+export { GanttStaticNodeData } from './gantt-static-node-data';
+export { GanttDataSetNodeData } from './gantt-data-set-node-data';
+export { GanttCodeListNodeData } from './gantt-code-list-node-data';

package/out/service/vo/index.d.ts

@@ -5,4 +5,5 @@ export * from './calendar-item-data';
 export * from './map-data';
 export * from './panel-data';
 export * from './chart-data';
+export * from './gantt-node-data';
 //# sourceMappingURL=index.d.ts.map

package/out/service/vo/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/vo/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/vo/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC"}

package/out/service/vo/index.js

@@ -5,3 +5,4 @@ export * from './calendar-item-data';
 export * from './map-data';
 export * from './panel-data';
 export * from './chart-data';
+export * from './gantt-node-data';

package/out/ui-action/provider/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;GAMG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAkB7C;AAED,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,uBAAuB,EACvB,0BAA0B,EAC1B,oBAAoB,GACrB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAGjE;;;;;;GAMG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAqB7C;AAED,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,uBAAuB,EACvB,0BAA0B,EAC1B,oBAAoB,GACrB,CAAC"}

package/out/ui-action/provider/index.js

@@ -4,6 +4,7 @@ import { SysUIActionProvider } from './sys-ui-action-provider';
 import { FrontUIActionProvider } from './front-ui-action-provider';
 import { WFWithdrawUIActionProvider } from './wf-withdraw-ui-action-provider';
 import { UIActionProviderBase } from './ui-action-provider-base';
+import { LoginOutUIActionProvider } from './loginout-ui-action-provider';
 /**
  * 预置默认的界面行为适配器
  *
@@ -25,5 +26,8 @@ export function presetUIActionProvider() {
     // 工作流撤回
     const wfWithdrawUIActionProvider = new WFWithdrawUIActionProvider();
     registerUIActionProvider('DEUIACTION_WFWithdraw', () => wfWithdrawUIActionProvider);
+    // 预置登出界面行为适配器
+    const loginOutUIActionProvider = new LoginOutUIActionProvider();
+    registerUIActionProvider('SYS_Logout', () => loginOutUIActionProvider);
 }
 export { FrontUIActionProvider, SysUIActionProvider, BackendUIActionProvider, WFWithdrawUIActionProvider, UIActionProviderBase, };

package/out/ui-action/provider/loginout-ui-action-provider.d.ts

@@ -0,0 +1,16 @@
+import { IAppDEUIAction } from '@ibiz/model-core';
+import { IUIActionResult, IUILogicParams } from '../../interface';
+import { UIActionProviderBase } from './ui-action-provider-base';
+/**
+ * 系统登出界面行为适配器
+ *
+ * @author zk
+ * @date 2023-12-11 07:12:49
+ * @export
+ * @class LoginOutUIActionProvider
+ * @extends {UIActionProviderBase}
+ */
+export declare class LoginOutUIActionProvider extends UIActionProviderBase {
+    execAction(_action: IAppDEUIAction, _params: IUILogicParams): Promise<IUIActionResult>;
+}
+//# sourceMappingURL=loginout-ui-action-provider.d.ts.map

package/out/ui-action/provider/loginout-ui-action-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loginout-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/loginout-ui-action-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,wBAAyB,SAAQ,oBAAoB;IAC1D,UAAU,CACd,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,eAAe,CAAC;CAa5B"}

package/out/ui-action/provider/loginout-ui-action-provider.js

@@ -0,0 +1,25 @@
+import { UIActionProviderBase } from './ui-action-provider-base';
+/**
+ * 系统登出界面行为适配器
+ *
+ * @author zk
+ * @date 2023-12-11 07:12:49
+ * @export
+ * @class LoginOutUIActionProvider
+ * @extends {UIActionProviderBase}
+ */
+export class LoginOutUIActionProvider extends UIActionProviderBase {
+    async execAction(_action, _params) {
+        const confirm = await ibiz.confirm.info({
+            title: '确认退出登录',
+            desc: '您确定要退出登录吗？退出后您将无法继续访问已登录状态的功能和信息，请确保您已保存所有未完成的操作。',
+        });
+        if (confirm) {
+            const bol = await ibiz.auth.logout();
+            if (bol) {
+                window.location.reload();
+            }
+        }
+        return {};
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.4.9",
+  "version": "0.4.11",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,8 +29,8 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.4.9",
-    "@ibiz/model-core": "^0.0.26",
+    "@ibiz-template/core": "^0.4.11",
+    "@ibiz/model-core": "^0.0.27",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.10",
     "@types/systemjs": "^6.13.5",
@@ -47,7 +47,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.4.0",
-    "@ibiz/model-core": "^0.0.26",
+    "@ibiz/model-core": "^0.0.27",
     "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": "aed61e1dc8d1cf0f56bbed55cfe70d6ea0f5cc58"
+  "gitHead": "b2512a91986d2e5fea22610a8148ab8f405ecb4e"
 }

package/src/controller/control/form/edit-form/edit-form.controller.ts

@@ -392,41 +392,57 @@ export class EditFormController
       throw new RuntimeError(`没找到${formItemUpdateId}表单项更新`);
     }
 
-    const { appDEMethodId, defiupdateDetails, customCode, scriptCode } =
-      formItemUpdate;
+    const {
+      appDEMethodId,
+      defiupdateDetails,
+      customCode,
+      scriptCode,
+      showBusyIndicator,
+    } = formItemUpdate;
     const updateItems = defiupdateDetails?.map(item => item.id!);
 
-    let updateData: IData; // 要修改的数据
-    if (customCode && scriptCode) {
-      // 脚本模式获取修改数据
-      updateData = ScriptFactory.execScriptFn(
-        {
-          ...this.getEventArgs(),
-          data: this.data,
-        },
-        scriptCode,
-        {
-          isAsync: false,
-        },
-      ) as IData;
-    } else {
-      // 后台服务获取修改数据
-      const params = { ...this.params, ...this.data.getOrigin() };
-      const res = await this.service.updateFormItem(
-        appDEMethodId!,
-        this.context,
-        params,
-      );
-      updateData = res.data;
-    }
+    try {
+      if (showBusyIndicator) {
+        this.startLoading();
+      }
+      let updateData: IData; // 要修改的数据
+      if (customCode && scriptCode) {
+        // 脚本模式获取修改数据
+        updateData = ScriptFactory.execScriptFn(
+          {
+            ...this.getEventArgs(),
+            data: this.data,
+          },
+          scriptCode,
+          {
+            isAsync: false,
+          },
+        ) as IData;
+      } else {
+        // 后台服务获取修改数据
+        const params = { ...this.params, ...this.data.getOrigin() };
+        const res = await this.service.updateFormItem(
+          appDEMethodId!,
+          this.context,
+          params,
+        );
+        updateData = res.data;
+      }
 
-    // 修改表单项更新的值
-    if (updateData && updateItems?.length) {
-      await Promise.all(
-        updateItems.map(itemName =>
-          this.setDataValue(itemName, updateData[itemName]),
-        ),
-      );
+      // 修改表单项更新的值
+      if (updateData && updateItems?.length) {
+        await Promise.all(
+          updateItems.map(itemName =>
+            this.setDataValue(itemName, updateData[itemName]),
+          ),
+        );
+      }
+
+      await awaitTimeout(2000);
+    } finally {
+      if (showBusyIndicator) {
+        this.endLoading();
+      }
     }
   }
 

package/src/controller/control/form/form-detail/form-druipart/form-druipart.controller.ts

@@ -53,7 +53,7 @@ export class FormDRUIPartController extends FormDetailController<IDEFormDRUIPart
   refreshItems: string[] = ['srfkey'];
 
   /**
-   * 参数项名称
+   * 参数项名称（这个模型暂不使用，相关场景可以通过配置导航参数实现）
    *
    * @author lxm
    * @date 2022-09-15 19:09:36

package/src/controller/control/form/form-detail/form-item/form-item.controller.ts

@@ -106,6 +106,21 @@ export class FormItemController
     return undefined;
   }
 
+  /**
+   * 标签标题
+   * @author lxm
+   * @date 2023-12-12 09:48:21
+   * @readonly
+   * @type {(string | undefined)}
+   */
+  get labelCaption(): string | undefined {
+    const { captionItemName } = this.model;
+    if (captionItemName) {
+      return this.data[captionItemName];
+    }
+    return this.model.caption;
+  }
+
   /**
    * Creates an instance of FormItemController.
    *