@ibiz-template/runtime 0.6.0 → 0.6.1-dev.0

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

@@ -4,7 +4,7 @@ import {
   IDETreeNode,
   IDETreeNodeRS,
 } from '@ibiz/model-core';
-import { IHttpResponse, ModelError } from '@ibiz-template/core';
+import { ModelError } from '@ibiz-template/core';
 import { IGanttNodeData } from '../../../interface';
 import { getChildNodeRSs, getRootNode, getTreeNode } from '../../../model';
 import { handleAllSettled } from '../../../utils';
@@ -26,28 +26,49 @@ import {
  */
 export class GanttService extends TreeService {
   /**
-   * 执行实体服务
+   * 获取节点草稿
    *
-   * @protected
-   * @param {string} appDataEntityId 实体标识
-   * @param {string} actionName 行为标识
-   * @param {IContext} context 上下文
-   * @param {IParams} params 参数
-   * @return {*}  {Promise<IHttpResponse<IData>>}
+   * @param {IDETreeDataSetNode} nodeModel
+   * @param {(IDETreeNodeRS | undefined)} nodeRS
+   * @param {(IGanttNodeData | undefined)} parentNodeData
+   * @param {TreeFetchOpts} opts
+   * @return {*}  {Promise<IGanttNodeData>}
    * @memberof GanttService
    */
-  execDeService(
-    appDataEntityId: string,
-    actionName: string,
-    context: IContext,
-    params: IParams,
-  ): Promise<IHttpResponse<IData>> {
-    return this.app.deService.exec(
-      appDataEntityId,
-      actionName,
+  async getNodeDraft(
+    nodeModel: IDETreeDataSetNode,
+    nodeRS: IDETreeNodeRS | undefined,
+    parentNodeData: IGanttNodeData | undefined,
+    opts: TreeFetchOpts,
+  ): Promise<IGanttNodeData> {
+    const { appDataEntityId } = nodeModel;
+
+    // 处理查询参数,没有关系的时候不处理参数了
+    const { context, params, navContext, navParams } = nodeRS
+      ? this.getNodeRSFilterParams(nodeRS, parentNodeData, opts)
+      : {
+          context: opts.context,
+          params: opts.params,
+          navContext: {},
+          navParams: {},
+        };
+
+    const response = await this.app.deService.exec(
+      appDataEntityId!,
+      'getdraft',
       context,
       params,
     );
+    const { data } = response;
+    if (nodeRS?.parentDER1N?.pickupDEFName && parentNodeData) {
+      data[nodeRS.parentDER1N.pickupDEFName] = parentNodeData._value;
+    }
+    return new GanttDataSetNodeData(this.model, nodeModel, parentNodeData, {
+      data: response.data,
+      leaf: true,
+      navContext,
+      navParams,
+    });
   }
 
   /**

package/src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts

@@ -275,6 +275,7 @@ export class TabExpPanelController
       params,
       viewId: tabViewPanel.embeddedAppDEViewId,
       isCache: this.isCache,
+      modalOptions: { replace: true },
     };
   }
 }

package/src/controller/notification/internal-message.controller.ts

@@ -156,10 +156,9 @@ export class InternalMessageController implements IInternalMessageController {
       return;
     }
 
-    // todo 后台接口适配
     await this.service.markRead(message.id);
-    // find.status = 'READ';
-    // this.unreadCount -= 1;
+    find.status = 'READ';
+    this.unreadCount -= 1;
 
     this.evt.emit('unreadCountChange', this.unreadCount);
     this.evt.emit('dataChange');

package/src/engine/view-base.engine.ts

@@ -133,9 +133,7 @@ export class ViewEngineBase implements IViewEngine {
     if (model.showCaptionBar === false) {
       names.push('view_captionbar');
     }
-    if (!getControl(model, 'toolbar')) {
-      names.push('view_toolbar', 'toolbar');
-    }
+
     const toolBarList = ['lefttoolbar', 'righttoolbar', 'footertoolbar'];
     toolBarList.forEach(name => {
       if (!getControl(model, name)) {
@@ -150,6 +148,15 @@ export class ViewEngineBase implements IViewEngine {
       if (!this.calcViewFooterVisible()) {
         names.push('view_footer');
       }
+      if (
+        !this.isExistAndInLayout('lefttoolbar') &&
+        !this.isExistAndInLayout('righttoolbar') &&
+        model.showCaptionBar === false
+      ) {
+        names.push('view_toolbar');
+      }
+    } else if (!getControl(model, 'toolbar')) {
+      names.push('view_toolbar', 'toolbar');
     }
     return names;
   }

package/src/interface/controller/common/i-nav-view-msg/i-nav-view-msg.ts

@@ -66,6 +66,16 @@ export interface INavViewMsg {
    */
   isCache?: boolean;
 
+  /**
+   * 视图打开参数
+   *
+   * @author zk
+   * @date 2024-02-06 02:02:15
+   * @type {boolean}
+   * @memberof INavViewMsg
+   */
+  modalOptions?: IData;
+
   /**
    * 是否404
    *

package/src/interface/controller/event/control/i-gantt.event.ts

@@ -1,3 +1,5 @@
+import { ITreeGridExRowState } from '../../state';
+import { EventBase } from '../argument';
 import { ITreeGridExEvent } from './i-tree-grid-ex.event';
 
 /**
@@ -9,4 +11,9 @@ import { ITreeGridExEvent } from './i-tree-grid-ex.event';
  * @interface IGanttEvent
  * @extends {IMDControlEvent}
  */
-export interface IGanttEvent extends ITreeGridExEvent {}
+export interface IGanttEvent extends ITreeGridExEvent {
+  onNewRow: {
+    event: { row: ITreeGridExRowState } & EventBase;
+    emitArgs: { row: ITreeGridExRowState };
+  };
+}

package/src/interface/util/i-open-view-util/i-open-view-util.ts

@@ -34,6 +34,7 @@ export interface IOpenViewUtil {
     appViewId: string,
     context: IContext,
     params?: IParams,
+    modalOptions?: IData,
   ): Promise<IModalData>;
 
   /**

package/src/service/vo/gantt-node-data/gantt-node-data-util.ts

@@ -20,7 +20,7 @@ export const calcDataItemValue = (
       return nodeDataItem.detreeColumnId === fieldCodeName;
     });
   if (targetTreeNodeDataItem && targetTreeNodeDataItem.appDEFieldId) {
-    result = data[targetTreeNodeDataItem.appDEFieldId];
+    result = data[targetTreeNodeDataItem.appDEFieldId!.toLowerCase()];
   }
   return result;
 };