liuyc 2 ani în urmă
părinte
comite
580574037d

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

@@ -539,13 +539,13 @@ public class ExcelTabController extends BladeController {
                     if (is_true) {
                         element.children().get(0).attr("placeholder", lastName)
                                 .attr("weighing", maxScore + "").attr("id", attrInfo).attr("keyName", attrInfo)
-                                .attr("@blur", "getRegularExpression(" + regularExpression + ")")
+                                .attr("@blur", "getRegularExpression(" + regularExpression + ",'" + filedLength + "')")
                                 .attr("v-model", "formData." + attrInfo)
                                 .attr("maxlength", filedLength);
                     } else {
                         element.children().get(0).attr("placeholder", lastName)
                                 .attr("weighing", maxScore + "").attr("id", attrInfo).attr("keyName", attrInfo)
-                                .attr("@blur", "getRegularExpression(" + regularExpression + ")")
+                                .attr("@blur", "getRegularExpression(" + regularExpression + ",'" + filedLength + "')")
                                 .attr("maxlength", filedLength);
                     }
                     element.attr("@click", "getInformation(" + oncklickText + ")");

+ 9 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/TableInfoController.java

@@ -151,7 +151,6 @@ public class TableInfoController extends BladeController {
                 wbsTree.setFullName(tableInfo.getNodeName());
                 wbsTree.setTableOwner(tableInfo.getTableOwner());
                 wbsTree.setTableType(tableInfo.getTableType());
-
                 wbsTreeService.updateById(wbsTree);
 
                 TableInfo tableInfoObj = BeanUtil.copyProperties(tableInfo, TableInfo.class);
@@ -161,6 +160,15 @@ public class TableInfoController extends BladeController {
                     tableInfoObj.setTableOwner(wbsTree.getTableOwner());
                     tableInfoService.updateById(tableInfoObj);
                 }
+            } else {
+                TableInfo tableInfo1 = tableInfoService.getBaseMapper().selectOne(Wrappers.<TableInfo>lambdaQuery().eq(TableInfo::getId, tableInfo.getId()));
+                if (tableInfo1 != null) {
+                    tableInfo1.setTabChName(tableInfo.getNodeName());
+                    tableInfo1.setTabType(tableInfo.getTableType());
+                    tableInfo1.setTableOwner(tableInfo.getTableOwner());
+                    tableInfo1.setFillRate(tableInfo.getFillRate());
+                    tableInfoService.updateById(tableInfo1);
+                }
             }
         }
         return R.data("操作成功");

+ 2 - 2
blade-service/blade-manager/src/main/java/org/springblade/manager/formula/TurnPoint.java

@@ -188,7 +188,7 @@ public class TurnPoint {
       return   this.levelInfo.getCloseZd().size()>1;
     }
 
-    public static void main(String[] args) {
+    /*public static void main(String[] args) {
         for(int i=0;i<100;i++){
             LevelInfo info = new LevelInfo();
             info.setSightHeight(144.228);
@@ -198,7 +198,7 @@ public class TurnPoint {
             System.out.println(tp.limit().stream().map(TurnPoint::getBmd0L).collect(Collectors.toList()));
         }
 
-    }
+    }*/
     public static Random r = new Random();
     public  List<TurnPoint> limit(){
         List<TurnPoint> result = new ArrayList<>();