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

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

@@ -23,10 +23,15 @@ export class ButtonState implements IButtonState {
 
   declare uiAction: IPSAppDEUIAction;
 
-  declare entity: AppEntityModel;
+  declare entity?: AppEntityModel;
 
-  constructor(name: string, uiAction: IPSUIAction, entity: AppEntityModel) {
-    this.app = ibiz.hub.getApp(entity.modelService.app);
+  constructor(name: string, uiAction: IPSUIAction, entity?: AppEntityModel) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    let s = uiAction.getPSModelService() as any;
+    if (s.getRealPSModelService) {
+      s = s.getRealPSModelService();
+    }
+    this.app = ibiz.hub.getApp(s.app);
     this.name = name;
     // 赋值uiAction
     Object.defineProperty(this, 'uiAction', {

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/index.ts

@@ -4,3 +4,4 @@ export * from './value-rule/value-rule';
 export * from './button-state';
 export * from './de-ac-mode/de-ac-mode-util';
 export * from './code-list/code-list';
+export * from './layout-helper/layout-helper';

package/src/controller/utils/layout-helper/layout-helper.ts

@@ -0,0 +1,86 @@
+import { IPSLayoutPos } from '@ibiz-template/model';
+
+/**
+ * 计算布局高宽
+ *
+ * @author lxm
+ * @date 2023-02-15 11:37:49
+ * @export
+ * @param {IPSLayoutPos} layoutPos
+ */
+export function calcLayoutHeightWidth(layoutPos: IPSLayoutPos): {
+  width: string;
+  height: string;
+} {
+  const { width, height, widthMode, heightMode } = layoutPos;
+  const result = { width: 'auto', height: 'auto' };
+  if (widthMode === 'FULL') {
+    result.width = '100%';
+  } else if (width > 0) {
+    if (widthMode === 'PERCENTAGE') {
+      result.width = `${width}%`;
+    } else {
+      result.width = `${width}px`;
+    }
+  }
+  if (heightMode === 'FULL') {
+    result.height = '100%';
+  } else if (height > 0) {
+    if (heightMode === 'PERCENTAGE') {
+      result.height = `${height}%`;
+    } else {
+      result.height = `${height}px`;
+    }
+  }
+  return result;
+}
+
+/**
+ * 计算布局内容压制自身的样式
+ *
+ * @author lxm
+ * @date 2023-02-15 11:49:06
+ * @export
+ * @param {IPSLayoutPos} layoutPos
+ * @returns {*}  {Partial<ILayoutController>}
+ */
+export function calcLayoutContentStyle(layoutPos: IPSLayoutPos): IData {
+  const { vAlignSelf, hAlignSelf } = layoutPos;
+  const result = {};
+  // 自身对齐方式
+  if (vAlignSelf || hAlignSelf) {
+    Object.assign(result, { display: 'flex' });
+    // 自身垂直对齐模式
+    switch (layoutPos.vAlignSelf) {
+      case 'TOP':
+        Object.assign(result, { 'align-items': 'flex-start' });
+        break;
+      case 'MIDDLE':
+        Object.assign(result, { 'align-items': 'center' });
+        break;
+      case 'BOTTOM':
+        Object.assign(result, { 'align-items': 'flex-end' });
+        break;
+      default:
+        break;
+    }
+    // 自身水平对齐模式
+    switch (layoutPos.hAlignSelf) {
+      case 'LEFT':
+        Object.assign(result, { 'justify-content': 'flex-start' });
+        break;
+      case 'CENTER':
+        Object.assign(result, { 'justify-content': 'center' });
+        break;
+      case 'RIGHT':
+        Object.assign(result, { 'justify-content': 'flex-end' });
+        break;
+      case 'JUSTIFY':
+        Object.assign(result, { 'justify-content': 'space-between' });
+        break;
+      default:
+        break;
+    }
+  }
+  return result;
+}

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/utils/value-rule/value-rule.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { IPSDEFormItemVR, IPSDEGridEditItemVR } from '@ibiz-template/model';
 import { isNilOrEmpty } from 'qx-util';
-import { IBizVerify } from '../../../service';
+import { verifyDeRules } from '../../../utils';
 
 /**
  * 生成值规则
@@ -72,10 +72,10 @@ export function generateRules(
           if (isNilOrEmpty(source[valueName])) {
             return true;
           }
-          const { isPast, infoMessage } = IBizVerify.verifyDeRules(
+          const { isPast, infoMessage } = verifyDeRules(
             valueName,
             source,
-            deRule.getPSDEFVRGroupCondition(),
+            deRule.getPSDEFVRGroupCondition()!,
           );
           if (!isPast) {
             callback(new Error(infoMessage || deRule.ruleInfo));

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/dataview-view.ts

@@ -0,0 +1,56 @@
+import { DataViewViewModel } from '@ibiz-template/model';
+import { DataViewViewNerve } from '../neuron';
+import { DataViewViewState } from '../state';
+import { MDViewController } from './md-view';
+
+/**
+ * 数据视图控制器
+ *
+ * @author chitanda
+ * @date 2022-08-01 18:08:54
+ * @export
+ * @class DataViewViewController
+ * @extends {MDViewController<DataViewViewModel>}
+ */
+export class DataViewViewController extends MDViewController<DataViewViewModel> {
+  state = new DataViewViewState();
+
+  declare nerve: DataViewViewNerve;
+
+  protected createNerve(): DataViewViewNerve {
+    return new DataViewViewNerve(this);
+  }
+
+  protected async onInit(): Promise<void> {
+    await super.onInit();
+    // 卡片适配器
+    const { dataView } = this.model;
+    if (dataView) {
+      this.providers[dataView.name] = await ibiz.register.control.get(dataView);
+    }
+  }
+
+  /**
+   * 视图加载方法
+   *
+   * @author lxm
+   * @date 2022-08-30 19:08:59
+   * @returns {*}  {Promise<void>}
+   */
+  async load(): Promise<IData[]> {
+    const { dataView } = this.nerve;
+    return dataView.call.load();
+  }
+
+  /**
+   * 视图删除方法
+   *
+   * @author lxm
+   * @date 2022-08-30 19:08:59
+   * @returns {*}  {Promise<void>}
+   */
+  async remove(): Promise<void> {
+    const { dataView } = this.nerve;
+    await dataView.call.remove();
+  }
+}

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();
       }
     });
@@ -54,16 +55,6 @@ export class EditViewController<
     }
   }
 
-  protected handleViewParams(): void {
-    // 编辑视图识别上下文的srfkey并转成实体名称，然后删除srfkey
-    if (this.context.srfkey) {
-      this.context[this.model.appEntity.deName] = this.context.srfkey;
-      this.context.srfkey = undefined; // 避免delete不掉，先置空
-      delete this.context.srfkey;
-    }
-    return super.handleViewParams();
-  }
-
   getData(): IData[] {
     const formData = this.nerve.form.call.getData();
     return formData;
@@ -79,8 +70,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,167 @@
+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> {
+  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);
+      }
+    }
+  }
+
+  /**
+   * 部件加载
+   *
+   * @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) {
+    if (this.state.toolbarState) {
+      this.state.toolbarState.update(data?.getOrigin());
+    }
+
+    const { grid } = this.model.gridExpBar;
+    if (grid && grid.navView) {
+      if (!grid.navView.initialized) {
+        await grid.navView.init();
+      }
+      const tempContext = {};
+      const tempViewParam = { ...this.params };
+      this.state.navItem.key = data.srfkey;
+      // 表格导航视图实体相关
+      const { appEntity } = grid.navView;
+      if (appEntity && data) {
+        const { deName } = appEntity;
+        Object.assign(tempContext, {
+          [`${deName}`]: data[deName],
+        });
+        // 导航过滤项
+        const { navFilter } = grid.source;
+        if (navFilter) {
+          Object.assign(tempViewParam, {
+            [navFilter]: data[deName],
+          });
+        }
+        // 导航关系
+        const navPSDer = grid.source.getNavPSDER();
+        if (navPSDer) {
+          const navPSDerStr = `n_${(
+            navPSDer.codeName && navPSDer.minorCodeName
+          ).toLowerCase()}_eq`;
+          Object.assign(tempViewParam, {
+            [navPSDerStr]: data[deName],
+          });
+        }
+      }
+      // 处理自定义导航上下文
+      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);
+        this.state.navItem.context = tempIBizContext;
+        this.state.navItem.params = tempViewParam;
+        ibiz.openView.root(grid.navView.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

@@ -7,6 +7,8 @@ export { OptViewController } from './opt-view';
 export { EditView3Controller } from './edit-view3';
 export { MDViewController } from './md-view';
 export { GridViewController } from './grid-view';
+export { DataViewViewController } from './dataview-view';
+export { ListViewController } from './list-view';
 export { PickupGridViewController } from './pickup-grid-view';
 export { PickupViewController } from './pickup-view';
 export { MPickupViewController } from './mpickup-view';
@@ -19,3 +21,8 @@ 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';
+export { WizardViewController } from './wizard-view';
+export { ListExpViewController } from './list-exp-view';
+export { KanbanViewController } from './kanban-view';

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

@@ -0,0 +1,54 @@
+import { KanbanViewModel } from '@ibiz-template/model';
+import { KanbanViewNerve } from '../neuron';
+import { KanbanViewState } from '../state';
+import { MDViewController } from './md-view';
+
+/**
+ * 看板视图控制器
+ *
+ * @export
+ * @class KanbanViewController
+ * @extends {MDViewController<KanbanViewModel>}
+ */
+export class KanbanViewController extends MDViewController<KanbanViewModel> {
+  state = new KanbanViewState();
+
+  declare nerve: KanbanViewNerve;
+
+  protected createNerve(): KanbanViewNerve {
+    return new KanbanViewNerve(this);
+  }
+
+  protected async onInit(): Promise<void> {
+    await super.onInit();
+    // 看板适配器
+    const { kanban } = this.model;
+    if (kanban) {
+      this.providers[kanban.name] = await ibiz.register.control.get(kanban);
+    }
+  }
+
+  /**
+   * 视图加载方法
+   *
+   * @author lxm
+   * @date 2022-08-30 19:08:59
+   * @returns {*}  {Promise<void>}
+   */
+  async load(): Promise<IData[]> {
+    const { kanban } = this.nerve;
+    return kanban.call.load();
+  }
+
+  /**
+   * 视图删除方法
+   *
+   * @author lxm
+   * @date 2022-08-30 19:08:59
+   * @returns {*}  {Promise<void>}
+   */
+  async remove(): Promise<void> {
+    const { kanban } = this.nerve;
+    await kanban.call.remove();
+  }
+}