@ibiz-template/runtime 0.0.3-beta.5 → 0.0.4-beta.1

package/out/controller/control/grid/grid-edit-item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-edit-item.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/grid/grid-edit-item.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,GAAG,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGlD;;;;;GAKG;AACH,qBAAa,sBAAsB;IACjC;;;;;;OAMG;IACH,KAAK,EAAE,iBAAiB,CAAC;IAEzB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAM;IAEnB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAE1B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,CAAM;IAElB;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,WAAW,CAEzB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,YAEX;IAED;;;;;;OAMG;gBACS,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,cAAc;IAK1D;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBvC;;;;;;;OAOG;cACa,SAAS;IAezB;;;;;;;;OAQG;IACG,WAAW,CAAC,GAAG,EAAE,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM;IAKvE;;;;;;;OAOG;IACG,gBAAgB,CACpB,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC,IAAI,CAAC;IAoBhB;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,iBAAiB,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;IAItE;;;;;;OAMG;IACH,cAAc,CAAC,GAAG,EAAE,iBAAiB;IAUrC;;;;;;OAMG;IACG,QAAQ,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CAmBzD"}
+{"version":3,"file":"grid-edit-item.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/grid/grid-edit-item.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,GAAG,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGlD;;;;;GAKG;AACH,qBAAa,sBAAsB;IACjC;;;;;;OAMG;IACH,KAAK,EAAE,iBAAiB,CAAC;IAEzB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAM;IAEnB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAE1B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,CAAM;IAElB;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,YAEX;IAED;;;;;;OAMG;gBACS,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,cAAc;IAK1D;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBvC;;;;;;;OAOG;cACa,SAAS;IAiBzB;;;;;;;;OAQG;IACG,WAAW,CAAC,GAAG,EAAE,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM;IAKvE;;;;;;;OAOG;IACG,gBAAgB,CACpB,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC,IAAI,CAAC;IAoBhB;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,iBAAiB,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;IAItE;;;;;;OAMG;IACH,cAAc,CAAC,GAAG,EAAE,iBAAiB;IAUrC;;;;;;OAMG;IACG,QAAQ,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CAmBzD"}

package/out/controller/control/grid/grid-edit-item.js

@@ -15,7 +15,7 @@ export class GridEditItemController {
      * @author lxm
      * @date 2022-09-05 19:09:24
      * @readonly
-     * @type {IBizContext}
+     * @type {IContext}
      */
     get context() {
         return this.grid.context;
@@ -39,7 +39,7 @@ export class GridEditItemController {
      * @readonly
      */
     get required() {
-        return !this.model.source.allowEmpty;
+        return !this.model.allowEmpty;
     }
     /**
      * Creates an instance of GridEditItemController.
@@ -104,7 +104,10 @@ export class GridEditItemController {
         if (!editItemsVRs) {
             return;
         }
-        this.rules = generateRules(editItemsVRs, this.model.codeName, this.model.source.valueItemName);
+        this.rules = generateRules(editItemsVRs, this.model.codeName, 
+        // todo
+        // this.model.valueItemName,
+        '');
         // 初始化async-validator实例
         this.validator = new Schema({ [this.model.codeName]: this.rules });
     }
@@ -131,8 +134,9 @@ export class GridEditItemController {
      */
     async dataChangeNotify(row, names) {
         // 刚加载初始化时的值不校验,只校验值项和自身值变更
-        if (names.includes(this.model.codeName) ||
-            names.includes(this.model.source.valueItemName)) {
+        if (names.includes(this.model.codeName)
+        // names.includes(this.model.valueItemName)
+        ) {
             const result = await this.validate(row);
             // todo校验不通过是否报错
             if (!result) {
@@ -162,7 +166,7 @@ export class GridEditItemController {
      * @returns {*}
      */
     calcEnableCond(row) {
-        const { enableCond } = this.model.source;
+        const { enableCond } = this.model;
         const isNew = row.data.srfuf === Srfuf.CREATE;
         if (enableCond === 0) {
             row.columnState[this.model.codeName].disabled = true;

package/out/controller/control/grid/grid-field-column.d.ts

@@ -1,4 +1,4 @@
-import { GridFieldColumnModel } from '@ibiz-template/model';
+import { GridFieldColumnModel } from '@ibiz/model-core';
 import { GridColumnController, GridRowController } from '.';
 import { CodeListItem } from '../../../service';
 /**
@@ -41,6 +41,16 @@ export declare class GridFieldColumnController extends GridColumnController<Grid
      * @readonly
      */
     clickable(row: GridRowController): any;
+    /**
+     * 公共参数处理，计算上下文和视图参数
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2022-08-25 15:44:14
+     */
+    handlePublicParams(data: IData, context: IContext, params: IParams): {
+        context: IContext;
+        params: IParams;
+    };
     /**
      * 打开链接视图
      *

package/out/controller/control/grid/grid-field-column.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-field-column.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/grid/grid-field-column.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,GAAG,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,oBAAoB,CAAC,oBAAoB,CAAC;IACvF;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAExC;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;;OAOG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,iBAAiB;IAKhC;;;;;;;;OAQG;IACG,YAAY,CAAC,GAAG,EAAE,iBAAiB,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC5E;;;;;;;;OAQG;IACG,aAAa,CACjB,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAWhB;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,SAAS,YAAY,EAAE,GAAG,SAAS,CAAC;CAanE"}
+{"version":3,"file":"grid-field-column.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/grid/grid-field-column.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,GAAG,CAAC;AAG5D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAIhD;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,oBAAoB,CAAC,oBAAoB,CAAC;IACvF;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAExC;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;;OAOG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,iBAAiB;IAKhC;;;;;OAKG;IACI,kBAAkB,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO;;;;IAgBzE;;;;;;;;OAQG;IACG,YAAY,CAAC,GAAG,EAAE,iBAAiB,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA2C5E;;;;;;;;OAQG;IACG,aAAa,CACjB,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAgBhB;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,SAAS,YAAY,EAAE,GAAG,SAAS,CAAC;CAcnE"}

package/out/controller/control/grid/grid-field-column.js

@@ -2,6 +2,8 @@ import { RuntimeError } from '@ibiz-template/core';
 import { clone } from 'ramda';
 import { GridColumnController } from '.';
 import { OpenAppViewCommand } from '../../../command';
+import { convertNavData, getWFContext } from '../../../utils';
+import { executeViewLogic } from '../../../view-logic';
 /**
  * 表格属性列控制器
  * @return {*}
@@ -17,7 +19,7 @@ export class GridFieldColumnController extends GridColumnController {
      * @returns {*}
      */
     get isLinkColumn() {
-        return this.model.source.enableLinkView && !!this.model.linkView;
+        return !!this.model.enableLinkView && !!this.model.linkView;
     }
     /**
      * 是否有触发界面行为
@@ -28,7 +30,7 @@ export class GridFieldColumnController extends GridColumnController {
      * @type {boolean}
      */
     get hasAction() {
-        return !!this.model.source.getPSDEUIAction();
+        return !!this.model.uiAction;
     }
     /**
      * 行是否可点击（影响列的界面样式）
@@ -41,6 +43,26 @@ export class GridFieldColumnController extends GridColumnController {
         const value = row.data[this.model.codeName];
         return (this.isLinkColumn || this.hasAction) && value;
     }
+    /**
+     * 公共参数处理，计算上下文和视图参数
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2022-08-25 15:44:14
+     */
+    handlePublicParams(data, context, params) {
+        const { navigateContexts, navigateParams } = this.model;
+        let selfContext = {};
+        if (navigateContexts && data) {
+            selfContext = convertNavData(navigateContexts, context, params, data);
+        }
+        const _context = Object.assign(context.clone(), selfContext);
+        let selfParams = {};
+        if (navigateParams && data) {
+            selfParams = convertNavData(navigateParams, context, params, data);
+        }
+        const _params = Object.assign(Object.assign({}, params), selfParams);
+        return { context: _context, params: _params };
+    }
     /**
      * 打开链接视图
      *
@@ -56,7 +78,7 @@ export class GridFieldColumnController extends GridColumnController {
             // 当前值不存在，不继续走打开链接视图逻辑
             return;
         }
-        const valueItem = this.model.source.linkValueItem || 'srfkey';
+        const valueItem = this.model.linkValueItem || 'srfkey';
         const value = row.data[valueItem];
         if (!value) {
             throw new RuntimeError('链接值项取不到值');
@@ -69,12 +91,15 @@ export class GridFieldColumnController extends GridColumnController {
             await linkView.init();
         }
         const { deName } = linkView.appEntity;
-        const newContext = Object.assign(this.context.clone(), {
-            [deName]: value,
-        });
-        const newParams = clone(this.params);
+        const wfContext = getWFContext(row.data);
+        const tempContext = Object.assign(this.context.clone(), Object.assign({ [deName]: value }, wfContext));
+        const tempParams = clone(this.params);
+        const { context: newContext, params: newParams } = this.handlePublicParams(row.data, tempContext, tempParams);
         // 打开视图
-        await ibiz.commands.execute(OpenAppViewCommand.TAG, linkView.source, newContext, newParams, { event });
+        const res = await ibiz.commands.execute(OpenAppViewCommand.TAG, linkView.source, newContext, newParams, { event });
+        if (res === null || res === void 0 ? void 0 : res.ok) {
+            this.grid.load();
+        }
     }
     /**
      * 触发表格列附加界面行为
@@ -87,7 +112,11 @@ export class GridFieldColumnController extends GridColumnController {
      */
     async triggerAction(row, event) {
         if (this.model.viewLogic) {
-            await this.grid.nerve.self.evt.asyncEmit('actionClick', this.model.viewLogic, [row.data], event);
+            await executeViewLogic(this.model.viewLogic, this.context, [row.data], this.params, {
+                event,
+                neuron: this.grid.nerve.self,
+                view: this.grid.ctx.view,
+            });
         }
     }
     /**
@@ -98,12 +127,17 @@ export class GridFieldColumnController extends GridColumnController {
      * @returns {*}
      */
     async loadCodeList() {
-        const codeList = this.model.source.getPSAppCodeList();
-        if (!codeList) {
-            return;
-        }
-        const dataItems = await this.app.codeList.get(codeList.codeName, this.context, this.params);
-        this.codeListItems = dataItems;
-        return dataItems;
+        // const codeList = this.model.getPSAppCodeList();
+        // if (!codeList) {
+        //   return;
+        // }
+        // const dataItems = await this.app.codeList.get(
+        //   codeList.codeName,
+        //   this.context,
+        //   this.params,
+        // );
+        // this.codeListItems = dataItems;
+        // return dataItems;
+        return undefined;
     }
 }

package/out/controller/control/grid/grid-field-edit-column.d.ts

@@ -1,4 +1,4 @@
-import { GridEditItemModel } from '@ibiz-template/model';
+import { GridEditItemModel } from '@ibiz/model-core';
 import { GridEditItemController } from './grid-edit-item';
 import { GridFieldColumnController } from './grid-field-column';
 /**

package/out/controller/control/grid/grid-field-edit-column.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-field-edit-column.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/grid/grid-field-edit-column.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAEhE;;;;;GAKG;AACH,qBAAa,6BAA8B,SAAQ,yBAAyB;IAC1E;;;;;;OAMG;IACH,QAAQ,EAAG,sBAAsB,CAAC;IAElC;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC;;;;;;;;OAQG;cACa,wBAAwB,CACtC,QAAQ,EAAE,iBAAiB,GAC1B,OAAO,CAAC,sBAAsB,CAAC;CAKnC"}
+{"version":3,"file":"grid-field-edit-column.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/grid/grid-field-edit-column.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAEhE;;;;;GAKG;AACH,qBAAa,6BAA8B,SAAQ,yBAAyB;IAC1E;;;;;;OAMG;IACH,QAAQ,EAAG,sBAAsB,CAAC;IAElC;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC;;;;;;;;OAQG;cACa,wBAAwB,CACtC,QAAQ,EAAE,iBAAiB,GAC1B,OAAO,CAAC,sBAAsB,CAAC;CAKnC"}

package/out/controller/control/grid/grid-group-column.d.ts

@@ -0,0 +1,11 @@
+import { GridGroupColumnModel } from '@ibiz/model-core';
+import { GridColumnController } from './grid-column';
+/**
+ * 表格分组列控制器
+ * @return {*}
+ * @author: zhujiamin
+ * @Date: 2022-09-01 18:25:20
+ */
+export declare class GridGroupColumnController extends GridColumnController<GridGroupColumnModel> {
+}
+//# sourceMappingURL=grid-group-column.d.ts.map

package/out/controller/control/grid/grid-group-column.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"grid-group-column.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/grid/grid-group-column.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,oBAAoB,CAAC,oBAAoB,CAAC;CAAG"}

package/out/controller/control/grid/grid-group-column.js

@@ -0,0 +1,9 @@
+import { GridColumnController } from './grid-column';
+/**
+ * 表格分组列控制器
+ * @return {*}
+ * @author: zhujiamin
+ * @Date: 2022-09-01 18:25:20
+ */
+export class GridGroupColumnController extends GridColumnController {
+}

package/out/controller/control/grid/grid-ua-column.d.ts

@@ -1,4 +1,4 @@
-import { GridUAColumnModel, IPSUIActionGroupDetail } from '@ibiz-template/model';
+import { GridUAColumnModel, IUIActionGroupDetail } from '@ibiz/model-core';
 import { GridColumnController } from './grid-column';
 import { GridRowController } from '.';
 /**
@@ -15,15 +15,15 @@ export declare class GridUAColumnController extends GridColumnController<GridUAC
      * @date 2022-09-07 21:09:43
      * @param {GridRowController} _row
      */
-    initActionStates(row: GridRowController): void;
+    initActionStates(_row: GridRowController): void;
     /**
      * 触发操作列点击事件
      *
      * @author lxm
      * @date 2022-09-07 22:09:46
-     * @param {IPSUIActionGroupDetail} detail
+     * @param {IUIActionGroupDetail} detail
      * @param {MouseEvent} event
      */
-    onActionClick(detail: IPSUIActionGroupDetail, row: GridRowController, event: MouseEvent): Promise<void>;
+    onActionClick(detail: IUIActionGroupDetail, row: GridRowController, event: MouseEvent): Promise<void>;
 }
 //# sourceMappingURL=grid-ua-column.d.ts.map

package/out/controller/control/grid/grid-ua-column.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-ua-column.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/grid/grid-ua-column.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAEjB,sBAAsB,EACvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,GAAG,CAAC;AAItC;;;;;GAKG;AACH,qBAAa,sBAAuB,SAAQ,oBAAoB,CAAC,iBAAiB,CAAC;IACjF;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,iBAAiB;IAqBvC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,sBAAsB,EAC9B,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CA2BjB"}
+{"version":3,"file":"grid-ua-column.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/grid/grid-ua-column.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,GAAG,CAAC;AAGtC;;;;;GAKG;AACH,qBAAa,sBAAuB,SAAQ,oBAAoB,CAAC,iBAAiB,CAAC;IACjF;;;;;;OAMG;IACH,gBAAgB,CAAC,IAAI,EAAE,iBAAiB;IAqBxC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CA8BjB"}

package/out/controller/control/grid/grid-ua-column.js

@@ -1,7 +1,5 @@
-import { DefectModelError, } from '@ibiz-template/model';
 import { GridColumnController } from './grid-column';
-import { ButtonContainerState, ButtonState } from '../../utils';
-import { AppDEUIActionUtil } from '../../../utils';
+import { executeViewLogic } from '../../../view-logic';
 /**
  * 表格操作列控制器
  * @return {*}
@@ -16,46 +14,57 @@ export class GridUAColumnController extends GridColumnController {
      * @date 2022-09-07 21:09:43
      * @param {GridRowController} _row
      */
-    initActionStates(row) {
-        // 操作列按钮状态控制
-        if (this.model.uiActionGroupDetails.length === 0) {
-            throw new DefectModelError(this.model.source, '操作列没有配置界面行为');
-        }
-        const containerState = new ButtonContainerState();
-        this.model.uiActionGroupDetails.forEach(detail => {
-            const action = detail.getPSUIAction();
-            if (action) {
-                const buttonState = new ButtonState(detail.name, action, this.grid.model.appEntity);
-                containerState.addState(detail.name, buttonState);
-            }
-        });
-        containerState.update(row.data.getOrigin());
-        row.uaColumnStates[this.model.codeName] = containerState;
+    initActionStates(_row) {
+        // // 操作列按钮状态控制
+        // if (this.model.uiActionGroupDetails.length === 0) {
+        //   throw new RuntimeModelError(this.model, '操作列没有配置界面行为');
+        // }
+        // const containerState = new ButtonContainerState();
+        // this.model.uiActionGroupDetails.forEach(detail => {
+        //   const action = detail.getPSUIAction();
+        //   if (action) {
+        //     const buttonState = new ButtonState(
+        //       detail.name,
+        //       action,
+        //       this.grid.model.appEntity,
+        //     );
+        //     containerState.addState(detail.name, buttonState);
+        //   }
+        // });
+        // containerState.update(row.data.getOrigin());
+        // row.uaColumnStates[this.model.codeName] = containerState;
     }
     /**
      * 触发操作列点击事件
      *
      * @author lxm
      * @date 2022-09-07 22:09:46
-     * @param {IPSUIActionGroupDetail} detail
+     * @param {IUIActionGroupDetail} detail
      * @param {MouseEvent} event
      */
     async onActionClick(detail, row, event) {
-        var _a;
         // 行编辑切换直接调表格方法，不走视图逻辑
-        if (((_a = detail.getPSUIAction()) === null || _a === void 0 ? void 0 : _a.uIActionTag) === 'ToggleRowEdit') {
-            await this.grid.toggleRowEdit(row);
-            return;
-        }
+        // if (detail.getPSUIAction()?.uIActionTag === 'ToggleRowEdit') {
+        //   await this.grid.toggleRowEdit(row);
+        //   return;
+        // }
+        const opts = {
+            event,
+            neuron: this.grid.nerve.self,
+            view: this.grid.ctx.view,
+        };
         const appViewLogic = this.model.findAppViewLogic(detail.name);
         if (appViewLogic) {
-            await this.grid.nerve.self.evt.asyncEmit('actionClick', appViewLogic, [row.data], event);
+            await executeViewLogic(appViewLogic, this.context, [row.data], this.params, opts);
         }
         else {
-            AppDEUIActionUtil.exec(detail.getPSUIAction(), this.context, [row.data], this.params, {
-                event,
-                neuron: this.grid.nerve.self,
-            });
+            // AppDEUIActionUtil.exec(
+            //   detail.getPSUIAction()! as IAppDEUIAction,
+            //   this.context,
+            //   [row.data],
+            //   this.params,
+            //   opts,
+            // );
         }
     }
 }

package/out/controller/control/grid/grid.d.ts

@@ -1,4 +1,4 @@
-import { GridModel } from '@ibiz-template/model';
+import { GridColumnModel, IDEGrid } from '@ibiz/model-core';
 import { ControlVO, GridService } from '../../../service';
 import { GridEditItemController, GridFieldColumnController, GridUAColumnController, GridRowController, GridColumnController } from '.';
 import { MDController } from '../md';
@@ -13,9 +13,9 @@ import { GridState } from '../../state';
  * @date 2022-08-01 18:08:13
  * @export
  * @class GridController
- * @extends {MDController<GridModel>}
+ * @extends {MDController<IDEGrid>}
  */
-export declare class GridController extends MDController<GridModel> {
+export declare class GridController extends MDController<IDEGrid> {
     state: GridState;
     nerve: GridNerve;
     /**
@@ -100,14 +100,6 @@ export declare class GridController extends MDController<GridModel> {
      * @readonly
      */
     get noSort(): boolean;
-    /**
-     * 排序查询条件
-     *
-     * @author lxm
-     * @date 2022-09-28 13:09:46
-     * @type {string}
-     */
-    sortQuery?: string;
     protected createNerve(): GridNerve;
     /**
      * 初始化方法
@@ -165,6 +157,14 @@ export declare class GridController extends MDController<GridModel> {
      * @param {ControlVO} data 选中的单条数据
      */
     onDbRowClick(data: ControlVO): Promise<void>;
+    /**
+     * 初始化表格属性列，操作列，编辑项控制器
+     *
+     * @author lxm
+     * @date 2022-08-24 21:08:48
+     * @protected
+     */
+    protected initColumnsController(column: GridColumnModel): Promise<void>;
     /**
      * 初始化表格属性列，操作列，编辑项控制器
      *

package/out/controller/control/grid/grid.d.ts.map

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

package/out/controller/control/grid/grid.js

@@ -12,7 +12,7 @@ import { GridState } from '../../state';
  * @date 2022-08-01 18:08:13
  * @export
  * @class GridController
- * @extends {MDController<GridModel>}
+ * @extends {MDController<IDEGrid>}
  */
 export class GridController extends MDController {
     constructor() {
@@ -83,7 +83,7 @@ export class GridController extends MDController {
      * @readonly
      */
     get noSort() {
-        return this.model.source.noSort;
+        return !!this.model.noSort;
     }
     createNerve() {
         return new GridNerve(this);
@@ -99,7 +99,7 @@ export class GridController extends MDController {
     async onInit() {
         await super.onInit();
         this.state.size = this.model.size;
-        this.state.singleSelect = this.model.source.singleSelect;
+        this.state.singleSelect = this.model.singleSelect;
         this.service = new GridService(this.model);
         await this.service.init(this.context);
         this.hasWidthFlexGrow = !!this.model.columns.find(column => column.widthFlexGrow);
@@ -108,10 +108,6 @@ export class GridController extends MDController {
         this.dataChangeNotify = debounceAndAsyncMerge(this.dataChangeNotify.bind(this), (arr1, arr2) => {
             return [arr1[0], Array.from(new Set([...arr1[1], ...arr2[1]]))];
         }, 200);
-        // 绑定表格排序参数，beforeLoad事件
-        this.nerve.self.evt.on('beforeLoad', () => {
-            return this.sortQuery ? { sort: this.sortQuery } : {};
-        });
         // 设置默认排序
         this.setSort();
     }
@@ -206,7 +202,7 @@ export class GridController extends MDController {
         rowController.modified = false;
         ibiz.message.success(`${res.data.srfmajortext || ''}保存成功`);
         this.gridStateNotify(rowController, GridNotifyState.SAVE);
-        await this.nerve.self.evt.asyncEmit('afterSave', [res.data], isCreate);
+        await this.nerve.self.emit('onSaveSuccess', undefined);
     }
     /**
      * 行单击事件
@@ -216,8 +212,26 @@ export class GridController extends MDController {
      * @param {ControlVO} data 选中的单条数据
      */
     async onRowClick(data) {
+        var _a;
+        // 激活事件
         if (this.mdCtrlActiveMode === 1) {
-            await this.nerve.self.evt.asyncEmit('dataActive', data);
+            await this.onActive(data);
+        }
+        // 选中事件
+        const { singleSelect, selectedData } = this.state;
+        if (singleSelect) {
+            // 单选时，data和选中数据不一样时数据变更，一样时是反选，把选中清空
+            this.onSelectionChange(((_a = selectedData[0]) === null || _a === void 0 ? void 0 : _a.srfkey) !== data.srfkey ? [data] : []);
+        }
+        else {
+            // 多选时，选中里没有则添加，有则删除
+            const findIndex = selectedData.findIndex(item => item.srfkey === data.srfkey);
+            if (findIndex === -1) {
+                this.onSelectionChange([...selectedData, data]);
+            }
+            else {
+                this.onSelectionChange(selectedData.filter((value, index) => index !== findIndex));
+            }
         }
     }
     /**
@@ -229,7 +243,35 @@ export class GridController extends MDController {
      */
     async onDbRowClick(data) {
         if (this.mdCtrlActiveMode === 2) {
-            await this.nerve.self.evt.asyncEmit('dataActive', data);
+            await this.onActive(data);
+        }
+    }
+    /**
+     * 初始化表格属性列，操作列，编辑项控制器
+     *
+     * @author lxm
+     * @date 2022-08-24 21:08:48
+     * @protected
+     */
+    async initColumnsController(column) {
+        // 初始化适配器
+        const provider = await ibiz.register.gridColumn.get(column);
+        this.providers[column.codeName] = provider;
+        // 初始化表格列控制器
+        const controller = await provider.createController(column, this);
+        this.columns[column.codeName] = controller;
+        // 分类存放控制器
+        if (column.source.columnType === 'DEFGRIDCOLUMN') {
+            this.fieldColumns[column.codeName] =
+                controller;
+        }
+        else if (column.source.columnType === 'UAGRIDCOLUMN') {
+            this.uaColumns[column.codeName] = controller;
+        }
+        else if (column.source.columnType === 'GROUPGRIDCOLUMN') {
+            await Promise.all(column.children.map(async (childColumn) => {
+                this.initColumnsController(childColumn);
+            }));
         }
     }
     /**
@@ -241,21 +283,7 @@ export class GridController extends MDController {
      */
     async initGridColumns() {
         await Promise.all(this.model.columns.map(async (column) => {
-            // 初始化适配器
-            const provider = await ibiz.register.gridColumn.get(column);
-            this.providers[column.codeName] = provider;
-            // 初始化表格列控制器
-            const controller = await provider.createController(column, this);
-            this.columns[column.codeName] = controller;
-            // 分类存放控制器
-            if (column.source.columnType === 'DEFGRIDCOLUMN') {
-                this.fieldColumns[column.codeName] =
-                    controller;
-            }
-            else if (column.source.columnType === 'UAGRIDCOLUMN') {
-                this.uaColumns[column.codeName] =
-                    controller;
-            }
+            this.initColumnsController(column);
         }));
         // 初始化表格编辑项控制器（显示列的编辑项控制器已经生成）
         await Promise.all(this.model.editItems.map(async (editItem) => {

package/out/controller/control/grid/index.d.ts

@@ -5,4 +5,5 @@ export * from './grid-field-edit-column';
 export * from './grid-ua-column';
 export * from './grid-edit-item';
 export * from './grid-row';
+export * from './grid-group-column';
 //# sourceMappingURL=index.d.ts.map

package/out/controller/control/grid/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/grid/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/grid/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC"}

package/out/controller/control/grid/index.js

@@ -5,3 +5,4 @@ export * from './grid-field-edit-column';
 export * from './grid-ua-column';
 export * from './grid-edit-item';
 export * from './grid-row';
+export * from './grid-group-column';

package/out/controller/control/index.d.ts

@@ -2,16 +2,15 @@ export { ControlController } from './control';
 export { AppMenuController } from './app-menu';
 export { MainController } from './main';
 export * from './form/index';
-export { MDController } from './md';
+export * from './md';
 export * from './grid/index';
 export { ListController } from './list';
 export { TreeController } from './tree';
-export { ViewPanelController } from './view-panel';
-export { PickupViewPanelController } from './pickup-view-panel';
 export * from './portlet';
 export * from './panel';
 export { DashboardController } from './dashboard';
 export { DataViewController } from './dataview';
 export { WizardPanelController } from './wizard-panel';
 export { KanbanController } from './kanban';
+export { ToolbarController } from './toolbar';
 //# sourceMappingURL=index.d.ts.map

package/out/controller/control/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/control/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAChE,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/control/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,cAAc,cAAc,CAAC;AAC7B,cAAc,MAAM,CAAC;AACrB,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC"}

package/out/controller/control/index.js

@@ -3,15 +3,14 @@ export { ControlController } from './control';
 export { AppMenuController } from './app-menu';
 export { MainController } from './main';
 export * from './form/index';
-export { MDController } from './md';
+export * from './md';
 export * from './grid/index';
 export { ListController } from './list';
 export { TreeController } from './tree';
-export { ViewPanelController } from './view-panel';
-export { PickupViewPanelController } from './pickup-view-panel';
 export * from './portlet';
 export * from './panel';
 export { DashboardController } from './dashboard';
 export { DataViewController } from './dataview';
 export { WizardPanelController } from './wizard-panel';
 export { KanbanController } from './kanban';
+export { ToolbarController } from './toolbar';