@ibiz-template/runtime 0.1.28 → 0.1.29

package/src/interface/controller/common/view-message/i-view-message.ts

@@ -0,0 +1,42 @@
+import { IAppViewMsg } from '@ibiz/model-core';
+
+export interface IViewMessage {
+  /**
+   * 位置
+   * @author lxm
+   * @date 2023-09-20 07:52:52
+   * @type {IPSAppViewMsg['position']}
+   */
+  position: IAppViewMsg['position'];
+
+  /**
+   * 消息类型
+   * @author lxm
+   * @date 2023-09-20 09:11:34
+   * @type {IAppViewMsg['messageType']}
+   */
+  messageType?: IAppViewMsg['messageType'];
+
+  /**
+   * 消息删除模式
+   * @author lxm
+   * @date 2023-09-20 09:11:35
+   * @type {IAppViewMsg['removeMode']}
+   */
+  removeMode?: IAppViewMsg['removeMode'];
+
+  /**
+   * 标题
+   * @author lxm
+   * @date 2023-09-20 02:26:33
+   * @type {string}
+   */
+  title?: string;
+  /**
+   * 消息内容
+   * @author lxm
+   * @date 2023-09-20 02:26:32
+   * @type {string}
+   */
+  message?: string;
+}

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

@@ -0,0 +1,20 @@
+import { IDETreeGrid } from '@ibiz/model-core';
+import { ITreeGridExEvent } from '../../event';
+import { ITreeGridExState } from '../../state';
+import { IMDControlController } from './i-md-control.controller';
+
+/**
+ * 树表格(增强)部件控制器
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:17
+ * @export
+ * @interface ITreeGridController
+ * @extends {IMDControlController<IDETreeGrid, ITreeGridState, ITreeGridEvent>}
+ */
+export interface ITreeGridExController
+  extends IMDControlController<
+    IDETreeGrid,
+    ITreeGridExState,
+    ITreeGridExEvent
+  > {}

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

@@ -0,0 +1,12 @@
+import { IGridController } from './i-grid.controller';
+
+/**
+ * 树表格部件控制器
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:17
+ * @export
+ * @interface ITreeGridController
+ * @extends {IMDControlController<IDETreeGrid, ITreeGridState, ITreeGridEvent>}
+ */
+export interface ITreeGridController extends IGridController {}

package/src/interface/controller/controller/control/index.ts

@@ -31,3 +31,5 @@ export * from './i-calendar.controller';
 export * from './i-calendar-exp-bar.controller';
 export * from './i-context-menu.controller';
 export * from './i-kanban.controller';
+export * from './i-tree-grid.controller';
+export * from './i-tree-grid-ex.controller';

package/src/interface/controller/controller/control/portlet/i-portlet.controller.ts

@@ -42,4 +42,12 @@ export interface IPortletController {
    * @return {*}  {Promise<void>}
    */
   dataChangeNotify(data: IData): Promise<void>;
+
+  /**
+   * 销毁方法
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-09-22 16:55:47
+   */
+  destroyed(): Promise<void>;
 }

package/src/interface/controller/event/control/i-tree-grid-ex.event.ts

@@ -0,0 +1,12 @@
+import { IMDControlEvent } from './i-md-control.event';
+
+/**
+ * 树表格(增强)部件事件
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:54
+ * @export
+ * @interface ITreeGridExEvent
+ * @extends {IMDControlEvent}
+ */
+export interface ITreeGridExEvent extends IMDControlEvent {}

package/src/interface/controller/event/control/i-tree-grid.event.ts

@@ -0,0 +1,12 @@
+import { IGridEvent } from './i-grid.event';
+
+/**
+ * 树表格部件事件
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:54
+ * @export
+ * @interface ITreeGridEvent
+ * @extends {IMDControlEvent}
+ */
+export interface ITreeGridEvent extends IGridEvent {}

package/src/interface/controller/event/control/index.ts

@@ -27,3 +27,5 @@ export * from './i-drtab.event';
 export * from './i-calendar.event';
 export * from './i-calendar-exp-bar.event';
 export * from './i-context-menu.event';
+export * from './i-tree-grid.event';
+export * from './i-tree-grid-ex.event';

package/src/interface/controller/event/view/i-tree-grid-ex-view.event.ts

@@ -0,0 +1,12 @@
+import { IMDViewEvent } from './i-md-view.event';
+
+/**
+ * 树表格视图（增强）事件
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:22
+ * @export
+ * @interface ITreeGridViewEvent
+ * @extends {IMDViewEvent}
+ */
+export type ITreeGridExViewEvent = IMDViewEvent;

package/src/interface/controller/event/view/i-tree-grid-view.event.ts

@@ -0,0 +1,12 @@
+import { IMDViewEvent } from './i-md-view.event';
+
+/**
+ * 树表格视图事件
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:22
+ * @export
+ * @interface ITreeGridViewEvent
+ * @extends {IMDViewEvent}
+ */
+export type ITreeGridViewEvent = IMDViewEvent;

package/src/interface/controller/event/view/index.ts

@@ -37,3 +37,5 @@ export * from './i-calendar-view.event';
 export * from './i-calendar-exp-view.event';
 export * from './i-pickup-md-view.event';
 export * from './i-form-pickup-data-view.event';
+export * from './i-tree-grid-view.event';
+export * from './i-tree-grid-ex-view.event';

package/src/interface/controller/state/control/i-tree-grid-ex.state.ts

@@ -0,0 +1,56 @@
+import { IColumnState } from './i-grid.state';
+import { IMDControlState } from './i-md-control.state';
+import { ITreeNodeData } from './i-tree.state';
+
+/**
+ * 树表格(增强)部件状态
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:01
+ * @export
+ * @interface ITreeGridExState
+ * @extends {IMDControlState}
+ */
+export interface ITreeGridExState extends IMDControlState {
+  items: ITreeNodeData[];
+
+  /**
+   * 表格列状态数组
+   * 顺序就是列的排序
+   * @author zk
+   * @date 2023-09-21 02:09:57
+   * @type {IColumnState[]}
+   * @memberof ITreeGridState
+   */
+  columnStates: IColumnState[];
+
+  /**
+   * 树的根节点
+   *
+   * @author zk
+   * @date 2023-09-21 02:09:29
+   * @type {ITreeNodeData[]}
+   * @memberof ITreeGridState
+   */
+  rootNodes: ITreeNodeData[];
+
+  /**
+   * 外部提供的默认展开的节点集合
+   *
+   * @author zk
+   * @date 2023-09-21 02:09:48
+   * @type {string[]}
+   * @memberof ITreeGridState
+   */
+  defaultExpandedKeys: string[];
+
+  /**
+   * 实际默认展开节点集合
+   *
+   * @author zk
+   * @date 2023-09-21 02:09:42
+   * @type {string[]}
+   * @memberof ITreeGridState
+   */
+  expandedKeys: string[];
+}

package/src/interface/controller/state/control/i-tree-grid.state.ts

@@ -0,0 +1,12 @@
+import { IGridState } from './i-grid.state';
+
+/**
+ * 树表格部件状态
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:01
+ * @export
+ * @interface ITreeGridState
+ * @extends {IMDControlState}
+ */
+export interface ITreeGridState extends IGridState {}

package/src/interface/controller/state/control/index.ts

@@ -33,3 +33,5 @@ export * from './i-calendar.state';
 export * from './i-calendar-exp-bar.state';
 export * from './i-context-menu.state';
 export * from './i-kanban.state';
+export * from './i-tree-grid.state';
+export * from './i-tree-grid-ex.state';

package/src/interface/controller/state/view/i-edit-view.state.ts

@@ -7,4 +7,13 @@ import { IViewState } from './i-view.state';
  * @interface IEditViewState
  * @extends {IViewState}
  */
-export interface IEditViewState extends IViewState {}
+export interface IEditViewState extends IViewState {
+  /**
+   * 是否为复制模式
+   *
+   * @author chitanda
+   * @date 2023-09-26 17:09:21
+   * @type {boolean}
+   */
+  copyMode?: boolean;
+}

package/src/interface/controller/state/view/i-tree-grid-ex-view.state.ts

@@ -0,0 +1,12 @@
+import { IMDViewState } from './i-md-view.state';
+
+/**
+ * 树表格视图（增强）UI状态
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:36
+ * @export
+ * @interface ITreeGridViewState
+ * @extends {IMDViewState}
+ */
+export interface ITreeGridExViewState extends IMDViewState {}

package/src/interface/controller/state/view/i-tree-grid-view.state.ts

@@ -0,0 +1,12 @@
+import { IMDViewState } from './i-md-view.state';
+
+/**
+ * 树表格视图UI状态
+ *
+ * @author zk
+ * @date 2023-09-21 11:09:36
+ * @export
+ * @interface ITreeGridViewState
+ * @extends {IMDViewState}
+ */
+export interface ITreeGridViewState extends IMDViewState {}

package/src/interface/controller/state/view/i-view.state.ts

@@ -1,4 +1,5 @@
 import { IViewSession } from '../../../studio';
+import { IViewMessage } from '../../common';
 import { IControllerState } from '../common/i-controller.state';
 
 /**
@@ -40,4 +41,12 @@ export interface IViewState extends IControllerState, IViewSession {
    * @type {boolean}
    */
   closeOK?: boolean;
+
+  /**
+   * 视图消息数据
+   * @author lxm
+   * @date 2023-09-20 09:48:29
+   * @type {{ [p: string]: IViewMessage[] }}
+   */
+  viewMessages: { [p: string]: IViewMessage[] };
 }

package/src/interface/controller/state/view/index.ts

@@ -38,3 +38,5 @@ export * from './i-calendar-exp-view.state';
 export * from './i-pickup-md-view.state';
 export * from './i-kanban-view.state';
 export * from './i-form-pickup-data-view.state';
+export * from './i-tree-grid-view.state';
+export * from './i-tree-grid-ex-view.state';

package/src/interface/provider/i-grid-column.provider.ts

@@ -1,4 +1,5 @@
 import { IDEGridColumn } from '@ibiz/model-core';
+import { TreeGridExController } from '../../controller';
 import { IGridColumnController, IGridController } from '../controller';
 
 /**
@@ -31,7 +32,7 @@ export interface IGridColumnProvider {
    */
   createController(
     columnModel: IDEGridColumn,
-    grid: IGridController,
+    grid: IGridController | TreeGridExController,
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ): Promise<IGridColumnController>;
 }

package/src/interface/service/service/i-app-de.service.ts

@@ -2,6 +2,7 @@ import { IHttpResponse } from '@ibiz-template/core';
 import { DECache } from '../../../service/utils';
 import { IFileService } from './i-file.service';
 import { IWorkFlowService } from './i-wf.service';
+import { IConfigService } from './i-config.service';
 
 /**
  * 实体服务
@@ -21,6 +22,15 @@ export interface IAppDEService {
    */
   readonly local: DECache;
 
+  /**
+   * 实体配置存储服务
+   *
+   * @author chitanda
+   * @date 2023-09-22 10:09:55
+   * @type {IConfigService}
+   */
+  readonly configCache: IConfigService;
+
   /**
    * 工作流相关服务
    *

package/src/interface/service/service/i-config.service.ts

@@ -0,0 +1,20 @@
+export interface IConfigService {
+  /**
+   * 保存配置
+   *
+   * @author chitanda
+   * @date 2023-09-22 10:09:05
+   * @param {IData} data
+   * @return {*}  {Promise<boolean>}
+   */
+  save(data: IData): Promise<boolean>;
+
+  /**
+   * 加载配置
+   *
+   * @author chitanda
+   * @date 2023-09-22 10:09:10
+   * @return {*}  {Promise<IData>}
+   */
+  load(): Promise<IData>;
+}

package/src/interface/service/service/index.ts

@@ -1,4 +1,5 @@
 export type { IAppDeAuthorityService } from './i-app-de-authority.service';
+export type { IConfigService } from './i-config.service';
 export type { IAppDEService } from './i-app-de.service';
 export type { IAuthService } from './i-auth.service';
 export type { IFileService } from './i-file.service';

package/src/logic-scheduler/executor/app-ui-logic-executor.ts

@@ -15,6 +15,7 @@ import { IModalData, IUILogicParams } from '../../interface';
 import { calcDeCodeNameById, getFormTypeFieldName } from '../../model';
 import { convertNavData } from '../../utils';
 import { LogicExecutor } from './logic-executor';
+import { Srfuf } from '../../service';
 
 /**
  * 应用预置界面逻辑
@@ -216,12 +217,20 @@ export class AppUILogicExecutor extends LogicExecutor {
     }
 
     // 拷贝数据处理
-    if (context.srfcopymode) {
-      // 置空主键
-      _data.srfkey = undefined;
-      tempParams = Object.assign(tempParams, _data.$origin);
+    if (params.srfcopymode) {
+      const entity = await ibiz.hub.getAppDataEntity(
+        view.model.appDataEntityId!,
+      );
+      const key = entity.keyAppDEFieldId;
+      if (key && _data) {
+        tempParams[key] = _data.srfkey;
+        tempParams.srfcopymode = true;
+      }
     }
 
+    // 特殊处理标记，标记当前是新建数据。在打开视图前会被删除，具体在 open-app-view.ts 中处理
+    tempParams.srfuf = Srfuf.CREATE;
+
     // 打开视图
     const result: IModalData = await ibiz.commands.execute(
       OpenAppViewCommand.TAG,

package/src/logic-scheduler/trigger/item-dyna-logic-trigger.ts

@@ -48,9 +48,6 @@ export class ItemDynaLogicTrigger extends LogicTrigger {
 
   execute(executeParams: IUILogicParams): boolean {
     const result = this.executor.execute(executeParams);
-    if (typeof result === 'boolean') {
-      return result;
-    }
-    throw new RuntimeError(`${this.logic.id}逻辑返回值不是布尔值`);
+    return !!result;
   }
 }

package/src/model/data-entity/data-entity.ts

@@ -4,7 +4,7 @@ import {
   IAppDEField,
   IDELogic,
 } from '@ibiz/model-core';
-import { isNotNil } from 'ramda';
+import { notNilEmpty } from 'qx-util';
 
 /**
  * 从实体id计算实体codeName(小写)
@@ -31,7 +31,7 @@ export function calcDeCodeNameById(id: string): string {
  */
 export function hasDeCodeName(params: IParams, entityId: string): boolean {
   const codeName = calcDeCodeNameById(entityId);
-  return isNotNil(params[codeName]);
+  return notNilEmpty(params[codeName]);
 }
 
 /**

package/src/register/helper/control-register.ts

@@ -72,7 +72,12 @@ export async function getControlProvider(
   provider = getProvider(controlType);
 
   if (!provider) {
-    ibiz.log.error(`找不到部件类型${controlType}对应的适配器`);
+    switch (controlType) {
+      case 'DATAINFOBAR':
+        return;
+      default:
+        ibiz.log.error(`找不到部件类型${controlType}对应的适配器`);
+    }
   } else {
     return provider;
   }

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

@@ -2,7 +2,8 @@
 /* eslint-disable no-constructor-return */
 /* eslint-disable max-classes-per-file */
 import { IAppDataEntity } from '@ibiz/model-core';
-import { clone } from 'ramda';
+import { clone, isNil } from 'ramda';
+import { DataTypes } from '@ibiz-template/core';
 import { Srfuf } from '../constant';
 import { findModelChild } from '../../model';
 import { IDataEntity } from '../../interface';
@@ -133,7 +134,7 @@ export class AppDataEntity implements IDataEntity {
    * @protected
    */
   protected defineProperties(): void {
-    const { _data } = this;
+    const { _data, convertVal } = this;
     const properties: { [key: string]: PropertyDescriptor } = {};
     const keys = Object.keys(_data);
     keys.forEach(key => {
@@ -149,17 +150,17 @@ export class AppDataEntity implements IDataEntity {
     });
     this._entity.appDEFields?.forEach(field => {
       const key = field.codeName!.toLowerCase();
-      if (!keys.includes(key)) {
-        properties[key] = {
-          enumerable: true,
-          set(val: unknown): void {
-            _data[key] = val;
-          },
-          get(): any {
-            return _data[key];
-          },
-        };
-      }
+      properties[key] = {
+        enumerable: true,
+        set(val: unknown): void {
+          _data[key] = convertVal(val, field.stdDataType);
+        },
+        get(): any {
+          return _data[key];
+        },
+      };
+      // 初始值转换
+      _data[key] = convertVal(_data[key], field.stdDataType);
     });
     Object.defineProperties(this, properties);
   }
@@ -193,4 +194,34 @@ export class AppDataEntity implements IDataEntity {
     }
     return this;
   }
+
+  /**
+   * 根据属性的数据类型转换值
+   * @author lxm
+   * @date 2023-09-25 03:37:28
+   * @protected
+   * @param {unknown} value
+   * @param {(number | undefined)} dataType
+   * @return {*}  {unknown}
+   */
+  protected convertVal(value: unknown, dataType: number | undefined): unknown {
+    // 没有数据类型的给原值
+    if (isNil(dataType)) {
+      return value;
+    }
+
+    // 数值转换
+    if (DataTypes.isNumber(dataType)) {
+      const numVal = !isNil(value) && value !== '' ? Number(value) : value;
+
+      if (Number.isNaN(numVal)) {
+        // 不能转换的给原值
+        ibiz.log.debug(`${value}不能转换成数字`);
+        return value;
+      }
+      return numVal;
+    }
+
+    return value;
+  }
 }

package/src/service/service/config/config.service.ts

@@ -0,0 +1,65 @@
+import { Application } from '../../../application';
+import { IConfigService } from '../../../interface';
+
+/**
+ * 应用配置存储服务
+ *
+ * @author chitanda
+ * @date 2023-09-22 10:09:05
+ * @export
+ * @class ConfigService
+ */
+export class ConfigService implements IConfigService {
+  private app: Application;
+
+  /**
+   * Creates an instance of ConfigService.
+   *
+   * @author chitanda
+   * @date 2023-09-22 10:09:16
+   * @param {string} appId 应用标识
+   * @param {string} folder 定义文件夹
+   * @param {string} tag 存储标识
+   */
+  constructor(
+    protected appId: string,
+    protected folder: string,
+    protected tag: string,
+  ) {
+    this.app = ibiz.hub.getApp(appId);
+  }
+
+  /**
+   * 保存配置
+   *
+   * @author chitanda
+   * @date 2023-09-22 10:09:05
+   * @param {IData} data
+   * @return {*}  {Promise<boolean>}
+   */
+  async save(data: IData): Promise<boolean> {
+    const res = await this.app.net.put(
+      `/configs/${this.folder}/${this.tag}`,
+      data,
+    );
+    if (res.ok) {
+      return res.data as unknown as boolean;
+    }
+    return false;
+  }
+
+  /**
+   * 加载配置
+   *
+   * @author chitanda
+   * @date 2023-09-22 10:09:10
+   * @return {*}  {Promise<IData>}
+   */
+  async load(): Promise<IData> {
+    const res = await this.app.net.get(`/configs/${this.folder}/${this.tag}`);
+    if (res.ok) {
+      return res.data;
+    }
+    return {};
+  }
+}

package/src/service/service/entity/de.service.ts

@@ -8,6 +8,7 @@ import { findModelChild } from '../../../model';
 import { DEActionMethod } from './method/de-action';
 import { FetchMethod } from './method/fetch';
 import { IAppDEService } from '../../../interface';
+import { ConfigService } from '../config/config.service';
 
 /**
  * 实体服务
@@ -18,6 +19,15 @@ import { IAppDEService } from '../../../interface';
  * @class DEService
  */
 export class DEService implements IAppDEService {
+  /**
+   * 实体配置存储服务
+   *
+   * @author chitanda
+   * @date 2023-09-22 10:09:55
+   * @type {ConfigService}
+   */
+  readonly configCache: ConfigService;
+
   /**
    * 工作流相关服务
    *
@@ -63,6 +73,11 @@ export class DEService implements IAppDEService {
    * @param {IAppDataEntity} model 应用实体模型
    */
   constructor(protected model: IAppDataEntity) {
+    this.configCache = new ConfigService(
+      model.appId!,
+      'PSAppDataEntity',
+      model.codeName!,
+    );
     this.wf = new WorkFlowService(model);
     this.file = new FileService(model);
   }

package/src/service/service/index.ts

@@ -1,4 +1,5 @@
 export { CodeListService } from './code-list/code-list.service';
+export { ConfigService } from './config/config.service';
 export { CounterService } from './counter/counter.service';
 export { DEService } from './entity/de.service';
 export { WorkFlowService } from './work-flow/work-flow.service';

package/src/service/vo/control.vo.ts

@@ -192,14 +192,9 @@ export class ControlVO {
         },
         set(val) {
           // 有mapField的走它的转换
-          this.$origin[dataKey] = mapField ? mapField.convertVal(val) : val;
+          this.$origin[dataKey] = val;
         },
       });
-
-      // 一开始初始化的时候先把值转换一下。
-      if (mapField) {
-        this[uiKey] = mapField.convertVal(this.$origin[dataKey]);
-      }
     } else {
       Object.defineProperty(this, uiKey, {
         enumerable: true,