@ibiz-template/runtime 0.5.0-beta.0 → 0.5.0-beta.1

package/out/service/vo/gantt-node-data/gantt-data-set-node-data.js

@@ -1,5 +1,5 @@
 import { TreeDataSetNodeData } from '../tree-node-data';
-import { calcDataItemValue, calcNodeDataItem } from './gantt-node-data-util';
+import { calcDataItemValue } from './gantt-node-data-util';
 export class GanttDataSetNodeData extends TreeDataSetNodeData {
     constructor(model, nodeModel, parentNodeData, opts) {
         super(nodeModel, parentNodeData, opts);
@@ -10,6 +10,5 @@ export class GanttDataSetNodeData extends TreeDataSetNodeData {
         this.prevDataItemValue = calcDataItemValue(model.prevDataItemName, nodeModel, data);
         this.finishDataItemValue = calcDataItemValue(model.finishDataItemName, nodeModel, data);
         this.totalDataItemValue = calcDataItemValue(model.totalDataItemName, nodeModel, data);
-        this.nodeDataItem = calcNodeDataItem(nodeModel, data);
     }
 }

package/out/service/vo/gantt-node-data/gantt-node-data-util.d.ts

@@ -6,11 +6,4 @@ import { IDETreeNode } from '@ibiz/model-core';
  * @returns
  */
 export declare const calcDataItemValue: (fieldCodeName: string | undefined, nodeModel: IDETreeNode, data?: IData) => string;
-/**
- * 计算数据项
- * @param nodeModel 节点模型
- * @param data 数据
- * @returns
- */
-export declare const calcNodeDataItem: (nodeModel: IDETreeNode, data: IData) => IData;
 //# sourceMappingURL=gantt-node-data-util.d.ts.map

package/out/service/vo/gantt-node-data/gantt-node-data-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gantt-node-data-util.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-node-data-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAuB,MAAM,kBAAkB,CAAC;AAEpE;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,kBACb,MAAM,GAAG,SAAS,aACtB,WAAW,SAChB,KAAK,KACV,MAaF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,cAChB,WAAW,QAChB,KAAK,KACV,KAUF,CAAC"}
+{"version":3,"file":"gantt-node-data-util.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-node-data-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAuB,MAAM,kBAAkB,CAAC;AAEpE;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,kBACb,MAAM,GAAG,SAAS,aACtB,WAAW,SAChB,KAAK,KACV,MAaF,CAAC"}

package/out/service/vo/gantt-node-data/gantt-node-data-util.js

@@ -17,21 +17,3 @@ export const calcDataItemValue = (fieldCodeName, nodeModel, data = {}) => {
     }
     return result;
 };
-/**
- * 计算数据项
- * @param nodeModel 节点模型
- * @param data 数据
- * @returns
- */
-export const calcNodeDataItem = (nodeModel, data) => {
-    var _a;
-    const dataItem = {};
-    (_a = nodeModel.detreeNodeDataItems) === null || _a === void 0 ? void 0 : _a.forEach(item => {
-        if (item.id && item.appDEFieldId) {
-            Object.assign(dataItem, {
-                [item.id.toLowerCase()]: data[item.appDEFieldId.toLowerCase()],
-            });
-        }
-    });
-    return dataItem;
-};

package/out/ui-action/provider/ui-action-provider-base.d.ts

@@ -18,6 +18,16 @@ export declare abstract class UIActionProviderBase implements IUIActionProvider
      * @return {*}  {Promise<IUIActionResult>}
      */
     exec(action: IAppDEUIAction, args: IUILogicParams): Promise<IUIActionResult>;
+    /**
+     * 根据界面行为逻辑返回值，合并参数获得后续逻辑要用的参数
+     * @author lxm
+     * @date 2023-12-25 02:42:23
+     * @protected
+     * @param {IUILogicParams} args 当前环境的参数
+     * @param {IUIActionResult} result 上一次逻辑执行的结果
+     * @return {*}  {IUILogicParams}
+     */
+    protected mergeArgsByResult(args: IUILogicParams, result: IUIActionResult): IUILogicParams;
     /**
      * 有错误和取消时对result做的处理
      * @author lxm

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

@@ -1 +1 @@
-{"version":3,"file":"ui-action-provider-base.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/ui-action-provider-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAgC,MAAM,kBAAkB,CAAC;AAChF,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,cAAc,EACf,MAAM,iBAAiB,CAAC;AAMzB;;;;;;;GAOG;AACH,8BAAsB,oBAAqB,YAAW,iBAAiB;IACrE;;;;;;;OAOG;IACG,IAAI,CACR,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAkE3B;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe;IAO/D;;;;;;;OAOG;IACG,SAAS,CACb,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,OAAO,CAAC;IAQnB;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CACjB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;OAWG;IACG,YAAY,CAChB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAOvC;;;;;;;;;;;;;;;;OAgBG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,EACb,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;QACT,aAAa,EAAE,QAAQ,CAAC;QACxB,UAAU,EAAE,KAAK,EAAE,CAAC;QACpB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;IAwFF;;;;;;;;;OASG;IACH,SAAS,CAAC,WAAW,CACnB,IAAI,EAAE,SAAS,GAAG,SAAS,EAC3B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,MAAM,GAAG,SAAS;CA2CtB"}
+{"version":3,"file":"ui-action-provider-base.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/ui-action-provider-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAgC,MAAM,kBAAkB,CAAC;AAChF,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,cAAc,EACf,MAAM,iBAAiB,CAAC;AAMzB;;;;;;;GAOG;AACH,8BAAsB,oBAAqB,YAAW,iBAAiB;IACrE;;;;;;;OAOG;IACG,IAAI,CACR,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAgE3B;;;;;;;;OAQG;IACH,SAAS,CAAC,iBAAiB,CACzB,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,eAAe,GACtB,cAAc;IASjB;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe;IAO/D;;;;;;;OAOG;IACG,SAAS,CACb,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,OAAO,CAAC;IAQnB;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CACjB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;OAWG;IACG,YAAY,CAChB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAOvC;;;;;;;;;;;;;;;;OAgBG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,EACb,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;QACT,aAAa,EAAE,QAAQ,CAAC;QACxB,UAAU,EAAE,KAAK,EAAE,CAAC;QACpB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;IAwFF;;;;;;;;;OASG;IACH,SAAS,CAAC,WAAW,CACnB,IAAI,EAAE,SAAS,GAAG,SAAS,EAC3B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,MAAM,GAAG,SAAS;CA2CtB"}

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

@@ -21,7 +21,6 @@ export class UIActionProviderBase {
      * @return {*}  {Promise<IUIActionResult>}
      */
     async exec(action, args) {
-        const { context, params, data } = args;
         const result = {
             refresh: action.reloadData,
             refreshMode: action.refreshMode,
@@ -47,8 +46,15 @@ export class UIActionProviderBase {
         if (result.cancel === true) {
             return this.returnError(result);
         }
+        // ** 界面行为执行之后，执行界面逻辑
+        if (action.uilogicAttachMode === 'AFTER') {
+            if (!appDEUILogicId) {
+                throw new RuntimeModelError(action, '没有配置实体界面逻辑');
+            }
+            await execUILogic(appDEUILogicId, appDataEntityId, this.mergeArgsByResult(args, result));
+        }
         // ** 后续界面行为
-        const nextActionParams = Object.assign(Object.assign({}, args), { context: result.nextContext || context, data: result.data || data, params: result.nextParams || params });
+        const nextActionParams = this.mergeArgsByResult(args, result);
         if (action.closeEditView) {
             // 关闭视图的情况下，不等待后续界面行为
             this.doNextAction(action, nextActionParams, action.appId);
@@ -62,15 +68,20 @@ export class UIActionProviderBase {
                 }
             }
         }
-        // ** 界面行为执行之后，执行界面逻辑
-        if (action.uilogicAttachMode === 'AFTER') {
-            if (!appDEUILogicId) {
-                throw new RuntimeModelError(action, '没有配置实体界面逻辑');
-            }
-            await execUILogic(appDEUILogicId, appDataEntityId, args);
-        }
         return result;
     }
+    /**
+     * 根据界面行为逻辑返回值，合并参数获得后续逻辑要用的参数
+     * @author lxm
+     * @date 2023-12-25 02:42:23
+     * @protected
+     * @param {IUILogicParams} args 当前环境的参数
+     * @param {IUIActionResult} result 上一次逻辑执行的结果
+     * @return {*}  {IUILogicParams}
+     */
+    mergeArgsByResult(args, result) {
+        return Object.assign(Object.assign({}, args), { context: result.nextContext || args.context, data: result.data || args.data, params: result.nextParams || args.params });
+    }
     /**
      * 有错误和取消时对result做的处理
      * @author lxm

package/out/utils/index.d.ts

@@ -1,7 +1,7 @@
 export { HandlebarsUtil } from './handlebars/handlebars';
 export { calcNavParams } from './nav-params/calc-nav-params';
 export * from './nav-params/nav-params';
-export { toLocalOpenWFRedirectView, openRedirectView, } from './open-redirect-view/open-redirect-view';
+export { toLocalOpenWFRedirectView, openRedirectView, getDERedirectToView, } from './open-redirect-view/open-redirect-view';
 export * from './verify';
 export { LayoutPanelUtil } from './layout-panel-util/layout-panel-util';
 export * from './wf-helper/wf-helper';

package/out/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,yCAAyC,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,yCAAyC,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC"}

package/out/utils/index.js

@@ -1,7 +1,7 @@
 export { HandlebarsUtil } from './handlebars/handlebars';
 export { calcNavParams } from './nav-params/calc-nav-params';
 export * from './nav-params/nav-params';
-export { toLocalOpenWFRedirectView, openRedirectView, } from './open-redirect-view/open-redirect-view';
+export { toLocalOpenWFRedirectView, openRedirectView, getDERedirectToView, } from './open-redirect-view/open-redirect-view';
 export * from './verify';
 export { LayoutPanelUtil } from './layout-panel-util/layout-panel-util';
 export * from './wf-helper/wf-helper';

package/out/utils/open-redirect-view/open-redirect-view.d.ts

@@ -1,5 +1,11 @@
 import { IAppDERedirectView, IAppDataEntity, IAppRedirectView } from '@ibiz/model-core';
 import { IModalData, IOpenViewOptions } from '../../interface';
+type ToViewParams = {
+    context: IContext;
+    params: IParams;
+    opts: IOpenViewOptions;
+    viewId: string;
+};
 /**
  * 打开重定向视图
  *
@@ -24,7 +30,24 @@ export declare function openRedirectView(appView: IAppRedirectView, context: ICo
  * @param {IContext} context
  * @param {string} linkUrl
  */
-export declare function toLocalOpenWFRedirectView(context: IContext, linkUrl: string, opts?: IOpenViewOptions): Promise<void>;
+export declare function toLocalOpenWFRedirectView(context: IContext, linkUrl: string, opts?: IOpenViewOptions): Promise<ToViewParams>;
+/**
+ * 获取处理后的重定向视图最终要跳转视图的相关信息
+ * @author lxm
+ * @date 2023-12-26 11:16:02
+ * @export
+ * @param {IAppDERedirectView} appView
+ * @param {IContext} context
+ * @param {IParams} [params={}]
+ * @param {IOpenViewOptions} [opts={}]
+ * @return {*}  {(Promise<({ type: 'view' } & ToViewParams) | { type: 'url'; url: string }>)}
+ */
+export declare function getDERedirectToView(appView: IAppDERedirectView, context: IContext, params?: IParams, opts?: IOpenViewOptions): Promise<({
+    type: 'view';
+} & ToViewParams) | {
+    type: 'url';
+    url: string;
+}>;
 /**
  * 打开实体重定向视图
  *
@@ -51,4 +74,5 @@ export declare function openDERedirectView(appView: IAppDERedirectView, context:
  * @return {*}  {Promise<string>}
  */
 export declare function calcDERdTag(entity: IAppDataEntity, rdView: IAppDERedirectView, params: IParams, data: IData): Promise<string>;
+export {};
 //# sourceMappingURL=open-redirect-view.d.ts.map

package/out/utils/open-redirect-view/open-redirect-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/utils/open-redirect-view/open-redirect-view.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAK/D;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAOrB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAoDf;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAwGrB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,MAAM,CAAC,CA4CjB"}
+{"version":3,"file":"open-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/utils/open-redirect-view/open-redirect-view.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAK/D,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,QAAQ,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,gBAAgB,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAOrB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,YAAY,CAAC,CAoDvB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,YAAY,CAAC,GAAG;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,CAsG3E;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC,CA+BrB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,MAAM,CAAC,CA6CjB"}

package/out/utils/open-redirect-view/open-redirect-view.js

@@ -65,21 +65,25 @@ export async function toLocalOpenWFRedirectView(context, linkUrl, opts = {}) {
         context.srfprocessinstanceid = params.srfprocessinstanceid;
         delete params.srfprocessinstanceid;
     }
-    await ibiz.commands.execute(OpenAppViewCommand.TAG, deRdView.id, context, params, opts);
+    return {
+        context,
+        params,
+        opts,
+        viewId: deRdView.id,
+    };
 }
 /**
- * 打开实体重定向视图
- *
- * @author chitanda
- * @date 2022-09-28 16:09:15
+ * 获取处理后的重定向视图最终要跳转视图的相关信息
+ * @author lxm
+ * @date 2023-12-26 11:16:02
  * @export
  * @param {IAppDERedirectView} appView
- * @param {IContext}
+ * @param {IContext} context
  * @param {IParams} [params={}]
- * @param {IData[]} [data=[]]
- * @return {*}  {Promise<IModalData>}
+ * @param {IOpenViewOptions} [opts={}]
+ * @return {*}  {(Promise<({ type: 'view' } & ToViewParams) | { type: 'url'; url: string }>)}
  */
-export async function openDERedirectView(appView, context, params = {}, opts = {}) {
+export async function getDERedirectToView(appView, context, params = {}, opts = {}) {
     var _a;
     // 计算重定向视图上下文参数转换
     const navContext = appView.appViewNavContexts || [];
@@ -116,20 +120,13 @@ export async function openDERedirectView(appView, context, params = {}, opts = {
                     linkUrl = linkUrl.slice(linkUrl.indexOf('appredirectview?'));
                 }
                 if (linkUrl.startsWith('http://') || linkUrl.startsWith('https://')) {
-                    return new Promise(resolve => {
-                        const newWindow = window.open(linkUrl, '_blank');
-                        if (newWindow) {
-                            newWindow.callback = () => {
-                                resolve({ ok: true, data: [] });
-                            };
-                        }
-                    });
+                    return { type: 'url', url: linkUrl };
                 }
                 if (linkUrl.startsWith('appredirectview?')) {
-                    await toLocalOpenWFRedirectView(context, linkUrl, opts);
-                    return { ok: true, data: [] };
+                    const toView = await toLocalOpenWFRedirectView(context, linkUrl, opts);
+                    return Object.assign({ type: 'view' }, toView);
                 }
-                return { ok: false, data: [] };
+                throw new RuntimeError(`未支持的linkUrl格式:${linkUrl}`);
             }
         }
     }
@@ -144,8 +141,14 @@ export async function openDERedirectView(appView, context, params = {}, opts = {
     // 拼接当前重定向视图所在应用实体名称为前缀
     const deRdTag = `${entity.name.toUpperCase()}:${rdTag}`;
     // 所有重定向引用视图
-    const allRefViews = appView.redirectAppViewRefs;
-    const refView = allRefViews === null || allRefViews === void 0 ? void 0 : allRefViews.find(view => {
+    const allRefViews = [];
+    if (appView.redirectAppViewRefs) {
+        allRefViews.push(...appView.redirectAppViewRefs);
+    }
+    if (appView.appViewRefs) {
+        allRefViews.push(...appView.appViewRefs);
+    }
+    const refView = allRefViews.find(view => {
         const matchKey = view.name || view.id;
         // 特殊补充 wfRdTag 匹配，子流程应用特殊模式
         return matchKey === deRdTag || matchKey === rdTag || matchKey === wfRdTag;
@@ -153,14 +156,15 @@ export async function openDERedirectView(appView, context, params = {}, opts = {
     if (refView) {
         const viewId = refView.refAppViewId;
         if (viewId) {
-            const result = await ibiz.commands.execute(OpenAppViewCommand.TAG, viewId, context, params, Object.assign(Object.assign({}, opts), { data: [curData] }));
-            if (result) {
-                return result;
-            }
-        }
-        else {
-            throw new RuntimeModelError(refView, `未配置实际引用视图`);
+            return {
+                type: 'view',
+                viewId,
+                context,
+                params,
+                opts: Object.assign(Object.assign({}, opts), { data: [curData] }),
+            };
         }
+        throw new RuntimeModelError(refView, `未配置实际引用视图`);
     }
     else {
         ibiz.log.error('重定向视图引用有：', allRefViews === null || allRefViews === void 0 ? void 0 : allRefViews.map(({ refAppViewId, name, realTitle }) => ({
@@ -170,7 +174,43 @@ export async function openDERedirectView(appView, context, params = {}, opts = {
         })));
         throw new RuntimeModelError(appView, `未找到重定向标识[${rdTag}]或[${deRdTag}]或工作流[${wfRdTag}]对应视图`);
     }
-    return { ok: true, data: [] };
+}
+/**
+ * 打开实体重定向视图
+ *
+ * @author chitanda
+ * @date 2022-09-28 16:09:15
+ * @export
+ * @param {IAppDERedirectView} appView
+ * @param {IContext}
+ * @param {IParams} [params={}]
+ * @param {IData[]} [data=[]]
+ * @return {*}  {Promise<IModalData>}
+ */
+export async function openDERedirectView(appView, context, params = {}, opts = {}) {
+    let toView;
+    try {
+        toView = await getDERedirectToView(appView, context, params, opts);
+    }
+    catch (error) {
+        ibiz.log.error(error);
+        return { ok: false, data: [] };
+    }
+    // 返回路径，则用window打开
+    if (toView.type === 'url') {
+        const openUrl = toView.url;
+        return new Promise(resolve => {
+            const newWindow = window.open(openUrl, '_blank');
+            if (newWindow) {
+                newWindow.callback = () => {
+                    resolve({ ok: true, data: [] });
+                };
+            }
+        });
+    }
+    // 返回视图相关信息，则打开视图
+    const result = await ibiz.commands.execute(OpenAppViewCommand.TAG, toView.viewId, toView.context, toView.params, toView.opts);
+    return result || { ok: true, data: [] };
 }
 /**
  * 计算重定向标识
@@ -193,7 +233,8 @@ export async function calcDERdTag(entity, rdView, params, data) {
         const { codeName } = findFieldById(entity, typeFieldId);
         const value = data[codeName.toLowerCase()];
         if (notNilEmpty(value)) {
-            return `${value}`;
+            // 因为平台发布出来的标识全都是大写，所以这里也全部转大写
+            return `${value.toUpperCase()}`;
         }
         ibiz.log.warn(`重定向视图[${rdView.name}]自定义类别属性[${typeFieldId}]值为空`, data);
     }

package/out/utils/ui-domain/ui-domain.d.ts

@@ -1,3 +1,4 @@
+import { IParentConfig } from '../../interface';
 /**
  * 界面域
  *
@@ -15,6 +16,15 @@ export declare class UIDomain {
      * @type {string}
      */
     readonly id: string;
+    /**
+     * DTO 父子关系映射
+     *
+     * @author chitanda
+     * @date 2023-12-26 15:12:13
+     * @protected
+     * @type {Map<string, IParentConfig[]>}
+     */
+    protected rsMap: Map<string, IParentConfig[]>;
     /**
      * Creates an instance of UIDomain.
      *
@@ -24,6 +34,24 @@ export declare class UIDomain {
      * @param {string} [id]
      */
     constructor(id?: string);
+    /**
+     * 设置当前界面域下，指定实体的相关父关系以及属性。在 DTO 包解析时设置此参数，销毁时清空
+     *
+     * @author chitanda
+     * @date 2023-12-26 15:12:31
+     * @param {string} entity
+     * @param {IParentConfig} config
+     */
+    setDERConfig(deCodeName: string, config: IParentConfig): void;
+    /**
+     * 获取当前界面域下，具体实体的关系(在数据加载完成之后才有值)
+     *
+     * @author chitanda
+     * @date 2023-12-26 16:12:07
+     * @param {string} deCodeName
+     * @return {*}  {IParentConfig[]}
+     */
+    getDERConfig(deCodeName: string): IParentConfig[];
     /**
      * 界面域销毁
      *

package/out/utils/ui-domain/ui-domain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-domain.d.ts","sourceRoot":"","sources":["../../../src/utils/ui-domain/ui-domain.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,qBAAa,QAAQ;IACnB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB;;;;;;;OAOG;gBACS,EAAE,CAAC,EAAE,MAAM;IAQvB;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAShB"}
+{"version":3,"file":"ui-domain.d.ts","sourceRoot":"","sources":["../../../src/utils/ui-domain/ui-domain.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,QAAQ;IACnB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAa;IAE1D;;;;;;;OAOG;gBACS,EAAE,CAAC,EAAE,MAAM;IAQvB;;;;;;;OAOG;IACH,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI;IAQ7D;;;;;;;OAOG;IACH,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,EAAE;IAOjD;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAWhB"}

package/out/utils/ui-domain/ui-domain.js

@@ -17,6 +17,15 @@ export class UIDomain {
      * @param {string} [id]
      */
     constructor(id) {
+        /**
+         * DTO 父子关系映射
+         *
+         * @author chitanda
+         * @date 2023-12-26 15:12:13
+         * @protected
+         * @type {Map<string, IParentConfig[]>}
+         */
+        this.rsMap = new Map();
         if (id) {
             this.id = id;
         }
@@ -24,6 +33,35 @@ export class UIDomain {
             this.id = createUUID();
         }
     }
+    /**
+     * 设置当前界面域下，指定实体的相关父关系以及属性。在 DTO 包解析时设置此参数，销毁时清空
+     *
+     * @author chitanda
+     * @date 2023-12-26 15:12:31
+     * @param {string} entity
+     * @param {IParentConfig} config
+     */
+    setDERConfig(deCodeName, config) {
+        if (!this.rsMap.has(deCodeName)) {
+            this.rsMap.set(deCodeName, []);
+        }
+        const arr = this.rsMap.get(deCodeName);
+        arr.push(config);
+    }
+    /**
+     * 获取当前界面域下，具体实体的关系(在数据加载完成之后才有值)
+     *
+     * @author chitanda
+     * @date 2023-12-26 16:12:07
+     * @param {string} deCodeName
+     * @return {*}  {IParentConfig[]}
+     */
+    getDERConfig(deCodeName) {
+        if (this.rsMap.has(deCodeName)) {
+            return this.rsMap.get(deCodeName);
+        }
+        return [];
+    }
     /**
      * 界面域销毁
      *
@@ -31,6 +69,8 @@ export class UIDomain {
      * @date 2023-12-22 15:12:49
      */
     destroy() {
+        // 清空当前域下的父子关系映射
+        this.rsMap.clear();
         const apps = ibiz.hub.getAllApps();
         apps.forEach(app => {
             app.deService.reset({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.5.0-beta.0",
+  "version": "0.5.0-beta.1",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -30,7 +30,7 @@
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/core": "^0.5.0-beta.0",
-    "@ibiz/model-core": "^0.0.28",
+    "@ibiz/model-core": "^0.0.29",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.10",
     "@types/systemjs": "^6.13.5",
@@ -46,8 +46,8 @@
     "ramda": "^0.29.1"
   },
   "peerDependencies": {
-    "@ibiz-template/core": "^0.4.0",
-    "@ibiz/model-core": "^0.0.28",
+    "@ibiz-template/core": "^0.5.0-beta.0",
+    "@ibiz/model-core": "^0.0.29",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "06600ef120d5aaca67336eb6afdf5281195d507a"
+  "gitHead": "30a5699d02d89a2755a595888a5f94c384f3b5fb"
 }

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

@@ -6,6 +6,7 @@ import {
   IMDControlController,
   IMDControlEvent,
   IMDControlState,
+  IToolbarController,
   MDCtrlLoadParams,
   MDCtrlRemoveParams,
 } from '../../../interface';
@@ -89,6 +90,38 @@ export class MDControlController<
    */
   protected dataEntity!: IAppDataEntity;
 
+  /**
+   * 批操作工具栏
+   *
+   * @author zk
+   * @date 2023-08-02 06:08:34
+   * @readonly
+   * @type {(IToolbarController | undefined)}
+   * @memberof ListController
+   */
+  protected get batchToolbarController(): IToolbarController | undefined {
+    const controller = this.view.getController(
+      `${this.model.name!}_batchtoolbar`,
+    );
+    return controller as IToolbarController;
+  }
+
+  /**
+   * 快速工具栏
+   *
+   * @author zk
+   * @date 2023-08-02 06:08:34
+   * @readonly
+   * @type {(IToolbarController | undefined)}
+   * @memberof ListController
+   */
+  protected get quickToolbarController(): IToolbarController | undefined {
+    const controller = this.view.getController(
+      `${this.model.name!}_quicktoolbar`,
+    );
+    return controller as IToolbarController;
+  }
+
   protected async onCreated(): Promise<void> {
     await super.onCreated();
 
@@ -406,6 +439,16 @@ export class MDControlController<
         data: selection,
       });
     }
+    // 根据数据计算工具栏权限和状态
+    const data = selection?.[0];
+    this.batchToolbarController?.calcButtonState(
+      data,
+      this.model.appDataEntityId,
+    );
+    this.quickToolbarController?.calcButtonState(
+      data,
+      this.model.appDataEntityId,
+    );
   }
 
   /**