@ibiz-template/runtime 0.1.28 → 0.1.29

package/src/ui-action/provider/backend-ui-action-provider.ts

@@ -77,8 +77,11 @@ export class BackendUIActionProvider extends UIActionProviderBase {
     );
 
     // 适配界面行为成功提示信息
-    if (res.ok && action.successMsg) {
-      ibiz.message.success(action.successMsg);
+    if (res.ok) {
+      const successMsg = this.calcMessage('success', action, args);
+      if (successMsg) {
+        ibiz.message.success(successMsg);
+      }
     }
     Object.assign(actionResult, {
       data: isArray(res.data) ? res.data : [res.data],

package/src/ui-action/provider/ui-action-provider-base.ts

@@ -1,5 +1,5 @@
 import { RuntimeModelError } from '@ibiz-template/core';
-import { IAppDEUIAction, INavigateParam } from '@ibiz/model-core';
+import { IAppDEUIAction, ILanguageRes, INavigateParam } from '@ibiz/model-core';
 import {
   IUIActionProvider,
   IUIActionResult,
@@ -7,7 +7,7 @@ import {
 } from '../../interface';
 import { calcDeCodeNameById } from '../../model';
 import { execUILogic } from '../../ui-logic';
-import { convertNavData, formatMultiData } from '../../utils';
+import { convertNavData, formatMultiData, ScriptFactory } from '../../utils';
 import { UIActionUtil } from '../uiaction-util';
 
 /**
@@ -49,7 +49,7 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
     }
 
     // **用户操作确认**
-    if (!(await this.isConfirm(action))) {
+    if (!(await this.isConfirm(action, args))) {
       return this.returnError(result);
     }
 
@@ -110,9 +110,13 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
    * @param {IAppDEUIAction} action 界面行为模型
    * @returns {*}  {Promise<boolean>}
    */
-  async isConfirm(action: IAppDEUIAction): Promise<boolean> {
-    if (action.enableConfirm && action.confirmMsg) {
-      return ibiz.modal.confirm({ title: action.confirmMsg });
+  async isConfirm(
+    action: IAppDEUIAction,
+    args: IUILogicParams,
+  ): Promise<boolean> {
+    const confirmMsg = this.calcMessage('confirm', action, args);
+    if (action.enableConfirm && confirmMsg) {
+      return ibiz.modal.confirm({ title: confirmMsg });
     }
     return true;
   }
@@ -265,4 +269,62 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
     );
     return { resultContext, resultData, resultParams };
   }
+
+  /**
+   * 计算消息信息（动态，多语言资源）
+   * @author lxm
+   * @date 2023-09-25 03:03:01
+   * @protected
+   * @param {('confirm' | 'success')} type
+   * @param {IAppDEUIAction} action
+   * @param {IUILogicParams} args
+   * @return {*}
+   */
+  protected calcMessage(
+    type: 'confirm' | 'success',
+    action: IAppDEUIAction,
+    args: IUILogicParams,
+  ): string | undefined {
+    let msg: string | undefined;
+    let msgRes: ILanguageRes | undefined;
+    const { confirmMsg, cmlanguageRes, successMsg, smlanguageRes } = action;
+    switch (type) {
+      case 'confirm':
+        msg = confirmMsg;
+        msgRes = cmlanguageRes;
+        break;
+      case 'success':
+        msg = successMsg;
+        msgRes = smlanguageRes;
+        break;
+      default:
+    }
+
+    // 多语言资源转换
+    if (msgRes) {
+      const msgResContent = ibiz.i18n.t(
+        msgRes.lanResTag!,
+        msgRes.defaultContent || msg,
+      );
+      if (msgResContent !== msgRes.lanResTag) {
+        msg = msgResContent;
+      }
+    }
+
+    if (msg) {
+      const { data } = args;
+      const scriptParams: IParams = { ...args };
+      if (data.length === 1) {
+        // 单数据
+        [scriptParams.data] = data;
+      } else if (data.length === 0) {
+        // 无数据
+        delete scriptParams.data;
+      }
+      return ScriptFactory.execScriptFn(scriptParams, `\`${msg}\``, {
+        isAsync: false,
+        singleRowReturn: true,
+      }) as string;
+    }
+  }
 }

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

@@ -143,4 +143,16 @@ export class UILogicContext {
       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/ui-logic/ui-logic-link/ui-logic-link.ts

@@ -49,7 +49,7 @@ export class UILogicLink {
    */
   constructor(public model: IDEUILogicLink) {
     const { linkMode, deuilogicLinkGroupCond } = this.model;
-    if (linkMode === 0) {
+    if ((linkMode || 0) === 0) {
       if (deuilogicLinkGroupCond) {
         this.groupCond = new UILogicLinkGroupCond(deuilogicLinkGroupCond);
       }

package/src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts

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

package/src/ui-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 { UILogicContext } from '../ui-logic-context';
 
 type SrcValParams = {
@@ -37,12 +38,18 @@ export function handleSrcVal(
   const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
   // 没有源值类型就是逻辑参数
   const srcValueType = srcValParams.srcValueType || 'SRCDLPARAM';
+  // 取属性值
+  let srcField = srcFieldName;
 
   let value: unknown;
   switch (srcValueType) {
     // 源逻辑参数
     case 'SRCDLPARAM':
       value = ctx.params[srcDEUILogicParamId!];
+      // 如果是实体参数对象则转换成小写。
+      if (ctx.isEntityParam(srcDEUILogicParamId!)) {
+        srcField = srcField?.toLowerCase();
+      }
       break;
     // 空值类型
     case 'NULLVALUE':
@@ -71,11 +78,20 @@ export function handleSrcVal(
       throw new ModelError(srcValParams, `暂未支持源值类型${srcValueType}`);
   }
 
-  // 取属性值
-  const srcField = srcFieldName;
   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/utils/error-handler/default-error-handler.ts

@@ -0,0 +1,40 @@
+import {
+  RuntimeModelError,
+  ModelError,
+  HttpError,
+  NoticeError,
+  RuntimeError,
+} from '@ibiz-template/core';
+import { IErrorHandler } from '../../interface';
+
+/**
+ * 默认处理器
+ * @author lxm
+ * @date 2023-09-26 04:52:18
+ * @export
+ * @class DefaultErrorHandler
+ * @implements {IErrorHandler}
+ */
+export class DefaultErrorHandler implements IErrorHandler {
+  handle(error: unknown): boolean | undefined {
+    if (error instanceof RuntimeModelError || error instanceof ModelError) {
+      ibiz.message.error(error.message, 10, true);
+    } else if (error instanceof HttpError) {
+      if (error.status === 401) {
+        ibiz.message.error('没有注册无权限错误处理器');
+      } else {
+        ibiz.notification.error({
+          title: '',
+          desc: error.message,
+          duration: 10,
+        });
+      }
+    } else if (error instanceof NoticeError) {
+      ibiz.message.error(error.message, error.duration, error.duration === 0);
+    } else if (error instanceof RuntimeError) {
+      ibiz.message.error(error.message, 10, true);
+    }
+    ibiz.log.error(error);
+    return true;
+  }
+}

package/src/utils/error-handler/error-handler-center.ts

@@ -0,0 +1,61 @@
+import { IErrorHandler } from '../../interface';
+
+/**
+ * 事件处理工具
+ *
+ * @author lxm
+ * @date 2022-09-21 18:09:31
+ * @export
+ * @class ErrorHandler
+ */
+export class ErrorHandlerCenter {
+  /**
+   * 处理器集合
+   * @author lxm
+   * @date 2023-09-26 04:56:29
+   * @type {IErrorHandler[]}
+   */
+  protected handlers: IErrorHandler[] = [];
+
+  /**
+   * 注册处理器（后注册的优先级更高）
+   * @author lxm
+   * @date 2023-09-26 04:59:06
+   * @param {IErrorHandler} handler
+   */
+  register(handler: IErrorHandler): void {
+    this.handlers.unshift(handler);
+  }
+
+  /**
+   * 处理单个报错
+   * @author lxm
+   * @date 2023-09-26 05:18:18
+   * @protected
+   * @param {unknown} error
+   */
+  protected handleSingle(error: unknown): void {
+    const find = this.handlers.find(item => {
+      return !!item.handle(error);
+    });
+    if (!find) {
+      ibiz.log.error('没有找到能处理该错误的处理器', error);
+    }
+  }
+
+  /**
+   * 按顺序检测处理器，最先满足条件的处理该异常
+   * @author lxm
+   * @date 2023-09-26 05:01:08
+   * @param {unknown} error
+   */
+  handle(error: unknown): void {
+    if (error instanceof Array) {
+      error.forEach(item => {
+        this.handleSingle(item);
+      });
+    } else {
+      this.handleSingle(error);
+    }
+  }
+}

package/src/utils/error-handler/index.ts

@@ -0,0 +1,2 @@
+export { DefaultErrorHandler } from './default-error-handler';
+export { ErrorHandlerCenter } from './error-handler-center';

package/src/utils/index.ts

@@ -13,3 +13,4 @@ export * from './value-rule/value-rule';
 export * from './script/index';
 export { TextUtil } from './text-util/text-util';
 export { RawValueUtil } from './raw-value-util/raw-value-util';
+export { handleAllSettled } from './promise/promise';

package/src/utils/promise/promise.ts

@@ -0,0 +1,41 @@
+/**
+ * 异步等待所有promise完成后才会结束异步
+ * 只返回成功的promise的返回值集合
+ * - 如果isThrow为true，有异常时抛出异常
+ * - 如果isThrow为false，有异常时用全局异常处理弹提示，逻辑不会中断
+ * @author lxm
+ * @date 2023-09-26 06:57:33
+ * @export
+ * @template T
+ * @param {(Iterable<T | PromiseLike<T>>)} values
+ * @param {boolean} [isThrow=true]
+ * @return {*}  {Promise<Awaited<T>[]>}
+ */
+export async function handleAllSettled<T>(
+  values: Iterable<T | PromiseLike<T>>,
+  isThrow = true,
+): Promise<Awaited<T>[]> {
+  const allResults = await Promise.allSettled(values);
+  const successResult: Awaited<T>[] = [];
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const errorResult: any[] = [];
+  allResults.forEach(item => {
+    if (item.status === 'fulfilled') {
+      successResult.push(item.value);
+    } else {
+      errorResult.push(item.reason);
+    }
+  });
+
+  // 有报错时根据是否抛出处理，抛出就抛，不抛就拿全局的异常处理弹提示。
+  if (errorResult.length > 0) {
+    const error = errorResult.length === 1 ? errorResult[0] : errorResult;
+    if (isThrow) {
+      throw error;
+    } else {
+      ibiz.util.error.handle(error);
+    }
+  }
+
+  return successResult;
+}