tanghc 3 年之前
父節點
當前提交
c0a21b4c67

+ 11 - 0
changelog.md

@@ -0,0 +1,11 @@
+# changelog
+
+## 1.0.0
+
+- 重构前端页面,采用elementUI
+- 优化了生成步骤
+- 优化了模板编辑页面
+
+## 1.0.1
+
+- 新增复制代码功能

+ 2 - 1
front/package.json

@@ -26,7 +26,8 @@
     "vue": "2.6.10",
     "vue-codemirror": "^4.0.6",
     "vue-router": "3.0.6",
-    "vuex": "3.1.0"
+    "vuex": "3.1.0",
+    "clipboard": "^2.0.6"
   },
   "devDependencies": {
     "@babel/core": "7.0.0",

+ 15 - 1
front/src/utils/global.js

@@ -3,6 +3,7 @@
  */
 import Vue from 'vue'
 import axios from 'axios'
+import ClipboardJS from 'clipboard'
 
 // 创建axios实例
 const client = axios.create({
@@ -97,5 +98,18 @@ Object.assign(Vue.prototype, {
   },
   headCellStyleSmall: function() {
     return { padding: '5px 0' }
-  }
+  },
+  initCopy: function() {
+    const _this = this
+    const clipboard = new ClipboardJS('.copyBtn')
+    clipboard.on('success', function() {
+      _this.tip('复制成功')
+    })
+    this.clipboard = clipboard
+  },
+  cleanCopy: function() {
+    if (this.clipboard) {
+      this.clipboard.destroy()
+    }
+  },
 })

+ 9 - 0
front/src/views/generate/result.vue

@@ -27,6 +27,11 @@
           />
         </el-aside>
         <el-main>
+          <el-button
+            v-show="content.length > 0"
+            type="text"
+            :data-clipboard-text="content"
+            class="copyBtn">复制代码</el-button>
           <codemirror
             v-model="content"
             :options="cmOptions"
@@ -90,6 +95,10 @@ export default {
       this.clientParam = JSON.parse(config)
       this.onGenerate()
     }
+    this.initCopy()
+  },
+  destroyed() {
+    this.cleanCopy()
   },
   methods: {
     onGenerate() {

+ 1 - 1
gen/pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.gitee.codegen</groupId>
     <artifactId>gen</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <description>一款代码生成器</description>
 
     <properties>

File diff suppressed because it is too large
+ 1 - 1
gen/src/main/resources/public/index.html


File diff suppressed because it is too large
+ 1 - 0
gen/src/main/resources/public/static/js/app.e9bd04e0.js


File diff suppressed because it is too large
+ 1 - 0
gen/src/main/resources/public/static/js/chunk-2d0efd67.32ec87ab.js


File diff suppressed because it is too large
+ 60 - 0
gen/src/main/resources/public/static/js/chunk-libs.3c441178.js


+ 1 - 1
pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.giee.codegen</groupId>
     <artifactId>code-gen</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>

+ 1 - 1
readme.md

@@ -32,7 +32,7 @@ Mac/Linux系统可直接执行`build.sh`进行构建,构建结果在build文
 - 手动构建:
 
     -  在工程根目录执行`mvn clean package`,在code-gen/gen/target下会生成一个`gen-xx-SNAPSHOT.jar`(xx表示本号)
-    - 将`gen-1.0.0-SNAPSHOT.jar`和db下的`gen.db`放在同一个文件夹下
+    - 将`gen-1.0.1-SNAPSHOT.jar`和db下的`gen.db`放在同一个文件夹下
     - 执行`java -jar gen-xx-SNAPSHOT.jar`
     - 浏览器访问`http://localhost:6969/`
 

+ 2 - 2
script/shutdown.sh

@@ -1,5 +1,5 @@
-echo "Stopping gen-1.0.0-SNAPSHOT.jar"
-pid=`ps -ef | grep gen-1.0.0-SNAPSHOT.jar | grep -v grep | awk '{print $2}'`
+echo "Stopping gen-1.0.1-SNAPSHOT.jar"
+pid=`ps -ef | grep gen-1.0.1-SNAPSHOT.jar | grep -v grep | awk '{print $2}'`
 if [ -n "$pid" ]
 then
    echo "kill -9 的id:" $pid

+ 3 - 3
script/startup.sh

@@ -1,9 +1,9 @@
-echo "Stopping gen-1.0.0-SNAPSHOT.jar"
-pid=`ps -ef | grep gen-1.0.0-SNAPSHOT.jar | grep -v grep | awk '{print $2}'`
+echo "Stopping gen-1.0.1-SNAPSHOT.jar"
+pid=`ps -ef | grep gen-1.0.1-SNAPSHOT.jar | grep -v grep | awk '{print $2}'`
 if [ -n "$pid" ]
 then
    echo "kill -9 的id:" $pid
    kill -9 $pid
 fi
-nohup java -jar -Xms128m -Xmx128m gen-1.0.0-SNAPSHOT.jar &
+nohup java -jar -Xms128m -Xmx128m gen-1.0.1-SNAPSHOT.jar &