区别文件

skyeye-web/src/main/webapp/assets/lib/winui/css/winui.css

@@ -2727,7 +2727,7 @@ body .layer-ext-winconfirm {
 
 .code-model-li{
     width: 100%;
-    height: 100px;
+    height: 105px;
     line-height: 25px;
     background-color: ghostwhite;
     margin-top: 10px;

skyeye-web/src/main/webapp/js/codemodelgroup/usemodelgroup.js

@@ -125,7 +125,7 @@ layui.config({
 	 				if(isNull(s)){
 	 					top.winui.window.msg('请先转换模板', {icon: 2,time: 2000});
 	 				}else{
-	 					if(row.modelType == 'xml' || row.modelType == 'javascript' || row.modelType == 'htmlmixed' || row.modelType == 'htmlhh'){
+	 					if(row.modelType == 'xml' || row.modelType == 'javascript' || row.modelType == 'html'){
 	 						$("#addContentToHTMLorJS").show();
 	 					}else{
 	 						$("#addContentToHTMLorJS").hide();
@@ -249,7 +249,13 @@ layui.config({
     	 	   			//遍历模板
 						$('#modelList').find('li').each(function() {
 							var label = $(this).find("label");
-							$("#" + label.attr("relation")).val(json.bean.tableName + label.attr("thiscontent"));
+							if(($("#" + label.attr("relation")).attr('modeltype') == 'javascript'
+								|| $("#" + label.attr("relation")).attr('modeltype') == 'xml'
+								|| $("#" + label.attr("relation")).attr('modeltype') == 'html') && $("#" + label.attr("relation")).attr('modelname') != 'Mapper'){
+								$("#" + label.attr("relation")).val(json.bean.tableISlowerName + label.attr("thiscontent"));
+							}else{
+								$("#" + label.attr("relation")).val(json.bean.tableName + label.attr("thiscontent"));
+							}
 						});
 						top.winui.window.msg('检索成功', {icon: 1,time: 2000});
 	 	   			}else{

skyeye-web/src/main/webapp/tpl/codemodelgroup/usemodelgroupmodel.tpl

@@ -4,7 +4,7 @@
 	        <div>
 	            <label class="layui-form-label" relation="{{id}}" thiscontent="{{modelName}}">{{modelName}}<i class="red">*</i></label>
 	            <div class="layui-input-block">
-	            	<input type="text" id="{{id}}" name="{{id}}" win-verify="required" placeholder="请选择数据库表检所生成" class="layui-input" maxlength="50"/>
+	            	<input type="text" id="{{id}}" name="{{id}}" modeltype="{{modelType}}" modelname="{{modelName}}" win-verify="required" placeholder="请选择数据库表检所生成" class="layui-input" maxlength="50"/>
 	            </div>
 	        </div>
 	    </div>