@ibiz-template/runtime 0.7.41-alpha.5 → 0.7.41-alpha.51

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":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAMlD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAG/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IAoBN,SAAS,CAAC,MAAM,EAAE,cAAc;IAnB5C;;;;;;;OAOG;IACH,SAAS,KAAK,UAAU,IAAI,OAAO,CAElC;IAED;;;;;;OAMG;gBACmB,MAAM,EAAE,cAAc;IAE5C;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAExD;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAQvD;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAK1D;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAKrD;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IAyC/D;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAY1D;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IAoDlE;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IA2B7D;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IA8BtE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IAuEtE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE;IAiBhE;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAItD;;;;;;OAMG;IACH,OAAO,IAAI,WAAW,EAAE;IAKxB;;;;;;;OAOG;IACH,YAAY,CAAC,MAAM,GAAE,OAAY,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO;IAgB9D;;;;;OAKG;IACH,KAAK,IAAI,IAAI;IAOb;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;IAgB/C;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,GAAG,YAAY,GAAG,IAAI;CAOjE"}
+{"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,EACL,iBAAiB,EACjB,WAAW,EACX,YAAY,EACb,MAAM,oBAAoB,CAAC;AAI5B;;;;;;;GAOG;AACH,qBAAa,OAAO;IAoBN,SAAS,CAAC,MAAM,EAAE,cAAc;IAnB5C;;;;;;;OAOG;IACH,SAAS,KAAK,UAAU,IAAI,OAAO,CAElC;IAED;;;;;;OAMG;gBACmB,MAAM,EAAE,cAAc;IAE5C;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAExD;;;;OAIG;IACI,aAAa,EAAE,iBAAiB,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAC3C;IAEtB;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAQvD;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAK1D;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAKrD;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IAyC/D;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAY1D;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IAwDlE;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IA2B7D;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IA8BtE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IAuEtE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE;IAiBhE;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAWtD;;;;;;OAMG;IACH,OAAO,IAAI,WAAW,EAAE;IAKxB;;;;;;;OAOG;IACH,YAAY,CAAC,MAAM,GAAE,OAAY,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO;IAgB9D;;;;;OAKG;IACH,KAAK,IAAI,IAAI;IAOb;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;IAgB/C;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,GAAG,YAAY,GAAG,IAAI;IAQhE;;;;;OAKG;IACH,aAAa,CAAC,UAAU,EAAE,KAAK,GAAG,OAAO,GAAG,IAAI;IAehD;;;;;OAKG;IACH,aAAa,CAAC,WAAW,GAAE,MAAM,GAAG,MAAM,GAAG,MAAe,GAAG,IAAI;CAapE"}

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

@@ -3,6 +3,7 @@ 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';
+import { ChangeTracker } from '../../../utils';
 /**
  * 实体缓存工具类
  *
@@ -41,6 +42,12 @@ export class DECache {
          * @type {Map<string, IDataEntity>}
          */
         this.cacheMap = new Map();
+        /**
+         * @description 变更记录器
+         * @type {IApiChangeTracker< Map<string, IDataEntity>>}
+         * @memberof DECache
+         */
+        this.changeTracker = new ChangeTracker();
     }
     /**
      * 强制设置数据，忽略其他逻辑
@@ -93,9 +100,9 @@ export class DECache {
         // 联合主键相关数据处理
         if (this.isUnionKey) {
             this.calcUnionKey(entity);
-            if (this.checkData(context, entity.srfkey)) {
+            if (this.checkData(context, entity.srfunionkey)) {
                 ibiz.log.error(new RuntimeError(ibiz.i18n.t('runtime.service.createPrimaryKeyData', {
-                    srfkey: entity.srfkey,
+                    srfkey: entity.srfunionkey,
                 })));
                 return null;
             }
@@ -157,23 +164,25 @@ export class DECache {
      */
     update(context, entity) {
         const oldKey = entity.srfkey;
-        // 联合主键相关数据处理
-        if (this.isUnionKey) {
-            this.calcUnionKey(entity);
-            // 只在临时数据的新建更新时，主键改变的时候，检测变更之后的主键是否已经存在
-            if (oldKey !== entity.srfkey && this.checkData(context, entity.srfkey)) {
-                ibiz.log.error(new RuntimeError(ibiz.i18n.t('runtime.service.updatePrimaryKeyData', {
-                    srfkey: entity.srfkey,
-                })));
-                return null;
-            }
-        }
         try {
             isExistSessionId('update', context);
             isExistSrfKey('update', entity);
-            entity.srftempdate = new Date().getTime();
             const data = this.cacheMap.get(oldKey);
             if (data) {
+                // 联合主键相关数据处理
+                if (this.isUnionKey) {
+                    const oldUnionKey = data.srfunionkey;
+                    this.calcUnionKey(entity);
+                    // 只在临时数据的新建更新时，主键改变的时候，检测变更之后的主键是否已经存在
+                    if (oldUnionKey !== entity.srfunionkey &&
+                        this.checkData(context, entity.srfunionkey)) {
+                        ibiz.log.error(new RuntimeError(ibiz.i18n.t('runtime.service.updatePrimaryKeyData', {
+                            srfkey: entity.srfunionkey,
+                        })));
+                        return null;
+                    }
+                }
+                entity.srftempdate = new Date().getTime();
                 const _data = clone(data);
                 _data.assign(entity);
                 // 提交回调
@@ -304,21 +313,22 @@ export class DECache {
                 const entity = entities[i];
                 isExistSrfKey('update', entity);
                 const oldKey = entity.srfkey;
-                // 联合主键相关数据处理
-                if (this.isUnionKey) {
-                    this.calcUnionKey(entity);
-                    // 主键改变的时候，检测变更之后的主键是否已经存在
-                    if (oldKey !== entity.srfkey &&
-                        this.checkData(context, entity.srfkey)) {
-                        ibiz.log.error(new RuntimeError(ibiz.i18n.t('runtime.service.updatePrimaryKeyData', {
-                            srfkey: entity.srfkey,
-                        })));
-                        continue;
-                    }
-                }
-                entity.srftempdate = new Date().getTime();
                 const data = this.cacheMap.get(entity.srfkey);
                 if (data) {
+                    // 联合主键相关数据处理
+                    if (this.isUnionKey) {
+                        const oldUnionKey = data.srfunionkey;
+                        this.calcUnionKey(entity);
+                        // 主键改变的时候，检测变更之后的主键是否已经存在
+                        if (oldUnionKey !== entity.srfunionkey &&
+                            this.checkData(context, entity.srfunionkey)) {
+                            ibiz.log.error(new RuntimeError(ibiz.i18n.t('runtime.service.updatePrimaryKeyData', {
+                                srfkey: entity.srfunionkey,
+                            })));
+                            continue;
+                        }
+                    }
+                    entity.srftempdate = new Date().getTime();
                     const _data = clone(data);
                     _data.assign(entity);
                     entities[i] = _data;
@@ -384,6 +394,13 @@ export class DECache {
      * @return {*}  {boolean}
      */
     checkData(_context, srfkey) {
+        if (this.isUnionKey) {
+            const items = this.getList();
+            const targetIndex = items.findIndex(item => {
+                return item.srfunionkey === srfkey;
+            });
+            return targetIndex !== -1;
+        }
         return !!this.cacheMap.get(srfkey);
     }
     /**
@@ -449,7 +466,7 @@ export class DECache {
             }
             return data[key];
         });
-        data.srfkey = unionValues.join('||');
+        data.srfunionkey = unionValues.join('||');
     }
     /**
      * 根据上下文，获取已经开启的事务
@@ -467,4 +484,43 @@ export class DECache {
         }
         return null;
     }
+    /**
+     * @description 记录变更
+     * @param {('ADD' | 'RESET' | 'UNDO' | 'REDO')} actionType 操作类型，添加数据 | 重置数据
+     * @returns {*}  {void}
+     * @memberof DECache
+     */
+    recordChanges(actionType) {
+        const trackMap = new Map();
+        if (this.cacheMap.size > 0) {
+            this.cacheMap.forEach((value, key) => {
+                trackMap.set(key, value.clone());
+            });
+        }
+        if (actionType === 'ADD') {
+            this.changeTracker.add(new Map(trackMap));
+        }
+        if (actionType === 'RESET') {
+            this.changeTracker.reset(new Map(trackMap));
+        }
+    }
+    /**
+     * @description 取消变更，'UNDO' | 'REDO'暂未支持
+     * @param {('INIT' | 'UNDO' | 'REDO')} [targetState='INIT'] 目标状态，初始化状态|撤销上一步操作|重做下一步操作
+     * @returns {*}  {void}
+     * @memberof DECache
+     */
+    cancelChanges(targetState = 'INIT') {
+        if (targetState !== 'INIT') {
+            return;
+        }
+        // 后续需支持undo和redo后再行调整
+        const initSate = this.changeTracker.getState();
+        if (initSate) {
+            this.clear();
+            initSate.forEach((value, key) => {
+                this.cacheMap.set(key, value.clone());
+            });
+        }
+    }
 }

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

@@ -81,6 +81,20 @@ export declare class DynamicCodeListCache {
      * @type {boolean}
      */
     protected isOperatorType: boolean;
+    /**
+     * @description 是否全局缓存，通过定义自定义参数（格式如：globalCache=true）启用全局缓存，若启用全局缓存，则缓存全局唯一，缓存key为代码表代码标识
+     * @protected
+     * @type {boolean}
+     * @memberof DynamicCodeListCache
+     */
+    protected isGlobalCache: boolean;
+    /**
+     * @description 前端缓存key，通过定义自定义参数（格式如：localCacheTag=${context.product}@${params.sort}）设置前端缓存key，若启用前端缓存key，则缓存key以前端缓存key为准
+     * @protected
+     * @type {(string | undefined)}
+     * @memberof DynamicCodeListCache
+     */
+    protected localCacheTag: string | undefined;
     /**
      * 应用上下文
      *
@@ -172,6 +186,14 @@ export declare class DynamicCodeListCache {
      * @return {codeListItem[] | undefined}
      */
     protected prepareTreeData(items: IData[]): CodeListItem[] | undefined;
+    /**
+     * @description 获取代码表缓存key
+     * @param {IContext} context
+     * @param {IParams} [params={}]
+     * @returns {*}  {string}
+     * @memberof DynamicCodeListCache
+     */
+    getCacheKey(context: IContext, params?: IParams): string;
     /**
      * 获取动态的代码项
      *

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":"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"}
+{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"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"}

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

@@ -1,10 +1,11 @@
-import { IBizContext, ModelError, RuntimeModelError, } from '@ibiz-template/core';
+import { IBizContext, ModelError, RuntimeModelError, StringUtil, } from '@ibiz-template/core';
 import { clone, isNil } from 'ramda';
 import { QXEvent, notNilEmpty } from 'qx-util';
 import { convertNavData, ScriptFactory } from '../../../utils';
 import { fieldValueToBoolean } from '../../utils';
 import { calcDeCodeNameById } from '../../../model';
 import { CodeListDataItem } from '../../vo';
+import { getTempContext } from '../util/util';
 /**
  * 动态代码表缓存对象
  *
@@ -41,6 +42,13 @@ export class DynamicCodeListCache {
          * @type {boolean}
          */
         this.isOperatorType = false;
+        /**
+         * @description 是否全局缓存，通过定义自定义参数（格式如：globalCache=true）启用全局缓存，若启用全局缓存，则缓存全局唯一，缓存key为代码表代码标识
+         * @protected
+         * @type {boolean}
+         * @memberof DynamicCodeListCache
+         */
+        this.isGlobalCache = false;
         /**
          * 应用上下文
          *
@@ -111,8 +119,18 @@ export class DynamicCodeListCache {
      */
     async init() {
         const fn = async () => {
+            const { predefinedType, userParam } = this.codeList;
+            // 启用全局缓存
+            if (userParam &&
+                userParam.globalCache &&
+                userParam.globalCache === 'true') {
+                this.isGlobalCache = true;
+            }
+            // 前端缓存key
+            if (userParam && userParam.localCacheTag) {
+                this.localCacheTag = userParam.localCacheTag;
+            }
             // 预定义类型处理
-            const { predefinedType } = this.codeList;
             if (predefinedType) {
                 this.isPredefined = true;
                 this.isOperatorType = predefinedType === 'OPERATOR';
@@ -361,6 +379,22 @@ export class DynamicCodeListCache {
         });
         return nestedList;
     }
+    /**
+     * @description 获取代码表缓存key
+     * @param {IContext} context
+     * @param {IParams} [params={}]
+     * @returns {*}  {string}
+     * @memberof DynamicCodeListCache
+     */
+    getCacheKey(context, params = {}) {
+        let key = this.isOperatorType || this.isGlobalCache
+            ? this.codeList.codeListTag
+            : `${this.codeList.codeListTag}@${JSON.stringify(getTempContext(context))}@${JSON.stringify(params)}`;
+        if (this.localCacheTag) {
+            key = StringUtil.fill(`${this.codeList.codeListTag}@${this.localCacheTag}`, context, params);
+        }
+        return key;
+    }
     /**
      * 获取动态的代码项
      *
@@ -380,11 +414,13 @@ export class DynamicCodeListCache {
             return this.load(context, params);
         }
         // 需要缓存的先找，在判断是否过期，是否正在加载等情况
-        const key = this.isOperatorType
-            ? this.codeList.codeListTag
-            : JSON.stringify(context) + JSON.stringify(params);
+        const key = this.getCacheKey(context, params);
         if (this.cache.has(key)) {
             const cacheData = this.cache.get(key);
+            // 开启全局缓存则全局唯一
+            if (this.isGlobalCache) {
+                return cacheData.promise ? cacheData.promise : cacheData.items;
+            }
             // 没过期的返回cacheData的promise或items
             if (cacheData.expirationTime > new Date().getTime()) {
                 return cacheData.promise ? cacheData.promise : cacheData.items;
@@ -438,7 +474,7 @@ export class DynamicCodeListCache {
      */
     async refresh() {
         // 删除缓存数据
-        const key = JSON.stringify(this.context) + JSON.stringify(this.params);
+        const key = this.getCacheKey(this.context, this.params);
         this.cache.delete(key);
         // 重新加载数据
         const result = await this.get(this.context, this.params);
@@ -454,7 +490,7 @@ export class DynamicCodeListCache {
      */
     onChange(fn, immediate = true) {
         this.evt.on('change', fn);
-        const key = JSON.stringify(this.context) + JSON.stringify(this.params);
+        const key = this.getCacheKey(this.context, this.params);
         const cacheData = this.cache.get(key);
         if (immediate && notNilEmpty(cacheData)) {
             fn(cacheData.items);

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

@@ -33,4 +33,11 @@ export declare function convertArrayToListMap(arr: IData[]): IData;
  * @return {*} IData[]
  */
 export declare function convertListMapToArray(obj: IData): IData[];
+/**
+ * @description 获取没有预置字段的上下文
+ * @export
+ * @param {IContext} context
+ * @returns {*}  {IData}
+ */
+export declare function getTempContext(context: IContext): IData;
 //# sourceMappingURL=util.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/util/util.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAsB3D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG;IAC1D,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB,CAaA;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,KAAK,CAOzD;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK,EAAE,CAQzD"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/util/util.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAsB3D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG;IAC1D,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB,CAaA;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,KAAK,CAOzD;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK,EAAE,CAQzD;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,QAAQ,GAAG,KAAK,CAmBvD"}

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

@@ -82,3 +82,29 @@ export function convertListMapToArray(obj) {
     });
     return result;
 }
+/**
+ * @description 获取没有预置字段的上下文
+ * @export
+ * @param {IContext} context
+ * @returns {*}  {IData}
+ */
+export function getTempContext(context) {
+    const result = {};
+    // 预置上下文字段
+    const presetContext = [
+        'srfappid',
+        'srfsimple',
+        'srfviewid',
+        'srfrunmode',
+        'srfreadonly',
+        'srfnavctrlid',
+        'srfsessionid',
+        'srfnavlogicid',
+    ];
+    Object.keys(context).forEach(key => {
+        if (!presetContext.includes(key)) {
+            result[key] = context[key];
+        }
+    });
+    return result;
+}

package/out/service/vo/calendar-item-data/calendar-item-data.d.ts

@@ -14,9 +14,13 @@ export declare class CalendarItemData implements ICalendarItemData {
     get deData(): IData;
     get navId(): string;
     get itemType(): string;
+    private _bkColor?;
     get bkColor(): string;
+    set bkColor(_val: string);
     get beginTime(): string;
+    private _color?;
     get color(): string;
+    set color(_val: string);
     get content(): string;
     get endTime(): string;
     get icon(): string;
@@ -26,5 +30,6 @@ export declare class CalendarItemData implements ICalendarItemData {
     get tag(): string;
     get text(): string;
     get tips(): string;
+    get srfkey(): string;
 }
 //# sourceMappingURL=calendar-item-data.d.ts.map

package/out/service/vo/calendar-item-data/calendar-item-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calendar-item-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/calendar-item-data/calendar-item-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD;;;;;;GAMG;AACH,qBAAa,gBAAiB,YAAW,iBAAiB;IAEtD,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,IAAI;gBADJ,KAAK,EAAE,gBAAgB,EACvB,IAAI,EAAE,KAAK;IAGrB,IAAI,MAAM,IAAI,KAAK,CAElB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,OAAO,IAAI,MAAM,CAKpB;IAED,IAAI,SAAS,IAAI,MAAM,CAGtB;IAED,IAAI,KAAK,IAAI,MAAM,CAKlB;IAED,IAAI,OAAO,IAAI,MAAM,CAGpB;IAED,IAAI,OAAO,IAAI,MAAM,CAGpB;IAED,IAAI,IAAI,IAAI,MAAM,CAGjB;IAED,IAAI,EAAE,IAAI,MAAM,CAKf;IAED,IAAI,KAAK,IAAI,MAAM,CAGlB;IAED,IAAI,IAAI,IAAI,MAAM,CAGjB;IAED,IAAI,GAAG,IAAI,MAAM,CAGhB;IAED,IAAI,IAAI,IAAI,MAAM,CAGjB;IAED,IAAI,IAAI,IAAI,MAAM,CAGjB;CACF"}
+{"version":3,"file":"calendar-item-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/calendar-item-data/calendar-item-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD;;;;;;GAMG;AACH,qBAAa,gBAAiB,YAAW,iBAAiB;IAEtD,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,IAAI;gBADJ,KAAK,EAAE,gBAAgB,EACvB,IAAI,EAAE,KAAK;IAGrB,IAAI,MAAM,IAAI,KAAK,CAElB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,OAAO,CAAC,QAAQ,CAAC,CAAS;IAE1B,IAAI,OAAO,IAAI,MAAM,CAQpB;IAED,IAAI,OAAO,CAAC,IAAI,EAAE,MAAM,EAEvB;IAED,IAAI,SAAS,IAAI,MAAM,CAGtB;IAED,OAAO,CAAC,MAAM,CAAC,CAAS;IAExB,IAAI,KAAK,IAAI,MAAM,CAQlB;IAED,IAAI,KAAK,CAAC,IAAI,EAAE,MAAM,EAErB;IAED,IAAI,OAAO,IAAI,MAAM,CAGpB;IAED,IAAI,OAAO,IAAI,MAAM,CAGpB;IAED,IAAI,IAAI,IAAI,MAAM,CAGjB;IAED,IAAI,EAAE,IAAI,MAAM,CAKf;IAED,IAAI,KAAK,IAAI,MAAM,CAGlB;IAED,IAAI,IAAI,IAAI,MAAM,CAGjB;IAED,IAAI,GAAG,IAAI,MAAM,CAGhB;IAED,IAAI,IAAI,IAAI,MAAM,CAGjB;IAED,IAAI,IAAI,IAAI,MAAM,CAGjB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;CACF"}

package/out/service/vo/calendar-item-data/calendar-item-data.js

@@ -21,9 +21,13 @@ export class CalendarItemData {
     }
     get bkColor() {
         const fieldName = this.model.bkcolorAppDEFieldId;
-        return fieldName && this.data[fieldName]
-            ? this.data[fieldName]
-            : this.model.bkcolor;
+        return (this._bkColor ||
+            (fieldName && this.data[fieldName]
+                ? this.data[fieldName]
+                : this.model.bkcolor));
+    }
+    set bkColor(_val) {
+        this._bkColor = _val;
     }
     get beginTime() {
         const fieldName = this.model.beginTimeAppDEFieldId;
@@ -31,9 +35,13 @@ export class CalendarItemData {
     }
     get color() {
         const fieldName = this.model.colorAppDEFieldId;
-        return fieldName && this.data[fieldName]
-            ? this.data[fieldName]
-            : this.model.color;
+        return (this._color ||
+            (fieldName && this.data[fieldName]
+                ? this.data[fieldName]
+                : this.model.color));
+    }
+    set color(_val) {
+        this._color = _val;
     }
     get content() {
         const fieldName = this.model.contentAppDEFieldId;
@@ -73,4 +81,7 @@ export class CalendarItemData {
         const fieldName = this.model.tipsAppDEFieldId;
         return fieldName ? this.data[fieldName] : undefined;
     }
+    get srfkey() {
+        return this.data.srfkey;
+    }
 }

package/out/service/vo/chart-data/chart-data.d.ts

@@ -1,6 +1,8 @@
 import { IDEChartSeries } from '@ibiz/model-core';
 import { IChartData } from '../../../interface';
 export declare class ChartData implements IChartData {
+    private deData;
+    private seriesModel?;
     [key: string | symbol]: any;
     _seriesModelId?: string;
     _catalog?: string;
@@ -8,6 +10,12 @@ export declare class ChartData implements IChartData {
     _uuid?: string;
     _chartid?: string;
     _catalogLevelData?: IData[];
-    constructor(deData: IData, seriesModel?: IDEChartSeries, catalog?: string, groupName?: string, chartId?: string, catalogLevelData?: IData[]);
+    constructor(deData: IData, seriesModel?: IDEChartSeries | undefined, catalog?: string, groupName?: string, chartId?: string, catalogLevelData?: IData[]);
+    /**
+     * @description 预定义导航参数
+     * @returns {*}  {IData}
+     * @memberof ChartData
+     */
+    get navParams(): IData;
 }
 //# sourceMappingURL=chart-data.d.ts.map

package/out/service/vo/chart-data/chart-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chart-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/chart-data/chart-data.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAgBhD,qBAAa,SAAU,YAAW,UAAU;IAE1C,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,iBAAiB,CAAC,EAAE,KAAK,EAAE,CAAC;gBAG1B,MAAM,EAAE,KAAK,EACb,WAAW,CAAC,EAAE,cAAc,EAC5B,OAAO,CAAC,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,EAChB,gBAAgB,CAAC,EAAE,KAAK,EAAE;CA2C7B"}
+{"version":3,"file":"chart-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/chart-data/chart-data.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAiBhD,qBAAa,SAAU,YAAW,UAAU;IAiBxC,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,WAAW,CAAC;IAhBtB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,iBAAiB,CAAC,EAAE,KAAK,EAAE,CAAC;gBAGlB,MAAM,EAAE,KAAK,EACb,WAAW,CAAC,4BAAgB,EACpC,OAAO,CAAC,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,EAChB,gBAAgB,CAAC,EAAE,KAAK,EAAE;IA4C5B;;;;OAIG;IACH,IAAI,SAAS,IAAI,KAAK,CAgCrB;CACF"}

package/out/service/vo/chart-data/chart-data.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-constructor-return */
 import { createUUID } from 'qx-util';
+import { calcDateRangeByScale } from '../../../utils';
 // 更新属性，缺的补充定义
 function updateKeyDefine(target, keys) {
     keys.forEach(key => {
@@ -15,6 +16,8 @@ function updateKeyDefine(target, keys) {
 }
 export class ChartData {
     constructor(deData, seriesModel, catalog, groupName, chartId, catalogLevelData) {
+        this.deData = deData;
+        this.seriesModel = seriesModel;
         this._seriesModelId = seriesModel === null || seriesModel === void 0 ? void 0 : seriesModel.id;
         this._catalog = catalog;
         this._groupName = groupName;
@@ -49,4 +52,35 @@ export class ChartData {
             },
         });
     }
+    /**
+     * @description 预定义导航参数
+     * @returns {*}  {IData}
+     * @memberof ChartData
+     */
+    get navParams() {
+        const params = { srfcategory: this._catalog };
+        if (!this.seriesModel)
+            return params;
+        const { groupMode, seriesField, catalogField, seriesCodeListId, catalogCodeListId, } = this.seriesModel;
+        // catalogField.toLowerCase()_value 和 seriesField.toLowerCase()_value 为分类属性和名称属性的原始值
+        if (catalogField && catalogCodeListId)
+            Object.assign(params, {
+                srfcategoryvalue: this.deData[`${catalogField.toLowerCase()}_value`],
+            });
+        if (seriesField)
+            Object.assign(params, { srfgroup: this._groupName });
+        if (seriesField && seriesCodeListId)
+            Object.assign(params, {
+                srfgroupvalue: this.deData[`${seriesField.toLowerCase()}_value`],
+            });
+        if (groupMode && groupMode !== 'CODELIST') {
+            const dateRange = calcDateRangeByScale(this._catalog, groupMode.toLowerCase());
+            if (dateRange)
+                Object.assign(params, {
+                    srfstarttime: dateRange.start,
+                    srfendtime: dateRange.end,
+                });
+        }
+        return params;
+    }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"code-list-data-item.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/code-list-data-item/code-list-data-item.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAKlD,qBAAa,gBAAiB,YAAW,YAAY;IACnD,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,EAAG,MAAM,GAAG,MAAM,CAAC;IAExB,IAAI,EAAG,MAAM,CAAC;IAEd,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAE1B,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;;;OAIG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;;;OASG;gBAED,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,KAAK,EACX,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf;CAkNJ"}
+{"version":3,"file":"code-list-data-item.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/code-list-data-item/code-list-data-item.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAKlD,qBAAa,gBAAiB,YAAW,YAAY;IACnD,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,EAAG,MAAM,GAAG,MAAM,CAAC;IAExB,IAAI,EAAG,MAAM,CAAC;IAEd,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAE1B,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;;;OAIG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;;;OASG;gBAED,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,KAAK,EACX,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf;CA0NJ"}

package/out/service/vo/code-list-data-item/code-list-data-item.js

@@ -118,7 +118,9 @@ export class CodeListDataItem {
         // 数据属性
         if (dataAppDEFieldId && this.$origin[dataAppDEFieldId]) {
             try {
-                this.data = ScriptFactory.execSingleLine(dataAppDEFieldId, this.$origin);
+                this.data = ScriptFactory.execSingleLine(dataAppDEFieldId, this.$origin instanceof AppDataEntity
+                    ? clone(this.$origin._data)
+                    : clone(this.$origin));
             }
             catch (error) {
                 ibiz.log.error(ibiz.i18n.t('runtime.service.dynamicCodeTable'));
@@ -170,6 +172,11 @@ export class CodeListDataItem {
             enumerable: true,
             configurable: true,
         });
+        // 其它未处理字段
+        this.children = undefined;
+        this.cls = undefined;
+        this.tooltip = undefined;
+        this.userData = undefined;
         // 关联其它属性，用于使用实体属性也要取到值的场景。
         Object.keys(data instanceof AppDataEntity ? clone(data._data) : clone(data)).forEach(key => {
             if (!Object.prototype.hasOwnProperty.call(this, key))

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

@@ -92,6 +92,13 @@ export declare class ControlVO {
      * @type {string}
      */
     srfmajorfield: string;
+    /**
+     * @description 数据的状态（新建与否）
+     * @protected
+     * @type {(Srfuf | undefined)}
+     * @memberof ControlVO
+     */
+    protected $srfuf: Srfuf | undefined;
     /**
      * Creates an instance of ControlVO.
      * @author lxm

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

@@ -1 +1 @@
-{"version":3,"file":"control.vo.d.ts","sourceRoot":"","sources":["../../../src/service/vo/control.vo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAc5C;;;;;;;GAOG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;;OAOG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;OAOG;IACK,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE5C;;;;;;OAMG;IACK,KAAK,EAAE,KAAK,CAAC;IAErB;;;;;;OAMG;IACK,MAAM,CAAC,EAAE,MAAM,CAAC;IAExB;;;;;;OAMG;IACK,UAAU,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACK,YAAY,CAAC,EAAE,MAAM,CAAC;IAE9B;;;;;;OAMG;IACK,OAAO,EAAE,MAAM,CAAC;IAExB;;;;;;OAMG;IACK,aAAa,EAAE,MAAM,CAAC;IAE9B;;;;;;OAMG;IACK,WAAW,EAAE,MAAM,CAAC;IAE5B;;;;;;OAMG;IACK,aAAa,EAAE,MAAM,CAAC;IAE9B;;;;;;OAMG;gBAED,OAAO,GAAE,KAAU,EACnB,UAAU,GAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAa;IAqIjD;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,YAAY;IA8CpB;;;;;;OAMG;IACH,SAAS,IAAI,KAAK;IAIlB;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAIxC;;;;;;OAMG;IACH,KAAK,IAAI,SAAS;CAQnB"}
+{"version":3,"file":"control.vo.d.ts","sourceRoot":"","sources":["../../../src/service/vo/control.vo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAc5C;;;;;;;GAOG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;;OAOG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;OAOG;IACK,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE5C;;;;;;OAMG;IACK,KAAK,EAAE,KAAK,CAAC;IAErB;;;;;;OAMG;IACK,MAAM,CAAC,EAAE,MAAM,CAAC;IAExB;;;;;;OAMG;IACK,UAAU,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACK,YAAY,CAAC,EAAE,MAAM,CAAC;IAE9B;;;;;;OAMG;IACK,OAAO,EAAE,MAAM,CAAC;IAExB;;;;;;OAMG;IACK,aAAa,EAAE,MAAM,CAAC;IAE9B;;;;;;OAMG;IACK,WAAW,EAAE,MAAM,CAAC;IAE5B;;;;;;OAMG;IACK,aAAa,EAAE,MAAM,CAAC;IAE9B;;;;;OAKG;IACH,SAAS,CAAC,MAAM,EAAE,KAAK,GAAG,SAAS,CAAC;IAEpC;;;;;;OAMG;gBAED,OAAO,GAAE,KAAU,EACnB,UAAU,GAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAa;IA2IjD;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,YAAY;IA8CpB;;;;;;OAMG;IACH,SAAS,IAAI,KAAK;IAIlB;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAIxC;;;;;;OAMG;IACH,KAAK,IAAI,SAAS;CASnB"}

package/out/service/vo/control.vo.js

@@ -110,13 +110,20 @@ export class ControlVO {
                 value: isNil(this.srfkey) ? createUUID() : this.srfkey,
             });
         }
-        // srfuf纯计算属性，不可修改
+        // 设置数据状态（新建与否）
+        if (Object.prototype.hasOwnProperty.call(this.$origin, 'srfuf')) {
+            this.$srfuf = this.$origin.srfuf;
+        }
+        else {
+            this.$srfuf =
+                this.srfkey === this.tempsrfkey ? Srfuf.UPDATE : Srfuf.CREATE;
+        }
         Object.defineProperty(this, 'srfuf', {
             get() {
-                if (Object.prototype.hasOwnProperty.call(this.$origin, 'srfuf')) {
-                    return this.$origin.srfuf;
-                }
-                return this.srfkey === this.tempsrfkey ? Srfuf.UPDATE : Srfuf.CREATE;
+                return this.$srfuf;
+            },
+            set(val) {
+                this.$srfuf = val;
             },
             enumerable: false,
             configurable: true,
@@ -233,7 +240,8 @@ export class ControlVO {
      */
     clone() {
         const cloneOrigin = clone(this.$origin);
-        const newVal = new ControlVO(cloneOrigin, this.$dataUIMap);
+        const newVal = new ControlVO(cloneOrigin, new Map([...this.$dataUIMap]));
+        newVal.srfuf = this.srfuf;
         Object.keys(this).forEach(key => {
             newVal[key] = this[key];
         });

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

@@ -0,0 +1,19 @@
+import { IGanttNodeLinkData, IGanttNodeData } from '../../../interface';
+export declare class GanttNodeLinkData implements IGanttNodeLinkData {
+    _uuid: string;
+    _from: string;
+    _to: string;
+    _fromValue: string;
+    _toValue: string;
+    _deData: IData;
+    _fromData: IGanttNodeData;
+    _toData: IGanttNodeData;
+    constructor(opts: {
+        fromDataItemName: string;
+        toDataItemName: string;
+        fromData: IGanttNodeData;
+        toData: IGanttNodeData;
+        data: IData;
+    });
+}
+//# sourceMappingURL=gantt-node-link-data.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"gantt-node-link-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-node-link-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAExE,qBAAa,iBAAkB,YAAW,kBAAkB;IAC1D,KAAK,EAAE,MAAM,CAAgB;IAErB,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAE,MAAM,CAAC;IAEZ,UAAU,EAAE,MAAM,CAAC;IAEnB,QAAQ,EAAE,MAAM,CAAC;IAEjB,OAAO,EAAE,KAAK,CAAC;IAEf,SAAS,EAAE,cAAc,CAAC;IAE1B,OAAO,EAAE,cAAc,CAAC;gBAEpB,IAAI,EAAE;QAChB,gBAAgB,EAAE,MAAM,CAAC;QACzB,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,EAAE,cAAc,CAAC;QACzB,MAAM,EAAE,cAAc,CAAC;QACvB,IAAI,EAAE,KAAK,CAAC;KACb;CA6CF"}