@ibiz-template/runtime 0.4.13 → 0.4.15

package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.ts

@@ -32,6 +32,13 @@ export class FormMDCtrlFormController extends FormMDCtrlController {
    */
   declare state: FormMDCtrlFormState;
 
+  /**
+   * 忽略下一次自身对应表单项数据变更
+   * @author lxm
+   * @date 2023-12-19 11:47:21
+   */
+  ignoreNextSelfChange = false;
+
   protected createState(): FormMDCtrlFormState {
     return new FormMDCtrlFormState(this.parent?.state);
   }
@@ -133,7 +140,7 @@ export class FormMDCtrlFormController extends FormMDCtrlController {
    */
   async formStateNotify(state: FormNotifyState): Promise<void> {
     await super.formStateNotify(state);
-    await this.fetchData();
+    await this.refresh();
   }
 
   /**
@@ -156,10 +163,10 @@ export class FormMDCtrlFormController extends FormMDCtrlController {
           item.context[this.deName] = formData.srfkey;
         }
       }
-      this.updateFormItem();
+      this.notifyFormDataChange();
     });
     controller.evt.on('onRemoveSuccess', () => {
-      this.updateFormItem();
+      this.notifyFormDataChange();
     });
   }
 
@@ -210,6 +217,11 @@ export class FormMDCtrlFormController extends FormMDCtrlController {
   }
 
   async dataChangeNotify(names: string[]): Promise<void> {
+    if (names.includes(this.model.id!) && this.ignoreNextSelfChange) {
+      this.ignoreNextSelfChange = false;
+      return;
+    }
+
     await super.dataChangeNotify(names);
 
     // 表单项更新的时候修改数据的时候需要刷新
@@ -217,4 +229,16 @@ export class FormMDCtrlFormController extends FormMDCtrlController {
       this.refresh();
     }
   }
+
+  /**
+   * 通知表单多数据部件对应的表单项数据变更
+   * @author lxm
+   * @date 2023-12-19 11:46:13
+   * @protected
+   */
+  protected notifyFormDataChange(): void {
+    this.updateFormItem();
+    this.ignoreNextSelfChange = true;
+    this.form.dataChangeNotify([this.name]);
+  }
 }

package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-md.controller.ts

@@ -40,6 +40,13 @@ export class FormMDCtrlMDController extends FormMDCtrlController {
    */
   mdController!: IMDControlController;
 
+  /**
+   * 忽略下一次自身对应表单项数据变更
+   * @author lxm
+   * @date 2023-12-19 11:47:21
+   */
+  ignoreNextSelfChange = false;
+
   /**
    * 表单项名称
    *
@@ -83,10 +90,10 @@ export class FormMDCtrlMDController extends FormMDCtrlController {
 
     // 多数据部件保存，删除之后触发表单项更新
     controller.evt.on('onSaveSuccess', () => {
-      this.updateFormItem();
+      this.notifyFormDataChange();
     });
     controller.evt.on('onRemoveSuccess', () => {
-      this.updateFormItem();
+      this.notifyFormDataChange();
     });
   }
 
@@ -141,6 +148,11 @@ export class FormMDCtrlMDController extends FormMDCtrlController {
   }
 
   async dataChangeNotify(names: string[]): Promise<void> {
+    if (names.includes(this.model.id!) && this.ignoreNextSelfChange) {
+      this.ignoreNextSelfChange = false;
+      return;
+    }
+
     await super.dataChangeNotify(names);
 
     // 表单项更新的时候修改数据的时候需要刷新
@@ -148,4 +160,16 @@ export class FormMDCtrlMDController extends FormMDCtrlController {
       this.refresh();
     }
   }
+
+  /**
+   * 通知表单多数据部件对应的表单项数据变更
+   * @author lxm
+   * @date 2023-12-19 11:46:13
+   * @protected
+   */
+  protected notifyFormDataChange(): void {
+    this.updateFormItem();
+    this.ignoreNextSelfChange = true;
+    this.form.dataChangeNotify([this.name]);
+  }
 }

package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.ts

@@ -14,17 +14,6 @@ import { FormMDCtrlController } from './form-mdctrl.controller';
  * @extends {FormDetailController<IDEFormMDCtrl>}
  */
 export class FormMDCtrlRepeaterController extends FormMDCtrlController {
-  /**
-   * 名称
-   * @author lxm
-   * @date 2023-11-22 03:31:02
-   * @readonly
-   * @type {string}
-   */
-  get name(): string {
-    return this.model.id!;
-  }
-
   /**
    * 多数据重复器对应的表单里的值
    *

package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.ts

@@ -12,6 +12,17 @@ import { FormDetailController } from '../form-detail';
  * @extends {FormDetailController<IDEFormMDCtrl>}
  */
 export class FormMDCtrlController extends FormDetailController<IDEFormMDCtrl> {
+  /**
+   * 名称
+   * @author lxm
+   * @date 2023-11-22 03:31:02
+   * @readonly
+   * @type {string}
+   */
+  get name(): string {
+    return this.model.id!;
+  }
+
   /**
    * 上下文
    *

package/src/controller/control/gantt/gantt.controller.ts

@@ -1,4 +1,6 @@
 /* eslint-disable no-param-reassign */
+/* eslint-disable no-prototype-builtins */
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import { recursiveIterate } from '@ibiz-template/core';
 import { IDEGantt, IDETreeColumn, IDETreeNode } from '@ibiz/model-core';
 import {
@@ -6,6 +8,7 @@ import {
   IGanttEvent,
   IGanttNodeData,
   IGanttState,
+  IGanttStyle,
   IGridColumnProvider,
   MDCtrlLoadParams,
 } from '../../../interface';
@@ -99,8 +102,18 @@ export class GanttController
     this.state.query = '';
     this.state.columnStates = [];
     this.state.rootNodes = [];
+    this.state.ganttStyle = {};
   }
 
+  /**
+   * 当数据放生变更时，若为当前应用实体数据。则多数据部件进行刷新
+   * 临时重写 防止错误刷新整个甘特图
+   * @protected
+   * @param {IData} msg
+   * @memberof GanttController
+   */
+  protected onDataChange(msg: IData): void {}
+
   protected async onCreated(): Promise<void> {
     await super.onCreated();
     await this.initGridColumns();
@@ -244,6 +257,16 @@ export class GanttController
     });
   }
 
+  /**
+   * 设置甘特图样式
+   *
+   * @param {IGanttStyle} style
+   * @memberof GanttController
+   */
+  setGanttStyle(style: IGanttStyle): void {
+    this.state.ganttStyle = style;
+  }
+
   /**
    * 加载
    *
@@ -490,6 +513,74 @@ export class GanttController
     };
   }
 
+  /**
+   * 转化节点数据项
+   * vo -> do
+   * @param {IDETreeNode} nodeModel 节点模型
+   * @param {IData} data 数据
+   * @memberof GanttController
+   */
+  transformNodeDataItem(nodeModel: IDETreeNode, data: IData): IData {
+    const dataItem: IData = {};
+    nodeModel.detreeNodeDataItems?.forEach(item => {
+      if (
+        item.id &&
+        item.appDEFieldId &&
+        data.hasOwnProperty(item.id.toLowerCase())
+      ) {
+        Object.assign(dataItem, {
+          [item.appDEFieldId.toLowerCase()]: data[item.id.toLowerCase()],
+        });
+      }
+    });
+    return dataItem;
+  }
+
+  /**
+   * 更新节点数据
+   *
+   * @param {(IGanttNodeData | IData)} nodeData 节点数据
+   * @param {IData} data 更新数据
+   * @param {boolean} [isTransformData=false] 是否转化数据项
+   * @return {*}
+   * @memberof GanttController
+   */
+  async updateNodeData(
+    nodeData: IGanttNodeData | IData,
+    data: IData,
+    isTransformData: boolean = false,
+  ): Promise<void> {
+    const key = nodeData.srfkey ? 'srfkey' : 'id';
+    const currentNode = this.state.items.find(
+      item => item[key] === nodeData[key],
+    );
+    if (!currentNode || !currentNode.srfkey) {
+      ibiz.log.error('找不到对应的动态实体树节点数据', nodeData);
+      return;
+    }
+    const nodeModel = this.getNodeModel(currentNode.nodeId);
+    if (nodeModel) {
+      const newData = isTransformData
+        ? this.transformNodeDataItem(nodeModel, data)
+        : data;
+      if (Object.keys(newData).length > 0) {
+        const [, entityCodename] = nodeModel.appDataEntityId!.split('.');
+        const tempContext = Object.assign(this.context.clone(), {
+          [entityCodename]: currentNode.srfkey,
+        });
+        const response = await this.service.execDeService(
+          nodeModel.appDataEntityId!,
+          'update',
+          tempContext,
+          newData,
+        );
+        if (response.status === 200) {
+          this.refreshNodeChildren(nodeData, true);
+        }
+      }
+    }
+  }
+
   /**
    * 刷新指定树节点的子节点数据
    *

package/src/controller/control/gantt/gantt.service.ts

@@ -4,7 +4,7 @@ import {
   IDETreeNode,
   IDETreeNodeRS,
 } from '@ibiz/model-core';
-import { ModelError } from '@ibiz-template/core';
+import { IHttpResponse, ModelError } from '@ibiz-template/core';
 import { IGanttNodeData } from '../../../interface';
 import { getChildNodeRSs, getRootNode, getTreeNode } from '../../../model';
 import { handleAllSettled } from '../../../utils';
@@ -25,6 +25,31 @@ import {
  * @extends {TreeService}
  */
 export class GanttService extends TreeService {
+  /**
+   * 执行实体服务
+   *
+   * @protected
+   * @param {string} appDataEntityId 实体标识
+   * @param {string} actionName 行为标识
+   * @param {IContext} context 上下文
+   * @param {IParams} params 参数
+   * @return {*}  {Promise<IHttpResponse<IData>>}
+   * @memberof GanttService
+   */
+  execDeService(
+    appDataEntityId: string,
+    actionName: string,
+    context: IContext,
+    params: IParams,
+  ): Promise<IHttpResponse<IData>> {
+    return this.app.deService.exec(
+      appDataEntityId,
+      actionName,
+      context,
+      params,
+    );
+  }
+
   /**
    * 获取子节点数据
    *

package/src/controller/control/kanban/kanban.controller.ts

@@ -1,18 +1,21 @@
 import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
-import { IDEKanban } from '@ibiz/model-core';
+import { IDEKanban, IUIActionGroupDetail } from '@ibiz/model-core';
 import { isNil } from 'ramda';
 import {
+  IController,
   IDragChangeInfo,
   IKanbanController,
   IKanbanEvent,
   IKanbanGroupState,
   IKanbanState,
+  IToolbarController,
   MDCtrlLoadParams,
 } from '../../../interface';
 import { calcDeCodeNameById } from '../../../model';
 import { ControlVO } from '../../../service';
 import { DataViewControlController } from '../data-view';
 import { KanbanService } from './kanban.service';
+import { UIActionUtil } from '../../../ui-action';
 
 export class KanbanController
   extends DataViewControlController<IDEKanban, IKanbanState, IKanbanEvent>
@@ -57,6 +60,8 @@ export class KanbanController
     super.initState();
     this.state.size = this.model.pagingSize || 1000;
     this.state.updating = false;
+    this.state.batching = false;
+    this.state.selectGroupKey = '';
     // 支持调整顺序和分组时
     this.state.draggable = this.enableEditOrder || this.enableEditGroup;
   }
@@ -70,6 +75,7 @@ export class KanbanController
    */
   protected async onCreated(): Promise<void> {
     await super.onCreated();
+    this.setToolbarHooks();
   }
 
   /**
@@ -116,6 +122,90 @@ export class KanbanController
     return super.afterLoad(args, items);
   }
 
+  /**
+   * 当展开批操作工具栏时需进行行点击拦截
+   *
+   * @param {IData} data
+   * @return {*}  {Promise<void>}
+   * @memberof KanbanController
+   */
+  async onRowClick(data: IData): Promise<void> {
+    const { groupAppDEFieldId } = this.model;
+    if (this.state.batching && groupAppDEFieldId) {
+      const groupVal = data[groupAppDEFieldId];
+      if (groupVal !== this.state.selectGroupKey) {
+        // 激活事件
+        if (this.state.mdctrlActiveMode === 1) {
+          await this.setActive(data);
+        }
+        return;
+      }
+    }
+    super.onRowClick(data);
+  }
+
+  /**
+   * 点击新建时设置选中分组
+   *
+   * @param {MouseEvent} event
+   * @param {(string | number)} group
+   * @memberof KanbanController
+   */
+  onClickNew(event: MouseEvent, group: string | number): void {
+    this.setSelectGroup(group);
+    super.onClickNew(event, group);
+  }
+
+  /**
+   * 分组工具栏需设置选中分组
+   *
+   * @param {IUIActionGroupDetail} detail
+   * @param {MouseEvent} event
+   * @param {IKanbanGroupState} group
+   * @return {*}  {Promise<void>}
+   * @memberof KanbanController
+   */
+  async onGroupToolbarClick(
+    detail: IUIActionGroupDetail,
+    event: MouseEvent,
+    group: IKanbanGroupState,
+  ): Promise<void> {
+    this.setSelectGroup(group.key);
+    super.onGroupToolbarClick(detail, event, group);
+  }
+
+  /**
+   * 分组行为项点击，需携带分组标识
+   *
+   * @param {IUIActionGroupDetail} detail
+   * @param {IData} item
+   * @param {MouseEvent} event
+   * @param {IKanbanGroupState} group
+   * @return {*}  {Promise<void>}
+   * @memberof KanbanController
+   */
+  async onGroupActionClick(
+    detail: IUIActionGroupDetail,
+    item: IData,
+    event: MouseEvent,
+    group: IKanbanGroupState,
+  ): Promise<void> {
+    this.setSelectGroup(group.key);
+    const params = { ...this.params, srfgroup: group };
+    const actionId = detail.uiactionId;
+    await UIActionUtil.execAndResolved(
+      actionId!,
+      {
+        context: this.context,
+        params,
+        data: [item],
+        view: this.view,
+        event,
+      },
+      detail.appId,
+    );
+  }
+
   handleDataGroup(): Promise<void> {
     if (!this.model.enableGroup || this.model.groupMode === 'NONE') {
       throw new RuntimeError('看板部件必须开启分组');
@@ -351,4 +441,171 @@ export class KanbanController
       await this.afterLoad({}, this.state.items);
     }
   }
+
+  /**
+   * 获取是否全屏
+   *
+   * @return {*}  {boolean}
+   * @memberof KanbanController
+   */
+  getFullscreen(): boolean {
+    const value =
+      (document as IData).isFullScreen ||
+      (document as IData).mozIsFullScreen ||
+      (document as IData).webkitIsFullScreen;
+    return value;
+  }
+
+  /**
+   * 触发全屏
+   *
+   * @param {IData} container
+   * @memberof KanbanController
+   */
+  onFullScreen(container: IData): boolean {
+    const isFull = this.getFullscreen();
+    if (!isFull) {
+      if (container) {
+        if (container.webkitRequestFullscreen) {
+          container.webkitRequestFullscreen();
+        } else if (container.mozRequestFullScreen) {
+          container.mozRequestFullScreen();
+        } else if (container.msRequestFullscreen) {
+          container.msRequestFullscreen();
+        } else if (container.requestFullscreen) {
+          container.requestFullscreen();
+        }
+      }
+    } else if ((document as IData).documentElement.requestFullScreen) {
+      (document as IData).exitFullScreen();
+    } else if ((document as IData).documentElement.webkitRequestFullScreen) {
+      (document as IData).webkitCancelFullScreen();
+    } else if ((document as IData).documentElement.mozRequestFullScreen) {
+      (document as IData).mozCancelFullScreen();
+    }
+    return !isFull;
+  }
+
+  /**
+   * 设置选中分组标识
+   *
+   * @param {(string | number)} key
+   * @memberof KanbanController
+   */
+  setSelectGroup(key: string | number): void {
+    if (!this.state.batching) {
+      this.state.selectGroupKey = key;
+    }
+  }
+
+  /**
+   * 设置分组控制器
+   *
+   * @param {string} groupKey
+   * @param {('quickToolbarController' | 'batchToolbarController')} name
+   * @param {IToolbarController} c
+   * @memberof KanbanController
+   */
+  setGroupController(
+    groupKey: string | number,
+    name: 'quickToolbarController' | 'batchToolbarController',
+    c: IToolbarController,
+  ): void {
+    const group = this.state.groups.find(x => x.key === groupKey);
+    if (group) {
+      group[name] = c;
+    }
+  }
+
+  /**
+   * 设置工具栏hook
+   *
+   * @memberof KanbanController
+   */
+  setToolbarHooks(): void {
+    this.listenNewController((name: string, c: IController) => {
+      if (
+        name.startsWith(`${this.model.name}_quicktoolbar`) ||
+        name.startsWith(`${this.model.name}_groupquicktoolbar`)
+      ) {
+        this.setQuickToolbarClickHook(name, c as IToolbarController);
+      }
+      if (name.startsWith(`${this.model.name}_batchtoolbar`)) {
+        this.setBatchToolbarClickHook(name, c as IToolbarController);
+      }
+    });
+  }
+
+  /**
+   * 设置快捷工具栏点击事件hook
+   *
+   * @param {string} name
+   * @param {IToolbarController} c
+   * @memberof KanbanController
+   */
+  setQuickToolbarClickHook(name: string, c: IToolbarController): void {
+    const key = name.split('quicktoolbar_')[1];
+    this.setGroupController(
+      key,
+      'quickToolbarController',
+      c as IToolbarController,
+    );
+    (c as IToolbarController).evt.on('onClick', (event): void => {
+      const groupKey = event.targetName.split('quicktoolbar_')[1];
+      this.setSelectGroup(groupKey);
+      Object.assign(event.params, { srfgroup: groupKey });
+    });
+  }
+
+  /**
+   * 设置批工具栏点击事件hook
+   *
+   * @param {string} name
+   * @param {IToolbarController} c
+   * @memberof KanbanController
+   */
+  setBatchToolbarClickHook(name: string, c: IToolbarController): void {
+    const key = name.split('batchtoolbar_')[1];
+    this.setGroupController(
+      key,
+      'batchToolbarController',
+      c as IToolbarController,
+    );
+    (c as IToolbarController).evt.on('onClick', (event): void => {
+      const groupKey = event.targetName.split('batchtoolbar_')[1];
+      this.setSelectGroup(groupKey);
+      Object.assign(event.params, { srfgroup: groupKey });
+    });
+  }
+
+  /**
+   * 打开批操作工具栏
+   *
+   * @param {string} groupKey
+   * @memberof KanbanController
+   */
+  openBatch(groupKey: string): void {
+    this.state.selectGroupKey = groupKey;
+    this.state.batching = true;
+    this.state.selectedData = [];
+    // 清空分组选中数据
+    this.state.groups.forEach(group => {
+      group.selectedData = [];
+    });
+  }
+
+  /**
+   * 关闭批操作工具栏
+   *
+   * @memberof KanbanController
+   */
+  closeBatch(): void {
+    this.state.selectGroupKey = '';
+    this.state.batching = false;
+    this.state.selectedData = [];
+    // 清空分组选中数据
+    this.state.groups.forEach(group => {
+      group.selectedData = [];
+    });
+  }
 }

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

@@ -4,7 +4,12 @@ import {
   RuntimeModelError,
   recursiveIterate,
 } from '@ibiz-template/core';
-import { IDETree, IDETreeDataSetNode, IDETreeNode } from '@ibiz/model-core';
+import {
+  IDETBUIActionItem,
+  IDETree,
+  IDETreeDataSetNode,
+  IDETreeNode,
+} from '@ibiz/model-core';
 import {
   ITreeState,
   ITreeEvent,
@@ -16,7 +21,11 @@ import { UIActionUtil } from '../../../ui-action';
 import { MDControlController } from '../../common';
 import { ContextMenuController } from '../context-menu';
 import { TreeService } from './tree.service';
-import { calcDeCodeNameById, getChildNodeRSs } from '../../../model';
+import {
+  calcDeCodeNameById,
+  getChildNodeRSs,
+  getUIActionItemsByActionLevel,
+} from '../../../model';
 
 export type DropNodeRS = {
   minorEntityId: string;
@@ -62,6 +71,13 @@ export class TreeController
    */
   dropNodeRss = new Map<string, DropNodeRS[]>();
 
+  /**
+   * 节点对应的上下文菜单里第一个行为级别为常用操作的项
+   * @author lxm
+   * @date 2023-12-19 03:14:03
+   */
+  nodeClickTBUIActionItem = new Map<string, IDETBUIActionItem>();
+
   protected initState(): void {
     super.initState();
     // 根节点初始化
@@ -106,6 +122,7 @@ export class TreeController
     }
 
     this.initDropNodeRss();
+    this.initNodeClickTBUIActionItem();
 
     this.service = new TreeService(this.model);
     await this.service.init(this.context);
@@ -163,6 +180,23 @@ export class TreeController
     });
   }
 
+  /**
+   * 初始化节点点击后触发的第一个常用操作的上下文菜单项
+   * @author lxm
+   * @date 2023-12-19 03:18:43
+   * @protected
+   */
+  protected initNodeClickTBUIActionItem(): void {
+    this.model.detreeNodes?.forEach(node => {
+      if (node.decontextMenu?.detoolbarItems?.length) {
+        const items = getUIActionItemsByActionLevel(node.decontextMenu, 200);
+        if (items.length > 0) {
+          this.nodeClickTBUIActionItem.set(node.id!, items[0]);
+        }
+      }
+    });
+  }
+
   /**
    * 树部件加载，从根节点开始重新加载
    *
@@ -254,7 +288,16 @@ export class TreeController
    * @returns {*}  {Promise<void>}
    * @memberof TreeController
    */
-  async onTreeNodeClick(nodeData: ITreeNodeData): Promise<void> {
+  async onTreeNodeClick(
+    nodeData: ITreeNodeData,
+    event: MouseEvent,
+  ): Promise<void> {
+    // 节点有配置常用操作的上下文菜单时，触发界面行为，后续逻辑都不走
+    if (this.nodeClickTBUIActionItem.has(nodeData.nodeId)) {
+      const item = this.nodeClickTBUIActionItem.get(nodeData.nodeId)!;
+      return this.doUIAction(item.uiactionId!, nodeData, event, item.appId);
+    }
+
     // 导航的时候，没有导航视图的时候，节点后续点击逻辑都不走，也不选中
     if (this.state.navigational) {
       const nodeModel = this.getNodeModel(nodeData.nodeId);