fix

govue/govue-runtime/header.js

@@ -4,7 +4,7 @@ var Promise;
 var GoUseCallback;
 var GoUse = function (cb) {
     GoUseCallback = "with(this){(" + cb.toString() + ")()}";
-}
+};
 var net = {
     request: function (c) {
         var url = c["url"];
@@ -129,22 +129,49 @@ var axiosUse = function (ctx) {
 var GetGoVueTemplate = function (raw) {
     var tagStart = "<!--gv-start-->";
     var tagEnd = "<!--gv-end-->";
-    var start = raw.indexOf(tagStart)
+    var start = raw.indexOf(tagStart);
     if (start < 0) {
         return
     }
-    var end = raw.indexOf(tagEnd)
+    var end = raw.indexOf(tagEnd);
     if (end < 0) {
-        throw "注释未闭合"
+        throw "注释未闭合";
         return
     }
     var content = raw.substring(start + tagStart.length, end);
     var template = raw.substring(0, start) + "<!--vue-ssr-outlet-->\n{{{GoVueTemplate}}}\n{{{GoVueData}}}" + raw.substr(end + tagEnd.length);
+
+
+
     return {
         template: template,
         content: content,
     }
-}
+};
+
+
+var GetGoVueTemplateInlineJs = function (raw) {
+    var tagStart = "<!--gv-js-start-->";
+    var tagEnd = "<!--gv-js-end-->";
+    var start = raw.indexOf(tagStart);
+    if (start < 0) {
+        return
+    }
+    var end = raw.indexOf(tagEnd);
+    if (end < 0) {
+        throw "js注释未闭合";
+        return
+    }
+    var content = raw.substring(start + tagStart.length, end);
+    var template = raw.substring(0, start) + "<!--gv-js-outlet-->" + raw.substr(end + tagEnd.length);
+
+
+
+    return {
+        template: template,
+        content: content,
+    }
+};
 
 
 var GetGoVueJsCode = function (htmlparser2, raw) {

govue/govue-runtime/runtime.js

@@ -1,20 +1,24 @@
 GV.init(function (_require) {
     new (function () {
         this.require = _require;
-        this.Vue = _require('Vue');
+        var Vue = this.Vue = _require('Vue');
+
         this.VueRouter = _require('vue-router');
-        this.Vue.use(this.VueRouter)
+        this.Vue.use(this.VueRouter);
         this.axios = _require('axios');
         var htmlparser2 = _require('htmlparser2');
         axiosUse(this);
         this.qs = _require('qs');
         this.GoVueMount = function (app, context) {
-            var ctx = GetGoVueTemplate(GoHtmlSrc)
+            var ctx = GetGoVueTemplate(GoHtmlSrc);
+            var cleanInlineJsCtx = GetGoVueTemplateInlineJs(ctx.template);
+
             app.$options.template = ctx.content;
+
             // console.log(ctx.template)
             var renderer = _require('vue-server-renderer').createRenderer({
-                template: ctx.template
-            })
+                template: cleanInlineJsCtx.template
+            });
 
             if (!context) {
                 context = {}
@@ -23,8 +27,10 @@ GV.init(function (_require) {
             context.GoVueData = "<go-vue-data style='display: none'>" + Base64Encode(encodeURIComponent(JSON.stringify(app.$data))) + "</go-vue-data>"
             renderer.renderToString(app, context, function (err, html) {
                 if (err) {
+                    Vue.options = {};
                     throw err
                 } else {
+                    html = html.replace("<!--gv-js-outlet-->",cleanInlineJsCtx.content);
                     GoReturn(html);
                 }
             })
@@ -37,7 +43,8 @@ GV.init(function (_require) {
             GoSetError(JSON.stringify({
                 code: GoUseCallback,
                 error: e.toString(),
-            }))
+            }));
+            Vue.options = {};
             throw e
         }
 
@@ -52,9 +59,13 @@ GV.init(function (_require) {
                 GoSetError(JSON.stringify({
                     code: "with(this){\n" + codes[i] + "\n}",
                     error: e.toString(),
-                }))
+                }));
+                Vue.options = {};
                 throw e
             }
         }
+
+        Vue.options = {};
+
     })()
 })

govue/govue.go

@@ -71,6 +71,10 @@ func (gv *GoVue) initRender(debug bool) (err error) {
 	if err != nil {
 		return
 	}
+	//headerScript, err := ioutil.ReadFile(filepath.Join("govue", "govue-runtime", "header.js"))
+	//if err != nil {
+	//	return
+	//}
 
 	polyfill, err := gv.Resources.Asset(filepath.Join("govue-runtime", "polyfill.js"))
 	if err != nil {
@@ -81,6 +85,10 @@ func (gv *GoVue) initRender(debug bool) (err error) {
 	if err != nil {
 		return
 	}
+	//mainScript, err := ioutil.ReadFile(filepath.Join("govue", "govue-runtime", "runtime.js"))
+	//if err != nil {
+	//	return
+	//}
 
 	govueScriptFile := "govue.js"
 	govueScript, err := gv.Resources.Asset(filepath.Join("govue-runtime", govueScriptFile))

static/index.html

@@ -63,18 +63,21 @@
 </div>
 </div>
 <!--gv-end-->
-<script gv-src>
 
 
+<!--gv-js-start-->
+<script gv-src>
+    // 代码中使用component时必须被 gv-js-star|gv-js-end 注释包裹 , 如果使用<script gv-src src="...index.js">的方式 则不需要
+
     Vue.component('govue-title', {
-        props:["govue_title"],
+        props: ["govue_title"],
         template: '<h1 id="title">{{govue_title}}</h1>'
     });
 
     if (isBrowser) {
-
         GoHtmlSrc = ""
     }
+
     var app = new Vue({
         data: {
             title: "govue",
@@ -99,8 +102,10 @@
 
     GoVueMount(app, {
         title: "govue-基础golang开发的一套vue服务端渲染方案",
-        govue_title: "",//使用的组件,data返回的数据需要全部在context中指定,原因未知
     }, "#app")
+
 </script>
+<!--gv-js-end-->
+
 </body>
 </html>