表和字段属性key全小写，准备兼容PostgreSQL；加宽本地保存测试的选项

TommyLemon · TommyLemon · commit 05c864cceb8e · 2019-02-17T18:30:43.000+08:00
diff --git a/apijson/CodeUtil.js b/apijson/CodeUtil.js
@@ -502,7 +502,7 @@ var CodeUtil = {
 
         //Table
         table = item == null ? null : item.Table;
-        model = CodeUtil.getModelName(table == null ? null : table.TABLE_NAME);
+        model = CodeUtil.getModelName(table == null ? null : table.table_name);
         if (model != clazz) {
           continue;
         }
@@ -515,7 +515,7 @@ var CodeUtil = {
           + '\n\n&#20351;&#29992;&#26041;&#27861;\n1.&#20462;&#25913;&#21253;&#21517;package \n2.import&#38656;&#35201;&#24341;&#20837;&#30340;&#31867;&#65292;&#21487;&#20351;&#29992;&#24555;&#25463;&#38190;Ctrl+Shift+O '
           + '\n*/\n'
           + '\npackage apijson.demo.server.model;\n\n\n'
-          + CodeUtil.getComment(table.TABLE_COMMENT, true)
+          + CodeUtil.getComment(table.table_comment, true)
           + '\n@MethodAccess'
           + '\npublic class ' + model + ' implements Serializable {'
           + '\n  private static final long serialVersionUID = 1L;\n';
@@ -532,16 +532,16 @@ var CodeUtil = {
           for (var j = 0; j < columnList.length; j++) {
             column = columnList[j];
 
-            name = CodeUtil.getFieldName(column == null ? null : column.COLUMN_NAME);
+            name = CodeUtil.getFieldName(column == null ? null : column.column_name);
             if (name == '') {
               continue;
             }
-            type = name == 'id' ? 'Long' : CodeUtil.getJavaType(column.COLUMN_TYPE, false);
+            type = name == 'id' ? 'Long' : CodeUtil.getJavaType(column.column_type, false);
 
 
             console.log('parseJavaBean [] for j=' + j + ': column = \n' + format(JSON.stringify(column)));
 
-            doc += '\n  private ' + type + ' ' + name + '; ' + CodeUtil.getComment(column.COLUMN_COMMENT, false);
+            doc += '\n  private ' + type + ' ' + name + '; ' + CodeUtil.getComment(column.column_comment, false);
 
           }
 
@@ -559,11 +559,11 @@ var CodeUtil = {
           for (var j = 0; j < columnList.length; j++) {
             column = columnList[j];
 
-            name = CodeUtil.getFieldName(column == null ? null : column.COLUMN_NAME);
+            name = CodeUtil.getFieldName(column == null ? null : column.column_name);
             if (name == '') {
               continue;
             }
-            type = name == 'id' ? 'Long' : CodeUtil.getJavaType(column.COLUMN_TYPE);
+            type = name == 'id' ? 'Long' : CodeUtil.getJavaType(column.column_type);
 
             console.log('parseJavaBean [] for j=' + j + ': column = \n' + format(JSON.stringify(column)));
 
@@ -1038,13 +1038,13 @@ var CodeUtil = {
 
       //Table
       table = item == null ? null : item.Table;
-      if (table == null || tableName != CodeUtil.getModelName(table.TABLE_NAME)) {
+      if (table == null || tableName != CodeUtil.getModelName(table.table_name)) {
         continue;
       }
       log('getDoc [] for i=' + i + ': table = \n' + format(JSON.stringify(table)));
 
       if (StringUtil.isEmpty(columnName)) {
-        return table.TABLE_COMMENT;
+        return table.table_comment;
       }
 
 
@@ -1155,15 +1155,15 @@ var CodeUtil = {
       var name;
       for (var j = 0; j < columnList.length; j++) {
         column = columnList[j];
-        name = column == null ? null : column.COLUMN_NAME;
+        name = column == null ? null : column.column_name;
         if (name == null || key != name) {
           continue;
         }
 
         var p = (at.length <= 0 ? '' : at + ' < ')
           + (fun.length <= 0 ? '' : fun + ' < ')
           + (logic.length <= 0 ? '' : logic + ' < ');
-        return (p.length <= 0 ? '' : p + key + ': ') + CodeUtil.getJavaType(column.COLUMN_TYPE, true) + ', ' + column.COLUMN_COMMENT;
+        return (p.length <= 0 ? '' : p + key + ': ') + CodeUtil.getJavaType(column.column_type, true) + ', ' + column.column_comment;
       }
 
       break;
diff --git a/index.html b/index.html
@@ -207,7 +207,7 @@
                     <use xlink:href="svg/icon.svg#record"></use>
                   </svg>
                 </a>
-                <ul class="historys pop">
+                <ul class="historys pop" style="width: 240px">
                   <li v-for="(his, index) in historys">
                     <a href="javascript:void(0)" @click="restore(his)"  > {{his.name}}</a>
 
diff --git a/js/main.js b/js/main.js
@@ -1424,18 +1424,18 @@
           '[]': {
             'count': 0,
             'Table': {
-              'TABLE_SCHEMA': App.schema,
-              'TABLE_TYPE': 'BASE TABLE',
-              'TABLE_NAME!$': ['\\_%', 'sys\\_%', 'system\\_%'],
-              '@order': 'TABLE_NAME+',
-              '@column': 'TABLE_NAME,TABLE_COMMENT'
+              'table_schema': App.schema,
+              'table_type': 'BASE TABLE',
+              'table_name!$': ['\\_%', 'sys\\_%', 'system\\_%'],
+              '@order': 'table_name+',
+              '@column': 'table_name,table_comment'
             },
             'Column[]': {
               'count': 0,
               'Column': {
-                'TABLE_SCHEMA': App.schema,
-                'TABLE_NAME@': '[]/Table/TABLE_NAME',
-                '@column': 'COLUMN_NAME,COLUMN_TYPE,COLUMN_COMMENT'
+                'table_schema': App.schema,
+                'table_name@': '[]/Table/table_name',
+                '@column': 'column_name,column_type,column_comment'
               }
             }
           },
@@ -1497,7 +1497,7 @@
               log('getDoc [] for i=' + i + ': table = \n' + format(JSON.stringify(table)));
 
 
-              doc += '### ' + (i + 1) + '. ' + CodeUtil.getModelName(table.TABLE_NAME) + '\n#### &#35828;&#26126;: \n' + App.toMD(table.TABLE_COMMENT);
+              doc += '### ' + (i + 1) + '. ' + CodeUtil.getModelName(table.table_name) + '\n#### &#35828;&#26126;: \n' + App.toMD(table.table_comment);
 
               //Column[]
               doc += '\n\n#### &#23383;&#27573;: \n &#21517;&#31216;  |  &#31867;&#22411;  |  &#26368;&#22823;&#38271;&#24230;  |  &#35814;&#32454;&#35828;&#26126;' +
@@ -1514,16 +1514,16 @@
               var length;
               for (var j = 0; j < columnList.length; j++) {
                 column = columnList[j];
-                name = column == null ? null : column.COLUMN_NAME;
+                name = column == null ? null : column.column_name;
                 if (name == null) {
                   continue;
                 }
-                type = CodeUtil.getJavaType(column.COLUMN_TYPE, false);
-                length = CodeUtil.getMaxLength(column.COLUMN_TYPE);
+                type = CodeUtil.getJavaType(column.column_type, false);
+                length = CodeUtil.getMaxLength(column.column_type);
 
                 log('getDoc [] for j=' + j + ': column = \n' + format(JSON.stringify(column)));
 
-                doc += '\n' + name + '  |  ' + type + '  |  ' + length + '  |  ' + App.toMD(column.COLUMN_COMMENT);
+                doc += '\n' + name + '  |  ' + type + '  |  ' + length + '  |  ' + App.toMD(column.column_comment);
 
               }
 
