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

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

@@ -4,11 +4,11 @@ export class GanttDataSetNodeData extends TreeDataSetNodeData {
     constructor(model, nodeModel, parentNodeData, opts) {
         super(nodeModel, parentNodeData, opts);
         const { data } = opts;
-        this.sndataIteValue = calcDataItemValue(model.sndataItemName, nodeModel, data);
-        this.beginDataItemValue = calcDataItemValue(model.beginDataItemName, nodeModel, data);
-        this.endDataItemValue = calcDataItemValue(model.endDataItemName, nodeModel, data);
-        this.prevDataItemValue = calcDataItemValue(model.prevDataItemName, nodeModel, data);
-        this.finishDataItemValue = calcDataItemValue(model.finishDataItemName, nodeModel, data);
-        this.totalDataItemValue = calcDataItemValue(model.totalDataItemName, nodeModel, data);
+        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-node-data-util.js

@@ -10,7 +10,7 @@ export const calcDataItemValue = (fieldCodeName, nodeModel, data = {}) => {
         return result;
     }
     const targetTreeNodeDataItem = nodeModel.detreeNodeDataItems.find((nodeDataItem) => {
-        return nodeDataItem.id === fieldCodeName;
+        return nodeDataItem.detreeColumnId === fieldCodeName;
     });
     if (targetTreeNodeDataItem && targetTreeNodeDataItem.appDEFieldId) {
         result = data[targetTreeNodeDataItem.appDEFieldId];

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

@@ -2,12 +2,12 @@ import { IDEGantt, IDETreeNode } from '@ibiz/model-core';
 import { IGanttNodeData } from '../../../interface';
 import { TreeStaticNodeData } from '../tree-node-data';
 export declare class GanttStaticNodeData extends TreeStaticNodeData implements IGanttNodeData {
-    sndataIteValue: string;
-    beginDataItemValue: string;
-    endDataItemValue: string;
-    prevDataItemValue: string | number;
-    finishDataItemValue: string | number;
-    totalDataItemValue: string | number;
+    _snDataItemValue: string;
+    _beginDataItemValue: string;
+    _endDataItemValue: string;
+    _prevDataItemValue: string | number;
+    _finishDataItemValue: string | number;
+    _totalDataItemValue: string | number;
     _children?: IGanttNodeData[] | undefined;
     _parent?: IGanttNodeData;
     constructor(model: IDEGantt, nodeModel: IDETreeNode, parentNodeData: IGanttNodeData | undefined, opts: {

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

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

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

@@ -3,11 +3,11 @@ import { calcDataItemValue } from './gantt-node-data-util';
 export class GanttStaticNodeData extends TreeStaticNodeData {
     constructor(model, nodeModel, parentNodeData, opts) {
         super(nodeModel, parentNodeData, opts);
-        this.sndataIteValue = calcDataItemValue(model.sndataItemName, nodeModel);
-        this.beginDataItemValue = calcDataItemValue(model.beginDataItemName, nodeModel);
-        this.endDataItemValue = calcDataItemValue(model.endDataItemName, nodeModel);
-        this.prevDataItemValue = calcDataItemValue(model.prevDataItemName, nodeModel);
-        this.finishDataItemValue = calcDataItemValue(model.finishDataItemName, nodeModel);
-        this.totalDataItemValue = calcDataItemValue(model.totalDataItemName, nodeModel);
+        this._snDataItemValue = calcDataItemValue(model.sndataItemName, nodeModel);
+        this._beginDataItemValue = calcDataItemValue(model.beginDataItemName, nodeModel);
+        this._endDataItemValue = calcDataItemValue(model.endDataItemName, nodeModel);
+        this._prevDataItemValue = calcDataItemValue(model.prevDataItemName, nodeModel);
+        this._finishDataItemValue = calcDataItemValue(model.finishDataItemName, nodeModel);
+        this._totalDataItemValue = calcDataItemValue(model.totalDataItemName, nodeModel);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.5.1-dev.0",
+  "version": "0.5.1",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,8 +29,8 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.5.1-dev.0",
-    "@ibiz/model-core": "^0.1.1",
+    "@ibiz-template/core": "^0.5.1-next.0",
+    "@ibiz/model-core": "^0.1.2",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
     "@types/systemjs": "^6.13.5",
@@ -47,7 +47,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.5.0-beta.0",
-    "@ibiz/model-core": "^0.1.1",
+    "@ibiz/model-core": "^0.1.2",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "c54e4d6aef0c43875f83272fed9126b0265236e0"
+  "gitHead": "f442a5daebbca26f24b167d8afa470d8fd2ff8b8"
 }

package/src/controller/control/grid/grid/grid.controller.ts

@@ -34,6 +34,7 @@ import {
   IExportColumn,
   IColumnState,
   ISearchGroupData,
+  IStorageColumnStates,
 } from '../../../../interface';
 import { calcDeCodeNameById } from '../../../../model';
 import { getGridColumnProvider } from '../../../../register';
@@ -697,20 +698,40 @@ export class GridController<
    * @return {*}  {Promise<void>}
    */
   protected initColumnStates(): void {
-    recursiveIterate(
-      this.model,
-      (column: IDEGridColumn) => {
-        if (column.columnType !== 'GROUPGRIDCOLUMN') {
-          this.state.columnStates.push({
-            key: column.codeName!,
-            caption: column.caption!,
-            hidden: !!column.hideDefault,
-            uaColumn: column.columnType === 'UAGRIDCOLUMN',
-          });
-        }
-      },
-      { childrenFields: ['degridColumns'] },
+    this.state.columnStates = [];
+    const storageColumnStatesStr = localStorage.getItem(
+      `${this.view.model.id}.${this.model.name}.columnStates`,
     );
+    // 有本地缓存从缓存里拿，拿完如果还是空数组再走模型
+    if (storageColumnStatesStr) {
+      const storageColumnStates: IStorageColumnStates = JSON.parse(
+        storageColumnStatesStr,
+      );
+      if (this.addSchemaColumn && storageColumnStates.schemaColumnStates) {
+        this.state.columnStates = storageColumnStates.schemaColumnStates;
+      } else if (
+        !this.addSchemaColumn &&
+        storageColumnStates.defaultColumnStates
+      ) {
+        this.state.columnStates = storageColumnStates.defaultColumnStates;
+      }
+    }
+    if (this.state.columnStates.length === 0) {
+      recursiveIterate(
+        this.model,
+        (column: IDEGridColumn) => {
+          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();
   }
 
@@ -1281,6 +1302,7 @@ export class GridController<
    */
   setColumnVisible(columnState: IColumnState): void {
     columnState.hidden = !columnState.hidden;
+    this.saveColumnStates();
   }
 
   /**
@@ -1299,8 +1321,56 @@ export class GridController<
     if (data.columnstates) {
       this.state.columnStates = data.columnstates;
     } else {
-      this.state.columnStates = [];
       this.initColumnStates();
     }
   }
+
+  /**
+   * 改变列排序
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2024-01-05 11:21:07
+   */
+  changeColumnStateSort(
+    columnKey: string,
+    newIndex: number,
+    oldIndex: number,
+  ): void {
+    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(): void {
+    let storageColumnStates: IStorageColumnStates = {};
+    // 先判断是否缓存过，根据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/src/controller/control/search-bar/entity-schema.ts

@@ -1,8 +1,15 @@
-import { IEditor, ISearchBarFilter } from '@ibiz/model-core';
+import { IDropDownList, IEditor, ISearchBarFilter } from '@ibiz/model-core';
 import { ValueOP } from '../../../constant';
 import { SearchBarController } from './search-bar.controller';
 import { ExcludeOPs } from './search-bar-filter.controller';
 
+type ISchemaField = {
+  type: string;
+  key: string;
+  description: string;
+  enumSource?: string;
+};
+
 const appId = '';
 
 /** 数据类型映射操作符号 */
@@ -91,6 +98,21 @@ function initDefaultEditor(): void {
 
 initDefaultEditor();
 
+function getEditor(field: ISchemaField, op: string): IEditor {
+  if (field.enumSource) {
+    return {
+      appId,
+      editorType: 'DROPDOWNLIST',
+      singleSelect: true,
+      valueType: 'SIMPLE',
+      appCodeListId: field.enumSource,
+      id: `${field.key}_${op}`,
+    } as IDropDownList;
+  }
+  const editorModel = EditorsMap[`${field.type}_${op}`];
+  return editorModel;
+}
+
 /**
  * 根据json模型计算出过滤项模型
  * @author lxm
@@ -100,10 +122,10 @@ initDefaultEditor();
  * @param {SearchBarController} c
  * @return {*}  {ISearchBarFilter[]}
  */
-export function calcFilterModelBySchema(
+export async function calcFilterModelBySchema(
   json: IData,
   c: SearchBarController,
-): ISearchBarFilter[] {
+): Promise<ISearchBarFilter[]> {
   if (!json.properties) {
     return [];
   }
@@ -112,11 +134,7 @@ export function calcFilterModelBySchema(
     return [];
   }
 
-  const addFields: {
-    key: string;
-    description: string;
-    type: string;
-  }[] = [];
+  const addFields: ISchemaField[] = [];
 
   Object.keys(properties).forEach((key: string) => {
     let type: string;
@@ -141,12 +159,17 @@ export function calcFilterModelBySchema(
       key,
       description: properties[key].description,
       type,
+      enumSource: properties[key].enumSource,
     });
   });
 
   // 属性codeName对应的属性id
   const codeNameToId: { [p: string]: string } = {};
-  c.appDataEntity.appDEFields?.forEach(field => {
+  const dataEntity = await ibiz.hub.getAppDataEntity(
+    c.model.appDataEntityId!,
+    c.model.appId,
+  );
+  dataEntity.appDEFields?.forEach(field => {
     codeNameToId[field.codeName!.toLowerCase()] = field.id!;
   });
 
@@ -159,18 +182,18 @@ export function calcFilterModelBySchema(
       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),
+        });
     });
   });
 

package/src/controller/control/search-bar/search-bar.controller.ts

@@ -4,7 +4,7 @@ import {
   recursiveIterate,
 } from '@ibiz-template/core';
 import { IAppDataEntity, ISearchBar, ISearchBarFilter } from '@ibiz/model-core';
-import { isNil } from 'ramda';
+import { clone, isNil } from 'ramda';
 import {
   ISearchBarState,
   ISearchBarEvent,
@@ -79,7 +79,9 @@ export class SearchBarController
    * @date 2023-12-29 04:15:34
    * @type {boolean}
    */
-  enableFilter: boolean = this.model.enableFilter === true;
+  get enableFilter(): boolean {
+    return this.model.enableFilter === true;
+  }
 
   /**
    * 最终使用的searchBarFilters
@@ -87,7 +89,16 @@ export class SearchBarController
    * @date 2023-12-29 06:55:13
    * @type {ISearchBarFilter[]}
    */
-  searchBarFilters!: ISearchBarFilter[];
+  get searchBarFilters(): ISearchBarFilter[] {
+    return this.model.searchBarFilters || [];
+  }
+
+  /**
+   * 是否启用根据实体的JSON Schema生成过滤项
+   * @author lxm
+   * @date 2024-01-05 10:10:37
+   */
+  addSchemaFilters = false;
 
   /**
    * 表格控制器
@@ -113,16 +124,6 @@ export class SearchBarController
     this.state.selectedGroupItem = null;
     this.state.searchBarGroups = [];
     this.state.selectedSearchGroupItem = null;
-    this.initFilterState();
-  }
-
-  /**
-   * 初始化Filter相关的属性
-   * @author lxm
-   * @date 2023-12-29 04:18:02
-   * @protected
-   */
-  protected initFilterState(): void {
     this.resetFilter();
     this.state.visible = !!(
       this.model.enableQuickSearch ||
@@ -132,6 +133,8 @@ export class SearchBarController
   }
 
   protected async onCreated(): Promise<void> {
+    await this.initByEntitySchema();
+
     await super.onCreated();
 
     const appDataEntity = await ibiz.hub.getAppDataEntity(
@@ -149,7 +152,6 @@ export class SearchBarController
       await this.service.init(this.context);
     }
 
-    await this.initByEntitySchema();
     await this.initSearchBarFilters();
     await this.initSearBarGroups();
   }
@@ -161,12 +163,17 @@ export class SearchBarController
    * @return {*}  {Promise<void>}
    */
   async initByEntitySchema(): Promise<void> {
-    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: ISearchBarFilter[] = [];
     this.model.searchBarFilters?.forEach(filter => {
@@ -182,9 +189,13 @@ export class SearchBarController
       }
     });
 
-    addSearchBarFilters.push(...mergeFilters);
-
-    this.searchBarFilters = addSearchBarFilters;
+    // 如果有根据json计算出的过滤项，则要重置相关state参数
+    if (addSearchBarFilters.length > 0) {
+      // 修改模型之前拷贝一份，避免污染原始数据
+      (this as IData).model = clone(this.model);
+      this.model.searchBarFilters = addSearchBarFilters.concat(...mergeFilters);
+      this.model.enableFilter = true;
+    }
   }
 
   /**
@@ -311,7 +322,7 @@ export class SearchBarController
    * @return {*}  {IData}
    */
   calcFilters(): IData[] | undefined {
-    if (!this.model.enableFilter) {
+    if (!this.enableFilter) {
       return;
     }
     let hasFilter = false; // 是否有过滤项

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

@@ -1,6 +1,11 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { IDETreeDEFColumn } from '@ibiz/model-core';
+import {
+  IDETreeDEFColumn,
+  IDETreeNode,
+  IDETreeNodeDataItem,
+} from '@ibiz/model-core';
 import { TreeGridExColumnController } from '../tree-grid-ex-column/tree-grid-ex-column.controller';
+import { ITreeGridExRowState } from '../../../../../interface';
 
 /**
  * 树表格（增强）属性列控制器
@@ -10,4 +15,32 @@ import { TreeGridExColumnController } from '../tree-grid-ex-column/tree-grid-ex-
  * @class TreeGridExFieldColumnController
  * @extends {TreeGridExColumnController<IDETreeDEFColumn>}
  */
-export class TreeGridExFieldColumnController extends TreeGridExColumnController<IDETreeDEFColumn> {}
+export class TreeGridExFieldColumnController extends TreeGridExColumnController<IDETreeDEFColumn> {
+  /**
+   * 给rowController初始化属性列的状态
+   *
+   * @author zpc
+   * @date 2024-01-07 21:09:43
+   * @param {ITreeGridExRowState} row
+   */
+  initColumnStates(row: ITreeGridExRowState): void {
+    const { data } = row;
+    if (!this.model.id || !data._deData) {
+      return;
+    }
+
+    const { detreeNodeDataItems } = this.treeGrid.getNodeModel(
+      data._nodeId,
+    ) as IDETreeNode;
+    const targetTreeNodeDataItem = detreeNodeDataItems?.find(
+      (treeNodeDataItem: IDETreeNodeDataItem) => {
+        return treeNodeDataItem.detreeColumnId === this.model.id;
+      },
+    );
+    if (targetTreeNodeDataItem && targetTreeNodeDataItem.appDEFieldId) {
+      (data as IData)[this.model.id.toLowerCase()] = (data._deData as IData)[
+        targetTreeNodeDataItem.appDEFieldId.toLowerCase()
+      ];
+    }
+  }
+}

package/src/controller/control/tree-grid-ex/tree-grid-ex-row.state.ts

@@ -28,7 +28,10 @@ export class TreeGridExRowState implements ITreeGridExRowState {
 
   constructor(data: ITreeNodeData, treeGrid: TreeGridExController) {
     this.data = data;
-
+    // 初始化属性列数据状态
+    Object.values(treeGrid.fieldColumns).forEach(column => {
+      column.initColumnStates(this);
+    });
     // 初始化操作列状态
     Object.values(treeGrid.uaColumns).forEach(column => {
       column.initActionStates(this);

package/src/interface/controller/state/control/i-gantt.state.ts

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

package/src/interface/controller/state/control/i-grid.state.ts

@@ -183,3 +183,27 @@ 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[];
+}

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

@@ -7,17 +7,17 @@ export class GanttCodeListNodeData
   extends TreeCodeListNodeData
   implements IGanttNodeData
 {
-  sndataIteValue: string;
+  _snDataItemValue: string;
 
-  beginDataItemValue: string;
+  _beginDataItemValue: string;
 
-  endDataItemValue: string;
+  _endDataItemValue: string;
 
-  prevDataItemValue: string | number;
+  _prevDataItemValue: string | number;
 
-  finishDataItemValue: string | number;
+  _finishDataItemValue: string | number;
 
-  totalDataItemValue: string | number;
+  _totalDataItemValue: string | number;
 
   _children?: IGanttNodeData[] | undefined;
 
@@ -36,32 +36,32 @@ export class GanttCodeListNodeData
   ) {
     super(nodeModel, parentNodeData, opts);
     const { data } = opts;
-    this.sndataIteValue = calcDataItemValue(
+    this._snDataItemValue = calcDataItemValue(
       model.sndataItemName,
       nodeModel,
       data,
     );
-    this.beginDataItemValue = calcDataItemValue(
+    this._beginDataItemValue = calcDataItemValue(
       model.beginDataItemName,
       nodeModel,
       data,
     );
-    this.endDataItemValue = calcDataItemValue(
+    this._endDataItemValue = calcDataItemValue(
       model.endDataItemName,
       nodeModel,
       data,
     );
-    this.prevDataItemValue = calcDataItemValue(
+    this._prevDataItemValue = calcDataItemValue(
       model.prevDataItemName,
       nodeModel,
       data,
     );
-    this.finishDataItemValue = calcDataItemValue(
+    this._finishDataItemValue = calcDataItemValue(
       model.finishDataItemName,
       nodeModel,
       data,
     );
-    this.totalDataItemValue = calcDataItemValue(
+    this._totalDataItemValue = calcDataItemValue(
       model.totalDataItemName,
       nodeModel,
       data,