@ibiz-template/runtime 0.1.27 → 0.1.29-dev.0

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/trigger/item-dyna-logic-trigger.ts

@@ -39,7 +39,11 @@ export class ItemDynaLogicTrigger extends LogicTrigger {
 
   match(matchParams: ITriggerMatchParams): boolean {
     const superResult = super.match(matchParams);
-    return superResult && matchParams.itemName === this.logic.itemName;
+    return (
+      superResult &&
+      // 忽略大小写匹配
+      matchParams.itemName?.toLowerCase() === this.logic.itemName?.toLowerCase()
+    );
   }
 
   execute(executeParams: IUILogicParams): boolean {

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/entity/method/method.ts

@@ -115,7 +115,7 @@ export abstract class Method {
           );
           break;
         case 'GET':
-          res = await this.app.net.get(`${path}/${methodName}`, data);
+          res = await this.app.net.get(`${path}/${methodName}`, data || params);
           break;
         case 'PUT': {
           res = await this.app.net.put(
@@ -125,7 +125,10 @@ export abstract class Method {
           break;
         }
         case 'DELETE':
-          res = await this.app.net.delete(`${path}/${methodName}`, data);
+          res = await this.app.net.delete(
+            `${path}/${methodName}`,
+            data || params,
+          );
           break;
         default:
           if (requestMethod) {

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/utils/dynamic-code-list/dynamic-code-list.ts

@@ -158,11 +158,11 @@ export class DynamicCodeListCache {
   ): Promise<CodeListItem[]> {
     const app = ibiz.hub.getApp(context.srfappid);
     // *预定义加载
+    // 特殊处理，避免预置代码表加载不全
+    if (!params.size) {
+      params = { ...params, size: 10000 };
+    }
     if (this.isPredefined) {
-      // 特殊处理，避免预置代码表加载不全
-      if (!params.size) {
-        params = { ...params, size: 10000 };
-      }
       const res = await app.net.get(
         `/dictionaries/codelist/${this.codeList.codeName}`,
         params,

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,

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

@@ -77,8 +77,11 @@ export class BackendUIActionProvider extends UIActionProviderBase {
     );
 
     // 适配界面行为成功提示信息
-    if (res.ok && action.successMsg) {
-      ibiz.message.success(action.successMsg);
+    if (res.ok) {
+      const successMsg = this.calcMessage('success', action, args);
+      if (successMsg) {
+        ibiz.message.success(successMsg);
+      }
     }
     Object.assign(actionResult, {
       data: isArray(res.data) ? res.data : [res.data],

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

@@ -1,5 +1,5 @@
 import { RuntimeModelError } from '@ibiz-template/core';
-import { IAppDEUIAction, INavigateParam } from '@ibiz/model-core';
+import { IAppDEUIAction, ILanguageRes, INavigateParam } from '@ibiz/model-core';
 import {
   IUIActionProvider,
   IUIActionResult,
@@ -7,7 +7,7 @@ import {
 } from '../../interface';
 import { calcDeCodeNameById } from '../../model';
 import { execUILogic } from '../../ui-logic';
-import { convertNavData, formatMultiData } from '../../utils';
+import { convertNavData, formatMultiData, ScriptFactory } from '../../utils';
 import { UIActionUtil } from '../uiaction-util';
 
 /**
@@ -49,7 +49,7 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
     }
 
     // **用户操作确认**
-    if (!(await this.isConfirm(action))) {
+    if (!(await this.isConfirm(action, args))) {
       return this.returnError(result);
     }
 
@@ -110,9 +110,13 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
    * @param {IAppDEUIAction} action 界面行为模型
    * @returns {*}  {Promise<boolean>}
    */
-  async isConfirm(action: IAppDEUIAction): Promise<boolean> {
-    if (action.enableConfirm && action.confirmMsg) {
-      return ibiz.modal.confirm({ title: action.confirmMsg });
+  async isConfirm(
+    action: IAppDEUIAction,
+    args: IUILogicParams,
+  ): Promise<boolean> {
+    const confirmMsg = this.calcMessage('confirm', action, args);
+    if (action.enableConfirm && confirmMsg) {
+      return ibiz.modal.confirm({ title: confirmMsg });
     }
     return true;
   }
@@ -265,4 +269,62 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
     );
     return { resultContext, resultData, resultParams };
   }
+
+  /**
+   * 计算消息信息（动态，多语言资源）
+   * @author lxm
+   * @date 2023-09-25 03:03:01
+   * @protected
+   * @param {('confirm' | 'success')} type
+   * @param {IAppDEUIAction} action
+   * @param {IUILogicParams} args
+   * @return {*}
+   */
+  protected calcMessage(
+    type: 'confirm' | 'success',
+    action: IAppDEUIAction,
+    args: IUILogicParams,
+  ): string | undefined {
+    let msg: string | undefined;
+    let msgRes: ILanguageRes | undefined;
+    const { confirmMsg, cmlanguageRes, successMsg, smlanguageRes } = action;
+    switch (type) {
+      case 'confirm':
+        msg = confirmMsg;
+        msgRes = cmlanguageRes;
+        break;
+      case 'success':
+        msg = successMsg;
+        msgRes = smlanguageRes;
+        break;
+      default:
+    }
+
+    // 多语言资源转换
+    if (msgRes) {
+      const msgResContent = ibiz.i18n.t(
+        msgRes.lanResTag!,
+        msgRes.defaultContent || msg,
+      );
+      if (msgResContent !== msgRes.lanResTag) {
+        msg = msgResContent;
+      }
+    }
+
+    if (msg) {
+      const { data } = args;
+      const scriptParams: IParams = { ...args };
+      if (data.length === 1) {
+        // 单数据
+        [scriptParams.data] = data;
+      } else if (data.length === 0) {
+        // 无数据
+        delete scriptParams.data;
+      }
+      return ScriptFactory.execScriptFn(scriptParams, `\`${msg}\``, {
+        isAsync: false,
+        singleRowReturn: true,
+      }) as string;
+    }
+  }
 }

package/src/ui-logic/ui-logic-context.ts

@@ -143,4 +143,16 @@ export class UILogicContext {
       get: () => this.lastReturn,
     });
   }
+
+  /**
+   * 是否是实体参数变量（即后台数据对象）
+   * @author lxm
+   * @date 2023-09-22 03:40:30
+   * @param {string} paramId
+   * @return {*}  {boolean}
+   */
+  isEntityParam(paramId: string): boolean {
+    const deLogicParams = this.deLogicParams.get(paramId);
+    return !!(deLogicParams && deLogicParams.model.entityParam);
+  }
 }

package/src/ui-logic/ui-logic-link/ui-logic-link.ts

@@ -49,7 +49,7 @@ export class UILogicLink {
    */
   constructor(public model: IDEUILogicLink) {
     const { linkMode, deuilogicLinkGroupCond } = this.model;
-    if (linkMode === 0) {
+    if ((linkMode || 0) === 0) {
       if (deuilogicLinkGroupCond) {
         this.groupCond = new UILogicLinkGroupCond(deuilogicLinkGroupCond);
       }

package/src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts

@@ -74,7 +74,13 @@ export class PrepareJSParamNode extends UILogicNode {
   ): void {
     const { dstFieldName, dstDEUILogicParamId } = nodeParam;
     // 目标参数
-    const dstField = dstFieldName;
+    let dstField = dstFieldName;
+
+    // 实体参数对象转小写
+    if (ctx.isEntityParam(dstDEUILogicParamId!)) {
+      dstField = dstField?.toLowerCase();
+    }
+
     // 源参数
     const srcVal = handleSrcVal(ctx, nodeParam);
     if (dstField) {

package/src/ui-logic/utils/handle-src-val.ts

@@ -1,5 +1,6 @@
 import { ModelError } from '@ibiz-template/core';
 import { clone } from 'ramda';
+import { ScriptFactory } from '../../utils';
 import { UILogicContext } from '../ui-logic-context';
 
 type SrcValParams = {
@@ -37,12 +38,18 @@ export function handleSrcVal(
   const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
   // 没有源值类型就是逻辑参数
   const srcValueType = srcValParams.srcValueType || 'SRCDLPARAM';
+  // 取属性值
+  let srcField = srcFieldName;
 
   let value: unknown;
   switch (srcValueType) {
     // 源逻辑参数
     case 'SRCDLPARAM':
       value = ctx.params[srcDEUILogicParamId!];
+      // 如果是实体参数对象则转换成小写。
+      if (ctx.isEntityParam(srcDEUILogicParamId!)) {
+        srcField = srcField?.toLowerCase();
+      }
       break;
     // 空值类型
     case 'NULLVALUE':
@@ -71,11 +78,20 @@ export function handleSrcVal(
       throw new ModelError(srcValParams, `暂未支持源值类型${srcValueType}`);
   }
 
-  // 取属性值
-  const srcField = srcFieldName;
   if (value && srcField) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    value = (value as any)[srcField];
+    try {
+      value = ScriptFactory.execScriptFn(
+        { srcValue: value },
+        `srcValue.${srcField}`,
+        {
+          singleRowReturn: true,
+          isAsync: false,
+        },
+      );
+    } catch (error) {
+      ibiz.log.error(`从源参数取属性${srcField}报错，源参数：`, value);
+      throw error;
+    }
   }
 
   return value;

package/src/utils/wf-helper/wf-helper.ts

@@ -34,8 +34,8 @@ export function getWFSubmitViewId(
   const key = type
     ? `WFUTILACTION@${type.toUpperCase()}`
     : `WFACTION@${ibiz.env.isMob ? sequenceflowmobview : sequenceflowview}`;
-  const submitViewRef = appViewRefs!.find(viewRef => {
-    return viewRef.name === key;
+  const submitViewRef = appViewRefs?.find(viewRef => {
+    return viewRef.name!.indexOf(key) !== -1;
   });
   return submitViewRef?.refAppViewId;
 }