@ibiz-template/runtime 0.1.28 → 0.1.29

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

@@ -0,0 +1,171 @@
+import { IHttpResponse } from '@ibiz-template/core';
+import {
+  IDETreeDataSetNode,
+  IDETreeNode,
+  IDETreeNodeRS,
+} from '@ibiz/model-core';
+import { isArray } from 'qx-util';
+import { ITreeNodeData } from '../../../interface';
+
+import { ControlVO, TreeDataSetNodeData, UIMapField } from '../../../service';
+import { TreeFetchOpts, TreeService } from '../tree/tree.service';
+
+/**
+ * 树表格增强部件服务
+ *
+ * @author zk
+ * @date 2023-09-25 05:09:52
+ * @export
+ * @class TreeGridService
+ * @extends {TreeService}
+ */
+export class TreeGridExService extends TreeService {
+  /**
+   * 表格列映射关系
+   *
+   * @author zk
+   * @date 2023-09-25 05:09:11
+   * @type {Map<string, Map<string, UIMapField>>}
+   * @memberof TreeGridService
+   */
+  multipleUiMap: Map<string, Map<string, UIMapField>> = new Map();
+
+  /**
+   * 初始化节点属性映射
+   *
+   * @author lxm
+   * @date 2022-08-31 18:08:37
+   */
+  initUIDataMap(): void {
+    super.initUIDataMap();
+    this.model.detreeNodes?.forEach((item: IDETreeNode) => {
+      const dataMap: Map<string, UIMapField> = new Map();
+      item.detreeNodeDataItems?.forEach(dataItem => {
+        const uiKey = dataItem.id!.toLowerCase();
+        const deField = dataItem.appDEFieldId!;
+        // 后台实体属性
+        const deFieldKey = deField.toLowerCase();
+        const mapField = new UIMapField(uiKey, deFieldKey, {
+          isOriginField: true,
+          dataType: dataItem.dataType,
+        });
+        dataMap.set(uiKey, mapField);
+      });
+      this.multipleUiMap.set(item.id!, dataMap);
+    });
+  }
+
+  /**
+   * 获取实体数据集数据
+   *
+   * @protected
+   * @param {TreeNodeRSModel} nodeRS
+   * @param {TreeFetchOpts} opts
+   * @returns {*}
+   * @memberof TreeService
+   */
+  protected async getDENodeDatas(
+    nodeModel: IDETreeDataSetNode,
+    nodeRS: IDETreeNodeRS | undefined,
+    parentNodeData: ITreeNodeData | undefined,
+    opts: TreeFetchOpts,
+  ): Promise<TreeDataSetNodeData[]> {
+    const { appDEDataSetId, appDataEntityId } = nodeModel;
+
+    // 处理查询参数,没有关系的时候不处理参数了
+    const { context, params, navContext, navParams } = nodeRS
+      ? this.getNodeRSFilterParams(nodeRS, parentNodeData, opts)
+      : {
+          context: opts.context,
+          params: opts.params,
+          navContext: {},
+          navParams: {},
+        };
+
+    // 设置查询长度
+    params.size = nodeModel.maxSize || 1000;
+    // 排序属性
+    if (nodeModel.sortAppDEFieldId && nodeModel.sortDir) {
+      Object.assign(params, {
+        sort: `${nodeModel.sortAppDEFieldId.toLowerCase()},${nodeModel.sortDir.toLowerCase()}`,
+      });
+    }
+
+    // 请求实体数据
+    const response = await this.app.deService.exec(
+      appDataEntityId!,
+      appDEDataSetId!,
+      context,
+      params,
+    );
+
+    if (response.data.length) {
+      const { data } = this.handleResponseForMultiple(response, nodeModel.id!);
+      const nodeDatas = data.map((item: ControlVO) => {
+        return new TreeDataSetNodeData(nodeModel, parentNodeData, {
+          data: item,
+          leaf: !!opts.leaf,
+          navContext,
+          navParams,
+        });
+      });
+      return nodeDatas;
+    }
+    return [];
+  }
+
+  /**
+   * 处理多数据源响应
+   *
+   * @author zk
+   * @date 2023-09-21 04:09:06
+   * @param {IHttpResponse} response
+   * @param {string} tag 多数据源dataUIMap标识
+   * @return {*}  {IHttpResponse}
+   * @memberof TreeGridService
+   */
+  handleResponseForMultiple(
+    response: IHttpResponse,
+    tag: string,
+  ): IHttpResponse {
+    const res = super.handleResponse(response) as IHttpResponse<
+      IData[] | IData
+    >;
+    if (res.headers) {
+      if (res.headers['x-page']) {
+        res.page = Number(res.headers['x-page']);
+      }
+      if (res.headers['x-per-page']) {
+        res.size = Number(res.headers['x-per-page']);
+      }
+      if (res.headers['x-total']) {
+        res.total = Number(res.headers['x-total']);
+      }
+    }
+    if (res.ok) {
+      if (isArray(res.data)) {
+        res.data = (res.data as IData[]).map(item =>
+          this.toUIDataForMultiple(item, tag),
+        );
+      } else {
+        res.data = this.toUIDataForMultiple(res.data, tag);
+      }
+    }
+    return res;
+  }
+
+  /**
+   * 实体数据转ui数据
+   *
+   * @author zk
+   * @date 2023-09-21 06:09:06
+   * @param {IData} entityData 实体数据
+   * @param {string} tag 多数据源dataUIMap标识
+   * @return {*}  {ControlVO}
+   * @memberof TreeGridService
+   */
+  toUIDataForMultiple(entityData: IData, tag: string): ControlVO {
+    const dataUIMap = this.multipleUiMap.get(tag);
+    return new ControlVO(entityData, dataUIMap);
+  }
+}

package/src/controller/utils/event/controller-event.ts

@@ -97,6 +97,22 @@ export class ControllerEvent<E extends IComponentEvent = IComponentEvent> {
     this.evt.on(name as string, fn);
   }
 
+  /**
+   * 取消订阅指定事件
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-09-22 17:45:07
+   */
+  off<K extends EventTypeKeyOf<E>>(
+    name: K,
+    fn: (event: EventTypeObjec<E>[K]['event']) => void | Promise<void>,
+  ): void {
+    if (this.isDestroyed) {
+      return;
+    }
+    this.evt.off(name as string, fn);
+  }
+
   /**
    * 订阅任意事件
    * @author lxm

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

@@ -0,0 +1 @@
+export * from './view-msg-controller';

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/engine/md-view.engine.ts

@@ -1,5 +1,6 @@
 import { RuntimeModelError } from '@ibiz-template/core';
 import { IAppDEMultiDataView } from '@ibiz/model-core';
+import { clone } from 'ramda';
 import { SysUIActionTag, ViewCallTag } from '../constant';
 import { ViewController } from '../controller';
 import {
@@ -262,13 +263,14 @@ export class MDViewEngine extends ViewEngineBase {
       throw new RuntimeModelError(this.view.model, `缺少newdata的视图逻辑`);
     }
 
-    const context = this.view.context.clone();
+    const params = clone(this.view.params);
     if (copyMode) {
-      context.srfcopymode = true;
+      params.srfcopymode = copyMode;
     }
+
     const result = await this.view.scheduler?.triggerCustom('newdata', {
-      context,
-      params: this.view.params,
+      context: this.view.context,
+      params,
       data,
       event,
       view: this.view,

package/src/global/global-util/global-util.ts

@@ -5,6 +5,10 @@ import {
   HandlebarsUtil,
   RawValueUtil,
 } from '../../utils';
+import {
+  DefaultErrorHandler,
+  ErrorHandlerCenter,
+} from '../../utils/error-handler';
 
 /**
  * 全局工具方法或对象
@@ -47,6 +51,17 @@ export class GlobalUtil {
    */
   readonly rawValue = new RawValueUtil();
 
+  /**
+   * 错误处理中心
+   * @author lxm
+   * @date 2023-09-26 05:04:26
+   */
+  readonly error = new ErrorHandlerCenter();
+
+  constructor() {
+    this.error.register(new DefaultErrorHandler());
+  }
+
   /**
    * 获取导出Excel工具类对象
    * @author lxm

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/common/i-error-handler/i-error-handler.ts

@@ -0,0 +1,16 @@
+/**
+ * 错误处理器接口
+ * @author lxm
+ * @date 2023-09-26 04:51:18
+ * @export
+ * @interface IErrorHandler
+ */
+export interface IErrorHandler {
+  /**
+   * 处理错误,如果处理了该异常则返回true,后续处理器的就不会处理该异常
+   * @author lxm
+   * @date 2023-09-26 04:48:57
+   * @param {unknown} error
+   */
+  handle(error: unknown): boolean | undefined;
+}

package/src/interface/common/index.ts

@@ -29,3 +29,4 @@ export type {
   IViewConfig,
 } from './i-app-view-config-service/i-app-view-config-service';
 export type { IOpenViewOptions } from './i-open-view-options/i-open-view-options';
+export type { IErrorHandler } from './i-error-handler/i-error-handler';

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';