@ibiz-template/runtime 0.1.8 → 0.1.9

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

@@ -100,7 +100,7 @@ export class OpenAppViewCommand {
     context: IContext,
     params: IParams = {},
   ): Promise<IModalData> {
-    return ibiz.openView.root(appView, context, params);
+    return ibiz.openView.root(appView.id, context, params);
   }
 
   /**
@@ -119,7 +119,7 @@ export class OpenAppViewCommand {
     context: IContext,
     params: IParams = {},
   ): Promise<IModalData> {
-    return ibiz.openView.modal(appView, context, params);
+    return ibiz.openView.modal(appView.id, context, params);
   }
 
   /**
@@ -142,7 +142,7 @@ export class OpenAppViewCommand {
     if (!event) {
       throw new RuntimeError('气泡打开缺少event');
     }
-    return ibiz.openView.popover(appView, event, context, params);
+    return ibiz.openView.popover(appView.id, event, context, params);
   }
 
   /**
@@ -161,7 +161,7 @@ export class OpenAppViewCommand {
     context: IContext,
     params: IParams = {},
   ): Promise<IModalData> {
-    return ibiz.openView.drawer(appView, context, params);
+    return ibiz.openView.drawer(appView.id, context, params);
   }
 
   /**
@@ -180,6 +180,6 @@ export class OpenAppViewCommand {
     context: IContext,
     params: IParams = {},
   ): Promise<IModalData> {
-    return ibiz.openView.custom(appView, context, params);
+    return ibiz.openView.custom(appView.id, context, params);
   }
 }

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

@@ -1,4 +1,4 @@
-import { IControl, IViewLayoutPanel } from '@ibiz/model-core';
+import { IControl, IControlLogic, IViewLayoutPanel } from '@ibiz/model-core';
 import { BaseController } from '..';
 import { CTX } from '../../ctx';
 import {
@@ -129,14 +129,7 @@ export class ControlController<
     }
 
     // 部件逻辑初始化
-    if (this.model.controlLogics?.length) {
-      this.scheduler = ibiz.scheduler.createControlScheduler(
-        this.model.controlLogics,
-      );
-      this.scheduler.defaultParamsCb = (): IUILogicParams => {
-        return this.getEventArgs();
-      };
-    }
+    this.initControlScheduler(this.model.controlLogics);
   }
 
   protected async onDestroyed(): Promise<void> {
@@ -225,4 +218,21 @@ export class ControlController<
       });
     }
   }
+
+  /**
+   * 初始化部件逻辑调度器
+   * @author lxm
+   * @date 2023-08-21 11:53:37
+   * @param {IControlLogic[]} logics
+   * @return {*}  {void}
+   */
+  protected initControlScheduler(logics: IControlLogic[] = []): void {
+    if (logics.length === 0) {
+      return;
+    }
+    this.scheduler = ibiz.scheduler.createControlScheduler(logics);
+    this.scheduler.defaultParamsCb = (): IUILogicParams => {
+      return this.getEventArgs();
+    };
+  }
 }

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

@@ -2,6 +2,7 @@
 import { createUUID, notNilEmpty } from 'qx-util';
 import { IBizContext, RuntimeError } from '@ibiz-template/core';
 import { IAppView } from '@ibiz/model-core';
+import { isEmpty, isNil } from 'ramda';
 import { LoadingState } from '../../utils/loading/loading.state';
 import {
   IViewController,
@@ -14,7 +15,7 @@ import {
   IUILogicParams,
   IViewEngine,
 } from '../../../interface';
-import { SysUIActionTag, ViewMode } from '../../../constant';
+import { SysUIActionTag } from '../../../constant';
 import { convertNavData, Modal } from '../../../utils';
 import { CTX } from '../../ctx';
 import { ControllerEvent } from '../../utils';
@@ -45,6 +46,8 @@ export class ViewController<
   extends BaseController<T, S, E>
   implements IViewController<T, S, E>
 {
+  session: IData = {};
+
   modal: IModal = new Modal({});
 
   protected get _evt(): ControllerEvent<IViewEvent> {
@@ -302,8 +305,11 @@ export class ViewController<
   handleContextParams(): void {
     this.context.srfappid = this.model.appId!;
 
-    // 路由打开的设置srfsessionid
-    if (this.modal.mode === ViewMode.ROUTE) {
+    // 只要上下文中无 srfsessionid 则生成一个
+    if (
+      isNil(this.context.srfsessionid) ||
+      isEmpty(this.context.srfsessionid)
+    ) {
       this.context.srfsessionid = createUUID();
     }
 

package/src/controller/hub.controller.ts

@@ -0,0 +1,22 @@
+import { IHubController } from '../interface';
+
+/**
+ * 应用级功能
+ *
+ * @author chitanda
+ * @date 2023-08-21 14:08:51
+ * @export
+ * @class AppController
+ * @implements {IHubController}
+ */
+export class HubController implements IHubController {
+  session: IData = {};
+
+  login(loginName: string, password: string): Promise<boolean> {
+    return ibiz.auth.login(loginName, password);
+  }
+
+  logout(): Promise<boolean> {
+    return ibiz.auth.logout();
+  }
+}

package/src/controller/index.ts

@@ -2,3 +2,4 @@ export * from './constant';
 export * from './common';
 export * from './ctx';
 export * from './utils';
+export { HubController } from './hub.controller';

package/src/controller/utils/value-rule/value-rule.ts

@@ -51,6 +51,7 @@ export function generateRules(
               ScriptFactory.execScriptFn(
                 { rule, value, callback, source },
                 sysRule.scriptCode!,
+                { isAsync: false },
               );
             } catch (error) {
               console.error(error);

package/src/interface/common/i-app-hub-service/i-app-hub-service.ts

@@ -3,6 +3,7 @@ import { Application } from '../../../application';
 import { Convert } from '../../../hub';
 import { ModelLoaderProvider } from '../../provider';
 import { IAppConfigService } from '../i-app-config-service/i-app-config-service';
+import { IHubController } from '../../controller';
 
 /**
  * 应用 hub 服务
@@ -22,6 +23,15 @@ export interface IAppHubService {
    */
   readonly convert: Convert;
 
+  /**
+   * 全局控制器，放置全局性的功能性方法
+   *
+   * @author chitanda
+   * @date 2023-08-21 15:08:00
+   * @type {IHubController}
+   */
+  readonly controller: IHubController;
+
   /**
    * 默认应用首页视图
    *

package/src/interface/controller/app.ts

@@ -0,0 +1,38 @@
+/**
+ * 应用控制器
+ *
+ * @author chitanda
+ * @date 2023-08-21 14:08:41
+ * @export
+ * @interface IHubController
+ */
+export interface IHubController {
+  /**
+   * 全局共享数据对象
+   *
+   * @author chitanda
+   * @date 2023-08-21 14:08:01
+   * @type {IData}
+   */
+  session: IData;
+
+  /**
+   * 登录
+   *
+   * @author chitanda
+   * @date 2023-08-17 16:08:23
+   * @param {string} loginName
+   * @param {string} password
+   * @return {*}  {Promise<boolean>}
+   */
+  login(loginName: string, password: string): Promise<boolean>;
+
+  /**
+   * 登出
+   *
+   * @author chitanda
+   * @date 2023-08-17 16:08:33
+   * @return {*}  {Promise<boolean>}
+   */
+  logout(): Promise<boolean>;
+}

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

@@ -0,0 +1,19 @@
+import { IDEContextMenu } from '@ibiz/model-core';
+import { IContextMenuEvent } from '../../event';
+import { IContextMenuState } from '../../state';
+import { IToolbarController } from './i-toolbar.controller';
+
+/**
+ * 上下文菜单接口
+ * @author lxm
+ * @date 2023-08-21 10:43:51
+ * @export
+ * @interface IContextMenuController
+ * @extends {IToolbarController<IDEContextMenu, IContextMenuState, IContextMenuEvent>}
+ */
+export interface IContextMenuController
+  extends IToolbarController<
+    IDEContextMenu,
+    IContextMenuState,
+    IContextMenuEvent
+  > {}

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

@@ -11,8 +11,11 @@ import { IControlController } from './i-control.controller';
  * @interface IToolbarController
  * @extends {IControlController}
  */
-export interface IToolbarController
-  extends IControlController<IDEToolbar, IToolbarState, IToolbarEvent> {
+export interface IToolbarController<
+  T extends IDEToolbar = IDEToolbar,
+  S extends IToolbarState = IToolbarState,
+  E extends IToolbarEvent = IToolbarEvent,
+> extends IControlController<T, S, E> {
   /**
    * 根据数据计算工具栏权限和状态
    * @author lxm
@@ -20,7 +23,7 @@ export interface IToolbarController
    * @param {IData} [data] 实体数据
    * @param {string} [appDeId] 实体标识
    */
-  calcButtonState(data?: IData, appDeId?: string): void;
+  calcButtonState(data?: IData, appDeId?: string): Promise<void>;
 
   /**
    * 设置额外的按钮（可多次调用会累加）

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

@@ -29,3 +29,4 @@ export * from './i-dashboard.controller';
 export * from './portlet/index';
 export * from './i-calendar.controller';
 export * from './i-calendar-exp-bar.controller';
+export * from './i-context-menu.controller';

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

@@ -29,6 +29,15 @@ export interface IViewController<
 > extends IController<T, S, E> {
   evt: ControllerEvent<E>;
 
+  /**
+   * 视图级共享数据对象
+   *
+   * @author chitanda
+   * @date 2023-08-21 15:08:52
+   * @type {IData}
+   */
+  session: IData;
+
   /**
    * 视图呈现模式
    * @author lxm

package/src/interface/controller/event/control/i-context-menu.event.ts

@@ -0,0 +1,10 @@
+import { IToolbarEvent } from './i-toolbar.event';
+
+/**
+ * 上下文菜单事件
+ *
+ * @export
+ * @interface IContextMenuEvent
+ * @extends {IToolbarEvent}
+ */
+export interface IContextMenuEvent extends IToolbarEvent {}

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

@@ -26,3 +26,4 @@ export * from './i-drbar.event';
 export * from './i-drtab.event';
 export * from './i-calendar.event';
 export * from './i-calendar-exp-bar.event';
+export * from './i-context-menu.event';

package/src/interface/controller/event/view/i-pickup-md-view.event.ts

@@ -0,0 +1,29 @@
+import { EventBase } from '../argument';
+import { IMDViewEvent } from './i-md-view.event';
+
+/**
+ * 选择多数据视图事件
+ *
+ * @author zk
+ * @date 2023-08-21 05:08:15
+ * @export
+ * @interface IPickupMDViewEvent
+ * @extends {IMDViewEvent}
+ */
+export interface IPickupMDViewEvent extends IMDViewEvent {
+  /**
+   * 选中数据变更事件
+   *
+   * @author zk
+   * @date 2023-08-21 05:08:09
+   * @type {{
+   *     event: EventBase;
+   *     emitArgs: { data: IData[] };
+   *   }}
+   * @memberof IPickupMDViewEvent
+   */
+  onSelectionChange: {
+    event: EventBase;
+    emitArgs: { data: IData[] };
+  };
+}

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

@@ -35,3 +35,4 @@ export * from './i-app-portal-view.event';
 export * from './i-de-portal-view.event';
 export * from './i-calendar-view.event';
 export * from './i-calendar-exp-view.event';
+export * from './i-pickup-md-view.event';

package/src/interface/controller/index.ts

@@ -3,3 +3,4 @@ export * from './controller';
 export * from './event';
 export * from './state';
 export * from './work-flow';
+export type { IHubController } from './app';

package/src/interface/controller/state/control/i-context-menu.state.ts

@@ -0,0 +1,10 @@
+import { IToolbarState } from './i-toolbar.state';
+
+/**
+ * 上下文菜单UI状态
+ *
+ * @export
+ * @interface IContextMenuState
+ * @extends {IToolbarState}
+ */
+export interface IContextMenuState extends IToolbarState {}

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

@@ -1,4 +1,4 @@
-import { IButtonContainerState, IIcon } from '../../common';
+import { IIcon } from '../../common';
 import { IMDControlState } from './i-md-control.state';
 
 /**
@@ -37,14 +37,6 @@ export interface ITreeState extends IMDControlState {
    * @type {string[]}
    */
   expandedKeys: string[];
-
-  /**
-   * 右键上下文菜单状态
-   * @author lxm
-   * @date 2023-08-01 04:48:11
-   * @type {{ [p: string]: IButtonContainerState }}
-   */
-  contextMenus: { [p: string]: IButtonContainerState };
 }
 
 /**

package/src/interface/controller/state/control/index.ts

@@ -31,3 +31,4 @@ export * from './i-drtab.state';
 export * from './i-dashboard.state';
 export * from './i-calendar.state';
 export * from './i-calendar-exp-bar.state';
+export * from './i-context-menu.state';

package/src/interface/controller/state/view/i-pickup-md-view.state.ts

@@ -0,0 +1,22 @@
+import { IMDViewState } from './i-md-view.state';
+
+/**
+ * 选择多数据视图UI状态
+ *
+ * @author zk
+ * @date 2023-05-25 05:05:43
+ * @export
+ * @interface IPickupMDViewState
+ * @extends {IMDViewState}
+ */
+export interface IPickupMDViewState extends IMDViewState {
+  /**
+   * 是否单选
+   *
+   * @author zk
+   * @date 2023-08-21 05:08:36
+   * @type {boolean}
+   * @memberof IPickupMDViewState
+   */
+  singleSelect: boolean;
+}

package/src/interface/controller/state/view/index.ts

@@ -35,3 +35,4 @@ export * from './i-de-portal-view.state';
 export * from './i-panel-view.state';
 export * from './i-calendar-view.state';
 export * from './i-calendar-exp-view.state';
+export * from './i-pickup-md-view.state';

package/src/interface/util/i-open-view-util/i-open-view-util.ts

@@ -1,4 +1,4 @@
-import { IModalData, IViewConfig } from '../../common';
+import { IModalData } from '../../common';
 
 /**
  * 打开视图工具类
@@ -25,13 +25,13 @@ export interface IOpenViewUtil {
    *
    * @author chitanda
    * @date 2023-07-12 21:07:51
-   * @param {IViewConfig} appView
+   * @param {string} appViewId
    * @param {IContext} context
    * @param {IParams} [params]
    * @return {*}  {Promise<IModalData>}
    */
   root(
-    appView: IViewConfig,
+    appViewId: string,
     context: IContext,
     params?: IParams,
   ): Promise<IModalData>;
@@ -41,13 +41,13 @@ export interface IOpenViewUtil {
    *
    * @author chitanda
    * @date 2022-08-16 20:08:41
-   * @param {IViewConfig} appView
+   * @param {string} appViewId
    * @param {IContext} [context]
    * @param {IParams} [params]
    * @return {*}  {Promise<IModalData>}
    */
   modal(
-    appView: IViewConfig,
+    appViewId: string,
     context: IContext,
     params?: IParams,
   ): Promise<IModalData>;
@@ -57,13 +57,13 @@ export interface IOpenViewUtil {
    *
    * @author chitanda
    * @date 2022-08-16 20:08:22
-   * @param {IViewConfig} appView
+   * @param {string} appViewId
    * @param {IContext} [context]
    * @param {IParams} [params]
    * @return {*}  {Promise<IModalData>}
    */
   popover(
-    appView: IViewConfig,
+    appViewId: string,
     event: MouseEvent,
     context: IContext,
     params?: IParams,
@@ -74,13 +74,13 @@ export interface IOpenViewUtil {
    *
    * @author chitanda
    * @date 2022-08-16 20:08:46
-   * @param {IViewConfig} appView
+   * @param {string} appViewId
    * @param {IContext} [context]
    * @param {IParams} [params]
    * @return {*}  {Promise<IModalData>}
    */
   drawer(
-    appView: IViewConfig,
+    appViewId: string,
     context: IContext,
     params?: IParams,
   ): Promise<IModalData>;
@@ -90,13 +90,13 @@ export interface IOpenViewUtil {
    *
    * @author chitanda
    * @date 2022-08-16 20:08:29
-   * @param {IViewConfig} appView
+   * @param {string} appViewId
    * @param {IContext} [context]
    * @param {IParams} [params]
    * @return {*}  {Promise<IModalData>}
    */
   custom(
-    appView: IViewConfig,
+    appViewId: string,
     context: IContext,
     params?: IParams,
   ): Promise<IModalData>;

package/src/interface/util/script/i-script-function.ts

@@ -12,7 +12,7 @@ export interface IScriptFunctionOpts {
    * @date 2023-07-25 10:46:18
    * @type {boolean}
    */
-  singleRowReturn: boolean;
+  singleRowReturn?: boolean;
 
   /**
    * 预置参数
@@ -21,4 +21,12 @@ export interface IScriptFunctionOpts {
    * @type {IParams}
    */
   presetParams?: IParams;
+
+  /**
+   * 是否是异步函数脚本
+   * @author lxm
+   * @date 2023-08-21 03:15:43
+   * @type {boolean}
+   */
+  isAsync?: boolean;
 }

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

@@ -1,5 +1,4 @@
-import { RuntimeError } from '@ibiz-template/core';
-import { IUILogicParams } from '../../interface';
+import { IScriptFunctionOpts, IUILogicParams } from '../../interface';
 import { ScriptFactory, ScriptFunction } from '../../utils';
 import { LogicExecutor } from './logic-executor';
 
@@ -18,12 +17,12 @@ export class ScriptExecutor extends LogicExecutor {
   scriptFn?: ScriptFunction;
 
   /**
-   * 是否单行返回，脚本只是单行的且默认把值返回
+   * 初始化完成
    * @author lxm
-   * @date 2023-06-25 10:06:32
+   * @date 2023-08-21 04:27:38
    * @type {boolean}
    */
-  isRowReturn: boolean = false;
+  initialized: boolean = false;
 
   /**
    * 执行参数转换成脚本执行作用域参数
@@ -32,8 +31,9 @@ export class ScriptExecutor extends LogicExecutor {
    * @param {IUILogicParams} _executeParams
    * @return {*}  {IData[]}
    */
-  convertScriptArgs(_executeParams: IUILogicParams): IData {
-    throw new RuntimeError('未设置脚本执行参数转换方法');
+  convertScriptArgs(executeParams: IUILogicParams): IData {
+    // 默认不特殊处理的不转换
+    return executeParams;
   }
 
   /**
@@ -46,16 +46,13 @@ export class ScriptExecutor extends LogicExecutor {
   init(
     paramKeys: string[],
     convertFun: (executeParams: IUILogicParams) => IData,
+    options?: IScriptFunctionOpts,
   ): void {
     this.convertScriptArgs = convertFun;
-    let code = this.logic.scriptCode!;
-    if (this.isRowReturn) {
-      code = `return (${code})`;
-    }
+    const code = this.logic.scriptCode!;
     // eslint-disable-next-line no-new-func
-    this.scriptFn = ScriptFactory.createScriptFn(paramKeys, code, {
-      singleRowReturn: this.isRowReturn,
-    });
+    this.scriptFn = ScriptFactory.createScriptFn(paramKeys, code, options);
+    this.initialized = true;
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/logic-scheduler/trigger/item-dyna-logic-trigger.ts

@@ -16,8 +16,10 @@ export class ItemDynaLogicTrigger extends LogicTrigger {
         `预定义逻辑类型${this.type}的触发器类型只能是脚本`,
       );
     }
-    this.executor.isRowReturn = true;
-    this.executor.init(
+  }
+
+  bindScriptExecutor(executor: ScriptExecutor): void {
+    executor.init(
       ['context', 'viewparams', 'data', 'env'],
       executeParams => {
         const { context, params, data } = executeParams;
@@ -28,6 +30,10 @@ export class ItemDynaLogicTrigger extends LogicTrigger {
           env: ibiz.env,
         };
       },
+      {
+        singleRowReturn: true,
+        isAsync: false,
+      },
     );
   }
 

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

@@ -6,6 +6,7 @@ import type {
   TriggerType,
 } from '../../interface';
 import { LogicExecutor } from '../executor/logic-executor';
+import { ScriptExecutor } from '../executor/script-executor';
 import { LogicScheduler } from '../scheduler/logic-scheduler';
 
 /**
@@ -51,6 +52,24 @@ export class LogicTrigger {
    */
   bindExecutor(executor: LogicExecutor): void {
     this.executor = executor;
+    if (this.executor.type === 'SCRIPT') {
+      this.bindScriptExecutor(executor as ScriptExecutor);
+    }
+  }
+
+  /**
+   * 绑定脚本执行器
+   * @author lxm
+   * @date 2023-08-21 04:33:35
+   * @param {ScriptExecutor} executor
+   */
+  bindScriptExecutor(executor: ScriptExecutor): void {
+    if (!executor.initialized) {
+      executor.init([], executeParams => executeParams, {
+        isAsync: true,
+        singleRowReturn: false,
+      });
+    }
   }
 
   /**

package/src/model/layout/layout.ts

@@ -145,5 +145,6 @@ export function calcGridLayoutPos(
 export function calcDynaClass(expression: string, data: IData): string[] {
   return ScriptFactory.execScriptFn({ data }, expression, {
     singleRowReturn: true,
+    isAsync: false,
   }) as string[];
 }

package/src/service/vo/tree-node-data/tree-data-set-node-data.ts

@@ -89,6 +89,9 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
       return ScriptFactory.execScriptFn(
         { data: this.deData },
         dataItem.scriptCode,
+        {
+          isAsync: false,
+        },
       ) as string;
     }
   }