公式相关-定位信息调整

blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/TableElementConverter.java

@@ -186,10 +186,10 @@ public class TableElementConverter implements ITableElementConverter {
         String coords = this.coordinateMap.get(fd.getTableName()).get(fd.getKey());
         StringBuilder sb = new StringBuilder();
         if(Func.isNotEmpty(coords)){
-            List<Coords> list = Stream.of(coords).flatMap(e-> Arrays.stream(e.split(";"))).map(e->{String[] xy=e.split("_");return new Coords(xy[0],xy[1]);}).collect(Collectors.toList());
+            List<Coords> list = Stream.of(coords).flatMap(e-> Arrays.stream(e.split(";"))).map(e->{String[] xy=e.split("_");return new Coords(xy[1],xy[0]);}).collect(Collectors.toList());
             for(int i=0;i<dataList.size();i++){
                 ElementData ed = dataList.get(i);
-                if(list.size()>i){
+                if(list.size()>i&&Func.isNotEmpty(ed.getValue())){
                      Coords c=list.get(i);
                      sb.append(ed.stringValue()).append("_^_").append(c.getY()).append("_").append(c.getX()).append("☆");
                 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -491,7 +491,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 					if(StringUtils.isNotEmpty(keyname)){
 						String[] keys = keyname.split("__");
 						String datakey = keys[0];
-						keyVal=keys[1];
+//						keyVal=keys[1];
 //						if(dataMap.containsKey(keys[0])){
 //							String datakeyVal = dataMap.get(datakey)+";"+keyVal;
 //						}else{