@ibiz-template/runtime 0.5.1-dev.0 → 0.5.1

package/out/controller/control/grid/grid/grid.controller.d.ts

@@ -421,5 +421,19 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      * @Date: 2023-12-21 10:54:45
      */
     setGroupParams(data: ISearchGroupData): void;
+    /**
+     * 改变列排序
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2024-01-05 11:21:07
+     */
+    changeColumnStateSort(columnKey: string, newIndex: number, oldIndex: number): void;
+    /**
+     * 存储列状态到本地
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2024-01-05 13:45:36
+     */
+    saveColumnStates(): void;
 }
 //# sourceMappingURL=grid.controller.d.ts.map

package/out/controller/control/grid/grid/grid.controller.d.ts.map

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

package/out/controller/control/grid/grid/grid.controller.js

@@ -526,16 +526,31 @@ export class GridController extends MDControlController {
      * @return {*}  {Promise<void>}
      */
     initColumnStates() {
-        recursiveIterate(this.model, (column) => {
-            if (column.columnType !== 'GROUPGRIDCOLUMN') {
-                this.state.columnStates.push({
-                    key: column.codeName,
-                    caption: column.caption,
-                    hidden: !!column.hideDefault,
-                    uaColumn: column.columnType === 'UAGRIDCOLUMN',
-                });
+        this.state.columnStates = [];
+        const storageColumnStatesStr = localStorage.getItem(`${this.view.model.id}.${this.model.name}.columnStates`);
+        // 有本地缓存从缓存里拿，拿完如果还是空数组再走模型
+        if (storageColumnStatesStr) {
+            const storageColumnStates = JSON.parse(storageColumnStatesStr);
+            if (this.addSchemaColumn && storageColumnStates.schemaColumnStates) {
+                this.state.columnStates = storageColumnStates.schemaColumnStates;
+            }
+            else if (!this.addSchemaColumn &&
+                storageColumnStates.defaultColumnStates) {
+                this.state.columnStates = storageColumnStates.defaultColumnStates;
             }
-        }, { childrenFields: ['degridColumns'] });
+        }
+        if (this.state.columnStates.length === 0) {
+            recursiveIterate(this.model, (column) => {
+                if (column.columnType !== 'GROUPGRIDCOLUMN') {
+                    this.state.columnStates.push({
+                        key: column.codeName,
+                        caption: column.caption,
+                        hidden: !!column.hideDefault,
+                        uaColumn: column.columnType === 'UAGRIDCOLUMN',
+                    });
+                }
+            }, { childrenFields: ['degridColumns'] });
+        }
         this.calcColumnFixed();
     }
     /**
@@ -1016,6 +1031,7 @@ export class GridController extends MDControlController {
      */
     setColumnVisible(columnState) {
         columnState.hidden = !columnState.hidden;
+        this.saveColumnStates();
     }
     /**
      * 设置点击分组后回显相关参数
@@ -1035,8 +1051,44 @@ export class GridController extends MDControlController {
             this.state.columnStates = data.columnstates;
         }
         else {
-            this.state.columnStates = [];
             this.initColumnStates();
         }
     }
+    /**
+     * 改变列排序
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2024-01-05 11:21:07
+     */
+    changeColumnStateSort(columnKey, newIndex, oldIndex) {
+        const columnState = this.state.columnStates.find(item => item.key === columnKey);
+        if (columnState) {
+            // 移除元素从旧位置，将元素插入到新位置
+            this.state.columnStates.splice(oldIndex, 1);
+            this.state.columnStates.splice(newIndex, 0, columnState);
+            // 存本地缓存
+            this.saveColumnStates();
+        }
+    }
+    /**
+     * 存储列状态到本地
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2024-01-05 13:45:36
+     */
+    saveColumnStates() {
+        let storageColumnStates = {};
+        // 先判断是否缓存过，根据addSchemaColumn判断存到哪个属性上
+        const storageColumnStatesStr = localStorage.getItem(`${this.view.model.id}.${this.model.name}.columnStates`);
+        if (storageColumnStatesStr) {
+            storageColumnStates = JSON.parse(storageColumnStatesStr);
+        }
+        if (this.addSchemaColumn) {
+            storageColumnStates.schemaColumnStates = this.state.columnStates;
+        }
+        else {
+            storageColumnStates.defaultColumnStates = this.state.columnStates;
+        }
+        localStorage.setItem(`${this.view.model.id}.${this.model.name}.columnStates`, JSON.stringify(storageColumnStates));
+    }
 }

package/out/controller/control/search-bar/entity-schema.d.ts

@@ -9,5 +9,5 @@ import { SearchBarController } from './search-bar.controller';
  * @param {SearchBarController} c
  * @return {*}  {ISearchBarFilter[]}
  */
-export declare function calcFilterModelBySchema(json: IData, c: SearchBarController): ISearchBarFilter[];
+export declare function calcFilterModelBySchema(json: IData, c: SearchBarController): Promise<ISearchBarFilter[]>;
 //# sourceMappingURL=entity-schema.d.ts.map

package/out/controller/control/search-bar/entity-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity-schema.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/entity-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AA2F9D;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,KAAK,EACX,CAAC,EAAE,mBAAmB,GACrB,gBAAgB,EAAE,CAwEpB"}
+{"version":3,"file":"entity-schema.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/entity-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAE5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAiH9D;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,KAAK,EACX,CAAC,EAAE,mBAAmB,GACrB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAyE7B"}

package/out/controller/control/search-bar/entity-schema.js

@@ -78,6 +78,20 @@ function initDefaultEditor() {
     });
 }
 initDefaultEditor();
+function getEditor(field, op) {
+    if (field.enumSource) {
+        return {
+            appId,
+            editorType: 'DROPDOWNLIST',
+            singleSelect: true,
+            valueType: 'SIMPLE',
+            appCodeListId: field.enumSource,
+            id: `${field.key}_${op}`,
+        };
+    }
+    const editorModel = EditorsMap[`${field.type}_${op}`];
+    return editorModel;
+}
 /**
  * 根据json模型计算出过滤项模型
  * @author lxm
@@ -87,7 +101,7 @@ initDefaultEditor();
  * @param {SearchBarController} c
  * @return {*}  {ISearchBarFilter[]}
  */
-export function calcFilterModelBySchema(json, c) {
+export async function calcFilterModelBySchema(json, c) {
     var _a;
     if (!json.properties) {
         return [];
@@ -118,11 +132,13 @@ export function calcFilterModelBySchema(json, c) {
             key,
             description: properties[key].description,
             type,
+            enumSource: properties[key].enumSource,
         });
     });
     // 属性codeName对应的属性id
     const codeNameToId = {};
-    (_a = c.appDataEntity.appDEFields) === null || _a === void 0 ? void 0 : _a.forEach(field => {
+    const dataEntity = await ibiz.hub.getAppDataEntity(c.model.appDataEntityId, c.model.appId);
+    (_a = dataEntity.appDEFields) === null || _a === void 0 ? void 0 : _a.forEach(field => {
         codeNameToId[field.codeName.toLowerCase()] = field.id;
     });
     const addSearchBarFilters = [];
@@ -133,18 +149,18 @@ export function calcFilterModelBySchema(json, c) {
             return;
         }
         ops.forEach(op => {
-            const editorModel = EditorsMap[`${item.type}_${op}`];
-            addSearchBarFilters.push({
-                appId,
-                appDEFieldId: codeNameToId[item.key],
-                id: item.key,
-                caption: item.description,
-                defsearchMode: {
+            if (item)
+                addSearchBarFilters.push({
                     appId,
-                    valueOP: op,
-                },
-                editor: editorModel,
-            });
+                    appDEFieldId: codeNameToId[item.key],
+                    id: item.key,
+                    caption: item.description,
+                    defsearchMode: {
+                        appId,
+                        valueOP: op,
+                    },
+                    editor: getEditor(item, op),
+                });
         });
     });
     return addSearchBarFilters;

package/out/controller/control/search-bar/search-bar.controller.d.ts

@@ -54,14 +54,20 @@ export declare class SearchBarController extends ControlController<ISearchBar, I
      * @date 2023-12-29 04:15:34
      * @type {boolean}
      */
-    enableFilter: boolean;
+    get enableFilter(): boolean;
     /**
      * 最终使用的searchBarFilters
      * @author lxm
      * @date 2023-12-29 06:55:13
      * @type {ISearchBarFilter[]}
      */
-    searchBarFilters: ISearchBarFilter[];
+    get searchBarFilters(): ISearchBarFilter[];
+    /**
+     * 是否启用根据实体的JSON Schema生成过滤项
+     * @author lxm
+     * @date 2024-01-05 10:10:37
+     */
+    addSchemaFilters: boolean;
     /**
      * 表格控制器
      * @return {*}
@@ -77,13 +83,6 @@ export declare class SearchBarController extends ControlController<ISearchBar, I
      */
     appDataEntity: IAppDataEntity;
     protected initState(): void;
-    /**
-     * 初始化Filter相关的属性
-     * @author lxm
-     * @date 2023-12-29 04:18:02
-     * @protected
-     */
-    protected initFilterState(): void;
     protected onCreated(): Promise<void>;
     /**
      * 根据实体jsonschema初始化

package/out/controller/control/search-bar/search-bar.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,WAAW,EACX,sBAAsB,EACtB,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAIxD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;OAKG;IACH,WAAW,SAAM;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,yBAAyB,EAAE,CAAM;IAEpD;;;;;OAKG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B;;;;;OAKG;IACH,gBAAgB,EAAE,sBAAsB,GAAG,IAAI,CAAQ;IAEvD;;;;;OAKG;IACH,oBAAoB,UAA8C;IAElE;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAoC;IAEzD;;;;;OAKG;IACH,gBAAgB,EAAG,gBAAgB,EAAE,CAAC;IAEtC;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,GAAG,SAAS,CAEtC;IAED;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;IAS3B;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;cASjB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IA2BzC;;;;;;OAMG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA2B5C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAIhB;;;;;OAKG;IACH,eAAe,IAAI,OAAO;IA2B1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYrD;;;;;OAKG;IACH,WAAW,IAAI,KAAK,EAAE,GAAG,SAAS;IAsBlC;;;;;;OAMG;IACH,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,KAAK;IAkBvC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW;IAqBtC;;;;;OAKG;IACH,SAAS,CAAC,oBAAoB,IAAI,WAAW,EAAE;IAU/C;;;;;OAKG;IACG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAkFxC;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAkCjC;;;;;OAKG;IACG,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;CA4BzE"}
+{"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,WAAW,EACX,sBAAsB,EACtB,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAIxD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;OAKG;IACH,WAAW,SAAM;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,yBAAyB,EAAE,CAAM;IAEpD;;;;;OAKG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B;;;;;OAKG;IACH,gBAAgB,EAAE,sBAAsB,GAAG,IAAI,CAAQ;IAEvD;;;;;OAKG;IACH,oBAAoB,UAA8C;IAElE;;;;;OAKG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;OAKG;IACH,IAAI,gBAAgB,IAAI,gBAAgB,EAAE,CAEzC;IAED;;;;OAIG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,GAAG,SAAS,CAEtC;IAED;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAcX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAwB1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAoCzC;;;;;;OAMG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA2B5C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAIhB;;;;;OAKG;IACH,eAAe,IAAI,OAAO;IA2B1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYrD;;;;;OAKG;IACH,WAAW,IAAI,KAAK,EAAE,GAAG,SAAS;IAsBlC;;;;;;OAMG;IACH,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,KAAK;IAkBvC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW;IAqBtC;;;;;OAKG;IACH,SAAS,CAAC,oBAAoB,IAAI,WAAW,EAAE;IAU/C;;;;;OAKG;IACG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAkFxC;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAkCjC;;;;;OAKG;IACG,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;CA4BzE"}

package/out/controller/control/search-bar/search-bar.controller.js

@@ -1,5 +1,5 @@
 import { RuntimeError, mergeInLeft, recursiveIterate, } from '@ibiz-template/core';
-import { isNil } from 'ramda';
+import { clone, isNil } from 'ramda';
 import { convertNavData, ScriptFactory } from '../../../utils';
 import { ControlController } from '../../common';
 import { SearchBarFilterController } from './search-bar-filter.controller';
@@ -47,12 +47,29 @@ export class SearchBarController extends ControlController {
          */
         this.isBackendSearchGroup = this.model.searchBarStyle === 'SEARCHBAR2';
         /**
-         * 启用自定义过滤项
+         * 是否启用根据实体的JSON Schema生成过滤项
          * @author lxm
-         * @date 2023-12-29 04:15:34
-         * @type {boolean}
+         * @date 2024-01-05 10:10:37
          */
-        this.enableFilter = this.model.enableFilter === true;
+        this.addSchemaFilters = false;
+    }
+    /**
+     * 启用自定义过滤项
+     * @author lxm
+     * @date 2023-12-29 04:15:34
+     * @type {boolean}
+     */
+    get enableFilter() {
+        return this.model.enableFilter === true;
+    }
+    /**
+     * 最终使用的searchBarFilters
+     * @author lxm
+     * @date 2023-12-29 06:55:13
+     * @type {ISearchBarFilter[]}
+     */
+    get searchBarFilters() {
+        return this.model.searchBarFilters || [];
     }
     /**
      * 表格控制器
@@ -69,21 +86,13 @@ export class SearchBarController extends ControlController {
         this.state.selectedGroupItem = null;
         this.state.searchBarGroups = [];
         this.state.selectedSearchGroupItem = null;
-        this.initFilterState();
-    }
-    /**
-     * 初始化Filter相关的属性
-     * @author lxm
-     * @date 2023-12-29 04:18:02
-     * @protected
-     */
-    initFilterState() {
         this.resetFilter();
         this.state.visible = !!(this.model.enableQuickSearch ||
             this.model.enableGroup ||
             this.enableFilter);
     }
     async onCreated() {
+        await this.initByEntitySchema();
         await super.onCreated();
         const appDataEntity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId, this.context.srfappid);
         if (appDataEntity) {
@@ -95,7 +104,6 @@ export class SearchBarController extends ControlController {
             this.service = new SearchBarService(this.model, this.view.model.codeName);
             await this.service.init(this.context);
         }
-        await this.initByEntitySchema();
         await this.initSearchBarFilters();
         await this.initSearBarGroups();
     }
@@ -107,12 +115,14 @@ export class SearchBarController extends ControlController {
      */
     async initByEntitySchema() {
         var _a;
-        this.enableFilter = true;
-        const json = await getEntitySchema(this.appDataEntity.id, this.context);
+        if (!this.addSchemaFilters) {
+            return;
+        }
+        const json = await getEntitySchema(this.model.appDataEntityId, this.context);
         if (!json) {
             return;
         }
-        const addSearchBarFilters = calcFilterModelBySchema(json, this);
+        const addSearchBarFilters = await calcFilterModelBySchema(json, this);
         const mergeFilters = [];
         (_a = this.model.searchBarFilters) === null || _a === void 0 ? void 0 : _a.forEach(filter => {
             const findindex = addSearchBarFilters.findIndex(item => {
@@ -126,8 +136,13 @@ export class SearchBarController extends ControlController {
                 mergeFilters.push(filter);
             }
         });
-        addSearchBarFilters.push(...mergeFilters);
-        this.searchBarFilters = addSearchBarFilters;
+        // 如果有根据json计算出的过滤项，则要重置相关state参数
+        if (addSearchBarFilters.length > 0) {
+            // 修改模型之前拷贝一份，避免污染原始数据
+            this.model = clone(this.model);
+            this.model.searchBarFilters = addSearchBarFilters.concat(...mergeFilters);
+            this.model.enableFilter = true;
+        }
     }
     /**
      * 计算快速搜索的占位
@@ -237,7 +252,7 @@ export class SearchBarController extends ControlController {
      * @return {*}  {IData}
      */
     calcFilters() {
-        if (!this.model.enableFilter) {
+        if (!this.enableFilter) {
             return;
         }
         let hasFilter = false; // 是否有过滤项

package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-field-column.controller.d.ts

@@ -1,5 +1,6 @@
 import { IDETreeDEFColumn } from '@ibiz/model-core';
 import { TreeGridExColumnController } from '../tree-grid-ex-column/tree-grid-ex-column.controller';
+import { ITreeGridExRowState } from '../../../../../interface';
 /**
  * 树表格（增强）属性列控制器
  * @author lxm
@@ -9,5 +10,13 @@ import { TreeGridExColumnController } from '../tree-grid-ex-column/tree-grid-ex-
  * @extends {TreeGridExColumnController<IDETreeDEFColumn>}
  */
 export declare class TreeGridExFieldColumnController extends TreeGridExColumnController<IDETreeDEFColumn> {
+    /**
+     * 给rowController初始化属性列的状态
+     *
+     * @author zpc
+     * @date 2024-01-07 21:09:43
+     * @param {ITreeGridExRowState} row
+     */
+    initColumnStates(row: ITreeGridExRowState): void;
 }
 //# sourceMappingURL=tree-grid-ex-field-column.controller.d.ts.map

package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-field-column.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-grid-ex-field-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-field-column.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,0BAA0B,EAAE,MAAM,uDAAuD,CAAC;AAEnG;;;;;;;GAOG;AACH,qBAAa,+BAAgC,SAAQ,0BAA0B,CAAC,gBAAgB,CAAC;CAAG"}
+{"version":3,"file":"tree-grid-ex-field-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-field-column.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAGjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,0BAA0B,EAAE,MAAM,uDAAuD,CAAC;AACnG,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,+BAAgC,SAAQ,0BAA0B,CAAC,gBAAgB,CAAC;IAC/F;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,mBAAmB,GAAG,IAAI;CAoBjD"}

package/out/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-field-column.controller.js

@@ -8,4 +8,24 @@ import { TreeGridExColumnController } from '../tree-grid-ex-column/tree-grid-ex-
  * @extends {TreeGridExColumnController<IDETreeDEFColumn>}
  */
 export class TreeGridExFieldColumnController extends TreeGridExColumnController {
+    /**
+     * 给rowController初始化属性列的状态
+     *
+     * @author zpc
+     * @date 2024-01-07 21:09:43
+     * @param {ITreeGridExRowState} row
+     */
+    initColumnStates(row) {
+        const { data } = row;
+        if (!this.model.id || !data._deData) {
+            return;
+        }
+        const { detreeNodeDataItems } = this.treeGrid.getNodeModel(data._nodeId);
+        const targetTreeNodeDataItem = detreeNodeDataItems === null || detreeNodeDataItems === void 0 ? void 0 : detreeNodeDataItems.find((treeNodeDataItem) => {
+            return treeNodeDataItem.detreeColumnId === this.model.id;
+        });
+        if (targetTreeNodeDataItem && targetTreeNodeDataItem.appDEFieldId) {
+            data[this.model.id.toLowerCase()] = data._deData[targetTreeNodeDataItem.appDEFieldId.toLowerCase()];
+        }
+    }
 }

package/out/controller/control/tree-grid-ex/tree-grid-ex-row.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-grid-ex-row.state.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid-ex/tree-grid-ex-row.state.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,aAAa,EACd,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,YAAW,mBAAmB;IAC5D,IAAI,EAAE,aAAa,CAAC;IAEpB;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;gBAE7C,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,oBAAoB;CAQhE"}
+{"version":3,"file":"tree-grid-ex-row.state.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid-ex/tree-grid-ex-row.state.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,aAAa,EACd,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,YAAW,mBAAmB;IAC5D,IAAI,EAAE,aAAa,CAAC;IAEpB;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;gBAE7C,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,oBAAoB;CAWhE"}

package/out/controller/control/tree-grid-ex/tree-grid-ex-row.state.js

@@ -18,6 +18,10 @@ export class TreeGridExRowState {
          */
         this.uaColStates = {};
         this.data = data;
+        // 初始化属性列数据状态
+        Object.values(treeGrid.fieldColumns).forEach(column => {
+            column.initColumnStates(this);
+        });
         // 初始化操作列状态
         Object.values(treeGrid.uaColumns).forEach(column => {
             column.initActionStates(this);

package/out/interface/controller/state/control/i-gantt.state.d.ts

@@ -50,7 +50,7 @@ export interface IGanttNodeData extends ITreeNodeData {
      * @date 2023-12-11 17:12:39
      * @type {string}
      */
-    sndataIteValue: string;
+    _snDataItemValue: string;
     /**
      * 开始时间
      *
@@ -58,7 +58,7 @@ export interface IGanttNodeData extends ITreeNodeData {
      * @date 2023-12-11 17:12:12
      * @type {string}
      */
-    beginDataItemValue: string;
+    _beginDataItemValue: string;
     /**
      * 结束时间
      *
@@ -66,7 +66,7 @@ export interface IGanttNodeData extends ITreeNodeData {
      * @date 2023-12-11 17:12:52
      * @type {string}
      */
-    endDataItemValue: string;
+    _endDataItemValue: string;
     /**
      * 前置数据
      *
@@ -74,7 +74,7 @@ export interface IGanttNodeData extends ITreeNodeData {
      * @date 2023-12-11 17:12:13
      * @type {(string | number)}
      */
-    prevDataItemValue: string | number;
+    _prevDataItemValue: string | number;
     /**
      * 完成量数据
      *
@@ -82,7 +82,7 @@ export interface IGanttNodeData extends ITreeNodeData {
      * @date 2023-12-11 17:12:26
      * @type {(string | number)}
      */
-    finishDataItemValue: string | number;
+    _finishDataItemValue: string | number;
     /**
      * 总量数据项
      *
@@ -90,7 +90,7 @@ export interface IGanttNodeData extends ITreeNodeData {
      * @date 2023-12-11 17:12:43
      * @type {(string | number)}
      */
-    totalDataItemValue: string | number;
+    _totalDataItemValue: string | number;
     /**
      * 子数据
      *

package/out/interface/controller/state/control/i-gantt.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-gantt.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-gantt.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAY,SAAQ,gBAAgB;IACnD;;;;;OAKG;IACH,UAAU,EAAE,WAAW,CAAC;CACzB;AAED,MAAM,WAAW,WAAW;IAC1B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAe,SAAQ,aAAa;IACnD;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;;;;;OAMG;IACH,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC;;;;;;OAMG;IACH,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC;;;;;;OAMG;IACH,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IAEzC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B"}
+{"version":3,"file":"i-gantt.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-gantt.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAY,SAAQ,gBAAgB;IACnD;;;;;OAKG;IACH,UAAU,EAAE,WAAW,CAAC;CACzB;AAED,MAAM,WAAW,WAAW;IAC1B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAe,SAAQ,aAAa;IACnD;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;;;;;OAMG;IACH,mBAAmB,EAAE,MAAM,CAAC;IAE5B;;;;;;OAMG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAE1B;;;;;;OAMG;IACH,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC;;;;;;OAMG;IACH,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEtC;;;;;;OAMG;IACH,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IAEzC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B"}

package/out/interface/controller/state/control/i-grid.state.d.ts

@@ -170,4 +170,26 @@ export interface IColumnState {
      */
     fixed?: 'left' | 'right';
 }
+/**
+ * 本地存储表格列状态对象
+ * @return {*}
+ * @author: zhujiamin
+ * @Date: 2024-01-05 11:38:38
+ */
+export interface IStorageColumnStates {
+    /**
+     * 开启jsonschema下的表格列状态
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2024-01-05 11:39:22
+     */
+    schemaColumnStates?: IColumnState[];
+    /**
+     * 默认表格列状态
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2024-01-05 11:39:22
+     */
+    defaultColumnStates?: IColumnState[];
+}
 //# sourceMappingURL=i-grid.state.d.ts.map

package/out/interface/controller/state/control/i-grid.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-grid.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-grid.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,UAAW,SAAQ,eAAe;IACjD;;;;;;OAMG;IACH,IAAI,EAAE,aAAa,EAAE,CAAC;IAEtB;;;;;;OAMG;IACH,YAAY,EAAE,YAAY,EAAE,CAAC;IAE7B;;;;;OAKG;IACH,SAAS,EAAE,KAAK,CAAC;IAEjB;;;;;OAKG;IACH,eAAe,CAAC,EAAE,KAAK,CAAC;IAExB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,IAAI,EAAE,SAAS,CAAC;IAEhB;;;;;;OAMG;IACH,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IAEvC;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;IAEpD;;;;;;;OAOG;IACH,mBAAmB,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;IAE5D;;;;;;OAMG;IACH,aAAa,EAAE;QACb,CAAC,CAAC,EAAE,MAAM,GAAG;YACX,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;SACnB,CAAC;KACH,CAAC;IAEF;;;;;;OAMG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;;OAMG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B"}
+{"version":3,"file":"i-grid.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-grid.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,UAAW,SAAQ,eAAe;IACjD;;;;;;OAMG;IACH,IAAI,EAAE,aAAa,EAAE,CAAC;IAEtB;;;;;;OAMG;IACH,YAAY,EAAE,YAAY,EAAE,CAAC;IAE7B;;;;;OAKG;IACH,SAAS,EAAE,KAAK,CAAC;IAEjB;;;;;OAKG;IACH,eAAe,CAAC,EAAE,KAAK,CAAC;IAExB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,IAAI,EAAE,SAAS,CAAC;IAEhB;;;;;;OAMG;IACH,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IAEvC;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;IAEpD;;;;;;;OAOG;IACH,mBAAmB,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;IAE5D;;;;;;OAMG;IACH,aAAa,EAAE;QACb,CAAC,CAAC,EAAE,MAAM,GAAG;YACX,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;SACnB,CAAC;KACH,CAAC;IAEF;;;;;;OAMG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;;OAMG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AAED;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,YAAY,EAAE,CAAC;IAEpC;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,YAAY,EAAE,CAAC;CACtC"}

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

@@ -2,12 +2,12 @@ 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;
+    _snDataItemValue: string;
+    _beginDataItemValue: string;
+    _endDataItemValue: string;
+    _prevDataItemValue: string | number;
+    _finishDataItemValue: string | number;
+    _totalDataItemValue: string | number;
     _children?: IGanttNodeData[] | undefined;
     _parent?: IGanttNodeData;
     constructor(model: IDEGantt, nodeModel: IDETreeDataSetNode, parentNodeData: IGanttNodeData | undefined, opts: {

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

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

@@ -4,11 +4,11 @@ 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);
+        this._snDataItemValue = 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

@@ -2,12 +2,12 @@ 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;
+    _snDataItemValue: string;
+    _beginDataItemValue: string;
+    _endDataItemValue: string;
+    _prevDataItemValue: string | number;
+    _finishDataItemValue: string | number;
+    _totalDataItemValue: string | number;
     _children?: IGanttNodeData[] | undefined;
     _parent?: IGanttNodeData;
     constructor(model: IDEGantt, nodeModel: IDETreeDataSetNode, parentNodeData: IGanttNodeData | undefined, opts: {

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

@@ -1 +1 @@
-{"version":3,"file":"gantt-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-data-set-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAGxD,qBAAa,oBACX,SAAQ,mBACR,YAAW,cAAc;IAEzB,cAAc,EAAE,MAAM,CAAC;IAEvB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,gBAAgB,EAAE,MAAM,CAAC;IAEzB,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,SAAS,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IAEzC,OAAO,CAAC,EAAE,cAAc,CAAC;gBAGvB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;CAmCJ"}
+{"version":3,"file":"gantt-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-data-set-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAGxD,qBAAa,oBACX,SAAQ,mBACR,YAAW,cAAc;IAEzB,gBAAgB,EAAE,MAAM,CAAC;IAEzB,mBAAmB,EAAE,MAAM,CAAC;IAE5B,iBAAiB,EAAE,MAAM,CAAC;IAE1B,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEtC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC,SAAS,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IAEzC,OAAO,CAAC,EAAE,cAAc,CAAC;gBAGvB,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"}