@ibiz-template/runtime 0.1.2 → 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/engine/md-view.engine.js

@@ -170,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}]，未配置编辑打开视图`);
         }
     }
     /**

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/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.2",
+  "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",
@@ -53,5 +53,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "f3d39488212f0fd0b65bc4a5aae8bd9541fb1cd6"
+  "gitHead": "1dd8759a918fa93fe6af75f7104a6911c46b186a"
 }

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

@@ -57,6 +57,7 @@ export class MDControlController<
     this.state.isLoaded = false;
     this.state.singleSelect = true;
     this.state.mdctrlActiveMode = 0;
+    this.state.groups = [];
   }
 
   /**
@@ -114,44 +115,42 @@ export class MDControlController<
    * @date 2022-08-19 14:08:50
    */
   async load(args: MDCtrlLoadParams = {}): Promise<IData[]> {
-    // *初始加载需要重置分页
-    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?.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?.params);
+
+      const res = await this.service.fetch(context, params);
       // 更新分页数据总条数
       if (typeof res.total === 'number') {
         this.state.total = res.total;
       }
-    } finally {
-      await this.endLoading();
-    }
 
-    if (isLoadMore) {
-      this.state.items.push(...res.data);
-    } else {
-      this.state.items = res.data;
-    }
+      if (isLoadMore) {
+        this.state.items.push(...res.data);
+      } else {
+        this.state.items = res.data;
+      }
 
-    await this.afterLoad(args, res.data);
+      await this.afterLoad(args, res.data);
 
-    this.state.isLoaded = true;
-    await this._evt.emit('onLoadSuccess', {
-      isInitialLoad,
-    });
+      this.state.isLoaded = true;
+      await this._evt.emit('onLoadSuccess', {
+        isInitialLoad,
+      });
+    } finally {
+      await this.endLoading();
+    }
 
     return this.state.items;
   }

package/src/engine/md-view.engine.ts

@@ -211,7 +211,7 @@ export class MDViewEngine extends ViewEngineBase {
     });
 
     if (result === -1) {
-      throw new RuntimeModelError(this.view.model, `缺少opendata的视图逻辑`);
+      ibiz.log.warn(`视图[${this.view.model.codeName}]，未配置编辑打开视图`);
     }
   }
 

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

@@ -13,17 +13,6 @@ import { IMDControlController } from './i-md-control.controller';
  */
 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/src/interface/controller/state/control/i-grid.state.ts

@@ -11,6 +11,31 @@ 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 {
@@ -82,3 +107,36 @@ 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;
+}

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

@@ -19,14 +19,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[];
 
   /**
    * 右键上下文菜单状态

package/src/model/layout/layout.ts

@@ -19,7 +19,9 @@ export function calcLayoutHeightWidth(layoutPos: ILayoutPos): {
   if (widthMode === 'FULL') {
     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 {
       result.width = `${width}px`;
@@ -28,7 +30,9 @@ export function calcLayoutHeightWidth(layoutPos: ILayoutPos): {
   if (heightMode === 'FULL') {
     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 {
       result.height = `${height}px`;

package/src/utils/open-redirect-view/open-redirect-view.ts

@@ -223,7 +223,7 @@ export async function openDERedirectView(
     );
     throw new RuntimeModelError(
       appView,
-      `未找到重定向标识[${rdTag}]或[${deRdTag}]或[${wfRdTag}]对应视图`,
+      `未找到重定向标识[${rdTag}]或[${deRdTag}]或工作流[${wfRdTag}]对应视图`,
     );
   }
   return { ok: true, data: [] };
@@ -248,16 +248,6 @@ export async function calcDERdTag(
   data: IData,
 ): Promise<string> {
   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;
@@ -268,10 +258,22 @@ export async function calcDERdTag(
     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)) {
     // 从多表单属性判断重定向视图类型
@@ -281,7 +283,7 @@ export async function calcDERdTag(
     }
   }
   if (notNilEmpty(typeValue)) {
-    rdTag = `${defView}:${typeValue}`;
+    rdTag = `${defView}:${typeValue.toUpperCase()}`;
   } else {
     rdTag = `${defView}`;
   }