@ibiz-template/runtime 0.1.21 → 0.1.22

package/src/controller/control/data-view/data-view.controller.ts

@@ -4,6 +4,7 @@ import {
   IDEDataViewItem,
   IUIActionGroupDetail,
 } from '@ibiz/model-core';
+import { isNil } from 'ramda';
 import {
   IDataViewControlState,
   IDataViewControlEvent,
@@ -17,12 +18,12 @@ import { MDControlController } from '../../common';
 import { ButtonContainerState, UIActionButtonState } from '../../utils';
 import { DataViewControlService } from './data-view.service';
 
-export class DataViewControlController
-  extends MDControlController<
-    IDEDataView,
-    IDataViewControlState,
-    IDataViewControlEvent
+export class DataViewControlController<
+    T extends IDEDataView = IDEDataView,
+    S extends IDataViewControlState = IDataViewControlState,
+    E extends IDataViewControlEvent = IDataViewControlEvent,
   >
+  extends MDControlController<T, S, E>
   implements IDataViewControlController
 {
   /**
@@ -33,6 +34,14 @@ export class DataViewControlController
    */
   declare service: DataViewControlService;
 
+  /**
+   * 分组代码表项集合
+   * @author lxm
+   * @date 2023-08-29 04:55:07
+   * @type {readonly}
+   */
+  groupCodeListItems?: readonly CodeListItem[];
+
   /**
    * 初始化State
    *
@@ -42,6 +51,7 @@ export class DataViewControlController
   protected initState(): void {
     super.initState();
     this.state.noSort = this.model.noSort === true;
+    this.state.size = this.model.pagingSize || 20;
   }
 
   /**
@@ -53,7 +63,17 @@ export class DataViewControlController
    */
   protected async onCreated(): Promise<void> {
     await super.onCreated();
-    this.state.size = this.model.pagingSize || 20;
+    await this.initControlService();
+  }
+
+  /**
+   * 初始化部件服务
+   * @author lxm
+   * @date 2023-08-29 04:13:05
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  protected async initControlService(): Promise<void> {
     this.service = new DataViewControlService(this.model);
     await this.service.init(this.context);
   }
@@ -158,8 +178,11 @@ export class DataViewControlController
    * @memberof DataViewControlController
    */
   async handleDataGroup(): Promise<void> {
-    const { enableGroup, groupMode } = this.model;
+    const { enableGroup, groupMode, groupAppDEFieldId } = this.model;
     if (enableGroup && groupMode) {
+      if (!groupAppDEFieldId) {
+        throw new RuntimeModelError(this.model, '分组属性没有配置');
+      }
       if (groupMode === 'AUTO') {
         this.handleAutoGroup();
       } else if (groupMode === 'CODELIST') {
@@ -177,16 +200,24 @@ export class DataViewControlController
     const { groupAppDEFieldId } = this.model;
     if (groupAppDEFieldId) {
       const { items } = this.state;
-      const childrenMap: Map<string, IData[]> = new Map();
+      const groupMap: Map<string, IData[]> = new Map();
       items.forEach((item: IData) => {
-        const children = childrenMap.get(item[groupAppDEFieldId]) || [];
-        children.push(item);
-        childrenMap.set(item[groupAppDEFieldId], children);
+        const groupVal = item[groupAppDEFieldId];
+        if (isNil(groupVal)) {
+          // 分组无值的不显示
+          return;
+        }
+
+        if (!groupMap.has(groupVal)) {
+          groupMap.set(groupVal, []);
+        }
+        groupMap.get(groupVal)!.push(item);
       });
       const groups: IMDControlGroupState[] = [];
-      childrenMap.forEach((value: IData[], key: string) => {
+      groupMap.forEach((value: IData[], key: string) => {
         groups.push({
           caption: key,
+          key,
           children: [...value],
         });
       });
@@ -194,44 +225,63 @@ export class DataViewControlController
     }
   }
 
+  /**
+   * 加载并初始化分组代码表项集合
+   * @author lxm
+   * @date 2023-08-29 05:11:39
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  protected async initGroupCodeListItems(): Promise<void> {
+    const { groupCodeListId } = this.model;
+    if (!groupCodeListId) {
+      throw new RuntimeModelError(this.model, '分组代码表没有配置');
+    }
+    const app = ibiz.hub.getApp(this.context.srfappid);
+    this.groupCodeListItems = await app.codeList.get(
+      groupCodeListId,
+      this.context,
+      this.params,
+    );
+  }
+
   /**
    * 处理代码表分组
    *
    * @memberof DataViewControlController
    */
   async handleCodeListGroup(): Promise<void> {
-    const { groupAppDEFieldId, groupCodeListId } = this.model;
-    if (groupAppDEFieldId && groupCodeListId) {
-      const { items } = this.state;
-      const groups: IMDControlGroupState[] = [];
-      const app = ibiz.hub.getApp(this.context.srfappid);
-      const codeList = await app.codeList.get(
-        groupCodeListId,
-        this.context,
-        this.params,
-      );
-      const keys: string[] = [];
-      codeList.forEach((codeListItem: CodeListItem) => {
-        const value = items.filter(
-          (item: IData) => item[groupAppDEFieldId] === codeListItem.value,
-        );
-        groups.push({
-          caption: codeListItem.text,
-          children: [...value],
-        });
-        keys.push(codeListItem.value as string);
-      });
-      const otherGroup = items.filter(
-        (item: IData) => keys.indexOf(item[groupAppDEFieldId]) === -1,
-      );
-      if (otherGroup.length > 0) {
-        groups.push({
-          caption: '其他',
-          children: [...otherGroup],
-        });
-      }
-      this.state.groups = groups;
+    const { groupAppDEFieldId } = this.model;
+    if (!this.groupCodeListItems) {
+      await this.initGroupCodeListItems();
     }
+    const { items } = this.state;
+    const groupMap: Map<string | number, IData[]> = new Map();
+    this.groupCodeListItems!.forEach(item => {
+      groupMap.set(item.value, []);
+    });
+    items.forEach((item: IData) => {
+      const groupVal = item[groupAppDEFieldId!];
+      const groupArr = groupMap.get(groupVal);
+      if (groupArr) {
+        groupArr.push(item);
+      }
+      // 不在代码表里数据忽略
+    });
+
+    const groups: IMDControlGroupState[] = [];
+    groupMap.forEach((arr, key) => {
+      // 标题
+      const codeListItem = this.groupCodeListItems!.find(
+        item => item.value === key,
+      )!;
+      groups.push({
+        caption: codeListItem.text,
+        key: codeListItem.value,
+        children: arr,
+      });
+    });
+    this.state.groups = groups;
   }
 
   /**

package/src/controller/control/data-view/data-view.service.ts

@@ -8,7 +8,9 @@ import { MDControlService, UIMapField } from '../../../service';
  * @class DataViewControlService
  * @extends {MDControlService<IDEDataView>}
  */
-export class DataViewControlService extends MDControlService<IDEDataView> {
+export class DataViewControlService<
+  T extends IDEDataView = IDEDataView,
+> extends MDControlService<T> {
   /**
    * 初始化属性映射
    *
@@ -16,7 +18,7 @@ export class DataViewControlService extends MDControlService<IDEDataView> {
    */
   initUIDataMap(): void {
     super.initUIDataMap();
-    // *初始化表格数据项的属性映射
+    // *初始化数据项的属性映射
     this.model.dedataViewDataItems?.forEach(item => {
       const uiKey = item.id!.toLowerCase();
       const deField = item.appDEFieldId;
@@ -26,6 +28,7 @@ export class DataViewControlService extends MDControlService<IDEDataView> {
         const deFieldKey = deField.toLowerCase();
         mapField = new UIMapField(uiKey, deFieldKey, {
           isOriginField: true,
+          dataType: item.dataType,
         });
       } else {
         // 前台属性

package/src/controller/control/form/edit-form/edit-form.service.ts

@@ -273,6 +273,7 @@ export class EditFormService<
           if (deField) {
             mapField = new UIMapField(uiKey, deField, {
               isOriginField: true,
+              dataType: formItem.dataType,
             });
           } else {
             // 前台属性和没属性的表单项，或预置属性

package/src/controller/control/form/form-detail/form-druipart/form-druipart.controller.ts

@@ -1,7 +1,7 @@
 import { isOverlap } from '@ibiz-template/core';
 import { IDEFormDRUIPart } from '@ibiz/model-core';
 import { createUUID, notNilEmpty } from 'qx-util';
-import { SysUIActionTag } from '../../../../../constant';
+import { SysUIActionTag, ViewCallTag } from '../../../../../constant';
 import { IViewController } from '../../../../../interface';
 import { convertNavData } from '../../../../../utils';
 import { FormNotifyState } from '../../../../constant';
@@ -117,9 +117,14 @@ export class FormDRUIPartController extends FormDetailController<IDEFormDRUIPart
     await super.formStateNotify(state);
 
     this.isNewData = state === FormNotifyState.DRAFT;
-    this.state.showMask = this.isNewData;
-
-    if (state === FormNotifyState.LOAD || state === FormNotifyState.DRAFT) {
+    if (this.model.maskMode !== 0) {
+      this.state.showMask = this.isNewData;
+    }
+    if (
+      state === FormNotifyState.LOAD ||
+      state === FormNotifyState.DRAFT ||
+      state === FormNotifyState.SAVE
+    ) {
       // 表单数据加载变更后，计算关系界面参数
       this.calcViewParams();
     }
@@ -190,7 +195,7 @@ export class FormDRUIPartController extends FormDetailController<IDEFormDRUIPart
     this.embedView = view;
     this.embedView.evt.on('onMounted', () => {
       if (!this.isNewData) {
-        this.embedView.callUIAction(SysUIActionTag.REFRESH);
+        this.embedView.call(ViewCallTag.LOAD);
       }
     });
     this.embedView.evt.on('onDataChange', event => {

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

@@ -328,6 +328,7 @@ export class GridController
         );
         this.state.groups.push({
           caption: codeListItem?.text || `${key}`,
+          key,
           children: value,
         });
       });
@@ -510,7 +511,6 @@ export class GridController
     rowState.data = res.data;
     rowState.modified = false;
 
-    ibiz.message.success(`${res.data.srfmajortext || ''}保存成功`);
     this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}SUCCESS`, {
       default: `${res.data.srfmajortext || ''}保存成功`,
       data: res.data,

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

@@ -30,6 +30,7 @@ export class GridService extends MDControlService<IDEGrid> {
         const deFieldKey = deField.toLowerCase();
         mapField = new UIMapField(uiKey, deFieldKey, {
           isOriginField: true,
+          dataType: column.dataType,
         });
       } else {
         // 前台属性

package/src/controller/control/index.ts

@@ -18,3 +18,4 @@ export * from './toolbar/index';
 export * from './tree/index';
 export * from './wizard-panel/index';
 export * from './md-ctrl/index';
+export * from './kanban/index';

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

@@ -0,0 +1,2 @@
+export * from './kanban.controller';
+export * from './kanban.service';

package/src/controller/control/kanban/kanban.controller.ts

@@ -0,0 +1,370 @@
+import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
+import { IDEKanban, IUIActionGroupDetail } from '@ibiz/model-core';
+import { isNil } from 'ramda';
+import {
+  IDragChangeInfo,
+  IKanbanController,
+  IKanbanEvent,
+  IKanbanState,
+  MDCtrlLoadParams,
+} from '../../../interface';
+import { calcDeCodeNameById } from '../../../model';
+import { ControlVO } from '../../../service';
+import { UIActionUtil } from '../../../ui-action';
+import { ButtonContainerState, UIActionButtonState } from '../../utils';
+import { DataViewControlController } from '../data-view';
+import { KanbanService } from './kanban.service';
+
+export class KanbanController
+  extends DataViewControlController<IDEKanban, IKanbanState, IKanbanEvent>
+  implements IKanbanController
+{
+  /**
+   * 数据视图（卡片）部件服务
+   *
+   * @type {KanbanService}
+   * @memberof KanbanController
+   */
+  declare service: KanbanService;
+
+  /**
+   * 允许调整顺序
+   * @author lxm
+   * @date 2023-09-11 04:02:39
+   * @readonly
+   * @type {boolean}
+   */
+  get enableEditOrder(): boolean {
+    return this.model.enableCardEditOrder === true;
+  }
+
+  /**
+   * 是否支持调整分组。
+   * @author lxm
+   * @date 2023-09-11 04:04:00
+   * @readonly
+   * @type {boolean}
+   */
+  get enableEditGroup(): boolean {
+    return this.model.enableCardEditGroup === true;
+  }
+
+  /**
+   * 是否允许新建
+   * @author lxm
+   * @date 2023-09-11 04:05:25
+   * @readonly
+   * @type {boolean}
+   */
+  get enableNew(): boolean {
+    return this.model.enableCardNew === true;
+  }
+
+  protected async initControlService(): Promise<void> {
+    this.service = new KanbanService(this.model);
+    await this.service.init(this.context);
+  }
+
+  protected initState(): void {
+    super.initState();
+    this.state.size = this.model.pagingSize || 1000;
+    this.state.updating = false;
+    // 支持调整顺序和分组时
+    this.state.draggable = this.enableEditOrder || this.enableEditGroup;
+  }
+
+  /**
+   * 初始化
+   *
+   * @protected
+   * @return {*}  {Promise<void>}
+   * @memberof KanbanController
+   */
+  protected async onCreated(): Promise<void> {
+    await super.onCreated();
+    await this.initGroupActionStates();
+  }
+
+  /**
+   * 初始化分组右侧界面行为按钮的状态
+   *
+   * @author chitanda
+   * @date 2023-08-02 17:08:04
+   * @return {*}  {Promise<void>}
+   */
+  async initGroupActionStates(): Promise<void> {
+    const { groupUIActionGroup } = this.model;
+    if (!groupUIActionGroup?.uiactionGroupDetails?.length) {
+      return;
+    }
+    const containerState = new ButtonContainerState();
+    groupUIActionGroup.uiactionGroupDetails.forEach(detail => {
+      const actionid = detail.uiactionId;
+      if (actionid) {
+        const buttonState = new UIActionButtonState(
+          detail.id!,
+          this.context.srfappid!,
+          actionid,
+        );
+        containerState.addState(detail.id!, buttonState);
+      }
+    });
+    await containerState.update();
+    this.state.groupActionGroupState = containerState;
+
+    this.evt.on('onSelectionChange', event => {
+      let data = event.data[0];
+      if (data && data instanceof ControlVO) {
+        data = data.getOrigin();
+      }
+      if (data) {
+        this.state.groupActionGroupState!.update(
+          data,
+          this.model.appDataEntityId!,
+        );
+      }
+    });
+  }
+
+  /**
+   * 本地排序items
+   * @author lxm
+   * @date 2023-09-04 09:30:55
+   * @param {IData[]} items
+   */
+  sortItems(items: IData[]): void {
+    const sortField = this.model.minorSortAppDEFieldId!;
+    const { minorSortDir } = this.model!;
+    if (!sortField) {
+      throw new RuntimeModelError(this.model, '排序属性没配置');
+    }
+    if (!minorSortDir) {
+      throw new RuntimeModelError(this.model, '排序方向没配置');
+    }
+    const isAsc = minorSortDir === 'ASC';
+
+    // 格式化排序属性的值
+    items.forEach(item => {
+      const sortValue = item[sortField];
+      if (isNil(sortValue)) {
+        item[sortField] = 0;
+      } else {
+        const toNum = Number(sortValue);
+        if (Number.isNaN(toNum)) {
+          throw new RuntimeError(
+            `${item.srfmajortext}的排序属性无法转换成数值`,
+          );
+        }
+      }
+    });
+
+    // 排序
+    items.sort((a, b) =>
+      isAsc ? a[sortField] - b[sortField] : b[sortField] - a[sortField],
+    );
+  }
+
+  async afterLoad(args: MDCtrlLoadParams, items: IData[]): Promise<IData[]> {
+    // 每次加载回来先本地排序，把数据的排序属性规范一下
+    this.sortItems(this.state.items);
+    return super.afterLoad(args, items);
+  }
+
+  handleDataGroup(): Promise<void> {
+    if (!this.model.enableGroup || this.model.groupMode === 'NONE') {
+      throw new RuntimeError('看板部件必须开启分组');
+    }
+    return super.handleDataGroup();
+  }
+
+  /**
+   * 拖拽变更事件处理回调
+   * @author lxm
+   * @date 2023-09-11 04:12:58
+   * @param {IDragChangeInfo} info
+   * @return {*}  {Promise<void>}
+   */
+  async onDragChange(info: IDragChangeInfo): Promise<void> {
+    if (!this.enableEditGroup) {
+      if (info.from !== info.to) {
+        ibiz.message.warning('当前看板不允许调整分组！');
+        return;
+      }
+    }
+
+    const isAsc = this.model.minorSortDir === 'ASC';
+    const { from, to, fromIndex, toIndex } = info;
+    const groupField = this.model.groupAppDEFieldId!;
+    const sortField = this.model.minorSortAppDEFieldId!;
+    const modifiedItems: IData[] = [];
+    const fromGroup = this.state.groups.find(x => x.key === from)!;
+    const toGroup = this.state.groups.find(x => x.key === to)!;
+
+    if (!this.enableEditOrder) {
+      if (info.from === info.to) {
+        ibiz.message.warning('当前看板不允许调整次序');
+        return;
+      }
+
+      // 只修改分组不管排序
+      const draggedItem = fromGroup.children[fromIndex];
+      draggedItem[groupField] = info.to; // 变更分组
+      return this.updateChangedItems([draggedItem] as ControlVO[]);
+    }
+
+    /**
+     * 获取下一个100的倍数
+     * @author lxm
+     * @date 2023-09-11 10:03:46
+     * @param {number} num
+     * @return {*}  {number}
+     */
+    const getNextSort = (num: number): number => {
+      return num + (100 - (num % 100));
+    };
+
+    const originArr = [...toGroup.children];
+    const changedArr = [...toGroup.children];
+
+    // 计算出拖拽前和拖拽后的数组
+    const draggedItem = fromGroup.children[fromIndex];
+    if (info.from !== info.to) {
+      draggedItem[groupField] = info.to; // 变更分组
+      changedArr.splice(toIndex, 0, draggedItem);
+    } else {
+      changedArr.splice(fromIndex, 1);
+      changedArr.splice(toIndex, 0, draggedItem);
+    }
+
+    // 前台先改值
+    const removeItems = fromGroup.children.splice(fromIndex, 1);
+    toGroup.children.splice(toIndex, 0, ...removeItems);
+
+    // 降序把数组反转,保证两个数组都是从小到大排
+    if (!isAsc) {
+      originArr.reverse();
+      changedArr.reverse();
+    }
+
+    let lastSort: number;
+    let cacheArr: IData[] = []; // 缓存的不修改数组
+    let cacheLastSort: number; // 缓存不修改数组第一个元素上一个排序值
+    changedArr.forEach((item, index) => {
+      if (lastSort === undefined) {
+        // 第一次出现要调整顺序的，如果不是0用原来位置的排序值，否则使用100
+        if (item !== originArr[index]) {
+          if (!originArr[index]) {
+            // 从别的分组挪进来的且处于末尾时使用上一个元素的排序值的后一个100
+            lastSort =
+              index === 0 ? 100 : getNextSort(originArr[index - 1][sortField]);
+          } else {
+            lastSort = originArr[index][sortField] || 100; // 如果是0的时候给100否则用原来的
+          }
+          item[sortField] = lastSort;
+          modifiedItems.push(item);
+        }
+      } else {
+        // 如果当前排序值比上一个小，提升它的排序值
+        if (lastSort >= item[sortField]) {
+          if (cacheArr.length > 0) {
+            cacheArr.forEach(cache => {
+              cache[sortField] = getNextSort(cacheLastSort);
+              modifiedItems.push(cache);
+              cacheLastSort = cache[sortField];
+            });
+            lastSort = cacheLastSort;
+            cacheLastSort = 0;
+            cacheArr = [];
+          }
+          item[sortField] = getNextSort(lastSort);
+          modifiedItems.push(item);
+        } else {
+          if (cacheArr.length === 0) {
+            cacheLastSort = lastSort;
+          }
+          cacheArr.push(item);
+        }
+        lastSort = item[sortField];
+      }
+    });
+
+    this.updateChangedItems(modifiedItems as ControlVO[]);
+  }
+
+  /**
+   * 批量更新修改的项，并更新后台返回的数据，然后重新计算分组和排序
+   * @author lxm
+   * @date 2023-09-11 04:13:15
+   * @param {ControlVO[]} changedItems
+   * @return {*}  {Promise<void>}
+   */
+  async updateChangedItems(changedItems: ControlVO[]): Promise<void> {
+    try {
+      this.state.updating = true;
+      await Promise.all(
+        changedItems.map(async item => {
+          // 往上下文添加主键
+          const deName = calcDeCodeNameById(this.model.appDataEntityId!);
+          const tempContext = this.context.clone();
+          tempContext[deName] = item.srfkey;
+
+          // 调用接口修改数据
+          const res = await this.service.updateGroup(tempContext, item);
+
+          // 更新完之后更新state里的数据。
+          if (res.data) {
+            const index = this.state.items.findIndex(
+              x => x.srfkey === item.srfkey,
+            );
+            this.state.items.splice(index, 1, res.data);
+          }
+        }),
+      );
+    } finally {
+      this.state.updating = false;
+      await this.afterLoad({}, this.state.items);
+    }
+  }
+
+  /**
+   * 点击新建
+   * @author lxm
+   * @date 2023-09-11 07:22:33
+   * @param {MouseEvent} event
+   * @param {(string | number)} group 分组标识
+   */
+  onClickNew(event: MouseEvent, group: string | number): void {
+    const params = { ...this.params, srfgroup: group };
+    UIActionUtil.execAndResolved('new', {
+      context: this.context,
+      params,
+      data: [],
+      view: this.view,
+      event,
+    });
+  }
+
+  /**
+   * 分组工具栏点击处理回调
+   * @author lxm
+   * @date 2023-09-11 04:48:06
+   * @param {IUIActionGroupDetail} detail
+   * @param {MouseEvent} event
+   * @return {*}  {Promise<void>}
+   */
+  async onGroupToolbarClick(
+    detail: IUIActionGroupDetail,
+    event: MouseEvent,
+    group: string | number,
+  ): Promise<void> {
+    const actionId = detail.uiactionId;
+    const params = { ...this.params, srfgroup: group };
+    await UIActionUtil.execAndResolved(actionId!, {
+      context: this.context,
+      params,
+      data: this.state.selectedData,
+      view: this.view,
+      event,
+    });
+  }
+}