@ibiz-template/runtime 0.1.17 → 0.1.19

package/src/controller/control/form/edit-form/edit-form.controller.ts

@@ -14,6 +14,7 @@ import {
 } from '../../../../interface';
 import { hasDeCodeName } from '../../../../model';
 import { Srfuf, ControlVO } from '../../../../service';
+import { ScriptFactory } from '../../../../utils';
 import { FormNotifyState } from '../../../constant';
 import { FormController } from '../form';
 import { EditFormService } from './edit-form.service';
@@ -255,20 +256,39 @@ export class EditFormController
       throw new RuntimeError(`没找到${formItemUpdateId}表单项更新`);
     }
 
-    const { appDEMethodId, defiupdateDetails } = formItemUpdate;
+    const { appDEMethodId, defiupdateDetails, customCode, scriptCode } =
+      formItemUpdate;
     const updateItems = defiupdateDetails!.map(item => item.id!);
 
-    const params = { ...this.params, ...this.data.getOrigin() };
-    const res = await this.service.updateFormItem(
-      appDEMethodId!,
-      this.context,
-      params,
-    );
-    const result = res.data;
-    if (result && updateItems?.length) {
+    let updateData: IData; // 要修改的数据
+    if (customCode && scriptCode) {
+      // 脚本模式获取修改数据
+      updateData = ScriptFactory.execScriptFn(
+        {
+          ...this.getEventArgs(),
+          data: this.data,
+        },
+        scriptCode,
+        {
+          isAsync: false,
+        },
+      ) as IData;
+    } else {
+      // 后台服务获取修改数据
+      const params = { ...this.params, ...this.data.getOrigin() };
+      const res = await this.service.updateFormItem(
+        appDEMethodId!,
+        this.context,
+        params,
+      );
+      updateData = res.data;
+    }
+
+    // 修改表单项更新的值
+    if (updateData && updateItems?.length) {
       await Promise.all(
         updateItems.map(itemName =>
-          this.setDataValue(itemName, result[itemName]),
+          this.setDataValue(itemName, updateData[itemName]),
         ),
       );
     }

package/src/controller/control/form/form/form.controller.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import { RuntimeError, debounceAndAsyncMerge } from '@ibiz-template/core';
+import { debounceAndAsyncMerge } from '@ibiz-template/core';
 import { IDEForm, IDEFormDetail } from '@ibiz/model-core';
 import {
   IFormState,
@@ -102,9 +102,10 @@ export abstract class FormController<
         return detail.dataChangeNotify(names);
       }),
     );
-    if (values.find(item => item.status === 'rejected')) {
+    const rejectedValue = values.find(item => item.status === 'rejected');
+    if (rejectedValue) {
       ibiz.log.error('dataChangeNotify报错', values);
-      throw new RuntimeError('数据变更后有错误');
+      throw (rejectedValue as PromiseRejectedResult).reason;
     }
   }
 

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

@@ -670,9 +670,10 @@ export class GridController
         return column.dataChangeNotify(row, names);
       }),
     );
-    if (values.find(item => item.status === 'rejected')) {
+    const rejectedValue = values.find(item => item.status === 'rejected');
+    if (rejectedValue) {
       ibiz.log.error('dataChangeNotify报错', values);
-      throw new RuntimeError('数据变更后有错误');
+      throw (rejectedValue as PromiseRejectedResult).reason;
     }
   }
 
@@ -807,25 +808,37 @@ export class GridController
     const { appDEMethodId, degeiupdateDetails, customCode, scriptCode } =
       findUpdate;
     const updateItems = degeiupdateDetails!.map(item => item.id!);
+
+    let updateData: IData; // 要修改的数据
     if (customCode && scriptCode) {
-      ScriptFactory.execScriptFn({ data: row.data }, scriptCode, {
-        isAsync: false,
-      });
+      // 脚本模式获取修改数据
+      updateData = ScriptFactory.execScriptFn(
+        {
+          ...this.getEventArgs(),
+          data: row.data,
+        },
+        scriptCode,
+        {
+          isAsync: false,
+        },
+      ) as IData;
     } 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]);
-          }),
-        );
-      }
+      updateData = res.data;
+    }
+    // 修改更新的值
+    if (updateData && updateItems?.length) {
+      await Promise.all(
+        updateItems.map(itemName => {
+          return this.setRowValue(row, itemName, updateData![itemName]);
+        }),
+      );
     }
   }
 

package/src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts

@@ -279,7 +279,7 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
    */
   formatValue(value: unknown = ''): string {
     // 根据数据类型增强转换显示文本
-    if (this.model.valueType) {
+    if (this.model.valueType !== 'SIMPLE') {
       return ValueExUtil.toText(this.model, value);
     }
 

package/src/controller/control/list/list.controller.ts

@@ -24,6 +24,7 @@ export class ListController
 
   protected async onCreated(): Promise<void> {
     await super.onCreated();
+    this.state.size = this.model.pagingSize || 20;
     this.service = new ListService(this.model);
     await this.service.init(this.context);
   }

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

@@ -184,7 +184,13 @@ export class TreeController
 
   setSelection(selection: IData[]): void {
     // todo 当自己点选中时，父节点选不选中，如果选中需要在这边优化
-    super.setSelection(selection);
+
+    // 通过id过滤出原始的树节点数据，避免外部使用的时候传入的选中数据有问题。
+    const selectionIds = selection.map(item => item.id);
+    const filterArr = this.state.items.filter(item =>
+      selectionIds.includes(item.id),
+    );
+    super.setSelection(filterArr);
   }
 
   /**

package/src/engine/md-view.engine.ts

@@ -117,14 +117,14 @@ export class MDViewEngine extends ViewEngineBase {
     // 搜索表单搜索触发加载
     if (this.searchForm) {
       this.searchForm.evt.on('onSearch', () => {
-        this.refresh();
+        this.reLoad();
       });
     }
 
     // 搜索栏搜索触发加载
     if (this.searchBar) {
       this.searchBar.evt.on('onSearch', () => {
-        this.refresh();
+        this.reLoad();
       });
     }
 
@@ -304,6 +304,16 @@ export class MDViewEngine extends ViewEngineBase {
     await this.xdataControl.refresh();
   }
 
+  /**
+   * 视图重新加载
+   * @author lxm
+   * @date 2023-05-22 03:17:33
+   * @return {*}  {Promise<void>}
+   */
+  protected async reLoad(): Promise<void> {
+    await this.xdataControl.load({ isInitialLoad: true });
+  }
+
   /**
    * 获取搜索相关的查询参数
    * @author lxm

package/src/interface/common/i-app-hub-service/i-app-hub-service.ts

@@ -105,6 +105,16 @@ export interface IAppHubService {
    */
   hasAppView(tag: string): boolean;
 
+  /**
+   * 获取应用模型样式内容
+   *
+   * @author chitanda
+   * @date 2023-09-06 10:09:07
+   * @param {string} appId
+   * @return {*}  {(Promise<string | null>)}
+   */
+  getAppStyle(appId: string): Promise<string | null>;
+
   /**
    * 根据应用视图 codeName 或 id 获取应用视图模型
    *

package/src/interface/controller/state/view/i-wf-step-trace-view.state.ts

@@ -7,4 +7,11 @@ import { IViewState } from './i-view.state';
  * @class IWFDynaActionViewState
  * @extends {IViewState}
  */
-export interface IWFStepTraceViewState extends IViewState {}
+export interface IWFStepTraceViewState extends IViewState {
+  /**
+   * 工作流历史数据
+   * @return {*}
+   * @author: zhujiamin
+   */
+  historyData: IData | null;
+}

package/src/interface/provider/model-loader.provider.ts

@@ -52,4 +52,14 @@ export interface ModelLoaderProvider {
     appId: string,
     codeName: string,
   ): Promise<IAppDataEntity>;
+
+  /**
+   * 获取应用样式表
+   *
+   * @author chitanda
+   * @date 2023-09-06 10:09:14
+   * @param {string} appId
+   * @return {*}  {(Promise<string | null>)}
+   */
+  getAppStyle(appId: string): Promise<string | null>;
 }

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

@@ -32,6 +32,8 @@ export class AppDataEntity implements IDataEntity {
 
   declare srfkey: string;
 
+  declare srfsourcekey: string;
+
   declare srfmajortext: string;
 
   get srfuf(): Srfuf {
@@ -87,6 +89,14 @@ export class AppDataEntity implements IDataEntity {
           return this._data[key] || _srfkey;
         },
       });
+      Object.defineProperty(this, 'srfsourcekey', {
+        set(val: unknown) {
+          this._data[key] = val;
+        },
+        get() {
+          return this._data[key];
+        },
+      });
     } else {
       ibiz.log.warn(`实体[${entity.codeName}]未配置主键字段`);
     }

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

@@ -5,6 +5,7 @@ import {
   IAppDEMethodDTOField,
 } from '@ibiz/model-core';
 import { ModelError } from '@ibiz-template/core';
+import { notNilEmpty } from 'qx-util';
 import { Application } from '../../application';
 import { AppDataEntity } from '../app-data-entity/app-data-entity';
 import { findModelChild } from '../../model';
@@ -26,6 +27,7 @@ export class MethodDto {
 
   constructor(
     protected entity: IAppDataEntity,
+    protected isLocalMode?: boolean,
     protected dto?: IAppDEMethodDTO,
   ) {
     if (dto) {
@@ -56,6 +58,9 @@ export class MethodDto {
           break;
         }
         case 'DTOS': {
+          if (notNilEmpty(data[key])) {
+            break;
+          }
           // 没有实体id的不处理
           if (!field.refAppDataEntityId) {
             break;
@@ -98,7 +103,9 @@ export class MethodDto {
    */
   async sets(context: IParams, data: IData[]): Promise<AppDataEntity[]> {
     const service = await this.app!.deService.getService(this.entity.id!);
-    service.local.clear(context);
+    if (this.isLocalMode) {
+      service.local.clear(context);
+    }
     return Promise.all(
       data.map(async datum => {
         const all = this.fields
@@ -119,7 +126,9 @@ export class MethodDto {
           await all[i];
         }
         const entityData = new AppDataEntity(this.entity, datum);
-        await service.local.add(context, entityData);
+        if (this.isLocalMode) {
+          await service.local.add(context, entityData);
+        }
         return entityData;
       }),
     );
@@ -146,7 +155,7 @@ export class MethodDto {
       entity.appDEMethodDTOs || [],
       field.refAppDEMethodDTOId!,
     )!;
-    const dto = new MethodDto(entity, methodDto);
+    const dto = new MethodDto(entity, this.isLocalMode, methodDto);
     this.dtoMap.set(field.codeName!, dto);
     return dto;
   }

package/src/service/service/authority/authority.service.ts

@@ -117,7 +117,7 @@ export class AuthorityService {
    */
   async init(appData = ibiz.appData): Promise<void> {
     if (!appData) {
-      throw new RuntimeError('没有appData数据');
+      return;
     }
     // 设置当前用户拥有的统一标识集合
     if (appData.unires) {

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

@@ -8,6 +8,7 @@ import { Method } from './method';
 import { IDataEntity } from '../../../../interface';
 import { findDELogic } from '../../../../model';
 import { execDELogicAction, execFieldLogics } from '../../../../de-logic';
+import { isLocalMode } from '../util/util';
 
 /**
  * 实体行为方法
@@ -31,7 +32,7 @@ export class DEActionMethod extends Method {
    * @type {boolean}
    */
   protected get isLocalMode(): boolean {
-    return this.method.actionType === 'BUILTIN';
+    return isLocalMode(this.method);
   }
 
   async exec(

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);
   }
 
   /**

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/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"}