From 71ac321f2cbfd55b6747f5630a81e406b4a1715d Mon Sep 17 00:00:00 2001
From: zhouhao <zh.sqy@qq.com>
Date: Thu, 1 Dec 2016 14:57:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8=E8=A1=A8=E7=BB=93=E6=9E=84=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/system-dev/generator/code-generator.ftl  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/hsweb-platform-ui-miniui/src/main/resources/templates/admin/system-dev/generator/code-generator.ftl b/hsweb-platform-ui-miniui/src/main/resources/templates/admin/system-dev/generator/code-generator.ftl
index 523f3e6..7f19a3b 100644
--- a/hsweb-platform-ui-miniui/src/main/resources/templates/admin/system-dev/generator/code-generator.ftl
+++ b/hsweb-platform-ui-miniui/src/main/resources/templates/admin/system-dev/generator/code-generator.ftl
@@ -143,7 +143,7 @@
 <div id="dbMetaWin" title="选择表" class="mini-window" style="width: 600px;" showFooter="true">
     数据源: <input id="datasource" style="width: 20%" class="mini-combobox" emptyText="默认数据源" nullItemText="默认数据源"
                 onvaluechanged="changeDatasource" textField="name" showNullItem="true"
-                 url="<@global.api "datasource?paging=false&includes=id,name"/>"/>
+                url="<@global.api "datasource?paging=false&includes=id,name"/>"/>
     表:<input class="mini-combobox" style="width: 60%" id="dbList" allowInput="true"><br>
     <div property="footer" style="text-align:right;padding: 5px 15px 5px 5px;">
         <input type='button' value="确定" onclick="chooseDbMeta()" style='vertical-align:middle;'/>
@@ -406,7 +406,7 @@
         });
     }
 
-    changeDatasource({selected:{id:""}});
+    changeDatasource({selected: {id: ""}});
     function changeDatasource(e) {
         var id = "";
         if (e.selected)
@@ -430,12 +430,12 @@
             var meta = dbMeta[tName];
             if (meta) {
                 var fields = [];
-                $(meta.fields).each(function () {
+                $(meta.columns).each(function () {
                     var data = mini.clone(this);
                     if (data.name == 'u_id') {
-                        fields.push({column: data.name, property: "id", comment: data.comment, dataType: data.dataType});
+                        fields.push({column: data.name, property: "id", comment: data.comment, javaType: data.javaType, jdbcType: data.jdbcType, dataType: data.dataType});
                     } else
-                        fields.push({column: data.name, comment: data.comment, dataType: data.dataType});
+                        fields.push({column: data.name, comment: data.comment, javaType: data.javaType, jdbcType: data.jdbcType, dataType: data.dataType});
                 });
                 tableMetaGrid.setData(fields);
                 var varData = varsGrid.getData();
@@ -528,7 +528,7 @@
     }
 
     function initAbsPath(parent, children, each) {
-        if (!parent.absPath)parent.absPath = "/";
+        if (!parent.absPath) parent.absPath = "/";
         if (children)
             $(children).each(function () {
                 this.parentPath = parent.absPath;
@@ -548,7 +548,7 @@
             var list = [];
             $(data).each(function () {
                 if (this.type == 'template') {
-                    if (!this.code)this.code = "";
+                    if (!this.code) this.code = "";
                     if (this.absPath.indexOf("/") == 0) {
                         this.absPath = this.absPath.substring(1, this.absPath.length);
                     }