@ibiz-template/runtime 0.1.5 → 0.1.6

package/src/interface/controller/controller/control/panel-item/i-panel-item-nav-pos.controller.ts

@@ -1,47 +1,6 @@
+import { INavViewMsg } from '../../../common';
 import { IPanelItemController } from './i-panel-item.controller';
 
-export interface INavViewMsg {
-  /**
-   * 视图唯一标识
-   * @author lxm
-   * @date 2023-05-25 07:01:28
-   * @type {string}
-   */
-  key: string;
-
-  /**
-   * 最新的路由全路径
-   * @author lxm
-   * @date 2023-05-25 07:03:29
-   * @type {string}
-   */
-  fullPath?: string;
-
-  /**
-   * 上下文
-   * @author lxm
-   * @date 2023-05-25 07:04:39
-   * @type {IContext}
-   */
-  context?: IContext;
-
-  /**
-   * 视图参数
-   * @author lxm
-   * @date 2023-05-25 07:04:38
-   * @type {IParams}
-   */
-  params?: IParams;
-
-  /**
-   * 视图模型
-   * @author lxm
-   * @date 2023-05-25 07:06:33
-   * @type {IAppView}
-   */
-  viewId?: string;
-}
-
 /**
  * 导航占位控制器接口
  *
@@ -51,16 +10,6 @@ export interface INavViewMsg {
  * @interface INavPosController
  */
 export interface IPanelItemNavPosController extends IPanelItemController {
-  /**
-   * 设置默认打开视图
-   *
-   * @author zk
-   * @date 2023-07-11 09:07:46
-   * @param {INavViewMsg} navViewMsg
-   * @memberof INavPosController
-   */
-  setDefaultOpenView(navViewMsg: INavViewMsg): void;
-
   /**
    * 打开视图
    *

package/src/interface/controller/event/argument/control-trigger.event.ts

@@ -0,0 +1,35 @@
+import { EventBase } from './base.event';
+
+/**
+ * 部件事件
+ * @author lxm
+ * @date 2023-08-09 10:52:48
+ * @export
+ * @interface ControlTriggerEvent
+ * @extends {EventBase}
+ */
+export interface ControlTriggerEvent extends EventBase {
+  /**
+   * 触发的部件名称
+   * @author lxm
+   * @date 2023-03-26 02:02:16
+   * @type {string}
+   */
+  triggerControlName: string;
+
+  /**
+   * 触发的部件事件的名称
+   * @author lxm
+   * @date 2023-07-26 11:00:37
+   * @type {string}
+   */
+  triggerEventName: string;
+
+  /**
+   * 触发的部件事件的事件对象
+   * @author lxm
+   * @date 2023-08-09 07:02:28
+   * @type {EventBase}
+   */
+  triggerEvent: EventBase;
+}

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

@@ -4,3 +4,5 @@ export { DataChangeEvent } from './data-change.event';
 export { ViewInfoEvent } from './view-info.event';
 export { CloseViewEvent } from './close-view.event';
 export { UIActionEvent } from './uiaction.event';
+export { ControlTriggerEvent } from './control-trigger.event';
+export { NavViewChangeEvent } from './nav-view-change.event';

package/src/interface/controller/event/argument/nav-view-change.event.ts

@@ -0,0 +1,20 @@
+import { INavViewMsg } from '../../common';
+import { EventBase } from './base.event';
+
+/**
+ * 导航视图变更事件
+ * @author lxm
+ * @date 2023-08-09 10:52:48
+ * @export
+ * @interface NavViewChangeEvent
+ * @extends {EventBase}
+ */
+export interface NavViewChangeEvent extends EventBase {
+  /**
+   * 导航视图信息
+   * @author lxm
+   * @date 2023-08-09 07:35:50
+   * @type {INavViewMsg}
+   */
+  navViewMsg: INavViewMsg;
+}

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

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

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

@@ -1,3 +1,5 @@
+import { PartialWithObject } from '@ibiz-template/core';
+import { ControlTriggerEvent, EventBase } from '../argument';
 import { IControlEvent } from './i-control.event';
 
 /**
@@ -8,4 +10,16 @@ import { IControlEvent } from './i-control.event';
  * @export
  * @interface IPanelEvent
  */
-export type IPanelEvent = IControlEvent;
+export interface IPanelEvent extends IControlEvent {
+  /**
+   * 面板里的部件事件监听
+   * @author lxm
+   * @date 2023-03-26 06:15:06
+   * @param {EventBase} event
+   * @return {*}  {Promise<void>}
+   */
+  onControlEvent: {
+    event: ControlTriggerEvent;
+    emitArgs: PartialWithObject<ControlTriggerEvent, EventBase>;
+  };
+}

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/service/dto/method.dto.ts

@@ -1,4 +1,5 @@
 /* eslint-disable no-await-in-loop */
+import { clone } from 'ramda';
 import {
   IAppDataEntity,
   IAppDEMethodDTO,
@@ -52,17 +53,21 @@ export class MethodDto {
    */
   async get(context: IParams, data: IData): Promise<IData> {
     const params: IData = {};
+    // 拷贝数据
+    const copyData = clone(data);
     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];
+          const val = copyData[key];
           if (isNilOrEmpty(val)) {
             params[key] = null;
           } else {
             params[key] = val;
           }
+          // 取值后删除
+          delete copyData[key];
           break;
         }
         case 'DTOS': {
@@ -87,6 +92,8 @@ export class MethodDto {
           );
       }
     }
+    // 合并剩余参数
+    Object.assign(params, copyData);
     return params;
   }
 

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