@ibiz-template/runtime 0.1.32 → 0.1.34

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/form/search-form/search-form.service.ts

@@ -28,7 +28,8 @@ export class SearchFormService<
     _context: IParams,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
-    let res = { ok: true, status: 200, data: { ...params } } as IHttpResponse;
+    const tempData = this.getFilteredData({ ...params });
+    let res = { ok: true, status: 200, data: tempData } as IHttpResponse;
     res = this.handleResponse(res);
     return res as IHttpResponse<ControlVO>;
   }
@@ -50,7 +51,7 @@ export class SearchFormService<
         }
       },
       {
-        childrenFields: ['deformPages', 'deformDetails'],
+        childrenFields: ['deformPages', 'deformTabPages', 'deformDetails'],
       },
     );
   }
@@ -70,4 +71,21 @@ export class SearchFormService<
     }
     return res as IHttpResponse<ControlVO>;
   }
+
+  /**
+   * 根据表单项过滤出数据
+   *
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-09-01 10:04:25
+   */
+  getFilteredData(data: IData): IData {
+    const tempData: IData = {};
+    this.dataUIMap.forEach(dataUI => {
+      if (data[dataUI.dataKey] !== undefined) {
+        tempData[dataUI.dataKey] = data[dataUI.dataKey];
+      }
+    });
+    return tempData;
+  }
 }

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/controller/control/tree/tree.controller.ts

@@ -109,14 +109,21 @@ export class TreeController
     const params = await this.getFetchParams();
     const hasQuery = !!params.query;
 
-    // 请求服务获取子节点数据
-    const nodes =
-      (await this.service.fetchChildNodes(parentNode, {
-        context: this.context.clone(),
-        params,
-        hasQuery,
-        defaultExpandedKeys: this.state.expandedKeys,
-      })) || [];
+    this.state.isLoading = true;
+
+    let nodes;
+    try {
+      // 请求服务获取子节点数据
+      nodes =
+        (await this.service.fetchChildNodes(parentNode, {
+          context: this.context.clone(),
+          params,
+          hasQuery,
+          defaultExpandedKeys: this.state.expandedKeys,
+        })) || [];
+    } finally {
+      this.state.isLoading = false;
+    }
 
     // 有父节点绑定到父节点数据上，无父节点替换rootNodes
     if (parentNode) {

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}

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

@@ -1,4 +1,5 @@
 import { IDEEditForm } from '@ibiz/model-core';
+import { IDataAbilityParams } from '../../../common';
 import { IEditFormEvent } from '../../event';
 import { IEditFormState } from '../../state';
 import { IFormController } from './i-form.controller';
@@ -19,7 +20,7 @@ export interface IEditFormController
    * @date 2023-05-16 11:08:45
    * @return {*}  {Promise<IData>}
    */
-  load(): Promise<IData>;
+  load(args?: IDataAbilityParams): Promise<IData>;
 
   /**
    * 保存表单数据
@@ -27,7 +28,7 @@ export interface IEditFormController
    * @date 2023-05-16 12:59:03
    * @return {*}  {Promise<IData>}
    */
-  save(): Promise<IData>;
+  save(args?: IDataAbilityParams): Promise<IData>;
 
   /**
    * 删除表单数据
@@ -37,7 +38,7 @@ export interface IEditFormController
    * @return {*}  {Promise<boolean>}
    * @memberof IEditFormController
    */
-  remove(): Promise<boolean>;
+  remove(args?: IDataAbilityParams): Promise<boolean>;
 
   /**
    * 工作流提交(调用前先确保调用保存)
@@ -47,7 +48,7 @@ export interface IEditFormController
    * @param {IParams} [extraParams={}] 不走工作流操作视图时使用
    * @returns {*}  {Promise<void>}
    */
-  wfSubmit(extraParams?: IParams): Promise<void>;
+  wfSubmit(args?: IDataAbilityParams): Promise<void>;
 
   /**
    * 工作流启动(调用前先确保调用保存)
@@ -57,5 +58,5 @@ export interface IEditFormController
    * @param {IParams} [extraParams={}] 不走工作流启动视图时使用
    * @returns {*}  {Promise<void>}
    */
-  wfStart(extraParams?: IParams | undefined): Promise<void>;
+  wfStart(args?: IDataAbilityParams): Promise<void>;
 }

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

@@ -66,7 +66,7 @@ export interface IController<
   childNames: string[];
 
   /**
-   * 视图布局面板
+   * 视图布局面板控制器
    * @author lxm
    * @date 2023-07-31 08:54:08
    * @type {IViewLayoutPanelController}

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

@@ -7,3 +7,4 @@ export { UIActionEvent } from './uiaction.event';
 export { ControlTriggerEvent } from './control-trigger.event';
 export { NavViewChangeEvent } from './nav-view-change.event';
 export { RowEditChangeEvent } from './row-edit-change.event';
+export { PanelItemEvent } from './panel-item.event';

package/src/interface/controller/event/argument/panel-item.event.ts

@@ -0,0 +1,27 @@
+import { EventBase } from './base.event';
+
+/**
+ * 面板成员事件
+ * @author lxm
+ * @date 2023-08-09 10:52:48
+ * @export
+ * @interface PanelItemEvent
+ * @extends {EventBase}
+ */
+export interface PanelItemEvent extends EventBase {
+  /**
+   * 触发的面板成员名称
+   * @author lxm
+   * @date 2023-03-26 02:02:16
+   * @type {string}
+   */
+  panelItemName: string;
+
+  /**
+   * 触发的面板成员事件的名称
+   * @author lxm
+   * @date 2023-07-26 11:00:37
+   * @type {string}
+   */
+  panelItemEventName: string;
+}

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

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

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

@@ -108,4 +108,12 @@ export interface ISchedulerLogic {
    * @type {string}
    */
   ctrlName?: string;
+
+  /**
+   * 触发应用实体界面行为
+   *
+   * @type {string}
+   * 来源  getPSAppDEUIAction
+   */
+  appDEUIActionId?: string;
 }

package/src/interface/service/service/i-app-de.service.ts

@@ -66,4 +66,40 @@ export interface IAppDEService {
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse>;
+
+  /**
+   * 触发实体服务方法 ac 模式
+   *
+   * @author chitanda
+   * @date 2023-10-12 17:10:27
+   * @param {string} id
+   * @param {IParams} context
+   * @param {(IData | IData[])} [params]
+   * @param {IParams} [params2]
+   * @return {*}  {Promise<IHttpResponse>}
+   */
+  execAc(
+    id: string,
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse>;
+
+  /**
+   * 实体级别 AI 聊天单次会话
+   *
+   * @author chitanda
+   * @date 2023-10-12 16:10:03
+   * @param {(data: unknown) => void} onmessage
+   * @param {IParams} context
+   * @param {IParams} [params]
+   * @param {IData} [data]
+   * @return {*}  {Promise<void>}
+   */
+  aiChatSse(
+    onmessage: (data: unknown) => void,
+    context: IParams,
+    params?: IParams,
+    data?: IData,
+  ): Promise<void>;
 }

package/src/interface/util/i-overlay-controller/i-overlay-controller.ts

@@ -1,4 +1,9 @@
-import { IPopoverOptions, IDrawerOptions, IModalOptions } from '../../common';
+import {
+  IPopoverOptions,
+  IDrawerOptions,
+  IModalOptions,
+  IFloatWindowOptions,
+} from '../../common';
 import { IOverlayContainer } from '../i-overlay-container/i-overlay-container';
 import { IOverlayPopoverContainer } from '../i-overlay-popover-container/i-overlay-popover-container';
 
@@ -111,4 +116,37 @@ export interface IOverlayController {
     props?: IParams,
     opts?: IModalOptions,
   ): IOverlayContainer;
+
+  /**
+   * 模态
+   *
+   * @author chitanda
+   * @date 2022-11-08 15:11:40
+   * @template T
+   * @param {unknown} component 组件名称，组件对象，或者绘制函数
+   * @param {IParams} [props] 组件props
+   * @param {IFloatWindowOptions} [opts]
+   * @return {*}  {Promise<T>}
+   */
+  floatWindow<T = void>(
+    component: unknown,
+    props?: IParams,
+    opts?: IFloatWindowOptions,
+  ): Promise<T>;
+
+  /**
+   * 创建全局模态容器
+   *
+   * @author chitanda
+   * @date 2022-11-09 15:11:58
+   * @param {unknown} component 组件名称，组件对象，或者绘制函数
+   * @param {IParams} [props] 组件props
+   * @param {IFloatWindowOptions} [opts]
+   * @return {*}  {IOverlayContainer}
+   */
+  createFloatWindow(
+    component: unknown,
+    props?: IParams,
+    opts?: IFloatWindowOptions,
+  ): IOverlayContainer;
 }

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

@@ -0,0 +1,20 @@
+import { IUILogicParams } from '../../interface';
+import { UIActionUtil } from '../../ui-action';
+import { LogicExecutor } from './logic-executor';
+
+/**
+ * 应用界面行为执行
+ * @author lxm
+ * @date 2023-07-17 01:57:27
+ * @export
+ * @class AppUILogicExecutor
+ * @extends {LogicExecutor}
+ */
+export class AppDEUIActionExecutor extends LogicExecutor {
+  declare type: 'APPDEUIACTION';
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  execute(executeParams: IUILogicParams): any {
+    UIActionUtil.execAndResolved(this.logic.appDEUIActionId!, executeParams);
+  }
+}