@ibiz-template/runtime 0.2.12 → 0.2.13

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

@@ -41,6 +41,7 @@ export class TreeController
     // 根节点初始化
     this.state.defaultExpandedKeys = [];
     this.state.expandedKeys = [];
+    this.state.navigational = false;
     this.state.size = 0;
   }
 
@@ -154,6 +155,14 @@ export class TreeController
    * @memberof TreeController
    */
   async onTreeNodeClick(nodeData: ITreeNodeData): Promise<void> {
+    // 导航的时候，没有导航视图的时候，节点后续点击逻辑都不走，也不选中
+    if (this.state.navigational) {
+      const nodeModel = this.getNodeModel(nodeData.nodeId);
+      if (!nodeModel?.navAppViewId) {
+        return;
+      }
+    }
+
     // 单选时，单击才会触发选中逻辑
     if (this.state.singleSelect) {
       // 选中相关处理
@@ -363,4 +372,31 @@ export class TreeController
       children: nodes,
     });
   }
+
+  async expandNodeByKey(expandKeys: string[]): Promise<void> {
+    const noExpandKeys = expandKeys.filter(
+      key => !this.state.expandedKeys.includes(key),
+    );
+    if (noExpandKeys.length === 0) {
+      return;
+    }
+
+    // 找到已存在的要展开的节点
+    const existNodes = this.state.items.filter(item =>
+      noExpandKeys.includes(item.id),
+    );
+
+    // 补充所有未展开的节点标识，查询过程中会自动加载后续展开
+    this.state.expandedKeys.push(...noExpandKeys);
+
+    if (existNodes.length === 0) {
+      return;
+    }
+    // 展开加载节点
+    await Promise.all(
+      existNodes.map(node => {
+        return this.loadNodes(node);
+      }),
+    );
+  }
 }

package/src/controller/utils/index.ts

@@ -2,6 +2,7 @@ export * from './counter';
 export * from './loading/loading.state';
 export * from './button-state';
 export * from './event';
+export * from './route/route';
 export * from './util/util';
 export * from './value-rule/value-rule';
 export * from './value-ex/value-ex';

package/src/controller/utils/route/route.ts

@@ -0,0 +1,11 @@
+/**
+ * 是否有子路由路径
+ * @author lxm
+ * @date 2023-11-08 10:12:54
+ * @export
+ * @param {number} routeDepth
+ * @return {*}  {boolean}
+ */
+export function hasSubRoute(routeDepth: number): boolean {
+  return window.location.hash.split('/').length > routeDepth * 2 + 2;
+}

package/src/controller/utils/view-msg/view-msg-controller.ts

@@ -146,13 +146,16 @@ export class ViewMsgController {
    */
   protected calcStaticMsg(detail: IAppViewMsgGroupDetail): IViewMessage {
     const { position: position1 } = detail;
+    const viewMsg = this.viewMsgMap.get(detail.appViewMsgId!)!;
     const {
       title,
       message,
       removeMode,
       position: position2,
       messageType,
-    } = this.viewMsgMap.get(detail.appViewMsgId!)!;
+    } = viewMsg;
+    const { userTag, userTag2, userTag3, userTag4 } = viewMsg as IData;
+
     // detail里的位置优先
     const position = position1 || position2;
     return {
@@ -161,6 +164,13 @@ export class ViewMsgController {
       position,
       messageType,
       removeMode,
+      // 额外参数
+      extraParams: {
+        userTag,
+        userTag2,
+        userTag3,
+        userTag4,
+      },
     };
   }
 

package/src/interface/controller/common/i-nav-view-msg/i-nav-view-msg.ts

@@ -65,4 +65,14 @@ export interface INavViewMsg {
    * @memberof INavViewMsg
    */
   isCache?: boolean;
+
+  /**
+   * 是否404
+   *
+   * @author zk
+   * @date 2023-09-26 06:09:17
+   * @type {string}
+   * @memberof INavViewMsg
+   */
+  is404?: boolean;
 }

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

@@ -39,4 +39,14 @@ export interface IViewMessage {
    * @type {string}
    */
   message?: string;
+
+  /**
+   * 额外参数
+   *
+   * @author zk
+   * @date 2023-11-06 11:11:50
+   * @type {IData}
+   * @memberof IViewMessage
+   */
+  extraParams: IData;
 }

package/src/interface/controller/controller/control/i-exp-bar-control.controller.ts

@@ -64,5 +64,5 @@ export interface IExpBarControlController<
    * @date 2023-09-14 07:03:39
    * @param {{ srfnav?: string; path: string }} info 当前系统的路由的从一级到最后一级的所有路径。
    */
-  onRouterChange(info: { srfnav: string; path: string }): void;
+  onRouterChange(info: { srfnav: string; path: string }): Promise<void>;
 }

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

@@ -57,4 +57,13 @@ export interface ITreeController
     nodeData: ITreeNodeData | IData,
     refreshParent?: boolean,
   ): Promise<void>;
+
+  /**
+   * 展开并加载节点
+   * @author lxm
+   * @date 2023-11-07 03:00:54
+   * @param {string[]} expandedKeys 要展开的节点标识集合
+   * @return {*}  {Promise<void>}
+   */
+  expandNodeByKey(expandedKeys: string[]): Promise<void>;
 }

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

@@ -37,6 +37,14 @@ export interface ITreeState extends IMDControlState {
    * @type {string[]}
    */
   expandedKeys: string[];
+
+  /**
+   * 是否是导航的（即树导航里的树）
+   * @author lxm
+   * @date 2023-11-08 03:25:21
+   * @type {boolean}
+   */
+  navigational: boolean;
 }
 
 /**

package/src/logic-scheduler/executor/app-ui-action-executor.ts

@@ -1,3 +1,4 @@
+import { RuntimeModelError } from '@ibiz-template/core';
 import { IUILogicParams } from '../../interface';
 import { UIActionUtil } from '../../ui-action';
 import { LogicExecutor } from './logic-executor';
@@ -15,6 +16,12 @@ export class AppDEUIActionExecutor extends LogicExecutor {
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(executeParams: IUILogicParams): any {
-    UIActionUtil.execAndResolved(this.logic.appDEUIActionId!, executeParams);
+    if (!this.logic.appDEUIActionId) {
+      throw new RuntimeModelError(
+        this.logic,
+        `逻辑中缺少触发应用实体界面行为id`,
+      );
+    }
+    UIActionUtil.execAndResolved(this.logic.appDEUIActionId, executeParams);
   }
 }

package/src/service/service/entity/util/util.ts

@@ -3,6 +3,7 @@ import { IAppDEAction, IAppDEDataSet, IAppDEMethod } from '@ibiz/model-core';
 /**
  * 是否为本地模式
  *
+ * @description 行为类型: 内置方法、数据集类型: 数据查询，才是本地模式
  * @author chitanda
  * @date 2023-09-06 16:09:06
  * @export

package/src/service/service/work-flow/work-flow.service.ts

@@ -66,6 +66,20 @@ export class WorkFlowService implements IWorkFlowService {
     return data;
   }
 
+  /**
+   * 获取工作流实例标记
+   *
+   * @author zk
+   * @date 2023-11-06 06:11:07
+   * @private
+   * @param {IParams} context
+   * @return {*}  {string}
+   * @memberof WorkFlowService
+   */
+  private getWFInstanceTag(context: IParams): string {
+    return context.srfprocessinstanceid || 'alls';
+  }
+
   /**
    * 根据当前步骤和任务获取工作流步骤数据（如：流程表单等）
    *
@@ -113,7 +127,9 @@ export class WorkFlowService implements IWorkFlowService {
   async getWFHistory(context: IParams): Promise<IHttpResponse<IData>> {
     const deKeyValue = context[this.model.codeName!.toLowerCase()];
     return this.app.net.get(
-      `${this.getBaseUrl()}/${deKeyValue}/process-instances/alls/history`,
+      `${this.getBaseUrl()}/${deKeyValue}/process-instances/${this.getWFInstanceTag(
+        context,
+      )}/history`,
     );
   }
 
@@ -128,7 +144,9 @@ export class WorkFlowService implements IWorkFlowService {
   async getWFProcessDiagram(context: IParams): Promise<IHttpResponse<IData>> {
     const deKeyValue = context[this.model.codeName!.toLowerCase()];
     return this.app.net.request(
-      `${this.getBaseUrl()}/${deKeyValue}/process-instances/alls/processdiagram`,
+      `${this.getBaseUrl()}/${deKeyValue}/process-instances/${this.getWFInstanceTag(
+        context,
+      )}/processdiagram`,
       {
         method: 'post',
         data: {},

package/src/service/vo/control.vo.ts

@@ -142,6 +142,18 @@ export class ControlVO {
       value: $dataUIMap || new Map(),
     });
 
+    // srfactionparam属性改到源对象上去
+    Object.defineProperty(this, 'srfactionparam', {
+      get() {
+        return this.$origin.srfactionparam;
+      },
+      set(val: unknown) {
+        this.$origin.srfactionparam = val;
+      },
+      enumerable: true,
+      configurable: true,
+    });
+
     // 可读写的预置属性,主键属性和主文本属性
     ['srfkey', 'srfmajortext'].forEach(key => {
       if (Object.prototype.hasOwnProperty.call(this.$origin, key)) {

package/src/service/vo/tree-node-data/tree-code-list-node-data.ts

@@ -21,8 +21,6 @@ export class TreeCodeListNodeData
 
   value: string;
 
-  deData: CodeListItem;
-
   constructor(
     model: IDETreeDataSetNode,
     parentNodeData: ITreeNodeData | undefined,
@@ -35,7 +33,6 @@ export class TreeCodeListNodeData
   ) {
     super(model, parentNodeData, opts);
     const { data } = opts;
-    this.deData = data;
     this.text = data.text;
     this.value = data.value as string;
     this.id = parentNodeData

package/src/ui-action/provider/backend-ui-action-provider.ts

@@ -54,8 +54,12 @@ export class BackendUIActionProvider extends UIActionProviderBase {
         if (resultData.length === 0) {
           resultData.push({});
         }
+        // srfactionparam只传选中数据的后台属性
+        const actionData = res.data.map(
+          item => item.getOrigin?.() || item || {},
+        );
         resultData.forEach(item => {
-          item.srfactionparam = res.data;
+          item.srfactionparam = actionData;
         });
       }
     }