@ibiz-template/runtime 0.5.7-alpha.5 → 0.5.7-alpha.7

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

@@ -1,5 +1,6 @@
 import { IHttpResponse, RuntimeError } from '@ibiz-template/core';
 import { ISysCalendar } from '@ibiz/model-core';
+import { clone } from 'ramda';
 import { ICalendarItemData } from '../../../interface';
 import { MDControlService, CalendarItemData } from '../../../service';
 
@@ -34,10 +35,15 @@ export class CalendarService extends MDControlService<ISysCalendar> {
     const promises = sysCalendarItems.map(
       async (item): Promise<IHttpResponse> => {
         const fetchAction = item.appDEDataSetId || 'fetchdefault';
+        const tempContext = context.clone();
+        const tempParams = clone(params);
+        if (item.maxSize) {
+          tempParams.size = item.maxSize;
+        }
         return this.exec2(
           fetchAction,
-          context,
-          params,
+          tempContext,
+          tempParams,
           undefined,
           item.appDataEntityId!,
         );

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

@@ -475,6 +475,13 @@ export class GridController<
     }
   }
 
+  async getFetchParams(extraParams: IParams = {}): Promise<IParams> {
+    if (this.model.enableItemPrivilege === true) {
+      extraParams.srfdataaccessaction = true;
+    }
+    return super.getFetchParams(extraParams);
+  }
+
   /**
    * 计算当前页的聚合数据
    * @author lxm

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

@@ -1,4 +1,4 @@
-import { IInternalMessage } from '@ibiz-template/core';
+import { IInternalMessage, IPortalMessage } from '@ibiz-template/core';
 import { QXEvent } from 'qx-util';
 import {
   IInternalMessageController,
@@ -27,6 +27,7 @@ export class InternalMessageController implements IInternalMessageController {
 
   async init(): Promise<void> {
     this.load();
+    this.listenMqtt();
   }
 
   async load(): Promise<void> {
@@ -61,4 +62,22 @@ export class InternalMessageController implements IInternalMessageController {
     }
     this.evt.emit('dataChange');
   }
+
+  /**
+   * 监听mqtt消息
+   * @author lxm
+   * @date 2024-01-30 01:53:44
+   * @protected
+   */
+  protected listenMqtt(): void {
+    ibiz.mc.command.internalMessage.on(async (msg: IPortalMessage) => {
+      ibiz.log.debug('mqtt internalMessage: ', msg);
+      if (msg.subtype !== 'INTERNALMESSAGE') {
+        return;
+      }
+
+      // todo 目前会有一种情况，不带data，弹右下角消息提示
+      ibiz.notification.info({ desc: msg.content, position: 'bottom-right' });
+    });
+  }
 }

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

@@ -1,5 +1,5 @@
 import { RuntimeModelError } from '@ibiz-template/core';
-import { IAppDEMultiDataView } from '@ibiz/model-core';
+import { IAppDEMultiDataView, ISearchBar } from '@ibiz/model-core';
 import { clone } from 'ramda';
 import { SysUIActionTag, ViewCallTag } from '../constant';
 import { ViewController } from '../controller';
@@ -14,7 +14,7 @@ import {
   EventBase,
   IUIActionResult,
 } from '../interface';
-import { calcDeCodeNameById } from '../model';
+import { calcDeCodeNameById, getControl } from '../model';
 import { ViewEngineBase } from './view-base.engine';
 
 /**
@@ -398,18 +398,46 @@ export class MDViewEngine extends ViewEngineBase {
     this.newData(Object.assign(args, { copyMode: true }));
   }
 
+  /**
+   * 计算头部显示
+   *
+   * @author zk
+   * @date 2024-01-29 05:01:30
+   * @protected
+   * @return {*}  {boolean}
+   * @memberof MDViewEngine
+   */
   protected calcViewHeaderVisible(): boolean {
-    let showHeader = super.calcViewHeaderVisible();
+    const showHeader = super.calcViewHeaderVisible();
     // 搜索栏
-    if (!this.searchBar || !this.searchBar.state.visible) {
-      const controller = this.viewLayoutPanel!.panelItems.view_searchbar;
-      if (controller) {
-        controller.state.visible = false;
-      }
-    } else {
-      showHeader = true;
+    const visible = this.calcViewSearchBarVisible();
+    return visible || showHeader;
+  }
+
+  /**
+   * 计算搜索栏显示
+   *
+   * @author zk
+   * @date 2024-01-29 05:01:36
+   * @protected
+   * @return {*}  {boolean}
+   * @memberof MDViewEngine
+   */
+  protected calcViewSearchBarVisible(): boolean {
+    const { model } = this.view;
+    // 搜索栏
+
+    const has: boolean = this.isExistAndInLayout('searchbar');
+    if (!has) {
+      return has;
     }
-    return showHeader;
+    const searchBar: ISearchBar = getControl(model, 'searchbar')!;
+    const visible = !!(
+      searchBar.enableQuickSearch ||
+      searchBar.enableGroup ||
+      searchBar.enableFilter === true
+    );
+    return visible;
   }
 
   /**
@@ -427,4 +455,24 @@ export class MDViewEngine extends ViewEngineBase {
       }
     }
   }
+
+  /**
+   * 计算移除的模型名称
+   *
+   * @author zk
+   * @date 2024-01-29 03:01:42
+   * @return {*}  {string[]}
+   * @memberof MDViewEngine
+   */
+  calcRemoveLayoutModel(): string[] {
+    const { model } = this.view;
+    const names = super.calcRemoveLayoutModel();
+    if (!getControl(model, 'searchform')) {
+      names.push('searchform');
+    }
+    if (!this.calcViewSearchBarVisible()) {
+      names.push('view_searchbar');
+    }
+    return names;
+  }
 }

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

@@ -1,4 +1,5 @@
-import { RuntimeError } from '@ibiz-template/core';
+import { RuntimeError, findRecursiveChild } from '@ibiz-template/core';
+import { IPanel, IPanelContainer } from '@ibiz/model-core';
 import { ViewCallTag } from '../constant';
 import {
   IViewController,
@@ -6,6 +7,7 @@ import {
   IViewLayoutPanelController,
 } from '../interface';
 import { IViewEngine } from '../interface/engine';
+import { getControl } from '../model';
 
 /**
  * 视图引擎基类
@@ -88,31 +90,93 @@ export class ViewEngineBase implements IViewEngine {
   async onCreated(): Promise<void> {
     const { childNames } = this.view;
     childNames.push('captionbar', 'toolbar');
+    this.calcDynamicLayout();
   }
 
-  async onMounted(): Promise<void> {
-    // 子类重写
-    const { model, childNames } = this.view;
-    ibiz.log.debug(`${model.id}的子组件：${childNames.join(';')}都已mounted`);
+  /**
+   * 计算动态布局模型
+   *
+   * @author zk
+   * @date 2024-01-29 02:01:47
+   * @memberof ViewEngineBase
+   */
+  protected calcDynamicLayout(): void {
+    const names = this.calcRemoveLayoutModel();
+    ibiz.log.debug(`${this.view.model.codeName}删除模型：${names.join(';')}`);
+    this.removeLayoutModel(names);
+  }
+
+  /**
+   * 计算移除的模型名称
+   *
+   * @author zk
+   * @date 2024-01-29 02:01:21
+   * @return {*}  {string[]}
+   * @memberof ViewEngineBase
+   */
+  protected calcRemoveLayoutModel(): string[] {
+    const { model } = this.view;
+    const names = [];
 
-    const showHeader = this.calcViewHeaderVisible();
-    if (!showHeader) {
-      const controller = this.viewLayoutPanel?.panelItems.view_header;
-      if (controller) {
-        controller.state.visible = false;
+    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)) {
+        names.push(name);
       }
+    });
+    if (!this.calcViewHeaderVisible()) {
+      names.push('view_header');
     }
 
     if (ibiz.env.isMob) {
-      // 显示隐藏底部栏
-      const showFooter = this.calcViewFooterVisible();
-      if (!showFooter) {
-        const controller = this.viewLayoutPanel?.panelItems.view_footer;
-        if (controller) {
-          controller.state.visible = false;
-        }
+      if (!this.calcViewFooterVisible()) {
+        names.push('view_footer');
       }
     }
+    return names;
+  }
+
+  /**
+   * 删除布局模型
+   *
+   * @author zk
+   * @date 2024-01-29 02:01:29
+   * @param {string[]} names
+   * @param {(IPanelContainer | undefined)} [container=this.view.model.viewLayoutPanel]
+   * @return {*}  {void}
+   * @memberof ViewEngineBase
+   */
+  private removeLayoutModel(
+    names: string[],
+    container: IPanelContainer | undefined = this.view.model.viewLayoutPanel,
+  ): void {
+    if (!container) {
+      return;
+    }
+    const items =
+      (container as IPanel)!.rootPanelItems || container.panelItems || [];
+    const index = items.findIndex(item => names.includes(item.id!));
+    if (index !== -1) {
+      items.splice(index, 1);
+    }
+    // 过滤深层的子成员
+    items.forEach(item => {
+      if (item.itemType === 'CONTAINER') {
+        this.removeLayoutModel(names, item);
+      }
+    });
+  }
+
+  async onMounted(): Promise<void> {
+    // 子类重写
+    const { model, childNames } = this.view;
+    ibiz.log.debug(`${model.id}的子组件：${childNames.join(';')}都已mounted`);
   }
 
   async onDestroyed(): Promise<void> {
@@ -159,49 +223,46 @@ export class ViewEngineBase implements IViewEngine {
     const { model } = this.view;
 
     // 标题栏
-    if (model.showCaptionBar === false) {
-      // 隐藏标题栏容器
-      const controller = this.viewLayoutPanel?.panelItems.view_captionbar;
-      if (controller) {
-        controller.state.visible = false;
-      }
-    } else {
+    if (model.showCaptionBar) {
       showHeader = true;
     }
-
     if (ibiz.env.isMob) {
-      if (!this.leftToolbar) {
-        // 隐藏左工具栏
-        const controller = this.viewLayoutPanel?.panelItems.lefttoolbar;
-        if (controller) {
-          controller.state.visible = false;
-        }
-      } else {
+      if (this.isExistAndInLayout('lefttoolbar')) {
         showHeader = true;
       }
 
-      if (!this.rightToolbar) {
-        // 隐藏右工具栏
-        const controller = this.viewLayoutPanel?.panelItems.righttoolbar;
-        if (controller) {
-          controller.state.visible = false;
-        }
-      } else {
+      if (this.isExistAndInLayout('righttoolbar')) {
         showHeader = true;
       }
-    } else if (!this.toolbar) {
-      // 隐藏工具栏容器
-      const controller = this.viewLayoutPanel?.panelItems.view_toolbar;
-      if (controller) {
-        controller.state.visible = false;
-      }
-    } else {
+    } else if (this.isExistAndInLayout('toolbar')) {
       showHeader = true;
     }
-
     return showHeader;
   }
 
+  /**
+   * 是否存在模型 并且 布局中有占位
+   *
+   * @author zk
+   * @date 2024-01-30 11:01:33
+   * @param {string} name
+   * @return {*}  {(IData | undefined)}
+   * @memberof ViewEngineBase
+   */
+  isExistAndInLayout(name: string): boolean {
+    const layout = this.view.model.viewLayoutPanel;
+    if (!layout) {
+      return false;
+    }
+    const ins = findRecursiveChild(layout, name, {
+      compareField: 'id',
+      childrenFields: ['panelItems', 'rootPanelItems'],
+    });
+    const { model } = this.view;
+    const has = getControl(model, name);
+    return !!(ins && has);
+  }
+
   /**
    * 计算底部的显示与否
    * @author lxm
@@ -213,10 +274,9 @@ export class ViewEngineBase implements IViewEngine {
     let showFooter: boolean = false;
 
     // 工具栏
-    if (this.footerToolbar) {
+    if (this.isExistAndInLayout('footertoolbar')) {
       showFooter = true;
     }
-
     return showFooter;
   }
 

package/src/interface/common/i-drawer-options/i-drawer-options.ts

@@ -1,7 +1,7 @@
 export interface IDrawerOptions {
   /**
    * 抽屉宽度
-   * 左、右方向时可用。目前只支持像素
+   * 左、右方向时可用。0-100的时候算百分比，100以上算像素px
    *
    * @author lxm
    * @date 2022-09-12 20:09:20
@@ -10,7 +10,7 @@ export interface IDrawerOptions {
   width?: number;
   /**
    * 抽屉高度
-   * 上、下方向时可用。目前只支持像素
+   * 上、下方向时可用。0-100的时候算百分比，100以上算像素px
    *
    * @author lxm
    * @date 2022-09-12 20:09:22

package/src/interface/common/i-modal-options/i-modal-options.ts

@@ -1,6 +1,6 @@
 export interface IModalOptions {
   /**
-   * 宽度
+   * 宽度 数字0-100的时候算百分比，100以上算像素px，字符串原样设置
    *
    * @author lxm
    * @date 2022-09-12 20:09:20
@@ -8,7 +8,7 @@ export interface IModalOptions {
    */
   width?: string | number;
   /**
-   * 高度
+   * 高度 数字0-100的时候算百分比，100以上算像素px，字符串原样设置
    *
    * @author lxm
    * @date 2022-09-12 20:09:22

package/src/interface/common/i-popover-options/i-popover-options.ts

@@ -32,21 +32,21 @@ interface AxesOffsets {
  */
 export interface IPopoverOptions<O = unknown> {
   /**
-   * 宽度
+   * 宽度 数字0-100的时候算百分比，100以上算像素px，字符串原样设置
    *
-   * @author chitanda
-   * @date 2022-11-08 16:11:26
-   * @type {string}
+   * @author lxm
+   * @date 2022-09-12 20:09:20
+   * @type {string | number}
    */
-  width?: string;
+  width?: string | number;
   /**
-   * 高度
+   * 高度 数字0-100的时候算百分比，100以上算像素px，字符串原样设置
    *
-   * @author chitanda
-   * @date 2022-11-08 16:11:33
-   * @type {string}
+   * @author lxm
+   * @date 2022-09-12 20:09:22
+   * @type {string | number}
    */
-  height?: string;
+  height?: string | number;
   /**
    * 展示方向
    *

package/src/interface/util/i-notification-util/i-notification-util.ts

@@ -32,6 +32,14 @@ export interface NotificationParams {
    * @type {number}
    */
   duration?: number;
+
+  /**
+   * 位置
+   * @author lxm
+   * @date 2024-01-30 11:43:21
+   * @type {('top-right' | 'top-left' | 'bottom-right' | 'bottom-left')}
+   */
+  position?: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left';
 }
 
 /**