@ibiz-template/runtime 0.5.0-beta.4 → 0.5.0

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

@@ -0,0 +1,178 @@
+import { IEditor, ISearchBarFilter } from '@ibiz/model-core';
+import { ValueOP } from '../../../constant';
+import { SearchBarController } from './search-bar.controller';
+import { ExcludeOPs } from './search-bar-filter.controller';
+
+const appId = '';
+
+/** 数据类型映射操作符号 */
+const typeToOPs: {
+  [p: string]: ValueOP[];
+} = {
+  string: [
+    ValueOP.EQ,
+    ValueOP.NOT_EQ,
+    ValueOP.IS_NULL,
+    ValueOP.IS_NOT_NULL,
+    ValueOP.USER_LIKE,
+    ValueOP.LIKE,
+    ValueOP.LIFT_LIKE,
+    ValueOP.RIGHT_LIKE,
+  ],
+  number: [
+    ValueOP.EQ,
+    ValueOP.GT,
+    ValueOP.GT_AND_EQ,
+    ValueOP.LT,
+    ValueOP.LT_AND_EQ,
+    ValueOP.NOT_EQ,
+    ValueOP.IS_NULL,
+    ValueOP.IS_NOT_NULL,
+    ValueOP.IN,
+    ValueOP.NOT_IN,
+  ],
+  date: [
+    ValueOP.EQ,
+    ValueOP.GT,
+    ValueOP.GT_AND_EQ,
+    ValueOP.LT,
+    ValueOP.LT_AND_EQ,
+    ValueOP.NOT_EQ,
+    ValueOP.IS_NULL,
+    ValueOP.IS_NOT_NULL,
+    ValueOP.IN,
+    ValueOP.NOT_IN,
+  ],
+};
+
+/** 数据类型和操作符映射的编辑器模型 */
+const EditorsMap: {
+  [p: string]: IEditor;
+} = {};
+
+/**
+ * 初始化默认映射的编辑器模型
+ * @author lxm
+ * @date 2024-01-02 10:32:05
+ * @param {string} type
+ * @param {string} op
+ * @return {*}  {IEditor}
+ */
+function initDefaultEditor(): void {
+  Object.keys(typeToOPs).forEach(type => {
+    const allowOPs = typeToOPs[type];
+    allowOPs.forEach(op => {
+      if (ExcludeOPs.includes(op)) {
+        return;
+      }
+
+      const key = `${type}_${op}`;
+      if (EditorsMap[key]) {
+        return;
+      }
+
+      if (type === 'date' && ![ValueOP.IN, ValueOP.NOT_IN].includes(op)) {
+        EditorsMap[key] = {
+          appId,
+          editorType: 'DATEPICKER',
+          id: key,
+        };
+      } else {
+        // 都可以给字符串类型
+        EditorsMap[key] = {
+          appId,
+          editorType: 'TEXTBOX',
+          id: key,
+        };
+      }
+    });
+  });
+}
+
+initDefaultEditor();
+
+/**
+ * 根据json模型计算出过滤项模型
+ * @author lxm
+ * @date 2024-01-02 10:27:40
+ * @export
+ * @param {IData} json
+ * @param {SearchBarController} c
+ * @return {*}  {ISearchBarFilter[]}
+ */
+export function calcFilterModelBySchema(
+  json: IData,
+  c: SearchBarController,
+): ISearchBarFilter[] {
+  if (!json.properties) {
+    return [];
+  }
+  const { properties } = json;
+  if (!(Object.keys(properties).length > 0)) {
+    return [];
+  }
+
+  const addFields: {
+    key: string;
+    description: string;
+    type: string;
+  }[] = [];
+
+  Object.keys(properties).forEach((key: string) => {
+    let type: string;
+
+    switch (properties[key].type) {
+      case 'string':
+        type = 'string';
+        if (properties[key].format === 'date-time') {
+          type = 'date';
+        }
+        break;
+      case 'integer':
+      case 'number':
+        type = 'number';
+        break;
+      default:
+        ibiz.log.error(`未支持的类型${properties[key].type}`);
+        return;
+    }
+
+    addFields.push({
+      key,
+      description: properties[key].description,
+      type,
+    });
+  });
+
+  // 属性codeName对应的属性id
+  const codeNameToId: { [p: string]: string } = {};
+  c.appDataEntity.appDEFields?.forEach(field => {
+    codeNameToId[field.codeName!.toLowerCase()] = field.id!;
+  });
+
+  const addSearchBarFilters: ISearchBarFilter[] = [];
+
+  addFields.forEach(item => {
+    const ops = typeToOPs[item.type];
+    if (!ops) {
+      ibiz.log.error('未支持的类型', item.type);
+      return;
+    }
+    ops.forEach(op => {
+      const editorModel = EditorsMap[`${item.type}_${op}`];
+      addSearchBarFilters.push({
+        appId,
+        appDEFieldId: codeNameToId[item.key],
+        id: item.key,
+        caption: item.description,
+        defsearchMode: {
+          appId,
+          valueOP: op,
+        },
+        editor: editorModel,
+      });
+    });
+  });
+
+  return addSearchBarFilters;
+}

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

@@ -8,6 +8,13 @@ import {
 import { findFieldById } from '../../../model';
 import { getEditorProvider } from '../../../register';
 import { SearchBarController } from './search-bar.controller';
+import { ValueOP } from '../../../constant';
+
+/** 不需要编辑器的OP */
+export const ExcludeOPs: string[] = [
+  ValueOP.IS_NULL,
+  ValueOP.IS_NOT_NULL,
+] as const;
 
 /**
  * 搜索栏过滤项控制器
@@ -73,6 +80,14 @@ export class SearchBarFilterController implements IEditorContainerController {
    */
   valueOP?: string;
 
+  /**
+   * 不需要编辑器
+   * @author lxm
+   * @date 2024-01-02 11:08:45
+   * @type {boolean}
+   */
+  noEditor: boolean = false;
+
   constructor(
     public model: ISearchBarFilter,
     public searchBar: SearchBarController,
@@ -88,6 +103,12 @@ export class SearchBarFilterController implements IEditorContainerController {
     this.label = model.caption || field?.logicName || model.id!;
 
     this.valueOP = model.defsearchMode?.valueOP;
+
+    // 有操作符的，如果是isnull，isnotnull这种，就是无编辑器
+    // 没有操作符的如果没有配置编辑器，就是无编辑器
+    this.noEditor = this.valueOP
+      ? ExcludeOPs.includes(this.valueOP)
+      : !this.model.editor;
   }
 
   /**
@@ -97,16 +118,18 @@ export class SearchBarFilterController implements IEditorContainerController {
    * @return {*}  {Promise<void>}
    */
   async init(): Promise<void> {
-    if (!this.model.editor) {
-      throw new RuntimeModelError(this.model, '缺少编辑器模型');
-    }
+    if (!this.noEditor) {
+      if (!this.model.editor) {
+        throw new RuntimeModelError(this.model, '缺少编辑器模型');
+      }
 
-    this.editorProvider = await getEditorProvider(this.model.editor);
-    if (this.editorProvider) {
-      this.editor = await this.editorProvider.createController(
-        this.model.editor,
-        this,
-      );
+      this.editorProvider = await getEditorProvider(this.model.editor);
+      if (this.editorProvider) {
+        this.editor = await this.editorProvider.createController(
+          this.model.editor,
+          this,
+        );
+      }
     }
   }
 }

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

@@ -3,7 +3,7 @@ import {
   mergeInLeft,
   recursiveIterate,
 } from '@ibiz-template/core';
-import { IAppDataEntity, ISearchBar } from '@ibiz/model-core';
+import { IAppDataEntity, ISearchBar, ISearchBarFilter } from '@ibiz/model-core';
 import { isNil } from 'ramda';
 import {
   ISearchBarState,
@@ -17,6 +17,8 @@ import { convertNavData, ScriptFactory } from '../../../utils';
 import { ControlController } from '../../common';
 import { SearchBarFilterController } from './search-bar-filter.controller';
 import { SearchBarService } from './search-bar.service';
+import { getEntitySchema } from '../../utils';
+import { calcFilterModelBySchema } from './entity-schema';
 
 /**
  * 搜索栏控制器
@@ -71,6 +73,22 @@ export class SearchBarController
    */
   isBackendSearchGroup = this.model.searchBarStyle === 'SEARCHBAR2';
 
+  /**
+   * 启用自定义过滤项
+   * @author lxm
+   * @date 2023-12-29 04:15:34
+   * @type {boolean}
+   */
+  enableFilter: boolean = this.model.enableFilter === true;
+
+  /**
+   * 最终使用的searchBarFilters
+   * @author lxm
+   * @date 2023-12-29 06:55:13
+   * @type {ISearchBarFilter[]}
+   */
+  searchBarFilters!: ISearchBarFilter[];
+
   /**
    * 表格控制器
    * @return {*}
@@ -93,16 +111,24 @@ export class SearchBarController
     super.initState();
     this.state.query = '';
     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 ||
       this.model.enableGroup ||
-      this.model.enableFilter
+      this.enableFilter
     );
-    if (this.model.enableFilter) {
-      this.resetFilter();
-    }
-    this.state.searchBarGroups = [];
-    this.state.selectedSearchGroupItem = null;
   }
 
   protected async onCreated(): Promise<void> {
@@ -123,10 +149,44 @@ export class SearchBarController
       await this.service.init(this.context);
     }
 
+    await this.initByEntitySchema();
     await this.initSearchBarFilters();
     await this.initSearBarGroups();
   }
 
+  /**
+   * 根据实体jsonschema初始化
+   * @author lxm
+   * @date 2023-12-29 04:21:31
+   * @return {*}  {Promise<void>}
+   */
+  async initByEntitySchema(): Promise<void> {
+    this.enableFilter = true;
+    const json = await getEntitySchema(this.appDataEntity.id!, this.context);
+    if (!json) {
+      return;
+    }
+    const addSearchBarFilters = calcFilterModelBySchema(json, this);
+
+    const mergeFilters: ISearchBarFilter[] = [];
+    this.model.searchBarFilters?.forEach(filter => {
+      const findindex = addSearchBarFilters.findIndex(
+        item =>
+          item.appDEFieldId === filter.appDEFieldId &&
+          (filter.defsearchMode?.valueOP
+            ? item.defsearchMode!.valueOP === filter.defsearchMode.valueOP
+            : true),
+      );
+      if (findindex === -1) {
+        mergeFilters.push(filter);
+      }
+    });
+
+    addSearchBarFilters.push(...mergeFilters);
+
+    this.searchBarFilters = addSearchBarFilters;
+  }
+
   /**
    * 计算快速搜索的占位
    * @author lxm
@@ -233,8 +293,8 @@ export class SearchBarController
    * @return {*}  {Promise<void>}
    */
   protected async initSearchBarFilters(): Promise<void> {
-    if (this.model.searchBarFilters?.length) {
-      this.model.searchBarFilters.forEach(item => {
+    if (this.searchBarFilters?.length) {
+      this.searchBarFilters.forEach(item => {
         const filterController = new SearchBarFilterController(item, this);
         this.filterControllers.push(filterController);
       });

package/src/controller/control/tree/tree.controller.ts

@@ -585,7 +585,7 @@ export class TreeController<
         !parent ||
         (!this.model.rootVisible && this.state.rootNodes.includes(parent))
       ) {
-        this.refresh();
+        await this.refresh();
         return;
       }
     }

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

@@ -1,6 +1,81 @@
-import { ITreeGridController } from '../../../interface';
+import { IDEGridFieldColumn, IDETreeGrid } from '@ibiz/model-core';
+import { RuntimeModelError } from '@ibiz-template/core';
+import {
+  ITreeGridController,
+  ITreeGridEvent,
+  ITreeGridState,
+} from '../../../interface';
 import { GridController } from '../grid';
 
-export class TreeGridController
-  extends GridController
-  implements ITreeGridController {}
+export class TreeGridController<
+    T extends IDETreeGrid = IDETreeGrid,
+    S extends ITreeGridState = ITreeGridState,
+    E extends ITreeGridEvent = ITreeGridEvent,
+  >
+  extends GridController<T, S, E>
+  implements ITreeGridController<T, S, E>
+{
+  /**
+   * 树表格值属性名称
+   *
+   */
+  treeGridValueField: string = '';
+
+  /**
+   * 树表格父属性名称
+   *
+   */
+  treeGridParentField: string = '';
+
+  protected initState(): void {
+    super.initState();
+    this.state.showTreeGrid = true;
+  }
+
+  /**
+   * 初始化方法
+   *
+   * @author lxm
+   * @date 2022-08-18 22:08:17
+   * @protected
+   * @returns {*}  {Promise<void>}
+   */
+  protected async onCreated(): Promise<void> {
+    await super.onCreated();
+
+    this.initTreeGridField();
+  }
+
+  /**
+   * 初始化树表格字段
+   * @return {*}
+   * @author: zhujiamin
+   */
+  protected initTreeGridField(): void {
+    const treeGridParent: IDEGridFieldColumn | undefined =
+      this.model.degridColumns?.find((item: IDEGridFieldColumn) => {
+        return item.treeColumnMode === 4 || item.treeColumnMode === 12;
+      });
+    const treeGridValue: IDEGridFieldColumn | undefined =
+      this.model.degridColumns?.find((item: IDEGridFieldColumn) => {
+        return item.treeColumnMode === 2 || item.treeColumnMode === 3;
+      });
+    if (!treeGridParent) {
+      throw new RuntimeModelError(this.model, '树表格无值列模式');
+    }
+    if (!treeGridValue) {
+      throw new RuntimeModelError(this.model, '树表格无父值列模式');
+    }
+    this.treeGridValueField = treeGridValue.appDEFieldId!.toLowerCase();
+    this.treeGridParentField = treeGridParent.appDEFieldId!.toLowerCase();
+  }
+
+  /**
+   * 切换树表格显示
+   * @return {*}
+   * @author: zhujiamin
+   */
+  switchTreeGridShow(): void {
+    this.state.showTreeGrid = !this.state.showTreeGrid;
+  }
+}

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

@@ -9,7 +9,6 @@ import {
   ITreeNodeData,
 } from '../../../interface';
 import { getTreeGridExColumnProvider } from '../../../register';
-
 import { TreeGridExService } from './tree-grid-ex.service';
 import { TreeController } from '../tree/tree.controller';
 import {
@@ -103,14 +102,15 @@ export class TreeGridExController<
   protected initState(): void {
     super.initState();
     this.state.columnStates = [];
+    this.state.rootNodes = [];
     this.state.rows = {};
   }
 
   protected async onCreated(): Promise<void> {
     await super.onCreated();
 
-    this.initColumnStates();
     await this.initGridColumns();
+    this.initColumnStates();
   }
 
   protected async initService(): Promise<void> {

package/src/controller/utils/index.ts

@@ -8,3 +8,4 @@ export * from './value-rule/value-rule';
 export * from './value-ex/value-ex';
 export * from './value-default/value-default';
 export * from './data-file-util/data-file-util';
+export * from './jsonschema/index';

package/src/controller/utils/jsonschema/entity.ts

@@ -0,0 +1,19 @@
+/**
+ * 获取实体的jsonschema
+ * @author lxm
+ * @date 2023-12-29 04:03:58
+ * @export
+ * @param {string} entityId
+ * @param {IContext} context
+ * @return {*}  {Promise<IData>}
+ */
+export async function getEntitySchema(
+  entityId: string,
+  context: IContext,
+): Promise<IData> {
+  const app = ibiz.hub.getApp(context.srfappid);
+  const entity = await ibiz.hub.getAppDataEntity(entityId, context.srfappid);
+  const url = `/jsonschema/${entity.name}`;
+  const res = await app.net.get(url);
+  return res.data;
+}

package/src/controller/utils/jsonschema/index.ts

@@ -0,0 +1 @@
+export * from './entity';

package/src/interface/common/i-app-hub-service/i-app-hub-service.ts

@@ -165,4 +165,11 @@ export interface IAppHubService {
    * @return {*}  {IAppService[]}
    */
   getAllApps(): IAppService[];
+
+  /**
+   * 重置清空基座
+   * @author lxm
+   * @date 2024-01-03 06:46:57
+   */
+  reset(): void;
 }

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

@@ -13,8 +13,11 @@ import { CodeListItem } from '../../../service';
  * @interface IGridController
  * @extends {IMDControlController}
  */
-export interface IGridController
-  extends IMDControlController<IDEGrid, IGridState, IGridEvent> {
+export interface IGridController<
+  T extends IDEGrid = IDEGrid,
+  S extends IGridState = IGridState,
+  E extends IGridEvent = IGridEvent,
+> extends IMDControlController<T, S, E> {
   /**
    * 新建行
    *

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

@@ -1,4 +1,7 @@
+import { IDETreeGrid } from '@ibiz/model-core';
 import { IGridController } from './i-grid.controller';
+import { ITreeGridState } from '../../state';
+import { ITreeGridEvent } from '../../event';
 
 /**
  * 树表格部件控制器
@@ -9,4 +12,16 @@ import { IGridController } from './i-grid.controller';
  * @interface ITreeGridController
  * @extends {IMDControlController<IDETreeGrid, ITreeGridState, ITreeGridEvent>}
  */
-export interface ITreeGridController extends IGridController {}
+export interface ITreeGridController<
+  T extends IDETreeGrid = IDETreeGrid,
+  S extends ITreeGridState = ITreeGridState,
+  E extends ITreeGridEvent = ITreeGridEvent,
+> extends IGridController<T, S, E> {
+  /**
+   * 切换树表格显示
+   * @return {*}
+   * @author: zhujiamin
+   *
+   */
+  switchTreeGridShow(): void;
+}

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

@@ -9,4 +9,10 @@ import { IGridState } from './i-grid.state';
  * @interface ITreeGridState
  * @extends {IMDControlState}
  */
-export interface ITreeGridState extends IGridState {}
+export interface ITreeGridState extends IGridState {
+  /**
+   * 树表格是否显示树形结构(默认为true)
+   *
+   */
+  showTreeGrid: boolean;
+}

package/src/interface/provider/i-app-menu-item.provider.ts

@@ -0,0 +1,40 @@
+import { IAppMenuItem } from '@ibiz/model-core';
+import { IAppMenuController } from '../controller';
+
+/**
+ * 应用菜单项适配器的接口
+ *
+ * @author lxm
+ * @date 2022-10-25 13:10:45
+ * @export
+ * @interface IAppMenuItemProvider
+ */
+export interface IAppMenuItemProvider {
+  /**
+   * 执行界面行为
+   * @author lxm
+   * @date 2023-05-08 09:55:06
+   * @param {IAppDEUIAction} action
+   * @param {IUILogicParams} params
+   * @return {*}  {Promise<IUIActionResult>}
+   */
+  onClick?(
+    menuItem: IAppMenuItem,
+    event: MouseEvent,
+    AppMenuController: IAppMenuController,
+  ): Promise<void>;
+
+  /**
+   * 绘制菜单项文本
+   * @author lxm
+   * @date 2023-12-29 03:05:22
+   * @param {IAppMenuItem} menuItem
+   * @param {IAppMenuController} AppMenuController
+   * @return {*}  {*}
+   */
+  renderText?(
+    menuItem: IAppMenuItem,
+    AppMenuController: IAppMenuController,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  ): any;
+}

package/src/interface/provider/index.ts

@@ -17,3 +17,4 @@ export type {
   IDEMethodCreateOptions,
 } from './i-de-method.provider';
 export type { ITreeGridExColumnProvider } from './i-tree-grid-ex-column.provider';
+export type { IAppMenuItemProvider } from './i-app-menu-item.provider';

package/src/interface/service/i-data-entity/i-data-entity.ts

@@ -1,4 +1,3 @@
-import { HistoryList } from '@ibiz-template/core';
 import { Srfuf } from '../../../service';
 
 /**
@@ -94,15 +93,6 @@ export interface IDataEntity {
    */
   srfuf: Srfuf;
 
-  /**
-   * 数据历史记录，可用于撤销操作
-   *
-   * @author chitanda
-   * @date 2023-12-28 21:12:08
-   * @type {HistoryList<IData>}
-   */
-  readonly history: HistoryList<IData>;
-
   /**
    * 提供当前数据克隆操作，返回克隆后的当前实例
    *
@@ -115,19 +105,10 @@ export interface IDataEntity {
   /**
    * 将指定的数据对象或者实体数据对象的属性值赋值到当前实体
    *
-   * @description 该方法会先创建一次历史记录，销毁此对象时必须调用 history.destroy() 方法
    * @author chitanda
    * @date 2023-05-16 17:05:26
    * @param {(IData | IDataEntity)} data
    * @return {*}  {IDataEntity}
    */
   assign(data: IData | IDataEntity): IDataEntity;
-
-  /**
-   * 销毁当前实体对象
-   *
-   * @author chitanda
-   * @date 2023-12-28 21:12:40
-   */
-  destroy(): void;
 }