@ibiz-template/runtime 0.7.41-alpha.140 → 0.7.41-alpha.142

package/src/controller/control/tree/tree.controller.ts

@@ -29,6 +29,7 @@ import {
   MDCtrlLoadParams,
   IApiNewTreeNodeParams,
   ITreeNodeProvider,
+  NotifyRefreshEventCtx,
 } from '../../../interface';
 import { UIActionUtil } from '../../../ui-action';
 import { MDControlController } from '../../common';
@@ -1300,7 +1301,7 @@ export class TreeController<
    * @param {IPortalMessage} msg
    * @return {*}  {void}
    */
-  protected onDEDataChange(msg: IPortalMessage): void {
+  protected async onDEDataChange(msg: IPortalMessage): Promise<void> {
     // msg.triggerKey 不为空，且与当前控制器的triggerKey一致时，则不处理
     if (!isNil(msg.triggerKey) && msg.triggerKey === this.triggerKey) {
       return;
@@ -1325,6 +1326,16 @@ export class TreeController<
       return;
     }
 
+    // 触发onNotifyRefresh事件，基于eventCtx.allowNext进行拦截
+    const eventCtx: NotifyRefreshEventCtx = {};
+    await this._evt.emit('onNotifyRefresh', {
+      data: msg,
+      args: eventCtx,
+    });
+    if (eventCtx.allowNext === false) {
+      return;
+    }
+
     this.doNextActive(
       () => !this.ctx.isDestroyed && this.refreshNodeChildren(findNode, true),
       {

package/src/engine/view-base.engine.ts

@@ -550,7 +550,7 @@ export class ViewEngineBase implements IViewEngine {
    * @protected
    * @param {IPortalMessage} msg
    */
-  protected onDEDataChange(msg: IPortalMessage): void {
+  protected async onDEDataChange(msg: IPortalMessage): Promise<void> {
     ibiz.log.debug('onDEDataChange', msg);
   }
 

package/src/interface/api/common/global-config/i-api-global-common-config.ts

@@ -319,8 +319,25 @@ export interface IApiGlobalCommonConfig {
 
   /**
    * @description AI输入框空白占位
-   * @type {''}
+   * @type {string}
+   * @memberof IApiGlobalCommonConfig
+   */
+  aiInputPlaceholder: string;
+
+  /**
+   * @description ai最小化容器ID
+   * @type {string | undefined}
+   * @platform web
+   * @memberof IApiGlobalCommonConfig
+   */
+  aiMinimizeContainerId: string | undefined;
+
+  /**
+   * @description 显示滚动到组件，目前仅pc端列表和卡片部件支持
+   * @default none
+   * @platform web
+   * @type {('top' | 'bottom' | 'auto' | 'none')}
    * @memberof IApiGlobalCommonConfig
    */
-  aiInputPlaceholder: '';
+  showScrollTo: 'top' | 'bottom' | 'auto' | 'none';
 }

package/src/interface/api/controller/control/i-api-data-view-control.controller.ts

@@ -14,6 +14,7 @@ import { IApiMDControlController } from './i-api-md-control.controller';
  * @ctrlparams {"name":"mdctrlrefreshmode","title":"刷新模式","defaultvalue":"'cache'","parameterType":"'nocache' | 'cache'","description":"多数据部件刷新模式，当值为 'cache'，部件刷新时保留选中数据；当值为 'nocache'，部件刷新时清空选中数据","effectPlatform":"web"}
  * @ctrlparams {"name":"batchtoolbarmode","title":"批操作工具栏显示模式","parameterType":"'default' | 'multiple'","defaultvalue":"'default'","description":"批操作工具栏显示模式，值为 'default' 时表示存在选择数据就显示批操作工具栏，值为 'multiple' 时表示选择至少2条数据才显示批操作工具栏","effectPlatform":"web"}
  * @ctrlparams {"name":"paginationmode","title":"分页显示模式","defaultvalue":"'default'","parameterType":"'default'|'simple'","description":"表格分页显示模式，当值为 default 时，显示完整的分页组件，值为 simple 时，显示简略版的分页组件，仅包含总条数，当前页，上一页和下一页","effectPlatform":"web"}
+ * @ctrlparams {"name":"showscrollto","title":"显示滚动到组件","defaultvalue":"'none'","parameterType":"'top' | 'bottom' | 'auto' | 'none'","description":"显示滚动组件，top：回到顶部，bottom：回到底部，auto：自动处理回到顶部/底部，none：无滚动组件","effectPlatform":"web"}
  * @template T
  * @template S
  */

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

@@ -15,6 +15,7 @@ import { IApiMDControlController } from './i-api-md-control.controller';
  * @ctrlparams {"name":"mdctrlrefreshmode","title":"刷新模式","defaultvalue":"'cache'","parameterType":"'nocache' | 'cache'","description":"多数据部件刷新模式，当值为 'cache'，部件刷新时保留选中数据；当值为 'nocache'，部件刷新时清空选中数据","effectPlatform":"web"}
  * @ctrlparams {"name":"batchtoolbarmode","title":"批操作工具栏显示模式","parameterType":"'default' | 'multiple'","defaultvalue":"'default'","description":"批操作工具栏显示模式，值为 'default' 时表示存在选择数据就显示批操作工具栏，值为 'multiple' 时表示选择至少2条数据才显示批操作工具栏","effectPlatform":"web"}
  * @ctrlparams {"name":"paginationmode","title":"分页显示模式","defaultvalue":"'default'","parameterType":"'default'|'simple'","description":"表格分页显示模式，当值为 default 时，显示完整的分页组件，值为 simple 时，显示简略版的分页组件，仅包含总条数，当前页，上一页和下一页","effectPlatform":"web"}
+ * @ctrlparams {"name":"showscrollto","title":"显示滚动组件","defaultvalue":"'none'","parameterType":"'top' | 'bottom' | 'auto' | 'none'","description":"显示滚动组件，top：回到顶部，bottom：回到底部，auto：自动处理回到顶部/底部，none：无滚动组件","effectPlatform":"web"}
  * @template T
  * @template S
  */

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

@@ -21,3 +21,4 @@ export {
   PanelDataContainerEventName,
 } from './panel-data-container.event';
 export type { BeforeSearchEventCtx } from './before-search.event';
+export type { NotifyRefreshEventCtx } from './notify-refresh.event';

package/src/interface/controller/event/argument/notify-refresh.event.ts

@@ -0,0 +1,12 @@
+/**
+ * @description 通知刷新事件上下文
+ * @export
+ * @interface NotifyRefreshEventCtx
+ */
+export interface NotifyRefreshEventCtx {
+  /**
+   * 是否允许执行后续逻辑
+   * 监听器可设置为 false 以阻止执行后续逻辑
+   */
+  allowNext?: boolean;
+}

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

@@ -1,5 +1,10 @@
-import { PartialWithObject } from '@ibiz-template/core';
-import { EventBase, FormDataChangeEvent, FormDetailEvent } from '../argument';
+import { IPortalMessage, PartialWithObject } from '@ibiz-template/core';
+import {
+  EventBase,
+  FormDataChangeEvent,
+  FormDetailEvent,
+  NotifyRefreshEventCtx,
+} from '../argument';
 import { IControlEvent } from './i-control.event';
 
 /**
@@ -74,4 +79,17 @@ export interface IFormEvent extends IControlEvent {
     event: FormDetailEvent;
     emitArgs: PartialWithObject<FormDetailEvent, EventBase>;
   };
+
+  /**
+   * @description 通知刷新
+   * @type {({
+   *     event: EventBase & { data: IPortalMessage; args: NotifyRefreshEventCtx };
+   *     emitArgs: { data: IPortalMessage; args: NotifyRefreshEventCtx };
+   *   })}
+   * @memberof IFormEvent
+   */
+  onNotifyRefresh: {
+    event: EventBase & { data: IPortalMessage; args: NotifyRefreshEventCtx };
+    emitArgs: { data: IPortalMessage; args: NotifyRefreshEventCtx };
+  };
 }

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

@@ -1,5 +1,5 @@
-import { PartialWithObject } from '@ibiz-template/core';
-import { EventBase, LoadEvent } from '../argument';
+import { IPortalMessage, PartialWithObject } from '@ibiz-template/core';
+import { EventBase, LoadEvent, NotifyRefreshEventCtx } from '../argument';
 import { IControlEvent } from './i-control.event';
 
 /**
@@ -178,4 +178,17 @@ export interface IMDControlEvent extends IControlEvent {
     event: EventBase & { navData: IData };
     emitArgs: { navData: IData };
   };
+
+  /**
+   * @description 通知刷新
+   * @type {({
+   *     event: EventBase & { data: IPortalMessage; args: NotifyRefreshEventCtx };
+   *     emitArgs: { data: IPortalMessage; args: NotifyRefreshEventCtx };
+   *   })}
+   * @memberof IMDControlEvent
+   */
+  onNotifyRefresh: {
+    event: EventBase & { data: IPortalMessage; args: NotifyRefreshEventCtx };
+    emitArgs: { data: IPortalMessage; args: NotifyRefreshEventCtx };
+  };
 }

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

@@ -298,20 +298,20 @@ export class LogicScheduler {
   }
 
   /**
-   * @description 触发部件项事件
-   * @param {string} ctrlItemName 部件项名称
+   * @description 触发部件事件
+   * @param {string} ctrlName 部件名称
    * @param {string} eventName 事件名称
    * @param {Partial<IUILogicParams>} [executeParams] 执行参数
    * @memberof LogicScheduler
    */
-  async triggerControlItemEvent(
-    ctrlItemName: string,
+  async asyncTriggerControlEvent(
+    ctrlName: string,
     eventName: string,
     executeParams?: Partial<IUILogicParams>,
   ): Promise<void> {
     const matchParams = {
+      ctrlName,
       eventName,
-      ctrlName: ctrlItemName,
       triggerType: 'CTRLEVENT',
     } as const;
     const result = this.triggerAndExecute(matchParams, executeParams);

package/src/service/de-service-util.ts

@@ -1,5 +1,5 @@
 import { IAppDataEntity, IApplication } from '@ibiz/model-core';
-import { IHttpResponse, RuntimeError } from '@ibiz-template/core';
+import { IBizContext, IHttpResponse, RuntimeError } from '@ibiz-template/core';
 import {
   IApiDEServiceUtil,
   IAppDEService,
@@ -132,8 +132,13 @@ export class DEServiceUtil implements IApiDEServiceUtil {
     const { targetApp, targetAppDataEntityId } =
       await this.computeAppDEMappingParam(context, id);
     if (targetApp && targetAppDataEntityId) {
+      // 映射场景下需将 srfappid 切换为目标应用，否则 createServiceInstance 会用源应用 appId 查找实体模型
+      const tempContext = IBizContext.create(
+        { srfappid: targetApp.appId },
+        { ...context },
+      );
       const targetService = await targetApp.deService.getService(
-        context,
+        tempContext,
         targetAppDataEntityId,
       );
       // 订阅服务方法处理状态
@@ -327,10 +332,15 @@ export class DEServiceUtil implements IApiDEServiceUtil {
     const { targetApp, targetAppDataEntityId } =
       await this.computeAppDEMappingParam(context, appDataEntityId);
     if (targetApp && targetAppDataEntityId) {
+      //  映射场景下需将 srfappid 切换为目标应用，否则 createServiceInstance 会用源应用 appId 查找实体模型
+      const tempContext = IBizContext.create(
+        { srfappid: targetApp.appId },
+        { ...context },
+      );
       const result = await targetApp.deService.exec(
         targetAppDataEntityId,
         methodName,
-        context,
+        tempContext,
         params,
         params2,
         header,

package/src/types.ts

@@ -279,6 +279,13 @@ declare module '@ibiz-template/core' {
      * @memberof IBizSys
      */
     screenShotUtil: IScreenShotUtil;
+
+    /**
+     * @description 扩展插件临时应用ID(仅用于加载扩展插件存储临时应用数据，方便注册模型处理器附加应用标识)
+     * @type {string}
+     * @memberof IBizSys
+     */
+    __TEMPAPPID__: string;
   }
 
   interface IEnvironment {