@ibiz-template/runtime 0.0.3-beta.0 → 0.0.3-beta.2

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

@@ -5,6 +5,7 @@ import { MDController } from '../md';
 import { GridNerve } from '../../neuron';
 import { GridNotifyState } from '../../constant';
 import { IGridColumnProvider } from '../../interface';
+import { GridState } from '../../state';
 /**
  * 表格控制器
  *
@@ -15,6 +16,7 @@ import { IGridColumnProvider } from '../../interface';
  * @extends {MDController<GridModel>}
  */
 export declare class GridController extends MDController<GridModel> {
+    state: GridState;
     nerve: GridNerve;
     /**
      * 表格部件服务
@@ -77,6 +79,7 @@ export declare class GridController extends MDController<GridModel> {
     /**
      * 表格行控制器
      *
+     * @deprecated
      * @author lxm
      * @date 2022-09-05 19:09:12
      * @type {GridRowController[]}
@@ -91,6 +94,13 @@ export declare class GridController extends MDController<GridModel> {
      * @type {(number | 0 | 1 | 2)}
      */
     gridRowActiveMode: number | 0 | 1 | 2;
+    /**
+     * 是否有配置宽度自适应列
+     *
+     * @type {boolean}
+     * @memberof GridController
+     */
+    hasWidthFlexGrow: boolean;
     /**
      * 是否默认禁用排序
      *
@@ -173,6 +183,11 @@ export declare class GridController extends MDController<GridModel> {
      *
      */
     setGridRowActiveMode(mode?: number | 0 | 1 | 2): void;
+    /**
+     * 设置表格是否包含在导航视图内
+     *
+     */
+    setGridIsExpView(isExpView?: boolean): 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":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAS,MAAM,kBAAkB,CAAC;AACjE,OAAO,EACL,sBAAsB,EACtB,yBAAyB,EACzB,sBAAsB,EACtB,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,GAAG,CAAC;AACX,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,YAAY,CAAC,SAAS,CAAC;IACzD,KAAK,YAAmB;IAEhB,KAAK,EAAE,SAAS,CAAC;IAEzB;;;;;;OAMG;IACK,OAAO,EAAE,WAAW,CAAC;IAE7B;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEtD;;;;;;OAMG;IACH,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAA;KAAE,CAAM;IAEhE;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAM;IAE1D;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAM;IAE1D;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;;;OAOG;IACH,IAAI,EAAE,iBAAiB,EAAE,CAAM;IAE/B;;;;;;;OAOG;IACH,iBAAiB,EAAE,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAK;IAE1C;;;;;OAKG;IACH,gBAAgB,EAAE,OAAO,CAAS;IAElC;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,SAAS,CAAC,WAAW,IAAI,SAAS;IAIlC;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAgCvC;;;;;OAKG;IACG,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAiBzD;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAU9B;;;;;OAKG;IACG,MAAM;IASZ;;;;;;;OAOG;IACG,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA2C1C;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAMhD;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAMlD;;;;;;;OAOG;IACH,oBAAoB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI;IAIrD;;;OAGG;IACH,gBAAgB,CAAC,SAAS,CAAC,EAAE,OAAO,GAAG,IAAI;IAM3C;;;;;;OAMG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAkChD;;;;;;;;OAQG;IACG,WAAW,CACf,GAAG,EAAE,iBAAiB,EACtB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,IAAI,CAAC;IAgBhB;;;;;;;OAOG;IACG,gBAAgB,CACpB,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC,IAAI,CAAC;IAahB;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,iBAAiB,EAAE,KAAK,EAAE,eAAe,GAAG,IAAI;IAOrE;;;;;;;OAOG;IACG,QAAQ,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IASxD;;;;;;OAMG;IACG,aAAa,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAO1D;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM;IAI1C;;;;;;;OAOG;IACG,kBAAkB,CACtB,GAAG,EAAE,iBAAiB,EACtB,UAAU,EAAE,MAAM,EAClB,WAAW,CAAC,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC,IAAI,CAAC;CAgBjB"}

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

@@ -4,6 +4,7 @@ import { GridEditItemController, GridRowController, } from '.';
 import { MDController } from '../md';
 import { GridNerve } from '../../neuron';
 import { GridNotifyState } from '../../constant';
+import { GridState } from '../../state';
 /**
  * 表格控制器
  *
@@ -16,6 +17,7 @@ import { GridNotifyState } from '../../constant';
 export class GridController extends MDController {
     constructor() {
         super(...arguments);
+        this.state = new GridState();
         /**
          * 所有表格列控制器集合
          *
@@ -59,6 +61,7 @@ export class GridController extends MDController {
         /**
          * 表格行控制器
          *
+         * @deprecated
          * @author lxm
          * @date 2022-09-05 19:09:12
          * @type {GridRowController[]}
@@ -73,6 +76,13 @@ export class GridController extends MDController {
          * @type {(number | 0 | 1 | 2)}
          */
         this.gridRowActiveMode = 2;
+        /**
+         * 是否有配置宽度自适应列
+         *
+         * @type {boolean}
+         * @memberof GridController
+         */
+        this.hasWidthFlexGrow = false;
     }
     /**
      * 是否默认禁用排序
@@ -97,10 +107,11 @@ export class GridController extends MDController {
      */
     async onInit() {
         await super.onInit();
-        this.size = this.model.size;
-        this.singleSelect = this.model.source.singleSelect;
+        this.state.size = this.model.size;
+        this.state.singleSelect = this.model.source.singleSelect;
         this.service = new GridService(this.model);
         await this.service.init(this.context);
+        this.hasWidthFlexGrow = !!this.model.columns.find(column => column.widthFlexGrow);
         await this.initGridColumns();
         // !数据变更通知防抖，且合并参数,如果有同出触发不同行的值变更则该方法需要重写
         this.dataChangeNotify = debounceAndAsyncMerge(this.dataChangeNotify.bind(this), (arr1, arr2) => {
@@ -123,12 +134,12 @@ export class GridController extends MDController {
      * @date 2022-08-19 14:08:50
      */
     async afterLoad(items) {
-        // 通知表格属性列,加载代码表
+        // 每次表格刷新时通知表格属性列,加载代码表,避免动态代码表更新不及时
         await Promise.allSettled(Object.values(this.fieldColumns).map(async (fieldColumn) => {
             await fieldColumn.loadCodeList();
         }));
         // 生成表格row对象
-        this.rows = items.map(item => {
+        this.state.rows = items.map(item => {
             const row = new GridRowController(item, this);
             this.gridStateNotify(row, GridNotifyState.LOAD);
             return row;
@@ -144,10 +155,10 @@ export class GridController extends MDController {
      */
     afterRemove(data) {
         super.afterRemove(data);
-        // 删除this.rows里的表格行数据
-        const index = this.rows.findIndex(item => item.data.srfkey === data.srfkey);
-        this.rows[index].destroy();
-        this.rows.splice(index, 1);
+        // 删除this.state.rows里的表格行数据
+        const index = this.state.rows.findIndex(item => item.data.srfkey === data.srfkey);
+        this.state.rows[index].destroy();
+        this.state.rows.splice(index, 1);
     }
     /**
      * 新建行
@@ -158,9 +169,9 @@ export class GridController extends MDController {
     async newRow() {
         const res = await this.service.getDraft(this.context, this.params);
         // 加载完后续处理
-        this.items.unshift(res.data);
+        this.state.items.unshift(res.data);
         const newRow = new GridRowController(res.data, this);
-        this.rows.unshift(newRow);
+        this.state.rows.unshift(newRow);
         this.gridStateNotify(newRow, GridNotifyState.DRAFT);
     }
     /**
@@ -172,7 +183,7 @@ export class GridController extends MDController {
      * @returns {*}  {Promise<void>}
      */
     async save(data) {
-        const rowController = this.rows.find(item => item.data.srfkey === data.srfkey);
+        const rowController = this.state.rows.find(item => item.data.srfkey === data.srfkey);
         if (!rowController) {
             throw new RuntimeError('行数据不存在');
         }
@@ -196,8 +207,8 @@ export class GridController extends MDController {
             await this.endLoading();
         }
         // 后续处理
-        const index = this.items.findIndex(item => item.srfkey === data.srfkey);
-        this.items.splice(index, 1, res.data);
+        const index = this.state.items.findIndex(item => item.srfkey === data.srfkey);
+        this.state.items.splice(index, 1, res.data);
         rowController.data = res.data;
         rowController.modified = false;
         ibiz.message.success(`${res.data.srfmajortext || ''}保存成功`);
@@ -239,6 +250,15 @@ export class GridController extends MDController {
     setGridRowActiveMode(mode) {
         this.gridRowActiveMode = mode === undefined ? 2 : mode;
     }
+    /**
+     * 设置表格是否包含在导航视图内
+     *
+     */
+    setGridIsExpView(isExpView) {
+        if (typeof isExpView === 'boolean') {
+            this.isExpView = isExpView;
+        }
+    }
     /**
      * 初始化表格属性列，操作列，编辑项控制器
      *

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

@@ -1,6 +1,7 @@
 import { MDModel } from '@ibiz-template/model';
 import { ControlVO, MDControlService } from '../../service';
 import { MDControlNerve } from '../neuron';
+import { MDState } from '../state';
 import { MainController } from './main';
 /**
  * 多数据部件控制器
@@ -13,8 +14,10 @@ import { MainController } from './main';
  * @template T
  */
 export declare class MDController<T extends MDModel = MDModel> extends MainController<T> {
+    state: MDState;
     /**
      * 多数据部件数据集合
+     * @deprecated
      * @author lxm
      * @date 2022-08-17 19:08:11
      * @type {ControlVO[]}
@@ -23,6 +26,7 @@ export declare class MDController<T extends MDModel = MDModel> extends MainContr
     /**
      * 多数据部件已选中的数据集合
      *
+     * @deprecated
      * @author lxm
      * @date 2022-08-18 22:08:14
      * @type {IData[]}
@@ -31,11 +35,33 @@ export declare class MDController<T extends MDModel = MDModel> extends MainContr
     /**
      * 是否是单项选择
      *
+     * @deprecated
      * @author lxm
      * @date 2022-08-19 10:08:29
      * @type {boolean}
      */
     singleSelect: boolean;
+    /**
+     * 是否默认选中第一条数据
+     *
+     * @type {boolean}
+     * @memberof MDController
+     */
+    isSelectFirstDefault: boolean;
+    /**
+     * 默认选中的数据
+     *
+     * @type {Array}
+     * @memberof MDController
+     */
+    defaultSelectKeys: Array<string>;
+    /**
+     * 是否默认选中第一条数据
+     *
+     * @type {boolean}
+     * @memberof MDController
+     */
+    isExpView: boolean;
     /**
      * 多数据部件服务
      *
@@ -47,14 +73,17 @@ export declare class MDController<T extends MDModel = MDModel> extends MainContr
     nerve: MDControlNerve;
     /**
      * 当前页
+     * @deprecated
      */
     curPage: number;
     /**
      * 分页条数
+     * @deprecated
      */
     size: number;
     /**
      * 总条数
+     * @deprecated
      */
     total: number;
     protected createNerve(): MDControlNerve;
@@ -67,6 +96,16 @@ export declare class MDController<T extends MDModel = MDModel> extends MainContr
      * @returns {*}  {Promise<void>}
      */
     protected onInit(): Promise<void>;
+    /**
+     * 设置是否默认选中第一条
+     *
+     */
+    setIsSelectFirstDefault(isSelectFirstDefault?: boolean): void;
+    /**
+     * 设置默认选中数据主键集合
+     *
+     */
+    setDefaultSelectKeys(defaultSelectKeys?: Array<string>): void;
     /**
      * 获取请求过滤参数（整合了视图参数，各种过滤条件，排序，分页）
      *
@@ -137,6 +176,13 @@ export declare class MDController<T extends MDModel = MDModel> extends MainContr
      * @returns {*}  {Promise<void>}
      */
     importData(): Promise<void>;
+    /**
+     * 数据导出
+     *
+     * @param {MouseEvent} event 原生js点击事件
+     * @returns {*}  {Promise<void>}
+     * @memberof MDController
+     */
     exportData(event: MouseEvent): Promise<void>;
 }
 //# sourceMappingURL=md.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"md.d.ts","sourceRoot":"","sources":["../../../src/controller/control/md.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,OAAO,EAER,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAS,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC;;;;;;;;;GASG;AACH,qBAAa,YAAY,CACvB,CAAC,SAAS,OAAO,GAAG,OAAO,CAC3B,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;OAKG;IACH,KAAK,EAAE,SAAS,EAAE,CAAM;IAExB;;;;;;OAMG;IACH,YAAY,EAAE,KAAK,EAAE,CAAM;IAE3B;;;;;;OAMG;IACH,YAAY,EAAE,OAAO,CAAS;IAE9B;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAEnB,KAAK,EAAE,cAAc,CAAC;IAE9B;;OAEG;IACH,OAAO,EAAE,MAAM,CAAK;IAEpB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAM;IAElB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAK;IAElB,SAAS,CAAC,WAAW,IAAI,cAAc;IAIvC;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAOvC;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAiBnC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IA6B9B;;;;;OAKG;IACG,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIjD;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA4B7B;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK;IAMvB;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAMnC;;;;;;OAMG;IACH,iBAAiB,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAK3C;;;;;;OAMG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBrB,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAwCnD"}
+{"version":3,"file":"md.d.ts","sourceRoot":"","sources":["../../../src/controller/control/md.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,OAAO,EAER,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAS,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC;;;;;;;;;GASG;AACH,qBAAa,YAAY,CACvB,CAAC,SAAS,OAAO,GAAG,OAAO,CAC3B,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB,KAAK,UAAiB;IAEtB;;;;;;OAMG;IACH,KAAK,EAAE,SAAS,EAAE,CAAM;IAExB;;;;;;;OAOG;IACH,YAAY,EAAE,KAAK,EAAE,CAAM;IAE3B;;;;;;;OAOG;IACH,YAAY,EAAE,OAAO,CAAS;IAE9B;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAS;IAEtC;;;;;OAKG;IACH,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAM;IAEtC;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAEnB,KAAK,EAAE,cAAc,CAAC;IAE9B;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAK;IAEpB;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAM;IAElB;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAK;IAElB,SAAS,CAAC,WAAW,IAAI,cAAc;IAIvC;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAOvC;;;OAGG;IACH,uBAAuB,CAAC,oBAAoB,CAAC,EAAE,OAAO,GAAG,IAAI;IAM7D;;;OAGG;IACH,oBAAoB,CAAC,iBAAiB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI;IAM7D;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAiBnC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IA2D9B;;;;;OAKG;IACG,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIjD;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAgC7B;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK;IAQvB;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAMnC;;;;;;OAMG;IACH,iBAAiB,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAK3C;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBjC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAwCnD"}

package/out/controller/control/md.js

@@ -3,6 +3,7 @@ import { downloadFileFromBlob, RuntimeError } from '@ibiz-template/core';
 import { DefectModelError, UnsupportedModelError, } from '@ibiz-template/model';
 import { Srfuf } from '../../service';
 import { MDControlNerve } from '../neuron';
+import { MDState } from '../state';
 import { MainController } from './main';
 /**
  * 多数据部件控制器
@@ -17,8 +18,10 @@ import { MainController } from './main';
 export class MDController extends MainController {
     constructor() {
         super(...arguments);
+        this.state = new MDState();
         /**
          * 多数据部件数据集合
+         * @deprecated
          * @author lxm
          * @date 2022-08-17 19:08:11
          * @type {ControlVO[]}
@@ -27,6 +30,7 @@ export class MDController extends MainController {
         /**
          * 多数据部件已选中的数据集合
          *
+         * @deprecated
          * @author lxm
          * @date 2022-08-18 22:08:14
          * @type {IData[]}
@@ -35,21 +39,46 @@ export class MDController extends MainController {
         /**
          * 是否是单项选择
          *
+         * @deprecated
          * @author lxm
          * @date 2022-08-19 10:08:29
          * @type {boolean}
          */
         this.singleSelect = false;
+        /**
+         * 是否默认选中第一条数据
+         *
+         * @type {boolean}
+         * @memberof MDController
+         */
+        this.isSelectFirstDefault = false;
+        /**
+         * 默认选中的数据
+         *
+         * @type {Array}
+         * @memberof MDController
+         */
+        this.defaultSelectKeys = [];
+        /**
+         * 是否默认选中第一条数据
+         *
+         * @type {boolean}
+         * @memberof MDController
+         */
+        this.isExpView = false;
         /**
          * 当前页
+         * @deprecated
          */
         this.curPage = 1;
         /**
          * 分页条数
+         * @deprecated
          */
         this.size = 20;
         /**
          * 总条数
+         * @deprecated
          */
         this.total = 0;
     }
@@ -69,6 +98,24 @@ export class MDController extends MainController {
         // 获取外部通知的singeleSelect
         // this.singleSelect =
     }
+    /**
+     * 设置是否默认选中第一条
+     *
+     */
+    setIsSelectFirstDefault(isSelectFirstDefault) {
+        if (typeof isSelectFirstDefault === 'boolean') {
+            this.isSelectFirstDefault = isSelectFirstDefault;
+        }
+    }
+    /**
+     * 设置默认选中数据主键集合
+     *
+     */
+    setDefaultSelectKeys(defaultSelectKeys) {
+        if (defaultSelectKeys) {
+            this.defaultSelectKeys = defaultSelectKeys;
+        }
+    }
     /**
      * 获取请求过滤参数（整合了视图参数，各种过滤条件，排序，分页）
      *
@@ -84,7 +131,7 @@ export class MDController extends MainController {
                 return Object.assign(preVal, curVal);
             })
             : {};
-        return Object.assign(Object.assign(Object.assign({}, this.params), _params), { page: this.curPage - 1, size: this.size });
+        return Object.assign(Object.assign(Object.assign({}, this.params), _params), { page: this.state.curPage - 1, size: this.state.size });
     }
     /**
      * 部件加载数据行为
@@ -106,15 +153,41 @@ export class MDController extends MainController {
         }
         // 更新分页数据总条数
         if (res.total) {
-            this.total = res.total;
+            this.state.total = res.total;
         }
         res.data.forEach(item => {
             item.reactiveInit();
         });
-        this.items = res.data;
-        await this.afterLoad(this.items);
+        this.state.items = res.data;
+        // 第一次加载并且默认选中第一条数据时
+        if (!this.state.hasLoaded &&
+            this.isSelectFirstDefault &&
+            this.state.items[0]) {
+            if (this.defaultSelectKeys.length === 0) {
+                // 不存在默认选中的时候，才往外抛第一条
+                await this.nerve.self.evt.asyncEmit('dataActive', this.state.items[0]);
+            }
+            else if (this.defaultSelectKeys.length > 0) {
+                // 存在默认选中但是返回数据里没有该条时，也往外抛第一条
+                const keyArr = this.state.items.map((item) => {
+                    return item.srfkey;
+                });
+                let result = false;
+                for (const select of this.defaultSelectKeys) {
+                    if (keyArr.includes(select)) {
+                        result = true;
+                        break;
+                    }
+                }
+                if (!result) {
+                    await this.nerve.self.evt.asyncEmit('dataActive', this.state.items[0]);
+                }
+            }
+        }
+        await this.afterLoad(this.state.items);
+        this.state.hasLoaded = true;
         this.force();
-        return this.items;
+        return this.state.items;
     }
     /**
      * 部件加载后处理
@@ -133,12 +206,12 @@ export class MDController extends MainController {
      * @returns {*}  {Promise<void>}
      */
     async remove() {
-        if (this.selectedData.length === 0) {
+        if (this.state.selectedData.length === 0) {
             throw new RuntimeError('未选中数据');
         }
         await this.startLoading();
         try {
-            await Promise.allSettled(this.selectedData.map(async (data) => {
+            await Promise.allSettled(this.state.selectedData.map(async (data) => {
                 // 新建未保存的数据直接走后续删除处理逻辑
                 if (data.srfuf !== Srfuf.CREATE) {
                     // 删除后台的数据
@@ -150,8 +223,12 @@ export class MDController extends MainController {
         finally {
             await this.endLoading();
         }
-        await this.nerve.self.evt.asyncEmit('afterRemove', this.selectedData);
-        this.selectedData = [];
+        await this.nerve.self.evt.asyncEmit('afterRemove', this.state.selectedData);
+        this.state.selectedData = [];
+        if (this.isExpView) {
+            // 在导航视图内，删除后激活第一条
+            await this.nerve.self.evt.asyncEmit('dataActive', this.state.items[0]);
+        }
         this.force();
     }
     /**
@@ -163,8 +240,8 @@ export class MDController extends MainController {
      */
     afterRemove(data) {
         // 删除this.items里的数据
-        const index = this.items.findIndex(item => item.srfkey === data.srfkey);
-        this.items.splice(index, 1);
+        const index = this.state.items.findIndex(item => item.srfkey === data.srfkey);
+        this.state.items.splice(index, 1);
     }
     /**
      * 获取多数据部件的选中数据集合
@@ -174,7 +251,7 @@ export class MDController extends MainController {
      * @returns {*}  {IData[]}
      */
     getData() {
-        return this.selectedData || [];
+        return this.state.selectedData || [];
     }
     /**
      * 选中所有数据并返回
@@ -184,9 +261,9 @@ export class MDController extends MainController {
      * @returns {*}  {Promise<IData[]>}
      */
     async selectAll() {
-        this.selectedData = [...this.items];
-        this.nerve.self.evt.emit('selectionChange', this.selectedData);
-        return this.selectedData;
+        this.state.selectedData = [...this.state.items];
+        this.nerve.self.evt.emit('selectionChange', this.state.selectedData);
+        return this.state.selectedData;
     }
     /**
      * 处理选中项变更事件
@@ -196,7 +273,7 @@ export class MDController extends MainController {
      * @param {IData[]} selection 当前选中的项集合
      */
     onSelectionChange(selection) {
-        this.selectedData = selection;
+        this.state.selectedData = selection;
         this.nerve.self.evt.emit('selectionChange', selection);
     }
     /**
@@ -206,7 +283,7 @@ export class MDController extends MainController {
      * @date 2022-11-08 15:11:54
      * @returns {*}  {Promise<void>}
      */
-    importData() {
+    async importData() {
         const { appEntity, dataImport } = this.model;
         let templateUrl = `${appEntity.deNamePlural}/importtemplate`;
         let importUrl = `${appEntity.deNamePlural}/importdata2`;
@@ -214,11 +291,24 @@ export class MDController extends MainController {
             templateUrl += `?srfimporttag=${dataImport.codeName}`;
             importUrl += `?srfimporttag=${dataImport.codeName}`;
         }
-        return ibiz.overlay.modal('DataImport', { templateUrl, importUrl }, {
+        const modal = ibiz.overlay.createModal('DataImport', {
+            dismiss: () => modal.dismiss(),
+            templateUrl,
+            importUrl,
+        }, {
             width: 'auto',
             placement: 'center',
         });
+        modal.present();
+        await modal.onWillDismiss();
     }
+    /**
+     * 数据导出
+     *
+     * @param {MouseEvent} event 原生js点击事件
+     * @returns {*}  {Promise<void>}
+     * @memberof MDController
+     */
     async exportData(event) {
         const { dataExport, appEntity } = this.model;
         if (!dataExport) {
@@ -231,7 +321,7 @@ export class MDController extends MainController {
         const popover = ibiz.overlay.createPopover('DataExport', {
             dismiss: (result) => popover.dismiss(result),
             maxRowCount: dataExport.maxRowCount || 1000,
-            pageSize: this.size,
+            pageSize: this.state.size,
         }, { autoClose: true, placement: 'bottom-end' });
         popover.present(event.target);
         const exportParams = await popover.onWillDismiss();

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

@@ -1,6 +1,7 @@
 import { TreeModel } from '@ibiz-template/model';
-import { TreeNodeData, TreeService } from '../../service';
+import { ITreeNodeData, TreeService } from '../../service';
 import { TreeNerve } from '../neuron';
+import { TreeState } from '../state';
 import { MDController } from './md';
 /**
  * 树部件控制器
@@ -12,14 +13,8 @@ import { MDController } from './md';
  * @extends {MDController<TreeModel>}
  */
 export declare class TreeController extends MDController<TreeModel> {
+    state: TreeState;
     nerve: TreeNerve;
-    /**
-     * 树节点集合
-     *
-     * @type {TreeNodeData[]}
-     * @memberof TreeController
-     */
-    treeNodes: TreeNodeData[];
     /**
      * 树部件服务
      *
@@ -36,6 +31,22 @@ export declare class TreeController extends MDController<TreeModel> {
      * @author lxm
      * @date 2022-08-19 14:08:50
      */
-    load(): Promise<IData[]>;
+    load(): Promise<ITreeNodeData[]>;
+    /**
+     * 加载子节点数据
+     *
+     * @param {(ITreeNodeData | undefined)} parentNode
+     * @returns {*}
+     * @memberof TreeController
+     */
+    loadNodes(parentNode: ITreeNodeData | undefined): Promise<ITreeNodeData[]>;
+    /**
+     * 树节点点击事件
+     *
+     * @param {ITreeNodeData} nodeData
+     * @returns {*}  {Promise<void>}
+     * @memberof TreeController
+     */
+    onTreeNodeClick(nodeData: ITreeNodeData): Promise<void>;
 }
 //# sourceMappingURL=tree.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../../src/controller/control/tree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAEpC;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,YAAY,CAAC,SAAS,CAAC;IACjD,KAAK,EAAE,SAAS,CAAC;IAEzB;;;;;OAKG;IACH,SAAS,EAAE,YAAY,EAAE,CAAM;IAE/B;;;;;;OAMG;IACK,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,SAAS;cAIlB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAMvC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;CAY/B"}
+{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../../src/controller/control/tree.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAEpC;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,YAAY,CAAC,SAAS,CAAC;IACzD,KAAK,YAAmB;IAEhB,KAAK,EAAE,SAAS,CAAC;IAEzB;;;;;;OAMG;IACK,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,SAAS;cAIlB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAMvC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAQtC;;;;;;OAMG;IACG,SAAS,CACb,UAAU,EAAE,aAAa,GAAG,SAAS,GACpC,OAAO,CAAC,aAAa,EAAE,CAAC;IAiC3B;;;;;;OAMG;IACG,eAAe,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAG9D"}