@ibiz-template/runtime 0.1.28 → 0.1.29-dev.0

package/src/controller/utils/view-msg/view-msg-controller.ts

@@ -0,0 +1,250 @@
+import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
+import {
+  IAppDataEntity,
+  IAppDEDataSetViewMsg,
+  IAppViewMsg,
+  IAppViewMsgGroup,
+  IAppViewMsgGroupDetail,
+} from '@ibiz/model-core';
+import { isNil, mergeRight } from 'ramda';
+import { IViewMessage } from '../../../interface';
+import { findFieldById } from '../../../model';
+
+export class ViewMsgController {
+  /**
+   * 视图消息组模型
+   * @author lxm
+   * @date 2023-09-22 05:37:24
+   * @type {IAppViewMsgGroup}
+   */
+  msgGroup!: IAppViewMsgGroup;
+
+  /**
+   * 视图消息map
+   * @author lxm
+   * @date 2023-09-22 05:38:03
+   */
+  viewMsgMap = new Map<string, IAppViewMsg>();
+
+  constructor(protected msgGroupId: string) {}
+
+  /**
+   * 初始化方法，从全局获取视图消息组和视图消息的模型
+   * @author lxm
+   * @date 2023-09-22 05:41:08
+   * @param {IContext} context
+   * @return {*}  {Promise<void>}
+   */
+  async init(context: IContext): Promise<void> {
+    const appModel = ibiz.hub.getApp(context.srfappid).model;
+    const msgGroup = appModel.appViewMsgGroups?.find(
+      item => item.id === this.msgGroupId,
+    );
+    if (!msgGroup) {
+      throw new RuntimeError(`找不到视图消息组${this.msgGroupId}的模型`);
+    }
+    this.msgGroup = msgGroup;
+
+    const msgDetailsViewMsgIds = msgGroup.appViewMsgGroupDetails!.map(
+      item => item.appViewMsgId,
+    );
+    appModel.appViewMsgs?.forEach(item => {
+      const index = msgDetailsViewMsgIds.indexOf(item.id);
+      if (index !== -1) {
+        this.viewMsgMap.set(item.id!, item);
+        msgDetailsViewMsgIds.splice(index, 1);
+      }
+    });
+    if (msgDetailsViewMsgIds.length) {
+      throw new RuntimeError(
+        `没有找到${msgDetailsViewMsgIds.join(',')}视图消息模型`,
+      );
+    }
+  }
+
+  getDeFieldName(
+    appDataEntity: IAppDataEntity,
+    fieldId?: string,
+  ): string | undefined {
+    if (!fieldId) {
+      return;
+    }
+    return findFieldById(appDataEntity, fieldId)?.name?.toLowerCase();
+  }
+
+  /**
+   * 查询并获取指定实体的数据集数据
+   * @author lxm
+   * @date 2023-09-20 08:10:57
+   * @static
+   * @param {IPSAppDEDataSetViewMsg} msgModel
+   * @param {IParams} [context={}]
+   * @param {IParams} [params={}]
+   * @return {*}  {Promise<IData[]>}
+   */
+  static async fetchDataSet(
+    msgModel: IAppDEDataSetViewMsg,
+    context: IContext,
+    params: IParams,
+  ): Promise<IData[]> {
+    const { appDataEntityId, appDEDataSetId } = msgModel;
+    if (!appDEDataSetId) {
+      throw new RuntimeModelError(msgModel, '未配置实体数据集');
+    }
+
+    // 查询数据
+    const res = await ibiz.hub
+      .getApp(context.srfappid)
+      .deService.exec(appDataEntityId!, appDEDataSetId, context, params);
+
+    if (res.data.length) {
+      return res.data as IData[];
+    }
+    return [];
+  }
+
+  /**
+   * 计算视图信息呈现数据
+   * @author lxm
+   * @date 2023-09-20 09:16:59
+   * @param {IContext} context
+   * @param {IParams} params
+   * @return {*}  {IViewMessage[]}
+   */
+  async calcViewMessages(
+    context: IContext,
+    params: IParams,
+  ): Promise<IViewMessage[]> {
+    const details = this.msgGroup.appViewMsgGroupDetails;
+    const result: IViewMessage[] = [];
+    if (details?.length) {
+      await Promise.all(
+        details.map(async detail => {
+          const msgModel = this.viewMsgMap.get(detail.appViewMsgId!)!;
+          if (msgModel.dynamicMode === 1) {
+            // 动态
+            const msgs = await this.calcDynaMsgs(detail, context, params);
+            result.push(...msgs);
+          } else {
+            // 静态
+            const msgData = this.calcStaticMsg(detail);
+            result.push(msgData);
+          }
+        }),
+      );
+    }
+    return result;
+  }
+
+  /**
+   * 计算静态消息数据(或者动态的里面静态的配置)
+   * @author lxm
+   * @date 2023-09-20 09:46:45
+   * @protected
+   * @param {IPSAppViewMsgGroupDetail} detail
+   * @return {*}  {IViewMessage}
+   */
+  protected calcStaticMsg(detail: IAppViewMsgGroupDetail): IViewMessage {
+    const { position: position1 } = detail;
+    const {
+      title,
+      message,
+      removeMode,
+      position: position2,
+      messageType,
+    } = this.viewMsgMap.get(detail.appViewMsgId!)!;
+    // detail里的位置优先
+    const position = position1 || position2;
+    return {
+      title,
+      message,
+      position,
+      messageType,
+      removeMode,
+    };
+  }
+
+  /**
+   * 计算动态视图消息数据
+   * @author lxm
+   * @date 2023-09-20 09:46:26
+   * @protected
+   * @param {IPSAppViewMsgGroupDetail} detail
+   * @param {IContext} context
+   * @param {IParams} params
+   * @return {*}  {Promise<IViewMessage[]>}
+   */
+  protected async calcDynaMsgs(
+    detail: IAppViewMsgGroupDetail,
+    context: IContext,
+    params: IParams,
+  ): Promise<IViewMessage[]> {
+    const msgModel = this.viewMsgMap.get(
+      detail.appViewMsgId!,
+    ) as IAppDEDataSetViewMsg;
+
+    const {
+      appDataEntityId,
+      orderValueAppDEFieldId,
+      titleAppDEFieldId,
+      removeFlagAppDEFieldId,
+      msgTypeAppDEFieldId,
+      contentAppDEFieldId,
+      msgPosAppDEFieldId,
+    } = msgModel;
+    if (!appDataEntityId) {
+      throw new RuntimeModelError(msgModel, '未配置应用实体');
+    }
+
+    const entity = await ibiz.hub.getAppDataEntity(
+      appDataEntityId!,
+      context.srfappid,
+    );
+
+    // 排序属性
+    const fetchParams = { ...params };
+    const sortField = this.getDeFieldName(entity, orderValueAppDEFieldId);
+    if (sortField) {
+      fetchParams.sort = `${sortField},asc`;
+    }
+
+    const dataSet = await ViewMsgController.fetchDataSet(
+      msgModel,
+      context,
+      fetchParams,
+    );
+    if (!dataSet.length) {
+      return [];
+    }
+
+    const basicMsg = this.calcStaticMsg(detail); // 基础静态的消息
+    const titleField = this.getDeFieldName(entity, titleAppDEFieldId);
+    const positionField = this.getDeFieldName(entity, msgPosAppDEFieldId);
+    const messageField = this.getDeFieldName(entity, contentAppDEFieldId);
+    const typeField = this.getDeFieldName(entity, msgTypeAppDEFieldId);
+    const removeModeField = this.getDeFieldName(entity, removeFlagAppDEFieldId);
+
+    const deViewMessages: IViewMessage[] = dataSet.map(item => {
+      const message: Partial<IViewMessage> = {};
+      if (positionField && !isNil(item[positionField])) {
+        message.position = item[positionField];
+      }
+      if (titleField && !isNil(item[titleField])) {
+        message.title = item[titleField];
+      }
+      if (messageField && !isNil(item[messageField])) {
+        message.message = item[messageField];
+      }
+      if (typeField && !isNil(item[typeField])) {
+        message.messageType = item[typeField];
+      }
+      if (removeModeField && !isNil(item[removeModeField])) {
+        message.removeMode = item[removeModeField];
+      }
+      // 合并基础配置，如果后台没有值的用基础配置的默认值。
+      return mergeRight(basicMsg, message);
+    });
+
+    return deViewMessages;
+  }
+}

package/src/de-logic/de-logic-context.ts

@@ -114,4 +114,16 @@ export class DELogicContext {
       get: () => this.lastReturn,
     });
   }
+
+  /**
+   * 是否是实体参数变量（即后台数据对象）
+   * @author lxm
+   * @date 2023-09-22 03:40:30
+   * @param {string} paramId
+   * @return {*}  {boolean}
+   */
+  isEntityParam(paramId: string): boolean {
+    const deLogicParams = this.deLogicParams.get(paramId);
+    return !!(deLogicParams && deLogicParams.model.entityParam);
+  }
 }

package/src/de-logic/de-logic-node/prepare-param-node/prepare-param-node.ts

@@ -95,7 +95,13 @@ export class PrepareParamNode extends DELogicNode {
   ): void {
     const { dstFieldName, dstDELogicParamId } = nodeParam;
     // 目标参数
-    const dstField = dstFieldName?.toLowerCase();
+    let dstField = dstFieldName;
+
+    // 实体参数对象转小写
+    if (ctx.isEntityParam(dstDELogicParamId!)) {
+      dstField = dstField?.toLowerCase();
+    }
+
     // 源参数
     const srcVal = handleSrcVal(ctx, nodeParam);
     if (dstField) {

package/src/de-logic/utils/handle-src-val.ts

@@ -1,5 +1,6 @@
 import { ModelError } from '@ibiz-template/core';
 import { clone } from 'ramda';
+import { ScriptFactory } from '../../utils';
 import { DELogicContext } from '../de-logic-context';
 
 type SrcValParams = {
@@ -34,18 +35,21 @@ export function handleSrcVal(
   ctx: DELogicContext,
   srcValParams: SrcValParams,
 ): unknown {
-  const { srcDELogicParamId, srcValueType, srcFieldName, srcValue } =
-    srcValParams;
-
+  const { srcDELogicParamId, srcFieldName, srcValue } = srcValParams;
   // 没有源值类型就是逻辑参数
-  if (!srcValParams.srcValueType) {
-    srcValParams.srcValueType = 'SRCDLPARAM';
-  }
+  const srcValueType = srcValParams.srcValueType || 'SRCDLPARAM';
+  // 取属性值
+  let srcField = srcFieldName;
+
   let value: unknown;
   switch (srcValueType) {
     // 源逻辑参数
     case 'SRCDLPARAM':
       value = ctx.params[srcDELogicParamId!];
+      // 如果是实体参数对象则转换成小写。
+      if (ctx.isEntityParam(srcDELogicParamId!)) {
+        srcField = srcField?.toLowerCase();
+      }
       break;
     // 空值类型
     case 'NULLVALUE':
@@ -74,11 +78,20 @@ export function handleSrcVal(
       throw new ModelError(srcValParams, `暂未支持源值类型${srcValueType}`);
   }
 
-  // 取属性值
-  const srcField = srcFieldName?.toLowerCase();
   if (value && srcField) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    value = (value as any)[srcField];
+    try {
+      value = ScriptFactory.execScriptFn(
+        { srcValue: value },
+        `srcValue.${srcField}`,
+        {
+          singleRowReturn: true,
+          isAsync: false,
+        },
+      );
+    } catch (error) {
+      ibiz.log.error(`从源参数取属性${srcField}报错，源参数：`, value);
+      throw error;
+    }
   }
 
   return value;

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

@@ -4,6 +4,7 @@ import { Convert } from '../../../hub';
 import { ModelLoaderProvider } from '../../provider';
 import { IAppConfigService } from '../i-app-config-service/i-app-config-service';
 import { IHubController } from '../../controller';
+import { IConfigService } from '../../service';
 
 /**
  * 应用 hub 服务
@@ -32,6 +33,15 @@ export interface IAppHubService {
    */
   readonly controller: IHubController;
 
+  /**
+   * 基座级配置存储服务
+   *
+   * @author chitanda
+   * @date 2023-09-22 10:09:59
+   * @type {IConfigService}
+   */
+  configCache: IConfigService;
+
   /**
    * 默认应用首页视图
    *

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

@@ -4,6 +4,7 @@ import {
   CodeListService,
   DEServiceUtil,
 } from '../../../service';
+import { IConfigService } from '../../service';
 
 /**
  * 应用服务
@@ -32,6 +33,15 @@ export interface IAppService {
    */
   readonly net: Net;
 
+  /**
+   * 应用级配置存储服务
+   *
+   * @author chitanda
+   * @date 2023-09-22 10:09:58
+   * @type {IConfigService}
+   */
+  readonly configCache: IConfigService;
+
   /**
    * 实体服务工具类
    *

package/src/interface/controller/common/index.ts

@@ -1,3 +1,4 @@
 export * from './button-state';
 export * from './i-icon/i-icon';
 export * from './i-nav-view-msg/i-nav-view-msg';
+export * from './view-message/i-view-message';

package/src/interface/controller/common/view-message/i-view-message.ts

@@ -0,0 +1,42 @@
+import { IAppViewMsg } from '@ibiz/model-core';
+
+export interface IViewMessage {
+  /**
+   * 位置
+   * @author lxm
+   * @date 2023-09-20 07:52:52
+   * @type {IPSAppViewMsg['position']}
+   */
+  position: IAppViewMsg['position'];
+
+  /**
+   * 消息类型
+   * @author lxm
+   * @date 2023-09-20 09:11:34
+   * @type {IAppViewMsg['messageType']}
+   */
+  messageType?: IAppViewMsg['messageType'];
+
+  /**
+   * 消息删除模式
+   * @author lxm
+   * @date 2023-09-20 09:11:35
+   * @type {IAppViewMsg['removeMode']}
+   */
+  removeMode?: IAppViewMsg['removeMode'];
+
+  /**
+   * 标题
+   * @author lxm
+   * @date 2023-09-20 02:26:33
+   * @type {string}
+   */
+  title?: string;
+  /**
+   * 消息内容
+   * @author lxm
+   * @date 2023-09-20 02:26:32
+   * @type {string}
+   */
+  message?: string;
+}

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

@@ -0,0 +1,20 @@
+import { IDETreeGrid } from '@ibiz/model-core';
+import { ITreeGridExEvent } from '../../event';
+import { ITreeGridExState } from '../../state';
+import { IMDControlController } from './i-md-control.controller';
+
+/**
+ * 树表格(增强)部件控制器
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:17
+ * @export
+ * @interface ITreeGridController
+ * @extends {IMDControlController<IDETreeGrid, ITreeGridState, ITreeGridEvent>}
+ */
+export interface ITreeGridExController
+  extends IMDControlController<
+    IDETreeGrid,
+    ITreeGridExState,
+    ITreeGridExEvent
+  > {}

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

@@ -0,0 +1,12 @@
+import { IGridController } from './i-grid.controller';
+
+/**
+ * 树表格部件控制器
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:17
+ * @export
+ * @interface ITreeGridController
+ * @extends {IMDControlController<IDETreeGrid, ITreeGridState, ITreeGridEvent>}
+ */
+export interface ITreeGridController extends IGridController {}

package/src/interface/controller/controller/control/index.ts

@@ -31,3 +31,5 @@ export * from './i-calendar.controller';
 export * from './i-calendar-exp-bar.controller';
 export * from './i-context-menu.controller';
 export * from './i-kanban.controller';
+export * from './i-tree-grid.controller';
+export * from './i-tree-grid-ex.controller';

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

@@ -42,4 +42,12 @@ export interface IPortletController {
    * @return {*}  {Promise<void>}
    */
   dataChangeNotify(data: IData): Promise<void>;
+
+  /**
+   * 销毁方法
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-09-22 16:55:47
+   */
+  destroyed(): Promise<void>;
 }

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

@@ -0,0 +1,12 @@
+import { IMDControlEvent } from './i-md-control.event';
+
+/**
+ * 树表格(增强)部件事件
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:54
+ * @export
+ * @interface ITreeGridExEvent
+ * @extends {IMDControlEvent}
+ */
+export interface ITreeGridExEvent extends IMDControlEvent {}

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

@@ -0,0 +1,12 @@
+import { IGridEvent } from './i-grid.event';
+
+/**
+ * 树表格部件事件
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:54
+ * @export
+ * @interface ITreeGridEvent
+ * @extends {IMDControlEvent}
+ */
+export interface ITreeGridEvent extends IGridEvent {}

package/src/interface/controller/event/control/index.ts

@@ -27,3 +27,5 @@ export * from './i-drtab.event';
 export * from './i-calendar.event';
 export * from './i-calendar-exp-bar.event';
 export * from './i-context-menu.event';
+export * from './i-tree-grid.event';
+export * from './i-tree-grid-ex.event';

package/src/interface/controller/event/view/i-tree-grid-ex-view.event.ts

@@ -0,0 +1,12 @@
+import { IMDViewEvent } from './i-md-view.event';
+
+/**
+ * 树表格视图（增强）事件
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:22
+ * @export
+ * @interface ITreeGridViewEvent
+ * @extends {IMDViewEvent}
+ */
+export type ITreeGridExViewEvent = IMDViewEvent;

package/src/interface/controller/event/view/i-tree-grid-view.event.ts

@@ -0,0 +1,12 @@
+import { IMDViewEvent } from './i-md-view.event';
+
+/**
+ * 树表格视图事件
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:22
+ * @export
+ * @interface ITreeGridViewEvent
+ * @extends {IMDViewEvent}
+ */
+export type ITreeGridViewEvent = IMDViewEvent;

package/src/interface/controller/event/view/index.ts

@@ -37,3 +37,5 @@ export * from './i-calendar-view.event';
 export * from './i-calendar-exp-view.event';
 export * from './i-pickup-md-view.event';
 export * from './i-form-pickup-data-view.event';
+export * from './i-tree-grid-view.event';
+export * from './i-tree-grid-ex-view.event';

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

@@ -0,0 +1,56 @@
+import { IColumnState } from './i-grid.state';
+import { IMDControlState } from './i-md-control.state';
+import { ITreeNodeData } from './i-tree.state';
+
+/**
+ * 树表格(增强)部件状态
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:01
+ * @export
+ * @interface ITreeGridExState
+ * @extends {IMDControlState}
+ */
+export interface ITreeGridExState extends IMDControlState {
+  items: ITreeNodeData[];
+
+  /**
+   * 表格列状态数组
+   * 顺序就是列的排序
+   * @author zk
+   * @date 2023-09-21 02:09:57
+   * @type {IColumnState[]}
+   * @memberof ITreeGridState
+   */
+  columnStates: IColumnState[];
+
+  /**
+   * 树的根节点
+   *
+   * @author zk
+   * @date 2023-09-21 02:09:29
+   * @type {ITreeNodeData[]}
+   * @memberof ITreeGridState
+   */
+  rootNodes: ITreeNodeData[];
+
+  /**
+   * 外部提供的默认展开的节点集合
+   *
+   * @author zk
+   * @date 2023-09-21 02:09:48
+   * @type {string[]}
+   * @memberof ITreeGridState
+   */
+  defaultExpandedKeys: string[];
+
+  /**
+   * 实际默认展开节点集合
+   *
+   * @author zk
+   * @date 2023-09-21 02:09:42
+   * @type {string[]}
+   * @memberof ITreeGridState
+   */
+  expandedKeys: string[];
+}

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

@@ -0,0 +1,12 @@
+import { IGridState } from './i-grid.state';
+
+/**
+ * 树表格部件状态
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:01
+ * @export
+ * @interface ITreeGridState
+ * @extends {IMDControlState}
+ */
+export interface ITreeGridState extends IGridState {}

package/src/interface/controller/state/control/index.ts

@@ -33,3 +33,5 @@ export * from './i-calendar.state';
 export * from './i-calendar-exp-bar.state';
 export * from './i-context-menu.state';
 export * from './i-kanban.state';
+export * from './i-tree-grid.state';
+export * from './i-tree-grid-ex.state';

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

@@ -0,0 +1,12 @@
+import { IMDViewState } from './i-md-view.state';
+
+/**
+ * 树表格视图（增强）UI状态
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:36
+ * @export
+ * @interface ITreeGridViewState
+ * @extends {IMDViewState}
+ */
+export interface ITreeGridExViewState extends IMDViewState {}

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

@@ -0,0 +1,12 @@
+import { IMDViewState } from './i-md-view.state';
+
+/**
+ * 树表格视图UI状态
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:36
+ * @export
+ * @interface ITreeGridViewState
+ * @extends {IMDViewState}
+ */
+export interface ITreeGridViewState extends IMDViewState {}

package/src/interface/controller/state/view/i-view.state.ts

@@ -1,4 +1,5 @@
 import { IViewSession } from '../../../studio';
+import { IViewMessage } from '../../common';
 import { IControllerState } from '../common/i-controller.state';
 
 /**
@@ -40,4 +41,12 @@ export interface IViewState extends IControllerState, IViewSession {
    * @type {boolean}
    */
   closeOK?: boolean;
+
+  /**
+   * 视图消息数据
+   * @author lxm
+   * @date 2023-09-20 09:48:29
+   * @type {{ [p: string]: IViewMessage[] }}
+   */
+  viewMessages: { [p: string]: IViewMessage[] };
 }