@ibiz-template/runtime 0.4.17-dev.1 → 0.5.0-beta.1

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.4.17-dev.1",
+  "version": "0.5.0-beta.1",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,8 +29,8 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.4.17-dev.1",
-    "@ibiz/model-core": "^0.0.28",
+    "@ibiz-template/core": "^0.5.0-beta.0",
+    "@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": "aabc8a7a92e6715602b803977fd9d2516955d902"
+  "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();
 
@@ -213,7 +246,10 @@ export class MDControlController<
     if (this.state.isSimple) {
       return [];
     }
-    await this.startLoading();
+    const silent = args.silent === true;
+    if (!silent) {
+      await this.startLoading();
+    }
     try {
       // *初始加载需要重置分页
       const isInitialLoad = args.isInitialLoad === true;
@@ -253,7 +289,9 @@ export class MDControlController<
       });
       throw error;
     } finally {
-      await this.endLoading();
+      if (!silent) {
+        await this.endLoading();
+      }
     }
 
     this.state.items.forEach((item, index) => {
@@ -401,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,
+    );
   }
 
   /**

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

@@ -297,15 +297,11 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
   protected calcDynaClass(data: IData): void {
     if (this.model.dynaClass) {
       const dynaClass = calcDynaClass(this.model.dynaClass, data);
-      if (dynaClass.length) {
-        this.state.class.containerDyna = dynaClass;
-      }
+      this.state.class.containerDyna = dynaClass;
     }
     if (this.model.labelDynaClass) {
       const dynaClass = calcDynaClass(this.model.labelDynaClass, data);
-      if (dynaClass.length) {
-        this.state.class.labelDyna = dynaClass;
-      }
+      this.state.class.labelDyna = dynaClass;
     }
   }