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

package/src/controller/control/toolbar/toolbar.controllerr.ts

@@ -124,7 +124,7 @@ export class ToolbarController<
       },
       { childrenFields: ['detoolbarItems'] },
     );
-    await this.state.buttonsState.update();
+    await this.calcButtonState();
   }
 
   /**
@@ -164,7 +164,11 @@ export class ToolbarController<
     await this.state.buttonsState.update(_data, appDeId);
 
     // 计算菜单项逻辑的预置逻辑
-    if (this.scheduler && _data) {
+    if (this.scheduler) {
+      const logicParams: IData = {};
+      if (_data) {
+        logicParams.data = [_data];
+      }
       // 遍历所有的项
       recursiveIterate(
         this.model,
@@ -172,9 +176,10 @@ export class ToolbarController<
           const itemState = this.state.buttonsState[item.id!] as IButtonState;
           // 计算项显示逻辑
           if (itemState.visible) {
-            const dynaVisible = this.scheduler!.triggerItemVisible(item.id!, {
-              data: [_data!],
-            });
+            const dynaVisible = this.scheduler!.triggerItemVisible(
+              item.id!,
+              logicParams,
+            );
             if (dynaVisible !== undefined) {
               itemState.visible = dynaVisible;
             }
@@ -182,9 +187,10 @@ export class ToolbarController<
 
           // 计算项启用逻辑
           if (!itemState.disabled) {
-            const dynaEnable = this.scheduler!.triggerItemEnable(item.id!, {
-              data: [_data!],
-            });
+            const dynaEnable = this.scheduler!.triggerItemEnable(
+              item.id!,
+              logicParams,
+            );
             if (dynaEnable !== undefined) {
               itemState.disabled = !dynaEnable;
             }

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

@@ -19,7 +19,7 @@ import {
   TreeDataSetNodeData,
   TreeCodeListNodeData,
 } from '../../../service';
-import { calcNavParams } from '../../../utils';
+import { calcNavParams, handleAllSettled } from '../../../utils';
 
 export interface TreeFetchOpts {
   /**
@@ -104,7 +104,7 @@ export class TreeService extends MDControlService<IDETree> {
       if (childNodeRSs.length === 0) {
         return;
       }
-      const results = await Promise.allSettled(
+      const results = await handleAllSettled(
         childNodeRSs.map(async childNodeRS => {
           const childNode = getTreeNode(
             this.model,
@@ -117,14 +117,11 @@ export class TreeService extends MDControlService<IDETree> {
             opts,
           );
         }),
+        false,
       );
 
       results.forEach(result => {
-        if (result.status === 'fulfilled' && result.value) {
-          childrenNodes.push(...result.value);
-        } else if (result.status === 'rejected') {
-          ibiz.log.error(result.reason);
-        }
+        childrenNodes.push(...result);
       });
     }
     return childrenNodes;
@@ -352,9 +349,11 @@ export class TreeService extends MDControlService<IDETree> {
     // 设置查询长度
     params.size = nodeModel.maxSize || 1000;
     // 排序属性
-    if (nodeModel.sortAppDEFieldId && nodeModel.sortDir) {
+    if (nodeModel.sortAppDEFieldId) {
       Object.assign(params, {
-        sort: `${nodeModel.sortAppDEFieldId.toLowerCase()},${nodeModel.sortDir.toLowerCase()}`,
+        sort: `${nodeModel.sortAppDEFieldId.toLowerCase()},${
+          nodeModel.sortDir ? nodeModel.sortDir.toLowerCase() : 'asc'
+        }`,
       });
     }
 

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-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/i-global-config/i-global-view-config.ts

@@ -20,11 +20,13 @@ export interface IGlobalViewConfig {
   enableDataInfoBar: boolean;
 
   /**
-   * 全局导航是否启用缓存
+   * 用于控制全局哪些导航部件启用缓存，全大写。TABEXPPANEL:GRIDEXPBAR: - :分隔每个导航部件的缓存开关，必须用:结尾，如：TABEXPPANEL:开启表格导航部件缓存，GRIDEXPBAR:开启分页导航部件缓存
    *
+   * @default 'TABEXPPANEL:'
+   * @description 判断时将使用 `部件类型:` 的方式进行判断，如：TABEXPPANEL:，表示开启表格导航视图的缓存
    * @author chitanda
    * @date 2023-09-15 12:09:09
-   * @type {boolean}
+   * @type {string}
    */
-  enableExpCache: boolean;
+  expCacheMode: string;
 }

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/i-nav-view-msg/i-nav-view-msg.ts

@@ -45,4 +45,14 @@ export interface INavViewMsg {
    * @type {IAppView}
    */
   viewId?: string;
+
+  /**
+   * 是否缓存
+   *
+   * @author zk
+   * @date 2023-09-26 06:09:17
+   * @type {string}
+   * @memberof INavViewMsg
+   */
+  isCache?: boolean;
 }

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

@@ -7,4 +7,13 @@ import { IViewState } from './i-view.state';
  * @interface IEditViewState
  * @extends {IViewState}
  */
-export interface IEditViewState extends IViewState {}
+export interface IEditViewState extends IViewState {
+  /**
+   * 是否为复制模式
+   *
+   * @author chitanda
+   * @date 2023-09-26 17:09:21
+   * @type {boolean}
+   */
+  copyMode?: boolean;
+}

package/src/logic-scheduler/executor/app-ui-logic-executor.ts

@@ -15,6 +15,7 @@ import { IModalData, IUILogicParams } from '../../interface';
 import { calcDeCodeNameById, getFormTypeFieldName } from '../../model';
 import { convertNavData } from '../../utils';
 import { LogicExecutor } from './logic-executor';
+import { Srfuf } from '../../service';
 
 /**
  * 应用预置界面逻辑
@@ -216,12 +217,20 @@ export class AppUILogicExecutor extends LogicExecutor {
     }
 
     // 拷贝数据处理
-    if (context.srfcopymode) {
-      // 置空主键
-      _data.srfkey = undefined;
-      tempParams = Object.assign(tempParams, _data.$origin);
+    if (params.srfcopymode) {
+      const entity = await ibiz.hub.getAppDataEntity(
+        view.model.appDataEntityId!,
+      );
+      const key = entity.keyAppDEFieldId;
+      if (key && _data) {
+        tempParams[key] = _data.srfkey;
+        tempParams.srfcopymode = true;
+      }
     }
 
+    // 特殊处理标记，标记当前是新建数据。在打开视图前会被删除，具体在 open-app-view.ts 中处理
+    tempParams.srfuf = Srfuf.CREATE;
+
     // 打开视图
     const result: IModalData = await ibiz.commands.execute(
       OpenAppViewCommand.TAG,

package/src/logic-scheduler/trigger/item-dyna-logic-trigger.ts

@@ -48,9 +48,6 @@ export class ItemDynaLogicTrigger extends LogicTrigger {
 
   execute(executeParams: IUILogicParams): boolean {
     const result = this.executor.execute(executeParams);
-    if (typeof result === 'boolean') {
-      return result;
-    }
-    throw new RuntimeError(`${this.logic.id}逻辑返回值不是布尔值`);
+    return !!result;
   }
 }

package/src/model/data-entity/data-entity.ts

@@ -4,7 +4,7 @@ import {
   IAppDEField,
   IDELogic,
 } from '@ibiz/model-core';
-import { isNotNil } from 'ramda';
+import { notNilEmpty } from 'qx-util';
 
 /**
  * 从实体id计算实体codeName(小写)
@@ -31,7 +31,7 @@ export function calcDeCodeNameById(id: string): string {
  */
 export function hasDeCodeName(params: IParams, entityId: string): boolean {
   const codeName = calcDeCodeNameById(entityId);
-  return isNotNil(params[codeName]);
+  return notNilEmpty(params[codeName]);
 }
 
 /**

package/src/register/helper/control-register.ts

@@ -72,7 +72,12 @@ export async function getControlProvider(
   provider = getProvider(controlType);
 
   if (!provider) {
-    ibiz.log.error(`找不到部件类型${controlType}对应的适配器`);
+    switch (controlType) {
+      case 'DATAINFOBAR':
+        return;
+      default:
+        ibiz.log.error(`找不到部件类型${controlType}对应的适配器`);
+    }
   } else {
     return provider;
   }

package/src/service/app-data-entity/app-data-entity.ts

@@ -205,6 +205,11 @@ export class AppDataEntity implements IDataEntity {
    * @return {*}  {unknown}
    */
   protected convertVal(value: unknown, dataType: number | undefined): unknown {
+    // 空值不转换
+    if (value == null) {
+      return value;
+    }
+
     // 没有数据类型的给原值
     if (isNil(dataType)) {
       return value;

package/src/service/service/entity/method/method-renturn.ts

@@ -1,4 +1,5 @@
 import { IAppDataEntity, IAppDEMethod } from '@ibiz/model-core';
+import { isNilOrEmpty } from 'qx-util';
 import { MethodDto } from '../../../dto/method.dto';
 import { AppDataEntity } from '../../../app-data-entity/app-data-entity';
 import { findModelChild } from '../../../../model';
@@ -58,6 +59,9 @@ export class MethodReturn {
       const items = await this.dto.sets(context, [data]);
       return items[0];
     }
+    if (isNilOrEmpty(data)) {
+      data = {};
+    }
     return new AppDataEntity(this.entity, data);
   }
 }

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

@@ -116,7 +116,7 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
   ): Promise<boolean> {
     const confirmMsg = this.calcMessage('confirm', action, args);
     if (action.enableConfirm && confirmMsg) {
-      return ibiz.modal.confirm({ title: confirmMsg });
+      return ibiz.confirm.warning({ title: '操作确认', desc: confirmMsg });
     }
     return true;
   }

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;
+}