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

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/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;
+  _sndataIteValue: 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/service/vo/gantt-node-data/gantt-code-list-node-data.ts

@@ -7,17 +7,17 @@ export class GanttCodeListNodeData
   extends TreeCodeListNodeData
   implements IGanttNodeData
 {
-  sndataIteValue: string;
+  _sndataIteValue: 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._sndataIteValue = 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,

package/src/service/vo/gantt-node-data/gantt-data-set-node-data.ts

@@ -7,17 +7,17 @@ export class GanttDataSetNodeData
   extends TreeDataSetNodeData
   implements IGanttNodeData
 {
-  sndataIteValue: string;
+  _sndataIteValue: 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 GanttDataSetNodeData
   ) {
     super(nodeModel, parentNodeData, opts);
     const { data } = opts;
-    this.sndataIteValue = calcDataItemValue(
+    this._sndataIteValue = 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,

package/src/service/vo/gantt-node-data/gantt-static-node-data.ts

@@ -7,17 +7,17 @@ export class GanttStaticNodeData
   extends TreeStaticNodeData
   implements IGanttNodeData
 {
-  sndataIteValue: string;
+  _sndataIteValue: 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;
 
@@ -30,21 +30,24 @@ export class GanttStaticNodeData
     opts: { parentValueLevel?: number; leaf: boolean },
   ) {
     super(nodeModel, parentNodeData, opts);
-    this.sndataIteValue = calcDataItemValue(model.sndataItemName, nodeModel);
-    this.beginDataItemValue = calcDataItemValue(
+    this._sndataIteValue = calcDataItemValue(model.sndataItemName, nodeModel);
+    this._beginDataItemValue = calcDataItemValue(
       model.beginDataItemName,
       nodeModel,
     );
-    this.endDataItemValue = calcDataItemValue(model.endDataItemName, nodeModel);
-    this.prevDataItemValue = calcDataItemValue(
+    this._endDataItemValue = calcDataItemValue(
+      model.endDataItemName,
+      nodeModel,
+    );
+    this._prevDataItemValue = calcDataItemValue(
       model.prevDataItemName,
       nodeModel,
     );
-    this.finishDataItemValue = calcDataItemValue(
+    this._finishDataItemValue = calcDataItemValue(
       model.finishDataItemName,
       nodeModel,
     );
-    this.totalDataItemValue = calcDataItemValue(
+    this._totalDataItemValue = calcDataItemValue(
       model.totalDataItemName,
       nodeModel,
     );