@ibiz-template/runtime 0.7.41-alpha.10 → 0.7.41-alpha.100

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/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/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"}

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

@@ -0,0 +1,46 @@
+import { createUUID } from 'qx-util';
+export class GanttNodeLinkData {
+    constructor(opts) {
+        this._uuid = createUUID();
+        const { data, fromData, toData, fromDataItemName, toDataItemName } = opts;
+        this._deData = data;
+        this._fromData = fromData;
+        this._toData = toData;
+        Object.defineProperty(this, '_from', {
+            get() {
+                return this._fromData._id;
+            },
+            enumerable: true,
+            configurable: true,
+        });
+        Object.defineProperty(this, '_to', {
+            get() {
+                return this._toData._id;
+            },
+            enumerable: true,
+            configurable: true,
+        });
+        // fromValue值
+        Object.defineProperty(this, '_fromValue', {
+            get() {
+                return this._deData[fromDataItemName];
+            },
+            set(v) {
+                this._deData[fromDataItemName] = v;
+            },
+            enumerable: true,
+            configurable: true,
+        });
+        // toValue值
+        Object.defineProperty(this, '_toValue', {
+            get() {
+                return this._deData[toDataItemName];
+            },
+            set(v) {
+                this._deData[toDataItemName] = v;
+            },
+            enumerable: true,
+            configurable: true,
+        });
+    }
+}

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

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

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

@@ -1 +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"}
+{"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;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC"}

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

@@ -1,3 +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';
+export { GanttNodeLinkData } from './gantt-node-link-data';

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

@@ -13,6 +13,11 @@ export declare class MapData implements IMapData {
     _value?: number;
     _text?: string;
     _symbol?: string;
+    _bgcolor?: string;
+    _color?: string;
+    _borderColor?: string;
+    _borderWidth?: number;
+    _className?: string;
     constructor(deData: IData, mapItem: ISysMapItem);
 }
 //# sourceMappingURL=map-data.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"map-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/map-data/map-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAkB9C,qBAAa,OAAQ,YAAW,QAAQ;IAEtC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,GAAG,EAAE,MAAM,CAAC;IAEZ,UAAU,EAAE,MAAM,CAAC;IAEnB,UAAU,EAAE,MAAM,CAAC;IAEnB,OAAO,EAAE,KAAK,CAAC;IAEf,UAAU,CAAC,EAAE,MAAM,CAAa;IAEhC,SAAS,CAAC,EAAE,MAAM,CAAa;IAE/B,SAAS,CAAC,EAAE,MAAM,CAAa;IAE/B,QAAQ,CAAC,EAAE,MAAM,CAAa;IAE9B,MAAM,CAAC,EAAE,MAAM,CAAa;IAE5B,KAAK,CAAC,EAAE,MAAM,CAAa;IAE3B,OAAO,CAAC,EAAE,MAAM,CAAa;gBAEjB,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW;CAuHhD"}
+{"version":3,"file":"map-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/map-data/map-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAkB9C,qBAAa,OAAQ,YAAW,QAAQ;IAEtC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,GAAG,EAAE,MAAM,CAAC;IAEZ,UAAU,EAAE,MAAM,CAAC;IAEnB,UAAU,EAAE,MAAM,CAAC;IAEnB,OAAO,EAAE,KAAK,CAAC;IAEf,UAAU,CAAC,EAAE,MAAM,CAAa;IAEhC,SAAS,CAAC,EAAE,MAAM,CAAa;IAE/B,SAAS,CAAC,EAAE,MAAM,CAAa;IAE/B,QAAQ,CAAC,EAAE,MAAM,CAAa;IAE9B,MAAM,CAAC,EAAE,MAAM,CAAa;IAE5B,KAAK,CAAC,EAAE,MAAM,CAAa;IAE3B,OAAO,CAAC,EAAE,MAAM,CAAa;IAE7B,QAAQ,CAAC,EAAE,MAAM,CAAa;IAE9B,MAAM,CAAC,EAAE,MAAM,CAAa;IAE5B,YAAY,CAAC,EAAE,MAAM,CAAa;IAElC,YAAY,CAAC,EAAE,MAAM,CAAa;IAElC,UAAU,CAAC,EAAE,MAAM,CAAa;gBAEpB,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW;CA2IhD"}

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

@@ -21,7 +21,12 @@ export class MapData {
         this._value = undefined;
         this._text = undefined;
         this._symbol = undefined;
-        const { id, itemStyle, longitudeAppDEFieldId, latitudeAppDEFieldId, textAppDEFieldId, dataAppDEFieldId, data2AppDEFieldId, tipsAppDEFieldId, sysImage, altitudeAppDEFieldId, bkcolorAppDEFieldId, clsAppDEFieldId, colorAppDEFieldId, contentAppDEFieldId, iconAppDEFieldId, idAppDEFieldId, tagAppDEFieldId, tag2AppDEFieldId, } = mapItem;
+        this._bgcolor = undefined;
+        this._color = undefined;
+        this._borderColor = undefined;
+        this._borderWidth = undefined;
+        this._className = undefined;
+        const { id, itemStyle, sysCss, longitudeAppDEFieldId, latitudeAppDEFieldId, textAppDEFieldId, dataAppDEFieldId, data2AppDEFieldId, tipsAppDEFieldId, sysImage, altitudeAppDEFieldId, bkcolor, bkcolorAppDEFieldId, clsAppDEFieldId, color, colorAppDEFieldId, borderColor, borderWidth, contentAppDEFieldId, iconAppDEFieldId, idAppDEFieldId, tagAppDEFieldId, tag2AppDEFieldId, } = mapItem;
         const keyMap = new Map();
         this._id = id + deData.srfkey;
         this._deData = deData;
@@ -30,6 +35,21 @@ export class MapData {
         if (sysImage) {
             this._symbol = sysImage.rawContent || sysImage.imagePath;
         }
+        if (sysCss) {
+            this._className = sysCss.cssName;
+        }
+        if (bkcolor) {
+            this._bgcolor = bkcolor;
+        }
+        if (color) {
+            this._color = color;
+        }
+        if (borderColor) {
+            this._borderColor = borderColor;
+        }
+        if (borderWidth) {
+            this._borderWidth = borderWidth;
+        }
         if (AreaItemStyles.includes(this._itemStyle)) {
             if (longitudeAppDEFieldId) {
                 keyMap.set('_areaCode', longitudeAppDEFieldId);

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

@@ -13,12 +13,19 @@ export declare class TreeCodeListNodeData extends TreeNodeData implements ITreeN
     _text: string;
     _id: string;
     _value: string;
+    _deData: IData;
     constructor(model: IDETreeDataSetNode, parentNodeData: ITreeNodeData | undefined, opts: {
         data: CodeListItem;
         leaf: boolean;
         defaultExpand: boolean;
+        context?: IContext;
+        params?: IParams;
         navContext?: IParams;
         navParams?: IParams;
     });
+    /**
+     * 获取原始数据
+     */
+    getOrigin(): IData;
 }
 //# sourceMappingURL=tree-code-list-node-data.d.ts.map

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,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAG,MAAM,CAAC;IAEb,MAAM,EAAE,MAAM,CAAC;gBAGb,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY,CAAC;QACnB,IAAI,EAAE,OAAO,CAAC;QACd,aAAa,EAAE,OAAO,CAAC;QACvB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;CA8BJ"}
+{"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":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAGtD,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,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAG,MAAM,CAAC;IAEb,MAAM,EAAE,MAAM,CAAC;IAEP,OAAO,EAAE,KAAK,CAAC;gBAGrB,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY,CAAC;QACnB,IAAI,EAAE,OAAO,CAAC;QACd,aAAa,EAAE,OAAO,CAAC;QACvB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IAkEH;;OAEG;IACH,SAAS,IAAI,KAAK;CAGnB"}

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

@@ -1,3 +1,5 @@
+import { isNil } from 'ramda';
+import { updateKeyDefine } from '@ibiz-template/core';
 import { calcDeCodeNameById } from '../../../model';
 import { TreeNodeData } from './tree-node-data';
 /**
@@ -12,6 +14,7 @@ export class TreeCodeListNodeData extends TreeNodeData {
     constructor(model, parentNodeData, opts) {
         super(model, parentNodeData, opts);
         const { data } = opts;
+        this._deData = data;
         this._text = data.text;
         this._value = data.value;
         // id小写
@@ -32,6 +35,46 @@ export class TreeCodeListNodeData extends TreeNodeData {
         }
         this.srfkey = this._value;
         this.srfmajortext = this._text;
-        this._icon = this.calcIcon(model);
+        this._icon = this.calcIcon(model, data.sysImage);
+        const getDeKey = (key) => {
+            // deData属性上可枚举的属性，返回该属性名称
+            if (Object.prototype.hasOwnProperty.call(this._deData, key)) {
+                return key;
+            }
+        };
+        return new Proxy(this, {
+            get(target, p, _receiver) {
+                const deKey = getDeKey(p);
+                if (!isNil(deKey)) {
+                    return target._deData[deKey];
+                }
+                return target[p];
+            },
+            // 修改操作
+            set(target, p, value, _receiver) {
+                const deKey = getDeKey(p);
+                if (!isNil(deKey)) {
+                    target._deData[deKey] = value;
+                }
+                else {
+                    target[p] = value;
+                }
+                return true;
+            },
+            ownKeys(target) {
+                // 整合所有并排除重复
+                const allKeys = [
+                    ...new Set([...Object.keys(target), ...Object.keys(target._deData)]),
+                ];
+                updateKeyDefine(target, allKeys);
+                return allKeys;
+            },
+        });
+    }
+    /**
+     * 获取原始数据
+     */
+    getOrigin() {
+        return this._deData;
     }
 }

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

@@ -25,9 +25,16 @@ export declare class TreeDataSetNodeData extends TreeNodeData implements ITreeNo
         data: IData;
         leaf: boolean;
         defaultExpand: boolean;
+        context?: IContext;
+        params?: IParams;
         navContext?: IParams;
         navParams?: IParams;
     });
+    /**
+     * 初始化异步数据
+     * @param model 节点模型
+     */
+    initAsyncData(model: IDETreeDataSetNode): Promise<void>;
     /**
      * 初始化节点图标
      * @author ljx
@@ -65,5 +72,9 @@ export declare class TreeDataSetNodeData extends TreeNodeData implements ITreeNo
      * @return {*}  {(string | undefined)}
      */
     protected calcTextHtml(model: IDETreeDataSetNode): Promise<string | undefined>;
+    /**
+     * 获取原始数据
+     */
+    getOrigin(): IData;
 }
 //# sourceMappingURL=tree-data-set-node-data.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tree-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-data-set-node-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAG3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAahD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IACpE,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAE,MAAM,CAAC;IAEZ,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,KAAK,CAAC;IAEf,UAAU,EAAE,KAAK,CAAC;IAE1B;;;;OAIG;IACK,KAAK,EAAE,MAAM,mBAAmB,CAAC;gBAGvC,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;QACd,aAAa,EAAE,OAAO,CAAC;QACvB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IAmNH;;;;;;;OAOG;cACa,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;IAWvE;;;;;;;OAOG;cACa,YAAY,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;IAI3E,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,GAAG,SAAS;IAmBhE;;;;;;;OAOG;cACa,kBAAkB,CAChC,QAAQ,EAAE,mBAAmB,GAC5B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAY9B;;;;;;;OAOG;cACa,YAAY,CAC1B,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAS/B"}
+{"version":3,"file":"tree-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-data-set-node-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAG3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAahD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IACpE,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAE,MAAM,CAAC;IAEZ,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,KAAK,CAAC;IAEf,UAAU,EAAE,KAAK,CAAC;IAE1B;;;;OAIG;IACK,KAAK,EAAE,MAAM,mBAAmB,CAAC;gBAGvC,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;QACd,aAAa,EAAE,OAAO,CAAC;QACvB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IAkNH;;;OAGG;IACU,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAKpE;;;;;;;OAOG;cACa,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;IAWvE;;;;;;;OAOG;cACa,YAAY,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;IAI3E,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,GAAG,SAAS;IAmBhE;;;;;;;OAOG;cACa,kBAAkB,CAChC,QAAQ,EAAE,mBAAmB,GAC5B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAoB9B;;;;;;;OAOG;cACa,YAAY,CAC1B,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAU9B;;OAEG;IACH,SAAS,IAAI,KAAK;CAGnB"}