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

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

@@ -1,6 +1,6 @@
 import { MDViewModel } from '@ibiz-template/model';
-import { ViewMode } from '../../constant';
 import { MDViewNerve } from '../neuron';
+import { MDViewState } from '../state';
 import { ViewController } from './view';
 
 /**
@@ -16,9 +16,12 @@ import { ViewController } from './view';
 export class MDViewController<
   T extends MDViewModel = MDViewModel,
 > extends ViewController<T> {
+  state = new MDViewState();
+
   /**
    * 是否显示搜索表单
    *
+   * @deprecated
    * @author lxm
    * @date 2022-08-28 20:08:10
    * @type {boolean}
@@ -28,6 +31,7 @@ export class MDViewController<
   /**
    * 快速搜索字符串
    *
+   * @deprecated
    * @author lxm
    * @date 2022-08-31 11:08:45
    * @type {string}
@@ -37,6 +41,7 @@ export class MDViewController<
   /**
    * 选中的数据
    *
+   * @deprecated
    * @author lxm
    * @date 2022-08-28 18:08:34
    * @type {IData[]}
@@ -52,9 +57,9 @@ export class MDViewController<
   protected async onInit(): Promise<void> {
     await super.onInit();
     // 搜索表单默认展开与否
-    this.showSearchForm = this.model.source.expandSearchForm;
+    this.state.showSearchForm = this.model.source.expandSearchForm;
     this.nerve.self.evt.on('mounted', () => {
-      if (this.modal.mode !== ViewMode.EMBED && this.model.source.loadDefault) {
+      if (this.model.source.loadDefault) {
         this.load();
       }
     });
@@ -75,7 +80,7 @@ export class MDViewController<
    * @returns {*}
    */
   getData() {
-    return this.selectedData;
+    return this.state.selectedData;
   }
 
   /**
@@ -133,7 +138,7 @@ export class MDViewController<
    * @date 2022-09-23 16:09:52
    */
   toggleFilter(): void {
-    this.showSearchForm = !this.showSearchForm;
+    this.state.showSearchForm = !this.state.showSearchForm;
   }
 
   /**
@@ -176,9 +181,9 @@ export class MDViewController<
    * @param {IData[]} data 选中的数据集合
    */
   onSelectionChange(data: IData[]) {
-    this.selectedData = data;
-    if (this.toolbarState) {
-      this.toolbarState.update(data[0]?.getOrigin());
+    this.state.selectedData = data;
+    if (this.state.toolbarState) {
+      this.state.toolbarState.update(data[0]?.getOrigin());
     }
   }
 
@@ -201,7 +206,7 @@ export class MDViewController<
    * @returns {*}  {IParams}
    */
   onBeforeLoad(): IParams {
-    const params: IParams = { query: this.query };
+    const params: IParams = { query: this.state.query };
     // 有搜索表单的整合相关参数
     if (this.nerve.searchForm) {
       const addParams = this.nerve.searchForm.call.getParams();

package/src/controller/view/mpickup-view.ts

@@ -1,5 +1,6 @@
 import { MPickupViewModel } from '@ibiz-template/model';
 import { MPickupViewNerve } from '../neuron';
+import { MPickupViewState } from '../state';
 import { PickupViewController } from './pickup-view';
 
 /**
@@ -12,29 +13,20 @@ import { PickupViewController } from './pickup-view';
  * @extends {ViewController}
  */
 export class MPickupViewController extends PickupViewController<MPickupViewModel> {
+  state = new MPickupViewState();
+
   declare nerve: MPickupViewNerve;
 
   protected createNerve(): MPickupViewNerve {
     return new MPickupViewNerve(this);
   }
 
-  /**
-   * 嵌入选择类视图选中的数据集合
-   *
-   * @author lxm
-   * @date 2022-09-12 16:09:57
-   * @type {IData[]}
-   */
-  embedSelection: IData[] = [];
-
-  /**
-   * 多项数据选择视图最终选中的数据集合
-   *
-   * @author lxm
-   * @date 2022-09-12 16:09:57
-   * @type {IData[]}
-   */
-  selfSelection: IData[] = [];
+  protected async onInit(): Promise<void> {
+    await super.onInit();
+    if (this.params.selectedData) {
+      this.state.selfSelection = JSON.parse(this.params.selectedData);
+    }
+  }
 
   /**
    * 视图面板数据变更事件处理
@@ -44,7 +36,7 @@ export class MPickupViewController extends PickupViewController<MPickupViewModel
    * @param {IData[]} data
    */
   onSelectionChange(data: IData[]) {
-    this.embedSelection = data;
+    this.state.embedSelection = data;
   }
 
   /**
@@ -71,11 +63,11 @@ export class MPickupViewController extends PickupViewController<MPickupViewModel
     if (data.length > 0) {
       // 去重，过滤已经选中的数据
       const addData = data.filter(item => {
-        return !this.selfSelection.find(
+        return !this.state.selfSelection.find(
           selection => selection.srfkey === item.srfkey,
         );
       });
-      this.selfSelection.push(...addData);
+      this.state.selfSelection.push(...addData);
     }
   }
 
@@ -89,11 +81,11 @@ export class MPickupViewController extends PickupViewController<MPickupViewModel
   removeSelections(data: IData[]) {
     if (data.length > 0) {
       data.forEach(item => {
-        const findIndex = this.selfSelection.findIndex(selection => {
+        const findIndex = this.state.selfSelection.findIndex(selection => {
           return selection.srfkey === item.srfkey;
         });
         if (findIndex !== -1) {
-          this.selfSelection.splice(findIndex, 1);
+          this.state.selfSelection.splice(findIndex, 1);
         }
       });
     }
@@ -106,7 +98,7 @@ export class MPickupViewController extends PickupViewController<MPickupViewModel
    * @date 2022-09-12 20:09:13
    */
   onOkButtonClick() {
-    this.closeView({ ok: true, data: this.selfSelection });
+    this.closeView({ ok: true, data: this.state.selfSelection });
   }
 
   /**

package/src/controller/view/pickup-view.ts

@@ -1,5 +1,6 @@
 import { PickupViewModel } from '@ibiz-template/model';
 import { PickupViewNerve } from '../neuron';
+import { PickupViewState } from '../state';
 import { ViewController } from './view';
 
 /**
@@ -14,6 +15,8 @@ import { ViewController } from './view';
 export class PickupViewController<
   T extends PickupViewModel = PickupViewModel,
 > extends ViewController<T> {
+  state = new PickupViewState();
+
   declare nerve: PickupViewNerve;
 
   protected createNerve(): PickupViewNerve {

package/src/controller/view/tab-exp-view.ts

@@ -1,6 +1,5 @@
 import { TabExpViewModel } from '@ibiz-template/model';
 import { createUUID } from 'qx-util';
-import { ViewMode } from '../../constant';
 import { TabExpViewNerve } from '../neuron';
 import { MainViewController } from './main-view';
 
@@ -47,7 +46,7 @@ export class TabExpViewController<
     }
 
     this.nerve.self.evt.on('mounted', () => {
-      if (this.modal.mode !== ViewMode.EMBED && this.model.source.loadDefault) {
+      if (this.model.source.loadDefault) {
         this.load();
       }
     });

package/src/controller/view/tree-exp-view.ts

@@ -1,7 +1,11 @@
 import { TreeExpViewModel } from '@ibiz-template/model';
-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 { ITreeNodeData } from '../../service';
+import { convertNavData } from '../../utils';
+import { MDViewController } from './md-view';
 
 /**
  * 树导航视图控制器
@@ -14,7 +18,9 @@ import { ViewController } from './view';
  */
 export class TreeExpViewController<
   T extends TreeExpViewModel = TreeExpViewModel,
-> extends ViewController<T> {
+> extends MDViewController<T> {
+  state = new TreeExpViewState();
+
   declare nerve: TreeExpViewNerve;
 
   protected createNerve(): TreeExpViewNerve {
@@ -28,11 +34,6 @@ export class TreeExpViewController<
     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();
-      }
-    });
   }
 
   /**
@@ -46,4 +47,69 @@ export class TreeExpViewController<
     const { tree } = this.nerve;
     return tree.call.load();
   }
+
+  async onDataActive(nodeData: ITreeNodeData) {
+    const tempContext = new IBizContext({}, this.context);
+    const tempParams = { ...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/src/controller/view/view.ts

@@ -15,6 +15,7 @@ import { ViewMode } from '../../constant';
 import { convertNavData } from '../../utils';
 import { executeViewLogic } from '../../view-logic';
 import { Application } from '../../application';
+import { ViewState } from '../state';
 
 /**
  * 视图控制器
@@ -35,6 +36,13 @@ export class ViewController<T extends ViewModel = ViewModel> {
    */
   model!: T;
 
+  /**
+   * 视图UI状态
+   *
+   * @memberof ViewController
+   */
+  state = new ViewState();
+
   /**
    * 当前视图所归属的应用
    *
@@ -73,7 +81,7 @@ export class ViewController<T extends ViewModel = ViewModel> {
 
   /**
    * 控制器是否已经准备完成
-   *
+   * @deprecated
    * @author chitanda
    * @date 2022-07-24 16:07:25
    * @type {boolean}
@@ -92,6 +100,7 @@ export class ViewController<T extends ViewModel = ViewModel> {
   /**
    * 视图标题
    *
+   * @deprecated
    * @author lxm
    * @date 2022-08-25 11:08:45
    * @type {string}
@@ -101,6 +110,7 @@ export class ViewController<T extends ViewModel = ViewModel> {
   /**
    * 视图工具栏界面状态
    *
+   * @deprecated
    * @author lxm
    * @date 2022-10-13 23:10:20
    * @type {IButtonContainerState}
@@ -108,7 +118,7 @@ export class ViewController<T extends ViewModel = ViewModel> {
   toolbarState: IButtonContainerState | null = null;
 
   /**
-   * 视图loading
+   * 视图loading状态控制器
    *
    * @author lxm
    * @date 2022-09-19 14:09:12
@@ -166,7 +176,7 @@ export class ViewController<T extends ViewModel = ViewModel> {
    */
   async init(): Promise<void> {
     await this.onInit();
-    this.complete = true;
+    this.state.complete = true;
     this.nerve.created();
     this.setCaption(this.model.caption);
     this.force(() => {
@@ -219,7 +229,7 @@ export class ViewController<T extends ViewModel = ViewModel> {
       toolbarState.addState(item.id, buttonState);
     });
     toolbarState.update();
-    this.toolbarState = toolbarState;
+    this.state.toolbarState = toolbarState;
   }
 
   /**
@@ -388,8 +398,10 @@ export class ViewController<T extends ViewModel = ViewModel> {
    * @param {string} caption
    */
   setCaption(caption: string) {
-    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();
   }
 
@@ -401,6 +413,7 @@ export class ViewController<T extends ViewModel = ViewModel> {
    */
   beginViewLoading() {
     this.viewLoading.begin();
+    this.state.isLoading = this.viewLoading.isLoading;
   }
 
   /**
@@ -411,5 +424,6 @@ export class ViewController<T extends ViewModel = ViewModel> {
    */
   endViewLoading() {
     this.viewLoading.end();
+    this.state.isLoading = this.viewLoading.isLoading;
   }
 }

package/src/controller/view/wf-step-trace-view.ts

@@ -44,10 +44,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/src/service/dto/method.dto.ts

@@ -81,10 +81,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: IData[] = service.local.getList(context);
           if (items) {
             const arr = [];

package/src/service/entity/entity.ts

@@ -41,10 +41,12 @@ export class Entity {
   constructor(entity: IPSAppDataEntity, data: IData | Entity) {
     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/src/service/index.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';

package/src/service/interface/i-tree-node-data/i-tree-node-data.ts

@@ -0,0 +1,74 @@
+/**
+ * 树节点数据格式
+ *
+ * @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;
+
+  // todo 其他界面绘制相关属性
+}

package/src/service/interface/index.ts

@@ -1 +1,2 @@
 export { CodeListItem } from './code-list-item/code-list-item';
+export { ITreeNodeData } from './i-tree-node-data/i-tree-node-data';

package/src/service/service/widget/control-service.ts

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