@ibiz-template/runtime 0.1.29 → 0.1.31

package/src/controller/common/control/control.controller.ts

@@ -1,6 +1,7 @@
 import { IControl, IControlLogic, IViewLayoutPanel } from '@ibiz/model-core';
 import { NoticeError } from '@ibiz-template/core';
 import { isNil } from 'ramda';
+import { notNilEmpty } from 'qx-util';
 import { BaseController } from '..';
 import { CTX } from '../../ctx';
 import {
@@ -19,7 +20,7 @@ import {
 } from '../../../interface';
 import { ControlLogicScheduler } from '../../../logic-scheduler';
 import { getControlProvider } from '../../../register';
-import { ScriptFactory } from '../../../utils';
+import { convertNavData, ScriptFactory } from '../../../utils';
 
 /**
  * 部件控制器
@@ -63,6 +64,16 @@ export class ControlController<
 
   layoutPanel?: IViewLayoutPanelController;
 
+  /**
+   * 部件参数
+   *
+   * @author zk
+   * @date 2023-09-26 03:09:21
+   * @type {IData}
+   * @memberof ControlController
+   */
+  controlParams: IData = {};
+
   /**
    * 子适配器
    * @author lxm
@@ -130,7 +141,8 @@ export class ControlController<
       const provider = await getControlProvider(this.controlPanel);
       this.providers[this.controlPanel.name!] = provider!;
     }
-
+    // 处理上下文和导航参数
+    this.handleControlParams();
     // 部件逻辑初始化
     this.initControlScheduler(this.model.controlLogics);
   }
@@ -222,6 +234,23 @@ export class ControlController<
     }
   }
 
+  /**
+   * 部件参数解析
+   *
+   * @author zk
+   * @date 2023-09-27 07:09:08
+   * @protected
+   * @memberof ControlController
+   */
+  protected handleControlParams(): void {
+    const { ctrlParams } = this.model.controlParam!;
+    let params = {};
+    if (notNilEmpty(ctrlParams)) {
+      params = convertNavData(ctrlParams!, this.params, this.context);
+    }
+    Object.assign(this.controlParams, params);
+  }
+
   /**
    * 初始化部件逻辑调度器
    * @author lxm

package/src/controller/control/dashboard/portlet/index.ts

@@ -1,3 +1,4 @@
 export * from './portlet-part';
 export * from './container-portlet';
 export * from './view-portlet';
+export * from './menu-portlet';

package/src/controller/control/dashboard/portlet/menu-portlet/index.ts

@@ -0,0 +1 @@
+export * from './menu-portlet.controller';

package/src/controller/control/dashboard/portlet/menu-portlet/menu-portlet.controller.ts

@@ -0,0 +1,4 @@
+import { IDBAppMenuPortletPart } from '@ibiz/model-core';
+import { PortletPartController } from '../portlet-part/portlet-part.controller';
+
+export class MenuPortletController extends PortletPartController<IDBAppMenuPortletPart> {}

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

@@ -152,6 +152,25 @@ export class ExpBarControlController<
     return control;
   }
 
+  /**
+   * 是否缓存
+   *
+   * @author zk
+   * @date 2023-09-27 09:09:59
+   * @readonly
+   * @type {boolean}
+   * @memberof ExpBarControlController
+   */
+  get isCache(): boolean {
+    if (this.controlParams.expcache === 'CACHE') {
+      return true;
+    }
+    if (this.controlParams.expcache === 'NO_CACHE') {
+      return false;
+    }
+    return ibiz.config.view.expCacheMode.includes(this.model.controlType!);
+  }
+
   /**
    * 创建完成
    *
@@ -274,7 +293,10 @@ export class ExpBarControlController<
       }
       // 此时不需要导航占位push路由，只要有个key触发绘制下级视图就行。
       this._evt.emit('onNavViewChange', {
-        navViewMsg: { key: this.state.srfnav },
+        navViewMsg: {
+          key: this.state.srfnav,
+          isCache: this.isCache,
+        },
         context: this.context,
       });
     } else if (selectItem) {
@@ -297,7 +319,12 @@ export class ExpBarControlController<
     if (!data) {
       // 导航视图传空让他导航占位绘制空界面
       this.state.srfnav = '';
-      this._evt.emit('onNavViewChange', { navViewMsg: { key: '' } });
+      this._evt.emit('onNavViewChange', {
+        navViewMsg: {
+          key: '',
+          isCache: this.isCache,
+        },
+      });
       return;
     }
     // 默认选中并激活第一项
@@ -401,6 +428,7 @@ export class ExpBarControlController<
       context: result.context,
       params: result.params,
       viewId: viewModelId,
+      isCache: this.isCache,
     };
   }
 

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

@@ -123,6 +123,7 @@ export class TreeExpBarController
     return {
       key: nodeId,
       viewId: nodeModel.navAppViewId,
+      isCache: this.isCache,
       ...result,
     };
   }

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

@@ -38,6 +38,25 @@ export class TabExpPanelController
    */
   isShowIcon = false;
 
+  /**
+   * 是否缓存
+   *
+   * @author zk
+   * @date 2023-09-27 09:09:59
+   * @readonly
+   * @type {boolean}
+   * @memberof ExpBarControlController
+   */
+  get isCache(): boolean {
+    if (this.controlParams.expcache === 'CACHE') {
+      return true;
+    }
+    if (this.controlParams.expcache === 'NO_CACHE') {
+      return false;
+    }
+    return ibiz.config.view.expCacheMode.includes(this.model.controlType!);
+  }
+
   /**
    * 初始化state的属性
    *
@@ -235,6 +254,7 @@ export class TabExpPanelController
       context,
       params,
       viewId: tabViewPanel.embeddedAppDEViewId,
+      isCache: this.isCache,
     };
   }
 }

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

@@ -40,11 +40,15 @@ export class TreeController
     super.initState();
     // 根节点初始化
     this.state.defaultExpandedKeys = [];
+    this.state.expandedKeys = [];
     this.state.size = 0;
   }
 
   protected async onCreated(): Promise<void> {
     await super.onCreated();
+
+    this.state.expandedKeys = [...this.state.defaultExpandedKeys];
+
     this.service = new TreeService(this.model);
     await this.service.init(this.context);
 
@@ -74,8 +78,17 @@ export class TreeController
    */
   async load(args: MDCtrlLoadParams = {}): Promise<ITreeNodeData[]> {
     const isInitialLoad = args.isInitialLoad === true;
-    const nodes = await this.loadNodes();
-    this.state.expandedKeys = this.calcExpandedKeys(nodes);
+    if (isInitialLoad) {
+      await this.startLoading();
+    }
+    let nodes;
+    try {
+      nodes = await this.loadNodes();
+    } finally {
+      if (isInitialLoad) {
+        await this.endLoading();
+      }
+    }
     await this.afterLoad(args, nodes);
     this.state.isLoaded = true;
     await this.evt.emit('onLoadSuccess', {
@@ -95,24 +108,15 @@ export class TreeController
   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();
-    }
+    const nodes =
+      (await this.service.fetchChildNodes(parentNode, {
+        context: this.context.clone(),
+        params,
+        hasQuery,
+        defaultExpandedKeys: this.state.expandedKeys,
+      })) || [];
 
     // 有父节点绑定到父节点数据上，无父节点替换rootNodes
     if (parentNode) {
@@ -130,6 +134,8 @@ export class TreeController
       },
     );
 
+    this.state.expandedKeys = this.calcExpandedKeys(nodes);
+
     return nodes;
   }
 
@@ -164,6 +170,25 @@ export class TreeController
     }
   }
 
+  /**
+   * 树节点数据变更事件处理
+   * @author lxm
+   * @date 2023-09-28 01:48:05
+   * @param {ITreeNodeData} nodeData
+   * @param {boolean} isExpand true为展开，false为折叠
+   */
+  onExpandChange(nodeData: ITreeNodeData, isExpand: boolean): void {
+    const hasKey = this.state.expandedKeys.includes(nodeData.id);
+    if (isExpand && !hasKey) {
+      this.state.expandedKeys.push(nodeData.id);
+    } else if (!isExpand && hasKey) {
+      const index = this.state.expandedKeys.indexOf(nodeData.id);
+      if (index !== -1) {
+        this.state.expandedKeys.splice(index, 1);
+      }
+    }
+  }
+
   /**
    * 树节点双击事件
    * @author lxm
@@ -266,7 +291,7 @@ export class TreeController
   }
 
   /**
-   * 计算展开节点集合
+   * 计算展开节点集合(根据加载的子节点计算所有的展开节点标识集合)
    * @author lxm
    * @date 2023-08-09 05:19:36
    * @param {ITreeNodeData[]} nodes
@@ -274,16 +299,18 @@ export class TreeController
    * @return {*}  {string[]}
    */
   calcExpandedKeys(nodes: ITreeNodeData[]): string[] {
-    let expandedKeys: string[] = [];
+    // 用户操作的添加的要保留
+    let expandedKeys: string[] = [...this.state.expandedKeys];
+
+    // 计算加载回来的里面带的默认展开
     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));
-    }
+
+    // 去重
+    expandedKeys = Array.from(new Set(expandedKeys));
     return expandedKeys;
   }
 

package/src/interface/common/i-global-config/i-global-view-config.ts

@@ -20,11 +20,13 @@ export interface IGlobalViewConfig {
   enableDataInfoBar: boolean;
 
   /**
-   * 全局导航是否启用缓存
+   * 用于控制全局哪些导航部件启用缓存，全大写。TABEXPPANEL:GRIDEXPBAR: - :分隔每个导航部件的缓存开关，必须用:结尾，如：TABEXPPANEL:开启表格导航部件缓存，GRIDEXPBAR:开启分页导航部件缓存
    *
+   * @default 'TABEXPPANEL:'
+   * @description 判断时将使用 `部件类型:` 的方式进行判断，如：TABEXPPANEL:，表示开启表格导航视图的缓存
    * @author chitanda
    * @date 2023-09-15 12:09:09
-   * @type {boolean}
+   * @type {string}
    */
-  enableExpCache: boolean;
+  expCacheMode: string;
 }

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

@@ -45,4 +45,14 @@ export interface INavViewMsg {
    * @type {IAppView}
    */
   viewId?: string;
+
+  /**
+   * 是否缓存
+   *
+   * @author zk
+   * @date 2023-09-26 06:09:17
+   * @type {string}
+   * @memberof INavViewMsg
+   */
+  isCache?: boolean;
 }

package/src/service/app-data-entity/app-data-entity.ts

@@ -205,6 +205,11 @@ export class AppDataEntity implements IDataEntity {
    * @return {*}  {unknown}
    */
   protected convertVal(value: unknown, dataType: number | undefined): unknown {
+    // 空值不转换
+    if (value == null) {
+      return value;
+    }
+
     // 没有数据类型的给原值
     if (isNil(dataType)) {
       return value;

package/src/service/service/entity/method/method-renturn.ts

@@ -1,4 +1,5 @@
 import { IAppDataEntity, IAppDEMethod } from '@ibiz/model-core';
+import { isNilOrEmpty } from 'qx-util';
 import { MethodDto } from '../../../dto/method.dto';
 import { AppDataEntity } from '../../../app-data-entity/app-data-entity';
 import { findModelChild } from '../../../../model';
@@ -58,6 +59,9 @@ export class MethodReturn {
       const items = await this.dto.sets(context, [data]);
       return items[0];
     }
+    if (isNilOrEmpty(data)) {
+      data = {};
+    }
     return new AppDataEntity(this.entity, data);
   }
 }

package/src/ui-action/provider/ui-action-provider-base.ts

@@ -116,7 +116,7 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
   ): Promise<boolean> {
     const confirmMsg = this.calcMessage('confirm', action, args);
     if (action.enableConfirm && confirmMsg) {
-      return ibiz.modal.confirm({ title: confirmMsg });
+      return ibiz.confirm.warning({ title: '操作确认', desc: confirmMsg });
     }
     return true;
   }