@ibiz-template/runtime 0.1.7 → 0.1.9

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

@@ -60,16 +60,25 @@ export class MDControlController<
     this.state.groups = [];
   }
 
+  protected async onCreated(): Promise<void> {
+    await super.onCreated();
+    // 设置默认排序
+    this.setSort();
+  }
+
   /**
    * 设置排序
+   * 无参数时设置的是默认排序。
    *
    * @author lxm
    * @date 2022-09-28 13:09:44
    * @param {string} key 排序字段
    * @param {string} order 排序顺序
    */
-  setSort(key: string, order: 'asc' | 'desc'): void {
-    this.state.sortQuery = `${key},${order}`;
+  setSort(key?: string, order?: 'asc' | 'desc'): void {
+    if (key && order) {
+      this.state.sortQuery = `${key},${order}`;
+    }
   }
 
   /**
@@ -189,14 +198,20 @@ export class MDControlController<
     if (!data?.length) {
       throw new RuntimeError('未选中数据');
     }
-    const del = await ibiz.confirm.error({
-      title: '数据删除',
-      desc: '确认删除数据？',
-    });
-    if (!del) {
-      return;
+
+    // 删除确认提示
+    if (args?.silent !== true) {
+      const del = await ibiz.confirm.error({
+        title: '数据删除',
+        desc: '确认删除数据？',
+      });
+      if (!del) {
+        return;
+      }
     }
+
     await this.startLoading();
+    let needRefresh = false;
     try {
       const deName = calcDeCodeNameById(this.model.appDataEntityId!);
       await Promise.allSettled(
@@ -207,17 +222,25 @@ export class MDControlController<
             tempContext[deName] = item.srfkey;
             // 删除后台的数据
             await this.service.remove(tempContext, params);
+            needRefresh = true;
           }
 
           this.afterRemove(data);
         }),
       );
-      ibiz.notification.success({
-        desc: `数据[${data
-          .map(item => item.srfmajortext)
-          .join('、')}]删除成功!`,
-      });
-      this.refresh();
+
+      if (args?.silent !== true) {
+        ibiz.notification.success({
+          desc: `数据[${data
+            .map(item => item.srfmajortext)
+            .join('、')}]删除成功!`,
+        });
+      }
+
+      // 刷新数据，补全这一页缺少的数据
+      if (needRefresh) {
+        this.refresh();
+      }
     } finally {
       await this.endLoading();
     }

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/engine/md-view.engine.ts

@@ -142,11 +142,11 @@ export class MDViewEngine extends ViewEngineBase {
       return null;
     }
     if (key === SysUIActionTag.EDIT || key === SysUIActionTag.VIEW) {
-      this.openData(args!);
+      await this.openData(args!);
       return null;
     }
     if (key === SysUIActionTag.NEW) {
-      this.newData(args!);
+      await this.newData(args!);
       return null;
     }
     if (key === SysUIActionTag.REMOVE) {
@@ -300,10 +300,19 @@ export class MDViewEngine extends ViewEngineBase {
     // 有搜索表单的整合相关参数
     if (this.searchForm) {
       const addParams = this.searchForm.getData()[0];
-      Object.assign(params, addParams);
+      const filteredParams = Object.entries(addParams).reduce(
+        (result: IData, [key, value]) => {
+          if (value !== null && value !== undefined && value !== '') {
+            result[key] = value;
+          }
+          return result;
+        },
+        {},
+      );
+      Object.assign(params, filteredParams);
     }
     // 有搜索栏的整合相关参数
-    if (this.searchBar) {
+    if (this.searchBar && this.searchBar.state.query) {
       const addParams = {
         query: this.searchBar.state.query,
       };

package/src/install.ts

@@ -1,7 +1,7 @@
 import { GlobalConfig } from './config/global-config';
 import { RegisterCenter } from './register/register-center';
 import { installCommand } from './command';
-import { AuthService } from './service';
+import { V7AuthService } from './service';
 import { AppHub } from './app-hub';
 import { EngineFactory } from './engine';
 import { GlobalUtil } from './global';
@@ -26,7 +26,7 @@ export function install(): void {
   // 初始化全局配置
   ibiz.config = new GlobalConfig();
   // 挂载认证服务
-  ibiz.auth = new AuthService();
+  ibiz.auth = new V7AuthService();
   // 挂载引擎工厂
   ibiz.engine = new EngineFactory();
   // 安装默认指令

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/common/i-icon/i-icon.ts

@@ -21,4 +21,12 @@ export interface IIcon {
    * @type {string}
    */
   imagePath?: string;
+
+  /**
+   * html字符串
+   * @author lxm
+   * @date 2023-08-15 02:14:26
+   * @type {string}
+   */
+  htmlStr?: string;
 }

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

@@ -24,7 +24,7 @@ export interface IGridController
   newRow(): Promise<void>;
 
   /**
-   * 保存
+   * 保存单条数据
    *
    * @author zk
    * @date 2023-07-31 02:07:52
@@ -33,13 +33,21 @@ export interface IGridController
   save(data: ControlVO): Promise<void>;
 
   /**
-   * 切换行编辑状态
+   * 保存表格所有数据
    *
    * @author zk
-   * @date 2023-07-31 02:07:26
+   * @date 2023-07-31 02:07:52
    * @memberof IGridController
    */
-  toggleRowEdit(row?: IData): void;
+  saveAll(): Promise<void>;
+
+  /**
+   * 切换表格的行编辑开启关闭状态
+   * @author lxm
+   * @date 2023-08-16 10:18:14
+   * @param {IData} [rowData] 行数据
+   */
+  toggleRowEdit(): void;
 
   /**
    * 数据导出

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

@@ -20,7 +20,15 @@ export interface MDCtrlLoadParams extends IDataAbilityParams {
   isLoadMore?: boolean;
 }
 
-export interface MDCtrlRemoveParams extends IDataAbilityParams {}
+export interface MDCtrlRemoveParams extends IDataAbilityParams {
+  /**
+   * 是否静默删除
+   * @author lxm
+   * @date 2023-08-17 06:04:23
+   * @type {boolean}
+   */
+  silent?: 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

@@ -44,4 +44,12 @@ export interface ITreeController
     nodeData: ITreeNodeData,
     event: MouseEvent,
   ): Promise<void>;
+
+  /**
+   * 刷新父节点数据
+   * @author lxm
+   * @date 2023-08-18 01:49:59
+   * @param {ITreeNodeData} parentNode
+   */
+  refreshParent(parentData: ITreeNodeData | IData): 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/argument/index.ts

@@ -6,3 +6,4 @@ export { CloseViewEvent } from './close-view.event';
 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';

package/src/interface/controller/event/argument/row-edit-change.event.ts

@@ -0,0 +1,20 @@
+import { IGridRowState } from '../../state';
+import { EventBase } from './base.event';
+
+/**
+ * 行编辑切换事件
+ * @author lxm
+ * @date 2023-03-26 02:07:11
+ * @export
+ * @interface RowEditChangeEvent
+ * @extends {EventBase}
+ */
+export interface RowEditChangeEvent extends EventBase {
+  /**
+   * 行状态对象
+   * @author lxm
+   * @date 2023-08-17 06:58:15
+   * @type {IGridRowState}
+   */
+  row: IGridRowState;
+}

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-grid.event.ts

@@ -1,4 +1,5 @@
-import { EventBase } from '../..';
+import { PartialWithObject } from '@ibiz-template/core';
+import { EventBase, RowEditChangeEvent } from '../..';
 import { IMDControlEvent } from './i-md-control.event';
 
 /**
@@ -21,4 +22,16 @@ export interface IGridEvent extends IMDControlEvent {
     event: EventBase;
     emitArgs: { data: IData[] };
   };
+
+  /**
+   * 表格行编辑切换事件
+   * @author lxm
+   * @date 2023-03-26 06:15:06
+   * @param {emitArgs} undefined
+   * @return {*}  {Promise<void>}
+   */
+  onRowEditChange: {
+    event: RowEditChangeEvent;
+    emitArgs: PartialWithObject<RowEditChangeEvent, EventBase>;
+  };
 }

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

@@ -21,4 +21,18 @@ export interface ITreeEvent extends IMDControlEvent {
     event: EventBase & { nodeData: ITreeNodeData };
     emitArgs: { data: IData[]; nodeData: ITreeNodeData };
   };
+
+  /**
+   * 父节点刷新结束之后事件
+   * @author lxm
+   * @date 2023-08-18 02:18:24
+   * @type {({
+   *     event: EventBase & { children: ITreeNodeData[] };
+   *     emitArgs: { children: ITreeNodeData[] };
+   *   })}
+   */
+  onAfterRefreshParent: {
+    event: EventBase & { parentNode: ITreeNodeData; children: ITreeNodeData[] };
+    emitArgs: { parentNode: ITreeNodeData; children: ITreeNodeData[] };
+  };
 }

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-grid.state.ts

@@ -36,6 +36,14 @@ export interface IGridState extends IMDControlState {
    * @type {IData}
    */
   remoteAggResult?: IData;
+
+  /**
+   * 开启表格行编辑
+   * @author lxm
+   * @date 2023-08-17 02:38:18
+   * @type {boolean}
+   */
+  rowEditOpen: boolean;
 }
 
 export interface IGridRowState {
@@ -75,6 +83,7 @@ export interface IGridRowState {
   editColStates: {
     [p: string]: {
       disabled: boolean;
+      readonly: boolean;
       editable: boolean;
       required: boolean;
     };

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

@@ -1,4 +1,4 @@
-import { IButtonContainerState } from '../../common';
+import { IIcon } from '../../common';
 import { IMDControlState } from './i-md-control.state';
 
 /**
@@ -10,6 +10,8 @@ import { IMDControlState } from './i-md-control.state';
  * @extends {IMDControlState}
  */
 export interface ITreeState extends IMDControlState {
+  items: ITreeNodeData[];
+
   /**
    * 树的根节点
    *
@@ -35,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 };
 }
 
 /**
@@ -152,5 +146,21 @@ export interface ITreeNodeData {
    */
   srfmajortext?: string;
 
+  /**
+   * 图标
+   * @author lxm
+   * @date 2023-08-15 02:02:49
+   * @type {IIcon}
+   */
+  icon?: IIcon;
+
+  /**
+   * 节点文本的html显示
+   * @author lxm
+   * @date 2023-08-15 02:15:09
+   * @type {string}
+   */
+  textHtml?: string;
+
   // todo 其他界面绘制相关属性
 }

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';