@ibiz-template/runtime 0.5.7-alpha.4 → 0.5.7-alpha.6

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

@@ -1,15 +1,10 @@
-import {
-  RuntimeError,
-  mergeInLeft,
-  recursiveIterate,
-} from '@ibiz-template/core';
+import { mergeInLeft } from '@ibiz-template/core';
 import { IAppDataEntity, ISearchBar, ISearchBarFilter } from '@ibiz/model-core';
-import { clone, isNil } from 'ramda';
+import { clone } from 'ramda';
 import {
   ISearchBarState,
   ISearchBarEvent,
   ISearchBarController,
-  IFilterNode,
   IBackendSearchBarGroup,
   IGridController,
 } from '../../../interface';
@@ -19,6 +14,11 @@ import { SearchBarFilterController } from './search-bar-filter.controller';
 import { SearchBarService } from './search-bar.service';
 import { getEntitySchema } from '../../utils';
 import { calcFilterModelBySchema } from './entity-schema';
+import {
+  calcSearchConds,
+  getOriginFilterNodes,
+  parseFilters,
+} from './use-searchcond';
 
 /**
  * 搜索栏控制器
@@ -106,7 +106,7 @@ export class SearchBarController
    * @author lxm
    * @date 2024-01-05 10:10:37
    */
-  addSchemaFilters = false;
+  addSchemaFilters = true;
 
   /**
    * 表格控制器
@@ -184,7 +184,11 @@ export class SearchBarController
     if (!json) {
       return;
     }
-    const addSearchBarFilters = await calcFilterModelBySchema(json, this);
+    const addSearchBarFilters = await calcFilterModelBySchema(
+      json,
+      this.model.appDataEntityId!,
+      this.model.appId,
+    );
 
     const mergeFilters: ISearchBarFilter[] = [];
     this.model.searchBarFilters?.forEach(filter => {
@@ -304,7 +308,7 @@ export class SearchBarController
    * @date 2023-10-16 03:52:44
    */
   resetFilter(): void {
-    this.state.filterNodes = this.getOriginFilterNodes();
+    this.state.filterNodes = getOriginFilterNodes();
     this.evt.emit('onSearch', undefined);
   }
 
@@ -318,7 +322,12 @@ export class SearchBarController
   protected async initSearchBarFilters(): Promise<void> {
     if (this.searchBarFilters?.length) {
       this.searchBarFilters.forEach(item => {
-        const filterController = new SearchBarFilterController(item, this);
+        const filterController = new SearchBarFilterController(
+          item,
+          this.appDataEntity,
+          this.context,
+          this.params,
+        );
         this.filterControllers.push(filterController);
       });
       await Promise.all(
@@ -337,91 +346,8 @@ export class SearchBarController
     if (!this.enableFilter) {
       return;
     }
-    let hasFilter = false; // 是否有过滤项
-    let hasError = false; // 是否有过滤项格式不正确
-    recursiveIterate(this.state.filterNodes[0], (node: IFilterNode) => {
-      if (node.leaf) {
-        if (node.field && node.valueOP && !isNil(node.value)) {
-          hasFilter = true;
-        } else {
-          // 如果过滤项不给
-          hasError = true;
-        }
-      }
-    });
-    if (hasFilter && !hasError) {
-      const filter = [this.formatFilters(this.state.filterNodes[0])];
-      return filter;
-    }
-  }
-
-  /**
-   * 格式化过滤项 （后续如果修改这里的逻辑记得把下方的反推函数parseFilters也跟着修改！）
-   * @author lxm
-   * @date 2023-10-16 03:45:41
-   * @param {IFilterNode} node
-   * @return {*}  {IData}
-   */
-  formatFilters(node: IFilterNode): IData {
-    if (!node.leaf) {
-      return {
-        condtype: 'GROUP',
-        condop: node.logicType,
-        bnotmode: false,
-        searchconds: node.children.map(item => this.formatFilters(item)),
-      };
-    }
-
-    return {
-      condtype: 'DEFIELD',
-      fieldname: node.field,
-      condop: node.valueOP,
-      value: node.value,
-    };
-  }
-
-  /**
-   * 根据格式化后的过滤项反推出过滤项树节点数据集合
-   * @param {IData} data
-   * @return {*}
-   * @author: zhujiamin
-   * @Date: 2023-12-28 09:47:45
-   */
-  parseFilters(data: IData): IFilterNode {
-    if (data.condtype === 'GROUP') {
-      return {
-        leaf: false,
-        logicType: data.condop === 'AND' ? 'AND' : 'OR',
-        children: (data.searchconds || []).map((item: IData) =>
-          this.parseFilters(item),
-        ),
-      };
-    }
-    if (data.condtype === 'DEFIELD') {
-      return {
-        leaf: true,
-        field: data.fieldname || null,
-        valueOP: data.condop || null,
-        value: data.value || null,
-      };
-    }
-    throw new RuntimeError(`无效的condtype:${data.condtype}`);
-  }
-
-  /**
-   * 获取初始过滤项树节点数据集合
-   * @return {*}
-   * @author: zhujiamin
-   * @Date: 2023-12-21 17:29:47
-   */
-  protected getOriginFilterNodes(): IFilterNode[] {
-    return [
-      {
-        leaf: false,
-        logicType: 'AND',
-        children: [{ leaf: true, field: null, valueOP: null, value: null }],
-      },
-    ];
+    const searchconds = calcSearchConds(this.state.filterNodes);
+    return searchconds;
   }
 
   /**
@@ -611,11 +537,11 @@ export class SearchBarController
     ) {
       // 根据后台标准的searchconds计算出 前端回显的树形结构FilterNodes
       const filterNodes = groupItem.searchGroupData.searchconds.map(item =>
-        this.parseFilters(item),
+        parseFilters(item),
       );
       this.state.filterNodes = filterNodes;
     } else {
-      this.state.filterNodes = this.getOriginFilterNodes();
+      this.state.filterNodes = getOriginFilterNodes();
     }
     if (this.grid && groupItem && groupItem.searchGroupData) {
       this.grid.setGroupParams(groupItem.searchGroupData);

package/src/controller/control/search-bar/use-searchcond.ts

@@ -0,0 +1,100 @@
+import { RuntimeError, recursiveIterate } from '@ibiz-template/core';
+import { isNil } from 'ramda';
+import { IFilterNode } from '../../../interface';
+
+/**
+ * 获取初始过滤项树节点数据集合
+ * @return {*}
+ * @author: zhujiamin
+ * @Date: 2023-12-21 17:29:47
+ */
+export function getOriginFilterNodes(): IFilterNode[] {
+  return [
+    {
+      leaf: false,
+      logicType: 'AND',
+      children: [{ leaf: true, field: null, valueOP: null, value: null }],
+    },
+  ];
+}
+
+/**
+ * 格式化过滤项 （后续如果修改这里的逻辑记得把下方的反推函数parseFilters也跟着修改！）
+ * @author lxm
+ * @date 2023-10-16 03:45:41
+ * @param {IFilterNode} node
+ * @return {*}  {IData}
+ */
+export function formatFilters(node: IFilterNode): IData {
+  if (!node.leaf) {
+    return {
+      condtype: 'GROUP',
+      condop: node.logicType,
+      bnotmode: false,
+      searchconds: node.children.map(item => formatFilters(item)),
+    };
+  }
+
+  return {
+    condtype: 'DEFIELD',
+    fieldname: node.field,
+    condop: node.valueOP,
+    value: node.value,
+  };
+}
+
+/**
+ * 根据格式化后的过滤项反推出过滤项树节点数据集合
+ * @param {IData} data
+ * @return {*}
+ * @author: zhujiamin
+ * @Date: 2023-12-28 09:47:45
+ */
+export function parseFilters(data: IData): IFilterNode {
+  if (data.condtype === 'GROUP') {
+    return {
+      leaf: false,
+      logicType: data.condop === 'AND' ? 'AND' : 'OR',
+      children: (data.searchconds || []).map((item: IData) =>
+        parseFilters(item),
+      ),
+    };
+  }
+  if (data.condtype === 'DEFIELD') {
+    return {
+      leaf: true,
+      field: data.fieldname || null,
+      valueOP: data.condop || null,
+      value: data.value || null,
+    };
+  }
+  throw new RuntimeError(`无效的condtype:${data.condtype}`);
+}
+
+/**
+ * 根据filterNodes计算出SearchConds
+ * @param {IData} data
+ * @return {*}
+ * @author: zhujiamin
+ * @Date: 2023-12-28 09:47:45
+ */
+export function calcSearchConds(
+  filterNodes: IFilterNode[],
+): IData[] | undefined {
+  let hasFilter = false; // 是否有过滤项
+  let hasError = false; // 是否有过滤项格式不正确
+  recursiveIterate(filterNodes[0], (node: IFilterNode) => {
+    if (node.leaf) {
+      if (node.field && node.valueOP && !isNil(node.value)) {
+        hasFilter = true;
+      } else {
+        // 如果过滤项不给
+        hasError = true;
+      }
+    }
+  });
+  if (hasFilter && !hasError) {
+    const filter = [formatFilters(filterNodes[0])];
+    return filter;
+  }
+}

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,90 @@ 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 (!this.calcViewFooterVisible()) {
+      names.push('view_footer');
     }
+    return names;
+  }
 
-    if (ibiz.env.isMob) {
-      // 显示隐藏底部栏
-      const showFooter = this.calcViewFooterVisible();
-      if (!showFooter) {
-        const controller = this.viewLayoutPanel?.panelItems.view_footer;
-        if (controller) {
-          controller.state.visible = false;
-        }
-      }
+  /**
+   * 删除布局模型
+   *
+   * @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 +220,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 +271,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;
   /**
    * 展示方向
    *