优化代码生成器

java110-generator/src/main/java/com/java110/code/web/GeneratorAddComponent.java

@@ -78,24 +78,24 @@ public class GeneratorAddComponent extends BaseGenerator {
 
                     String value = selectValues[valueIndex];
 
-                    option += "<option  value=\"" + value + "\">" + selectValueNames[valueIndex] + "</option>\n";
+                    option += "<option  value=\"" + value + "\"><span><vc:i18n name='" + selectValueNames[valueIndex] + "' namespace='add"+toUpperCaseFirstOne(data.getString("templateCode"))+"'></vc:i18n></span></option>\n";
 
                 }
 
                 inputStr = "<select class=\"custom-select\" v-model=\"add" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info." + column.getString("code") + "\">\n" +
-                        "         <option selected  disabled value=\"\">" + required + "，请选择" + column.getString("cnCode") + "</option>\n" +
+                        "         <option selected  disabled value=\"\"><span><vc:i18n name='" + required + "，请选择" + column.getString("cnCode") + "' namespace='add"+toUpperCaseFirstOne(data.getString("templateCode"))+"'></vc:i18n></span></option>\n" +
                         "         " + option +
                         "  </select>";
             } else if ("textarea".equals(column.getString("inputType"))) {
-                inputStr = "<textarea  placeholder=\"" + required + "，请填写" + column.getString("cnCode") + "\" class=\"form-control\"" +
+                inputStr = "<textarea  :placeholder=\"vc.i18n('" + required + "，请填写" + column.getString("cnCode") + "','add"+toUpperCaseFirstOne(data.getString("templateCode"))+"')\" class=\"form-control\"" +
                         " v-model=\"add" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info." + column.getString("code") + "\">" +
                         "</textarea>";
             } else {
                 inputStr = "           <input v-model=\"add" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info." + column.getString("code") + "\" " +
-                        "                  type=\"text\" placeholder=\"" + required + "，请填写" + column.getString("cnCode") + "\" class=\"form-control\">\n";
+                        "                  type=\"text\" :placeholder=\"vc.i18n('" + required + "，请填写" + column.getString("cnCode") + "','add"+toUpperCaseFirstOne(data.getString("templateCode"))+"')\" class=\"form-control\">\n";
             }
             thSb.append("<div class=\"form-group row\">\n" +
-                    "         <label class=\"col-sm-2 col-form-label\">" + column.getString("cnCode") + "</label>\n" +
+                    "         <label class=\"col-sm-2 col-form-label\"><span><vc:i18n name='" + column.getString("cnCode") + "' namespace='add"+toUpperCaseFirstOne(data.getString("templateCode"))+"'></vc:i18n></span></label>\n" +
                     "         <div class=\"col-sm-10\">\n" +
                     inputStr +
                     "         </div>\n" +

java110-generator/src/main/java/com/java110/code/web/GeneratorChooseComponent.java

@@ -40,18 +40,18 @@ public class GeneratorChooseComponent extends BaseGenerator {
 
         StringBuffer thSb = new StringBuffer();
         StringBuffer tdSb = new StringBuffer();
-        thSb.append("                            <th class=\"text-center\">" + data.getString("templateKeyName") + "</th>\n");
+        thSb.append("                            <th class=\"text-center\"><span><vc:i18n='" + data.getString("templateKeyName") + "' namespace='choose"+data.getString("templateCode")+"'></vc:i18n><span></th>\n");
 
         tdSb.append("                            <td class=\"text-center\">{{" + data.getString("templateCode") + "." + data.getString("templateKey") + "}}</td>\n");
 
         JSONArray columns = data.getJSONArray("columns");
         for (int columnIndex = 0; columnIndex < columns.size(); columnIndex++) {
             JSONObject column = columns.getJSONObject(columnIndex);
-            thSb.append("                            <th class=\"text-center\">" + column.getString("cnCode") + "</th>\n");
+            thSb.append("                            <th class=\"text-center\"><span><vc:i18n='" + column.getString("cnCode") + "' namespace='choose"+data.getString("templateCode")+"'></vc:i18n><span> </th>\n");
 
             tdSb.append("                            <td class=\"text-center\">{{" + data.getString("templateCode") + "." + column.getString("code") + "}}</td>\n");
         }
-        thSb.append("                            <th class=\"text-center\">操作</th>\n");
+        thSb.append("                            <th class=\"text-center\"><span><vc:i18n name='操作'></i18n></span></th>\n");
 
         fileContext = fileContext.replace("@@columnsCnCode@@", thSb.toString())
                 .replace("@@columnsName@@", tdSb.toString());

java110-generator/src/main/java/com/java110/code/web/GeneratorEditComponent.java

@@ -57,24 +57,23 @@ public class GeneratorEditComponent extends BaseGenerator {
 
                     String value = selectValues[valueIndex];
 
-                    option += "<option  value=\"" + value + "\">" + selectValueNames[valueIndex] + "</option>\n";
+                    option += "<option  value=\"" + value + "\"><span><vc:i18n name='" + selectValueNames[valueIndex] + "' namespace='edit"+toUpperCaseFirstOne(data.getString("templateCode"))+"'></vc:i18n></span> </option>\n";
 
                 }
 
                 inputStr = "<select class=\"custom-select\" v-model=\"edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info." + column.getString("code") + "\">\n" +
-                        "         <option selected  disabled value=\"\">" + required + "，请选择" + column.getString("cnCode") + "</option>\n" +
+                        "         <option selected  disabled value=\"\"> <span><vc:i18n name='" + required + "，请选择" + column.getString("cnCode") + "' namespace='edit"+toUpperCaseFirstOne(data.getString("templateCode"))+"'></vc:i18n></span></option>\n" +
                         "         " + option +
                         "  </select>";
             } else if ("textarea".equals(column.getString("inputType"))) {
-                inputStr = "<textarea  placeholder=\"" + required + "，请填写" + column.getString("cnCode") + "\" class=\"form-control\"" +
+                inputStr = "<textarea  :placeholder=\"vc.i18n('" + required + "，请填写" + column.getString("cnCode") + "','edit"+toUpperCaseFirstOne(data.getString("templateCode"))+"')\" class=\"form-control\"" +
                         " v-model=\"edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info." + column.getString("code") + "\">" +
                         "</textarea>";
             } else {
                 inputStr = "           <input v-model=\"edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info." + column.getString("code") + "\" " +
-                        "                  type=\"text\" placeholder=\"" + required + "，请填写" + column.getString("cnCode") + "\" class=\"form-control\">\n";
+                        "                  type=\"text\" :placeholder=\"vc.i18n('" + required + "，请填写" + column.getString("cnCode") + "','edit"+toUpperCaseFirstOne(data.getString("templateCode"))+"')\" class=\"form-control\">\n";
             }
-            thSb.append("<div class=\"form-group row\">\n" +
-                    "         <label class=\"col-sm-2 col-form-label\">" + column.getString("cnCode") + "</label>\n" +
+            thSb.append("<div class=\"form-group row\">\n<span><vc:i18n name='" + column.getString("cnCode") + "' namespace='edit"+toUpperCaseFirstOne(data.getString("templateCode"))+"'></vc:i18n></span> </label>\n" +
                     "         <div class=\"col-sm-10\">\n" +
                     inputStr +
                     "         </div>\n" +

java110-generator/src/main/java/com/java110/code/web/GeneratorManagerComponent.java

@@ -63,11 +63,11 @@ public class GeneratorManagerComponent extends BaseGenerator {
 
             if ("choose".equals(tmpCond.getString("inputType"))) {
                 conditionInput.append("                            <div class=\"form-group input-group\">\n" +
-                        "                                <input type=\"text\" placeholder=\"请选择" + tmpCond.getString("name") +
+                        "                                <input type=\"text\" :placeholder=\"vc.i18n('请选择" + tmpCond.getString("name")+"','"+data.getString("templateCode")+"Manage')" +
                         "\" v-model=\"" + data.getString("templateCode") + "ManageInfo.conditions." + tmpCond.getString("code") + "\" class=\" form-control\">\n" +
                         "                                <div class=\"input-group-prepend\">\n" +
                         "                                    <button type=\"button\" class=\"btn btn-primary btn-sm\" v-on:click=\"_open" + toUpperCaseFirstOne(tmpCond.getString("componentName")) + "Method()\"><i\n" +
-                        "                                            class=\"glyphicon glyphicon-search\"></i> 选择\n" +
+                        "                                            class=\"glyphicon glyphicon-search\"></i> <span><vc:i18n name=\"选择\"></vc:i18n></span>\n" +
                         "                                    </button>\n" +
                         "                                </div>\n" +
                         "                            </div>\n");
@@ -82,7 +82,7 @@ public class GeneratorManagerComponent extends BaseGenerator {
 
             } else if ("input".equals(tmpCond.getString("inputType"))) {
                 conditionInput.append("<div class=\"form-group\">\n" +
-                        "                                <input type=\"text\" placeholder=\"请输入" + tmpCond.getString("name") + "\" v-model=\"" + data.getString("templateCode") + "ManageInfo.conditions." + tmpCond.getString("code") + "\" class=\" form-control\">\n" +
+                        "                                <input type=\"text\" :placeholder=\"vc.i18n('请选择" + tmpCond.getString("name")+"','"+data.getString("templateCode")+"Manage')" + "\" v-model=\"" + data.getString("templateCode") + "ManageInfo.conditions." + tmpCond.getString("code") + "\" class=\" form-control\">\n" +
                         "                            </div>");
             } else if ("select".equals(tmpCond.getString("inputType"))){
 
@@ -94,13 +94,12 @@ public class GeneratorManagerComponent extends BaseGenerator {
                 for (int valueIndex = 0; valueIndex < selectValues.length; valueIndex++) {
 
                     String value = selectValues[valueIndex];
-
-                    option += "<option  value=\"" + value + "\">" + selectValueNames[valueIndex] + "</option>\n";
+                    option += "<option  value=\"" + value + "\"><span><vc:i18n name='" + selectValueNames[valueIndex] + "' namespace='"+data.getString("templateCode")+"Manage'></vc:i18n></span></option>\n";
 
                 }
 
                 conditionInput.append("<select class=\"custom-select\" v-model=\"" + data.getString("templateCode") + "ManageInfo.conditions." + tmpCond.getString("code") +"\">\n" +
-                        "         <option selected  value=\"\">请选择" + tmpCond.getString("name") + "</option>\n" +
+                        "         <option selected  value=\"\"><vc:i18n name='请选择" + tmpCond.getString("name")+"' namespace='"+data.getString("templateCode")+"Manage'></vc:i18n></span></option>\n" +
                         "         " +option+
                         "  </select>"
                 );
@@ -111,7 +110,7 @@ public class GeneratorManagerComponent extends BaseGenerator {
             if (condIndex == 2) {
                 conditionInput.append("<div class=\"col-sm-1\">\n" +
                         "                            <button type=\"button\" class=\"btn btn-primary btn-sm\" v-on:click=\"_query" + toUpperCaseFirstOne(data.getString("templateCode")) + "Method()\">\n" +
-                        "                                    <i class=\"glyphicon glyphicon-search\"></i> 查询\n" +
+                        "                                    <i class=\"glyphicon glyphicon-search\"></i> <span><vc:i18n name=\"查询\"></vc:i18n></span>\n" +
                         "                            </button>\n" +
                         "                        </div>");
             } else if (condIndex % 3 == 2) {
@@ -140,7 +139,7 @@ public class GeneratorManagerComponent extends BaseGenerator {
 
         StringBuffer thSb = new StringBuffer();
         StringBuffer tdSb = new StringBuffer();
-        thSb.append("                            <th class=\"text-center\">" + data.getString("templateKeyName") + "</th>\n");
+        thSb.append("                            <th class=\"text-center\"><span><vc:i18n='" + data.getString("templateKeyName") + "' namespace='"+data.getString("templateCode")+"Manage'></vc:i18n><span></th>\n");
 
         tdSb.append("                            <td class=\"text-center\">{{" + data.getString("templateCode") + "." + data.getString("templateKey") + "}}</td>\n");
 
@@ -148,16 +147,16 @@ public class GeneratorManagerComponent extends BaseGenerator {
         for (int columnIndex = 0; columnIndex < columns.size(); columnIndex++) {
             JSONObject column = columns.getJSONObject(columnIndex);
             if (column.getBoolean("show")) {
-                thSb.append("                            <th class=\"text-center\">" + column.getString("cnCode") + "</th>\n");
+                thSb.append("                            <th class=\"text-center\"><span><vc:i18n='" + column.getString("cnCode") + "' namespace='"+data.getString("templateCode")+"Manage'></vc:i18n><span></th>\n");
                 tdSb.append("                            <td class=\"text-center\">{{" + data.getString("templateCode") + "." + column.getString("code") + "}}</td>\n");
             }
         }
-        thSb.append("                            <th class=\"text-center\">操作</th>\n");
+        thSb.append("                            <th class=\"text-center\"><span><vc:i18n name='操作'></i18n></span></th>\n");
         tdSb.append("                            <td class=\"text-center\"><div class=\"btn-group\">\n" +
-                "                                    <button class=\"btn-white btn btn-xs\" v-on:click=\"_openEdit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Model(" + data.getString("templateCode") + ")\">修改</button>\n" +
+                "                                    <button class=\"btn-white btn btn-xs\" v-on:click=\"_openEdit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Model(" + data.getString("templateCode") + ")\"><span><vc:i18n name='修改'></i18n></span></button>\n" +
                 "                                </div>\n" +
                 "                                <div class=\"btn-group\">\n" +
-                "                                    <button class=\"btn-white btn btn-xs\" v-on:click=\"_openDelete" + toUpperCaseFirstOne(data.getString("templateCode")) + "Model(" + data.getString("templateCode") + ")\">删除</button>\n" +
+                "                                    <button class=\"btn-white btn btn-xs\" v-on:click=\"_openDelete" + toUpperCaseFirstOne(data.getString("templateCode")) + "Model(" + data.getString("templateCode") + ")\"><span><vc:i18n name='删除'></i18n></span></button>\n" +
                 "                                </div></td>\n");
 
         fileContext = fileContext.replace("@@columnsCnCode@@", thSb.toString())

java110-generator/src/main/java/com/java110/code/web/GeneratorViewComponent.java

@@ -47,7 +47,7 @@ public class GeneratorViewComponent extends BaseGenerator {
 
             thSb.append("<div class=\"col-sm-4\">\n" +
                     "                        <div class=\"form-group\">\n" +
-                    "                            <label class=\"col-form-label\" >" + column.getString("cnCode") + "：</label>\n" +
+                    "                            <label class=\"col-form-label\" > <span><vc:i18n='" + column.getString("cnCode") + "' namespace='view"+data.getString("templateCode")+"Info'></vc:i18n><span>：</label>\n" +
                     "                            <label class=\"\">{{view" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info." + column.getString("code") + "}}</label>\n" +
                     "                        </div>\n" +
                     "</div>\n");

java110-generator/src/main/resources/web/add/add.html

@@ -2,14 +2,18 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
-                <h3 class="m-t-none m-b ">添加@@templateName@@</h3>
+                <h3 class="m-t-none m-b "><span><vc:i18n name="添加@@templateName@@" namespace="add@@TemplateCode@@"></vc:i18n></span></h3>
                 <div class="ibox-content">
                     <div>
                         <div>
                             @@addTemplateColumns@@
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="save@@TemplateCode@@Info()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button" v-on:click="save@@TemplateCode@@Info()" ><i class="fa fa-check"></i>&nbsp;
+                                    <span><vc:i18n name="保存"></vc:i18n></span>
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">
+                                    <span><vc:i18n name="取消"></vc:i18n></span>
+                                    </button>
                             </div>
                         </div>
                     </div>

java110-generator/src/main/resources/web/choose/choose.html

@@ -2,7 +2,7 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
-                <h3 class="modal-title" id="choose@@TemplateCode@@ModelLabel">选择@@templateName@@</h3>
+                <h3 class="modal-title" id="choose@@TemplateCode@@ModelLabel"> <span><vc:i18n name="选择@@templateName@@" namespace="choose@@TemplateCode@@"></vc:i18n></span></h3>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
@@ -17,9 +17,10 @@
                                 </div>
                                 <div class="col-sm-5">
                                     <div class="input-group">
-                                        <input placeholder="输入@@templateName@@名称" type="text" v-model="choose@@TemplateCode@@Info._current@@TemplateCode@@Name" class="form-control form-control-sm">
+                                        <input :placeholder="vc.i18n('输入@@templateName@@名称','choose@@TemplateCode@@')" type="text" v-model="choose@@TemplateCode@@Info._current@@TemplateCode@@Name" class="form-control form-control-sm">
                                         <span class="input-group-append">
-                                                <button type="button" class="btn btn-sm btn-primary" v-on:click="query@@TemplateCode@@s()">查询</button>
+                                                <button type="button" class="btn btn-sm btn-primary" v-on:click="query@@TemplateCode@@s()">
+                                                    <span><vc:i18n name="查询"></vc:i18n></span></button>
                                             </span>
                                     </div>
                                 </div>
@@ -35,7 +36,9 @@
                                         <tr v-for="@@templateCode@@ in choose@@TemplateCode@@Info.@@templateCode@@s">
                                             @@columnsName@@
                                             <td>
-                                                <button class="btn btn-primary btn-xs" v-on:click="choose@@TemplateCode@@(@@templateCode@@)">选择</button>
+                                                <button class="btn btn-primary btn-xs" v-on:click="choose@@TemplateCode@@(@@templateCode@@)">
+                                                    <span><vc:i18n name="选择"></vc:i18n></span>
+                                                    </button>
                                             </td>
                                         </tr>
                                     </tbody>

java110-generator/src/main/resources/web/delete/delete.html

@@ -2,17 +2,17 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="exampleModalLabel">请确认您的操作!</h5>
+                <h5 class="modal-title" id="exampleModalLabel"> <span><vc:i18n name="请确认您的操作!"></vc:i18n></span></h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
             <div class="modal-body">
-                <tr align="center"><th>确定删除@@templateName@@</th></tr>
+                <tr align="center"><th><span><vc:i18n name="确定删除@@templateName@@" namespace="delete@@TemplateCode@@"></vc:i18n></span></th></tr>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal" v-on:click="closeDelete@@TemplateCode@@Model()">点错了</button>
-                <button type="button" class="btn btn-primary" v-on:click="delete@@TemplateCode@@()">确认删除</button>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal" v-on:click="closeDelete@@TemplateCode@@Model()"><span><vc:i18n name="点错了"></vc:i18n></span></button>
+                <button type="button" class="btn btn-primary" v-on:click="delete@@TemplateCode@@()"><span><vc:i18n name="确认删除!"></vc:i18n></span></button>
             </div>
         </div>
     </div>

java110-generator/src/main/resources/web/edit/edit.html

@@ -2,14 +2,14 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
-                <h3 class="m-t-none m-b ">修改@@templateName@@</h3>
+                <h3 class="m-t-none m-b "><span><vc:i18n name="修改@@templateName@@" namespace="edit@@TemplateCode@@"></vc:i18n></span></h3>
                 <div class="ibox-content">
                     <div>
                         <div>
                             @@editTemplateColumns@@
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="edit@@TemplateCode@@()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button" v-on:click="edit@@TemplateCode@@()" ><i class="fa fa-check"></i>&nbsp;<span><vc:i18n name="保存"></vc:i18n></span></button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal"><span><vc:i18n name="取消"></vc:i18n></span></button>
                             </div>
                         </div>
                     </div>

java110-generator/src/main/resources/web/manage/manage.html

@@ -3,7 +3,7 @@
         <div class="col-lg-12">
             <div class="ibox ">
                 <div class="ibox-title">
-                    <h5>查询条件</h5>
+                    <h5><span><vc:i18n name="查询条件"></vc:i18n></span></h5>
                     <div class="ibox-tools" style="top:10px;">
                         @@moreCondition@@
                     </div>
@@ -19,11 +19,11 @@
         <div class="col-lg-12">
             <div class="ibox">
                 <div class="ibox-title">
-                    <h5>@@templateName@@信息</h5>
+                    <h5><span><vc:i18n name="@@templateName@@信息"  namespace="@@templateCode@@Manage"></vc:i18n></span></h5>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAdd@@TemplateCode@@Modal()">
                             <i class="glyphicon glyphicon-plus"></i>
-                            添加@@templateName@@
+                            <span><vc:i18n name="添加@@templateName@@"  namespace="@@templateCode@@Manage"></vc:i18n></span>
                         </button>
                     </div>
                 </div>

java110-generator/src/main/resources/web/view/viewInfo.html

@@ -2,13 +2,13 @@
     <div class="col-lg-12">
         <div class="ibox ">
             <div class="ibox-title">
-                <h5>@@templateName@@信息</h5>
+                <h5><span><vc:i18n name="@@templateName@@信息"  namespace="view@@TemplateCode@@Info"></vc:i18n></span></h5>
                 <div class="ibox-tools" style="top:10px;">
                     <button type="button" v-if="view@@TemplateCode@@Info.index != 2" class="btn btn-primary btn-sm" style="margin-right:10px;"  v-on:click="_openSelect@@TemplateCode@@InfoModel()">
-                        <i class="glyphicon glyphicon-search"></i> 选择@@templateName@@</button>
+                        <i class="glyphicon glyphicon-search"></i> <span><vc:i18n name="选择@@templateName@@"  namespace="view@@TemplateCode@@Info"></vc:i18n></span></button>
 
                     <button type="button" v-if="view@@TemplateCode@@Info.index != 2" class="btn btn-primary btn-sm" v-on:click="_openAdd@@TemplateCode@@InfoModel()">
-                        <i class="glyphicon glyphicon-plus"></i> 添加@@templateName@@</button>
+                        <i class="glyphicon glyphicon-plus"></i> <span><vc:i18n name="添加@@templateName@@"  namespace="view@@TemplateCode@@Info"></vc:i18n></span></button>
                 </div>
             </div>
             <div class="ibox-content">