@ibiz-template/runtime 0.1.28 → 0.1.29

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

@@ -5,14 +5,18 @@ import {
   RuntimeError,
   mergeDefaultInLeft,
 } from '@ibiz-template/core';
-import { IDEEditForm } from '@ibiz/model-core';
+import { IAppDEEditView, IDEEditForm } from '@ibiz/model-core';
 import { debounce } from 'lodash-es';
+import { clone } from 'ramda';
 import {
   IEditFormState,
   IEditFormEvent,
   IEditFormController,
+  IViewController,
+  IEditViewState,
+  IEditViewEvent,
 } from '../../../../interface';
-import { hasDeCodeName } from '../../../../model';
+import { calcDeCodeNameById, hasDeCodeName } from '../../../../model';
 import { Srfuf, ControlVO } from '../../../../service';
 import { ScriptFactory } from '../../../../utils';
 import { FormNotifyState } from '../../../constant';
@@ -40,6 +44,14 @@ export class EditFormController
    */
   service!: EditFormService;
 
+  get view(): IViewController<IAppDEEditView, IEditViewState, IEditViewEvent> {
+    return this.ctx.view as IViewController<
+      IAppDEEditView,
+      IEditViewState,
+      IEditViewEvent
+    >;
+  }
+
   /**
    * 初始化方法
    *
@@ -108,6 +120,57 @@ export class EditFormController
     return this.data;
   }
 
+  /**
+   * 拷贝模式加载数据
+   *
+   * @author chitanda
+   * @date 2023-09-26 19:09:21
+   * @return {*}  {Promise<IData>}
+   */
+  protected async copy(): Promise<IData> {
+    const context = clone(this.context);
+    const queryParams: IParams = clone(this.params);
+
+    const appDataEntity = await ibiz.hub.getAppDataEntity(
+      this.model.appDataEntityId!,
+    );
+    const key = appDataEntity.keyAppDEFieldId;
+    if (key && this.params[key]) {
+      const deCodeName = calcDeCodeNameById(this.model.appDataEntityId!);
+      context[deCodeName] = this.params[key];
+      delete queryParams[key];
+      delete this.params[key];
+      delete queryParams.srfcopymode;
+      delete this.params.srfcopymode;
+    }
+
+    let res;
+    try {
+      await this.startLoading();
+      await this.evt.emit('onBeforeLoad', undefined);
+      res = await this.service.get(context, queryParams);
+    } catch (error) {
+      await this.evt.emit('onLoadError', undefined);
+      this.actionNotification('GETERROR', {
+        error: error as Error,
+      });
+      throw error;
+    } finally {
+      await this.endLoading();
+    }
+
+    res.data.$origin.srfsourcekey = undefined;
+
+    this.state.modified = false;
+    this.state.data = res.data;
+    this.formStateNotify(FormNotifyState.LOAD);
+
+    await this.evt.emit('onLoadSuccess', undefined);
+    this.actionNotification('GETSUCCESS');
+    this.state.isLoaded = true;
+    return this.data;
+  }
+
   /**
    * 部件加载数据行为
    *
@@ -115,6 +178,11 @@ export class EditFormController
    * @date 2022-08-19 14:08:50
    */
   async load(): Promise<IData> {
+    // 复制模式独立处理
+    const copyMode = this.params.srfcopymode;
+    if (copyMode) {
+      return this.copy();
+    }
     const isLoadDraft = !hasDeCodeName(
       this.context,
       this.model.appDataEntityId!,
@@ -124,7 +192,7 @@ export class EditFormController
       return this.loadDraft();
     }
 
-    const queryParams = { ...this.params };
+    const queryParams = clone(this.params);
 
     let res;
     try {

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

@@ -285,7 +285,7 @@ export class EditFormService<
         }
       },
       {
-        childrenFields: ['deformPages', 'deformDetails'],
+        childrenFields: ['deformPages', 'deformTabPages', 'deformDetails'],
       },
     );
   }

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

@@ -11,6 +11,7 @@ import {
 import { findChildFormDetails } from '../../../../model';
 import { getFormDetailProvider } from '../../../../register';
 import { ControlVO } from '../../../../service';
+import { handleAllSettled } from '../../../../utils';
 import { ControlController } from '../../../common';
 import { FormNotifyState } from '../../../constant';
 import { ControllerEvent, isValueChange } from '../../../utils';
@@ -97,16 +98,11 @@ export abstract class FormController<
    */
   async dataChangeNotify(names: string[]): Promise<void> {
     // 通知所有成员项去处理成员项相关逻辑
-    const values = await Promise.allSettled(
+    await handleAllSettled(
       Object.values(this.details).map(async detail => {
         return detail.dataChangeNotify(names);
       }),
     );
-    const rejectedValue = values.find(item => item.status === 'rejected');
-    if (rejectedValue) {
-      ibiz.log.error('dataChangeNotify报错', values);
-      throw (rejectedValue as PromiseRejectedResult).reason;
-    }
   }
 
   /**

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

@@ -32,7 +32,7 @@ import { ControlVO, Srfuf } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
 import { getDefaultValue, isValueChange } from '../../../utils';
-import { ScriptFactory } from '../../../../utils';
+import { handleAllSettled, ScriptFactory } from '../../../../utils';
 
 /**
  * 表格控制器
@@ -267,10 +267,11 @@ export class GridController
   ): Promise<ControlVO[]> {
     await super.afterLoad(args, items);
     // 每次表格刷新时通知表格属性列,加载代码表,避免动态代码表更新不及时
-    await Promise.allSettled(
+    await handleAllSettled(
       Object.values(this.fieldColumns).map(async fieldColumn => {
         await fieldColumn.loadCodeList();
       }),
+      false,
     );
 
     // 生成表格row对象
@@ -536,7 +537,7 @@ export class GridController
       return;
     }
 
-    Promise.allSettled(
+    await handleAllSettled(
       needSaveData.map(data => {
         return this.save(data);
       }),
@@ -695,16 +696,11 @@ export class GridController
    */
   async dataChangeNotify(row: GridRowState, names: string[]): Promise<void> {
     // 通知所有编辑项去处理编辑项相关逻辑
-    const values = await Promise.allSettled(
+    await handleAllSettled(
       Object.values(this.editColumns).map(async column => {
         return column.dataChangeNotify(row, names);
       }),
     );
-    const rejectedValue = values.find(item => item.status === 'rejected');
-    if (rejectedValue) {
-      ibiz.log.error('dataChangeNotify报错', values);
-      throw (rejectedValue as PromiseRejectedResult).reason;
-    }
   }
 
   /**

package/src/controller/control/index.ts

@@ -19,3 +19,5 @@ export * from './tree/index';
 export * from './wizard-panel/index';
 export * from './md-ctrl/index';
 export * from './kanban/index';
+export * from './tree-grid-ex/index';
+export * from './tree-grid/index';

package/src/controller/control/toolbar/toolbar.controllerr.ts

@@ -124,7 +124,7 @@ export class ToolbarController<
       },
       { childrenFields: ['detoolbarItems'] },
     );
-    await this.state.buttonsState.update();
+    await this.calcButtonState();
   }
 
   /**
@@ -164,7 +164,11 @@ export class ToolbarController<
     await this.state.buttonsState.update(_data, appDeId);
 
     // 计算菜单项逻辑的预置逻辑
-    if (this.scheduler && _data) {
+    if (this.scheduler) {
+      const logicParams: IData = {};
+      if (_data) {
+        logicParams.data = [_data];
+      }
       // 遍历所有的项
       recursiveIterate(
         this.model,
@@ -172,9 +176,10 @@ export class ToolbarController<
           const itemState = this.state.buttonsState[item.id!] as IButtonState;
           // 计算项显示逻辑
           if (itemState.visible) {
-            const dynaVisible = this.scheduler!.triggerItemVisible(item.id!, {
-              data: [_data!],
-            });
+            const dynaVisible = this.scheduler!.triggerItemVisible(
+              item.id!,
+              logicParams,
+            );
             if (dynaVisible !== undefined) {
               itemState.visible = dynaVisible;
             }
@@ -182,9 +187,10 @@ export class ToolbarController<
 
           // 计算项启用逻辑
           if (!itemState.disabled) {
-            const dynaEnable = this.scheduler!.triggerItemEnable(item.id!, {
-              data: [_data!],
-            });
+            const dynaEnable = this.scheduler!.triggerItemEnable(
+              item.id!,
+              logicParams,
+            );
             if (dynaEnable !== undefined) {
               itemState.disabled = !dynaEnable;
             }

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

@@ -19,7 +19,7 @@ import {
   TreeDataSetNodeData,
   TreeCodeListNodeData,
 } from '../../../service';
-import { calcNavParams } from '../../../utils';
+import { calcNavParams, handleAllSettled } from '../../../utils';
 
 export interface TreeFetchOpts {
   /**
@@ -104,7 +104,7 @@ export class TreeService extends MDControlService<IDETree> {
       if (childNodeRSs.length === 0) {
         return;
       }
-      const results = await Promise.allSettled(
+      const results = await handleAllSettled(
         childNodeRSs.map(async childNodeRS => {
           const childNode = getTreeNode(
             this.model,
@@ -117,14 +117,11 @@ export class TreeService extends MDControlService<IDETree> {
             opts,
           );
         }),
+        false,
       );
 
       results.forEach(result => {
-        if (result.status === 'fulfilled' && result.value) {
-          childrenNodes.push(...result.value);
-        } else if (result.status === 'rejected') {
-          ibiz.log.error(result.reason);
-        }
+        childrenNodes.push(...result);
       });
     }
     return childrenNodes;
@@ -352,9 +349,11 @@ export class TreeService extends MDControlService<IDETree> {
     // 设置查询长度
     params.size = nodeModel.maxSize || 1000;
     // 排序属性
-    if (nodeModel.sortAppDEFieldId && nodeModel.sortDir) {
+    if (nodeModel.sortAppDEFieldId) {
       Object.assign(params, {
-        sort: `${nodeModel.sortAppDEFieldId.toLowerCase()},${nodeModel.sortDir.toLowerCase()}`,
+        sort: `${nodeModel.sortAppDEFieldId.toLowerCase()},${
+          nodeModel.sortDir ? nodeModel.sortDir.toLowerCase() : 'asc'
+        }`,
       });
     }
 

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

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

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

@@ -0,0 +1,6 @@
+import { ITreeGridController } from '../../../interface';
+import { GridController } from '../grid';
+
+export class TreeGridController
+  extends GridController
+  implements ITreeGridController {}

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

@@ -0,0 +1,12 @@
+import { GridService } from '../grid';
+
+/**
+ * 树表格部件服务
+ *
+ * @author zk
+ * @date 2023-09-25 05:09:52
+ * @export
+ * @class TreeGridService
+ * @extends {TreeService}
+ */
+export class TreeGridService extends GridService {}

package/src/controller/control/tree-grid-ex/index.ts

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

package/src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts

@@ -0,0 +1,283 @@
+import { recursiveIterate } from '@ibiz-template/core';
+import { IDETree, IDETreeColumn } from '@ibiz/model-core';
+import {
+  MDCtrlLoadParams,
+  ITreeNodeData,
+  ITreeGridExController,
+  IGridColumnProvider,
+  ITreeGridExState,
+  ITreeGridExEvent,
+} from '../../../interface';
+import { getGridColumnProvider } from '../../../register';
+import { MDControlController } from '../../common';
+import {
+  GridColumnController,
+  GridFieldColumnController,
+  GridUAColumnController,
+} from '../grid';
+import { TreeGridExService } from './tree-grid-ex.service';
+
+/**
+ * 树表格部件控制器
+ *
+ * @author zk
+ * @date 2023-09-21 06:09:46
+ * @export
+ * @class TreeGridExController
+ * @extends {MDControlController<IDETree, ITreeGridState, ITreeGridEvent>}
+ * @implements {ITreeGridExController}
+ */
+export class TreeGridExController
+  extends MDControlController<IDETree, ITreeGridExState, ITreeGridExEvent>
+  implements ITreeGridExController
+{
+  declare service: TreeGridExService;
+
+  /**
+   * 表格列的适配器
+   *
+   * @author zk
+   * @date 2023-09-21 06:09:04
+   * @type {{ [key: string]: IGridColumnProvider }}
+   * @memberof TreeGridExController
+   */
+  providers: { [key: string]: IGridColumnProvider } = {};
+
+  /**
+   * 所有表格列控制器集合
+   *
+   * @author zk
+   * @date 2023-09-21 06:09:10
+   * @type {{ [key: string]: GridColumnController }}
+   * @memberof TreeGridExController
+   */
+  columns: { [key: string]: GridColumnController } = {};
+
+  /**
+   * 所有表格属性列的控制器
+   *
+   * @author zk
+   * @date 2023-09-21 06:09:16
+   * @type {{ [key: string]: GridFieldColumnController }}
+   * @memberof TreeGridExController
+   */
+  fieldColumns: { [key: string]: GridFieldColumnController } = {};
+
+  /**
+   * 所有表格操作列的控制器
+   *
+   * @author zk
+   * @date 2023-09-21 06:09:21
+   * @type {{ [key: string]: GridUAColumnController }}
+   * @memberof TreeGridExController
+   */
+  uaColumns: { [key: string]: GridUAColumnController } = {};
+
+  protected initState(): void {
+    super.initState();
+    // 根节点初始化
+    this.state.size = 0;
+    this.state.columnStates = [];
+    this.state.defaultExpandedKeys = [];
+  }
+
+  protected async onCreated(): Promise<void> {
+    await super.onCreated();
+    this.service = new TreeGridExService(this.model);
+    await this.service.init(this.context);
+    this.initColumnStates();
+    await this.initGridColumns();
+  }
+
+  /**
+   * 初始化表格属性列，操作列，编辑项控制器
+   *
+   * @author zk
+   * @date 2023-09-21 06:09:28
+   * @protected
+   * @return {*}  {Promise<void>}
+   * @memberof TreeGridExController
+   */
+  protected async initGridColumns(): Promise<void> {
+    if (this.model.detreeColumns) {
+      await Promise.all(
+        this.model.detreeColumns.map(async column =>
+          this.initColumnsController(column),
+        ),
+      );
+    }
+  }
+
+  /**
+   * 初始化表格属性列，操作列，编辑项控制器
+   *
+   * @author zk
+   * @date 2023-09-21 06:09:37
+   * @protected
+   * @param {IDETreeColumn} column
+   * @return {*}  {Promise<void>}
+   * @memberof TreeGridExController
+   */
+  protected async initColumnsController(column: IDETreeColumn): Promise<void> {
+    // 初始化适配器
+    const provider = await getGridColumnProvider(column);
+    if (!provider) {
+      return;
+    }
+    this.providers[column.codeName!] = provider;
+
+    // 初始化表格列控制器
+    const controller = await provider.createController(column, this);
+    this.columns[column.codeName!] = controller as GridColumnController;
+    // 分类存放控制器
+    if (column.columnType === 'DEFGRIDCOLUMN') {
+      this.fieldColumns[column.codeName!] =
+        controller as GridFieldColumnController;
+    } else if (column.columnType === 'UAGRIDCOLUMN') {
+      this.uaColumns[column.codeName!] = controller as GridUAColumnController;
+    }
+  }
+
+  /**
+   * 初始化表格列状态
+   *
+   * @author zk
+   * @date 2023-09-21 06:09:43
+   * @protected
+   * @memberof TreeGridExController
+   */
+  protected initColumnStates(): void {
+    recursiveIterate(
+      this.model,
+      (column: IDETreeColumn) => {
+        if (column.columnType !== 'GROUPGRIDCOLUMN') {
+          this.state.columnStates.push({
+            key: column.codeName!,
+            caption: column.caption!,
+            hidden: !!column.hideDefault,
+            uaColumn: column.columnType === 'UAGRIDCOLUMN',
+          });
+        }
+      },
+      { childrenFields: ['detreeColumns'] },
+    );
+    this.calcColumnFixed();
+  }
+
+  /**
+   * 计算列的固定状态
+   *
+   * @author zk
+   * @date 2023-09-21 06:09:50
+   * @protected
+   * @memberof TreeGridExController
+   */
+  protected calcColumnFixed(): void {
+    const showColumns = this.state.columnStates.filter(
+      column => !column.hidden,
+    );
+    const allNum = showColumns.length;
+    showColumns.forEach((column, index) => {
+      if (column.uaColumn) {
+        column.fixed = index + 1 <= Math.floor(allNum / 2) ? 'left' : 'right';
+      } else {
+        column.fixed = 'right';
+      }
+    });
+  }
+
+  /**
+   * 树部件加载，从根节点开始重新加载
+   *
+   * @author zk
+   * @date 2023-09-21 06:09:56
+   * @param {MDCtrlLoadParams} [args={}]
+   * @return {*}  {Promise<ITreeNodeData[]>}
+   * @memberof TreeGridExController
+   */
+  async load(args: MDCtrlLoadParams = {}): Promise<ITreeNodeData[]> {
+    const isInitialLoad = args.isInitialLoad === true;
+    const nodes = await this.loadNodes();
+    this.state.expandedKeys = this.calcExpandedKeys(nodes);
+    await this.afterLoad(args, nodes);
+    this.state.isLoaded = true;
+    await this.evt.emit('onLoadSuccess', {
+      isInitialLoad,
+    });
+
+    return nodes;
+  }
+
+  /**
+   * 加载子节点数据
+   *
+   * @author zk
+   * @date 2023-09-21 06:09:02
+   * @param {ITreeNodeData} [parentNode]
+   * @return {*}  {Promise<ITreeNodeData[]>}
+   * @memberof TreeGridExController
+   */
+  async loadNodes(parentNode?: ITreeNodeData): Promise<ITreeNodeData[]> {
+    const params = await this.getFetchParams();
+    const hasQuery = !!params.query;
+    const defaultExpandedKeys = !parentNode
+      ? this.state.defaultExpandedKeys
+      : undefined;
+
+    // 请求服务获取子节点数据
+    await this.startLoading();
+    let nodes;
+    try {
+      nodes =
+        (await this.service.fetchChildNodes(parentNode, {
+          context: this.context.clone(),
+          params,
+          hasQuery,
+          defaultExpandedKeys,
+        })) || [];
+    } finally {
+      await this.endLoading();
+    }
+
+    // 有父节点绑定到父节点数据上，无父节点替换rootNodes
+    if (parentNode) {
+      parentNode.children = nodes;
+    } else {
+      this.state.rootNodes = nodes;
+    }
+
+    // 更新items
+    this.state.items = [];
+    recursiveIterate(
+      { children: this.state.rootNodes },
+      (node: ITreeNodeData) => {
+        this.state.items.push(node);
+      },
+    );
+
+    return nodes;
+  }
+
+  /**
+   * 计算展开节点集合
+   *
+   * @author zk
+   * @date 2023-09-21 06:09:07
+   * @param {ITreeNodeData[]} nodes
+   * @return {*}  {string[]}
+   * @memberof TreeGridExController
+   */
+  protected calcExpandedKeys(nodes: ITreeNodeData[]): string[] {
+    let expandedKeys: string[] = [];
+    recursiveIterate({ children: nodes }, (node: ITreeNodeData) => {
+      if (node.children?.length) {
+        expandedKeys.push(node.id);
+      }
+    });
+    if (this.state.defaultExpandedKeys.length) {
+      expandedKeys.push(...this.state.defaultExpandedKeys);
+      expandedKeys = Array.from(new Set(expandedKeys));
+    }
+    return expandedKeys;
+  }
+}