@ibiz-template/runtime 0.1.5 → 0.1.7

package/out/ui-logic/ui-logic.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-await-in-loop */
 import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { UILogicContext } from './ui-logic-context';
-import { DEActionNode, DEUIActionNode, EndNode, PrepareJSParamNode, StartNode, ViewCtrlInvokeNode, } from './ui-logic-node';
+import { BindParamNode, DEActionNode, DEUIActionNode, EndNode, PrepareJSParamNode, StartNode, ViewCtrlInvokeNode, } from './ui-logic-node';
 import { UILogicParam } from './ui-logic-param/ui-logic-param';
 /**
  * 界面逻辑
@@ -61,12 +61,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/out/ui-logic/utils/handle-src-val.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/utils/handle-src-val.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,KAAK,YAAY,GAAG;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,CA+CT"}
+{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/utils/handle-src-val.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,KAAK,YAAY,GAAG;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,CA4CT"}

package/out/ui-logic/utils/handle-src-val.js

@@ -10,11 +10,9 @@ import { clone } from 'ramda';
  * @return {*}
  */
 export function handleSrcVal(ctx, srcValParams) {
-    const { srcDEUILogicParamId, srcValueType, srcFieldName, srcValue } = srcValParams;
+    const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
     // 没有源值类型就是逻辑参数
-    if (!srcValParams.srcValueType) {
-        srcValParams.srcValueType = 'SRCDLPARAM';
-    }
+    const srcValueType = srcValParams.srcValueType || 'SRCDLPARAM';
     let value;
     switch (srcValueType) {
         // 源逻辑参数

package/out/utils/open-redirect-view/open-redirect-view.d.ts

@@ -1,5 +1,5 @@
 import { IAppDERedirectView, IAppDataEntity, IAppRedirectView } from '@ibiz/model-core';
-import { IModalData } from '../../interface';
+import { IModalData, IOpenViewOptions } from '../../interface';
 /**
  * 打开重定向视图
  *
@@ -12,7 +12,7 @@ import { IModalData } from '../../interface';
  * @param {IData} [data={}]
  * @return {*}  {Promise<IModalData>}
  */
-export declare function openRedirectView(appView: IAppRedirectView, context: IContext, params?: IParams, data?: IData[]): Promise<IModalData>;
+export declare function openRedirectView(appView: IAppRedirectView, context: IContext, params?: IParams, opts?: IOpenViewOptions): Promise<IModalData>;
 /**
  * 本地打开工作流重定向视图
  *
@@ -24,7 +24,7 @@ export declare function openRedirectView(appView: IAppRedirectView, context: ICo
  * @param {IContext} context
  * @param {string} linkUrl
  */
-export declare function toLocalOpenWFRedirectView(context: IContext, linkUrl: string): Promise<void>;
+export declare function toLocalOpenWFRedirectView(context: IContext, linkUrl: string, opts?: IOpenViewOptions): Promise<void>;
 /**
  * 打开实体重定向视图
  *
@@ -37,7 +37,7 @@ export declare function toLocalOpenWFRedirectView(context: IContext, linkUrl: st
  * @param {IData[]} [data=[]]
  * @return {*}  {Promise<IModalData>}
  */
-export declare function openDERedirectView(appView: IAppDERedirectView, context: IContext, params?: IParams, data?: IData[]): Promise<IModalData>;
+export declare function openDERedirectView(appView: IAppDERedirectView, context: IContext, params?: IParams, opts?: IOpenViewOptions): Promise<IModalData>;
 /**
  * 计算重定向标识
  *

package/out/utils/open-redirect-view/open-redirect-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/utils/open-redirect-view/open-redirect-view.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAK7C;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,UAAU,CAAC,CAOrB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAmDf;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,UAAU,CAAC,CAyGrB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,MAAM,CAAC,CA0CjB"}
+{"version":3,"file":"open-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/utils/open-redirect-view/open-redirect-view.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAK/D;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAOrB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAoDf;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAyGrB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,MAAM,CAAC,CA0CjB"}

package/out/utils/open-redirect-view/open-redirect-view.js

@@ -16,8 +16,8 @@ import { calcDeCodeNameById, findFieldById } from '../../model';
  * @param {IData} [data={}]
  * @return {*}  {Promise<IModalData>}
  */
-export async function openRedirectView(appView, context, params = {}, data = []) {
-    return openDERedirectView(appView, context, params, data);
+export async function openRedirectView(appView, context, params = {}, opts = {}) {
+    return openDERedirectView(appView, context, params, opts);
 }
 /**
  * 本地打开工作流重定向视图
@@ -30,7 +30,7 @@ export async function openRedirectView(appView, context, params = {}, data = [])
  * @param {IContext} context
  * @param {string} linkUrl
  */
-export async function toLocalOpenWFRedirectView(context, linkUrl) {
+export async function toLocalOpenWFRedirectView(context, linkUrl, opts = {}) {
     const i = linkUrl.lastIndexOf('?');
     const queryStr = decodeURIComponent(linkUrl.substring(i + 1, linkUrl.length));
     const params = qs.parse(queryStr, { delimiter: ';' });
@@ -65,7 +65,7 @@ export async function toLocalOpenWFRedirectView(context, linkUrl) {
         context.srfprocessinstanceid = params.srfprocessinstanceid;
         delete params.srfprocessinstanceid;
     }
-    await ibiz.commands.execute(OpenAppViewCommand.TAG, deRdView.id, context, params);
+    await ibiz.commands.execute(OpenAppViewCommand.TAG, deRdView.id, context, params, opts);
 }
 /**
  * 打开实体重定向视图
@@ -79,7 +79,8 @@ export async function toLocalOpenWFRedirectView(context, linkUrl) {
  * @param {IData[]} [data=[]]
  * @return {*}  {Promise<IModalData>}
  */
-export async function openDERedirectView(appView, context, params = {}, data = []) {
+export async function openDERedirectView(appView, context, params = {}, opts = {}) {
+    var _a;
     // 计算重定向视图上下文参数转换
     const navContext = appView.appViewNavContexts || [];
     const navContextData = convertNavData(navContext, context, params);
@@ -91,7 +92,7 @@ export async function openDERedirectView(appView, context, params = {}, data = [
     // 重定向视图对应应用实体
     const entityId = appView.appDataEntityId;
     const key = calcDeCodeNameById(entityId);
-    let curData = data[0] || {};
+    let curData = ((_a = opts.data) === null || _a === void 0 ? void 0 : _a[0]) || {};
     // 将数据主键转换到上下文当中
     context[key] = curData[key] || context[key] || params[key];
     // 实体重定向视图获取数据行为
@@ -125,7 +126,7 @@ export async function openDERedirectView(appView, context, params = {}, data = [
                     });
                 }
                 if (linkUrl.startsWith('appredirectview?')) {
-                    await toLocalOpenWFRedirectView(context, linkUrl);
+                    await toLocalOpenWFRedirectView(context, linkUrl, opts);
                     return { ok: true, data: [] };
                 }
                 return { ok: false, data: [] };
@@ -151,7 +152,7 @@ export async function openDERedirectView(appView, context, params = {}, data = [
     if (refView) {
         const viewId = refView.refAppViewId;
         if (viewId) {
-            const result = await ibiz.commands.execute(OpenAppViewCommand.TAG, viewId, context, params, { data: [curData] });
+            const result = await ibiz.commands.execute(OpenAppViewCommand.TAG, viewId, context, params, Object.assign(Object.assign({}, opts), { data: [curData] }));
             if (result) {
                 return result;
             }
@@ -219,7 +220,7 @@ export async function calcDERdTag(entity, rdView, params, data) {
         }
     }
     if (notNilEmpty(typeValue)) {
-        rdTag = `${defView}:${typeValue.toUpperCase()}`;
+        rdTag = `${defView}:${typeValue.toString().toUpperCase()}`;
     }
     else {
         rdTag = `${defView}`;

package/out/utils/wf-helper/wf-helper.js

@@ -23,11 +23,11 @@ export function getWFContext(data) {
  */
 export function getWFSubmitViewId(view, link) {
     var _a;
-    const { type, sequenceFlowView, sequenceFlowMobView } = link;
+    const { type, sequenceflowview, sequenceflowmobview } = link;
     const appViewRefs = ((_a = view.viewLayoutPanel) === null || _a === void 0 ? void 0 : _a.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;
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.5",
+    "@ibiz-template/core": "^0.1.7",
     "@ibiz/model-core": "^0.0.14",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.7",
@@ -53,5 +53,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "76df195a7f16de6aec8c14d1315c09db06b5c3ff"
+  "gitHead": "5e283e6c4cfad7a27402a60f96d4f628bf1dbb1a"
 }

package/src/command/app/open-app-view/open-app-view.ts

@@ -1,6 +1,6 @@
 import { ModelError, RuntimeError } from '@ibiz-template/core';
 import { IAppRedirectView } from '@ibiz/model-core';
-import { IModalData, IViewConfig } from '../../../interface';
+import { IModalData, IOpenViewOptions, IViewConfig } from '../../../interface';
 import { calcDeCodeNameById } from '../../../model';
 import { openRedirectView } from '../../../utils';
 
@@ -34,7 +34,7 @@ export class OpenAppViewCommand {
     appViewId: string,
     context: IContext,
     params: IParams = {},
-    opts: IData = {},
+    opts: IOpenViewOptions = {},
   ): Promise<IModalData | void> {
     const appView = await ibiz.hub.config.view.get(appViewId!);
     if (!appView) {
@@ -54,7 +54,7 @@ export class OpenAppViewCommand {
         fullViewModel as IAppRedirectView,
         context,
         params,
-        opts.data,
+        opts,
       );
     }
     const { openMode = 'INDEXVIEWTAB' } = appView;
@@ -72,7 +72,7 @@ export class OpenAppViewCommand {
       case 'POPUPAPP':
         throw new ModelError(appView, '未支持的视图打开模式: POPUPAPP');
       case 'POPOVER':
-        return this.openPopover(appView, opts.event, context, params);
+        return this.openPopover(appView, opts.event!, context, params);
       case 'DRAWER_LEFT':
       case 'DRAWER_RIGHT':
       case 'DRAWER_TOP':
@@ -135,10 +135,13 @@ export class OpenAppViewCommand {
    */
   protected async openPopover(
     appView: IViewConfig,
-    event: MouseEvent,
+    event: MouseEvent | undefined,
     context: IContext,
     params: IParams = {},
   ): Promise<IModalData> {
+    if (!event) {
+      throw new RuntimeError('气泡打开缺少event');
+    }
     return ibiz.openView.popover(appView, event, context, params);
   }
 

package/src/controller/common/base.controller.ts

@@ -200,7 +200,7 @@ export class BaseController<
   async destroyed(): Promise<void> {
     await this.onDestroyed();
     ibiz.log.debug(`${this.constructor.name}:${this.name} onDestroyed`);
-    this._evt.emit('onDestroyed', undefined);
+    await this._evt.emit('onDestroyed', undefined);
     this.evt.destroy();
   }
 

package/src/controller/common/control/control.controller.ts

@@ -95,7 +95,7 @@ export class ControlController<
    * @protected
    */
   protected registerToCtx(): void {
-    this.ctx.registerController(this.model.name!, this);
+    this.ctx.registerController(this.model.name! || this.model.id!, this);
   }
 
   /**

package/src/controller/common/control/md-control.controller.ts

@@ -189,7 +189,7 @@ export class MDControlController<
     if (!data?.length) {
       throw new RuntimeError('未选中数据');
     }
-    const del = await ibiz.modal.confirm({
+    const del = await ibiz.confirm.error({
       title: '数据删除',
       desc: '确认删除数据？',
     });

package/src/controller/common/view/view.controller.ts

@@ -252,9 +252,12 @@ export class ViewController<
       this.scheduler.defaultParamsCb = (): IUILogicParams => {
         return this.getEventArgs();
       };
-      this.evt.onAll((_eventName, event) => {
-        this.scheduler!.triggerViewEvent(event);
-      });
+      if (this.scheduler.hasViewEventTrigger) {
+        // 监听视图事件触发视图事件触发器
+        this.evt.onAll((_eventName, event) => {
+          this.scheduler!.triggerViewEvent(event);
+        });
+      }
     }
 
     // 执行视图引擎的doCreated
@@ -380,5 +383,15 @@ export class ViewController<
         this.mountCounter.attend(this.layoutPanel!.model.name!);
       });
     }
+
+    if (this.scheduler?.hasControlEventTrigger) {
+      // 监听部件事件触发部件事件触发器
+      panel.evt.on('onControlEvent', event => {
+        this.scheduler!.triggerControlEvent(
+          event.triggerControlName,
+          event.triggerEvent,
+        );
+      });
+    }
   }
 }

package/src/controller/ctx/ctx.ts

@@ -48,7 +48,7 @@ export class CTX<V extends IViewController = IViewController> {
    * @date 2023-04-26 07:54:46
    * @protected
    */
-  readonly evt = new QXEvent<CTXEvent>();
+  readonly evt = new QXEvent<CTXEvent>(3000);
 
   /**
    * 当前视图控制器集合（包含自身视图控制器，部件控制器，和下一层级的视图的控制器）

package/src/interface/common/i-open-view-options/i-open-view-options.ts

@@ -0,0 +1,40 @@
+/**
+ * 打开视图额外参数
+ * @author lxm
+ * @date 2023-08-14 11:46:55
+ * @export
+ * @interface IOpenViewOptions
+ */
+export interface IOpenViewOptions {
+  /**
+   * 打开方式
+   * @author lxm
+   * @date 2023-08-14 01:40:27
+   * @type {string}
+   */
+  openMode?: string;
+
+  /**
+   * 不等待路由打开
+   * @author lxm
+   * @date 2023-07-28 02:23:13
+   * @type {boolean}
+   */
+  noWaitRoute?: boolean;
+
+  /**
+   * 数据集合
+   * @author lxm
+   * @date 2023-08-14 01:40:14
+   * @type {IData[]}
+   */
+  data?: IData[];
+
+  /**
+   * 原生js事件
+   * @author lxm
+   * @date 2023-08-14 04:22:06
+   * @type {MouseEvent}
+   */
+  event?: MouseEvent;
+}

package/src/interface/common/index.ts

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

package/src/interface/controller/common/i-nav-view-msg/i-nav-view-msg.ts

@@ -0,0 +1,48 @@
+/**
+ * 导航视图需要使用到的相关信息
+ * @author lxm
+ * @date 2023-08-10 05:46:21
+ * @export
+ * @interface INavViewMsg
+ */
+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;
+}

package/src/interface/controller/common/index.ts

@@ -1,2 +1,3 @@
 export * from './button-state';
 export * from './i-icon/i-icon';
+export * from './i-nav-view-msg/i-nav-view-msg';

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

@@ -1,4 +1,5 @@
 import { IExpBar } from '@ibiz/model-core';
+import { INavViewMsg } from '../../common';
 import { IExpBarControlEvent } from '../../event';
 import { IExpBarControlState } from '../../state';
 import { IControlController } from './i-control.controller';
@@ -45,4 +46,15 @@ export interface IExpBarControlController<
    * @memberof IExpBarControlController
    */
   load(): Promise<IData[]>;
+
+  /**
+   * 获取导航视图消息
+   *
+   * @author zk
+   * @date 2023-08-04 08:08:27
+   * @param {IData[]} data
+   * @return {*}  {(INavViewMsg | undefined)}
+   * @memberof ITreeExpBarController
+   */
+  getNavViewMsg(data: IData, context: IContext, params: IParams): INavViewMsg;
 }

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

@@ -2,7 +2,6 @@ import { ITreeExpBar } from '@ibiz/model-core';
 import { ITreeExpBarEvent } from '../../event';
 import { ITreeExpBarState } from '../../state';
 import { IExpBarControlController } from './i-exp-bar-control.controller';
-import { INavViewMsg } from './panel-item';
 
 /**
  * 树导航栏控制器
@@ -16,19 +15,4 @@ export interface ITreeExpBarController
     ITreeExpBar,
     ITreeExpBarState,
     ITreeExpBarEvent
-  > {
-  /**
-   * 获取导航视图消息
-   *
-   * @author zk
-   * @date 2023-08-04 08:08:27
-   * @param {IData[]} data
-   * @return {*}  {(INavViewMsg | undefined)}
-   * @memberof ITreeExpBarController
-   */
-  getNavViewMsg(
-    data: IData[],
-    context: IContext,
-    params: IParams,
-  ): INavViewMsg | undefined;
-}
+  > {}

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