new element-ui,bootstrap modules

README.md

@@ -6,7 +6,7 @@
 
 SpringBootCodeGenerator
 ----
-基于SpringBoot2+Freemarker的代码生成器，用DDL SQL语句生成JPA/JdbcTemplate/Mybatis/BeetlSQL相关代码，支持mysql/oracle/pgsql三大数据库。目前以JPA的为主，各大模板也在陆续优化。欢迎大家提交模板和交流想法！
+基于SpringBoot2+Freemarker的代码生成器，用DDL SQL语句生成JPA/JdbcTemplate/Mybatis/BeetlSQL相关代码，支持mysql/oracle/pgsql三大数据库。以释放双手为目的，各大模板也在陆续补充和优化。欢迎大家提交模板和交流想法！
 <br><br>
 另外，感谢bejson三叔将他部署在http://java.bejson.com/generator上，成为besjon专供工具。
 <br><br>
@@ -16,6 +16,7 @@ SpringBootCodeGenerator
 <tr><td>CSDN博客</td> <td>http://blog.csdn.net/moshowgame</td></tr>
 <tr><td></td> <td></td></tr>
 <tr><td>更新日期</td> <td>更新内容</td></tr>
+<tr><td>20181003<td>新增element-ui/bootstrap生成。</td></tr>
 <tr><td>20181002<td>修复公共CDN之Layer.js404问题，导致项目无法生成。</td></tr>
 <tr><td>20180927<td>优化COMMENT提取逻辑，支持多种复杂情况的注释（感谢@raodeming的反馈）。</td></tr>
 <tr><td>20180926<td>全新BeetlSQL模块，以及一些小细节优化（感谢@三叔同事的建议）。</td></tr>

generator-web/generator-web.iml

@@ -51,6 +51,10 @@
     <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:11.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:linux:11.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:mac:11.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:win:11.0.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.8.RELEASE" level="project" />

generator-web/src/main/java/com/softdev/system/generator/controller/IndexController.java

@@ -79,6 +79,9 @@ public class IndexController {
             result.put("beetlentity", freemarkerTool.processString("xxl-code-generator/beetlentity.ftl", params));
             result.put("beetlcontroller", freemarkerTool.processString("xxl-code-generator/beetlcontroller.ftl", params));
 
+            result.put("elementui", freemarkerTool.processString("xxl-code-generator/element-ui.ftl", params));
+            result.put("bootstrap", freemarkerTool.processString("xxl-code-generator/bootstrap.ftl", params));
+
             // 计算,生成代码行数
             int lineNum = 0;
             for (Map.Entry<String, String> item: result.entrySet()) {

generator-web/src/main/resources/static/js/index-new.js

@@ -159,5 +159,17 @@ $(function () {
             genCodeArea.setSize('auto', 'auto');
         }
     });
+    $('#bootstrap').click(function ()  {
+        if(!$.isEmptyObject(codeData)) {
+            genCodeArea.setValue(codeData.bootstrap);
+            genCodeArea.setSize('auto', 'auto');
+        }
+    });
+    $('#element-ui').click(function ()  {
+        if(!$.isEmptyObject(codeData)) {
+            genCodeArea.setValue(codeData.elementui);
+            genCodeArea.setSize('auto', 'auto');
+        }
+    });
 
 });

generator-web/src/main/resources/templates/index.ftl

@@ -30,7 +30,7 @@
 <div class="jumbotron">
     <div class="container">
         <h1>Spring Boot Code Generator!</h1>
-            基于<code>SpringBoot2</code>+<code>Freemarker</code>的代码生成器，用<code>DDL SQL</code>语句生成<code>JPA</code>/<code>JdbcTemplate</code>/<code>Mybatis</code>/<code>BeetlSQL</code>相关代码，支持<code>mysql</code>/<code>oracle</code>/<code>pgsql</code>三大数据库。目前以<code>JPA</code>的为主，各大模板也在陆续优化。欢迎大家提交模板和交流想法，如果发现有SQL语句不能识别，请<a href="https://github.com/moshowgame/SpringBootCodeGenerator/issues">留言</a>给我分析，谢谢！
+            基于<code>SpringBoot2</code>+<code>Freemarker</code>的代码生成器，用<code>DDL SQL</code>语句生成<code>JPA</code>/<code>JdbcTemplate</code>/<code>Mybatis</code>/<code>BeetlSQL</code>相关代码，支持<code>mysql</code>/<code>oracle</code>/<code>pgsql</code>三大数据库。以<code>释放双手</code>为目的，各大模板也在陆续补充和优化。欢迎大家多多提交模板和交流想法，如果发现有SQL语句不能识别，请<a href="https://github.com/moshowgame/SpringBootCodeGenerator/issues">留言</a>给我分析，谢谢！
         </p>
         <div class="input-group mb-3">
             <div class="input-group-prepend">
@@ -84,6 +84,17 @@ CREATE TABLE `userinfo` (
             </div>
             <div class="btn-group mr-2" role="group" aria-label="First group">
                 <button type="button" class="btn btn-default" id="swaggerui">swagger-ui</button>
+                <button type="button" class="btn btn-default" id="element-ui">element-ui</button>
+                <button type="button" class="btn btn-default" id="bootstrap">bootstrap</button>
+            </div>
+        </div>
+        <div class="btn-toolbar mb-3" role="toolbar" aria-label="Toolbar with button groups">
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <div class="input-group-text" id="btnGroupAddon">JPA</div>
+                </div>
+            </div>
+            <div class="btn-group mr-2" role="group" aria-label="First group">
                 <button type="button" class="btn btn-default" id="entity">entity</button>
                 <button type="button" class="btn btn-default" id="repository">repository</button>
                 <button type="button" class="btn btn-default" id="jpacontroller">controller</button>

generator-web/src/main/resources/templates/xxl-code-generator/bootstrap.ftl

@@ -0,0 +1,13 @@
+<form action="/${classInfo.className?uncap_first}/save">
+
+    <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+        <#list classInfo.fieldList as fieldItem >
+            <div class="form-group">
+                <label for="${fieldItem.fieldName}Label">${fieldItem.fieldComment}</label>
+                <input type="input" class="form-control" id="${fieldItem.fieldName}" name="${fieldItem.fieldName}}" placeholder="请输入${fieldItem.fieldComment}">
+            </div>
+        </#list>
+    </#if>
+
+    <button type="submit" class="btn btn-primary">保存</button>
+</form>

generator-web/src/main/resources/templates/xxl-code-generator/element-ui.ftl

@@ -0,0 +1,18 @@
+
+
+<el-form :inline="true" :model="submitData" class="demo-form-inline" :rules="rules" ref="ruleForm">
+    <el-card class="box-card">
+        <div slot="header" class="header clearfix">
+            <span>${classInfo.classComment}</span>
+            <el-button v-if="!ischeck && !isFind" class="fr" type="primary" @click="validate('ruleForm')">提交</el-button>
+            <el-button v-else class="fr" type="primary" @click="goBack">返回</el-button>
+        </div>
+        <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+            <#list classInfo.fieldList as fieldItem >
+             <el-form-item label="${fieldItem.fieldComment}" prop="${fieldItem.fieldName}">
+                 <el-input placeholder="${fieldItem.fieldComment}" v-model="submitData.${fieldItem.fieldName}"></el-input>
+             </el-form-item>
+            </#list>
+        </#if>
+    </el-card>
+</el-form>