@ibiz-template/runtime 0.1.8 → 0.1.10

package/out/utils/script/script-function.js

@@ -6,6 +6,7 @@ import { mergeRight } from 'ramda';
 const DefaultOptions = {
     /** 是否是单行脚本，并把表达式结果return */
     singleRowReturn: false,
+    isAsync: true,
 };
 export class ScriptFunction {
     constructor(argKeys, scriptCode, options = DefaultOptions) {
@@ -32,6 +33,9 @@ export class ScriptFunction {
         if (options.singleRowReturn) {
             code = `return (${code})`;
         }
+        if (options.isAsync) {
+            code = `return (async function() { ${code}} )();`;
+        }
         return code;
     }
     /**
@@ -46,7 +50,26 @@ export class ScriptFunction {
         const keys = options.presetParams ? Object.keys(options.presetParams) : [];
         keys.push(...argKeys);
         // 预置提供的参数
-        keys.push('document', 'el', 'selector');
+        const presetArgsKeys = [
+            'document',
+            'el',
+            'selector',
+            'env',
+            'appSession',
+            'topViewSession',
+            'viewSession',
+            'context',
+            'viewParam',
+            'activeData',
+            'data',
+            'app',
+            'topView',
+            'parentView',
+            'view',
+            'parent',
+            'util',
+        ];
+        keys.push(...presetArgsKeys);
         // 除重
         this.argKeys = Array.from(new Set(keys));
     }
@@ -70,10 +93,61 @@ export class ScriptFunction {
         // 对象参数转数组
         const result = [];
         this.argKeys.forEach(key => {
+            if (_params[key] === undefined) {
+                this.fillDefaultParams(key, _params);
+            }
             result.push(_params[key]);
         });
         return result;
     }
+    /**
+     * 填充预置参数
+     * @author lxm
+     * @date 2023-08-21 04:07:50
+     * @protected
+     * @param {string} key
+     * @param {IParams} param
+     */
+    fillDefaultParams(key, param) {
+        const view = param.view;
+        switch (key) {
+            case 'util': // 工具类
+                param.util = {
+                    message: ibiz.message,
+                    notification: ibiz.notification,
+                    modal: ibiz.modal,
+                    confirm: ibiz.confirm,
+                    openView: ibiz.openView,
+                };
+                break;
+            case 'env': // 全局环境变量
+                param.env = ibiz.env;
+                break;
+            case 'app': // 应用级的控制器
+                param.app = ibiz.hub.controller;
+                break;
+            case 'parent': // 父容器控制器
+                param.parent = view === null || view === void 0 ? void 0 : view.parentView;
+                break;
+            case 'topView': // 顶级视图控制器
+                param.topView = view === null || view === void 0 ? void 0 : view.getTopView();
+                break;
+            case 'parentView': // 父级视图控制器
+                param.parentView = view === null || view === void 0 ? void 0 : view.parentView;
+                break;
+            case 'topViewSession': // 顶级视图共享数据对象
+                param.topViewSession = view === null || view === void 0 ? void 0 : view.getTopView().session;
+                break;
+            case 'viewSession': // 当前视图共享数据对象
+                param.viewSession = view === null || view === void 0 ? void 0 : view.session;
+                break;
+            case 'appSession': // 全局共享数据对象
+                param.appSession = ibiz.hub.controller.session;
+                break;
+            default:
+                break;
+        }
+    }
     /**
      * 执行脚本代码
      * @author lxm

package/out/utils/verify/de-rule-verify.js

@@ -361,7 +361,7 @@ function checkFieldScriptRule(value, data, scriptCode, errorInfo, primaryModel)
     };
     try {
         // 避免脚本内变量冲突
-        const result = ScriptFactory.execScriptFn({ value, data: source }, scriptCode);
+        const result = ScriptFactory.execScriptFn({ value, data: source }, scriptCode, { isAsync: false });
         if (typeof result === 'boolean') {
             resultBoolean = result;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -30,7 +30,7 @@
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/core": "^0.1.8",
-    "@ibiz/model-core": "^0.0.14",
+    "@ibiz/model-core": "^0.0.15",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.7",
     "@types/systemjs": "^6.13.1",
@@ -44,7 +44,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.1.0",
-    "@ibiz/model-core": "^0.0.14",
+    "@ibiz/model-core": "^0.0.15",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "lodash-es": "^4.17.21",
@@ -53,5 +53,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "cb6f466a8477cdcf184a8be03b8c26bd67324a70"
+  "gitHead": "24e2a2f4b050fbb3a3b9f5deeee97f98985913e4"
 }

package/src/app-hub.ts

@@ -3,6 +3,7 @@ import { RuntimeError } from '@ibiz-template/core';
 import { Application } from './application';
 import { IAppHubService, ModelLoaderProvider } from './interface';
 import { AppConfigService, Convert } from './hub';
+import { HubController } from './controller';
 
 /**
  * 运行时总集
@@ -22,6 +23,14 @@ export class AppHub implements IAppHubService {
    */
   readonly convert: Convert = new Convert();
 
+  /**
+   * 全局控制器，放置全局性的功能性方法
+   *
+   * @author chitanda
+   * @date 2023-08-21 15:08:48
+   */
+  readonly controller = new HubController();
+
   /**
    * 应用总集
    *

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/config/global-config.ts

@@ -23,7 +23,7 @@ export class GlobalConfig implements IGlobalConfig {
 
   // 全局表格配置
   grid: IGlobalGridConfig = {
-    editShowMode: 'cell',
+    editShowMode: 'row',
     editSaveMode: 'cell-blur',
   };
 

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/common/i-ui-action-result/i-ui-action-result.ts

@@ -16,6 +16,14 @@ export interface IUIActionResult {
    */
   refresh?: boolean;
 
+  /**
+   * 刷新引用视图模式
+   * @description 值模式 [界面行为重新加载数据模式] {0：无、 1：引用视图或树节点、 2：引用树节点父节点、 3：引用树节点根节点 }
+   * @type {( number | 0 | 1 | 2 | 3)}
+   * @default 0
+   */
+  refreshMode?: number | 0 | 1 | 2 | 3;
+
   /**
    * 是否关闭界面
    *

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-form.controller.ts

@@ -23,4 +23,12 @@ export interface IFormController<
    * @return {*}  {IData[]}
    */
   getData(): IData[];
+
+  /**
+   * 表单值规则校验
+   * @author zzq
+   * @date 2023-08-23 16:38:33
+   * @return {*}  {Promise<boolean>}
+   */
+  validate(): Promise<boolean>;
 }

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

@@ -1,7 +1,7 @@
 import { IDEGrid } from '@ibiz/model-core';
 import { ControlVO } from '../../../../service';
 import { IGridEvent } from '../../event';
-import { IGridState } from '../../state';
+import { IGridRowState, IGridState } from '../../state';
 import { IMDControlController } from './i-md-control.controller';
 
 /**
@@ -57,4 +57,13 @@ export interface IGridController
    * @memberof IGridController
    */
   exportData(_args: { event: MouseEvent; params: IData }): Promise<void>;
+
+  /**
+   * 值规则校验
+   *
+   * @author zzq
+   * @date 2023-08-23 18:23:26
+   * @memberof IGridController
+   */
+  validate(row: IGridRowState): Promise<boolean>;
 }

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

@@ -46,10 +46,15 @@ export interface ITreeController
   ): Promise<void>;
 
   /**
-   * 刷新父节点数据
+   * 刷新指定树节点的子节点数据
    * @author lxm
-   * @date 2023-08-18 01:49:59
-   * @param {ITreeNodeData} parentNode
+   * @date 2023-08-23 08:23:59
+   * @param {(ITreeNodeData | IData)} nodeData 指定树节点数据，可以是节点数据，也可以是对应的实体数据
+   * @param {boolean} [refreshParent=false] 是否是刷新给定节点数据的父节点的子节点数据
+   * @return {*}  {Promise<void>}
    */
-  refreshParent(parentData: ITreeNodeData | IData): void;
+  refreshNodeChildren(
+    nodeData: ITreeNodeData | IData,
+    refreshParent?: boolean,
+  ): 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/i-pickup-view-panel.event.ts

@@ -38,20 +38,4 @@ export interface IPickupViewPanelEvent extends IControlEvent {
     event: EventBase;
     emitArgs: { data: IData[] };
   };
-
-  /**
-   * 选择视图初始化
-   *
-   * @author zk
-   * @date 2023-08-04 05:08:37
-   * @type {{
-   *     event: EventBase;
-   *     emitArgs: { data: IViewController };
-   *   }}
-   * @memberof IPickupViewPanelEvent
-   */
-  onPickUpViewMounted: {
-    event: EventBase;
-    emitArgs: undefined;
-  };
 }

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-exp-bar.state.ts

@@ -7,4 +7,13 @@ import { IExpBarControlState } from './i-exp-bar-control.state';
  * @interface ITreeExpBarState
  * @extends {IExpBarControlState}
  */
-export interface ITreeExpBarState extends IExpBarControlState {}
+export interface ITreeExpBarState extends IExpBarControlState {
+  /**
+   * 不需要配置导航视图
+   * 没有配置导航视图的情况下也正常抛出导航事件，由外部决定导航参数用在哪个导航视图里。
+   * @author lxm
+   * @date 2023-08-22 03:39:14
+   * @type {boolean}
+   */
+  noNeedNavView: boolean;
+}