Merge remote-tracking branch 'origin/master'

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -430,6 +430,8 @@ public class ExcelTabController extends BladeController {
 			for(int j=0; j<tds.size();j++){
 				Element element = tds.get(j);
 				if(element.html().indexOf("el-input")>=0){
+
+					boolean is_true =false;
 					String titleName = element.attr("title");
 					double maxScore = 0.48;
 					String lastName = "警告";
@@ -440,18 +442,27 @@ public class ExcelTabController extends BladeController {
 						if(titleName.equals(ysName)){
 							lastName = elementInfo.getEName();
 							attrInfo = elementInfo.getEKey()+"__"+i+"_"+j;
+							maxScore = 100;
+							is_true = true;
 							break;
 						}else{
 							if(MathUtil.sim(titleName,ysName) > maxScore){
 								attrInfo = elementInfo.getEKey()+"__"+i+"_"+j;
 								lastName = ysName ;
 								maxScore = MathUtil.sim(titleName,ysName);
+								is_true = true;
 							}
 						}
 					}
 					String oncklickText = "'"+lastName +"',"+i+","+j;
-					element.children().get(0).attr("placeholder",lastName).attr("@focus","getInformation("+oncklickText+")")
-							.attr("weighing",maxScore+"").attr("id",attrInfo).attr("keyName",attrInfo).attr("v-model","formData."+attrInfo);
+					if(is_true){
+						element.children().get(0).attr("placeholder",lastName).attr("@focus","getInformation("+oncklickText+")")
+								.attr("weighing",maxScore+"").attr("id",attrInfo).attr("keyName",attrInfo).attr("v-model","formData."+attrInfo);
+					}else{
+						element.children().get(0).attr("placeholder",lastName).attr("@focus","getInformation("+oncklickText+")")
+								.attr("weighing",maxScore+"").attr("id",attrInfo).attr("keyName",attrInfo);
+					}
+
 				}
 			}
 		}
@@ -562,7 +573,7 @@ public class ExcelTabController extends BladeController {
 		}
 
 		Map<String,String> dataMap2 = new HashMap<>();
-		dataMap2.put("pkeyId",pkeyId);
+		dataMap2.put("p_key_id",pkeyId);
 		for(String k:dataMap.keySet()){
 			if(dataMap.get(k).indexOf(",")>=0){
 				String [] ziduan= dataMap.get(k).split(",");