Merge branch 'issue10_11' into dev

This commit is contained in:
pangwu86 2017-11-16 21:47:11 +08:00
commit 78f857aea8
4 changed files with 17 additions and 14 deletions

File diff suppressed because one or more lines are too long

View File

@ -8,10 +8,10 @@
<meta name="Keywords" content="Nutz,Nutz是什么,Nutz下载,Nutz社区, Java框架,JavaWeb,Aop,ORM,Dubbo,JDK8, JavaEE,tomcat,jetty"/>
<title>Hello, So NB!</title>
<link rel="icon" href="favicon.ico" type="image/vnd.microsoft.icon"/>
<link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
<script src="https://unpkg.com/jquery/dist/jquery.js"></script>
<script src="https://unpkg.com/vue/dist/vue.js"></script>
<script src="https://unpkg.com/element-ui/lib/index.js"></script>
<link rel="stylesheet" href="css/element-ui-chalk.css">
<script src="js/jquery.min.js"></script>
<script src="js/vue.min.js"></script>
<script src="js/element-ui-index.js"></script>
</head>
<body>
<div id="app">
@ -82,7 +82,7 @@
<el-form-item label="WeChat">
<el-switch v-model="nb.weixin.enable"></el-switch>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">立即创建</el-button>
</el-form-item>
@ -91,7 +91,7 @@
<!--配置清单-->
<el-col :span="16" :offset="4" v-show="making">
<el-form label-width="100px">
<el-input autosize type="textarea" v-model="nbJson"></el-input>
<el-input :autosize="nbTextArea" type="textarea" v-model="nbJson"></el-input>
</el-form>
<div style="margin-top: 20px"></div>
<!--<el-progress type="circle" :percentage="makper"-->
@ -104,7 +104,7 @@
</el-row>
<el-row v-if="activeMenu == 2">
<el-col :span="16" :offset="4">
有疑问? 来 <a href="https://nutz.cn">https://nutz.cn</> 就可以了
有疑问? 来 <a href="https://nutz.cn">https://nutz.cn</a> 就可以了
</el-col>
</el-row>
</el-main>
@ -121,6 +121,7 @@
makper: 0,
upload: false,
done: false,
nbTextArea: {minRows: 2, maxRows: 6},
versionOptions: [{
label: "2.0-SNAPSHOT",
value: "2.0-SNAPSHOT"
@ -149,14 +150,14 @@
username: "root",
password: "root"
},
redis : {
enable : false
redis: {
enable: false
},
quartz : {
enable : false
quartz: {
enable: false
},
weixin : {
enable : false
weixin: {
enable: false
}
},
nbJson: "",
@ -186,7 +187,7 @@
});
},
downloadNB: function () {
var durl = window.origin + this.nbUrl;
var durl = this.nbUrl;
console.log("DW: " + durl);
window.open(durl);
this.making = false;

File diff suppressed because one or more lines are too long