@ibiz-template/runtime 0.1.13 → 0.1.14

package/out/controller/common/editor/editor.controller.d.ts

@@ -86,7 +86,7 @@ export declare class EditorController<T extends IEditor = IEditor> implements IE
      * @Date: 2022-08-25 15:44:14
      */
     handlePublicParams(data: IData, context: IContext, params: IParams): {
-        context: IData;
+        context: IContext;
         params: IParams;
     };
     /**

package/out/controller/common/editor/editor.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/editor/editor.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAA2B,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EAClB,MAAM,+BAA+B,CAAC;AAEvC;;;;;;;GAOG;AACH,qBAAa,gBAAgB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CACvD,YAAW,iBAAiB;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAG,QAAQ,CAAC;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAG,OAAO,CAAC;IAE1B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,0BAA0B,CAAC;IAE5C;;;;;OAKG;IACI,WAAW,SAAM;IAExB;;;;;OAKG;IACI,YAAY,EAAE,KAAK,CAAM;IAEhC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,0BAA0B;IAOxD;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvC;;;;;;OAMG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,KAAK,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IActC;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS;IASjD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;CAGlC"}
+{"version":3,"file":"editor.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/editor/editor.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAA2B,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EAClB,MAAM,+BAA+B,CAAC;AAEvC;;;;;;;GAOG;AACH,qBAAa,gBAAgB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CACvD,YAAW,iBAAiB;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAG,QAAQ,CAAC;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAG,OAAO,CAAC;IAE1B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,0BAA0B,CAAC;IAE5C;;;;;OAKG;IACI,WAAW,SAAM;IAExB;;;;;OAKG;IACI,YAAY,EAAE,KAAK,CAAM;IAEhC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,0BAA0B;IAOxD;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvC;;;;;;OAMG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAiBzC;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS;IASjD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;CAGlC"}

package/out/controller/common/editor/editor.controller.js

@@ -79,11 +79,13 @@ export class EditorController {
         if (navigateContexts && data) {
             selfContext = convertNavData(navigateContexts, context, params, data);
         }
+        const _context = Object.assign(context.clone(), selfContext);
         let selfParams = {};
         if (navigateParams && data) {
             selfParams = convertNavData(navigateParams, context, params, data);
         }
-        return { context: selfContext, params: selfParams };
+        const _params = Object.assign(Object.assign({}, params), selfParams);
+        return { context: _context, params: _params };
     }
     /**
      * 字符串转对象、数组对象

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

@@ -60,16 +60,16 @@ export class Method {
             let res = null;
             switch (requestMethod) {
                 case 'POST':
-                    res = await this.app.net.post(`${path}/${methodName}`, data);
+                    res = await this.app.net.post(`${path}/${methodName}`, data, params);
                     break;
                 case 'GET':
-                    res = await this.app.net.get(`${path}/${methodName}`, params);
+                    res = await this.app.net.get(`${path}/${methodName}`, data);
                     break;
                 case 'PUT':
-                    res = await this.app.net.put(`${path}/${methodName}`, data);
+                    res = await this.app.net.put(`${path}/${methodName}`, data, params);
                     break;
                 case 'DELETE':
-                    res = await this.app.net.delete(`${path}/${methodName}`, params);
+                    res = await this.app.net.delete(`${path}/${methodName}`, data);
                     break;
                 default:
                     if (requestMethod) {

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

@@ -1 +1 @@
-{"version":3,"file":"backend-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/backend-ui-action-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,uBAAwB,SAAQ,oBAAoB;IACzD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAmE5B"}
+{"version":3,"file":"backend-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/backend-ui-action-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,uBAAwB,SAAQ,oBAAoB;IACzD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAoE5B"}

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

@@ -22,6 +22,7 @@ export class BackendUIActionProvider extends UIActionProviderBase {
         }
         // 处理参数
         const { resultContext, resultParams, resultData } = await this.handleParams(action, context, data, params);
+        const tempParams = Object.assign(Object.assign({}, params), resultParams);
         // 如果有打开视图，打开视图，并把返回的数据作为子实体数据
         const frontPSAppView = action.frontAppViewId;
         if (frontPSAppView) {
@@ -43,7 +44,7 @@ export class BackendUIActionProvider extends UIActionProviderBase {
         const app = ibiz.hub.getApp(context === null || context === void 0 ? void 0 : context.srfappid);
         const _data = resultData.map(item => { var _a; return ((_a = item.getOrigin) === null || _a === void 0 ? void 0 : _a.call(item)) || item || {}; });
         const isMultiData = ['MULTIKEY', 'MULTIDATA'].includes(action.actionTarget);
-        const res = await app.deService.exec(entityName, methodName, resultContext, isMultiData ? _data : _data[0], resultParams);
+        const res = await app.deService.exec(entityName, methodName, resultContext, isMultiData ? _data : _data[0], tempParams);
         // 适配界面行为成功提示信息
         if (res.ok && action.successMsg) {
             ibiz.message.success(action.successMsg);
@@ -51,7 +52,7 @@ export class BackendUIActionProvider extends UIActionProviderBase {
         Object.assign(actionResult, {
             data: isArray(res.data) ? res.data : [res.data],
             nextContext: resultContext,
-            nextParams: resultParams,
+            nextParams: tempParams,
         });
         return actionResult;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.13",
+    "@ibiz-template/core": "^0.1.14",
     "@ibiz/model-core": "^0.0.15",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.7",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "609d58f98989f485823ff7be7ecedf4956d7fad2"
+  "gitHead": "ea26f98a8968882f3097e022ccbe3b99e21f1ef6"
 }

package/src/controller/common/editor/editor.controller.ts

@@ -126,18 +126,21 @@ export class EditorController<T extends IEditor = IEditor>
     data: IData,
     context: IContext,
     params: IParams,
-  ): { context: IData; params: IParams } {
+  ): { context: IContext; params: IParams } {
     const { navigateContexts, navigateParams } = this
       .model as INavigateParamContainer;
     let selfContext = {};
     if (navigateContexts && data) {
       selfContext = convertNavData(navigateContexts!, context, params, data);
     }
+    const _context = Object.assign(context.clone(), selfContext);
+
     let selfParams = {};
     if (navigateParams && data) {
       selfParams = convertNavData(navigateParams!, context, params, data);
     }
-    return { context: selfContext, params: selfParams };
+    const _params: IParams = { ...params, ...selfParams };
+    return { context: _context, params: _params };
   }
 
   /**

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

@@ -121,16 +121,16 @@ export abstract class Method {
       let res: HttpResponse | null = null;
       switch (requestMethod) {
         case 'POST':
-          res = await this.app.net.post(`${path}/${methodName}`, data);
+          res = await this.app.net.post(`${path}/${methodName}`, data, params);
           break;
         case 'GET':
-          res = await this.app.net.get(`${path}/${methodName}`, params);
+          res = await this.app.net.get(`${path}/${methodName}`, data);
           break;
         case 'PUT':
-          res = await this.app.net.put(`${path}/${methodName}`, data);
+          res = await this.app.net.put(`${path}/${methodName}`, data, params);
           break;
         case 'DELETE':
-          res = await this.app.net.delete(`${path}/${methodName}`, params);
+          res = await this.app.net.delete(`${path}/${methodName}`, data);
           break;
         default:
           if (requestMethod) {

package/src/ui-action/provider/backend-ui-action-provider.ts

@@ -33,6 +33,7 @@ export class BackendUIActionProvider extends UIActionProviderBase {
       data,
       params,
     );
+    const tempParams = { ...params, ...resultParams };
 
     // 如果有打开视图，打开视图，并把返回的数据作为子实体数据
     const frontPSAppView = action.frontAppViewId;
@@ -70,7 +71,7 @@ export class BackendUIActionProvider extends UIActionProviderBase {
       methodName,
       resultContext,
       isMultiData ? _data : _data[0],
-      resultParams,
+      tempParams,
     );
 
     // 适配界面行为成功提示信息
@@ -80,7 +81,7 @@ export class BackendUIActionProvider extends UIActionProviderBase {
     Object.assign(actionResult, {
       data: isArray(res.data) ? res.data : [res.data],
       nextContext: resultContext,
-      nextParams: resultParams,
+      nextParams: tempParams,
     });
 
     return actionResult;