@ibiz-template/runtime 0.1.26 → 0.1.28

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

@@ -13,6 +13,7 @@ import {
   IMDControlGroupState,
   CodeListItem,
 } from '../../../interface';
+import { ControlVO } from '../../../service';
 import { UIActionUtil } from '../../../ui-action';
 import { MDControlController } from '../../common';
 import { ButtonContainerState, UIActionButtonState } from '../../utils';
@@ -42,6 +43,17 @@ export class DataViewControlController<
    */
   groupCodeListItems?: readonly CodeListItem[];
 
+  /**
+   * 是否允许新建
+   * @author lxm
+   * @date 2023-09-11 04:05:25
+   * @readonly
+   * @type {boolean}
+   */
+  get enableNew(): boolean {
+    return this.model.enableCardNew === true;
+  }
+
   /**
    * 初始化State
    *
@@ -52,6 +64,7 @@ export class DataViewControlController<
     super.initState();
     this.state.noSort = this.model.noSort === true;
     this.state.size = this.model.pagingSize || 20;
+    this.state.singleSelect = this.model.singleSelect === true;
   }
 
   /**
@@ -78,6 +91,97 @@ export class DataViewControlController<
     await this.service.init(this.context);
   }
 
+  /**
+   * 初始化分组右侧界面行为按钮的状态
+   *
+   * @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;
+    }
+    this.state.groups.forEach(async group => {
+      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();
+      group.groupActionGroupState = containerState;
+    });
+  }
+
+  /**
+   * 行单击事件
+   *
+   * @author lxm
+   * @date 2022-08-18 22:08:16
+   * @param {IData} data 选中的单条数据
+   */
+  async onRowClick(data: IData): Promise<void> {
+    super.onRowClick(data);
+    const { groupAppDEFieldId } = this.model;
+    if (groupAppDEFieldId) {
+      // 根据selectedData填充分组的选中数据
+      this.state.groups.forEach(group => {
+        group.selectedData = [];
+      });
+      this.state.selectedData.forEach(select => {
+        const groupVal = select[groupAppDEFieldId];
+        const selectGroup = this.state.groups.find(
+          group => group.key === groupVal,
+        );
+        if (selectGroup) {
+          selectGroup.selectedData!.push(select);
+        }
+      });
+      // 根据分组选中的数据更新分组的按钮状态
+      if (this.state.singleSelect) {
+        // 单选情况下只有点击的分组的按钮会激活
+        this.state.groups.forEach(group => {
+          let tempData = data;
+          if (group.selectedData!.indexOf(tempData) !== -1) {
+            if (tempData && tempData instanceof ControlVO) {
+              tempData = tempData.getOrigin();
+            }
+            if (tempData) {
+              group.groupActionGroupState!.update(
+                tempData,
+                this.model.appDataEntityId!,
+              );
+            }
+          } else {
+            group.groupActionGroupState!.update(
+              undefined,
+              this.model.appDataEntityId!,
+            );
+          }
+        });
+      } else {
+        // 多选情况下可能有多组分组按钮会激活
+        const actionGroup = this.state.groups.find(group => {
+          return group.children.indexOf(data) !== -1;
+        });
+        if (actionGroup) {
+          actionGroup.groupActionGroupState!.update(
+            actionGroup.selectedData![0],
+            this.model.appDataEntityId!,
+          );
+        }
+      }
+    }
+  }
+
   /**
    * 加载更多
    *
@@ -91,7 +195,9 @@ export class DataViewControlController<
   }
 
   async afterLoad(args: MDCtrlLoadParams, items: IData[]): Promise<IData[]> {
+    await this.initGroupCodeListItems();
     await this.handleDataGroup();
+    await this.initGroupActionStates();
     return items;
   }
 
@@ -235,7 +341,7 @@ export class DataViewControlController<
   protected async initGroupCodeListItems(): Promise<void> {
     const { groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError(this.model, '分组代码表没有配置');
+      return;
     }
     const app = ibiz.hub.getApp(this.context.srfappid);
     this.groupCodeListItems = await app.codeList.get(
@@ -251,9 +357,9 @@ export class DataViewControlController<
    * @memberof DataViewControlController
    */
   async handleCodeListGroup(): Promise<void> {
-    const { groupAppDEFieldId } = this.model;
-    if (!this.groupCodeListItems) {
-      await this.initGroupCodeListItems();
+    const { groupAppDEFieldId, groupCodeListId } = this.model;
+    if (!groupCodeListId) {
+      throw new RuntimeModelError(this.model, '分组代码表没有配置');
     }
     const { items } = this.state;
     const groupMap: Map<string | number, IData[]> = new Map();
@@ -306,4 +412,46 @@ export class DataViewControlController<
       }
     }
   }
+
+  /**
+   * 点击新建
+   * @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: IMDControlGroupState,
+  ): Promise<void> {
+    const actionId = detail.uiactionId;
+    const params = { ...this.params, srfgroup: group.key };
+    await UIActionUtil.execAndResolved(actionId!, {
+      context: this.context,
+      params,
+      data: group.selectedData || [],
+      view: this.view,
+      event,
+    });
+  }
 }

package/src/controller/control/exp-bar/exp-bar.controller.ts

@@ -223,6 +223,11 @@ export class ExpBarControlController<
         );
       });
     }
+
+    // 如果外面没有配置默认不加载的话，默认部件自己加载
+    if (this.state.loadDefault) {
+      this.load();
+    }
   }
 
   /**
@@ -261,7 +266,6 @@ export class ExpBarControlController<
     const routeAndHasSub =
       this.routeDepth &&
       window.location.hash.split('/').length > this.routeDepth * 2 + 2;
-    console.log('routeAndHasSub', routeAndHasSub);
 
     if (routeAndHasSub) {
       if (selectItem) {

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

@@ -60,6 +60,15 @@ export class EditFormController
     }) as () => Promise<void>;
   }
 
+  protected async onMounted(): Promise<void> {
+    await super.onMounted();
+
+    // 如果外面没有配置默认不加载的话，默认部件自己加载
+    if (this.state.loadDefault) {
+      this.load();
+    }
+  }
+
   /**
    * 加载草稿行为
    * @author lxm

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

@@ -1,9 +1,7 @@
 /* eslint-disable no-param-reassign */
 import { IDEFormItem, IValueItemEditor } from '@ibiz/model-core';
 import Schema from 'async-validator';
-import { createUUID, isNilOrEmpty } from 'qx-util';
-import { ModelError, RuntimeError } from '@ibiz-template/core';
-import dayjs from 'dayjs';
+import { isNilOrEmpty } from 'qx-util';
 import { EditFormController } from '../../edit-form';
 import { FormController } from '../../form/form.controller';
 import { FormDetailController } from '../form-detail/form-detail.controller';
@@ -18,7 +16,7 @@ import { getEditorProvider } from '../../../../../register';
 import { Srfuf } from '../../../../../service';
 import { filterValueRules } from '../../../../../utils';
 import { FormNotifyState } from '../../../../constant';
-import { generateRules } from '../../../../utils';
+import { generateRules, getDefaultValue } from '../../../../utils';
 
 export class FormItemController
   extends FormDetailController<IDEFormItem>
@@ -344,70 +342,18 @@ export class FormItemController
     const { createDVT, createDV, updateDVT, updateDV } = this.model;
     const valueType = isCreate ? createDVT : updateDVT;
     const defaultValue = isCreate ? createDV : updateDV;
-    // 置空
-    if (valueType === 'RESET') {
-      data[this.name] = null;
-      return;
-    }
 
-    // 除置空之外的默认值类型，有值的时候不走
-    if (this.value) {
-      return;
-    }
-    // 没有配置默认值
-    if (isNilOrEmpty(valueType) && isNilOrEmpty(defaultValue)) {
-      return;
-    }
-    // 没有配类型，配了默认值的直接赋值默认值
-    if (!valueType && defaultValue) {
-      data[this.name] = defaultValue;
-      return;
-    }
-    switch (valueType) {
-      // 当前应用数据，优先取视图参数，视图参数没有取上下文
-      case 'APPDATA':
-        if (Object.prototype.hasOwnProperty.call(this.params, defaultValue!)) {
-          data[this.name] = this.params[defaultValue!];
-        }
-        if (Object.prototype.hasOwnProperty.call(this.context, defaultValue!)) {
-          data[this.name] = this.context[defaultValue!];
-        }
-        break;
-      // 当前操作用户(名称)
-      case 'OPERATORNAME':
-        data[this.name] = this.context.srfusername;
-        break;
-      // 当前操作用户(编号)
-      case 'OPERATOR':
-        data[this.name] = this.context.srfuserid;
-        break;
-      // 当前时间
-      case 'CURTIME':
-        data[this.name] = dayjs().format(this.model.valueFormat);
-        break;
-      // 数据对象属性
-      case 'PARAM':
-        data[this.name] = this.data[defaultValue!];
-        break;
-      case 'SESSION': // 用户全局对象
-      case 'APPLICATION': // 系统数据对象
-        // 取appData里的上下文
-        if (!ibiz.appData?.context) {
-          throw new RuntimeError('appdata.context不存在');
-        }
-        data[this.name] = ibiz.appData.context[defaultValue!];
-        break;
-      // 网页请求用视图参数
-      case 'CONTEXT':
-        data[this.name] = this.params[defaultValue!];
-        break;
-      // 唯一编码
-      case 'UNIQUEID':
-        data[this.name] = createUUID();
-        break;
-      default:
-        // 未支持类型： SESSION：用户全局对象、 APPLICATION：系统全局对象、 CONTEXT：网页请求。这些应该是后台的模式，前台暂不处理
-        throw new ModelError(this.model, `默认值类型[${valueType}]未支持`);
+    const defaultVal = getDefaultValue(
+      {
+        name: this.name,
+        valueType,
+        defaultValue,
+        valueFormat: this.model.valueFormat,
+      },
+      { data, context: this.context, params: this.params },
+    );
+    if (defaultVal !== undefined) {
+      data[this.name] = defaultVal;
     }
   }
 }

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

@@ -41,6 +41,15 @@ export class SearchFormController
     await this.load();
   }
 
+  protected async onMounted(): Promise<void> {
+    await super.onMounted();
+
+    // 如果外面没有配置默认不加载的话，默认部件自己加载
+    if (this.state.loadDefault) {
+      this.load();
+    }
+  }
+
   /**
    * 加载草稿
    *

package/src/controller/control/grid/grid/grid-row.state.ts

@@ -13,6 +13,8 @@ import { GridController } from './grid.controller';
 export class GridRowState implements IGridRowState {
   data: ControlVO;
 
+  cacheData?: ControlVO;
+
   /**
    * 错误信息集合，p是对应属性名称
    *

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

@@ -3,6 +3,7 @@ import {
   awaitTimeout,
   debounceAndAsyncMerge,
   HttpResponse,
+  mergeDefaultInLeft,
   recursiveIterate,
   RuntimeError,
   RuntimeModelError,
@@ -30,7 +31,7 @@ import { getGridColumnProvider } from '../../../../register';
 import { ControlVO, Srfuf } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
-import { isValueChange } from '../../../utils';
+import { getDefaultValue, isValueChange } from '../../../utils';
 import { ScriptFactory } from '../../../../utils';
 
 /**
@@ -431,9 +432,13 @@ export class GridController
       throw new RuntimeError('请先完成当前行编辑中的行的操作');
     }
 
+    const queryParams = { ...this.params };
+    const defaultData = this.calcDefaultValue({}, true); // 新建默认值
+    Object.assign(queryParams, defaultData);
+
     let res;
     try {
-      res = await this.service.getDraft(this.context, this.params);
+      res = await this.service.getDraft(this.context, queryParams);
     } catch (error) {
       this.actionNotification('GETDRAFTERROR', {
         error: error as Error,
@@ -441,13 +446,17 @@ export class GridController
       throw error;
     }
 
+    const draftData = res.data;
+    // 处理后台导致的新建默认值丢失
+    mergeDefaultInLeft(draftData, defaultData);
+
     // 加载完后续处理
-    this.state.items.unshift(res.data);
-    const newRow = new GridRowState(res.data, this);
+    this.state.items.unshift(draftData);
+    const newRow = new GridRowState(draftData, this);
     this.state.rows.unshift(newRow);
     this.gridStateNotify(newRow, GridNotifyState.DRAFT);
     this.switchRowEdit(this.state.rows[0], true);
-    this.actionNotification('GETDRAFTSUCCESS', { data: res.data });
+    this.actionNotification('GETDRAFTSUCCESS', { data: draftData });
   }
 
   /**
@@ -755,27 +764,38 @@ export class GridController
     if (row.showRowEdit === toState) {
       return;
     }
+
     if (toState === false) {
-      // 校验并保存
+      // * 处理关闭行编辑
       if (isSave) {
+        // 校验并保存
         await this.save(row.data);
-      } else {
-        // eslint-disable-next-line no-lonely-if
-        if (row.data.srfuf === Srfuf.CREATE) {
-          row.showRowEdit = false;
-          this.evt.emit('onRowEditChange', { row });
-          return this.remove({ data: [row.data], silent: true });
-        }
-        // todo 不保存的时候还原已经修改的数据
+      } else if (row.data.srfuf === Srfuf.CREATE) {
+        // 新建的行取消时删除这一行的数据
+        row.showRowEdit = false;
+        this.evt.emit('onRowEditChange', { row });
+        return this.remove({ data: [row.data], silent: true });
+      } else if (row.cacheData) {
+        // 取消的时候，还原编辑前的数据
+        row.data = row.cacheData;
+        delete row.cacheData;
       }
-    }
-
-    // 如果已经有一行处于行编辑了，不开起另一行。
-    if (toState === true) {
+    } else {
+      // * 处理显示行编辑
+      // 如果已经有一行处于行编辑了，不开起另一行。
       const editingRow = this.state.rows.find(item => item.showRowEdit);
       if (editingRow) {
         throw new RuntimeError('同时只能有一行开启行编辑');
       }
+
+      if (row.data.srfuf === Srfuf.UPDATE) {
+        // 打开时先缓存一下
+        row.cacheData = clone(row.data);
+        // 填充更新默认值
+
+        const defaultVal = this.calcDefaultValue(row.data, false);
+        Object.assign(row.data, defaultVal);
+      }
     }
 
     // 修改行的编辑状态和编辑列的编辑状态。
@@ -988,4 +1008,35 @@ export class GridController
       autoWidth: true, // 单元格是否自适应
     });
   }
+
+  /**
+   * 计算默认值并返回一个对象，对象里的属性就是要填充的默认值
+   * 没有的属性就是不需要填充默认值的属性
+   * @author lxm
+   * @date 2023-09-18 04:01:06
+   * @param {IData} data
+   * @param {boolean} isCreate
+   * @return {*}  {IData}
+   */
+  calcDefaultValue(data: IData, isCreate: boolean): IData {
+    const result: IData = {};
+    Object.values(this.editColumns).forEach(c => {
+      const { createDV, createDVT, updateDV, updateDVT } = c.editItem;
+      const valueType = isCreate ? createDVT : updateDVT;
+      const defaultValue = isCreate ? createDV : updateDV;
+      const defaultVal = getDefaultValue(
+        {
+          name: c.fieldName,
+          valueType,
+          defaultValue,
+          valueFormat: c.valueFormat,
+        },
+        { data, context: this.context, params: this.params },
+      );
+      if (defaultVal !== undefined) {
+        result[c.fieldName] = defaultVal;
+      }
+    });
+    return result;
+  }
 }

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

@@ -1,5 +1,5 @@
 import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
-import { IDEKanban, IUIActionGroupDetail } from '@ibiz/model-core';
+import { IDEKanban } from '@ibiz/model-core';
 import { isNil } from 'ramda';
 import {
   IDragChangeInfo,
@@ -10,8 +10,6 @@ import {
 } 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';
 
@@ -49,17 +47,6 @@ export class KanbanController
     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);
@@ -82,48 +69,6 @@ export class 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!,
-        );
-      }
-    });
   }
 
   /**
@@ -325,46 +270,4 @@ export class KanbanController
       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,
-    });
-  }
 }