@ibiz-template/runtime 0.6.5 → 0.6.8

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

@@ -48,35 +48,38 @@ export class DEActionMethod extends Method {
             if (data && !this.isLocalMode) {
                 data = await this.inputHandle(context, data);
             }
-            switch (this.method.codeName) {
-                case 'Create':
+            const methodTag = this.method.actionTag
+                ? this.method.actionTag.toUpperCase()
+                : this.method.codeName.toUpperCase();
+            switch (methodTag) {
+                case 'CREATE':
                     result = await this.create(context, data, params || {}, header);
                     break;
-                case 'Get':
+                case 'GET':
                     result = await this.get(context, params, header);
                     break;
-                case 'GetDraft':
+                case 'GETDRAFT':
                     result = await this.getDraft(context, params, header);
                     break;
-                case 'Remove':
+                case 'REMOVE':
                     result = await this.remove(context, params);
                     break;
-                case 'Update':
+                case 'UPDATE':
                     result = await this.update(context, data, params, header);
                     break;
-                case 'CreateTemp':
+                case 'CREATETEMP':
                     result = await this.createTemp(context, data);
                     break;
-                case 'GetTemp':
+                case 'GETTEMP':
                     result = await this.getTemp(context, data);
                     break;
-                case 'GetDraftTemp':
+                case 'GETDRAFTTEMP':
                     result = await this.getDraftTemp(context, params);
                     break;
-                case 'RemoveTemp':
+                case 'REMOVETEMP':
                     result = await this.removeTemp(context, data);
                     break;
-                case 'UpdateTemp':
+                case 'UPDATETEMP':
                     result = await this.updateTemp(context, data);
                     break;
                 default: {
@@ -194,7 +197,9 @@ export class DEActionMethod extends Method {
             return this.getDraftTemp(context, params);
         }
         const path = this.calcPath(context);
-        const res = await this.app.net.get(`${path}/getdraft`, params, header);
+        // const res = await this.app.net.get(`${path}/getdraft`, params, header);
+        // 讲固定请求方法调整为指定的请求路径
+        const res = await this.app.net.get(this.mergeRequestPath(path, this.method.requestPath), params, header);
         res.data = await this.result.handle(context, res.data);
         return res;
     }

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

@@ -70,7 +70,14 @@ export declare abstract class Method {
      * @return {*}  {Promise<HttpResponse<any>>}
      */
     protected request(path: string, context: IContext, data?: IData | IData[], params?: IParams, header?: IData): Promise<HttpResponse<any>>;
-    protected mergeRequestPath(path: string, methodName: string): string;
+    /**
+     * 合并请求路径
+     * @author lionlau
+     * @param path
+     * @param methodName 方法名，以 / 开始
+     * @returns
+     */
+    protected mergeRequestPath(path: string, methodName?: string): string;
     /**
      * 根据上下文计算当前请求路径
      *

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":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEhF;;;;;;;GAOG;AACH,8BAAsB,MAAM;IAiCxB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAC9B,SAAS,CAAC,WAAW,EAAE,OAAO;IAnChC,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;;;;;;;;OAQG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY,EACpB,WAAW,GAAE,OAAe;IAOxC;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAEb,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAkD7B,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAIpE;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM;IAM7C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CACpB,IAAI,EAAE,KAAK,EAAE,GAAG,WAAW,EAAE,GAAG,KAAK,GAAG,WAAW,GAClD,WAAW,GAAG,WAAW,EAAE;CAG/B"}
+{"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;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEhF;;;;;;;GAOG;AACH,8BAAsB,MAAM;IAiCxB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAC9B,SAAS,CAAC,WAAW,EAAE,OAAO;IAnChC,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;;;;;;;;OAQG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY,EACpB,WAAW,GAAE,OAAe;IAOxC;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAEb,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAkD7B;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM;IAIrE;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM;IAM7C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CACpB,IAAI,EAAE,KAAK,EAAE,GAAG,WAAW,EAAE,GAAG,KAAK,GAAG,WAAW,GAClD,WAAW,GAAG,WAAW,EAAE;CAG/B"}

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

@@ -45,7 +45,7 @@ export class Method {
     async request(path, context, data, params, header) {
         const { actionType, requestMethod } = this.method;
         if (actionType === 'REMOTE') {
-            const methodName = this.method.codeName.toLowerCase();
+            const methodName = this.method.requestPath;
             let res = null;
             switch (requestMethod) {
                 case 'POST':
@@ -73,8 +73,15 @@ export class Method {
         }
         throw new RuntimeModelError(this.method, `未支持的行为类型[${actionType}]`);
     }
+    /**
+     * 合并请求路径
+     * @author lionlau
+     * @param path
+     * @param methodName 方法名，以 / 开始
+     * @returns
+     */
     mergeRequestPath(path, methodName) {
-        return `${path}/${methodName}`;
+        return methodName ? `${path}${methodName}` : `${path}`;
     }
     /**
      * 根据上下文计算当前请求路径
@@ -86,7 +93,7 @@ export class Method {
      * @return {*}  {string} 拼接结果说明: /祖父实体/祖父实体主键/爷爷实体/爷爷实体主键/父实体/父实体主键/当前实体
      */
     calcPath(context) {
-        const curPath = `/${this.entity.codeName2.toLowerCase()}`;
+        const curPath = `/${this.entity.deapicodeName2}`;
         const resPath = calcResPath(context, this.entity);
         return resPath + curPath;
     }

package/out/service/service/file/file.service.js

@@ -22,7 +22,7 @@ export class FileService {
      */
     exportData(dataExport, fetchAction, context, params) {
         const resPath = calcResPath(context, this.model);
-        const exportUrl = `${resPath}/${this.model.codeName2.toLowerCase()}/exportdata/${fetchAction.toLowerCase()}/?srfexporttag=${dataExport.codeName}`;
+        const exportUrl = `${resPath}/${this.model.deapicodeName2}/exportdata/${fetchAction.toLowerCase()}/?srfexporttag=${dataExport.codeName}`;
         return ibiz.net.request(exportUrl, {
             method: 'post',
             data: params,

package/out/ui-action/provider/front-ui-action-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAiE3B;;;;;;;;OAQG;IAEH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAiEhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA4C3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;CAqDjB"}
+{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAiE3B;;;;;;;;OAQG;IAEH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAiEhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA4C3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;CAmDjB"}

package/out/ui-action/provider/front-ui-action-provider.js

@@ -87,7 +87,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
      * @return {*}
      */
     async executePrint(action, args) {
-        var _a, _b, _c;
+        var _a, _b;
         // 处理参数
         const { resultContext, resultParams } = await this.handleParams(action, args.context, args.data, args.params);
         const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId, action.appId);
@@ -99,7 +99,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
             if (resultContext &&
                 resultContext[appDataEntity.codeName.toLowerCase()]) {
                 // TODO 临时写死printdata， 非标准，后续优化
-                requestUrl += `/${(_b = appDataEntity.codeName2) === null || _b === void 0 ? void 0 : _b.toLowerCase()}/printdata/${resultContext[appDataEntity.codeName.toLowerCase()]}`;
+                requestUrl += `/${appDataEntity.deapicodeName2}/printdata/${resultContext[appDataEntity.codeName.toLowerCase()]}`;
             }
             else {
                 throw new RuntimeError('没有找到数据主键');
@@ -114,9 +114,9 @@ export class FrontUIActionProvider extends UIActionProviderBase {
                 if (resultParams && resultParams.srfcontenttype) {
                     // 获取文件
                     const disposition = res.headers['content-disposition'];
-                    const filename = (_c = disposition
+                    const filename = (_b = disposition
                         .split(';')
-                        .find((str) => str.indexOf('filename=') !== -1)) === null || _c === void 0 ? void 0 : _c.slice(9);
+                        .find((str) => str.indexOf('filename=') !== -1)) === null || _b === void 0 ? void 0 : _b.slice(9);
                     const href = URL.createObjectURL(res.data);
                     const a = document.createElement('a');
                     a.href = href;
@@ -184,7 +184,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
      * @return {*}
      */
     async executeDataExport(action, args) {
-        var _a, _b;
+        var _a;
         // 处理参数
         const { resultParams } = await this.handleParams(action, args.context, args.data, args.params);
         const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId, action.appId);
@@ -193,7 +193,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
         });
         if (appDEDataExport) {
             // TODO 临时写死fetchdefault，应该从appDEDataExport的主表格上获取加载行为，但现在缺主表格模型，后续优化
-            const url = `/${(_b = appDataEntity.codeName2) === null || _b === void 0 ? void 0 : _b.toLowerCase()}/exportdata/fetchdefault?srfexporttag=${appDEDataExport.codeName}`;
+            const url = `/${appDataEntity.deapicodeName2}/exportdata/fetchdefault?srfexporttag=${appDEDataExport.codeName}`;
             //  参数
             const params = Object.assign(Object.assign({ page: 0, size: appDEDataExport.maxRowCount ? appDEDataExport.maxRowCount : 1000 }, args.params), resultParams);
             const res = await ibiz.net.request(url, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.6.5",
+  "version": "0.6.8",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@ibiz-template/core": "^0.6.3",
-    "@ibiz/model-core": "^0.1.14",
+    "@ibiz/model-core": "^0.1.15",
     "@types/animejs": "^3.1.12",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
@@ -54,7 +54,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.6.0",
-    "@ibiz/model-core": "^0.1.14",
+    "@ibiz/model-core": "^0.1.15",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -65,6 +65,5 @@
     "qs": "^6.11.0",
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
-  },
-  "gitHead": "cce7f66fe82ec7d7e111deef965c619b0cc0a16b"
+  }
 }