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

package/src/controller/state/index.ts

@@ -0,0 +1,2 @@
+export * from './view';
+export * from './control';

package/src/controller/state/view/edit-view-state.ts

@@ -0,0 +1,12 @@
+import { ViewState } from './view-state';
+
+/**
+ * 编辑视图状态
+ *
+ * @author chitanda
+ * @date 2023-01-03 16:01:42
+ * @export
+ * @class EditViewState
+ * @extends {ViewState}
+ */
+export class EditViewState extends ViewState {}

package/src/controller/state/view/edit-view3-state.ts

@@ -0,0 +1,9 @@
+import { EditViewState } from './edit-view-state';
+
+/**
+ * 编辑视图3(分页关系)状态
+ *
+ * @class EditView3State
+ * @extends {EditViewState}
+ */
+export class EditView3State extends EditViewState {}

package/src/controller/state/view/grid-exp-view-state.ts

@@ -0,0 +1,17 @@
+import { MDViewState } from './md-view-state';
+
+/**
+ * 表格导航视图状态
+ *
+ * @export
+ * @class GridExpViewState
+ * @extends {MDViewState}
+ */
+export class GridExpViewState extends MDViewState {
+  /**
+   * 导航项
+   *
+   * @memberof GridExpViewState
+   */
+  navItem: IData = {};
+}

package/src/controller/state/view/grid-view-state.ts

@@ -0,0 +1,10 @@
+import { MDViewState } from './md-view-state';
+
+/**
+ * 表格视图UI状态
+ *
+ * @export
+ * @class GridViewState
+ * @extends {MDViewState}
+ */
+export class GridViewState extends MDViewState {}

package/src/controller/state/view/index-view-state.ts

@@ -0,0 +1,18 @@
+import { ViewState } from './view-state';
+
+/**
+ * 首页视图UI状态
+ *
+ * @export
+ * @class IndexViewState
+ * @extends {ViewState}
+ */
+export class IndexViewState extends ViewState {
+  /**
+   * 菜单收缩变化
+   *
+   * @type {boolean}
+   * @memberof IndexViewController
+   */
+  public isCollapse: boolean = false;
+}

package/src/controller/state/view/index.ts

@@ -0,0 +1,9 @@
+export { EditViewState } from './edit-view-state';
+export { ViewState } from './view-state';
+export { MDViewState } from './md-view-state';
+export { GridViewState } from './grid-view-state';
+export { EditView3State } from './edit-view3-state';
+export { PickupViewState } from './pickup-view-state';
+export { MPickupViewState } from './mpickup-view-state';
+export { GridExpViewState } from './grid-exp-view-state';
+export { TreeExpViewState } from './tree-exp-view-state';

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

@@ -0,0 +1,30 @@
+import { ViewState } from './view-state';
+
+export class MDViewState extends ViewState {
+  /**
+   * 是否显示搜索表单
+   *
+   * @author lxm
+   * @date 2022-08-28 20:08:10
+   * @type {boolean}
+   */
+  showSearchForm: boolean = false;
+
+  /**
+   * 快速搜索字符串
+   *
+   * @author lxm
+   * @date 2022-08-31 11:08:45
+   * @type {string}
+   */
+  query: string = '';
+
+  /**
+   * 选中的数据
+   *
+   * @author lxm
+   * @date 2022-08-28 18:08:34
+   * @type {IData[]}
+   */
+  selectedData: IData[] = [];
+}

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

@@ -0,0 +1,28 @@
+import { PickupViewState } from './pickup-view-state';
+
+/**
+ * 多项选择视图状态
+ *
+ * @export
+ * @class MPickupViewState
+ * @extends {ViewState}
+ */
+export class MPickupViewState extends PickupViewState {
+  /**
+   * 嵌入选择类视图选中的数据集合
+   *
+   * @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[] = [];
+}

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

@@ -0,0 +1,10 @@
+import { ViewState } from './view-state';
+
+/**
+ * 选择视图状态
+ *
+ * @export
+ * @class PickupViewState
+ * @extends {ViewState}
+ */
+export class PickupViewState extends ViewState {}

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

@@ -0,0 +1,10 @@
+import { MDViewState } from './md-view-state';
+
+/**
+ * 树导航视图状态
+ *
+ * @export
+ * @class TreeExpViewState
+ * @extends {ViewState}
+ */
+export class TreeExpViewState extends MDViewState {}

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

@@ -0,0 +1,44 @@
+import { IButtonContainerState } from '../../interface';
+
+/**
+ * 视图UI状态对象
+ *
+ * @export
+ * @class ViewState
+ */
+export class ViewState {
+  /**
+   * 控制器是否已经准备完成
+   *
+   * @author chitanda
+   * @date 2022-07-24 16:07:25
+   * @type {boolean}
+   */
+  complete: boolean = false;
+
+  /**
+   * 视图标题
+   *
+   * @author lxm
+   * @date 2022-08-25 11:08:45
+   * @type {string}
+   */
+  caption!: string;
+
+  /**
+   * 视图工具栏界面状态
+   *
+   * @author lxm
+   * @date 2022-10-13 23:10:20
+   * @type {IButtonContainerState}
+   */
+  toolbarState: IButtonContainerState | null = null;
+
+  /**
+   * 视图是否正在加载
+   *
+   * @author lxm
+   * @date 2022-09-19 14:09:12
+   */
+  isLoading: boolean = false;
+}

package/src/controller/utils/counter/counter.ts

@@ -67,7 +67,7 @@ export class Counter {
    * @author lxm
    * @date 2022-08-18 21:08:22
    */
-  decrement(): void {
+  decrement(callback2?: () => void): void {
     if (this.state === 'Used') {
       return;
     }
@@ -76,7 +76,11 @@ export class Counter {
     }
     this.count -= 1;
     if (this.count === 0) {
-      this.callback();
+      if (callback2) {
+        callback2();
+      } else if (this.callback) {
+        this.callback();
+      }
       if (!this.reusable) {
         this.state = 'Used';
       }

package/src/controller/utils/loading/loading-state.ts

@@ -1,3 +1,4 @@
+import { NOOP } from '@ibiz-template/core';
 import { Counter } from '../counter/counter';
 
 /**
@@ -9,8 +10,6 @@ import { Counter } from '../counter/counter';
  * @class LoadingState
  */
 export class LoadingState {
-  private $isLoading: boolean = false;
-
   /**
    * 当前的loading状态，多次loading叠加时，只有所有loading都结束才会变回false。
    *
@@ -19,9 +18,7 @@ export class LoadingState {
    * @readonly
    * @type {boolean}
    */
-  get isLoading(): boolean {
-    return this.$isLoading;
-  }
+  isLoading: boolean = false;
 
   /**
    * loading计数器
@@ -30,9 +27,7 @@ export class LoadingState {
    * @date 2022-09-19 11:09:08
    * @private
    */
-  private counter = new Counter(() => {
-    this.$isLoading = false;
-  });
+  private counter = new Counter(NOOP);
 
   /**
    * 开始loading
@@ -41,7 +36,7 @@ export class LoadingState {
    * @date 2022-09-19 11:09:55
    */
   begin() {
-    this.$isLoading = true;
+    this.isLoading = true;
     this.counter.increment();
   }
 
@@ -52,6 +47,8 @@ export class LoadingState {
    * @date 2022-09-19 11:09:34
    */
   end() {
-    this.counter.decrement();
+    this.counter.decrement(() => {
+      this.isLoading = false;
+    });
   }
 }

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

@@ -0,0 +1,33 @@
+import { DashboardViewModel } from '@ibiz-template/model';
+import { DashboardViewNerve } from '../neuron';
+import { MainViewController } from './main-view';
+
+/**
+ * 应用看板视图控制器
+ *
+ * @author lxm
+ * @date 2022-09-08 16:09:49
+ * @export
+ * @class DashboardViewController
+ * @extends {ViewController}
+ */
+export class DashboardViewController<
+  T extends DashboardViewModel = DashboardViewModel,
+> extends MainViewController<T> {
+  declare nerve: DashboardViewNerve;
+
+  protected createNerve(): DashboardViewNerve {
+    return new DashboardViewNerve(this);
+  }
+
+  protected async onInit(): Promise<void> {
+    await super.onInit();
+    // 数据看板适配器
+    const { dashboard } = this.model;
+    if (dashboard) {
+      this.providers[dashboard.name] = await ibiz.register.control.get(
+        dashboard,
+      );
+    }
+  }
+}

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

@@ -1,11 +1,11 @@
 import { IBizContext, RuntimeError } from '@ibiz-template/core';
 import { EditViewModel } from '@ibiz-template/model';
 import { OpenAppViewCommand } from '../../command';
-import { ViewMode } from '../../constant';
 import { IModalData } from '../../interface';
 import { EntityService } from '../../service';
 
 import { EditViewNerve } from '../neuron';
+import { EditViewState } from '../state';
 import { MainViewController } from './main-view';
 
 /**
@@ -30,6 +30,8 @@ export class EditViewController<
    */
   protected entityService!: EntityService;
 
+  state = new EditViewState();
+
   declare nerve: EditViewNerve;
 
   protected createNerve(): EditViewNerve {
@@ -40,10 +42,9 @@ export class EditViewController<
     await super.onInit();
     this.entityService = await this.app.es.getService(
       this.model.appEntity.codeName,
-      this.context,
     );
     this.nerve.self.evt.on('mounted', () => {
-      if (this.modal.mode !== ViewMode.EMBED && this.model.source.loadDefault) {
+      if (this.model.source.loadDefault) {
         this.load();
       }
     });
@@ -79,8 +80,8 @@ export class EditViewController<
     const { form } = this.nerve;
     const data = await form.call.load();
     this.calcCaption(data);
-    if (this.toolbarState) {
-      this.toolbarState.update(data.getOrigin());
+    if (this.state.toolbarState) {
+      this.state.toolbarState.update(data.getOrigin());
     }
     return data;
   }

package/src/controller/view/edit-view3.ts

@@ -4,6 +4,7 @@ import { createUUID, notNilEmpty } from 'qx-util';
 import { Srfuf } from '../../service';
 import { convertNavData } from '../../utils';
 import { EditView3Nerve } from '../neuron';
+import { EditView3State } from '../state';
 import { EditViewController } from './edit-view';
 
 /**
@@ -16,6 +17,8 @@ import { EditViewController } from './edit-view';
  * @extends {ViewController}
  */
 export class EditView3Controller extends EditViewController<EditView3Model> {
+  state = new EditView3State();
+
   /**
    * 是否是新建数据
    *

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

@@ -0,0 +1,191 @@
+import { IBizContext } from '@ibiz-template/core';
+import {
+  DefectModelError,
+  GridExpViewModel,
+  IPSDETBUIActionItem,
+} from '@ibiz-template/model';
+import { notNilEmpty } from 'qx-util';
+import { convertNavData, GridExpViewState, MDViewController } from '../..';
+import { GridExpViewNerve } from '../neuron';
+
+export class GridExpViewController extends MDViewController<GridExpViewModel> {
+  /**
+   * 激活的数据
+   *
+   * @author lxm
+   * @date 2022-08-28 18:08:34
+   * @type {IData}
+   */
+  activeData?: IData;
+
+  state = new GridExpViewState();
+
+  declare nerve: GridExpViewNerve;
+
+  protected createNerve(): GridExpViewNerve {
+    return new GridExpViewNerve(this);
+  }
+
+  protected async onInit(): Promise<void> {
+    await super.onInit();
+    // 表格适配器
+    const { gridExpBar } = this.model;
+    if (gridExpBar) {
+      const { grid } = gridExpBar;
+      if (grid) {
+        this.providers[grid.name] = await ibiz.register.control.get(grid);
+      }
+    }
+    this.nerve.self.evt.on('mounted', () => {
+      if (this.model.source.loadDefault) {
+        this.load();
+      }
+    });
+  }
+
+  /**
+   * 部件加载
+   *
+   * @author chitanda
+   * @date 2022-12-28 16:12:23
+   * @return {*}  {Promise<IData[]>}
+   */
+  async load(): Promise<IData[]> {
+    const { grid } = this.nerve;
+    return grid.call.load();
+  }
+
+  /**
+   * 视图删除方法
+   *
+   * @author lxm
+   * @date 2022-08-30 19:08:59
+   * @returns {*}  {Promise<void>}
+   */
+  async remove(): Promise<void> {
+    const { grid } = this.nerve;
+    await grid.call.remove();
+  }
+
+  /**
+   * 视图新建行方法
+   *
+   * @author lxm
+   * @date 2022-08-30 19:08:59
+   * @returns {*}  {Promise<void>}
+   */
+  async newRow(): Promise<void> {
+    const { grid } = this.nerve;
+    await grid.call.newRow();
+  }
+
+  /**
+   * 激活数据变更
+   *
+   * @author lxm
+   * @date 2022-08-28 18:08:50
+   * @param {IData} data 选中的数据
+   */
+  async onDataActive(data: IData) {
+    this.activeData = data;
+    if (this.state.toolbarState) {
+      this.state.toolbarState.update(data?.getOrigin());
+    }
+
+    const { gridExpBar } = this.model;
+    if (gridExpBar) {
+      const { grid } = gridExpBar;
+      if (grid && grid.navPSAppView) {
+        const tempContext = {};
+        const tempViewParam = { ...this.params };
+        const arg = this.activeData;
+        const appDataEntity = grid.navPSAppView.source.getPSAppDataEntity();
+        if (appDataEntity && arg) {
+          Object.assign(tempContext, {
+            [`${appDataEntity.codeName?.toLowerCase()}`]:
+              arg[appDataEntity.codeName?.toLowerCase()],
+          });
+          // 主键
+          const keyField = appDataEntity
+            .getKeyPSAppDEField()
+            ?.codeName.toLowerCase();
+          if (keyField) {
+            Object.assign(tempContext, { [keyField]: arg[keyField] });
+            this.state.navItem.key = arg[keyField];
+          }
+          // 导航过滤项
+          const { navFilter } = grid.source;
+          if (navFilter) {
+            Object.assign(tempViewParam, {
+              [navFilter]: arg[appDataEntity.codeName?.toLowerCase()],
+            });
+          }
+          // 导航关系
+          const navPSDer = grid.source.getNavPSDER();
+          if (navPSDer) {
+            const navPSDerStr = `n_${(
+              navPSDer.codeName && navPSDer.minorCodeName
+            ).toLowerCase()}_eq`;
+            Object.assign(tempViewParam, {
+              [navPSDerStr]: arg[appDataEntity.codeName?.toLowerCase()],
+            });
+          }
+        }
+        // 处理自定义导航上下文
+        const navContexts = grid.source.getPSNavigateContexts();
+        let context = {};
+        if (notNilEmpty(navContexts)) {
+          context = convertNavData(navContexts!, tempContext, this.params);
+        }
+        Object.assign(tempContext, context);
+        // 处理自定义视图参数
+        const navParams = grid.source.getPSNavigateParams();
+        let params = {};
+        if (notNilEmpty(navParams)) {
+          params = convertNavData(navParams!, tempViewParam, this.params);
+        }
+        Object.assign(tempViewParam, params);
+        // 路由模式下跳转视图，变更路由
+        if (this.context.isRouter) {
+          Object.assign(tempContext, { toRouteLevel: this.modal.level! + 1 });
+          const tempIBizContext = new IBizContext(tempContext, this.context);
+          ibiz.openView.root(
+            grid.navPSAppView.source,
+            tempIBizContext,
+            tempViewParam,
+          );
+        } else {
+          const tempIBizContext = new IBizContext(tempContext, this.context);
+          this.state.navItem.context = tempIBizContext;
+          this.state.navItem.params = tempViewParam;
+        }
+      }
+    }
+  }
+
+  /**
+   * 工具栏点击
+   *
+   * @author chitanda
+   * @date 2022-12-28 21:12:18
+   * @param {IPSDETBUIActionItem} item
+   * @param {MouseEvent} event
+   * @return {*}  {Promise<void>}
+   */
+  async onToolbarClick(
+    item: IPSDETBUIActionItem,
+    event: MouseEvent,
+  ): Promise<void> {
+    const action = item.getPSAppViewUIAction();
+    if (!action) {
+      throw new DefectModelError(item, '没有配置界面行为!');
+    }
+    const viewLogicKey = `${action.name}_click`;
+    const appViewLogic =
+      this.model.gridExpBar.source.findPSAppViewLogic(viewLogicKey);
+    if (!appViewLogic) {
+      throw new DefectModelError(action, '没有找到对应的视图逻辑');
+    }
+    return this.executeViewLogic(appViewLogic, this.getData(), event);
+  }
+}

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

@@ -1,5 +1,6 @@
 import { GridViewModel } from '@ibiz-template/model';
 import { GridViewNerve } from '../neuron';
+import { GridViewState } from '../state';
 import { MDViewController } from './md-view';
 
 /**
@@ -12,6 +13,8 @@ import { MDViewController } from './md-view';
  * @extends {MDViewController<GridViewModel>}
  */
 export class GridViewController extends MDViewController<GridViewModel> {
+  state = new GridViewState();
+
   declare nerve: GridViewNerve;
 
   protected createNerve(): GridViewNerve {

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

@@ -1,4 +1,5 @@
 import { IndexViewModel } from '@ibiz-template/model';
+import { IndexViewState } from '../state/view/index-view-state';
 import { ViewController } from './view';
 
 /**
@@ -11,13 +12,16 @@ import { ViewController } from './view';
  * @extends {ViewController}
  */
 export class IndexViewController extends ViewController<IndexViewModel> {
+  state = new IndexViewState();
+
   /**
    * 菜单收缩变化
    *
+   * @deprecated
    * @type {boolean}
    * @memberof IndexViewController
    */
-  public collapseChange: boolean = false;
+  public isCollapse: boolean = false;
 
   protected async onInit(): Promise<void> {
     await super.onInit();

package/src/controller/view/index.ts

@@ -19,3 +19,5 @@ export * from './wf-step-trace-view';
 export { AppPortalViewController } from './app-portal-view';
 export { TreeExpViewController } from './tree-exp-view';
 export { TabExpViewController } from './tab-exp-view';
+export { GridExpViewController } from './grid-exp-view';
+export { DashboardViewController } from './dashboard-view';

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

@@ -42,14 +42,13 @@ export class MainViewController<
     if (!this.entityService) {
       this.entityService = await this.app.es.getService(
         this.model.appEntity.codeName,
-        this.context,
       );
     }
     const res = await this.entityService.exec('Get', this.context, this.params);
     this.mainData = res.data;
     this.calcCaption(res.data);
-    if (this.toolbarState) {
-      this.toolbarState.update(res.data);
+    if (this.state.toolbarState) {
+      this.state.toolbarState.update(res.data);
     }
     return res.data;
   }