@ibiz-template/runtime 0.4.17-dev.1 → 0.5.0-beta.1

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

@@ -65,7 +65,7 @@ export class SearchBarController
    * @author: zhujiamin
    * @Date: 2023-12-21 10:17:43
    */
-  isBackendSearchGroup = true;
+  isBackendSearchGroup = this.model.searchBarStyle === 'SEARCHBAR2';
 
   /**
    * 表格控制器
@@ -103,6 +103,7 @@ export class SearchBarController
 
   protected async onCreated(): Promise<void> {
     await super.onCreated();
+
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId!,
       this.context.srfappid,
@@ -318,12 +319,46 @@ export class SearchBarController
     this.state.searchBarGroups = [];
     if (this.isBackendSearchGroup) {
       if (this.model.searchBarGroups && this.model.searchBarGroups.length > 0) {
-        this.state.searchBarGroups = this.model.searchBarGroups.map(item => ({
-          ...item,
-          show: true,
-          saved: false,
-          searchGroupData: {},
-        }));
+        this.state.searchBarGroups = this.model.searchBarGroups.map(
+          (item, index) => {
+            const tempGroup = {
+              ...item,
+              saved: false,
+              show: true,
+              searchGroupData: {} as IData,
+              order: (index + 1) * 100,
+            };
+            if (item.data) {
+              try {
+                // 解析data属性到对应位置
+                const tempData = JSON.parse(item.data);
+                if (tempData.theme_model) {
+                  if (tempData.theme_model.sort) {
+                    tempGroup.searchGroupData.sort = tempData.theme_model.sort;
+                  }
+                  if (tempData.theme_model.columnstates) {
+                    tempGroup.searchGroupData.columnstates =
+                      tempData.theme_model.columnstates;
+                  }
+                  if (tempData.theme_model.filternodes) {
+                    tempGroup.searchGroupData.filternodes =
+                      tempData.theme_model.filternodes;
+                  }
+                  if (tempData.theme_model.searchconds) {
+                    tempGroup.searchGroupData.searchconds =
+                      tempData.theme_model.searchconds;
+                  }
+                }
+                if (tempData.valid_flag) {
+                  tempGroup.show = tempData.valid_flag === '1';
+                }
+              } catch (error) {
+                ibiz.log.error(error);
+              }
+            }
+            return tempGroup;
+          },
+        );
       }
       // 请求并合并searchBarGroups ，这里只能拿到清单
       const res = await this.service.fetch();
@@ -337,16 +372,32 @@ export class SearchBarController
             mergeInLeft(existGroup, group);
             existGroup.saved = true;
           } else {
+            // 找出最大的order项的下标index，然后+2新增
+            const tempMaxOrderIndex = this.state.searchBarGroups.reduce(
+              (maxIndex, item, currentIndex) =>
+                item.order > this.state.searchBarGroups[maxIndex].order
+                  ? currentIndex
+                  : maxIndex,
+              0,
+            );
             this.state.searchBarGroups.push({
-              ...group,
               appId: this.context.srfappid,
-              show: true,
               saved: true,
+              show: true,
               searchGroupData: {},
+              order: (tempMaxOrderIndex + 2) * 100,
+              // 以后台给的为准
+              ...group,
             } as IBackendSearchBarGroup);
           }
         });
       }
+      // 按照 order 属性从小到大排序
+      this.state.searchBarGroups.sort((a, b) => a.order - b.order);
+      // 更新 order 属性的值
+      this.state.searchBarGroups.forEach((item, index) => {
+        item.order = (index + 1) * 100;
+      });
     }
   }
 
@@ -369,8 +420,9 @@ export class SearchBarController
       // 根据是否保存过决定是更新还是新建
       if (this.state.selectedSearchGroupItem.saved) {
         await this.service.update(this.state.selectedSearchGroupItem.id!, {
-          theme_model: saveParams,
+          searchGroupData: saveParams,
           show: this.state.selectedSearchGroupItem.show,
+          order: this.state.selectedSearchGroupItem.order,
         });
         ibiz.message.success('保存成功');
       } else {
@@ -404,6 +456,7 @@ export class SearchBarController
       const res = await this.service.get(groupItem.id!);
       if (res.ok) {
         mergeInLeft(groupItem, res.data);
+        groupItem.show = true;
       }
     }
     if (groupItem.searchGroupData && groupItem.searchGroupData.filternodes) {

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

@@ -114,31 +114,46 @@ export class SearchBarService {
     return res;
   }
 
+  /**
+   * 批量新建
+   * @param {IData} data
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-26 15:49:00
+   */
+  async createBatch(data: IData[]): Promise<IHttpResponse> {
+    const createParams = this.convertFrontDataToBack(data);
+    const res = await this.app.net.post(`${this.themeUrl}`, createParams);
+    return res;
+  }
+
   /**
    * 更新数据
    *
    */
   async update(id: string, data: IData): Promise<IHttpResponse> {
-    const updateParams = { app_view_tag: this.viewTag };
-    if (data.theme_model) {
-      Object.assign(updateParams, {
-        theme_model: JSON.stringify(data.theme_model),
-      });
-    }
-    if (data.caption) {
-      Object.assign(updateParams, {
-        name: data.caption,
-      });
-    }
-    if (typeof data.show === 'boolean') {
-      Object.assign(updateParams, {
-        show: data.show,
-      });
-    }
+    const [updateParams] = this.convertFrontDataToBack([data]);
     const res = await this.app.net.put(`${this.themeUrl}/${id}`, updateParams);
     return res;
   }
 
+  /**
+   * 批量更新数据
+   * @param {IData} data
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-26 11:11:34
+   */
+  async updateBatch(data: IData[]): Promise<IHttpResponse> {
+    const updateParams = this.convertFrontDataToBack(data);
+    const idUrl = updateParams.map(item => item.id).join(';');
+    const res = await this.app.net.put(
+      `${this.themeUrl}/${idUrl}`,
+      updateParams,
+    );
+    return res;
+  }
+
   /**
    * 转换后台数据成前端需要的格式
    * @param {IData} data
@@ -155,6 +170,45 @@ export class SearchBarService {
       if (item.theme_model) {
         tempItem.searchGroupData = JSON.parse(item.theme_model);
       }
+      if (typeof item.valid_flag === 'number') {
+        tempItem.show = item.valid_flag === 1;
+      }
+      if (item.order_value) {
+        tempItem.order = item.order_value;
+      }
+      return tempItem;
+    });
+  }
+
+  /**
+   * 转换前端数据成后台需要的格式
+   * @param {IData} data
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-22 11:19:50
+   */
+  convertFrontDataToBack(data: IData[]): IData[] {
+    return data.map(item => {
+      const tempItem: IData = {
+        appId: item.appId,
+        app_view_tag: this.viewTag,
+        id: item.id,
+      };
+      if (item.caption) {
+        tempItem.name = item.caption;
+      }
+      if (
+        item.searchGroupData &&
+        Object.keys(item.searchGroupData).length > 0
+      ) {
+        tempItem.theme_model = JSON.stringify(item.searchGroupData);
+      }
+      if (typeof item.show === 'boolean') {
+        tempItem.valid_flag = item.show ? 1 : 0;
+      }
+      if (item.order) {
+        tempItem.order_value = item.order;
+      }
       return tempItem;
     });
   }

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

@@ -1,6 +1,4 @@
-import { IGanttNodeData } from '../../state';
-import { EventBase } from '../argument';
-import { IMDControlEvent } from './i-md-control.event';
+import { ITreeGridExEvent } from './i-tree-grid-ex.event';
 
 /**
  * 甘特图事件
@@ -11,38 +9,4 @@ import { IMDControlEvent } from './i-md-control.event';
  * @interface IGanttEvent
  * @extends {IMDControlEvent}
  */
-export interface IGanttEvent extends IMDControlEvent {
-  /**
-   * 数据激活事件
-   *
-   * @type {({
-   *     event: EventBase & { nodeData: IGanttNodeData };
-   *     emitArgs: { data: IData[]; nodeData: IGanttNodeData };
-   *   })}
-   * @memberof IGanttEvent
-   */
-  onActive: {
-    event: EventBase & { nodeData: IGanttNodeData };
-    emitArgs: { data: IData[]; nodeData: IGanttNodeData };
-  };
-
-  /**
-   * 父节点刷新结束之后事件
-   *
-   * @type {({
-   *     event: EventBase & {
-   *       parentNode: IGanttNodeData;
-   *       children: IGanttNodeData[];
-   *     };
-   *     emitArgs: { parentNode: IGanttNodeData; children: IGanttNodeData[] };
-   *   })}
-   * @memberof IGanttEvent
-   */
-  onAfterRefreshParent: {
-    event: EventBase & {
-      parentNode: IGanttNodeData;
-      children: IGanttNodeData[];
-    };
-    emitArgs: { parentNode: IGanttNodeData; children: IGanttNodeData[] };
-  };
-}
+export interface IGanttEvent extends ITreeGridExEvent {}

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

@@ -1,5 +1,4 @@
-import { IColumnState } from './i-grid.state';
-import { IMDControlState } from './i-md-control.state';
+import { ITreeGridExState } from './i-tree-grid-ex.state';
 import { ITreeNodeData } from './i-tree.state';
 
 /**
@@ -11,43 +10,7 @@ import { ITreeNodeData } from './i-tree.state';
  * @interface IGanttState
  * @extends {ITreeState}
  */
-export interface IGanttState extends IMDControlState {
-  items: IGanttNodeData[];
-
-  /**
-   * 表格列状态数组
-   *
-   * @type {IColumnState[]}
-   * @memberof IGanttState
-   */
-  columnStates: IColumnState[];
-
-  /**
-   * 树的根节点
-   *
-   * @type {IGanttNodeData}
-   * @memberof IGanttState
-   */
-  rootNodes: IGanttNodeData[];
-
-  /**
-   * 查询条件
-   *
-   * @author tony001
-   * @date 2023-12-11 18:12:20
-   * @type {string}
-   */
-  query: string;
-
-  /**
-   * 快速搜索占位符
-   *
-   * @author tony001
-   * @date 2023-12-11 18:12:29
-   * @type {string}
-   */
-  placeHolder: string;
-
+export interface IGanttState extends ITreeGridExState {
   /**
    * 甘特图样式
    *
@@ -154,12 +117,4 @@ export interface IGanttNodeData extends ITreeNodeData {
    * @memberof IGanttNodeData
    */
   parent?: IGanttNodeData;
-
-  /**
-   * 节点数据项
-   *
-   * @type {IData}
-   * @memberof IGanttNodeData
-   */
-  nodeDataItem?: IData;
 }

package/src/interface/controller/state/control/i-search-bar.state.ts

@@ -151,7 +151,7 @@ export interface ISearchGroupData {
   searchconds?: IData;
 
   /**
-   * 表格排序
+   * 表格排序查询条件
    */
   sort?: string;
 }
@@ -177,6 +177,14 @@ export interface IBackendSearchBarGroup extends ISearchBarGroup {
    */
   show: boolean;
 
+  /**
+   * 分组排序值
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-26 11:21:02
+   */
+  order: number;
+
   /**
    * 搜索分组数据
    * @return {*}

package/src/interface/service/i-parent-config/i-parent-config.ts

@@ -0,0 +1,66 @@
+/**
+ * 父数据关系配置，用在数据域当中计算实体的父数据关系
+ *
+ * @author chitanda
+ * @date 2023-12-26 15:12:59
+ * @export
+ * @interface IParentConfig
+ */
+export interface IParentConfig {
+  /**
+   * 主实体代码标识
+   *
+   * @author chitanda
+   * @date 2023-12-26 15:12:08
+   * @type {string}
+   */
+  majorDECodeName: string;
+  /**
+   * 主实体代码标识2
+   *
+   * @author chitanda
+   * @date 2023-12-26 15:12:03
+   * @type {string}
+   */
+  majorDECodeName2: string;
+  /**
+   * 主实体名称
+   *
+   * @author chitanda
+   * @date 2023-12-26 15:12:57
+   * @type {string}
+   */
+  majorDEName: string;
+  /**
+   * 从实体代码标识
+   *
+   * @author chitanda
+   * @date 2023-12-26 15:12:52
+   * @type {string}
+   */
+  minorDECodeName: string;
+  /**
+   * 从实体代码标识2
+   *
+   * @author chitanda
+   * @date 2023-12-26 15:12:46
+   * @type {string}
+   */
+  minorDECodeName2: string;
+  /**
+   * 从实体名称
+   *
+   * @author chitanda
+   * @date 2023-12-26 15:12:41
+   * @type {string}
+   */
+  minorDEName: string;
+  /**
+   * 关系属性名称
+   *
+   * @author chitanda
+   * @date 2023-12-26 15:12:29
+   * @type {string}
+   */
+  pickupDEFName: string;
+}

package/src/interface/service/index.ts

@@ -1,3 +1,4 @@
 export type { CodeListItem } from './code-list-item/code-list-item';
 export type { IDataEntity } from './i-data-entity/i-data-entity';
+export type { IParentConfig } from './i-parent-config/i-parent-config';
 export type * from './service';

package/src/interface/service/service/i-app-de.service.ts

@@ -3,6 +3,7 @@ import { DECache } from '../../../service/utils';
 import { IFileService } from './i-file.service';
 import { IWorkFlowService } from './i-wf.service';
 import { IConfigService } from './i-config.service';
+import { IDataEntity } from '../i-data-entity/i-data-entity';
 
 /**
  * 实体服务
@@ -321,6 +322,18 @@ export interface IAppDEService {
     data?: IData,
   ): Promise<IHttpResponse>;
 
+  /**
+   * 创建当前数据对象实例
+   *
+   * @author chitanda
+   * @date 2023-12-23 19:12:01
+   * @param {(IData[] | IDataEntity[] | IData | IDataEntity)} data
+   * @return {*}  {(IDataEntity | IDataEntity[])}
+   */
+  createEntity(
+    data: IData[] | IDataEntity[] | IData | IDataEntity,
+  ): IDataEntity | IDataEntity[];
+
   /**
    * 当前实体服务销毁时调用
    *

package/src/service/de-service-util.ts

@@ -32,11 +32,13 @@ export class DEServiceUtil {
 
   /**
    * 实体服务构造方法缓存
+   *
    * @author lxm
    * @date 2023-05-15 08:37:13
    * @protected
    */
-  protected constructorCache: Map<string, DEServiceConstructor> = new Map();
+  protected static constructorCache: Map<string, DEServiceConstructor> =
+    new Map();
 
   /**
    * Creates an instance of DEServiceUtil.
@@ -55,8 +57,8 @@ export class DEServiceUtil {
    * @param {string} id 实体标识
    * @param {DEServiceConstructor} constructor
    */
-  register(id: string, constructor: DEServiceConstructor): void {
-    this.constructorCache.set(id, constructor);
+  static register(id: string, constructor: DEServiceConstructor): void {
+    this.constructorCache.set(id.toUpperCase(), constructor);
   }
 
   /**
@@ -82,7 +84,7 @@ export class DEServiceUtil {
       if (!entityModel) {
         throw new RuntimeError(`未找到应用实体[${id}]`);
       }
-      const constructor = this.constructorCache.get(id);
+      const constructor = DEServiceUtil.constructorCache.get(id.toUpperCase());
       let service: IAppDEService;
       if (constructor) {
         service = await constructor(sandboxId, entityModel);

package/src/service/dto/method.dto.ts

@@ -5,7 +5,6 @@ import {
   IAppDEMethodDTOField,
 } from '@ibiz/model-core';
 import { ModelError } from '@ibiz-template/core';
-import { AppDataEntity } from '../app-data-entity/app-data-entity';
 import { findModelChild } from '../../model';
 import { IAppDEService, IAppService, IDataEntity } from '../../interface';
 
@@ -28,6 +27,16 @@ export class MethodDto {
 
   protected dtoMap: Map<string, MethodDto> = new Map();
 
+  /**
+   * 当前 DTO 是否已经计算过关系相关逻辑
+   *
+   * @link this.calcRs
+   * @author chitanda
+   * @date 2023-12-26 16:12:18
+   * @protected
+   */
+  protected isCalcRs = false;
+
   constructor(
     protected service: IAppDEService,
     protected entity: IAppDataEntity,
@@ -95,6 +104,7 @@ export class MethodDto {
    */
   async get(context: IContext, data: IData): Promise<IData> {
     const params: IData = {};
+    const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
     // 拷贝数据
     for (let i = 0; i < this.fields.length; i++) {
       const field = this.fields[i];
@@ -121,12 +131,27 @@ export class MethodDto {
             if (!field.refAppDataEntityId) {
               break;
             }
+
+            // 获取当前需要打包子数据的关系配置
+            let configs = uiDomain.getDERConfig(field.refAppDataEntityId!);
+            // 找到当前层级所在下标
+            const index = configs.findIndex(
+              config => config.majorDECodeName === this.entity.codeName,
+            );
+            // 过滤出当前层级之后的关系配置
+            configs = configs.slice(index + 1);
+
             const dto = await this.getFieldDto(context, field);
             // 子数据过滤参数
             const filterParams: IParams = {};
             if (field.refPickupAppDEFieldId) {
               filterParams[field.refPickupAppDEFieldId!] = data.srfkey;
             }
+            // 子层级数据过滤参数对象必须为空
+            configs.forEach(config => {
+              filterParams[config.pickupDEFName.toLowerCase()] = null;
+            });
+
             const items = await dto.select(context, filterParams);
             if (items) {
               const arr = [];
@@ -156,12 +181,13 @@ export class MethodDto {
    * @date 2022-10-10 23:10:50
    * @param {IContext} context
    * @param {IData[]} data
-   * @return {*}  {Promise<AppDataEntity[]>}
+   * @return {*}  {Promise<IDataEntity[]>}
    */
-  async sets(context: IContext, data: IData[]): Promise<AppDataEntity[]> {
+  async sets(context: IContext, data: IData[]): Promise<IDataEntity[]> {
     if (this.isLocalMode) {
       this.service.local.clear();
     }
+    await this.calcRs(context);
     return Promise.all(
       data.map(async datum => {
         const all = this.fields
@@ -181,10 +207,11 @@ export class MethodDto {
                 const pKey = datum[this.entity.keyAppDEFieldId!];
                 // 特殊处理，在子包内设置父对象标识
                 items.forEach(item => {
-                  item.srfpkey = pKey;
                   item[field.refPickupAppDEFieldId!] = pKey;
                 });
                 await dto.sets(context, items);
+                // 删除下边一行代码，DTO 的属性也不能直接删除。界面上表单类似重复器的地方会用到，保存时也需要由界面提供
+                // delete datum[key];
               } else {
                 await dto.sets(context, []);
               }
@@ -193,7 +220,7 @@ export class MethodDto {
         for (let i = 0; i < all.length; i++) {
           await all[i];
         }
-        const entityData = new AppDataEntity(this.entity, datum);
+        const entityData = this.service.createEntity(datum) as IDataEntity;
         if (this.isLocalMode) {
           await this.service.local.add(context, entityData);
         }
@@ -202,6 +229,51 @@ export class MethodDto {
     );
   }
 
+  /**
+   * 递归计算当前 DTO 相关实体的父关系配置
+   *
+   * @author chitanda
+   * @date 2023-12-26 16:12:13
+   * @protected
+   * @param {IContext} context
+   * @param {number} [depth=0] 递归层级，避免进入死循环。最大递归层级为 10
+   * @return {*}  {Promise<void>}
+   */
+  protected async calcRs(context: IContext, depth: number = 0): Promise<void> {
+    if (this.isCalcRs || depth > 10) {
+      return;
+    }
+    this.isCalcRs = true;
+    depth += 1;
+
+    const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+    const dtoFields = this.fields.filter(field => field.type === 'DTOS');
+
+    for (let i = 0; i < dtoFields.length; i++) {
+      const field = dtoFields[i];
+      if (!field.refAppDataEntityId) {
+        continue;
+      }
+      const configs = uiDomain.getDERConfig(field.refAppDataEntityId!);
+      const index = configs.findIndex(
+        config => config.pickupDEFName === field.refPickupAppDEFieldId!,
+      );
+      if (index === -1) {
+        const dto = await this.getFieldDto(context, field);
+        uiDomain.setDERConfig(field.refAppDataEntityId!, {
+          majorDEName: this.entity.name!,
+          majorDECodeName: this.entity.codeName!,
+          majorDECodeName2: this.entity.codeName2!,
+          minorDEName: dto.entity.name!,
+          minorDECodeName: dto.entity.codeName!,
+          minorDECodeName2: dto.entity.codeName2!,
+          pickupDEFName: field.refPickupAppDEFieldId!,
+        });
+        await dto.calcRs(context, depth);
+      }
+    }
+  }
+
   /**
    * 获取子属性 DTO
    *

package/src/service/service/entity/de.service.ts

@@ -12,7 +12,8 @@ import { FileService } from '../file/file.service';
 import { findModelChild } from '../../../model';
 import { IAppDEService, IDataEntity } from '../../../interface';
 import { ConfigService } from '../config/config.service';
-import { getDEMethodProvider } from '../../../register/helper/de-method-register';
+import { getDEMethodProvider } from '../../../register';
+import { AppDataEntity } from '../../app-data-entity/app-data-entity';
 
 /**
  * 实体服务
@@ -378,6 +379,30 @@ export class DEService implements IAppDEService {
     return resPath + curPath;
   }
 
+  protected newEntity(data: IData | IDataEntity): IDataEntity {
+    if (data instanceof AppDataEntity) {
+      return data.clone();
+    }
+    return new AppDataEntity(this.model, data);
+  }
+
+  /**
+   * 创建数据对象实例
+   *
+   * @author chitanda
+   * @date 2023-12-23 19:12:57
+   * @param {(IData[] | IDataEntity[] | IData | IDataEntity)} data
+   * @return {*}  {(IDataEntity | IDataEntity[])}
+   */
+  createEntity(
+    data: IData[] | IDataEntity[] | IData | IDataEntity,
+  ): IDataEntity | IDataEntity[] {
+    if (Array.isArray(data)) {
+      return data.map(item => this.newEntity(item));
+    }
+    return this.newEntity(data);
+  }
+
   /**
    * 服务实例销毁
    *