@ibiz-template/runtime 0.1.18 → 0.1.19

package/out/service/service/entity/method/method-renturn.js

@@ -1,6 +1,7 @@
 import { MethodDto } from '../../../dto/method.dto';
 import { AppDataEntity } from '../../../app-data-entity/app-data-entity';
 import { findModelChild } from '../../../../model';
+import { isLocalMode } from '../util/util';
 /**
  * 应用实体方法输出转换
  *
@@ -10,21 +11,25 @@ import { findModelChild } from '../../../../model';
  * @class MethodReturn
  */
 export class MethodReturn {
+    get isLocalMode() {
+        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(entity, output) {
+    constructor(entity, method) {
         this.entity = entity;
-        this.output = output;
+        this.method = method;
+        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/out/service/service/entity/method/method.js

@@ -27,8 +27,8 @@ export class Method {
         this.entity = entity;
         this.method = method;
         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/out/service/service/entity/util/util.d.ts

@@ -0,0 +1,12 @@
+import { IAppDEMethod } from '@ibiz/model-core';
+/**
+ * 是否为本地模式
+ *
+ * @author chitanda
+ * @date 2023-09-06 16:09:06
+ * @export
+ * @param {IAppDEMethod} method
+ * @return {*}  {boolean}
+ */
+export declare function isLocalMode(method: IAppDEMethod): boolean;
+//# sourceMappingURL=util.d.ts.map

package/out/service/service/entity/util/util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/util/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE7E;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAKzD"}

package/out/service/service/entity/util/util.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/handlebars/helpers/index.ts"],"names":[],"mappings":"AAmBA;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,CAmB/C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/handlebars/helpers/index.ts"],"names":[],"mappings":"AAoBA;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,CAoB/C"}

package/out/utils/handlebars/helpers/index.js

@@ -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';
@@ -30,7 +31,8 @@ export function installHelpers(hsb) {
     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/out/utils/handlebars/helpers/json/json-parse.d.ts

@@ -0,0 +1,16 @@
+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 declare class HelperJsonParse extends HelperBase {
+    constructor(hbs: IData);
+    onExecute(obj: string): string;
+}
+//# sourceMappingURL=json-parse.d.ts.map

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

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

package/out/utils/handlebars/helpers/json/json-parse.js

@@ -0,0 +1,19 @@
+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) {
+        super(hbs, 'jsonParse');
+    }
+    onExecute(obj) {
+        return JSON.parse(obj);
+    }
+}

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

@@ -6,11 +6,11 @@ import { HelperBase } from '../helper-base';
  * @author chitanda
  * @date 2021-12-24 15:12:59
  * @export
- * @class HelperJson
+ * @class HelperJsonStringify
  * @extends {HelperBase}
  */
-export declare class HelperJson extends HelperBase {
+export declare class HelperJsonStringify extends HelperBase {
     constructor(hbs: IData);
     onExecute(obj: Record<string, unknown> | unknown[], space: number): string;
 }
-//# sourceMappingURL=json.d.ts.map
+//# sourceMappingURL=json-stringify.d.ts.map

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

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

package/out/utils/handlebars/helpers/json/{json.js → json-stringify.js}

@@ -6,10 +6,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) {
         super(hbs, 'jsonStringify');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "d363fb94c05e098f5a6c928533788e7cba99f833"
+  "gitHead": "62b9073941f08f79c2a5ae70c9b895d1a9300c26"
 }

package/src/app-hub.ts

@@ -204,6 +204,21 @@ export class AppHub implements IAppHubService {
     return this.view2appMap.has(id);
   }
 
+  /**
+   * 获取应用样式
+   *
+   * @author chitanda
+   * @date 2023-09-06 10:09:22
+   * @param {string} appId
+   * @return {*}  {(Promise<string | null>)}
+   */
+  async getAppStyle(appId: string): Promise<string | null> {
+    if (this.modelLoaderProvider) {
+      return this.modelLoaderProvider.getAppStyle(appId);
+    }
+    return null;
+  }
+
   /**
    * 根据视图代码名称查找视图
    *

package/src/application.ts

@@ -112,23 +112,14 @@ export class Application implements IAppService {
    * @return {*}  {Promise<void>}
    */
   protected async loadAppModelStyle(): Promise<void> {
-    await this.net
-      .get(`${ibiz.env.remoteModelUrl}/PSSYSAPP.json.css`)
-      .then(res => {
-        const dom = document.createElement('style');
-        dom.setAttribute('type', 'text/css');
-        if (res.request && res.request.responseURL) {
-          const url = new URL(res.request.responseURL);
-          dom.id = url.pathname;
-        }
-        dom.innerHTML = res.data as unknown as string;
-        document.head.appendChild(dom);
-      })
-      .catch(err => {
-        ibiz.log.error(
-          `应用[${this.appId}]模型全局样式加载失败：${err.message}`,
-        );
-      });
+    const style = await ibiz.hub.getAppStyle(this.appId);
+    if (style) {
+      const dom = document.createElement('style');
+      dom.setAttribute('type', 'text/css');
+      dom.id = this.appId;
+      dom.innerHTML = style;
+      document.head.appendChild(dom);
+    }
   }
 
   /**

package/src/controller/control/dashboard/dashboard.controller.ts

@@ -1,4 +1,3 @@
-import { RuntimeError } from '@ibiz-template/core';
 import {
   IDashboard,
   IDBContainerPortletPart,
@@ -119,9 +118,10 @@ export class DashboardController
         return portlet.dataChangeNotify(data);
       }),
     );
-    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/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/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/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/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

@@ -27,6 +27,7 @@ export class MethodDto {
 
   constructor(
     protected entity: IAppDataEntity,
+    protected isLocalMode?: boolean,
     protected dto?: IAppDEMethodDTO,
   ) {
     if (dto) {
@@ -102,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
@@ -123,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;
       }),
     );
@@ -150,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);
       }
     }
   }