@ibiz-template/runtime 0.1.33 → 0.1.34

package/out/service/service/entity/method/ac-fetch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ac-fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/ac-fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC;;;;;;;;GAQG;AACH,qBAAa,aAAc,SAAQ,WAAW;IAC5C,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;CAGrE"}

package/out/service/service/entity/method/ac-fetch.js

@@ -0,0 +1,15 @@
+import { FetchMethod } from './fetch';
+/**
+ * ac 模式下的数据集获取请求
+ *
+ * @author chitanda
+ * @date 2023-10-12 17:10:03
+ * @export
+ * @class AcFetchMethod
+ * @extends {FetchMethod}
+ */
+export class AcFetchMethod extends FetchMethod {
+    mergeRequestPath(path, methodName) {
+        return `${path}/ac/${methodName}?srfac=ac`;
+    }
+}

package/out/service/service/entity/method/method.d.ts

@@ -77,6 +77,7 @@ export declare abstract class Method {
      * @return {*}  {Promise<HttpResponse<any>>}
      */
     protected request(path: string, context: IParams, data?: IData, params?: IParams): Promise<HttpResponse<any>>;
+    protected mergeRequestPath(path: string, methodName: string): string;
     /**
      * 根据上下文计算当前请求路径
      *

package/out/service/service/entity/method/method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,8BAAsB,MAAM;IA2CxB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IA3ChC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAG,WAAW,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAG,YAAY,CAAC;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAElC;;;;;;;;OAQG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAOhC;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GAEf,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IA2C7B;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;IAM5C;;;;;;;OAOG;cACa,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC;IAOpD;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,GAAG,WAAW;CAM/D"}
+{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,8BAAsB,MAAM;IA2CxB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IA3ChC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAG,WAAW,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAG,YAAY,CAAC;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAElC;;;;;;;;OAQG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAOhC;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GAEf,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IA8C7B,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAIpE;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;IAM5C;;;;;;;OAOG;cACa,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC;IAOpD;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,GAAG,WAAW;CAM/D"}

package/out/service/service/entity/method/method.js

@@ -49,17 +49,17 @@ export class Method {
             let res = null;
             switch (requestMethod) {
                 case 'POST':
-                    res = await this.app.net.post(`${path}/${methodName}`, notNilEmpty(data) ? data : params);
+                    res = await this.app.net.post(this.mergeRequestPath(path, methodName), notNilEmpty(data) ? data : params);
                     break;
                 case 'GET':
-                    res = await this.app.net.get(`${path}/${methodName}`, data || params);
+                    res = await this.app.net.get(this.mergeRequestPath(path, methodName), data || params);
                     break;
                 case 'PUT': {
-                    res = await this.app.net.put(`${path}/${methodName}`, notNilEmpty(data) ? data : params);
+                    res = await this.app.net.put(this.mergeRequestPath(path, methodName), notNilEmpty(data) ? data : params);
                     break;
                 }
                 case 'DELETE':
-                    res = await this.app.net.delete(`${path}/${methodName}`, data || params);
+                    res = await this.app.net.delete(this.mergeRequestPath(path, methodName), data || params);
                     break;
                 default:
                     if (requestMethod) {
@@ -73,6 +73,9 @@ export class Method {
         }
         throw new RuntimeModelError(this.method, `未支持的行为类型[${actionType}]`);
     }
+    mergeRequestPath(path, methodName) {
+        return `${path}/${methodName}`;
+    }
     /**
      * 根据上下文计算当前请求路径
      *

package/out/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-link-single-cond.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAE3E;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,eAAe;IAmCrC,KAAK,EAAE,sBAAsB;IAlChD;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAE7B;IAED,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;gBAEkB,KAAK,EAAE,sBAAsB;IAMhD;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAgCnE"}
+{"version":3,"file":"ui-logic-link-single-cond.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAE3E;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,eAAe;IAmCrC,KAAK,EAAE,sBAAsB;IAlChD;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAE7B;IAED,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;gBAEkB,KAAK,EAAE,sBAAsB;IAMhD;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAsCnE"}

package/out/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.js

@@ -1,5 +1,6 @@
 import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { testCond } from '../../../utils';
+import { handleSrcVal } from '../../utils';
 import { UILogicLinkCond } from '../ui-logic-link-cond/ui-logic-link-cond';
 /**
  * 界面逻辑连接条件项
@@ -40,7 +41,10 @@ export class UILogicLinkSingleCond extends UILogicLinkCond {
      * @return {*}  {boolean}
      */
     test(ctx, context, data) {
-        const dst = ctx.params[this.dstParam];
+        const dstVal = handleSrcVal(ctx, {
+            srcDEUILogicParamId: this.dstParam,
+            srcFieldName: this.dstField,
+        });
         switch (this.type) {
             case 'ENTITYFIELD': {
                 if (!this.value) {
@@ -48,20 +52,23 @@ export class UILogicLinkSingleCond extends UILogicLinkCond {
                 }
                 // 数据对象属性
                 const value = data[this.value] != null ? data[this.value] : context[this.value];
-                return testCond(dst[this.dstField], this.op, value);
+                return testCond(dstVal, this.op, value);
             }
             case 'SRCENTITYFIELD': {
                 if (!this.value) {
                     throw new RuntimeModelError(this.model, '当前条件值类型为[源数据对象属性],缺少配置条件值');
                 }
                 // 源数据对象属性
-                const src = ctx.params[this.srcParam];
-                return testCond(dst[this.dstField], this.op, src[this.value]);
+                const srcVal = handleSrcVal(ctx, {
+                    srcDEUILogicParamId: this.srcParam,
+                    srcFieldName: this.value,
+                });
+                return testCond(dstVal, this.op, srcVal);
             }
             case 'CURTIME': // 当前时间
                 throw new ModelError(this.model, `暂未支持条件值类型为[当前时间]`);
             default: // 直接使用目标对象参数属性和值做对比
-                return testCond(dst[this.dstField], this.op, this.value);
+                return testCond(dstVal, this.op, this.value);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.33",
+  "version": "0.1.34",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.33",
+    "@ibiz-template/core": "^0.1.34",
     "@ibiz/model-core": "^0.0.19",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.8",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "769acca4bc7229f5d27f57e803a9f1d3ea7172ac"
+  "gitHead": "6b6ab37103623fbc1994241b511829a2013a72c0"
 }

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

@@ -147,6 +147,13 @@ export class ControlController<
     this.initControlScheduler(this.model.controlLogics);
   }
 
+  protected async onMounted(): Promise<void> {
+    await super.onMounted();
+
+    // 启动定时器触发
+    this.scheduler?.startTimerTrigger();
+  }
+
   protected async onDestroyed(): Promise<void> {
     await super.onDestroyed();
     if (this.scheduler) {
@@ -213,7 +220,21 @@ export class ControlController<
   } {
     const context = this.context.clone();
     const params = { ...this.params };
-    const data = args?.data || this.getData() || [];
+
+    let data = this.getData() || [];
+    if (args?.data) {
+      data = Array.isArray(args.data) ? args.data : [args.data];
+    }
+
+    // 合并附加上下文
+    if (args?.context) {
+      Object.assign(context, args.context);
+    }
+
+    // 合并附加视图参数
+    if (args?.viewParam) {
+      Object.assign(params, args.viewParam);
+    }
     return { context, params, data };
   }
 
@@ -243,6 +264,9 @@ export class ControlController<
    * @memberof ControlController
    */
   protected handleControlParams(): void {
+    if (!this.model.controlParam) {
+      return;
+    }
     const { ctrlParams } = this.model.controlParam!;
     let params = {};
     if (notNilEmpty(ctrlParams)) {

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

@@ -198,7 +198,7 @@ export class MDControlController<
 
       // *查询参数处理
       const { context } = this.handlerAbilityParams(args);
-      const params = await this.getFetchParams(args?.params);
+      const params = await this.getFetchParams(args?.viewParam);
 
       const res = await this.service.fetch(context, params);
       // 更新分页数据总条数

package/src/controller/common/editor/editor.controller.ts

@@ -164,8 +164,7 @@ export class EditorController<T extends IEditor = IEditor>
     if (navigateParams && data) {
       selfParams = convertNavData(navigateParams!, data, params, context);
     }
-    const _params: IParams = { ...params, ...selfParams };
-    return { context: _context, params: _params };
+    return { context: _context, params: selfParams };
   }
 
   /**

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

@@ -265,6 +265,7 @@ export class ViewController<
     // 初始化计时器服务
     await this.initCounters();
 
+    // 初始化视图逻辑调度器
     const appViewLogics = getViewLogics(this.model);
     if (appViewLogics.length) {
       this.scheduler = ibiz.scheduler.createViewScheduler(appViewLogics);
@@ -414,6 +415,7 @@ export class ViewController<
       panel.evt.on('onControlEvent', event => {
         this.scheduler!.triggerControlEvent(
           event.triggerControlName,
+          event.triggerEventName,
           event.triggerEvent,
         );
       });

package/src/controller/control/calendar/calendar.controller.ts

@@ -76,7 +76,7 @@ export class CalendarController
     const isInitialLoad = args.isInitialLoad === true;
     // *查询参数处理
     const { context } = this.handlerAbilityParams(args);
-    const params = await this.getFetchParams(args?.params);
+    const params = await this.getFetchParams(args?.viewParam);
     // *发起请求
     await this.startLoading();
     let items;

package/src/controller/control/data-view/data-view.controller.ts

@@ -155,13 +155,13 @@ export class DataViewControlController<
               tempData = tempData.getOrigin();
             }
             if (tempData) {
-              group.groupActionGroupState!.update(
+              group.groupActionGroupState?.update(
                 tempData,
                 this.model.appDataEntityId!,
               );
             }
           } else {
-            group.groupActionGroupState!.update(
+            group.groupActionGroupState?.update(
               undefined,
               this.model.appDataEntityId!,
             );
@@ -173,7 +173,7 @@ export class DataViewControlController<
           return group.children.indexOf(data) !== -1;
         });
         if (actionGroup) {
-          actionGroup.groupActionGroupState!.update(
+          actionGroup.groupActionGroupState?.update(
             actionGroup.selectedData![0],
             this.model.appDataEntityId!,
           );

package/src/controller/control/form/edit-form/edit-form.controller.ts

@@ -15,6 +15,7 @@ import {
   IViewController,
   IEditViewState,
   IEditViewEvent,
+  IDataAbilityParams,
 } from '../../../../interface';
 import { calcDeCodeNameById, hasDeCodeName } from '../../../../model';
 import { Srfuf, ControlVO } from '../../../../service';
@@ -87,8 +88,8 @@ export class EditFormController
    * @date 2023-08-25 02:45:11
    * @return {*}  {Promise<IData>}
    */
-  async loadDraft(): Promise<IData> {
-    const queryParams = { ...this.params };
+  async loadDraft(args?: IDataAbilityParams): Promise<IData> {
+    const { context, params: queryParams } = this.handlerAbilityParams(args);
     // 新建默认值给到graft接口，接口会回来
     const params = await this.getDraftParams(); // 新建默认值
     Object.assign(queryParams, params);
@@ -97,7 +98,7 @@ export class EditFormController
     try {
       await this.startLoading();
       await this.evt.emit('onBeforeLoadDraft', { params: queryParams });
-      res = await this.service.getDraft(this.context, queryParams);
+      res = await this.service.getDraft(context, queryParams);
     } catch (error) {
       await this.evt.emit('onLoadDraftError', undefined);
       this.actionNotification('GETDRAFTERROR', {
@@ -177,7 +178,7 @@ export class EditFormController
    * @author lxm
    * @date 2022-08-19 14:08:50
    */
-  async load(): Promise<IData> {
+  async load(args?: IDataAbilityParams): Promise<IData> {
     // 复制模式独立处理
     const copyMode = this.params.srfcopymode;
     if (copyMode) {
@@ -192,13 +193,15 @@ export class EditFormController
       return this.loadDraft();
     }
 
-    const queryParams = clone(this.params);
+    const { context, params } = this.handlerAbilityParams(args);
+
+    const queryParams = clone(params);
 
     let res;
     try {
       await this.startLoading();
       await this.evt.emit('onBeforeLoad', undefined);
-      res = await this.service.get(this.context, queryParams);
+      res = await this.service.get(context, queryParams);
     } catch (error) {
       await this.evt.emit('onLoadError', undefined);
       this.actionNotification('GETERROR', {
@@ -225,7 +228,7 @@ export class EditFormController
    * @author lxm
    * @date 2022-08-31 22:08:40
    */
-  async save(): Promise<IData> {
+  async save(args?: IDataAbilityParams): Promise<IData> {
     // 如果数据正在处理中，则延迟保存
     if (this.state.processing) {
       const data = await awaitTimeout(500, this.save.bind(this));
@@ -238,12 +241,16 @@ export class EditFormController
     }
     await this.startLoading();
     await this.evt.emit('onBeforeSave', undefined);
-    const isCreate = this.data.srfuf === Srfuf.CREATE;
+
+    const { context, data } = this.handlerAbilityParams(args);
+    const saveData = data[0];
+
+    const isCreate = saveData.srfuf === Srfuf.CREATE;
     let res;
     try {
       res = isCreate
-        ? await this.service.create(this.context, this.data)
-        : await this.service.update(this.context, this.data);
+        ? await this.service.create(context, saveData)
+        : await this.service.update(context, saveData);
     } catch (error) {
       await this.evt.emit('onSaveError', undefined);
       this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}ERROR`, {
@@ -279,7 +286,8 @@ export class EditFormController
    * @date 2022-09-01 09:09:36
    * @returns {*}
    */
-  async remove(): Promise<boolean> {
+  async remove(args?: IDataAbilityParams): Promise<boolean> {
+    const { context, params } = this.handlerAbilityParams(args);
     // 新建数据清空数据
     let res: IHttpResponse | undefined;
     let ok: boolean = false;
@@ -296,7 +304,7 @@ export class EditFormController
       }
       await this.startLoading();
       try {
-        res = await this.service.remove(this.context, this.params);
+        res = await this.service.remove(context, params);
       } catch (error) {
         await this.evt.emit('onRemoveError', undefined);
         this.actionNotification('REMOVEERROR', {
@@ -406,21 +414,15 @@ export class EditFormController
    * @param {IParams} [extraParams={}] 不走工作流启动视图时使用
    * @returns {*}  {Promise<void>}
    */
-  async wfStart(extraParams: IParams = {}): Promise<void> {
+  async wfStart(args?: IDataAbilityParams): Promise<void> {
     const isValid = await this.validate();
     if (!isValid) {
       throw new RuntimeError('请检查表单填写！');
     }
     await this.startLoading();
+    const { context, params } = this.handlerAbilityParams(args);
     try {
-      await this.service.wfStart(
-        this.context,
-        {
-          ...this.params,
-          ...extraParams,
-        },
-        this.data,
-      );
+      await this.service.wfStart(context, params, this.data);
     } catch (error) {
       this.actionNotification('WFSTARTERROR', {
         error: error as Error,
@@ -440,21 +442,16 @@ export class EditFormController
    * @param {IParams} [extraParams={}] 不走工作流操作视图时使用
    * @returns {*}  {Promise<void>}
    */
-  async wfSubmit(extraParams: IParams = {}): Promise<void> {
+  async wfSubmit(args?: IDataAbilityParams): Promise<void> {
     const isValid = await this.validate();
     if (!isValid) {
       throw new RuntimeError('请检查表单填写！');
     }
+
     await this.startLoading();
+    const { context, params } = this.handlerAbilityParams(args);
     try {
-      await this.service.wfSubmit(
-        this.context,
-        {
-          ...this.params,
-          ...extraParams,
-        },
-        this.data,
-      );
+      await this.service.wfSubmit(context, params, this.data);
     } catch (error) {
       this.actionNotification('WFSUBMITERROR', {
         error: error as Error,

package/src/controller/control/grid/grid/grid.controller.ts

@@ -893,7 +893,7 @@ export class GridController
   async loadData(args: MDCtrlLoadParams): Promise<ControlVO[]> {
     // *查询参数处理
     const { context } = this.handlerAbilityParams(args);
-    const params = await this.getFetchParams(args?.params);
+    const params = await this.getFetchParams(args?.viewParam);
     let res;
     // *发起请求
     await this.startLoading();
@@ -959,7 +959,7 @@ export class GridController
                 size: (endPage - startPage + 1) * size,
               }
             : { size: 1000, page: 0 };
-        data = await this.loadData({ params });
+        data = await this.loadData({ viewParam: params });
       }
       if (type === 'selectedRows') {
         data = this.getData();

package/src/controller/control/panel/panel/panel-item.controller.ts

@@ -341,4 +341,16 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
       }
     }
   }
+
+  /**
+   * 点击事件
+   * @author lxm
+   * @date 2023-10-11 05:03:26
+   */
+  onClick(): void {
+    this.panel.evt.emit('onPanelItemEvent', {
+      panelItemName: this.model.id!,
+      panelItemEventName: 'onClick',
+    });
+  }
 }

package/src/controller/control/panel/panel/panel.controller.ts

@@ -19,6 +19,7 @@ import {
 import { getPanelItemProvider } from '../../../../register';
 import { ControlController } from '../../../common';
 import { PanelNotifyState } from '../../../constant';
+import { ControllerEvent } from '../../../utils';
 
 /**
  * 面板部件控制器
@@ -37,6 +38,10 @@ export class PanelController<
   extends ControlController<T, S, E>
   implements IPanelController<T, S, E>
 {
+  protected get _evt(): ControllerEvent<IPanelEvent> {
+    return this.evt;
+  }
+
   /**
    * 所有面板成员的控制器
    *
@@ -86,9 +91,24 @@ export class PanelController<
     this.inputData = data;
   }
 
+  getData(): IData[] {
+    return [this.data];
+  }
+
   protected async onCreated(): Promise<void> {
     await super.onCreated();
     await this.initPanelItemControllers();
+
+    if (this.scheduler?.hasControlEventTrigger) {
+      // 监听部件事件触发部件事件触发器
+      this._evt.on('onPanelItemEvent', event => {
+        this.scheduler!.triggerControlEvent(
+          event.panelItemName,
+          event.panelItemEventName,
+          event,
+        );
+      });
+    }
   }
 
   protected async onMounted(): Promise<void> {

package/src/controller/control/panel/view-layout-panel/view-layout-panel.controller.ts

@@ -30,6 +30,17 @@ export class ViewLayoutPanelController
   protected async onCreated(): Promise<void> {
     this.preprocessModel();
     await super.onCreated();
+
+    if (this.scheduler?.hasControlEventTrigger) {
+      // 监听部件事件触发部件事件触发器
+      this.evt.on('onControlEvent', event => {
+        this.scheduler!.triggerControlEvent(
+          event.triggerControlName,
+          event.triggerEventName,
+          event.triggerEvent,
+        );
+      });
+    }
   }
 
   protected registerToCtx(): void {

package/src/interface/common/i-data-ability-params/i-data-ability-params.ts

@@ -10,9 +10,9 @@ export interface IDataAbilityParams {
    * 当前这次操作附加的上下文参数
    * @author lxm
    * @date 2023-03-21 05:53:33
-   * @type {IContext}
+   * @type {IParams}
    */
-  context?: IContext;
+  context?: IParams;
 
   /**
    * 当前这次操作附加的视图参数
@@ -20,7 +20,7 @@ export interface IDataAbilityParams {
    * @date 2023-03-21 05:54:23
    * @type {IParams}
    */
-  params?: IParams;
+  viewParam?: IParams;
 
   /**
    * 执行能力使用的数据集合
@@ -29,5 +29,5 @@ export interface IDataAbilityParams {
    * @date 2023-03-21 05:54:33
    * @type {IData[]}
    */
-  data?: IData[];
+  data?: IData[] | IData;
 }

package/src/interface/common/i-float-window-options/i-float-window-options.ts

@@ -0,0 +1,74 @@
+/**
+ * 全局悬浮窗口配置项
+ *
+ * @author chitanda
+ * @date 2023-10-11 21:10:18
+ * @export
+ * @interface IFloatWindowOptions
+ */
+export interface IFloatWindowOptions {
+  /**
+   * 初始宽度，单位 px
+   *
+   * @author chitanda
+   * @date 2023-10-11 21:10:10
+   * @type {number}
+   */
+  width?: number;
+  /**
+   * 初始高度，单位 px
+   *
+   * @author chitanda
+   * @date 2023-10-11 21:10:19
+   * @type {number}
+   */
+  height?: number;
+  /**
+   * 最小宽度，单位 px
+   *
+   * @author chitanda
+   * @date 2023-10-11 22:10:18
+   * @type {number}
+   */
+  minWidth?: number;
+  /**
+   * 最小高度，单位 px
+   *
+   * @author chitanda
+   * @date 2023-10-11 22:10:25
+   * @type {number}
+   */
+  minHeight?: number;
+  /**
+   * 初始 x 坐标，单位 px
+   *
+   * @author chitanda
+   * @date 2023-10-11 21:10:29
+   * @type {number}
+   */
+  x?: number;
+  /**
+   * 初始 y 坐标，单位 px
+   *
+   * @author chitanda
+   * @date 2023-10-11 21:10:38
+   * @type {number}
+   */
+  y?: number;
+  /**
+   * 附加样式，用于自定义样式
+   *
+   * @author chitanda
+   * @date 2023-10-11 21:10:22
+   * @type {string}
+   */
+  windowClass?: string;
+  /**
+   * 是否默认全屏
+   *
+   * @author chitanda
+   * @date 2023-10-11 21:10:49
+   * @type {boolean}
+   */
+  fullscreen?: boolean;
+}

package/src/interface/common/index.ts

@@ -30,3 +30,4 @@ export type {
 } 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';
+export type { IFloatWindowOptions } from './i-float-window-options/i-float-window-options';

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

@@ -27,7 +27,7 @@ export interface IControlController<
   view: IViewController;
 
   /**
-   * 部件布局面板
+   * 部件布局面板控制器
    * @author lxm
    * @date 2023-07-31 08:54:08
    * @type {IViewLayoutPanelController}