@ibiz-template/runtime 0.1.16 → 0.1.17

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

@@ -31,6 +31,7 @@ import { ControlVO, Srfuf } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
 import { isValueChange } from '../../../utils';
+import { ScriptFactory } from '../../../../utils';
 
 /**
  * 表格控制器
@@ -803,22 +804,28 @@ export class GridController
       throw new RuntimeError(`没找到${updateId}编辑列更新`);
     }
 
-    const { appDEMethodId, degeiupdateDetails } = findUpdate;
+    const { appDEMethodId, degeiupdateDetails, customCode, scriptCode } =
+      findUpdate;
     const updateItems = degeiupdateDetails!.map(item => item.id!);
-
-    const params = { ...this.params, ...row.data.getOrigin() };
-    const res = await this.service.updateGridEditItem(
-      appDEMethodId!,
-      this.context,
-      params,
-    );
-    const result = res.data;
-    if (result && updateItems?.length) {
-      await Promise.all(
-        updateItems.map(itemName => {
-          return this.setRowValue(row, itemName, result[itemName]);
-        }),
+    if (customCode && scriptCode) {
+      ScriptFactory.execScriptFn({ data: row.data }, scriptCode, {
+        isAsync: false,
+      });
+    } else {
+      const params = { ...this.params, ...row.data.getOrigin() };
+      const res = await this.service.updateGridEditItem(
+        appDEMethodId!,
+        this.context,
+        params,
       );
+      const result = res.data;
+      if (result && updateItems?.length) {
+        await Promise.all(
+          updateItems.map(itemName => {
+            return this.setRowValue(row, itemName, result![itemName]);
+          }),
+        );
+      }
     }
   }
 

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

@@ -64,7 +64,10 @@ export class GridService extends MDControlService<IDEGrid> {
     context: IParams,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
-    let res = await this.entityService.exec(methodName, context, params);
+    const entityService = await this.app.deService.getService(
+      this.model.appDataEntityId!,
+    );
+    let res = await entityService.exec(methodName, context, params);
     res = this.handleResponse(res);
     return res as IHttpResponse<ControlVO>;
   }

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

@@ -9,6 +9,14 @@ import { DELogicParam } from './de-logic-param/de-logic-param';
  * @class DELogicContext
  */
 export class DELogicContext {
+  /**
+   * 上一次返回值
+   * @author lxm
+   * @date 2023-09-04 09:22:52
+   * @type {unknown}
+   */
+  lastReturn: unknown;
+
   /**
    * Creates an instance of DELogicContext.
    * @author lxm
@@ -82,4 +90,28 @@ export class DELogicContext {
    * @type {string}
    */
   defaultParamName: string = 'Default';
+
+  /**
+   * 设置上一次返回值
+   * @author lxm
+   * @date 2023-09-04 09:23:52
+   * @param {unknown} value
+   */
+  setLastReturn(value: unknown): void {
+    this.lastReturn = value;
+  }
+
+  /**
+   * 初始化上一次返回参数类型的逻辑参数
+   * @author lxm
+   * @date 2023-09-04 09:52:00
+   * @param {string} tag
+   */
+  initLastReturnParam(tag: string): void {
+    Object.defineProperty(this.params, tag, {
+      enumerable: true,
+      configurable: true,
+      get: () => this.lastReturn,
+    });
+  }
 }

package/src/de-logic/de-logic-param/de-logic-param.ts

@@ -48,7 +48,8 @@ export class DELogicParam {
       // 数据对象变量
       ctx.params[tag] = {};
     } else if (m.lastReturnParam) {
-      throw new ModelError(m, `未支持的逻辑参数类型: 上次调用返回`);
+      // 上一次调用返回
+      ctx.initLastReturnParam(tag);
     } else if (m.appContextParam) {
       // 应用上下文
       ctx.params[tag] = ctx.context;

package/src/interface/controller/controller/editor/i-editor-container.controller.ts

@@ -37,4 +37,13 @@ export interface IEditorContainerController {
    * @type {IParams}
    */
   params: IParams;
+
+  /**
+   * 数据类型
+   *
+   * @author zhanghengfeng
+   * @date 2023-09-01 11:09:38
+   * @type {(number | undefined)}
+   */
+  dataType: number | undefined;
 }

package/src/interface/controller/event/view/i-form-pickup-data-view.event.ts

@@ -0,0 +1,12 @@
+import { IPickupDataViewEvent } from './i-pickup-data-view.event';
+
+/**
+ * 表单选择数据视图事件
+ *
+ * @author zk
+ * @date 2023-09-01 02:09:26
+ * @export
+ * @interface IFormPickupDataViewEvent
+ * @extends {IMDViewEvent}
+ */
+export interface IFormPickupDataViewEvent extends IPickupDataViewEvent {}

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

@@ -36,3 +36,4 @@ export * from './i-de-portal-view.event';
 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';

package/src/interface/controller/state/view/i-form-pickup-data-view.state.ts

@@ -0,0 +1,12 @@
+import { IPickupDataViewState } from './i-pickup-data-view.state';
+
+/**
+ * 表单选择数据视图UI状态
+ *
+ * @author zk
+ * @date 2023-09-01 02:09:26
+ * @export
+ * @interface IFormPickupDataViewState
+ * @extends {IMDViewState}
+ */
+export interface IFormPickupDataViewState extends IPickupDataViewState {}

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

@@ -32,4 +32,12 @@ export interface IViewState extends IControllerState, IViewSession {
    * @type {boolean}
    */
   noLoadDefault: boolean;
+
+  /**
+   * 设置关闭视图时返回给外面的状态
+   * @author lxm
+   * @date 2023-09-01 10:37:46
+   * @type {boolean}
+   */
+  closeOK?: boolean;
 }

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

@@ -36,3 +36,4 @@ export * from './i-panel-view.state';
 export * from './i-calendar-view.state';
 export * from './i-calendar-exp-view.state';
 export * from './i-pickup-md-view.state';
+export * from './i-form-pickup-data-view.state';

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

@@ -23,6 +23,47 @@ export interface ModalParams {
    * @type {string}
    */
   desc?: string;
+
+  /**
+   * 显示确认按钮（默认显示）
+   * @author lxm
+   * @date 2023-09-04 05:37:59
+   * @type {boolean}
+   */
+  showConfirmButton?: boolean;
+
+  /**
+   * 是否显示取消按钮
+   * @author lxm
+   * @date 2023-09-04 05:38:49
+   * @type {boolean}
+   */
+  showCancelButton?: boolean;
+
+  /**
+   * 确认按钮显示文本
+   * @author lxm
+   * @date 2023-09-04 05:39:30
+   * @type {string}
+   */
+  confirmButtonText?: string;
+
+  /**
+   * 取消按钮显示文本
+   * @author lxm
+   * @date 2023-09-04 05:39:30
+   * @type {string}
+   */
+  cancelButtonText?: string;
+
+  /**
+   * 消息类型
+   * @author lxm
+   * @date 2023-09-04 05:40:25
+   * @type {('success' | '')}
+   */
+  type?: 'success' | 'info' | 'warning' | 'error';
+
   /**
    * 传递给时机组件的参数
    *

package/src/model/layout/layout.ts

@@ -49,12 +49,14 @@ export function calcLayoutHeightWidth(layoutPos: ILayoutPos): {
  * @export
  * @param {ILayoutPos} layoutPos
  */
-export function calcContentAlignStyle(layoutPos: ILayoutPos): IData {
+export function calcContentAlignStyle(
+  layoutPos: ILayoutPos,
+): IData | undefined {
   const { valignSelf, halignSelf } = layoutPos;
-  const result = {};
+  let result;
   // 自身对齐方式
   if (valignSelf || halignSelf) {
-    Object.assign(result, { display: 'flex' });
+    result = { display: 'flex' };
     // 自身垂直对齐模式
     switch (valignSelf) {
       case 'TOP':

package/src/service/dto/method.dto.ts

@@ -24,10 +24,6 @@ export class MethodDto {
 
   protected dtoMap: Map<string, MethodDto> = new Map();
 
-  get isLocalMode(): boolean {
-    return this.entity.storageMode === 1 || this.entity.storageMode === 4;
-  }
-
   constructor(
     protected entity: IAppDataEntity,
     protected dto?: IAppDEMethodDTO,
@@ -123,9 +119,7 @@ export class MethodDto {
           await all[i];
         }
         const entityData = new AppDataEntity(this.entity, datum);
-        if (this.isLocalMode) {
-          await service.local.add(context, entityData);
-        }
+        await service.local.add(context, entityData);
         return entityData;
       }),
     );

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

@@ -2,7 +2,6 @@ import { IHttpResponse } from '@ibiz-template/core';
 import { IControl } from '@ibiz/model-core';
 import { ControlVO } from '../../vo/control.vo';
 import { UIMapField } from '../../vo/ui-map-field';
-import { IAppDEService } from '../../../interface';
 import { Application } from '../../../application';
 
 export class ControlService<T extends IControl = IControl> {
@@ -17,15 +16,6 @@ export class ControlService<T extends IControl = IControl> {
    */
   readonly model: T;
 
-  /**
-   * 实体服务
-   *
-   * @author lxm
-   * @date 2022-08-29 18:08:19
-   * @type {IAppDEService}
-   */
-  entityService!: IAppDEService;
-
   /**
    * UI数据和实体数据的属性名映射
    * key：UI数据属性名

package/src/service/service/entity/method/de-action.ts

@@ -21,6 +21,19 @@ import { execDELogicAction, execFieldLogics } from '../../../../de-logic';
 export class DEActionMethod extends Method {
   declare method: IAppDEAction;
 
+  /**
+   * 是否为本地模式
+   *
+   * @author chitanda
+   * @date 2023-04-19 16:04:46
+   * @readonly
+   * @protected
+   * @type {boolean}
+   */
+  protected get isLocalMode(): boolean {
+    return this.method.actionType === 'BUILTIN';
+  }
+
   async exec(
     context: IParams,
     data: IData,

package/src/service/service/entity/method/fetch.ts

@@ -23,6 +23,10 @@ import { execFieldLogics } from '../../../../de-logic';
 export class FetchMethod extends Method {
   declare method: IAppDEDataSet;
 
+  protected get isLocalMode(): boolean {
+    return this.method.dataSetType === 'DATAQUERY';
+  }
+
   async exec(
     context: IParams,
     data: IData,
@@ -42,6 +46,7 @@ export class FetchMethod extends Method {
     switch (this.method.dataSetType) {
       case 'INDEXDE':
       case 'CODELIST':
+      case 'MULTIFORM':
         res = await this.fetchCodeListSet(context, params);
         break;
       case 'REMOTE':

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

@@ -50,19 +50,6 @@ export abstract class Method {
    */
   protected service?: IAppDEService;
 
-  /**
-   * 是否为本地模式
-   *
-   * @author chitanda
-   * @date 2023-04-19 16:04:46
-   * @readonly
-   * @protected
-   * @type {boolean}
-   */
-  protected get isLocalMode(): boolean {
-    return this.entity.storageMode === 1 || this.entity.storageMode === 4;
-  }
-
   /**
    * Creates an instance of Method.
    *

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

@@ -10,6 +10,14 @@ import { UILogicParam } from './ui-logic-param/ui-logic-param';
  * @class UILogicContext
  */
 export class UILogicContext {
+  /**
+   * 上一次返回值
+   * @author lxm
+   * @date 2023-09-04 09:22:52
+   * @type {unknown}
+   */
+  lastReturn: unknown;
+
   /**
    * 上下文
    */
@@ -111,4 +119,28 @@ export class UILogicContext {
   renewParam(name: string): void {
     this.deLogicParams.get(name)?.renew(this);
   }
+
+  /**
+   * 设置上一次返回值
+   * @author lxm
+   * @date 2023-09-04 09:23:52
+   * @param {unknown} value
+   */
+  setLastReturn(value: unknown): void {
+    this.lastReturn = value;
+  }
+
+  /**
+   * 初始化上一次返回参数类型的逻辑参数
+   * @author lxm
+   * @date 2023-09-04 09:52:00
+   * @param {string} tag
+   */
+  initLastReturnParam(tag: string): void {
+    Object.defineProperty(this.params, tag, {
+      enumerable: true,
+      configurable: true,
+      get: () => this.lastReturn,
+    });
+  }
 }

package/src/ui-logic/ui-logic-node/debug-param-node/debug-param-node.ts

@@ -0,0 +1,26 @@
+import { RuntimeModelError } from '@ibiz-template/core';
+import { IDEUIDebugParamLogic } from '@ibiz/model-core';
+import { UILogicContext } from '../../ui-logic-context';
+import { UILogicNode } from '../ui-logic-node';
+
+/**
+ * 调试逻辑参数节点
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class DebugParamNode
+ * @extends {UILogicNode}
+ */
+export class DebugParamNode extends UILogicNode {
+  declare model: IDEUIDebugParamLogic;
+
+  async exec(ctx: UILogicContext): Promise<void> {
+    const { dstDEUILogicParamId, name } = this.model;
+    if (!dstDEUILogicParamId) {
+      throw new RuntimeModelError(this.model, '缺少目标参数对象配置');
+    }
+    const param = ctx.params[dstDEUILogicParamId];
+    console.log(`逻辑节点${name}操作参数值:`, param);
+  }
+}

package/src/ui-logic/ui-logic-node/index.ts

@@ -6,3 +6,5 @@ export { PrepareJSParamNode } from './prepare-js-param-node/prepare-js-param-nod
 export { UILogicNode } from './ui-logic-node';
 export { ViewCtrlInvokeNode } from './view-ctrl-invoke-node/view-ctrl-invoke-node';
 export { BindParamNode } from './bind-param-node/bind-param-node';
+export { MsgBoxNode } from './msg-box-node/msg-box-node';
+export { DebugParamNode } from './debug-param-node/debug-param-node';

package/src/ui-logic/ui-logic-node/msg-box-node/msg-box-node.ts

@@ -0,0 +1,87 @@
+import { ModelError, RuntimeModelError } from '@ibiz-template/core';
+import { IDEUIMsgBoxLogic } from '@ibiz/model-core';
+import { ModalParams } from '../../../interface';
+import { UILogicContext } from '../../ui-logic-context';
+import { UILogicNode } from '../ui-logic-node';
+
+/**
+ * 消息弹窗节点
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class MsgBoxNode
+ * @extends {UILogicNode}
+ */
+export class MsgBoxNode extends UILogicNode {
+  declare model: IDEUIMsgBoxLogic;
+
+  protected typeMap = {
+    INFO: 'info',
+    QUESTION: 'success',
+    WARNING: 'warning',
+    ERROR: 'error',
+  } as const;
+
+  async exec(ctx: UILogicContext): Promise<void> {
+    const { msgBoxType, buttonsType, msgBoxParamId } = this.model;
+    if (!msgBoxType) {
+      throw new RuntimeModelError(this.model, '缺少消息类型的配置');
+    }
+    if (!buttonsType) {
+      throw new RuntimeModelError(this.model, '缺少按钮类型的配置');
+    }
+
+    // 处理标题和内容
+    let { title } = this.model;
+    let { message } = this.model;
+    if (msgBoxParamId) {
+      const param = ctx.params[msgBoxParamId];
+      if (param.title) {
+        title = param.title;
+      }
+      if (param.message) {
+        message = param.message;
+      }
+    }
+
+    // 处理消息类型
+    const type =
+      this.typeMap[msgBoxType as 'INFO' | 'QUESTION' | 'WARNING' | 'ERROR'];
+    const modalParams: ModalParams = {
+      type,
+      title: title || '消息',
+      desc: message,
+    };
+
+    let resultTags: string[] = [];
+    // 处理按钮类型
+    switch (buttonsType) {
+      case 'YESNO':
+        modalParams.confirmButtonText = '是';
+        modalParams.cancelButtonText = '否';
+        modalParams.showConfirmButton = true;
+        modalParams.showCancelButton = true;
+        resultTags = ['yes', 'no'];
+        break;
+      case 'OK':
+        modalParams.confirmButtonText = '确定';
+        modalParams.showConfirmButton = true;
+        modalParams.showCancelButton = false;
+        resultTags = ['ok'];
+        break;
+      case 'OKCANCEL':
+        modalParams.confirmButtonText = '确定';
+        modalParams.cancelButtonText = '取消';
+        modalParams.showConfirmButton = true;
+        modalParams.showCancelButton = true;
+        resultTags = ['ok', 'cancel'];
+        break;
+      default:
+        throw new ModelError(this.model, `${buttonsType}暂未支持`);
+    }
+    console.log(this.model, modalParams);
+    const result = await ibiz.modal.confirm(modalParams);
+    ctx.setLastReturn(resultTags[result ? 0 : 1]);
+  }
+}

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

@@ -69,7 +69,8 @@ export class UILogicParam {
       // 数据对象变量
       ctx.params[tag] = {};
     } else if (m.lastReturnParam) {
-      throw new ModelError(m, `未支持的逻辑参数类型: 上次调用返回`);
+      // 上一次调用返回变量
+      ctx.initLastReturnParam(tag);
     } else if (m.navContextParam) {
       // 应用上下文
       ctx.params[tag] = context;

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

@@ -6,8 +6,10 @@ import { UILogicContext } from './ui-logic-context';
 import {
   BindParamNode,
   DEActionNode,
+  DebugParamNode,
   DEUIActionNode,
   EndNode,
+  MsgBoxNode,
   PrepareJSParamNode,
   StartNode,
   UILogicNode,
@@ -79,6 +81,12 @@ export class UILogic {
         case 'VIEWCTRLINVOKE': // 视图部件调用
           logicNode = new ViewCtrlInvokeNode(node);
           break;
+        case 'MSGBOX': // 消息弹窗
+          logicNode = new MsgBoxNode(node);
+          break;
+        case 'DEBUGPARAM': // 调试逻辑参数
+          logicNode = new DebugParamNode(node);
+          break;
         case 'RESETPARAM': // 重置参数
         case 'COPYPARAM': // 拷贝参数
         case 'VIEWCTRLFIREEVENT': // 视图部件事件触发
@@ -86,11 +94,9 @@ export class UILogic {
         case 'SORTPARAM': // 排序数组参数
         case 'RENEWPARAM': // 重新建立参数
         case 'PFPLUGIN': // 前端插件调用
-        case 'MSGBOX': // 消息弹窗
         case 'DEDATASET': // 实体数据集
         case 'DELOGIC': // 实体逻辑
         case 'THROWEXCEPTION': // 抛出异常
-        case 'DEBUGPARAM': // 调试逻辑参数
         default:
           throw new ModelError(node, `未支持的逻辑节点类型: ${logicNodeType}`);
       }