@ibiz-template/runtime 0.1.5 → 0.1.7

package/src/interface/controller/event/control/i-tab-exp-panel.event.ts

@@ -1,3 +1,5 @@
+import { PartialWithObject } from '@ibiz-template/core';
+import { NavViewChangeEvent, EventBase } from '../argument';
 import { IControlEvent } from './i-control.event';
 
 /**
@@ -7,4 +9,14 @@ import { IControlEvent } from './i-control.event';
  * @interface ITabExpPanelEvent
  * @extends {IControlEvent}
  */
-export interface ITabExpPanelEvent extends IControlEvent {}
+export interface ITabExpPanelEvent extends IControlEvent {
+  /**
+   * 导航视图变更事件
+   * @author lxm
+   * @date 2023-08-09 07:19:00
+   */
+  onNavViewChange: {
+    event: NavViewChangeEvent;
+    emitArgs: PartialWithObject<NavViewChangeEvent, EventBase>;
+  };
+}

package/src/interface/controller/work-flow/wf-link.ts

@@ -21,7 +21,7 @@ export interface WFLink {
    * @date 2023-06-20 03:30:20
    * @type {string}
    */
-  sequenceFlowView: string;
+  sequenceflowview: string;
 
   /**
    * pc端流程操作表单
@@ -29,7 +29,7 @@ export interface WFLink {
    * @date 2023-06-20 03:30:21
    * @type {string}
    */
-  sequenceFlowForm: string;
+  sequenceflowform: string;
 
   /**
    * 移动端流程操作视图
@@ -37,7 +37,7 @@ export interface WFLink {
    * @date 2023-06-20 03:31:45
    * @type {string}
    */
-  sequenceFlowMobView: string;
+  sequenceflowmobview: string;
 
   /**
    * 移动端流程操作表单
@@ -45,7 +45,7 @@ export interface WFLink {
    * @date 2023-06-20 03:31:43
    * @type {string}
    */
-  sequenceFlowMobForm: string;
+  sequenceflowmobform: string;
 
   /**
    * 流程ID

package/src/interface/logic-scheduler/i-scheduler-logic.ts

@@ -88,21 +88,24 @@ export interface ISchedulerLogic {
   /**
    * 事件名称
    * @type {string}
-   * 来源  getEventNames
    */
   eventNames?: string;
 
   /**
    * 事件参数
    * @type {string}
-   * 来源  getEventArg
    */
   eventArg?: string;
 
   /**
    * 事件参数2
    * @type {string}
-   * 来源  getEventArg2
    */
   eventArg2?: string;
+
+  /**
+   * 部件名称
+   * @type {string}
+   */
+  ctrlName?: string;
 }

package/src/interface/logic-scheduler/i-trigger-match-params.ts

@@ -22,4 +22,10 @@ export interface ITriggerMatchParams {
    * 来源  getEventNames
    */
   eventName?: string;
+
+  /**
+   * 部件名称
+   * @type {string}
+   */
+  ctrlName?: string;
 }

package/src/interface/util/i-confirm-util/i-confirm-util.ts

@@ -0,0 +1,82 @@
+/**
+ * 确认框参数
+ *
+ * @author chitanda
+ * @date 2022-08-17 16:08:42
+ * @export
+ * @interface ConfirmParams
+ */
+export interface ConfirmParams {
+  /**
+   * 标题
+   *
+   * @author chitanda
+   * @date 2022-08-17 16:08:04
+   * @type {string}
+   */
+  title: string;
+  /**
+   * 描述
+   *
+   * @author chitanda
+   * @date 2022-08-17 16:08:08
+   * @type {string}
+   */
+  desc?: string;
+  /**
+   * 传递给组件的参数
+   *
+   * @author chitanda
+   * @date 2023-08-14 15:08:07
+   * @type {IParams}
+   */
+  options?: IParams;
+}
+
+/**
+ * 确认框
+ *
+ * @description 需要用户确认收到提示消息时使用此工具
+ * @author chitanda
+ * @date 2022-08-17 16:08:25
+ * @export
+ * @interface IConfirmUtil
+ */
+export interface IConfirmUtil {
+  /**
+   * 普通信息
+   *
+   * @author chitanda
+   * @date 2022-08-17 16:08:36
+   * @param {ConfirmParams} params
+   * @return {*}  {Promise<boolean>}
+   */
+  info(params: ConfirmParams): Promise<boolean>;
+  /**
+   * 成功信息
+   *
+   * @author chitanda
+   * @date 2022-08-17 16:08:47
+   * @param {ConfirmParams} params
+   * @return {*}  {Promise<boolean>}
+   */
+  success(params: ConfirmParams): Promise<boolean>;
+  /**
+   * 警告信息
+   *
+   * @author chitanda
+   * @date 2022-08-17 16:08:53
+   * @param {ConfirmParams} params
+   * @return {*}  {Promise<boolean>}
+   */
+  warning(params: ConfirmParams): Promise<boolean>;
+  /**
+   * 错误信息
+   *
+   * @author chitanda
+   * @date 2022-08-17 16:08:59
+   * @param {ConfirmParams} params
+   * @return {*}  {Promise<boolean>}
+   */
+  error(params: ConfirmParams): Promise<boolean>;
+}

package/src/interface/util/i-modal-util/i-modal-util.ts

@@ -23,6 +23,14 @@ export interface ModalParams {
    * @type {string}
    */
   desc?: string;
+  /**
+   * 传递给时机组件的参数
+   *
+   * @author chitanda
+   * @date 2023-08-14 15:08:07
+   * @type {IParams}
+   */
+  options?: IParams;
 }
 
 /**

package/src/interface/util/index.ts

@@ -1,6 +1,7 @@
 export { ILoadingUtil } from './i-loading-util/i-loading-util';
 export { IMessageUtil } from './i-message-util/i-message-util';
 export { IModalUtil, ModalParams } from './i-modal-util/i-modal-util';
+export { IConfirmUtil, ConfirmParams } from './i-confirm-util/i-confirm-util';
 export {
   INotificationUtil,
   NotificationParams,

package/src/logic-scheduler/index.ts

@@ -12,6 +12,7 @@ import { LogicTriggerFactory } from './trigger/logic-trigger-factory';
 import { TimerTrigger } from './trigger/timer-trigger';
 import { AppUILogicExecutor } from './executor/app-ui-logic-executor';
 import { ViewEventTrigger } from './trigger/view-event-trigger';
+import { ControlEventTrigger } from './trigger/control-event-trigger';
 
 export {
   LogicSchedulerCenter,
@@ -54,6 +55,10 @@ export function installLogicSchedule(): void {
     'VIEWEVENT',
     (logic, scheduler) => new ViewEventTrigger(logic, scheduler),
   );
+  ibiz.scheduler.triggerFactory.register(
+    'CTRLEVENT',
+    (logic, scheduler) => new ControlEventTrigger(logic, scheduler),
+  );
 
   // 执行器
   ibiz.scheduler.executorFactory.register(

package/src/logic-scheduler/scheduler/logic-scheduler.ts

@@ -3,6 +3,7 @@ import type {
   IUILogicParams,
   ISchedulerLogic,
   ITriggerMatchParams,
+  EventBase,
 } from '../../interface';
 import { LogicExecutor } from '../executor/logic-executor';
 import { LogicTrigger } from '../trigger/logic-trigger';
@@ -22,6 +23,22 @@ export class LogicScheduler {
 
   executors = new Map<string, LogicExecutor>();
 
+  /**
+   * 是否有视图事件触发类型逻辑
+   * @author lxm
+   * @date 2023-08-14 02:19:51
+   * @type {boolean}
+   */
+  hasViewEventTrigger: boolean = false;
+
+  /**
+   * 是否有部件事件触发类型逻辑
+   * @author lxm
+   * @date 2023-08-14 02:19:51
+   * @type {boolean}
+   */
+  hasControlEventTrigger: boolean = false;
+
   constructor(logics: ISchedulerLogic[]) {
     this.logics = logics;
     logics.forEach(logic => {
@@ -78,6 +95,15 @@ export class LogicScheduler {
    * @return {*}  {LogicTrigger}
    */
   protected createTrigger(logic: ISchedulerLogic): LogicTrigger {
+    switch (logic.triggerType) {
+      case 'VIEWEVENT':
+        this.hasViewEventTrigger = true;
+        break;
+      case 'CTRLEVENT':
+        this.hasControlEventTrigger = true;
+        break;
+      default:
+    }
     return ibiz.scheduler.triggerFactory.createTrigger(logic, this);
   }
 
@@ -228,4 +254,21 @@ export class LogicScheduler {
     const params = this.getExecuteParams(executeParams);
     return trigger.execute(params);
   }
+
+  /**
+   * 触发部件事件
+   * @author lxm
+   * @date 2023-06-26 02:26:33
+   * @param {string} itemName 子项名称
+   * @param {Partial<IUILogicParams>} executeParams 执行参数
+   * @return {*}  {(boolean | undefined)}
+   */
+  triggerControlEvent(ctrlName: string, event: EventBase): void {
+    const matchParams = {
+      ctrlName,
+      eventName: event.eventName,
+      triggerType: 'CTRLEVENT',
+    } as const;
+    this.triggerAndExecute(matchParams, event);
+  }
 }

package/src/logic-scheduler/trigger/control-event-trigger.ts

@@ -0,0 +1,45 @@
+import { StudioControlEvents } from '../../constant';
+import type { ISchedulerLogic, ITriggerMatchParams } from '../../interface';
+import { LogicScheduler } from '../scheduler/logic-scheduler';
+import { LogicTrigger } from './logic-trigger';
+
+/**
+ * 部件事件触发器
+ * @author lxm
+ * @date 2023-08-14 02:10:46
+ * @export
+ * @class ControlEventTrigger
+ * @extends {LogicTrigger}
+ */
+export class ControlEventTrigger extends LogicTrigger {
+  declare type: 'CTRLEVENT';
+
+  /**
+   * 监听事件名称集合
+   * @author lxm
+   * @date 2023-07-26 05:48:30
+   * @protected
+   * @type {string[]}
+   */
+  protected listenEventNames: string[] = [];
+
+  constructor(
+    protected logic: ISchedulerLogic,
+    protected scheduler: LogicScheduler,
+  ) {
+    super(logic, scheduler);
+    const names = logic.eventNames!.split(',');
+    this.listenEventNames = names.map(
+      name => StudioControlEvents[name as keyof StudioControlEvents] || name,
+    );
+  }
+
+  match(matchParams: ITriggerMatchParams): boolean {
+    const superResult = super.match(matchParams);
+    return (
+      superResult &&
+      matchParams.ctrlName === this.logic.ctrlName &&
+      this.listenEventNames.includes(matchParams.eventName!)
+    );
+  }
+}

package/src/logic-scheduler/trigger/view-event-trigger.ts

@@ -3,6 +3,14 @@ import type { ISchedulerLogic, ITriggerMatchParams } from '../../interface';
 import { LogicScheduler } from '../scheduler/logic-scheduler';
 import { LogicTrigger } from './logic-trigger';
 
+/**
+ * 视图事件触发器
+ * @author lxm
+ * @date 2023-08-14 02:12:44
+ * @export
+ * @class ViewEventTrigger
+ * @extends {LogicTrigger}
+ */
 export class ViewEventTrigger extends LogicTrigger {
   declare type: 'VIEWEVENT';
 

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

@@ -4,7 +4,6 @@ import {
   IAppDEMethodDTO,
   IAppDEMethodDTOField,
 } from '@ibiz/model-core';
-import { isNilOrEmpty } from 'qx-util';
 import { ModelError } from '@ibiz-template/core';
 import { Application } from '../../application';
 import { AppDataEntity } from '../app-data-entity/app-data-entity';
@@ -52,17 +51,12 @@ export class MethodDto {
    */
   async get(context: IParams, data: IData): Promise<IData> {
     const params: IData = {};
+    // 拷贝数据
     for (let i = 0; i < this.fields.length; i++) {
       const field = this.fields[i];
       const key = field.codeName!.toLowerCase();
       switch (field.type) {
         case 'SIMPLE': {
-          const val = data[key];
-          if (isNilOrEmpty(val)) {
-            params[key] = null;
-          } else {
-            params[key] = val;
-          }
           break;
         }
         case 'DTOS': {
@@ -87,7 +81,8 @@ export class MethodDto {
           );
       }
     }
-    return params;
+    // 合并剩余参数
+    return { ...data, ...params };
   }
 
   /**

package/src/service/service/code-list/code-list.service.ts

@@ -99,8 +99,15 @@ export class CodeListService {
   ): Readonly<CodeListItem>[] {
     return codeItems.map(codeItem => {
       // todo代码项其他属性，表单数据
+      let text = codeItem.text!;
+      if (codeItem.textLanguageRes) {
+        text = ibiz.i18n.t(
+          codeItem.textLanguageRes.lanResTag!,
+          codeItem.textLanguageRes.defaultContent,
+        );
+      }
       const _codeItem: CodeListItem = {
-        text: codeItem.text!,
+        text,
         value: isValueNumber ? Number(codeItem.value) : codeItem.value!,
         color: codeItem.color,
         id: codeItem.codeName!,

package/src/types.ts

@@ -1,3 +1,4 @@
+import { I18n } from '@ibiz-template/core/src/interface';
 import { EngineFactory } from './engine';
 import { GlobalUtil } from './global';
 import {
@@ -5,6 +6,7 @@ import {
   INotificationUtil,
   IOpenViewUtil,
   IModalUtil,
+  IConfirmUtil,
   ILoadingUtil,
   IPluginFactory,
   IOverlayController,
@@ -45,6 +47,16 @@ declare module '@ibiz-template/core' {
      */
     modal: IModalUtil;
 
+    /**
+     * 确认框
+     *
+     * @description 需要用户确认收到提示消息时使用此工具
+     * @author chitanda
+     * @date 2022-08-17 16:08:10
+     * @type {IConfirmUtil}
+     */
+    confirm: IConfirmUtil;
+
     /**
      * 消息通知
      *
@@ -137,6 +149,15 @@ declare module '@ibiz-template/core' {
      */
     util: GlobalUtil;
 
+    /**
+     * 多语言
+     *
+     * @author chitanda
+     * @date 2023-08-11 16:08:15
+     * @type {I18n}
+     */
+    i18n: I18n;
+
     /**
      * 逻辑调度中心
      * @author lxm

package/src/ui-logic/ui-logic-node/bind-param-node/bind-param-node.ts

@@ -0,0 +1,30 @@
+import { RuntimeModelError } from '@ibiz-template/core';
+import { IDEUIBindParamLogic } from '@ibiz/model-core';
+import { UILogicContext } from '../../ui-logic-context';
+import { handleSrcVal } from '../../utils';
+import { UILogicNode } from '../ui-logic-node';
+
+/**
+ * 绑定参数
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class BindParamNode
+ * @extends {UILogicNode}
+ */
+export class BindParamNode extends UILogicNode {
+  declare model: IDEUIBindParamLogic;
+
+  async exec(ctx: UILogicContext): Promise<void> {
+    const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
+    if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
+      throw new RuntimeModelError(
+        this.model,
+        '缺少目标参数对象或者源参数对象配置',
+      );
+    }
+    const srcVal = handleSrcVal(ctx, this.model);
+    ctx.params[dstDEUILogicParamId] = srcVal;
+  }
+}

package/src/ui-logic/ui-logic-node/index.ts

@@ -5,3 +5,4 @@ export { EndNode } from './end-node/end-node';
 export { PrepareJSParamNode } from './prepare-js-param-node/prepare-js-param-node';
 export { UILogicNode } from './ui-logic-node';
 export { ViewCtrlInvokeNode } from './view-ctrl-invoke-node/view-ctrl-invoke-node';
+export { BindParamNode } from './bind-param-node/bind-param-node';

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

@@ -1,4 +1,4 @@
-import { ModelError, RuntimeError } from '@ibiz-template/core';
+import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { IDEUILogicParam } from '@ibiz/model-core';
 import { UILogicContext } from '../ui-logic-context';
 
@@ -46,7 +46,10 @@ export class UILogicParam {
       if (control) {
         ctx.params[tag] = control;
       } else {
-        throw new RuntimeError(`没找到${m.codeName!}指定部件对象`);
+        throw new RuntimeModelError(
+          this.model,
+          `视图逻辑初始化参数，未找到${m.codeName!}指定部件对象`,
+        );
       }
     } else if (m.activeViewParam) {
       // 当前视图

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

@@ -4,6 +4,7 @@ import { IDEUILogic } from '@ibiz/model-core';
 import { IUILogicParams } from '../interface';
 import { UILogicContext } from './ui-logic-context';
 import {
+  BindParamNode,
   DEActionNode,
   DEUIActionNode,
   EndNode,
@@ -72,12 +73,14 @@ export class UILogic {
         case 'PREPAREJSPARAM': // 准备参数
           logicNode = new PrepareJSParamNode(node);
           break;
-        case 'RESETPARAM': // 重置参数
-        case 'COPYPARAM': // 拷贝参数
         case 'BINDPARAM': // 绑定参数
+          logicNode = new BindParamNode(node);
+          break;
         case 'VIEWCTRLINVOKE': // 视图部件调用
           logicNode = new ViewCtrlInvokeNode(node);
           break;
+        case 'RESETPARAM': // 重置参数
+        case 'COPYPARAM': // 拷贝参数
         case 'VIEWCTRLFIREEVENT': // 视图部件事件触发
         case 'APPENDPARAM': // 附加到数组参数
         case 'SORTPARAM': // 排序数组参数

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

@@ -34,13 +34,10 @@ export function handleSrcVal(
   ctx: UILogicContext,
   srcValParams: SrcValParams,
 ): unknown {
-  const { srcDEUILogicParamId, srcValueType, srcFieldName, srcValue } =
-    srcValParams;
-
+  const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
   // 没有源值类型就是逻辑参数
-  if (!srcValParams.srcValueType) {
-    srcValParams.srcValueType = 'SRCDLPARAM';
-  }
+  const srcValueType = srcValParams.srcValueType || 'SRCDLPARAM';
+
   let value: unknown;
   switch (srcValueType) {
     // 源逻辑参数

package/src/utils/open-redirect-view/open-redirect-view.ts

@@ -7,7 +7,7 @@ import {
 import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
 import { isNilOrEmpty, notNilEmpty } from 'qx-util';
 import qs from 'qs';
-import { IModalData } from '../../interface';
+import { IModalData, IOpenViewOptions } from '../../interface';
 import { OpenAppViewCommand } from '../../command';
 import { convertNavData } from '../nav-params/nav-params';
 import { calcDeCodeNameById, findFieldById } from '../../model';
@@ -28,13 +28,13 @@ export async function openRedirectView(
   appView: IAppRedirectView,
   context: IContext,
   params: IParams = {},
-  data: IData[] = [],
+  opts: IOpenViewOptions = {},
 ): Promise<IModalData> {
   return openDERedirectView(
     appView as IAppDERedirectView,
     context,
     params,
-    data,
+    opts,
   );
 }
 
@@ -52,6 +52,7 @@ export async function openRedirectView(
 export async function toLocalOpenWFRedirectView(
   context: IContext,
   linkUrl: string,
+  opts: IOpenViewOptions = {},
 ): Promise<void> {
   const i = linkUrl.lastIndexOf('?');
   const queryStr: string = decodeURIComponent(
@@ -102,6 +103,7 @@ export async function toLocalOpenWFRedirectView(
     deRdView.id,
     context,
     params,
+    opts,
   );
 }
 
@@ -121,7 +123,7 @@ export async function openDERedirectView(
   appView: IAppDERedirectView,
   context: IContext,
   params: IParams = {},
-  data: IData[] = [],
+  opts: IOpenViewOptions = {},
 ): Promise<IModalData> {
   // 计算重定向视图上下文参数转换
   const navContext = appView.appViewNavContexts || [];
@@ -135,7 +137,7 @@ export async function openDERedirectView(
   // 重定向视图对应应用实体
   const entityId = appView.appDataEntityId!;
   const key = calcDeCodeNameById(entityId);
-  let curData: IData = data[0] || {};
+  let curData: IData = opts.data?.[0] || {};
   // 将数据主键转换到上下文当中
   context[key] = curData[key] || context[key] || params[key];
   // 实体重定向视图获取数据行为
@@ -171,7 +173,7 @@ export async function openDERedirectView(
           });
         }
         if (linkUrl.startsWith('appredirectview?')) {
-          await toLocalOpenWFRedirectView(context, linkUrl);
+          await toLocalOpenWFRedirectView(context, linkUrl, opts);
           return { ok: true, data: [] };
         }
         return { ok: false, data: [] };
@@ -204,7 +206,7 @@ export async function openDERedirectView(
         viewId,
         context,
         params,
-        { data: [curData] },
+        { ...opts, data: [curData] },
       );
       if (result) {
         return result;
@@ -283,7 +285,7 @@ export async function calcDERdTag(
     }
   }
   if (notNilEmpty(typeValue)) {
-    rdTag = `${defView}:${typeValue.toUpperCase()}`;
+    rdTag = `${defView}:${typeValue.toString().toUpperCase()}`;
   } else {
     rdTag = `${defView}`;
   }

package/src/utils/wf-helper/wf-helper.ts

@@ -29,11 +29,11 @@ export function getWFSubmitViewId(
   view: IAppView,
   link: WFLink,
 ): string | undefined {
-  const { type, sequenceFlowView, sequenceFlowMobView } = link;
+  const { type, sequenceflowview, sequenceflowmobview } = link;
   const appViewRefs = view.viewLayoutPanel?.appViewRefs || view.appViewRefs;
   const key = type
     ? `WFUTILACTION@${type.toUpperCase()}`
-    : `WFACTION@${ibiz.env.isMob ? sequenceFlowMobView : sequenceFlowView}`;
+    : `WFACTION@${ibiz.env.isMob ? sequenceflowmobview : sequenceflowview}`;
   const submitViewRef = appViewRefs!.find(viewRef => {
     return viewRef.name === key;
   });