@ibiz-template/runtime 0.2.12 → 0.2.15

package/out/interface/controller/controller/control/i-medit-view-panel.controller.d.ts

@@ -10,5 +10,11 @@ import { IMDControlController } from './i-md-control.controller';
  * @extends {IMDControlController<IDEMultiEditViewPanel, IMEditViewPanelState, IMEditViewPanelEvent>}
  */
 export interface IMEditViewPanelController<T extends IDEMultiEditViewPanel = IDEMultiEditViewPanel, S extends IMEditViewPanelState = IMEditViewPanelState, E extends IMEditViewPanelEvent = IMEditViewPanelEvent> extends IMDControlController<T, S, E> {
+    /**
+     * 处理添加
+     *
+     * @memberof IMEditViewPanelController
+     */
+    handleAdd(): Promise<void>;
 }
 //# sourceMappingURL=i-medit-view-panel.controller.d.ts.map

package/out/interface/controller/controller/control/i-medit-view-panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-medit-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-medit-view-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;GAMG;AACH,MAAM,WAAW,yBAAyB,CACxC,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,EACvD,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EACrD,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,CACrD,SAAQ,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;CAAG"}
+{"version":3,"file":"i-medit-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-medit-view-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;GAMG;AACH,MAAM,WAAW,yBAAyB,CACxC,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,EACvD,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EACrD,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,CACrD,SAAQ,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACrC;;;;OAIG;IACH,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B"}

package/out/interface/controller/controller/control/i-tree.controller.d.ts

@@ -45,5 +45,13 @@ export interface ITreeController extends IMDControlController<IDETree, ITreeStat
      * @return {*}  {Promise<void>}
      */
     refreshNodeChildren(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>;
 }
 //# sourceMappingURL=i-tree.controller.d.ts.map

package/out/interface/controller/controller/control/i-tree.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-tree.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-tree.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;GAOG;AACH,MAAM,WAAW,eACf,SAAQ,oBAAoB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC;IAC7D;;;;;;OAMG;IACH,eAAe,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD;;;;;OAKG;IACH,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1D;;;;;;;;OAQG;IACH,UAAU,CACR,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB;;;;;;;OAOG;IACH,mBAAmB,CACjB,QAAQ,EAAE,aAAa,GAAG,KAAK,EAC/B,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB"}
+{"version":3,"file":"i-tree.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-tree.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;GAOG;AACH,MAAM,WAAW,eACf,SAAQ,oBAAoB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC;IAC7D;;;;;;OAMG;IACH,eAAe,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD;;;;;OAKG;IACH,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1D;;;;;;;;OAQG;IACH,UAAU,CACR,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB;;;;;;;OAOG;IACH,mBAAmB,CACjB,QAAQ,EAAE,aAAa,GAAG,KAAK,EAC/B,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB;;;;;;OAMG;IACH,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxD"}

package/out/interface/controller/state/control/i-medit-view-panel.state.d.ts

@@ -25,5 +25,10 @@ export interface IMEditViewPanelState extends IMDControlState {
      *
      */
     activeTab: string;
+    /**
+     * 是否需要滚动
+     *
+     */
+    isNeedScroll: boolean;
 }
 //# sourceMappingURL=i-medit-view-panel.state.d.ts.map

package/out/interface/controller/state/control/i-medit-view-panel.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-medit-view-panel.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-medit-view-panel.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,YAAY;IAE3B,EAAE,EAAE,MAAM,CAAC;IAEX,OAAO,EAAE,KAAK,CAAC;IAEf,MAAM,EAAE,KAAK,CAAC;IAEd,IAAI,EAAE,SAAS,CAAC;IAEhB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D;;;OAGG;IACH,YAAY,EAAE,YAAY,EAAE,CAAC;IAE7B;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB"}
+{"version":3,"file":"i-medit-view-panel.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-medit-view-panel.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,YAAY;IAE3B,EAAE,EAAE,MAAM,CAAC;IAEX,OAAO,EAAE,KAAK,CAAC;IAEf,MAAM,EAAE,KAAK,CAAC;IAEd,IAAI,EAAE,SAAS,CAAC;IAEhB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D;;;OAGG;IACH,YAAY,EAAE,YAAY,EAAE,CAAC;IAE7B;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,YAAY,EAAE,OAAO,CAAC;CACvB"}

package/out/interface/controller/state/control/i-tree.state.d.ts

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

package/out/interface/controller/state/control/i-tree.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-tree.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-tree.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;;GAOG;AACH,MAAM,WAAW,UAAW,SAAQ,eAAe;IACjD,KAAK,EAAE,aAAa,EAAE,CAAC;IAEvB;;;;;OAKG;IACH,SAAS,EAAE,aAAa,EAAE,CAAC;IAE3B;;;;;;;OAOG;IACH,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAE9B;;;;;OAKG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;;OAMG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,IAAI,EAAE,OAAO,CAAC;IAEd;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC;IAE3B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,aAAa,CAAC;IAEvB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC;IAEf;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CAGnB"}
+{"version":3,"file":"i-tree.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-tree.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;;GAOG;AACH,MAAM,WAAW,UAAW,SAAQ,eAAe;IACjD,KAAK,EAAE,aAAa,EAAE,CAAC;IAEvB;;;;;OAKG;IACH,SAAS,EAAE,aAAa,EAAE,CAAC;IAE3B;;;;;;;OAOG;IACH,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAE9B;;;;;OAKG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;IAEvB;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAC;CACvB;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;;OAMG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,IAAI,EAAE,OAAO,CAAC;IAEd;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC;IAE3B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,aAAa,CAAC;IAEvB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC;IAEf;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CAGnB"}

package/out/logic-scheduler/executor/app-ui-action-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-ui-action-executor.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/executor/app-ui-action-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,qBAAsB,SAAQ,aAAa;IAC9C,IAAI,EAAE,eAAe,CAAC;IAG9B,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,GAAG;CAG5C"}
+{"version":3,"file":"app-ui-action-executor.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/executor/app-ui-action-executor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,qBAAsB,SAAQ,aAAa;IAC9C,IAAI,EAAE,eAAe,CAAC;IAG9B,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,GAAG;CAS5C"}

package/out/logic-scheduler/executor/app-ui-action-executor.js

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

package/out/service/service/entity/util/util.d.ts

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

package/out/service/service/entity/util/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/util/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE7E;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAKzD"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/util/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE7E;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAKzD"}

package/out/service/service/entity/util/util.js

@@ -1,6 +1,7 @@
 /**
  * 是否为本地模式
  *
+ * @description 行为类型: 内置方法、数据集类型: 数据查询，才是本地模式
  * @author chitanda
  * @date 2023-09-06 16:09:06
  * @export

package/out/service/service/work-flow/work-flow.service.d.ts

@@ -47,6 +47,17 @@ export declare class WorkFlowService implements IWorkFlowService {
      * @memberof WorkFlowService
      */
     private getActiveData;
+    /**
+     * 获取工作流实例标记
+     *
+     * @author zk
+     * @date 2023-11-06 06:11:07
+     * @private
+     * @param {IParams} context
+     * @return {*}  {string}
+     * @memberof WorkFlowService
+     */
+    private getWFInstanceTag;
     /**
      * 根据当前步骤和任务获取工作流步骤数据（如：流程表单等）
      *

package/out/service/service/work-flow/work-flow.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"work-flow.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/work-flow/work-flow.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"work-flow.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/work-flow/work-flow.service.ts"],"names":[],"mappings":"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"}

package/out/service/service/work-flow/work-flow.service.js

@@ -55,6 +55,19 @@ export class WorkFlowService {
         }
         return data;
     }
+    /**
+     * 获取工作流实例标记
+     *
+     * @author zk
+     * @date 2023-11-06 06:11:07
+     * @private
+     * @param {IParams} context
+     * @return {*}  {string}
+     * @memberof WorkFlowService
+     */
+    getWFInstanceTag(context) {
+        return context.srfprocessinstanceid || 'alls';
+    }
     /**
      * 根据当前步骤和任务获取工作流步骤数据（如：流程表单等）
      *
@@ -91,7 +104,7 @@ export class WorkFlowService {
      */
     async getWFHistory(context) {
         const deKeyValue = context[this.model.codeName.toLowerCase()];
-        return this.app.net.get(`${this.getBaseUrl()}/${deKeyValue}/process-instances/alls/history`);
+        return this.app.net.get(`${this.getBaseUrl()}/${deKeyValue}/process-instances/${this.getWFInstanceTag(context)}/history`);
     }
     /**
      * 根据业务主键获取工作流流程图片
@@ -103,7 +116,7 @@ export class WorkFlowService {
      */
     async getWFProcessDiagram(context) {
         const deKeyValue = context[this.model.codeName.toLowerCase()];
-        return this.app.net.request(`${this.getBaseUrl()}/${deKeyValue}/process-instances/alls/processdiagram`, {
+        return this.app.net.request(`${this.getBaseUrl()}/${deKeyValue}/process-instances/${this.getWFInstanceTag(context)}/processdiagram`, {
             method: 'post',
             data: {},
             responseType: 'blob',

package/out/service/vo/control.vo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control.vo.d.ts","sourceRoot":"","sources":["../../../src/service/vo/control.vo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAa5C;;;;;;;GAOG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;;OAOG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;OAOG;IACK,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE5C;;;;;;OAMG;IACK,KAAK,EAAE,KAAK,CAAC;IAErB;;;;;;OAMG;IACK,MAAM,CAAC,EAAE,MAAM,CAAC;IAExB;;;;;;OAMG;IACK,UAAU,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACK,YAAY,CAAC,EAAE,MAAM,CAAC;IAE9B;;;;;;OAMG;IACK,OAAO,EAAE,MAAM,CAAC;IAExB;;;;;;OAMG;IACK,aAAa,EAAE,MAAM,CAAC;IAE9B;;;;;;OAMG;IACK,WAAW,EAAE,MAAM,CAAC;IAE5B;;;;;;OAMG;IACK,aAAa,EAAE,MAAM,CAAC;IAE9B;;;;;;OAMG;gBAED,OAAO,GAAE,KAAU,EACnB,UAAU,GAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAa;IAkHjD;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,YAAY;IAqCpB;;;;;;OAMG;IACH,SAAS,IAAI,KAAK;IAIlB;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAIxC;;;;;;OAMG;IACH,KAAK,IAAI,SAAS;CAQnB"}
+{"version":3,"file":"control.vo.d.ts","sourceRoot":"","sources":["../../../src/service/vo/control.vo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAa5C;;;;;;;GAOG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;;OAOG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;OAOG;IACK,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE5C;;;;;;OAMG;IACK,KAAK,EAAE,KAAK,CAAC;IAErB;;;;;;OAMG;IACK,MAAM,CAAC,EAAE,MAAM,CAAC;IAExB;;;;;;OAMG;IACK,UAAU,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACK,YAAY,CAAC,EAAE,MAAM,CAAC;IAE9B;;;;;;OAMG;IACK,OAAO,EAAE,MAAM,CAAC;IAExB;;;;;;OAMG;IACK,aAAa,EAAE,MAAM,CAAC;IAE9B;;;;;;OAMG;IACK,WAAW,EAAE,MAAM,CAAC;IAE5B;;;;;;OAMG;IACK,aAAa,EAAE,MAAM,CAAC;IAE9B;;;;;;OAMG;gBAED,OAAO,GAAE,KAAU,EACnB,UAAU,GAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAa;IA8HjD;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,YAAY;IAqCpB;;;;;;OAMG;IACH,SAAS,IAAI,KAAK;IAIlB;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAIxC;;;;;;OAMG;IACH,KAAK,IAAI,SAAS;CAQnB"}

package/out/service/vo/control.vo.js

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

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

@@ -13,7 +13,6 @@ export declare class TreeCodeListNodeData extends TreeNodeData implements ITreeN
     text: string;
     id: string;
     value: string;
-    deData: CodeListItem;
     constructor(model: IDETreeDataSetNode, parentNodeData: ITreeNodeData | undefined, opts: {
         data: CodeListItem;
         leaf: boolean;

package/out/service/vo/tree-node-data/tree-code-list-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-code-list-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-code-list-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,oBACX,SAAQ,YACR,YAAW,aAAa;IAExB,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,EAAE,MAAM,CAAC;IAEd,MAAM,EAAE,YAAY,CAAC;gBAGnB,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY,CAAC;QACnB,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;CA0BJ"}
+{"version":3,"file":"tree-code-list-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-code-list-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,oBACX,SAAQ,YACR,YAAW,aAAa;IAExB,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,EAAE,MAAM,CAAC;gBAGZ,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY,CAAC;QACnB,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;CAyBJ"}

package/out/service/vo/tree-node-data/tree-code-list-node-data.js

@@ -12,7 +12,6 @@ export class TreeCodeListNodeData extends TreeNodeData {
     constructor(model, parentNodeData, opts) {
         super(model, parentNodeData, opts);
         const { data } = opts;
-        this.deData = data;
         this.text = data.text;
         this.value = data.value;
         this.id = parentNodeData

package/out/ui-action/provider/backend-ui-action-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backend-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/backend-ui-action-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,uBAAwB,SAAQ,oBAAoB;IACzD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAyE5B"}
+{"version":3,"file":"backend-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/backend-ui-action-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,uBAAwB,SAAQ,oBAAoB;IACzD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CA6E5B"}

package/out/ui-action/provider/backend-ui-action-provider.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.2.12",
+  "version": "0.2.15",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,11 +29,11 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.2.6",
+    "@ibiz-template/core": "^0.2.15",
     "@ibiz/model-core": "^0.0.20",
-    "@types/path-browserify": "^1.0.0",
-    "@types/qs": "^6.9.8",
-    "@types/systemjs": "^6.13.3",
+    "@types/path-browserify": "^1.0.2",
+    "@types/qs": "^6.9.10",
+    "@types/systemjs": "^6.13.5",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.10",
     "echarts": "^5.4.3",
@@ -46,7 +46,7 @@
     "ramda": "^0.29.1"
   },
   "peerDependencies": {
-    "@ibiz-template/core": "^0.1.0",
+    "@ibiz-template/core": "^0.2.13",
     "@ibiz/model-core": "^0.0.20",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
@@ -58,6 +58,5 @@
     "qs": "^6.11.0",
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
-  },
-  "gitHead": "ec31792dd33f5df963d1dbaadcae589182da96c0"
+  }
 }

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

@@ -318,7 +318,7 @@ export class MDControlController<
       }
 
       // 刷新数据，补全这一页缺少的数据
-      if (needRefresh) {
+      if (needRefresh && !args?.notRefresh) {
         await this.refresh();
       }
     } catch (error) {

package/src/controller/common/view/view.controller.ts

@@ -464,6 +464,12 @@ export class ViewController<
       title: message.title!,
       desc: message.message,
     };
+    // userTag为确认按钮文本
+    if (message.extraParams.userTag) {
+      Object.assign(modalParams, {
+        confirmButtonText: message.extraParams.userTag,
+      });
+    }
     if (message.messageType === 'WARN') {
       await ibiz.modal.warning(modalParams);
     } else if (message.messageType === 'ERROR') {

package/src/controller/control/calendar/calendar.controller.ts

@@ -106,8 +106,8 @@ export class CalendarController
    */
   protected getCurSelectDate(param: IParams): IData {
     const { selectedDate } = this.state;
-    const { start, end } = param;
-    if (!start || !end) {
+    const { srfstartdate, srfenddate } = param;
+    if (!srfstartdate || !srfenddate) {
       // 获取当前月份的第一天
       const firstDayOfMonth = new Date(
         selectedDate.getFullYear(),
@@ -121,11 +121,11 @@ export class CalendarController
         1,
       );
       return {
-        start: dayjs(firstDayOfMonth).format('YYYY-MM-DD HH:mm:ss'),
-        end: dayjs(lastDayOfMonth).format('YYYY-MM-DD HH:mm:ss'),
+        srfstartdate: dayjs(firstDayOfMonth).format('YYYY-MM-DD HH:mm:ss'),
+        srfenddate: dayjs(lastDayOfMonth).format('YYYY-MM-DD HH:mm:ss'),
       };
     }
-    return { start, end };
+    return { srfstartdate, srfenddate };
   }
 
   /**

package/src/controller/control/chart/generator/base-series-generator.ts

@@ -1,4 +1,4 @@
-import { RuntimeModelError, toNumberOrNil } from '@ibiz-template/core';
+import { plus, RuntimeModelError, toNumberOrNil } from '@ibiz-template/core';
 import {
   IChartSeriesCSCartesian2DEncode,
   IDEChartSeries,
@@ -282,7 +282,10 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
         groupData[group].set(catalog, { value: 0 });
       }
       // 相同分类属性的值属性数据累加
-      groupData[group].get(catalog)!.value += item[this.valueField];
+      groupData[group].get(catalog)!.value = plus(
+        groupData[group].get(catalog)!.value,
+        item[this.valueField],
+      );
       groupData[group].get(catalog)!.deData = item;
     });
 

package/src/controller/control/exp-bar/calendar-exp-bar.controller.ts

@@ -60,12 +60,12 @@ export class CalendarExpBarController
     return controller as ICalendarController;
   }
 
-  public defaultNavBySrfnav(): void {
+  public navBySrfnav(): void {
     const selectItem: ICalendarItemData | undefined =
       this.xDataController?.state.items.find(
         item => item.navId === this.state.srfnav,
       );
-    super.defaultNavBySrfnav();
+    super.navBySrfnav();
     if (!selectItem) {
       return;
     }

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

@@ -22,7 +22,7 @@ import {
 import { calcDeCodeNameById } from '../../../model';
 import { calcNavParams } from '../../../utils';
 import { ControlController } from '../../common';
-import { ControllerEvent } from '../../utils';
+import { ControllerEvent, hasSubRoute } from '../../utils';
 
 type XDataControlModel = IDEGrid | IDEList | IDEDataView;
 
@@ -229,7 +229,7 @@ export class ExpBarControlController<
         this.xDataLoadSuccess(event);
       });
       this.xDataController.evt.on('onRemoveSuccess', () => {
-        this.defaultNavByFirstItem();
+        this.navByFirstItem();
       });
     }
 
@@ -261,10 +261,10 @@ export class ExpBarControlController<
       // 只处理默认第一次加载
       if (this.state.srfnav && this.routeDepth) {
         // 路由srfnav回显
-        this.defaultNavBySrfnav();
+        this.navBySrfnav();
       } else {
         // 默认选中第一条并导航
-        this.defaultNavByFirstItem();
+        this.navByFirstItem();
       }
     }
   }
@@ -275,17 +275,14 @@ export class ExpBarControlController<
    * @date 2023-08-10 04:04:08
    * @protected
    */
-  protected defaultNavBySrfnav(): void {
+  protected navBySrfnav(): void {
     // 找到选中项，如果没有就模拟选中数据
     const selectItem = this.xDataController?.state.items.find(
       item => item[this.navKeyName] === this.state.srfnav,
     );
 
     // 是否是路由模式且有子路由
-    const routeAndHasSub =
-      this.routeDepth &&
-      window.location.hash.split('/').length > this.routeDepth * 2 + 2;
-
+    const routeAndHasSub = this.routeDepth && hasSubRoute(this.routeDepth);
     if (routeAndHasSub) {
       if (selectItem) {
         // 在多数据部件里面选项设置回显。
@@ -300,10 +297,23 @@ export class ExpBarControlController<
         },
         context: this.context,
       });
-    } else if (selectItem) {
+      return;
+    }
+
+    if (selectItem) {
       // 非路由模式,或者有路由模式下有srfnav没有子路由时，需要在多数据部件里面选项设置回显。
       this.xDataController.setActive(selectItem);
       this.xDataController.setSelection([selectItem]);
+    } else {
+      // 找不到匹配的选中项的情况，告诉导航占位显示404
+      this._evt.emit('onNavViewChange', {
+        navViewMsg: {
+          key: this.state.srfnav,
+          is404: true,
+          isCache: this.isCache,
+        },
+        context: this.context,
+      });
     }
   }
 
@@ -315,7 +325,7 @@ export class ExpBarControlController<
    * @date 2023-08-10 03:58:15
    * @protected
    */
-  protected defaultNavByFirstItem(): void {
+  protected navByFirstItem(): void {
     const data = this.xDataController.state.items[0];
     if (!data) {
       // 导航视图传空让他导航占位绘制空界面
@@ -323,7 +333,6 @@ export class ExpBarControlController<
       this._evt.emit('onNavViewChange', {
         navViewMsg: {
           key: '',
-          isRoutePushed: true,
           isCache: this.isCache,
         },
       });
@@ -476,10 +485,10 @@ export class ExpBarControlController<
    * @date 2023-09-14 07:03:39
    * @param {{ srfnav?: string; path: string }} info 当前系统的路由的从一级到最后一级的所有路径。
    */
-  onRouterChange(info: { srfnav: string; path: string }): void {
+  async onRouterChange(info: { srfnav: string; path: string }): Promise<void> {
     if (this.state.srfnav !== info.srfnav) {
       this.state.srfnav = info.srfnav;
-      this.defaultNavBySrfnav();
+      this.navBySrfnav();
     }
   }
 }

package/src/controller/control/exp-bar/tree-exp-bar.controller.ts

@@ -128,7 +128,7 @@ export class TreeExpBarController
     };
   }
 
-  protected defaultNavByFirstItem(): void {
+  protected navByFirstItem(): void {
     const data = this.xDataController.state.items.find(node => {
       // 根节点不显示的时候排除根节点
       if (
@@ -165,16 +165,35 @@ export class TreeExpBarController
 
     // 计算树的默认展开集合
     if (this.state.srfnav) {
-      const expandedKeys: string[] = [];
-      this.state.srfnav.split(':').forEach((item, index) => {
-        if (index === 0) {
-          expandedKeys.push(item);
-        } else {
-          expandedKeys.push(`${expandedKeys[index - 1]}:${item}`);
-        }
-      });
-      expandedKeys.pop(); // 删除最后一个
-      this.defaultExpandedKeys = expandedKeys;
+      this.defaultExpandedKeys = this.calcExpandKeys(this.state.srfnav);
+    }
+  }
+
+  /**
+   * 根据srfnav计算需要展开的节点标识
+   * @author lxm
+   * @date 2023-11-07 02:42:45
+   * @param {string} srfnav
+   * @return {*}  {string[]}
+   */
+  calcExpandKeys(srfnav: string): string[] {
+    const expandedKeys: string[] = [];
+    srfnav.split(':').forEach((item, index) => {
+      if (index === 0) {
+        expandedKeys.push(item);
+      } else {
+        expandedKeys.push(`${expandedKeys[index - 1]}:${item}`);
+      }
+    });
+    expandedKeys.pop(); // 删除最后一个
+    return expandedKeys;
+  }
+
+  async onRouterChange(info: { srfnav: string; path: string }): Promise<void> {
+    if (this.state.srfnav !== info.srfnav) {
+      const expandKeys = this.calcExpandKeys(info.srfnav);
+      await this.xDataController.expandNodeByKey(expandKeys);
     }
+    await super.onRouterChange(info);
   }
 }

package/src/controller/control/form/edit-form/edit-form.controller.ts

@@ -232,6 +232,7 @@ export class EditFormController
    * @date 2022-08-31 22:08:40
    */
   async save(args?: IDataAbilityParams): Promise<IData> {
+    const silent = args?.silent === true;
     // 如果数据正在处理中，则延迟保存
     if (this.state.processing) {
       const data = await awaitTimeout(500, this.save.bind(this));
@@ -242,7 +243,10 @@ export class EditFormController
     if (!isValid) {
       throw new RuntimeError('请检查表单填写！');
     }
-    await this.startLoading();
+
+    if (!silent) {
+      await this.startLoading();
+    }
     await this.evt.emit('onBeforeSave', undefined);
 
     const { context, data } = this.handlerAbilityParams(args);
@@ -261,7 +265,9 @@ export class EditFormController
       });
       throw error;
     } finally {
-      await this.endLoading();
+      if (!silent) {
+        await this.endLoading();
+      }
     }
 
     // 保存结束后合并修改临时主键
@@ -272,9 +278,11 @@ export class EditFormController
     this.state.modified = false;
     await this.evt.emit('onSaveSuccess', undefined);
     this.formStateNotify(FormNotifyState.SAVE);
-    this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}SUCCESS`, {
-      default: `${this.data.srfmajortext || ''}保存成功`,
-    });
+    if (!silent) {
+      this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}SUCCESS`, {
+        default: `${this.data.srfmajortext || ''}保存成功`,
+      });
+    }
     if (this.view.modal.mode === 'ROUTE') {
       ibiz.mc.command.send(
         this.data.$origin,
@@ -342,7 +350,7 @@ export class EditFormController
    * @date 2022-09-01 09:09:36
    * @returns {*}
    */
-  async goBack(): Promise<void> {
+  async goBack(): Promise<IData> {
     await this.startLoading();
     let res;
     try {
@@ -354,6 +362,7 @@ export class EditFormController
     if (res.data) {
       mergeInLeft(this.data, res.data);
     }
+    return this.data;
   }
 
   /**
@@ -493,7 +502,7 @@ export class EditFormController
     if (this.model.enableAutoSave) {
       // 自动保存静默，报错直接控制台输出
       try {
-        await this.save();
+        await this.save({ silent: true });
       } catch (error) {
         ibiz.log.error(error);
       }

package/src/controller/control/grid/grid/grid.controller.ts

@@ -500,7 +500,6 @@ export class GridController
     if (!isValid) {
       throw new RuntimeError('行数据校验不通过，保存取消');
     }
-    await this.startLoading();
     let res;
     const deName = calcDeCodeNameById(this.model.appDataEntityId!);
     const tempContext = this.context.clone();
@@ -516,8 +515,6 @@ export class GridController
         data: rowState.data,
       });
       throw error;
-    } finally {
-      await this.endLoading();
     }
     // 后续处理
     const index = this.findRowStateIndex(data);