fix: render client locals merge

app/extend/context.js

@@ -4,7 +4,7 @@ module.exports = {
     return this.renderVueClient(name, locals, options);
   },
   renderVueClient(name, locals, options = {}) {
-    locals = this.app.vue.normalizeLocals(this, locals);
+    locals = this.app.vue.normalizeLocals(this, locals, options, false);
     return this.app.vue.renderClient(name, locals, options).then(html => {
       this.body = html;
     });

lib/engine.js

@@ -43,16 +43,26 @@ class Engine {
     return this[VUE_RESOURCE];
   }
 
-  normalizeLocals(ctx, locals = {}, options = {}) {
+  normalizeLocals(ctx, locals = {}, options = {}, engine = true) {
+    // egg-view engine mode, the locals had merged
+    if (engine) {
+      if (this.config.mergeLocals) {
+        return this.setCSRFLocals(ctx, locals);
+      }
+    }
+    // source locals, no merge locals
+    const sourceLocals = options && options.locals ? options.locals : locals;
     // default locals and data merge;
     if (this.config.mergeLocals) {
-      [ 'ctx', 'request', 'helper' ].forEach(key => {
-        Object.defineProperty(locals, key, { enumerable: false });
-      });
-      return this.setCSRFLocals(ctx, locals);
+      locals = Object.assign({}, { ctx, request: ctx.request, helper: ctx.helper }, ctx.locals, sourceLocals);
+    } else {
+      locals = Object.assign({}, { ctx, request: ctx.request, helper: ctx.helper }, sourceLocals);
     }
+    [ 'ctx', 'request', 'helper' ].forEach(key => {
+      Object.defineProperty(locals, key, { enumerable: false });
+    });
     // only data
-    return this.setCSRFLocals(ctx, options && options.locals || {});
+    return this.setCSRFLocals(ctx, locals);
   }
 
   setCSRFLocals(ctx, locals) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "egg-view-vue-ssr",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "vue server side render solution for egg",
   "eggPlugin": {
     "name": "vuessr"