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

package/out/controller/view/tree-exp-view.js

@@ -1,6 +1,9 @@
-import { ViewMode } from '../../constant';
+import { IBizContext } from '@ibiz-template/core';
+import { notNilEmpty } from 'qx-util';
 import { TreeExpViewNerve } from '../neuron';
-import { ViewController } from './view';
+import { TreeExpViewState } from '../state';
+import { convertNavData } from '../../utils';
+import { MDViewController } from './md-view';
 /**
  * 树导航视图控制器
  *
@@ -10,7 +13,11 @@ import { ViewController } from './view';
  * @class TreeExpViewController
  * @extends {ViewController}
  */
-export class TreeExpViewController extends ViewController {
+export class TreeExpViewController extends MDViewController {
+    constructor() {
+        super(...arguments);
+        this.state = new TreeExpViewState();
+    }
     createNerve() {
         return new TreeExpViewNerve(this);
     }
@@ -21,11 +28,6 @@ export class TreeExpViewController extends ViewController {
         if (tree) {
             this.providers[tree.name] = await ibiz.register.control.get(tree);
         }
-        this.nerve.self.evt.on('mounted', () => {
-            if (this.modal.mode !== ViewMode.EMBED && this.model.source.loadDefault) {
-                this.load();
-            }
-        });
     }
     /**
      * 加载方法
@@ -38,4 +40,47 @@ export class TreeExpViewController extends ViewController {
         const { tree } = this.nerve;
         return tree.call.load();
     }
+    async onDataActive(nodeData) {
+        const tempContext = new IBizContext({}, this.context);
+        const tempParams = Object.assign({}, this.params);
+        const nodeModel = this.model.tree.getNodeById(nodeData.nodeId);
+        const { navView } = nodeModel;
+        if (!navView) {
+            return;
+        }
+        if (!navView.initialized) {
+            await navView.init();
+        }
+        // 处理导航视图参数
+        // 处理上下文主键，默认实体名称，有导航过滤项的使用过滤项作为键名
+        let keyFieldName;
+        if (navView.appEntity) {
+            keyFieldName = navView.appEntity.deName;
+        }
+        if (nodeModel.navFilter) {
+            keyFieldName = nodeModel.navFilter;
+        }
+        if (keyFieldName) {
+            tempContext[keyFieldName] = nodeData.value;
+        }
+        // todo导航关系
+        // 自定义导航参数
+        const navContexts = nodeModel.source.getPSNavigateContexts();
+        if (notNilEmpty(navContexts)) {
+            Object.assign(tempContext, convertNavData(navContexts, this.context, this.params, nodeData.deData || nodeData));
+        }
+        // 处理导航视图参数
+        const navParams = nodeModel.source.getPSNavigateParams();
+        if (notNilEmpty(navParams)) {
+            Object.assign(tempParams, convertNavData(navParams, this.params, this.context, nodeData.deData || nodeData));
+        }
+        // 路由模式下跳转路由
+        if (this.context.isRouter) {
+            Object.assign(tempContext, {
+                toRouteLevel: this.modal.level + 1,
+                currentRouteContext: nodeData.id,
+            });
+            ibiz.openView.root(navView.source, tempContext, tempParams);
+        }
+    }
 }

package/out/controller/view/view.d.ts

@@ -5,6 +5,7 @@ import { ViewNerve } from '../neuron';
 import { IButtonContainerState, IControlProvider } from '../interface';
 import { IModal, IModalData } from '../../interface';
 import { Application } from '../../application';
+import { ViewState } from '../state';
 /**
  * 视图控制器
  *
@@ -24,6 +25,12 @@ export declare class ViewController<T extends ViewModel = ViewModel> {
      * @type {T}
      */
     model: T;
+    /**
+     * 视图UI状态
+     *
+     * @memberof ViewController
+     */
+    state: ViewState;
     /**
      * 当前视图所归属的应用
      *
@@ -58,7 +65,7 @@ export declare class ViewController<T extends ViewModel = ViewModel> {
     params: IParams;
     /**
      * 控制器是否已经准备完成
-     *
+     * @deprecated
      * @author chitanda
      * @date 2022-07-24 16:07:25
      * @type {boolean}
@@ -75,6 +82,7 @@ export declare class ViewController<T extends ViewModel = ViewModel> {
     /**
      * 视图标题
      *
+     * @deprecated
      * @author lxm
      * @date 2022-08-25 11:08:45
      * @type {string}
@@ -83,13 +91,14 @@ export declare class ViewController<T extends ViewModel = ViewModel> {
     /**
      * 视图工具栏界面状态
      *
+     * @deprecated
      * @author lxm
      * @date 2022-10-13 23:10:20
      * @type {IButtonContainerState}
      */
     toolbarState: IButtonContainerState | null;
     /**
-     * 视图loading
+     * 视图loading状态控制器
      *
      * @author lxm
      * @date 2022-09-19 14:09:12

package/out/controller/view/view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAEL,eAAe,EACf,mBAAmB,EACnB,SAAS,EACV,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAIrD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,cAAc,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS;IA+GhD,SAAS,EAAE,MAAM;IA9G1B;;;;;;;OAOG;IACH,KAAK,EAAG,CAAC,CAAC;IAEV;;;;;;OAMG;IACH,GAAG,EAAG,WAAW,CAAC;IAElB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAA4B;IAEzC;;;;;;OAMG;IACH,OAAO,EAAE,WAAW,CAAC;IAErB;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,KAAK,EAAG,SAAS,CAAC;IAElB;;;;;;OAMG;IACH,OAAO,EAAG,MAAM,CAAC;IAEjB;;;;;;OAMG;IACH,YAAY,EAAE,qBAAqB,GAAG,IAAI,CAAQ;IAElD;;;;;OAKG;IACH,WAAW,eAAsB;IAEjC;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD;;;;;;;;;OASG;gBAEM,SAAS,EAAE,MAAM,EACxB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY;IAOtB;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,SAAS;IAIlC;;;;;;;OAOG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAU3B;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAWvC;;;;;;OAMG;IACH,gBAAgB,IAAI,IAAI;IAsBxB;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAuBlC;;;;;;OAMG;IACH,OAAO,IAAI,IAAI;IAIf;;;;;OAKG;IACG,OAAO;IAIb;;;;;;;;OAQG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB;;;;;OAKG;IACG,SAAS,CAAC,IAAI,GAAE,UAA+C;IAIrE;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAKrC;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAKnC;;;;;;;OAOG;IAEH,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI;IAK3C;;;;;;;OAOG;IACG,cAAc,CAClB,IAAI,EAAE,mBAAmB,EACzB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAehB;;;;;;;;OAQG;IACG,gBAAgB,CACpB,YAAY,EAAE,eAAe,EAC7B,IAAI,EAAE,KAAK,EAAE,EACb,KAAK,CAAC,EAAE,UAAU,GACjB,OAAO,CAAC,IAAI,CAAC;IAOhB;;;;;;OAMG;IACH,UAAU,CAAC,OAAO,EAAE,MAAM;IAM1B;;;;;OAKG;IACH,gBAAgB;IAIhB;;;;;OAKG;IACH,cAAc;CAGf"}
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAEL,eAAe,EACf,mBAAmB,EACnB,SAAS,EACV,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAIrD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC;;;;;;;GAOG;AACH,qBAAa,cAAc,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS;IAwHhD,SAAS,EAAE,MAAM;IAvH1B;;;;;;;OAOG;IACH,KAAK,EAAG,CAAC,CAAC;IAEV;;;;OAIG;IACH,KAAK,YAAmB;IAExB;;;;;;OAMG;IACH,GAAG,EAAG,WAAW,CAAC;IAElB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAA4B;IAEzC;;;;;;OAMG;IACH,OAAO,EAAE,WAAW,CAAC;IAErB;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,KAAK,EAAG,SAAS,CAAC;IAElB;;;;;;;OAOG;IACH,OAAO,EAAG,MAAM,CAAC;IAEjB;;;;;;;OAOG;IACH,YAAY,EAAE,qBAAqB,GAAG,IAAI,CAAQ;IAElD;;;;;OAKG;IACH,WAAW,eAAsB;IAEjC;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD;;;;;;;;;OASG;gBAEM,SAAS,EAAE,MAAM,EACxB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY;IAOtB;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,SAAS;IAIlC;;;;;;;OAOG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAU3B;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAWvC;;;;;;OAMG;IACH,gBAAgB,IAAI,IAAI;IAsBxB;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAuBlC;;;;;;OAMG;IACH,OAAO,IAAI,IAAI;IAIf;;;;;OAKG;IACG,OAAO;IAIb;;;;;;;;OAQG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB;;;;;OAKG;IACG,SAAS,CAAC,IAAI,GAAE,UAA+C;IAIrE;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAKrC;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAKnC;;;;;;;OAOG;IAEH,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI;IAK3C;;;;;;;OAOG;IACG,cAAc,CAClB,IAAI,EAAE,mBAAmB,EACzB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAehB;;;;;;;;OAQG;IACG,gBAAgB,CACpB,YAAY,EAAE,eAAe,EAC7B,IAAI,EAAE,KAAK,EAAE,EACb,KAAK,CAAC,EAAE,UAAU,GACjB,OAAO,CAAC,IAAI,CAAC;IAOhB;;;;;;OAMG;IACH,UAAU,CAAC,OAAO,EAAE,MAAM;IAQ1B;;;;;OAKG;IACH,gBAAgB;IAKhB;;;;;OAKG;IACH,cAAc;CAIf"}

package/out/controller/view/view.js

@@ -7,6 +7,7 @@ import { ButtonContainerState, ButtonState } from '../utils';
 import { ViewMode } from '../../constant';
 import { convertNavData } from '../../utils';
 import { executeViewLogic } from '../../view-logic';
+import { ViewState } from '../state';
 /**
  * 视图控制器
  *
@@ -28,6 +29,12 @@ export class ViewController {
      */
     constructor(modelPath, context, params = {}) {
         this.modelPath = modelPath;
+        /**
+         * 视图UI状态
+         *
+         * @memberof ViewController
+         */
+        this.state = new ViewState();
         /**
          * 当为模态、飘窗等非路由模式打开时，外部会注入此方法，用于关闭视图。
          *
@@ -38,7 +45,7 @@ export class ViewController {
         this.modal = { mode: ViewMode.ROUTE };
         /**
          * 控制器是否已经准备完成
-         *
+         * @deprecated
          * @author chitanda
          * @date 2022-07-24 16:07:25
          * @type {boolean}
@@ -47,13 +54,14 @@ export class ViewController {
         /**
          * 视图工具栏界面状态
          *
+         * @deprecated
          * @author lxm
          * @date 2022-10-13 23:10:20
          * @type {IButtonContainerState}
          */
         this.toolbarState = null;
         /**
-         * 视图loading
+         * 视图loading状态控制器
          *
          * @author lxm
          * @date 2022-09-19 14:09:12
@@ -92,7 +100,7 @@ export class ViewController {
      */
     async init() {
         await this.onInit();
-        this.complete = true;
+        this.state.complete = true;
         this.nerve.created();
         this.setCaption(this.model.caption);
         this.force(() => {
@@ -136,7 +144,7 @@ export class ViewController {
             toolbarState.addState(item.id, buttonState);
         });
         toolbarState.update();
-        this.toolbarState = toolbarState;
+        this.state.toolbarState = toolbarState;
     }
     /**
      * 处理上下文和导航参数相关的，如自定义导航参数的处理
@@ -282,8 +290,10 @@ export class ViewController {
      * @param {string} caption
      */
     setCaption(caption) {
-        this.caption = caption;
-        this.nerve.self.evt.asyncEmit('setTitle', this.caption);
+        this.state.caption = caption;
+        if (this.nerve.self) {
+            this.nerve.self.evt.asyncEmit('setTitle', caption);
+        }
         this.force();
     }
     /**
@@ -294,6 +304,7 @@ export class ViewController {
      */
     beginViewLoading() {
         this.viewLoading.begin();
+        this.state.isLoading = this.viewLoading.isLoading;
     }
     /**
      *关闭视图loading
@@ -303,5 +314,6 @@ export class ViewController {
      */
     endViewLoading() {
         this.viewLoading.end();
+        this.state.isLoading = this.viewLoading.isLoading;
     }
 }

package/out/controller/view/wf-step-trace-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wf-step-trace-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/wf-step-trace-view.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC;;;;;;;;GAQG;AACH,qBAAa,yBAA0B,SAAQ,cAAc;IAC3D;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,EAAG,aAAa,CAAC;IAExC;;;;;OAKG;IACH,IAAI,EAAE,KAAK,GAAG,SAAS,CAAC;cAER,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvC;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM;IAIvB;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAOjC"}
+{"version":3,"file":"wf-step-trace-view.d.ts","sourceRoot":"","sources":["../../../src/controller/view/wf-step-trace-view.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC;;;;;;;;GAQG;AACH,qBAAa,yBAA0B,SAAQ,cAAc;IAC3D;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,EAAG,aAAa,CAAC;IAExC;;;;;OAKG;IACH,IAAI,EAAE,KAAK,GAAG,SAAS,CAAC;cAER,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM;IAIvB;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAOjC"}

package/out/controller/view/wf-step-trace-view.js

@@ -15,7 +15,7 @@ export class WFStepTraceViewController extends ViewController {
         if (!this.deName) {
             throw new RuntimeError('没有接收到deName');
         }
-        this.entityService = await this.app.es.getService(this.deName, this.context);
+        this.entityService = await this.app.es.getService(this.deName);
         await this.getUIData();
     }
     /**

package/out/service/dto/method.dto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EAEd,iBAAiB,EACjB,sBAAsB,EAEvB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C;;;;;;;GAOG;AACH,qBAAa,SAAS;IA2BR,SAAS,CAAC,GAAG,CAAC;IA1B1B,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAE,sBAAsB,EAAE,CAAC;IAE3C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAErD,SAAS,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC;IAEnC,SAAS,KAAK,MAAM,IAAI,cAAc,CASrC;IAED;;;;;;OAMG;gBACmB,GAAG,CAAC,+BAAmB;IAS7C;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IA0CzD;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;IAyB1D;;;;;;;;OAQG;cACa,WAAW,CACzB,KAAK,EAAE,sBAAsB,GAC5B,OAAO,CAAC,SAAS,CAAC;CAStB"}
+{"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EAEd,iBAAiB,EACjB,sBAAsB,EAEvB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C;;;;;;;GAOG;AACH,qBAAa,SAAS;IA2BR,SAAS,CAAC,GAAG,CAAC;IA1B1B,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAE,sBAAsB,EAAE,CAAC;IAE3C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAErD,SAAS,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC;IAEnC,SAAS,KAAK,MAAM,IAAI,cAAc,CASrC;IAED;;;;;;OAMG;gBACmB,GAAG,CAAC,+BAAmB;IAS7C;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAuCzD;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;IAyB1D;;;;;;;;OAQG;cACa,WAAW,CACzB,KAAK,EAAE,sBAAsB,GAC5B,OAAO,CAAC,SAAS,CAAC;CAStB"}

package/out/service/dto/method.dto.js

@@ -64,7 +64,7 @@ export class MethodDto {
                 case 'DTOS': {
                     const dto = await this.getFieldDto(field);
                     const refEntity = field.getRefPSAppDataEntity();
-                    const service = await this.app.es.getService(refEntity.codeName, context);
+                    const service = await this.app.es.getService(refEntity.codeName);
                     const items = service.local.getList(context);
                     if (items) {
                         const arr = [];

package/out/service/entity/entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../../src/service/entity/entity.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC;;;;;;;GAOG;AACH,qBAAa,MAAM;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,UAAkB,IAAI,EAAE,KAAK,CAAC;IAE9B,UAAkB,MAAM,EAAE,gBAAgB,CAAC;IAEnC,SAAS,EAAE,MAAM,CAAC;IAElB,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,EAAE,MAAM,CAAC;IAE7B,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED;;;;;;;OAOG;gBACS,MAAM,EAAE,gBAAgB,EAAE,IAAI,EAAE,KAAK,GAAG,MAAM;IAmC1D;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAmBlC;;;;;;OAMG;IACH,KAAK,IAAI,MAAM;IAIf;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM;CAQrC"}
+{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../../src/service/entity/entity.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC;;;;;;;GAOG;AACH,qBAAa,MAAM;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,UAAkB,IAAI,EAAE,KAAK,CAAC;IAE9B,UAAkB,MAAM,EAAE,gBAAgB,CAAC;IAEnC,SAAS,EAAE,MAAM,CAAC;IAElB,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,EAAE,MAAM,CAAC;IAE7B,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED;;;;;;;OAOG;gBACS,MAAM,EAAE,gBAAgB,EAAE,IAAI,EAAE,KAAK,GAAG,MAAM;IAqC1D;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAmBlC;;;;;;OAMG;IACH,KAAK,IAAI,MAAM;IAIf;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM;CAQrC"}

package/out/service/entity/entity.js

@@ -23,10 +23,12 @@ export class Entity {
     constructor(entity, data) {
         Object.defineProperty(this, 'entity', {
             enumerable: false,
+            configurable: true,
             value: entity,
         });
         Object.defineProperty(this, 'data', {
             enumerable: false,
+            configurable: true,
             value: data instanceof Entity ? clone(data.data) : clone(data),
         });
         const key = entity.getKeyPSAppDEField().codeName.toLowerCase();

package/out/service/index.d.ts

@@ -2,8 +2,7 @@ export * from './interface';
 export * from './utils';
 export * from './service';
 export * from './constant';
-export * from './vo/control.vo';
-export * from './vo/tree-node-data';
+export * from './vo';
 export { AuthService } from './auth/auth.service';
 export { AuthorityService } from './authority/authority.service';
 export { ServiceUtil } from './service-util';

package/out/service/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,MAAM,CAAC;AAErB,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC"}

package/out/service/index.js

@@ -2,8 +2,7 @@ export * from './interface';
 export * from './utils';
 export * from './service';
 export * from './constant';
-export * from './vo/control.vo';
-export * from './vo/tree-node-data';
+export * from './vo';
 export { AuthService } from './auth/auth.service';
 export { AuthorityService } from './authority/authority.service';
 export { ServiceUtil } from './service-util';

package/out/service/interface/i-tree-node-data/i-tree-node-data.d.ts

@@ -0,0 +1,66 @@
+/**
+ * 树节点数据格式
+ *
+ * @export
+ * @class ITreeNodeData
+ */
+export interface ITreeNodeData {
+    /**
+     * 节点标识(节点模型的标识)
+     *
+     * @type {string}
+     * @memberof ITreeNodeData
+     */
+    nodeId: string;
+    /**
+     * 节点唯一标识，在父的id上加上自身的唯一标识，用>分隔
+     * 如：staticNode1>14>84847aa970ba3db7bbe00754aed3888d
+     *
+     * @type {string}
+     * @memberof ITreeNodeData
+     */
+    id: string;
+    /**
+     * 节点的值(可能是自己的主键，也可能是沿用父的值)
+     *
+     * @type {string}
+     * @memberof ITreeNodeData
+     */
+    value: string;
+    /**
+     * 节点显示名称
+     *
+     * @type {string}
+     * @memberof ITreeNodeData
+     */
+    text: string;
+    /**
+     * 是否是叶子节点（没有子节点的节点）
+     *
+     * @type {boolean}
+     * @memberof ITreeNodeData
+     */
+    leaf: boolean;
+    /**
+     * 子节点集合（没有子节点则不存在）
+     *
+     * @type {ITreeNodeData[]}
+     * @memberof ITreeNodeData
+     */
+    children?: ITreeNodeData[];
+    /**
+     * 父节点数据对象
+     *
+     * @type {ITreeNodeData}
+     * @memberof ITreeNodeData
+     */
+    parent?: ITreeNodeData;
+    /**
+     * 实体数据
+     *
+     * @type {IData}
+     * @memberof ITreeNodeData
+     */
+    deData?: IData;
+}
+//# sourceMappingURL=i-tree-node-data.d.ts.map

package/out/service/interface/i-tree-node-data/i-tree-node-data.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"i-tree-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/interface/i-tree-node-data/i-tree-node-data.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;;OAMG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,IAAI,EAAE,OAAO,CAAC;IAEd;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC;IAE3B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,aAAa,CAAC;IAEvB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC;CAGhB"}

package/out/service/interface/i-tree-node-data/i-tree-node-data.js

@@ -0,0 +1 @@
+export {};

package/out/service/interface/index.d.ts

@@ -1,2 +1,3 @@
 export { CodeListItem } from './code-list-item/code-list-item';
+export { ITreeNodeData } from './i-tree-node-data/i-tree-node-data';
 //# sourceMappingURL=index.d.ts.map

package/out/service/interface/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/interface/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/interface/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC"}

package/out/service/service/widget/control-service.d.ts

@@ -53,7 +53,7 @@ export declare class ControlService<T extends ControlModel = ControlModel> {
      * @date 2022-08-18 22:08:30
      * @returns {*}  {Promise<void>}
      */
-    init(context?: IContext): Promise<void>;
+    init(_context?: IContext): Promise<void>;
     /**
      * 初始化属性映射
      *

package/out/service/service/widget/control-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control-service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/control-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,qBAAa,cAAc,CAAC,CAAC,SAAS,YAAY,GAAG,YAAY;IAC/D,QAAQ,CAAC,GAAG,EAAG,WAAW,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,cAAc,CAE9B;IAED;;;;;;OAMG;IACH,aAAa,EAAG,aAAa,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,0BAAiC;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,CAAC;IAKpB;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ7C;;;;;OAKG;IACH,SAAS,CAAC,aAAa;IAiBvB;;;;;;;;;OASG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAKzB;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,aAAa;IAKjD;;;;;;;OAOG;IACH,QAAQ,CAAC,UAAU,EAAE,KAAK,GAAG,SAAS;CAGvC"}
+{"version":3,"file":"control-service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/control-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,qBAAa,cAAc,CAAC,CAAC,SAAS,YAAY,GAAG,YAAY;IAC/D,QAAQ,CAAC,GAAG,EAAG,WAAW,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,cAAc,CAE9B;IAED;;;;;;OAMG;IACH,aAAa,EAAG,aAAa,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,0BAAiC;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,CAAC;IAKpB;;;;;;OAMG;IACG,IAAI,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAO9C;;;;;OAKG;IACH,SAAS,CAAC,aAAa;IAiBvB;;;;;;;;;OASG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAKzB;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,aAAa;IAKjD;;;;;;;OAOG;IACH,QAAQ,CAAC,UAAU,EAAE,KAAK,GAAG,SAAS;CAGvC"}

package/out/service/service/widget/control-service.js

@@ -37,8 +37,8 @@ export class ControlService {
      * @date 2022-08-18 22:08:30
      * @returns {*}  {Promise<void>}
      */
-    async init(context) {
-        this.entityService = await this.app.es.getService(this.appEntity.source.codeName, context);
+    async init(_context) {
+        this.entityService = await this.app.es.getService(this.appEntity.source.codeName);
         this.initUIDataMap();
     }
     /**

package/out/service/service/widget/tree-service.d.ts

@@ -1,7 +1,7 @@
-import { IPSDETreeCodeListNode, IPSDETreeDataSetNode, IPSDETreeNode, IPSDETreeStaticNode, TreeModel } from '@ibiz-template/model';
-import { TreeNodeData } from '../../vo/tree-node-data';
+import { TreeModel, TreeNodeRSModel } from '@ibiz-template/model';
+import { ITreeNodeData } from '../../interface/i-tree-node-data/i-tree-node-data';
 import { MDControlService } from './md-control-service';
-interface TreeFetchOpts {
+export interface TreeFetchOpts {
     /**
      * 是否有过滤搜索
      *
@@ -44,41 +44,49 @@ export declare class TreeService extends MDControlService<TreeModel> {
     /**
      * 获取子节点数据
      *
-     * @param {TreeNodeData} [parentNode] 父节点数据
+     * @param {ITreeNodeData} [parentNodeData] 父节点数据
      * @param {boolean} [hasQuery=false] 是否搜索
      * @returns {*}
      * @memberof TreeService
      */
-    fetchChildNodes(parentNode: TreeNodeData | undefined, opts: TreeFetchOpts): Promise<TreeNodeData[] | undefined>;
-    getBaseNodeData(nodeModel: IPSDETreeNode, opts: TreeFetchOpts): TreeNodeData;
+    fetchChildNodes(parentNodeData: ITreeNodeData | undefined, opts: TreeFetchOpts): Promise<ITreeNodeData[] | undefined>;
     /**
      * 获取静态节点数据
      *
      * @protected
-     * @param {IPSDETreeStaticNode} nodeModel
+     * @param {TreeStaticNodeModel} nodeModel
      * @param {boolean} [hasQuery=false]
      * @returns {*}
      * @memberof TreeService
      */
-    protected getStaticNodeData(nodeModel: IPSDETreeStaticNode, opts: TreeFetchOpts): Promise<TreeNodeData>;
+    protected getStaticNodeData(nodeRS: TreeNodeRSModel, parentNodeData: ITreeNodeData | undefined, opts: TreeFetchOpts): Promise<ITreeNodeData>;
+    /**
+     * 获取父值过滤的视图参数
+     *
+     * @param {TreeNodeRSModel} nodeRS 节点关系模型
+     * @param {(ITreeNodeData | undefined)} parentNodeData 父节点数据
+     * @returns {*}  {(IParams | undefined)}
+     * @memberof TreeService
+     */
+    getParentFilterParams(nodeRS: TreeNodeRSModel, parentNodeData: ITreeNodeData | undefined): IParams | undefined;
     /**
      * 获取实体数据集数据
      *
      * @protected
-     * @param {IPSDETreeDataSetNode} nodeModel
-     * @param {boolean} [_hasQuery=false]
+     * @param {TreeNodeRSModel} nodeRS
+     * @param {TreeFetchOpts} opts
+     * @returns {*}
      * @memberof TreeService
      */
-    protected getDENodeDatas(nodeModel: IPSDETreeDataSetNode, opts: TreeFetchOpts): Promise<any>;
+    protected getDENodeDatas(nodeRS: TreeNodeRSModel, parentNodeData: ITreeNodeData | undefined, opts: TreeFetchOpts): Promise<any>;
     /**
      * 获取代码表节点数据
      *
      * @protected
-     * @param {IPSDETreeCodeListNode} _nodeModel
+     * @param {TreeCodeListNodeModel} _nodeModel
      * @param {TreeFetchOpts} _opts
      * @memberof TreeService
      */
-    protected getCodeListNodeDatas(_nodeModel: IPSDETreeCodeListNode, _opts: TreeFetchOpts): Promise<void>;
+    protected getCodeListNodeDatas(_nodeRS: TreeNodeRSModel, _parentNodeData: ITreeNodeData | undefined, _opts: TreeFetchOpts): Promise<void>;
 }
-export {};
 //# sourceMappingURL=tree-service.d.ts.map

package/out/service/service/widget/tree-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/tree-service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACpB,aAAa,EACb,mBAAmB,EACnB,SAAS,EACV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,UAAU,aAAa;IACrB;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;;OAKG;IACH,OAAO,EAAE,QAAQ,CAAC;IAClB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,SAAS,CAAC;IAC1D;;;;;OAKG;IACH,aAAa;IAKb;;;;;;;OAOG;IACG,eAAe,CACnB,UAAU,EAAE,YAAY,GAAG,SAAS,EACpC,IAAI,EAAE,aAAa;IAgDrB,eAAe,CAAC,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa;IAgB7D;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,SAAS,EAAE,mBAAmB,EAC9B,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,YAAY,CAAC;IAYxB;;;;;;;OAOG;cACa,cAAc,CAC5B,SAAS,EAAE,oBAAoB,EAC/B,IAAI,EAAE,aAAa;IAkBrB;;;;;;;OAOG;cACa,oBAAoB,CAClC,UAAU,EAAE,qBAAqB,EACjC,KAAK,EAAE,aAAa;CAIvB"}
+{"version":3,"file":"tree-service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/tree-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,SAAS,EACT,eAAe,EAEhB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,mDAAmD,CAAC;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;;OAKG;IACH,OAAO,EAAE,QAAQ,CAAC;IAClB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,SAAS,CAAC;IAC1D;;;;;OAKG;IACH,aAAa;IAKb;;;;;;;OAOG;IACG,eAAe,CACnB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa;IA4CrB;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,MAAM,EAAE,eAAe,EACvB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,CAAC;IAgBzB;;;;;;;OAOG;IACH,qBAAqB,CACnB,MAAM,EAAE,eAAe,EACvB,cAAc,EAAE,aAAa,GAAG,SAAS,GACxC,OAAO,GAAG,SAAS;IAetB;;;;;;;;OAQG;cACa,cAAc,CAC5B,MAAM,EAAE,eAAe,EACvB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa;IA0BrB;;;;;;;OAOG;cACa,oBAAoB,CAClC,OAAO,EAAE,eAAe,EACxB,eAAe,EAAE,aAAa,GAAG,SAAS,EAC1C,KAAK,EAAE,aAAa;CAIvB"}