@ibiz-template/runtime 0.0.3-beta.5 → 0.0.3-beta.7

package/src/controller/control/form/form-item.ts

@@ -1,5 +1,4 @@
 import { isNilOrEmpty } from 'qx-util';
-import { IBizContext } from '@ibiz-template/core';
 import { FormItemModel } from '@ibiz-template/model';
 import Schema from 'async-validator';
 import dayjs from 'dayjs';
@@ -28,9 +27,9 @@ export class FormItemController extends FormDetailController<FormItemModel> {
    *
    * @author lxm
    * @date 2022-08-24 20:08:55
-   * @type {IBizContext}
+   * @type {IContext}
    */
-  readonly context: IBizContext;
+  readonly context: IContext;
 
   /**
    * 视图参数
@@ -101,23 +100,12 @@ export class FormItemController extends FormDetailController<FormItemModel> {
     return this.form.data[this.name];
   }
 
-  /**
-   * 表单数据
-   *
-   * @author lxm
-   * @date 2022-09-01 22:09:48
-   * @readonly
-   */
-  get data() {
-    return this.form.data;
-  }
-
   /**
    * Creates an instance of FormItemController.
    * @author lxm
    * @date 2022-08-24 20:08:24
    * @param {FormItemModel} model 表单项模型
-   * @param {IBizContext} context 上下对象
+   * @param {IContext} context 上下对象
    * @param {IParams} [params={}] 视图参数
    */
   constructor(
@@ -199,11 +187,19 @@ export class FormItemController extends FormDetailController<FormItemModel> {
 
   async dataChangeNotify(name: string[]): Promise<void> {
     await super.dataChangeNotify(name);
-    const { resetItemName } = this.model;
+    const { resetItemNames } = this.model;
     const { valueItemName } = this.model.source;
 
     // 重置项，变更时自己的值置空
-    if (name.includes(resetItemName!)) {
+    let isReset = false;
+    if (resetItemNames && resetItemNames.length > 0) {
+      resetItemNames.forEach((resetItemName: string) => {
+        if (name.includes(resetItemName)) {
+          isReset = true;
+        }
+      });
+    }
+    if (isReset) {
       this.setDataValue(null, this.name);
     }
 
@@ -229,8 +225,8 @@ export class FormItemController extends FormDetailController<FormItemModel> {
     this.calcEnableCond();
 
     // 触发默认值
-    if (state === FormNotifyState.DRAFT || state === FormNotifyState.LOAD) {
-      this.setDefaultValue(state === FormNotifyState.DRAFT);
+    if (state === FormNotifyState.LOAD) {
+      this.setDefaultValue(false);
     }
   }
 
@@ -264,7 +260,7 @@ export class FormItemController extends FormDetailController<FormItemModel> {
       try {
         await this.validator.validate(this.data);
       } catch ({ errors, _fields }) {
-        this.state.error = (errors as IData[])[0].message;
+        this.state.error = (errors as IDatum[])[0].message;
         return false;
       }
     }

package/src/controller/control/form/form.ts

@@ -4,6 +4,7 @@ import {
   FormModel,
 } from '@ibiz-template/model';
 import { debounceAndAsyncMerge, RuntimeError } from '@ibiz-template/core';
+import { isNil } from 'lodash-es';
 import {
   FormItemController,
   FormDetailController,
@@ -130,6 +131,23 @@ export abstract class FormController<
     );
   }
 
+  /**
+   * 获取加载草稿额外参数，新建默认值
+   * @author lxm
+   * @date 2023-04-27 10:32:06
+   * @return {*}
+   */
+  async getDraftParams() {
+    await Promise.all(this.formItems.map(item => item.setDefaultValue(true)));
+    const result: IParams = {};
+    Object.keys(this.data).forEach(key => {
+      if (!isNil(this.data[key])) {
+        result[key] = this.data[key];
+      }
+    });
+    return result;
+  }
+
   /**
    * 初始化表单成员控制器
    *
@@ -180,9 +198,9 @@ export abstract class FormController<
    *
    * @author lxm
    * @date 2022-09-22 17:09:04
-   * @returns {*}  {Promise<IData>}
+   * @returns {*}  {Promise<IDatum>}
    */
-  abstract load(): Promise<IData>;
+  abstract load(): Promise<IDatum>;
 
   /**
    * 获取表单数据
@@ -191,7 +209,7 @@ export abstract class FormController<
    * @date 2022-08-30 19:08:11
    * @returns {*}
    */
-  getData(): IData[] {
+  getData(): IDatum[] {
     return [this.state.data];
   }
 

package/src/controller/control/form/search-form.ts

@@ -48,7 +48,13 @@ export class SearchFormController extends FormController<SearchFormModel> {
    * @returns {*}  {Promise<IData>}
    */
   async load(): Promise<IData> {
-    const res = await this.service.getDraft(this.context, this.params);
+    const queryParams = { ...this.params };
+
+    // 新建默认值给到graft接口，接口会回来
+    const params = await this.getDraftParams();
+    Object.assign(queryParams, params);
+
+    const res = await this.service.getDraft(this.context, queryParams);
     this.state.data = res.data;
     this.state.isLoaded = true;
     this.formStateNotify(FormNotifyState.DRAFT);
@@ -67,6 +73,16 @@ export class SearchFormController extends FormController<SearchFormModel> {
     return { ...this.data.getRequestData() };
   }
 
+  /**
+   * 执行搜索行为
+   * @author lxm
+   * @date 2023-03-26 02:27:23
+   * @return {*}  {Promise<void>}
+   */
+  async search(): Promise<void> {
+    await this.nerve.self.emit('onSearch', undefined);
+  }
+
   /**
    * 搜索表单按钮回调
    *
@@ -74,7 +90,7 @@ export class SearchFormController extends FormController<SearchFormModel> {
    * @date 2022-09-22 19:09:07
    */
   async onSearchButtonClick(): Promise<void> {
-    await this.nerve.self.evt.asyncEmit('search');
+    await this.search();
   }
 
   /**
@@ -85,7 +101,7 @@ export class SearchFormController extends FormController<SearchFormModel> {
    */
   async reset(): Promise<void> {
     await this.load();
-    await this.nerve.self.evt.asyncEmit('search');
+    await this.search();
   }
 
   /**
@@ -98,7 +114,7 @@ export class SearchFormController extends FormController<SearchFormModel> {
   async dataChangeNotify(names: string[]): Promise<void> {
     await super.dataChangeNotify(names);
     if (this.model.source.enableAutoSearch) {
-      this.nerve.self.evt.asyncEmit('search');
+      this.search();
     }
   }
 

package/src/controller/control/grid/grid-column.ts

@@ -1,4 +1,3 @@
-import { IBizContext } from '@ibiz-template/core';
 import { GridColumnModel } from '@ibiz-template/model';
 import { GridController } from '.';
 import { Application } from '../../../application';
@@ -36,9 +35,9 @@ export class GridColumnController<T extends GridColumnModel = GridColumnModel> {
    * @author lxm
    * @date 2022-09-05 19:09:24
    * @readonly
-   * @type {IBizContext}
+   * @type {IContext}
    */
-  get context(): IBizContext {
+  get context(): IContext {
     return this.grid.context;
   }
 

package/src/controller/control/grid/grid-edit-item.ts

@@ -1,4 +1,4 @@
-import { IBizContext, RuntimeError } from '@ibiz-template/core';
+import { RuntimeError } from '@ibiz-template/core';
 import { GridEditItemModel } from '@ibiz-template/model';
 import Schema from 'async-validator';
 import { GridNotifyState } from '../../constant';
@@ -85,9 +85,9 @@ export class GridEditItemController {
    * @author lxm
    * @date 2022-09-05 19:09:24
    * @readonly
-   * @type {IBizContext}
+   * @type {IContext}
    */
-  get context(): IBizContext {
+  get context(): IContext {
     return this.grid.context;
   }
 
@@ -267,7 +267,7 @@ export class GridEditItemController {
       try {
         await this.validator.validate(row.data);
       } catch ({ errors, _fields }) {
-        row.errors[editName] = (errors as IData[])[0].message;
+        row.errors[editName] = (errors as IDatum[])[0].message;
         return false;
       }
     }

package/src/controller/control/grid/grid-field-column.ts

@@ -3,7 +3,10 @@ import { GridFieldColumnModel } from '@ibiz-template/model';
 import { clone } from 'ramda';
 import { GridColumnController, GridRowController } from '.';
 import { OpenAppViewCommand } from '../../../command';
+import { IModalData } from '../../../interface';
 import { CodeListItem } from '../../../service';
+import { convertNavData, getWFContext } from '../../../utils';
+import { executeViewLogic } from '../../../view-logic';
 
 /**
  * 表格属性列控制器
@@ -41,7 +44,7 @@ export class GridFieldColumnController extends GridColumnController<GridFieldCol
    * @type {boolean}
    */
   get hasAction(): boolean {
-    return !!this.model.source.getPSDEUIAction();
+    return !!this.model.uiAction;
   }
 
   /**
@@ -56,6 +59,28 @@ export class GridFieldColumnController extends GridColumnController<GridFieldCol
     return (this.isLinkColumn || this.hasAction) && value;
   }
 
+  /**
+   * 公共参数处理，计算上下文和视图参数
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2022-08-25 15:44:14
+   */
+  public handlePublicParams(data: IData, context: IContext, params: IParams) {
+    const { navigateContexts, navigateParams } = this.model;
+    let selfContext = {};
+    if (navigateContexts && data) {
+      selfContext = convertNavData(navigateContexts!, context, params, data);
+    }
+    const _context = Object.assign(context.clone(), selfContext);
+
+    let selfParams = {};
+    if (navigateParams && data) {
+      selfParams = convertNavData(navigateParams!, context, params, data);
+    }
+    const _params: IParams = { ...params, ...selfParams };
+    return { context: _context, params: _params };
+  }
+
   /**
    * 打开链接视图
    *
@@ -84,18 +109,28 @@ export class GridFieldColumnController extends GridColumnController<GridFieldCol
       await linkView.init();
     }
     const { deName } = linkView.appEntity;
-    const newContext = Object.assign(this.context.clone(), {
+    const wfContext = getWFContext(row.data);
+    const tempContext = Object.assign(this.context.clone(), {
       [deName!]: value,
+      ...wfContext,
     });
-    const newParams = clone(this.params);
+    const tempParams = clone(this.params);
+    const { context: newContext, params: newParams } = this.handlePublicParams(
+      row.data,
+      tempContext,
+      tempParams,
+    );
     // 打开视图
-    await ibiz.commands.execute(
+    const res: IModalData = await ibiz.commands.execute(
       OpenAppViewCommand.TAG,
       linkView!.source,
       newContext,
       newParams,
       { event },
     );
+    if (res?.ok) {
+      this.grid.load();
+    }
   }
 
   /**
@@ -112,11 +147,16 @@ export class GridFieldColumnController extends GridColumnController<GridFieldCol
     event: MouseEvent,
   ): Promise<void> {
     if (this.model.viewLogic) {
-      await this.grid.nerve.self.evt.asyncEmit(
-        'actionClick',
+      await executeViewLogic(
         this.model.viewLogic,
+        this.context,
         [row.data],
-        event,
+        this.params,
+        {
+          event,
+          neuron: this.grid.nerve.self,
+          view: this.grid.ctx.view,
+        },
       );
     }
   }

package/src/controller/control/grid/grid-group-column.ts

@@ -0,0 +1,10 @@
+import { GridGroupColumnModel } from '@ibiz-template/model';
+import { GridColumnController } from './grid-column';
+
+/**
+ * 表格分组列控制器
+ * @return {*}
+ * @author: zhujiamin
+ * @Date: 2022-09-01 18:25:20
+ */
+export class GridGroupColumnController extends GridColumnController<GridGroupColumnModel> {}

package/src/controller/control/grid/grid-ua-column.ts

@@ -8,6 +8,7 @@ import { GridColumnController } from './grid-column';
 import { GridRowController } from '.';
 import { ButtonContainerState, ButtonState } from '../../utils';
 import { AppDEUIActionUtil } from '../../../utils';
+import { executeViewLogic } from '../../../view-logic';
 
 /**
  * 表格操作列控制器
@@ -62,13 +63,19 @@ export class GridUAColumnController extends GridColumnController<GridUAColumnMod
       await this.grid.toggleRowEdit(row);
       return;
     }
+    const opts = {
+      event,
+      neuron: this.grid.nerve.self,
+      view: this.grid.ctx.view,
+    };
     const appViewLogic = this.model.findAppViewLogic(detail.name);
     if (appViewLogic) {
-      await this.grid.nerve.self.evt.asyncEmit(
-        'actionClick',
+      await executeViewLogic(
         appViewLogic,
+        this.context,
         [row.data],
-        event,
+        this.params,
+        opts,
       );
     } else {
       AppDEUIActionUtil.exec(
@@ -76,10 +83,7 @@ export class GridUAColumnController extends GridColumnController<GridUAColumnMod
         this.context,
         [row.data],
         this.params,
-        {
-          event,
-          neuron: this.grid.nerve.self,
-        },
+        opts,
       );
     }
   }

package/src/controller/control/grid/grid.ts

@@ -1,4 +1,8 @@
-import { GridModel } from '@ibiz-template/model';
+import {
+  GridColumnModel,
+  GridGroupColumnModel,
+  GridModel,
+} from '@ibiz-template/model';
 import {
   awaitTimeout,
   debounceAndAsyncMerge,
@@ -115,15 +119,6 @@ export class GridController extends MDController<GridModel> {
     return this.model.source.noSort;
   }
 
-  /**
-   * 排序查询条件
-   *
-   * @author lxm
-   * @date 2022-09-28 13:09:46
-   * @type {string}
-   */
-  sortQuery?: string;
-
   protected createNerve(): GridNerve {
     return new GridNerve(this);
   }
@@ -156,11 +151,6 @@ export class GridController extends MDController<GridModel> {
       200,
     );
 
-    // 绑定表格排序参数，beforeLoad事件
-    this.nerve.self.evt.on('beforeLoad', () => {
-      return this.sortQuery ? { sort: this.sortQuery } : {};
-    });
-
     // 设置默认排序
     this.setSort();
   }
@@ -275,7 +265,7 @@ export class GridController extends MDController<GridModel> {
     rowController.modified = false;
     ibiz.message.success(`${res.data.srfmajortext || ''}保存成功`);
     this.gridStateNotify(rowController, GridNotifyState.SAVE);
-    await this.nerve.self.evt.asyncEmit('afterSave', [res.data], isCreate);
+    await this.nerve.self.emit('onSaveSuccess', undefined);
   }
 
   /**
@@ -286,8 +276,29 @@ export class GridController extends MDController<GridModel> {
    * @param {ControlVO} data 选中的单条数据
    */
   async onRowClick(data: ControlVO): Promise<void> {
+    // 激活事件
     if (this.mdCtrlActiveMode === 1) {
-      await this.nerve.self.evt.asyncEmit('dataActive', data);
+      await this.onActive(data);
+    }
+    // 选中事件
+    const { singleSelect, selectedData } = this.state;
+    if (singleSelect) {
+      // 单选时，data和选中数据不一样时数据变更，一样时是反选，把选中清空
+      this.onSelectionChange(
+        selectedData[0]?.srfkey !== data.srfkey ? [data] : [],
+      );
+    } else {
+      // 多选时，选中里没有则添加，有则删除
+      const findIndex = selectedData.findIndex(
+        item => item.srfkey === data.srfkey,
+      );
+      if (findIndex === -1) {
+        this.onSelectionChange([...selectedData, data]);
+      } else {
+        this.onSelectionChange(
+          selectedData.filter((value, index) => index !== findIndex),
+        );
+      }
     }
   }
 
@@ -300,7 +311,38 @@ export class GridController extends MDController<GridModel> {
    */
   async onDbRowClick(data: ControlVO): Promise<void> {
     if (this.mdCtrlActiveMode === 2) {
-      await this.nerve.self.evt.asyncEmit('dataActive', data);
+      await this.onActive(data);
+    }
+  }
+
+  /**
+   * 初始化表格属性列，操作列，编辑项控制器
+   *
+   * @author lxm
+   * @date 2022-08-24 21:08:48
+   * @protected
+   */
+  protected async initColumnsController(column: GridColumnModel) {
+    // 初始化适配器
+    const provider = await ibiz.register.gridColumn.get(column);
+    this.providers[column.codeName] = provider;
+
+    // 初始化表格列控制器
+    const controller = await provider.createController(column, this);
+    this.columns[column.codeName] = controller;
+
+    // 分类存放控制器
+    if (column.source.columnType === 'DEFGRIDCOLUMN') {
+      this.fieldColumns[column.codeName] =
+        controller as GridFieldColumnController;
+    } else if (column.source.columnType === 'UAGRIDCOLUMN') {
+      this.uaColumns[column.codeName] = controller as GridUAColumnController;
+    } else if (column.source.columnType === 'GROUPGRIDCOLUMN') {
+      await Promise.all(
+        (column as GridGroupColumnModel).children.map(async childColumn => {
+          this.initColumnsController(childColumn);
+        }),
+      );
     }
   }
 
@@ -314,22 +356,7 @@ export class GridController extends MDController<GridModel> {
   protected async initGridColumns(): Promise<void> {
     await Promise.all(
       this.model.columns.map(async column => {
-        // 初始化适配器
-        const provider = await ibiz.register.gridColumn.get(column);
-        this.providers[column.codeName] = provider;
-
-        // 初始化表格列控制器
-        const controller = await provider.createController(column, this);
-        this.columns[column.codeName] = controller;
-
-        // 分类存放控制器
-        if (column.source.columnType === 'DEFGRIDCOLUMN') {
-          this.fieldColumns[column.codeName] =
-            controller as GridFieldColumnController;
-        } else if (column.source.columnType === 'UAGRIDCOLUMN') {
-          this.uaColumns[column.codeName] =
-            controller as GridUAColumnController;
-        }
+        this.initColumnsController(column);
       }),
     );
 

package/src/controller/control/grid/index.ts

@@ -5,3 +5,4 @@ export * from './grid-field-edit-column';
 export * from './grid-ua-column';
 export * from './grid-edit-item';
 export * from './grid-row';
+export * from './grid-group-column';

package/src/controller/control/index.ts

@@ -3,15 +3,14 @@ export { ControlController } from './control';
 export { AppMenuController } from './app-menu';
 export { MainController } from './main';
 export * from './form/index';
-export { MDController } from './md';
+export * from './md';
 export * from './grid/index';
 export { ListController } from './list';
 export { TreeController } from './tree';
-export { ViewPanelController } from './view-panel';
-export { PickupViewPanelController } from './pickup-view-panel';
 export * from './portlet';
 export * from './panel';
 export { DashboardController } from './dashboard';
 export { DataViewController } from './dataview';
 export { WizardPanelController } from './wizard-panel';
 export { KanbanController } from './kanban';
+export { ToolbarController } from './toolbar';