@ibiz-template/runtime 0.1.1 → 0.1.3

package/out/controller/common/control/md-control.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;GASG;AACH,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAE7C,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAExC;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAe3B;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAIjD;;;;;;OAMG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA6B7D;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IA2CzD;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIzE;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0CtD;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAQ9B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrC,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5C;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9C;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBjC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAkC9D"}
+{"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;GASG;AACH,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAE7C,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAExC;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAgB3B;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAIjD;;;;;;OAMG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA6B7D;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAyCzD;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIzE;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0CtD;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAQ9B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrC,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5C;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9C;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBjC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAkC9D"}

package/out/controller/common/control/md-control.controller.js

@@ -30,6 +30,7 @@ export class MDControlController extends ControlController {
         this.state.isLoaded = false;
         this.state.singleSelect = true;
         this.state.mdctrlActiveMode = 0;
+        this.state.groups = [];
     }
     /**
      * 设置排序
@@ -78,42 +79,40 @@ export class MDControlController extends ControlController {
      * @date 2022-08-19 14:08:50
      */
     async load(args = {}) {
-        // *初始加载需要重置分页
-        const isInitialLoad = args.isInitialLoad === true;
-        const isLoadMore = args.isLoadMore === true;
-        if (isInitialLoad) {
-            this.state.curPage = 1;
-        }
-        else if (isLoadMore) {
-            this.state.curPage += 1;
-        }
-        // *查询参数处理
-        const { context } = this.handlerAbilityParams(args);
-        const params = await this.getFetchParams(args === null || args === void 0 ? void 0 : args.params);
-        // *发起请求
         await this.startLoading();
-        let res;
         try {
-            res = await this.service.fetch(context, params);
+            // *初始加载需要重置分页
+            const isInitialLoad = args.isInitialLoad === true;
+            const isLoadMore = args.isLoadMore === true;
+            if (isInitialLoad) {
+                this.state.curPage = 1;
+            }
+            else if (isLoadMore) {
+                this.state.curPage += 1;
+            }
+            // *查询参数处理
+            const { context } = this.handlerAbilityParams(args);
+            const params = await this.getFetchParams(args === null || args === void 0 ? void 0 : args.params);
+            const res = await this.service.fetch(context, params);
             // 更新分页数据总条数
             if (typeof res.total === 'number') {
                 this.state.total = res.total;
             }
+            if (isLoadMore) {
+                this.state.items.push(...res.data);
+            }
+            else {
+                this.state.items = res.data;
+            }
+            await this.afterLoad(args, res.data);
+            this.state.isLoaded = true;
+            await this._evt.emit('onLoadSuccess', {
+                isInitialLoad,
+            });
         }
         finally {
             await this.endLoading();
         }
-        if (isLoadMore) {
-            this.state.items.push(...res.data);
-        }
-        else {
-            this.state.items = res.data;
-        }
-        await this.afterLoad(args, res.data);
-        this.state.isLoaded = true;
-        await this._evt.emit('onLoadSuccess', {
-            isInitialLoad,
-        });
         return this.state.items;
     }
     /**

package/out/de-logic/index.d.ts

@@ -14,6 +14,19 @@ import { IAppDataEntity, IAppDELogic } from '@ibiz/model-core';
  * @return {*}  {Promise<HttpResponse<IData>>}
  */
 export declare function execDELogic(deDELogic: IAppDELogic, context: IParams, data: IData, params: IParams): Promise<unknown>;
+/**
+ * 通过id执行实体逻辑
+ * @author lxm
+ * @date 2023-08-04 02:49:44
+ * @export
+ * @param {string} deDELogicId
+ * @param {string} dataEntityId
+ * @param {IParams} context
+ * @param {IData} data
+ * @param {IParams} params
+ * @return {*}  {Promise<unknown>}
+ */
+export declare function execDELogicById(deDELogicId: string, dataEntityId: string, context: IParams, data: IData, params: IParams): Promise<unknown>;
 /**
  * 执行实体方法的实体逻辑并返回对应的response
  * @author lxm

package/out/de-logic/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/de-logic/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAS/D;;;;;;;;;;;;GAYG;AACH,wBAAsB,WAAW,CAC/B,SAAS,EAAE,WAAW,EACtB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,OAAO,CAAC,CAMlB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,WAAW,EACtB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAU9B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,EACtC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC,CAYf"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/de-logic/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,YAAY,EAAgB,MAAM,qBAAqB,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AA2B/D;;;;;;;;;;;;GAYG;AACH,wBAAsB,WAAW,CAC/B,SAAS,EAAE,WAAW,EACtB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,OAAO,CAAC,CAMlB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,WAAW,EACtB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAU9B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,EACtC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC,CAYf"}

package/out/de-logic/index.js

@@ -1,10 +1,23 @@
-import { HttpError, HttpResponse } from '@ibiz-template/core';
-import { filterFieldLogics } from '../model';
+import { HttpError, HttpResponse, RuntimeError } from '@ibiz-template/core';
+import { filterFieldLogics, findDELogic } from '../model';
 import { DELogic } from './de-logic';
 /**
  * 实体处理逻辑实例缓存
  */
 const deLogicMap = new Map();
+/**
+ * 找到实体逻辑模型
+ * @author lxm
+ * @date 2023-08-04 02:47:16
+ * @param {string} deDELogicId
+ * @param {string} dataEntityId
+ * @param {string} [appId]
+ * @return {*}  {(Promise<IAppDELogic | undefined>)}
+ */
+async function findDeLogic(deDELogicId, dataEntityId, appId) {
+    const appDataEntity = await ibiz.hub.getAppDataEntity(dataEntityId, appId);
+    return findDELogic(deDELogicId, appDataEntity);
+}
 /**
  * 执行实体处理逻辑
  *
@@ -25,6 +38,25 @@ export async function execDELogic(deDELogic, context, data, params) {
     const deLogic = deLogicMap.get(deDELogic);
     return deLogic.exec(context, data, params);
 }
+/**
+ * 通过id执行实体逻辑
+ * @author lxm
+ * @date 2023-08-04 02:49:44
+ * @export
+ * @param {string} deDELogicId
+ * @param {string} dataEntityId
+ * @param {IParams} context
+ * @param {IData} data
+ * @param {IParams} params
+ * @return {*}  {Promise<unknown>}
+ */
+export async function execDELogicById(deDELogicId, dataEntityId, context, data, params) {
+    const deLogic = await findDeLogic(deDELogicId, dataEntityId, context.srfappid);
+    if (!deLogic) {
+        throw new RuntimeError(`${dataEntityId}找不到实体逻辑${deDELogicId}`);
+    }
+    return execDELogic(deLogic, context, data, params);
+}
 /**
  * 执行实体方法的实体逻辑并返回对应的response
  * @author lxm

package/out/engine/md-view.engine.d.ts

@@ -1,6 +1,6 @@
 import { IAppDEMultiDataView } from '@ibiz/model-core';
 import { ViewController } from '../controller';
-import { IMDViewEvent, IMDViewState, IMDControlController, ISearchFormController, MDCtrlRemoveParams, ISearchBarController } from '../interface';
+import { IMDViewEvent, IMDViewState, IMDControlController, ISearchFormController, MDCtrlRemoveParams, ISearchBarController, MDCtrlLoadParams } from '../interface';
 import { ViewEngineBase } from './view-base.engine';
 /**
  * 多数据视图引擎
@@ -87,7 +87,7 @@ export declare class MDViewEngine extends ViewEngineBase {
      * @date 2023-05-22 03:17:33
      * @return {*}  {Promise<void>}
      */
-    protected load(): Promise<void>;
+    protected load(args?: MDCtrlLoadParams): Promise<void>;
     /**
      * 视图刷新
      * @author lxm

package/out/engine/md-view.engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyD1B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAoCrE,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;;OAQG;cACa,QAAQ,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBjB;;;;;;;;OAQG;cACa,OAAO,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BjB;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrC;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IAiBpC;;;;;OAKG;cACa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAc1C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}
+{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EACjB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyD1B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAwCrE,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;;OAQG;cACa,QAAQ,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBjB;;;;;;;;OAQG;cACa,OAAO,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BjB;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IAiBpC;;;;;OAKG;cACa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAc1C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}

package/out/engine/md-view.engine.js

@@ -136,6 +136,10 @@ export class MDViewEngine extends ViewEngineBase {
             this.copy(args);
             return null;
         }
+        if (key === 'load') {
+            this.load(args);
+            return null;
+        }
         return super.call(key, args);
     }
     getData() {
@@ -166,7 +170,7 @@ export class MDViewEngine extends ViewEngineBase {
             view: this.view,
         }));
         if (result === -1) {
-            throw new RuntimeModelError(this.view.model, `缺少opendata的视图逻辑`);
+            ibiz.log.warn(`视图[${this.view.model.codeName}]，未配置编辑打开视图`);
         }
     }
     /**
@@ -216,8 +220,8 @@ export class MDViewEngine extends ViewEngineBase {
      * @date 2023-05-22 03:17:33
      * @return {*}  {Promise<void>}
      */
-    async load() {
-        await this.xdataControl.load({ isInitialLoad: true });
+    async load(args = {}) {
+        await this.xdataControl.load(Object.assign({ isInitialLoad: true }, args));
     }
     /**
      * 视图刷新

package/out/index.d.ts

@@ -9,6 +9,8 @@ export * from './service';
 export * from './utils';
 export * from './controller';
 export * from './ui-action';
+export * from './ui-logic';
+export * from './de-logic';
 export * from './engine';
 export * from './model';
 export { Application } from './application';

package/out/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,CAAC;AAEjB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,CAAC;AAEjB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC"}

package/out/index.js

@@ -9,6 +9,8 @@ export * from './service';
 export * from './utils';
 export * from './controller';
 export * from './ui-action';
+export * from './ui-logic';
+export * from './de-logic';
 export * from './engine';
 export * from './model';
 export { Application } from './application';

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

@@ -1,6 +1,7 @@
 import { IDEPickupViewPanel } from '@ibiz/model-core';
 import { IPickupViewPanelEvent } from '../../event';
 import { IPickupViewPanelState } from '../../state';
+import { IViewController } from '../view';
 import { IControlController } from './i-control.controller';
 /**
  * 选择视图面板控制器
@@ -10,6 +11,15 @@ import { IControlController } from './i-control.controller';
  * @extends {IControlController<IDEPickupViewPanel, IPickupViewPanelState, IPickupViewPanelEvent>}
  */
 export interface IPickupViewPanelController extends IControlController<IDEPickupViewPanel, IPickupViewPanelState, IPickupViewPanelEvent> {
+    /**
+     * 选择视图嵌入视图控制器
+     *
+     * @author zk
+     * @date 2023-08-04 08:08:43
+     * @type {IViewController}
+     * @memberof IPickupViewPanelController
+     */
+    embedView: IViewController;
     /**
      * 获取选中数据
      *

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

@@ -1 +1 @@
-{"version":3,"file":"i-pickup-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-pickup-view-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;GAMG;AACH,MAAM,WAAW,0BACf,SAAQ,kBAAkB,CACxB,kBAAkB,EAClB,qBAAqB,EACrB,qBAAqB,CACtB;IACD;;;;;;;OAOG;IACH,eAAe,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAEpC;;;;;;;OAOG;IACH,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;CAChC"}
+{"version":3,"file":"i-pickup-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-pickup-view-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;GAMG;AACH,MAAM,WAAW,0BACf,SAAQ,kBAAkB,CACxB,kBAAkB,EAClB,qBAAqB,EACrB,qBAAqB,CACtB;IACD;;;;;;;OAOG;IACH,SAAS,EAAE,eAAe,CAAC;IAC3B;;;;;;;OAOG;IACH,eAAe,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAEpC;;;;;;;OAOG;IACH,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;CAChC"}

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

@@ -2,6 +2,7 @@ import { ITreeExpBar } from '@ibiz/model-core';
 import { ITreeExpBarEvent } from '../../event';
 import { ITreeExpBarState } from '../../state';
 import { IExpBarControlController } from './i-exp-bar-control.controller';
+import { INavViewMsg } from './panel-item';
 /**
  * 树导航栏控制器
  *
@@ -10,5 +11,15 @@ import { IExpBarControlController } from './i-exp-bar-control.controller';
  * @extends {IExpBarControlController<ITreeExpBar, ITreeExpBarState, ITreeExpBarEvent>}
  */
 export interface ITreeExpBarController extends IExpBarControlController<ITreeExpBar, ITreeExpBarState, ITreeExpBarEvent> {
+    /**
+     * 获取导航视图消息
+     *
+     * @author zk
+     * @date 2023-08-04 08:08:27
+     * @param {IData[]} data
+     * @return {*}  {(INavViewMsg | undefined)}
+     * @memberof ITreeExpBarController
+     */
+    getNavViewMsg(data: IData[]): INavViewMsg | undefined;
 }
 //# sourceMappingURL=i-tree-exp-bar.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"i-tree-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-tree-exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE1E;;;;;;GAMG;AACH,MAAM,WAAW,qBACf,SAAQ,wBAAwB,CAC9B,WAAW,EACX,gBAAgB,EAChB,gBAAgB,CACjB;CAAG"}
+{"version":3,"file":"i-tree-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-tree-exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C;;;;;;GAMG;AACH,MAAM,WAAW,qBACf,SAAQ,wBAAwB,CAC9B,WAAW,EACX,gBAAgB,EAChB,gBAAgB,CACjB;IACD;;;;;;;;OAQG;IACH,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,WAAW,GAAG,SAAS,CAAC;CACvD"}

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

@@ -11,16 +11,6 @@ import { IMDControlController } from './i-md-control.controller';
  * @extends {IMDControlController}
  */
 export interface ITreeController extends IMDControlController<IDETree, ITreeState, ITreeEvent> {
-    /**
-     * 设置展开节点
-     *
-     * @author zk
-     * @date 2023-07-10 08:07:36
-     * @param {string[]} nodeKey
-     * @param {boolean} isExpanded
-     * @memberof ITreeController
-     */
-    setExpandedKeys(nodeKeys: string[], isReplace?: boolean): void;
     /**
      * 树节点点击事件
      *

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;;;;;;;;OAQG;IACH,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAE/D;;;;;;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;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;CAClB"}

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

@@ -40,5 +40,20 @@ export interface IPickupViewPanelEvent extends IControlEvent {
             data: IData[];
         };
     };
+    /**
+     * 选择视图初始化
+     *
+     * @author zk
+     * @date 2023-08-04 05:08:37
+     * @type {{
+     *     event: EventBase;
+     *     emitArgs: { data: IViewController };
+     *   }}
+     * @memberof IPickupViewPanelEvent
+     */
+    onPickUpViewMounted: {
+        event: EventBase;
+        emitArgs: undefined;
+    };
 }
 //# sourceMappingURL=i-pickup-view-panel.event.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"i-pickup-view-panel.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-pickup-view-panel.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD;;;;;;GAMG;AACH,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D;;;;;;;;OAQG;IACH,iBAAiB,EAAE;QACjB,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE;YAAE,IAAI,EAAE,KAAK,EAAE,CAAA;SAAE,CAAC;KAC7B,CAAC;IAEF;;;;;;;;;;OAUG;IACH,YAAY,EAAE;QACZ,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE;YAAE,IAAI,EAAE,KAAK,EAAE,CAAA;SAAE,CAAC;KAC7B,CAAC;CACH"}
+{"version":3,"file":"i-pickup-view-panel.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-pickup-view-panel.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD;;;;;;GAMG;AACH,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D;;;;;;;;OAQG;IACH,iBAAiB,EAAE;QACjB,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE;YAAE,IAAI,EAAE,KAAK,EAAE,CAAA;SAAE,CAAC;KAC7B,CAAC;IAEF;;;;;;;;;;OAUG;IACH,YAAY,EAAE;QACZ,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE;YAAE,IAAI,EAAE,KAAK,EAAE,CAAA;SAAE,CAAC;KAC7B,CAAC;IAEF;;;;;;;;;;OAUG;IACH,mBAAmB,EAAE;QACnB,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,SAAS,CAAC;KACrB,CAAC;CACH"}

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

@@ -10,6 +10,28 @@ export interface IGridState extends IMDControlState {
      * @type {IGridRowState[]}
      */
     rows: IGridRowState[];
+    /**
+     * 表格列状态数组
+     * 顺序就是列的排序
+     * @author lxm
+     * @date 2023-08-04 07:08:16
+     * @type {IColumnState[]}
+     */
+    columnStates: IColumnState[];
+    /**
+     * 聚合计算的结果
+     * @author lxm
+     * @date 2023-08-07 04:09:08
+     * @type {IData}
+     */
+    aggResult: IData;
+    /**
+     * 远程聚合计算结果
+     * @author lxm
+     * @date 2023-08-07 05:36:54
+     * @type {IData}
+     */
+    remoteAggResult?: IData;
 }
 export interface IGridRowState {
     /**
@@ -78,4 +100,34 @@ export interface IGridRowState {
      */
     processing: boolean;
 }
+/**
+ * 表格列状态
+ * @author lxm
+ * @date 2023-08-04 07:19:02
+ * @export
+ * @interface IColumnState
+ */
+export interface IColumnState {
+    /**
+     * 列标识,是列模型的codeName
+     * @author lxm
+     * @date 2023-08-04 07:16:07
+     * @type {string}
+     */
+    key: string;
+    /**
+     * 列的中文标题
+     * @author lxm
+     * @date 2023-08-04 07:17:57
+     * @type {string}
+     */
+    caption: string;
+    /**
+     * 显示隐藏
+     * @author lxm
+     * @date 2023-08-04 07:18:47
+     * @type {boolean}
+     */
+    hidden: boolean;
+}
 //# sourceMappingURL=i-grid.state.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"i-grid.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-grid.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,UAAW,SAAQ,eAAe;IACjD;;;;;;OAMG;IACH,IAAI,EAAE,aAAa,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,IAAI,EAAE,SAAS,CAAC;IAEhB;;;;;;OAMG;IACH,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IAEvC;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;IAEpD;;;;;;OAMG;IACH,aAAa,EAAE;QACb,CAAC,CAAC,EAAE,MAAM,GAAG;YACX,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;SACnB,CAAC;KACH,CAAC;IAEF;;;;;;OAMG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;;OAMG;IACH,UAAU,EAAE,OAAO,CAAC;CACrB"}
+{"version":3,"file":"i-grid.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-grid.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,UAAW,SAAQ,eAAe;IACjD;;;;;;OAMG;IACH,IAAI,EAAE,aAAa,EAAE,CAAC;IAEtB;;;;;;OAMG;IACH,YAAY,EAAE,YAAY,EAAE,CAAC;IAE7B;;;;;OAKG;IACH,SAAS,EAAE,KAAK,CAAC;IAEjB;;;;;OAKG;IACH,eAAe,CAAC,EAAE,KAAK,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,IAAI,EAAE,SAAS,CAAC;IAEhB;;;;;;OAMG;IACH,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IAEvC;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;IAEpD;;;;;;OAMG;IACH,aAAa,EAAE;QACb,CAAC,CAAC,EAAE,MAAM,GAAG;YACX,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;SACnB,CAAC;KACH,CAAC;IAEF;;;;;;OAMG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;;OAMG;IACH,UAAU,EAAE,OAAO,CAAC;CACrB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;CACjB"}

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

@@ -17,14 +17,14 @@ export interface ITreeState extends IMDControlState {
      */
     rootNode: ITreeNodeData;
     /**
-     * 展开的节点集合
+     * 默认展开的节点集合
      *
      * @author zk
      * @date 2023-07-10 08:07:25
      * @type {string[]}
      * @memberof ITreeState
      */
-    expandedKeys: string[];
+    defaultExpandedKeys: string[];
     /**
      * 右键上下文菜单状态
      * @author lxm

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,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;;GAOG;AACH,MAAM,WAAW,UAAW,SAAQ,eAAe;IACjD;;;;;OAKG;IACH,QAAQ,EAAE,aAAa,CAAC;IAExB;;;;;;;OAOG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;IAEvB;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;CACtD;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;CAGvB"}
+{"version":3,"file":"i-tree.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-tree.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;;GAOG;AACH,MAAM,WAAW,UAAW,SAAQ,eAAe;IACjD;;;;;OAKG;IACH,QAAQ,EAAE,aAAa,CAAC;IAExB;;;;;;;OAOG;IACH,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAE9B;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;CACtD;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;CAGvB"}

package/out/model/layout/layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../src/model/layout/layout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAGnE;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,UAAU,GAAG;IAC5D,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAsBA;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,UAAU,GAAG,KAAK,CAuClE;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,cAAc,GACxB,MAAM,CAAC,UAAU,EAAE,eAAe,CAAC,CA+BrC;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,MAAM,EAAE,CAIvE"}
+{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../src/model/layout/layout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAGnE;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,UAAU,GAAG;IAC5D,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CA0BA;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,UAAU,GAAG,KAAK,CAuClE;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,cAAc,GACxB,MAAM,CAAC,UAAU,EAAE,eAAe,CAAC,CA+BrC;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,MAAM,EAAE,CAIvE"}

package/out/model/layout/layout.js

@@ -14,7 +14,10 @@ export function calcLayoutHeightWidth(layoutPos) {
         result.width = '100%';
     }
     else if (width && width > 0) {
-        if (widthMode === 'PERCENTAGE') {
+        if (width > 0 && width <= 1) {
+            result.width = `${width * 100}%`;
+        }
+        else if (widthMode === 'PERCENTAGE') {
             result.width = `${width}%`;
         }
         else {
@@ -25,7 +28,10 @@ export function calcLayoutHeightWidth(layoutPos) {
         result.height = '100%';
     }
     else if (height && height > 0) {
-        if (heightMode === 'PERCENTAGE') {
+        if (height > 0 && height <= 1) {
+            result.height = `${height * 100}%`;
+        }
+        else if (heightMode === 'PERCENTAGE') {
             result.height = `${height}%`;
         }
         else {

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,MAAM,iBAAiB,CAAC;AAK7C;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,UAAU,CAAC,CAOrB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAmDf;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,UAAU,CAAC,CAyGrB;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,CAwCjB"}
+{"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,MAAM,iBAAiB,CAAC;AAK7C;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,UAAU,CAAC,CAOrB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAmDf;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,UAAU,CAAC,CAyGrB;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,CA0CjB"}

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

@@ -166,7 +166,7 @@ export async function openDERedirectView(appView, context, params = {}, data = [
             tag: name,
             title: realTitle,
         })));
-        throw new RuntimeModelError(appView, `未找到重定向标识[${rdTag}]或[${deRdTag}]或[${wfRdTag}]对应视图`);
+        throw new RuntimeModelError(appView, `未找到重定向标识[${rdTag}]或[${deRdTag}]或工作流[${wfRdTag}]对应视图`);
     }
     return { ok: true, data: [] };
 }
@@ -184,16 +184,6 @@ export async function openDERedirectView(appView, context, params = {}, data = [
  */
 export async function calcDERdTag(entity, rdView, params, data) {
     let rdTag = '';
-    // 重定向视图自定义类别属性
-    const typeFieldId = rdView.typeAppDEFieldId;
-    // 自定义重定向
-    if (typeFieldId) {
-        const { codeName } = findFieldById(entity, typeFieldId);
-        const value = data[codeName.toLowerCase()];
-        if (notNilEmpty(value)) {
-            return value;
-        }
-    }
     const defView = `${ibiz.env.isMob ? 'MOB' : ''}EDITVIEW`;
     // 如果流程步骤存在，按照工作流优先
     const srfWf = params.srfwf;
@@ -204,10 +194,22 @@ export async function calcDERdTag(entity, rdView, params, data) {
         return `${defView}:${srfWf.toUpperCase()}`;
     }
     let typeValue = '';
-    // 从索引属性获取重定向视图类型
-    if (entity.indexTypeAppDEFieldId) {
-        const { codeName } = findFieldById(entity, entity.indexTypeAppDEFieldId);
-        typeValue = data[codeName.toLowerCase()];
+    // 重定向视图自定义类别属性
+    const typeFieldId = rdView.typeAppDEFieldId;
+    // 自定义重定向
+    if (typeFieldId) {
+        const { codeName } = findFieldById(entity, typeFieldId);
+        const value = data[codeName.toLowerCase()];
+        if (notNilEmpty(value)) {
+            typeValue = value;
+        }
+    }
+    if (isNilOrEmpty(typeValue)) {
+        // 从索引属性获取重定向视图类型
+        if (entity.indexTypeAppDEFieldId) {
+            const { codeName } = findFieldById(entity, entity.indexTypeAppDEFieldId);
+            typeValue = data[codeName.toLowerCase()];
+        }
     }
     if (isNilOrEmpty(typeValue)) {
         // 从多表单属性判断重定向视图类型
@@ -217,7 +219,7 @@ export async function calcDERdTag(entity, rdView, params, data) {
         }
     }
     if (notNilEmpty(typeValue)) {
-        rdTag = `${defView}:${typeValue}`;
+        rdTag = `${defView}:${typeValue.toUpperCase()}`;
     }
     else {
         rdTag = `${defView}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.1",
+    "@ibiz-template/core": "^0.1.3",
     "@ibiz/model-core": "^0.0.14",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.7",
@@ -52,5 +52,6 @@
     "qs": "^6.11.0",
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
-  }
+  },
+  "gitHead": "1dd8759a918fa93fe6af75f7104a6911c46b186a"
 }