@ibiz-template/runtime 0.4.13 → 0.4.14

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

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

@@ -20,7 +20,7 @@ export interface ITreeController
    * @returns {*}  {Promise<void>}
    * @memberof ITreeController
    */
-  onTreeNodeClick(nodeData: ITreeNodeData): Promise<void>;
+  onTreeNodeClick(nodeData: ITreeNodeData, event: MouseEvent): Promise<void>;
 
   /**
    * 树节点双击事件

package/src/model/index.ts

@@ -8,3 +8,4 @@ export * from './grid/index';
 export * from './form/index';
 export * from './view/view';
 export * from './panel/index';
+export * from './toolbar/toolbar';

package/src/model/toolbar/toolbar.ts

@@ -0,0 +1,35 @@
+import { recursiveIterate } from '@ibiz-template/core';
+import {
+  IDETBUIActionItem,
+  IDEToolbar,
+  IDEToolbarItem,
+} from '@ibiz/model-core';
+
+/**
+ * 获取工具栏里面指定行为级别的界面行为项
+ * @author lxm
+ * @date 2023-12-19 03:07:51
+ * @export
+ * @param {IDEToolbar} toolbar 工具栏
+ * @param {number} actionLevel 行为级别 {50：不常用、 100：一般操作、 200：常用操作、 250：关键操作 }
+ * @return {*}  {IDETBUIActionItem[]}
+ */
+export function getUIActionItemsByActionLevel(
+  toolbar: IDEToolbar,
+  actionLevel: number,
+): IDETBUIActionItem[] {
+  const result: IDETBUIActionItem[] = [];
+  recursiveIterate(
+    toolbar,
+    (item: IDEToolbarItem) => {
+      if (item.itemType === 'DEUIACTION') {
+        const uiItem = item as IDETBUIActionItem;
+        if (uiItem.actionLevel === actionLevel) {
+          result.push(uiItem);
+        }
+      }
+    },
+    { childrenFields: ['detoolbarItems'] },
+  );
+  return result;
+}

package/src/service/dto/method.dto.ts

@@ -112,7 +112,7 @@ export class MethodDto {
               field.refAppDataEntityId!,
             );
             const items = await service.selectLocal(context, {
-              srfpkey: data[this.entity.keyAppDEFieldId!],
+              // srfpkey: data[this.entity.keyAppDEFieldId!],
             });
             if (items) {
               const arr = [];