@ibiz-template/runtime 0.1.18 → 0.1.20

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

@@ -10,6 +10,7 @@ import { PSDEDQCondEngine, SearchFilter } from '../../../utils';
 import { Method } from './method';
 import { IDataEntity } from '../../../../interface';
 import { execFieldLogics } from '../../../../de-logic';
+import { isLocalMode } from '../util/util';
 
 /**
  * 数据集请求
@@ -24,7 +25,7 @@ export class FetchMethod extends Method {
   declare method: IAppDEDataSet;
 
   protected get isLocalMode(): boolean {
-    return this.method.dataSetType === 'DATAQUERY';
+    return isLocalMode(this.method);
   }
 
   async exec(

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

@@ -1,6 +1,7 @@
-import { IAppDataEntity, IAppDEMethodInput } from '@ibiz/model-core';
+import { IAppDataEntity, IAppDEMethod } from '@ibiz/model-core';
 import { MethodDto } from '../../../dto/method.dto';
 import { findModelChild } from '../../../../model';
+import { isLocalMode } from '../util/util';
 
 /**
  * 应用实体方法输入转换
@@ -13,25 +14,29 @@ import { findModelChild } from '../../../../model';
 export class MethodInput {
   protected dto?: MethodDto;
 
+  protected get isLocalMode(): boolean {
+    return isLocalMode(this.method);
+  }
+
   /**
    * Creates an instance of MethodInput.
-   *
    * @author chitanda
-   * @date 2022-10-11 17:10:59
+   * @date 2023-09-06 16:09:26
    * @param {IAppDataEntity} entity
-   * @param {IAppDEMethodInput} [input]
+   * @param {IAppDEMethod} method
    */
   constructor(
     protected entity: IAppDataEntity,
-    protected input?: IAppDEMethodInput,
+    protected method: IAppDEMethod,
   ) {
+    const input = method.appDEMethodInput;
     if (input) {
       const methodDto = findModelChild(
         entity.appDEMethodDTOs || [],
         input.appDEMethodDTOId!,
       );
       if (methodDto) {
-        this.dto = new MethodDto(entity, methodDto);
+        this.dto = new MethodDto(entity, this.isLocalMode, methodDto);
       }
     }
   }

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

@@ -1,8 +1,9 @@
-import { IAppDataEntity, IAppDEMethodReturn } from '@ibiz/model-core';
+import { IAppDataEntity, IAppDEMethod } from '@ibiz/model-core';
 import { MethodDto } from '../../../dto/method.dto';
 import { AppDataEntity } from '../../../app-data-entity/app-data-entity';
 import { findModelChild } from '../../../../model';
 import { IDataEntity } from '../../../../interface';
+import { isLocalMode } from '../util/util';
 
 /**
  * 应用实体方法输出转换
@@ -15,25 +16,30 @@ import { IDataEntity } from '../../../../interface';
 export class MethodReturn {
   protected dto?: MethodDto;
 
+  protected get isLocalMode(): boolean {
+    return isLocalMode(this.method);
+  }
+
   /**
    * Creates an instance of MethodReturn.
-   *
    * @author chitanda
-   * @date 2022-10-11 17:10:47
+   * @date 2023-09-06 16:09:45
    * @param {IAppDataEntity} entity
+   * @param {IAppDEMethod} method
    * @param {IAppDEMethodReturn} [output]
    */
   constructor(
     protected entity: IAppDataEntity,
-    protected output?: IAppDEMethodReturn,
+    protected method: IAppDEMethod,
   ) {
+    const output = method.appDEMethodReturn;
     if (output) {
       const methodDto = findModelChild(
         entity.appDEMethodDTOs || [],
         output.appDEMethodDTOId!,
       );
       if (methodDto) {
-        this.dto = new MethodDto(entity, methodDto);
+        this.dto = new MethodDto(entity, this.isLocalMode, methodDto);
       }
     }
   }

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

@@ -64,8 +64,8 @@ export abstract class Method {
     protected method: IAppDEMethod,
   ) {
     this.app = ibiz.hub.getApp(entity.appId);
-    this.input = new MethodInput(entity, method.appDEMethodInput);
-    this.result = new MethodReturn(entity, method.appDEMethodReturn);
+    this.input = new MethodInput(entity, method);
+    this.result = new MethodReturn(entity, method);
   }
 
   /**
@@ -181,6 +181,9 @@ export abstract class Method {
    * @return {*}  {IDataEntity}
    */
   protected createEntity(data: IData | IDataEntity): IDataEntity {
+    if (data instanceof AppDataEntity) {
+      return data.clone();
+    }
     return new AppDataEntity(this.entity, data);
   }
 }

package/src/service/service/entity/util/util.ts

@@ -0,0 +1,17 @@
+import { IAppDEAction, IAppDEDataSet, IAppDEMethod } from '@ibiz/model-core';
+
+/**
+ * 是否为本地模式
+ *
+ * @author chitanda
+ * @date 2023-09-06 16:09:06
+ * @export
+ * @param {IAppDEMethod} method
+ * @return {*}  {boolean}
+ */
+export function isLocalMode(method: IAppDEMethod): boolean {
+  return (
+    (method as IAppDEAction).actionType === 'BUILTIN' ||
+    (method as IAppDEDataSet).dataSetType === 'DATAQUERY'
+  );
+}

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

@@ -169,8 +169,8 @@ export class ControlVO {
     dataKey: string,
     isOriginField: boolean = true,
   ): void {
-    // srfuf不做处理
-    if (uiKey === 'srfuf') {
+    // srfuf和srfkey不做处理
+    if (uiKey === 'srfuf' || uiKey === 'srfkey') {
       return;
     }
 

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

@@ -80,7 +80,6 @@ export class MsgBoxNode extends UILogicNode {
       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/utils/handlebars/helpers/index.ts

@@ -5,7 +5,8 @@ import { HelperEq } from './eq/eq';
 import { HelperGt } from './gt/gt';
 import { HelperGte } from './gte/gte';
 import { HelperEqPropertyValue } from './eq-property-value/eq-property-value';
-import { HelperJson } from './json/json';
+import { HelperJsonParse } from './json/json-parse';
+import { HelperJsonStringify } from './json/json-stringify';
 import { HelperLowerCase } from './lower-case/lower-case';
 import { HelperLt } from './lt/lt';
 import { HelperLte } from './lte/lte';
@@ -31,7 +32,8 @@ export function installHelpers(hsb: IData): void {
   new HelperEq(hsb);
   new HelperGt(hsb);
   new HelperGte(hsb);
-  new HelperJson(hsb);
+  new HelperJsonParse(hsb);
+  new HelperJsonStringify(hsb);
   new HelperLowerCase(hsb);
   new HelperLt(hsb);
   new HelperLte(hsb);

package/src/utils/handlebars/helpers/json/json-parse.ts

@@ -0,0 +1,21 @@
+import { HelperBase } from '../helper-base';
+
+/**
+ * json字符创 转 对象
+ *
+ * @description 用法 {{json xxx 2}}，支持第二个参数传递格式化。效果: 将 json 对象转为 json 字符串
+ * @author chitanda
+ * @date 2021-12-24 15:12:59
+ * @export
+ * @class HelperJson
+ * @extends {HelperBase}
+ */
+export class HelperJsonParse extends HelperBase {
+  constructor(hbs: IData) {
+    super(hbs, 'jsonParse');
+  }
+
+  onExecute(obj: string): string {
+    return JSON.parse(obj);
+  }
+}

package/src/utils/handlebars/helpers/json/{json.ts → json-stringify.ts}

@@ -7,10 +7,10 @@ import { HelperBase } from '../helper-base';
  * @author chitanda
  * @date 2021-12-24 15:12:59
  * @export
- * @class HelperJson
+ * @class HelperJsonStringify
  * @extends {HelperBase}
  */
-export class HelperJson extends HelperBase {
+export class HelperJsonStringify extends HelperBase {
   constructor(hbs: IData) {
     super(hbs, 'jsonStringify');
   }

package/out/utils/handlebars/helpers/json/json.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../../../../src/utils/handlebars/helpers/json/json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;;;GASG;AACH,qBAAa,UAAW,SAAQ,UAAU;gBAC5B,GAAG,EAAE,KAAK;IAItB,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;CAO3E"}