@ibiz-template/runtime 0.0.3-beta.6 → 0.0.4-beta.2

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

@@ -1,9 +1,6 @@
-import { UnsupportedModelError, } from '@ibiz-template/model';
-import { RuntimeError } from '@ibiz-template/core';
+import { ModelError, RuntimeError } from '@ibiz-template/core';
 import { EntityCache } from '../../utils';
 import { WorkFlowService } from '../work-flow/work-flow.service';
-import { DEActionMethod } from './method/de-action';
-import { FetchMethod } from './method/fetch';
 import { FileService } from '../file/file.service';
 /**
  * 实体服务
@@ -19,7 +16,7 @@ export class EntityService {
      *
      * @author chitanda
      * @date 2022-08-24 18:08:44
-     * @param {AppEntityModel} model 应用实体模型
+     * @param {IAppDataEntity} model 应用实体模型
      * @param {ServicePathItem[][]} paths 计算出的资源关系路径
      */
     constructor(model, paths) {
@@ -58,21 +55,25 @@ export class EntityService {
         if (this.methodMap.has(methodName)) {
             return this.methodMap.get(methodName);
         }
-        const model = this.model.findPSAppDeMethod(methodName);
-        let method = null;
-        switch (model.methodType) {
-            case 'DEACTION':
-                method = new DEActionMethod(this.model, model, this.paths);
-                break;
-            case 'FETCH':
-            case 'FETCHTEMP':
-                method = new FetchMethod(this.model, model, this.paths);
-                break;
-            default:
-                throw new UnsupportedModelError(model, `未支持的服务方法类型: ${model.methodType}`);
-        }
-        this.methodMap.set(methodName, method);
-        return method;
+        // const model = this.model.findPSAppDeMethod(methodName) as IAppDEMethod;
+        // let method: Method | null = null;
+        // switch (model.methodType) {
+        //   case 'DEACTION':
+        //     method = new DEActionMethod(this.model, model, this.paths);
+        //     break;
+        //   case 'FETCH':
+        //   case 'FETCHTEMP':
+        //     method = new FetchMethod(this.model, model, this.paths);
+        //     break;
+        //   default:
+        //     throw new ModelError(
+        //       model,
+        //       `未支持的服务方法类型: ${model.methodType}`,
+        //     );
+        // }
+        // this.methodMap.set(methodName, method);
+        // return method;
+        throw new ModelError(this.model, `未支持的服务方法: ${methodName}`);
     }
     /**
      * 执行服务方法
@@ -90,13 +91,13 @@ export class EntityService {
         if (method) {
             return method.exec(context, params, params2);
         }
-        throw new RuntimeError(`${this.model.deName}未支持「${methodName}」方法`);
+        throw new RuntimeError(`${this.model.codeName}未支持「${methodName}」方法`);
     }
     getPath(methodName, context, params = {}, params2 = {}) {
         const method = this.getMethod(methodName);
         if (method) {
             return method.exec(context, params, params2);
         }
-        throw new RuntimeError(`${this.model.deName}未支持「${methodName}」方法`);
+        throw new RuntimeError(`${this.model.codeName}未支持「${methodName}」方法`);
     }
 }

package/out/service/service/entity/method/de-action.d.ts

@@ -120,6 +120,6 @@ export declare class DEActionMethod extends Method {
      * @param {IParams} [params]
      * @return {*}  {Promise<IHttpResponse>}
      */
-    removeBatchTemp(context: IParams, params?: IParams): Promise<IHttpResponse>;
+    removeBatchTemp(_context: IParams, _params?: IParams): Promise<IHttpResponse>;
 }
 //# sourceMappingURL=de-action.d.ts.map

package/out/service/service/entity/method/de-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAElE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAClC,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAuF/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAUjC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAYjC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,MAAM,EACpB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAcjC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAajC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAUjC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAajC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAoBjC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAajC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAqBjC;;;;;;OAMG;IACG,eAAe,CACnB,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC;CAc1B"}
+{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAClC,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAuF/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAUjC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAYjC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,MAAM,EACpB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAcjC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAajC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAUjC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAajC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAoBjC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAajC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAqBjC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAc1B"}

package/out/service/service/entity/method/de-action.js

@@ -1,5 +1,4 @@
 import { HttpResponse } from '@ibiz-template/core';
-import { execDELogic, execDELogicResponse } from '../../../../de-logic';
 import { Method } from './method';
 /**
  * 实体行为方法
@@ -12,29 +11,33 @@ import { Method } from './method';
  */
 export class DEActionMethod extends Method {
     async exec(context, data, params) {
-        // 实体逻辑处理
-        if (this.method.actionType === 'DELOGIC') {
-            const deLogic = this.method.getPSAppDELogic();
-            if (deLogic === null || deLogic === void 0 ? void 0 : deLogic.enableFront) {
-                return execDELogicResponse(deLogic, context, data, params);
-            }
-        }
-        if (!this.entity.isLocalMode) {
-            data = await this.input.handle(context, data);
-        }
+        // // 实体逻辑处理
+        // if (this.method.actionType === 'DELOGIC') {
+        //   const deLogic = this.method.getPSAppDELogic();
+        //   if (deLogic?.enableFront) {
+        //     return execDELogicResponse(deLogic, context, data, params);
+        //   }
+        // }
+        // if (!this.isLocalMode) {
+        //   data = await this.input.handle(context, data);
+        // }
         // 执行变更属性逻辑
-        const { onChange, compute } = this.entity.deFieldLogics;
-        if (onChange.length) {
-            const promiseResult = await Promise.all(onChange.map(logic => {
-                return execDELogic(logic, context, data, params);
-            }));
-            promiseResult.forEach(value => {
-                Object.assign(data, value);
-            });
-        }
-        let path = this.calcPath(context);
+        // const { onChange, compute } = this.entity.deFieldLogics;
+        // if (onChange.length) {
+        //   const promiseResult = await Promise.all(
+        //     onChange.map(logic => {
+        //       return execDELogic(logic, context, data, params);
+        //     }),
+        //   );
+        //   promiseResult.forEach(value => {
+        //     Object.assign(data, value);
+        //   });
+        // }
+        const path = this.calcPath(context);
         if (this.method.needResourceKey) {
-            path = `${path}/${context[this.entity.deName] || data[this.entity.keyName]}`;
+            // path = `${path}/${
+            //   context[this.entity.codeName] || data[this.entity.keyName]
+            // }`;
         }
         let result;
         switch (this.method.codeName) {
@@ -75,14 +78,16 @@ export class DEActionMethod extends Method {
             }
         }
         // 计算属性逻辑
-        if (compute.length) {
-            const promiseResult = await Promise.all(compute.map(logic => {
-                return execDELogic(logic, context, data, params);
-            }));
-            promiseResult.forEach(value => {
-                Object.assign(data, value);
-            });
-        }
+        // if (compute.length) {
+        //   const promiseResult = await Promise.all(
+        //     compute.map(logic => {
+        //       return execDELogic(logic, context, data, params);
+        //     }),
+        //   );
+        //   promiseResult.forEach(value => {
+        //     Object.assign(data, value);
+        //   });
+        // }
         return result;
     }
     /**
@@ -95,7 +100,7 @@ export class DEActionMethod extends Method {
      * @return {*}  {Promise<IHttpResponse<IData>>}
      */
     async create(context, data, params) {
-        if (this.entity.isLocalMode) {
+        if (this.isLocalMode) {
             return this.createTemp(context, this.createEntity(data));
         }
         const path = this.calcPath(context);
@@ -113,11 +118,11 @@ export class DEActionMethod extends Method {
      * @return {*}  {Promise<IHttpResponse<Entity>>}
      */
     async remove(context, params) {
-        if (this.entity.isLocalMode) {
+        if (this.isLocalMode) {
             return this.removeTemp(context, params);
         }
         const path = this.calcPath(context);
-        const res = await this.app.net.delete(`${path}/${context[this.entity.deName]}`, params);
+        const res = await this.app.net.delete(`${path}/${context[this.entity.codeName]}`, params);
         return res;
     }
     /**
@@ -131,11 +136,11 @@ export class DEActionMethod extends Method {
      * @return {*}  {Promise<IHttpResponse<Entity>>}
      */
     async update(context, data, params = {}) {
-        if (this.entity.isLocalMode) {
+        if (this.isLocalMode) {
             return this.updateTemp(context, this.createEntity(data));
         }
         const path = this.calcPath(context);
-        const res = await this.app.net.put(`${path}/${context[this.entity.deName]}`, data, params);
+        const res = await this.app.net.put(`${path}/${context[this.entity.codeName]}`, data, params);
         res.data = await this.result.handle(context, res.data);
         return res;
     }
@@ -149,11 +154,11 @@ export class DEActionMethod extends Method {
      * @return {*}  {Promise<IHttpResponse<Entity>>}
      */
     async get(context, params = {}) {
-        if (this.entity.isLocalMode) {
+        if (this.isLocalMode) {
             return this.getTemp(context, params);
         }
         const path = this.calcPath(context);
-        const res = await this.app.net.get(`${path}/${context[this.entity.deName]}`, params);
+        const res = await this.app.net.get(`${path}/${context[this.entity.codeName]}`, params);
         res.data = await this.result.handle(context, res.data);
         return res;
     }
@@ -167,7 +172,7 @@ export class DEActionMethod extends Method {
      * @return {*}  {Promise<IHttpResponse<IData>>}
      */
     async getDraft(context, params) {
-        if (this.entity.isLocalMode) {
+        if (this.isLocalMode) {
             return this.getDraftTemp(context, params);
         }
         const path = this.calcPath(context);
@@ -229,10 +234,10 @@ export class DEActionMethod extends Method {
         try {
             let key = null;
             if (params) {
-                key = params[this.entity.keyName];
+                // key = params[this.entity.keyName];
             }
             if (!key && context) {
-                key = context[this.entity.deName];
+                key = context[this.entity.codeName];
             }
             const s = await this.getService();
             const data = s.local.delete(context, key);
@@ -280,10 +285,10 @@ export class DEActionMethod extends Method {
         try {
             let key = null;
             if (params) {
-                key = params[this.entity.keyName];
+                // key = params[this.entity.keyName];
             }
             if (!key && context) {
-                key = context[this.entity.deName];
+                key = context[this.entity.codeName];
             }
             const s = await this.getService();
             const data = s.local.get(context, key);
@@ -304,19 +309,18 @@ export class DEActionMethod extends Method {
      * @param {IParams} [params]
      * @return {*}  {Promise<IHttpResponse>}
      */
-    async removeBatchTemp(context, params) {
-        if (params) {
-            const keys = params[this.entity.keyName];
-            if (keys) {
-                try {
-                    const s = await this.getService();
-                    await s.local.deleteBatch(context, keys);
-                }
-                catch (err) {
-                    return new HttpResponse(err, 500);
-                }
-            }
-        }
+    async removeBatchTemp(_context, _params) {
+        // if (params) {
+        //   const keys: string[] = params[this.entity.keyName];
+        //   if (keys) {
+        //     try {
+        //       const s = await this.getService();
+        //       await s.local.deleteBatch(context, keys);
+        //     } catch (err) {
+        //       return new HttpResponse(err, 500);
+        //     }
+        //   }
+        // }
         return new HttpResponse(true);
     }
 }

package/out/service/service/entity/method/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAInD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC/B,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;IAkClC;;;;;;OAMG;cACa,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC;IA8DpB;;;;;;;;OAQG;cACa,WAAW,CACzB,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAAgC,GACrD,OAAO,CAAC,MAAM,EAAE,CAAC;CA4CrB"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGnD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC/B,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;IAkClC;;;;;;OAMG;cACa,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC;IA8DpB;;;;;;;;OAQG;cACa,WAAW,CACzB,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,MAAM,EAAE,CAAC;CA4CrB"}

package/out/service/service/entity/method/fetch.js

@@ -1,8 +1,5 @@
-import { HttpResponse } from '@ibiz-template/core';
-import { ascSort, descSort, notNilEmpty } from 'qx-util';
+import { ascSort, descSort } from 'qx-util';
 import { clone, equals, isEmpty, isNil, where } from 'ramda';
-import { execDELogic } from '../../../../de-logic';
-import { SearchFilter } from '../../../utils';
 import { Method } from './method';
 /**
  * 数据集请求
@@ -15,27 +12,34 @@ import { Method } from './method';
  */
 export class FetchMethod extends Method {
     async exec(context, data, params) {
-        if (this.entity.isLocalMode) {
-            const items = await this.searchLocal(null, new SearchFilter(context, data));
-            return new HttpResponse(items, 200);
-        }
+        // if (this.entity.isLocalMode) {
+        //   const items = await this.searchLocal(
+        //     null,
+        //     new SearchFilter(context, data),
+        //   );
+        //   return new HttpResponse<Entity[]>(items, 200);
+        // }
         const path = this.calcPath(context);
         const res = await this.request(path, context, data, params);
         const items = res.data || [];
         res.data = items.map(item => this.createEntity(item));
         // 计算属性逻辑
-        const { compute } = this.entity.deFieldLogics;
-        if (compute.length && res.data && res.data.length > 0) {
-            res.data = await Promise.all(res.data.map(async (item) => {
-                const promiseResult = await Promise.all(compute.map(logic => {
-                    return execDELogic(logic, context, item, params);
-                }));
-                promiseResult.forEach(value => {
-                    Object.assign(item, value);
-                });
-                return item;
-            }));
-        }
+        // const { compute } = this.entity.deFieldLogics;
+        // if (compute.length && res.data && res.data.length > 0) {
+        //   res.data = await Promise.all(
+        //     res.data.map(async (item: IDatum) => {
+        //       const promiseResult = await Promise.all(
+        //         compute.map(logic => {
+        //           return execDELogic(logic, context, item, params);
+        //         }),
+        //       );
+        //       promiseResult.forEach(value => {
+        //         Object.assign(item, value);
+        //       });
+        //       return item;
+        //     }),
+        //   );
+        // }
         return res;
     }
     /**
@@ -51,19 +55,19 @@ export class FetchMethod extends Method {
         items = ascSort(items, 'srfordervalue');
         // 查询数据条件集
         const data = {};
-        if (notNilEmpty(context)) {
-            const map = this.entity.majorKeyMap;
-            if (map) {
-                for (const key in map) {
-                    if (Object.prototype.hasOwnProperty.call(map, key)) {
-                        const val = map[key];
-                        if (notNilEmpty(context[key])) {
-                            data[val] = equals(context[key]);
-                        }
-                    }
-                }
-            }
-        }
+        // if (notNilEmpty(context)) {
+        //   const map = this.entity.majorKeyMap;
+        //   if (map) {
+        //     for (const key in map) {
+        //       if (Object.prototype.hasOwnProperty.call(map, key)) {
+        //         const val = map[key];
+        //         if (notNilEmpty(context[key])) {
+        //           data[val] = equals(context[key]);
+        //         }
+        //       }
+        //     }
+        //   }
+        // }
         const nullData = {};
         const undefinedData = {};
         const emptyData = {};
@@ -115,7 +119,7 @@ export class FetchMethod extends Method {
      * @param {string[]} [queryParamKeys=this.entity.quickSearchKeys] 当前实体支持快速搜索的属性
      * @return {*}  {Promise<Entity[]>}
      */
-    async searchLocal(cond, filter, queryParamKeys = this.entity.quickSearchKeys) {
+    async searchLocal(cond, filter, queryParamKeys = this.entity.quickSearchAppDEFieldIds) {
         const service = await this.getService();
         let list = [];
         // 走查询条件

package/out/service/service/entity/method/method-input.d.ts

@@ -1,4 +1,4 @@
-import { AppEntityModel, IPSAppDEMethodInput } from '@ibiz-template/model';
+import { IAppDataEntity, IAppDEMethodInput } from '@ibiz/model-core';
 import { MethodDto } from '../../../dto/method.dto';
 /**
  * 应用实体方法输入转换
@@ -9,18 +9,18 @@ import { MethodDto } from '../../../dto/method.dto';
  * @class MethodInput
  */
 export declare class MethodInput {
-    protected entity: AppEntityModel;
-    protected input?: IPSAppDEMethodInput | undefined;
+    protected entity: IAppDataEntity;
+    protected input?: IAppDEMethodInput | undefined;
     protected dto?: MethodDto;
     /**
      * Creates an instance of MethodInput.
      *
      * @author chitanda
      * @date 2022-10-11 17:10:59
-     * @param {AppEntityModel} entity
-     * @param {IPSAppDEMethodInput} [input]
+     * @param {IAppDataEntity} entity
+     * @param {IAppDEMethodInput} [input]
      */
-    constructor(entity: AppEntityModel, input?: IPSAppDEMethodInput | undefined);
+    constructor(entity: IAppDataEntity, input?: IAppDEMethodInput | undefined);
     /**
      * 处理请求发送参数
      *

package/out/service/service/entity/method/method-input.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method-input.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-input.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,WAAW;IAYpB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,KAAK,CAAC;IAZlB,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;;;;OAOG;gBAES,MAAM,EAAE,cAAc,EACtB,KAAK,CAAC,iCAAqB;IAQvC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;CAM5D"}
+{"version":3,"file":"method-input.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-input.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,WAAW;IAYpB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,KAAK,CAAC;IAZlB,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;;;;OAOG;gBAES,MAAM,EAAE,cAAc,EACtB,KAAK,CAAC,+BAAmB;IAQrC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;CAM5D"}

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

@@ -1,4 +1,3 @@
-import { MethodDto } from '../../../dto/method.dto';
 /**
  * 应用实体方法输入转换
  *
@@ -13,16 +12,16 @@ export class MethodInput {
      *
      * @author chitanda
      * @date 2022-10-11 17:10:59
-     * @param {AppEntityModel} entity
-     * @param {IPSAppDEMethodInput} [input]
+     * @param {IAppDataEntity} entity
+     * @param {IAppDEMethodInput} [input]
      */
     constructor(entity, input) {
         this.entity = entity;
         this.input = input;
-        const methodDto = input === null || input === void 0 ? void 0 : input.getPSAppDEMethodDTO();
-        if (methodDto) {
-            this.dto = new MethodDto(methodDto);
-        }
+        // const methodDto = input?.getPSAppDEMethodDTO();
+        // if (methodDto) {
+        //   this.dto = new MethodDto(methodDto);
+        // }
     }
     /**
      * 处理请求发送参数

package/out/service/service/entity/method/method-renturn.d.ts

@@ -1,4 +1,4 @@
-import { AppEntityModel, IPSAppDEMethodReturn } from '@ibiz-template/model';
+import { IAppDataEntity, IAppDEMethodReturn } from '@ibiz/model-core';
 import { Application } from '../../../../application';
 import { MethodDto } from '../../../dto/method.dto';
 import { Entity } from '../../../entity/entity';
@@ -11,8 +11,8 @@ import { Entity } from '../../../entity/entity';
  * @class MethodReturn
  */
 export declare class MethodReturn {
-    protected entity: AppEntityModel;
-    protected output?: IPSAppDEMethodReturn | undefined;
+    protected entity: IAppDataEntity;
+    protected output?: IAppDEMethodReturn | undefined;
     protected app: Application;
     protected dto?: MethodDto;
     /**
@@ -20,10 +20,10 @@ export declare class MethodReturn {
      *
      * @author chitanda
      * @date 2022-10-11 17:10:47
-     * @param {AppEntityModel} entity
-     * @param {IPSAppDEMethodReturn} [output]
+     * @param {IAppDataEntity} entity
+     * @param {IAppDEMethodReturn} [output]
      */
-    constructor(entity: AppEntityModel, output?: IPSAppDEMethodReturn | undefined);
+    constructor(entity: IAppDataEntity, output?: IAppDEMethodReturn | undefined);
     /**
      * 处理请求返回参数
      *

package/out/service/service/entity/method/method-renturn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method-renturn.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-renturn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAcrB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,CAAC;IAdnB,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC;IAE3B,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;;;;OAOG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,CAAC,kCAAsB;IASzC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;CAO7D"}
+{"version":3,"file":"method-renturn.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-renturn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAcrB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,CAAC;IAdnB,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;;;;OAOG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,CAAC,gCAAoB;IAUvC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;CAO7D"}

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

@@ -1,4 +1,3 @@
-import { MethodDto } from '../../../dto/method.dto';
 import { Entity } from '../../../entity/entity';
 /**
  * 应用实体方法输出转换
@@ -14,17 +13,18 @@ export class MethodReturn {
      *
      * @author chitanda
      * @date 2022-10-11 17:10:47
-     * @param {AppEntityModel} entity
-     * @param {IPSAppDEMethodReturn} [output]
+     * @param {IAppDataEntity} entity
+     * @param {IAppDEMethodReturn} [output]
      */
     constructor(entity, output) {
         this.entity = entity;
         this.output = output;
-        this.app = ibiz.hub.getApp(entity.modelService.app);
-        const methodDto = output === null || output === void 0 ? void 0 : output.getPSAppDEMethodDTO();
-        if (methodDto) {
-            this.dto = new MethodDto(methodDto);
-        }
+        // todo
+        // this.app = ibiz.hub.getApp(entity.modelService.app);
+        // const methodDto = output?.getPSAppDEMethodDTO();
+        // if (methodDto) {
+        //   this.dto = new MethodDto(methodDto);
+        // }
     }
     /**
      * 处理请求返回参数
@@ -40,6 +40,6 @@ export class MethodReturn {
             const items = await this.dto.sets(context, [data]);
             return items[0];
         }
-        return new Entity(this.entity.source, data);
+        return new Entity(this.entity, data);
     }
 }

package/out/service/service/entity/method/method.d.ts

@@ -1,5 +1,5 @@
 import { HttpResponse } from '@ibiz-template/core';
-import { AppEntityModel, IAppDEMethod } from '@ibiz-template/model';
+import { IAppDataEntity, IAppDEMethod } from '@ibiz/model-core';
 import { Application } from '../../../../application';
 import { Entity } from '../../../entity/entity';
 import { ServicePathItem } from '../../../utils';
@@ -15,7 +15,7 @@ import { MethodReturn } from './method-renturn';
  * @class Method
  */
 export declare abstract class Method {
-    protected entity: AppEntityModel;
+    protected entity: IAppDataEntity;
     protected method: IAppDEMethod;
     protected paths: ServicePathItem[][];
     protected app: Application;
@@ -46,16 +46,26 @@ export declare abstract class Method {
      * @type {EntityService}
      */
     protected service?: EntityService;
+    /**
+     * 是否为本地模式
+     *
+     * @author chitanda
+     * @date 2023-04-19 16:04:46
+     * @readonly
+     * @protected
+     * @type {boolean}
+     */
+    protected get isLocalMode(): boolean;
     /**
      * Creates an instance of Method.
      *
      * @author chitanda
      * @date 2022-10-10 14:10:19
-     * @param {AppEntityModel} entity
+     * @param {IAppDataEntity} entity
      * @param {IAppDEMethod} method
      * @param {ServicePathItem[][]} paths
      */
-    constructor(entity: AppEntityModel, method: IAppDEMethod, paths: ServicePathItem[][]);
+    constructor(entity: IAppDataEntity, method: IAppDEMethod, paths: ServicePathItem[][]);
     /**
      * 执行行为
      *

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

@@ -1 +1 @@
-{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EACL,cAAc,EAEd,YAAY,EACb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAe,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,8BAAsB,MAAM;IA2CxB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAC9B,SAAS,CAAC,KAAK,EAAE,eAAe,EAAE,EAAE;IA5CtC,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC;IAE3B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,WAAW,CAAC;IAE7B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC;IAE/B;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAElC;;;;;;;;OAQG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,eAAe,EAAE,EAAE;IAOtC;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GAEd,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAqC7B;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;IAM5C;;;;;;;OAOG;cACa,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC;IAOpD;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM;CAGrD"}
+{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAe,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,8BAAsB,MAAM;IAyDxB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAC9B,SAAS,CAAC,KAAK,EAAE,eAAe,EAAE,EAAE;IA1DtC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAG,WAAW,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAG,YAAY,CAAC;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAElC;;;;;;;;OAQG;IACH,SAAS,KAAK,WAAW,IAAI,OAAO,CAGnC;IAED;;;;;;;;OAQG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,eAAe,EAAE,EAAE;IAOtC;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GAEd,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAyC7B;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;IAM5C;;;;;;;OAOG;cACa,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC;IAOpD;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM;CAGrD"}