@ibiz-template/runtime 0.1.28 → 0.1.29

package/out/controller/control/form/edit-form/edit-form.controller.d.ts

@@ -1,5 +1,5 @@
-import { IDEEditForm } from '@ibiz/model-core';
-import { IEditFormState, IEditFormEvent, IEditFormController } from '../../../../interface';
+import { IAppDEEditView, IDEEditForm } from '@ibiz/model-core';
+import { IEditFormState, IEditFormEvent, IEditFormController, IViewController, IEditViewState, IEditViewEvent } from '../../../../interface';
 import { FormController } from '../form';
 import { EditFormService } from './edit-form.service';
 /**
@@ -19,6 +19,7 @@ export declare class EditFormController extends FormController<IDEEditForm, IEdi
      * @type {EditFormService}
      */
     service: EditFormService;
+    get view(): IViewController<IAppDEEditView, IEditViewState, IEditViewEvent>;
     /**
      * 初始化方法
      *
@@ -36,6 +37,14 @@ export declare class EditFormController extends FormController<IDEEditForm, IEdi
      * @return {*}  {Promise<IData>}
      */
     loadDraft(): Promise<IData>;
+    /**
+     * 拷贝模式加载数据
+     *
+     * @author chitanda
+     * @date 2023-09-26 19:09:21
+     * @return {*}  {Promise<IData>}
+     */
+    protected copy(): Promise<IData>;
     /**
      * 部件加载数据行为
      *

package/out/controller/control/form/edit-form/edit-form.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAY1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;OAKG;IACG,SAAS,IAAI,OAAO,CAAC,KAAK,CAAC;IAiCjC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAqC5B;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA+C5B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IA2ChC;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAc7B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+C7D;;;;;;;OAOG;IACG,OAAO,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BvD;;;;;;;OAOG;IACG,QAAQ,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAUhC"}
+{"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/D,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,cAAc,EACf,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B,IAAI,IAAI,IAAI,eAAe,CAAC,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,CAM1E;IAED;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAY1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;OAKG;IACG,SAAS,IAAI,OAAO,CAAC,KAAK,CAAC;IAiCjC;;;;;;OAMG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA4CtC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA0C5B;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA+C5B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IA2ChC;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAc7B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+C7D;;;;;;;OAOG;IACG,OAAO,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BvD;;;;;;;OAOG;IACG,QAAQ,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAUhC"}

package/out/controller/control/form/edit-form/edit-form.controller.js

@@ -1,6 +1,7 @@
 import { awaitTimeout, mergeInLeft, RuntimeError, mergeDefaultInLeft, } from '@ibiz-template/core';
 import { debounce } from 'lodash-es';
-import { hasDeCodeName } from '../../../../model';
+import { clone } from 'ramda';
+import { calcDeCodeNameById, hasDeCodeName } from '../../../../model';
 import { Srfuf, ControlVO } from '../../../../service';
 import { ScriptFactory } from '../../../../utils';
 import { FormNotifyState } from '../../../constant';
@@ -16,6 +17,9 @@ import { EditFormService } from './edit-form.service';
  * @extends {FormController<EditFormModel>}
  */
 export class EditFormController extends FormController {
+    get view() {
+        return this.ctx.view;
+    }
     /**
      * 初始化方法
      *
@@ -77,6 +81,51 @@ export class EditFormController extends FormController {
         this.state.isLoaded = true;
         return this.data;
     }
+    /**
+     * 拷贝模式加载数据
+     *
+     * @author chitanda
+     * @date 2023-09-26 19:09:21
+     * @return {*}  {Promise<IData>}
+     */
+    async copy() {
+        const context = clone(this.context);
+        const queryParams = clone(this.params);
+        const appDataEntity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId);
+        const key = appDataEntity.keyAppDEFieldId;
+        if (key && this.params[key]) {
+            const deCodeName = calcDeCodeNameById(this.model.appDataEntityId);
+            context[deCodeName] = this.params[key];
+            delete queryParams[key];
+            delete this.params[key];
+            delete queryParams.srfcopymode;
+            delete this.params.srfcopymode;
+        }
+        let res;
+        try {
+            await this.startLoading();
+            await this.evt.emit('onBeforeLoad', undefined);
+            res = await this.service.get(context, queryParams);
+        }
+        catch (error) {
+            await this.evt.emit('onLoadError', undefined);
+            this.actionNotification('GETERROR', {
+                error: error,
+            });
+            throw error;
+        }
+        finally {
+            await this.endLoading();
+        }
+        res.data.$origin.srfsourcekey = undefined;
+        this.state.modified = false;
+        this.state.data = res.data;
+        this.formStateNotify(FormNotifyState.LOAD);
+        await this.evt.emit('onLoadSuccess', undefined);
+        this.actionNotification('GETSUCCESS');
+        this.state.isLoaded = true;
+        return this.data;
+    }
     /**
      * 部件加载数据行为
      *
@@ -84,12 +133,17 @@ export class EditFormController extends FormController {
      * @date 2022-08-19 14:08:50
      */
     async load() {
+        // 复制模式独立处理
+        const copyMode = this.params.srfcopymode;
+        if (copyMode) {
+            return this.copy();
+        }
         const isLoadDraft = !hasDeCodeName(this.context, this.model.appDataEntityId);
         // 加载草稿单独走一个方法
         if (isLoadDraft) {
             return this.loadDraft();
         }
-        const queryParams = Object.assign({}, this.params);
+        const queryParams = clone(this.params);
         let res;
         try {
             await this.startLoading();

package/out/controller/control/form/edit-form/edit-form.service.js

@@ -197,7 +197,7 @@ export class EditFormService extends ControlService {
                 this.dataUIMap.set(uiKey, mapField);
             }
         }, {
-            childrenFields: ['deformPages', 'deformDetails'],
+            childrenFields: ['deformPages', 'deformTabPages', 'deformDetails'],
         });
     }
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAiB,MAAM,gBAAgB,CAAC;AAChE,OAAO,KAAK,EACV,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AAExB;;;;;;;;;GASG;AACH,8BAAsB,cAAc,CAChC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,UAAU,CAAC,CAEhD;IAED;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAEvD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;;OAMG;IACH,SAAS,EAAE,kBAAkB,EAAE,CAAM;IAErC;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IActD;;;;;OAKG;IACH,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAM7C;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1C;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC;IAQtC;;;;;;OAMG;cACa,qBAAqB,CACnC,OAAO,GAAE,aAAa,EAA4B,EAClD,IAAI,GAAE,cAAqB,EAC3B,MAAM,GAAE,wBAAwB,GAAG,SAAqB,GACvD,OAAO,CAAC,IAAI,CAAC;IAkChB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAE/B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB;;;;;;;OAOG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB/D;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IASlC,kBAAkB,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE,GACzC,IAAI;CAGR"}
+{"version":3,"file":"form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAiB,MAAM,gBAAgB,CAAC;AAChE,OAAO,KAAK,EACV,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AAExB;;;;;;;;;GASG;AACH,8BAAsB,cAAc,CAChC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,UAAU,CAAC,CAEhD;IAED;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAEvD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;;OAMG;IACH,SAAS,EAAE,kBAAkB,EAAE,CAAM;IAErC;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAStD;;;;;OAKG;IACH,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAM7C;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1C;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC;IAQtC;;;;;;OAMG;cACa,qBAAqB,CACnC,OAAO,GAAE,aAAa,EAA4B,EAClD,IAAI,GAAE,cAAqB,EAC3B,MAAM,GAAE,wBAAwB,GAAG,SAAqB,GACvD,OAAO,CAAC,IAAI,CAAC;IAkChB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAE/B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB;;;;;;;OAOG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB/D;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IASlC,kBAAkB,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE,GACzC,IAAI;CAGR"}

package/out/controller/control/form/form/form.controller.js

@@ -3,6 +3,7 @@ import { debounceAndAsyncMerge } from '@ibiz-template/core';
 import { findChildFormDetails } from '../../../../model';
 import { getFormDetailProvider } from '../../../../register';
 import { ControlVO } from '../../../../service';
+import { handleAllSettled } from '../../../../utils';
 import { ControlController } from '../../../common';
 import { isValueChange } from '../../../utils';
 /**
@@ -73,14 +74,9 @@ export class FormController extends ControlController {
      */
     async dataChangeNotify(names) {
         // 通知所有成员项去处理成员项相关逻辑
-        const values = await Promise.allSettled(Object.values(this.details).map(async (detail) => {
+        await handleAllSettled(Object.values(this.details).map(async (detail) => {
             return detail.dataChangeNotify(names);
         }));
-        const rejectedValue = values.find(item => item.status === 'rejected');
-        if (rejectedValue) {
-            ibiz.log.error('dataChangeNotify报错', values);
-            throw rejectedValue.reason;
-        }
     }
     /**
      * 表单状态变更通知

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

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

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

@@ -9,7 +9,7 @@ import { Srfuf } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
 import { getDefaultValue, isValueChange } from '../../../utils';
-import { ScriptFactory } from '../../../../utils';
+import { handleAllSettled, ScriptFactory } from '../../../../utils';
 /**
  * 表格控制器
  *
@@ -188,9 +188,9 @@ export class GridController extends MDControlController {
     async afterLoad(args, items) {
         await super.afterLoad(args, items);
         // 每次表格刷新时通知表格属性列,加载代码表,避免动态代码表更新不及时
-        await Promise.allSettled(Object.values(this.fieldColumns).map(async (fieldColumn) => {
+        await handleAllSettled(Object.values(this.fieldColumns).map(async (fieldColumn) => {
             await fieldColumn.loadCodeList();
-        }));
+        }), false);
         // 生成表格row对象
         this.state.rows = items.map(item => {
             const row = new GridRowState(item, this);
@@ -418,7 +418,7 @@ export class GridController extends MDControlController {
         if (!needSaveData.length) {
             return;
         }
-        Promise.allSettled(needSaveData.map(data => {
+        await handleAllSettled(needSaveData.map(data => {
             return this.save(data);
         }));
     }
@@ -555,14 +555,9 @@ export class GridController extends MDControlController {
      */
     async dataChangeNotify(row, names) {
         // 通知所有编辑项去处理编辑项相关逻辑
-        const values = await Promise.allSettled(Object.values(this.editColumns).map(async (column) => {
+        await handleAllSettled(Object.values(this.editColumns).map(async (column) => {
             return column.dataChangeNotify(row, names);
         }));
-        const rejectedValue = values.find(item => item.status === 'rejected');
-        if (rejectedValue) {
-            ibiz.log.error('dataChangeNotify报错', values);
-            throw rejectedValue.reason;
-        }
     }
     /**
      * 表格状态变更通知

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

@@ -19,4 +19,6 @@ export * from './tree/index';
 export * from './wizard-panel/index';
 export * from './md-ctrl/index';
 export * from './kanban/index';
+export * from './tree-grid-ex/index';
+export * from './tree-grid/index';
 //# 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":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/controller/control/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC"}

package/out/controller/control/index.js

@@ -19,3 +19,5 @@ export * from './tree/index';
 export * from './wizard-panel/index';
 export * from './md-ctrl/index';
 export * from './kanban/index';
+export * from './tree-grid-ex/index';
+export * from './tree-grid/index';

package/out/controller/control/toolbar/toolbar.controllerr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toolbar.controllerr.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/toolbar.controllerr.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,cAAc,EAEd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,YAAY,EAEb,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,eAAe,EAGhB,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;;;;;;OAWG;cACa,UAAU,CACxB,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,UAAU,EACjB,KAAK,GAAE,KAAU,GAChB,OAAO,CAAC,IAAI,CAAC;cAoCA,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1C;;;;;;;;;;OAUG;IACG,WAAW,CACf,IAAI,EAAE,cAAc,GAAG,YAAY,EACnC,KAAK,EAAE,UAAU,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,IAAI,CAAC;IAcV,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCpE,eAAe,CACb,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,EACrC,OAAO,EAAE,YAAY,EAAE,GACtB,IAAI;IAOP,iBAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI;IAS/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;CAcnE"}
+{"version":3,"file":"toolbar.controllerr.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/toolbar.controllerr.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,cAAc,EAEd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,YAAY,EAEb,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,eAAe,EAGhB,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;;;;;;OAWG;cACa,UAAU,CACxB,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,UAAU,EACjB,KAAK,GAAE,KAAU,GAChB,OAAO,CAAC,IAAI,CAAC;cAoCA,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1C;;;;;;;;;;OAUG;IACG,WAAW,CACf,IAAI,EAAE,cAAc,GAAG,YAAY,EACnC,KAAK,EAAE,UAAU,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,IAAI,CAAC;IAcV,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA6CpE,eAAe,CACb,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,EACrC,OAAO,EAAE,YAAY,EAAE,GACtB,IAAI;IAOP,iBAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI;IAS/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;CAcnE"}

package/out/controller/control/toolbar/toolbar.controllerr.js

@@ -75,7 +75,7 @@ export class ToolbarController extends ControlController {
                 this.state.buttonsState.addState(uiItem.id, buttonState);
             }
         }, { childrenFields: ['detoolbarItems'] });
-        await this.state.buttonsState.update();
+        await this.calcButtonState();
     }
     /**
      * 工具栏按钮点击事件
@@ -107,24 +107,24 @@ export class ToolbarController extends ControlController {
         }
         await this.state.buttonsState.update(_data, appDeId);
         // 计算菜单项逻辑的预置逻辑
-        if (this.scheduler && _data) {
+        if (this.scheduler) {
+            const logicParams = {};
+            if (_data) {
+                logicParams.data = [_data];
+            }
             // 遍历所有的项
             recursiveIterate(this.model, (item) => {
                 const itemState = this.state.buttonsState[item.id];
                 // 计算项显示逻辑
                 if (itemState.visible) {
-                    const dynaVisible = this.scheduler.triggerItemVisible(item.id, {
-                        data: [_data],
-                    });
+                    const dynaVisible = this.scheduler.triggerItemVisible(item.id, logicParams);
                     if (dynaVisible !== undefined) {
                         itemState.visible = dynaVisible;
                     }
                 }
                 // 计算项启用逻辑
                 if (!itemState.disabled) {
-                    const dynaEnable = this.scheduler.triggerItemEnable(item.id, {
-                        data: [_data],
-                    });
+                    const dynaEnable = this.scheduler.triggerItemEnable(item.id, logicParams);
                     if (dynaEnable !== undefined) {
                         itemState.disabled = !dynaEnable;
                     }

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

@@ -1 +1 @@
-{"version":3,"file":"tree.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EACP,mBAAmB,EACnB,kBAAkB,EAClB,WAAW,EACX,aAAa,EACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAOnD,OAAO,EACL,gBAAgB,EAEhB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAG1B,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE/B;;;;;OAKG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;;;;;;GAOG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;;;OAOG;IACG,eAAe,CACnB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CAAC;IAiDvC;;;;;;;;;;OAUG;cACa,oBAAoB,CAClC,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,EAAE,CAAC;IAwE3B;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,CAAC;IAUzB;;;;;;;OAOG;IACH,qBAAqB,CACnB,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB;QACD,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,OAAO,CAAC;QAChB,UAAU,EAAE,OAAO,CAAC;QACpB,SAAS,EAAE,OAAO,CAAC;KACpB;IA+DD;;;;;;;;OAQG;cACa,cAAc,CAC5B,SAAS,EAAE,kBAAkB,EAC7B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,mBAAmB,EAAE,CAAC;IA2CjC;;;;;;;OAOG;cACa,oBAAoB,CAClC,SAAS,EAAE,mBAAmB,EAC9B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,oBAAoB,EAAE,CAAC;CA8BnC"}
+{"version":3,"file":"tree.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EACP,mBAAmB,EACnB,kBAAkB,EAClB,WAAW,EACX,aAAa,EACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAOnD,OAAO,EACL,gBAAgB,EAEhB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAG1B,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE/B;;;;;OAKG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;;;;;;GAOG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;;;OAOG;IACG,eAAe,CACnB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CAAC;IA8CvC;;;;;;;;;;OAUG;cACa,oBAAoB,CAClC,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,EAAE,CAAC;IAwE3B;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,CAAC;IAUzB;;;;;;;OAOG;IACH,qBAAqB,CACnB,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB;QACD,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,OAAO,CAAC;QAChB,UAAU,EAAE,OAAO,CAAC;QACpB,SAAS,EAAE,OAAO,CAAC;KACpB;IA+DD;;;;;;;;OAQG;cACa,cAAc,CAC5B,SAAS,EAAE,kBAAkB,EAC7B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,mBAAmB,EAAE,CAAC;IA6CjC;;;;;;;OAOG;cACa,oBAAoB,CAClC,SAAS,EAAE,mBAAmB,EAC9B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,oBAAoB,EAAE,CAAC;CA8BnC"}

package/out/controller/control/tree/tree.service.js

@@ -1,7 +1,7 @@
 import { ModelError } from '@ibiz-template/core';
 import { getRootNode, getChildNodeRSs, getTreeNode, calcDeCodeNameById, } from '../../../model';
 import { MDControlService, TreeStaticNodeData, TreeDataSetNodeData, TreeCodeListNodeData, } from '../../../service';
-import { calcNavParams } from '../../../utils';
+import { calcNavParams, handleAllSettled } from '../../../utils';
 /**
  * 树部件服务
  * @author lxm
@@ -36,17 +36,12 @@ export class TreeService extends MDControlService {
             if (childNodeRSs.length === 0) {
                 return;
             }
-            const results = await Promise.allSettled(childNodeRSs.map(async (childNodeRS) => {
+            const results = await handleAllSettled(childNodeRSs.map(async (childNodeRS) => {
                 const childNode = getTreeNode(this.model, childNodeRS.childDETreeNodeId);
                 return this.fetchNodeDatasByType(childNode, childNodeRS, parentNodeData, opts);
-            }));
+            }), false);
             results.forEach(result => {
-                if (result.status === 'fulfilled' && result.value) {
-                    childrenNodes.push(...result.value);
-                }
-                else if (result.status === 'rejected') {
-                    ibiz.log.error(result.reason);
-                }
+                childrenNodes.push(...result);
             });
         }
         return childrenNodes;
@@ -193,9 +188,9 @@ export class TreeService extends MDControlService {
         // 设置查询长度
         params.size = nodeModel.maxSize || 1000;
         // 排序属性
-        if (nodeModel.sortAppDEFieldId && nodeModel.sortDir) {
+        if (nodeModel.sortAppDEFieldId) {
             Object.assign(params, {
-                sort: `${nodeModel.sortAppDEFieldId.toLowerCase()},${nodeModel.sortDir.toLowerCase()}`,
+                sort: `${nodeModel.sortAppDEFieldId.toLowerCase()},${nodeModel.sortDir ? nodeModel.sortDir.toLowerCase() : 'asc'}`,
             });
         }
         // 请求实体数据

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

@@ -0,0 +1,3 @@
+export * from './tree-grid.controller';
+export * from './tree-grid.service';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC"}

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

@@ -0,0 +1,2 @@
+export * from './tree-grid.controller';
+export * from './tree-grid.service';

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

@@ -0,0 +1,5 @@
+import { ITreeGridController } from '../../../interface';
+import { GridController } from '../grid';
+export declare class TreeGridController extends GridController implements ITreeGridController {
+}
+//# sourceMappingURL=tree-grid.controller.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tree-grid.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid/tree-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,qBAAa,kBACX,SAAQ,cACR,YAAW,mBAAmB;CAAG"}

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

@@ -0,0 +1,3 @@
+import { GridController } from '../grid';
+export class TreeGridController extends GridController {
+}

package/out/controller/control/tree-grid/tree-grid.service.d.ts

@@ -0,0 +1,13 @@
+import { GridService } from '../grid';
+/**
+ * 树表格部件服务
+ *
+ * @author zk
+ * @date 2023-09-25 05:09:52
+ * @export
+ * @class TreeGridService
+ * @extends {TreeService}
+ */
+export declare class TreeGridService extends GridService {
+}
+//# sourceMappingURL=tree-grid.service.d.ts.map

package/out/controller/control/tree-grid/tree-grid.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tree-grid.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid/tree-grid.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC;;;;;;;;GAQG;AACH,qBAAa,eAAgB,SAAQ,WAAW;CAAG"}

package/out/controller/control/tree-grid/tree-grid.service.js

@@ -0,0 +1,12 @@
+import { GridService } from '../grid';
+/**
+ * 树表格部件服务
+ *
+ * @author zk
+ * @date 2023-09-25 05:09:52
+ * @export
+ * @class TreeGridService
+ * @extends {TreeService}
+ */
+export class TreeGridService extends GridService {
+}

package/out/controller/control/tree-grid-ex/index.d.ts

@@ -0,0 +1,3 @@
+export * from './tree-grid-ex.controller';
+export * from './tree-grid-ex.service';
+//# sourceMappingURL=index.d.ts.map

package/out/controller/control/tree-grid-ex/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid-ex/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC"}

package/out/controller/control/tree-grid-ex/index.js

@@ -0,0 +1,2 @@
+export * from './tree-grid-ex.controller';
+export * from './tree-grid-ex.service';

package/out/controller/control/tree-grid-ex/tree-grid-ex.controller.d.ts

@@ -0,0 +1,134 @@
+import { IDETree, IDETreeColumn } from '@ibiz/model-core';
+import { MDCtrlLoadParams, ITreeNodeData, ITreeGridExController, IGridColumnProvider, ITreeGridExState, ITreeGridExEvent } from '../../../interface';
+import { MDControlController } from '../../common';
+import { GridColumnController, GridFieldColumnController, GridUAColumnController } from '../grid';
+import { TreeGridExService } from './tree-grid-ex.service';
+/**
+ * 树表格部件控制器
+ *
+ * @author zk
+ * @date 2023-09-21 06:09:46
+ * @export
+ * @class TreeGridExController
+ * @extends {MDControlController<IDETree, ITreeGridState, ITreeGridEvent>}
+ * @implements {ITreeGridExController}
+ */
+export declare class TreeGridExController extends MDControlController<IDETree, ITreeGridExState, ITreeGridExEvent> implements ITreeGridExController {
+    service: TreeGridExService;
+    /**
+     * 表格列的适配器
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:04
+     * @type {{ [key: string]: IGridColumnProvider }}
+     * @memberof TreeGridExController
+     */
+    providers: {
+        [key: string]: IGridColumnProvider;
+    };
+    /**
+     * 所有表格列控制器集合
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:10
+     * @type {{ [key: string]: GridColumnController }}
+     * @memberof TreeGridExController
+     */
+    columns: {
+        [key: string]: GridColumnController;
+    };
+    /**
+     * 所有表格属性列的控制器
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:16
+     * @type {{ [key: string]: GridFieldColumnController }}
+     * @memberof TreeGridExController
+     */
+    fieldColumns: {
+        [key: string]: GridFieldColumnController;
+    };
+    /**
+     * 所有表格操作列的控制器
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:21
+     * @type {{ [key: string]: GridUAColumnController }}
+     * @memberof TreeGridExController
+     */
+    uaColumns: {
+        [key: string]: GridUAColumnController;
+    };
+    protected initState(): void;
+    protected onCreated(): Promise<void>;
+    /**
+     * 初始化表格属性列，操作列，编辑项控制器
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:28
+     * @protected
+     * @return {*}  {Promise<void>}
+     * @memberof TreeGridExController
+     */
+    protected initGridColumns(): Promise<void>;
+    /**
+     * 初始化表格属性列，操作列，编辑项控制器
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:37
+     * @protected
+     * @param {IDETreeColumn} column
+     * @return {*}  {Promise<void>}
+     * @memberof TreeGridExController
+     */
+    protected initColumnsController(column: IDETreeColumn): Promise<void>;
+    /**
+     * 初始化表格列状态
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:43
+     * @protected
+     * @memberof TreeGridExController
+     */
+    protected initColumnStates(): void;
+    /**
+     * 计算列的固定状态
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:50
+     * @protected
+     * @memberof TreeGridExController
+     */
+    protected calcColumnFixed(): void;
+    /**
+     * 树部件加载，从根节点开始重新加载
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:56
+     * @param {MDCtrlLoadParams} [args={}]
+     * @return {*}  {Promise<ITreeNodeData[]>}
+     * @memberof TreeGridExController
+     */
+    load(args?: MDCtrlLoadParams): Promise<ITreeNodeData[]>;
+    /**
+     * 加载子节点数据
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:02
+     * @param {ITreeNodeData} [parentNode]
+     * @return {*}  {Promise<ITreeNodeData[]>}
+     * @memberof TreeGridExController
+     */
+    loadNodes(parentNode?: ITreeNodeData): Promise<ITreeNodeData[]>;
+    /**
+     * 计算展开节点集合
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:07
+     * @param {ITreeNodeData[]} nodes
+     * @return {*}  {string[]}
+     * @memberof TreeGridExController
+     */
+    protected calcExpandedKeys(nodes: ITreeNodeData[]): string[];
+}
+//# sourceMappingURL=tree-grid-ex.controller.d.ts.map

package/out/controller/control/tree-grid-ex/tree-grid-ex.controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tree-grid-ex.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,qBAAqB,EACrB,mBAAmB,EACnB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EACL,oBAAoB,EACpB,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;;;;;;;;GASG;AACH,qBAAa,oBACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,CACvE,YAAW,qBAAqB;IAExB,OAAO,EAAE,iBAAiB,CAAC;IAEnC;;;;;;;OAOG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;;;OAOG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEtD;;;;;;;OAOG;IACH,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAA;KAAE,CAAM;IAEhE;;;;;;;OAOG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAM;IAE1D,SAAS,CAAC,SAAS,IAAI,IAAI;cAQX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1C;;;;;;;;OAQG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAUhD;;;;;;;;;OASG;cACa,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB3E;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAkBlC;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAcjC;;;;;;;;OAQG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAajE;;;;;;;;OAQG;IACG,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAyCrE;;;;;;;;OAQG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE;CAa7D"}