公式相关:range

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/RangeInfo.java

@@ -3,11 +3,14 @@ package org.springblade.manager.dto;
 import com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.common.utils.BaseUtils;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -74,22 +77,23 @@ public class RangeInfo {
 
     public void build(){
         if(Func.isNotBlank(this.design)){
-            this.gDesign= Arrays.stream(this.design.split("[^\\d.]+")).filter(Func::isNumeric).map(Func::toDouble).collect(Collectors.toList());
+            this.gDesign= Arrays.stream(this.design.split("[^\\d.]+")).filter(BaseUtils::isNumber).map(Func::toDouble).collect(Collectors.toList());
         }
         if(Func.isNotBlank(this.size)){
-            this.gSize= Arrays.stream(this.size.split("[^\\d.]+")).filter(Func::isNumeric).map(Func::toInt).collect(Collectors.toList());
+            this.gSize= Arrays.stream(this.size.split("[^\\d.]+")).filter(BaseUtils::isNumber).map(Func::toInt).collect(Collectors.toList());
         }
         if(Func.isNotBlank(this.dev)){
             this.gDev= Arrays.stream(this.dev.split("/+")).collect(Collectors.toList());
         }
         if(Func.isNotBlank(this.pass)){
-            this.gPass= Arrays.stream(this.pass.split("[^\\d.%]+")).filter(Func::isNumeric).map(Func::toInt).collect(Collectors.toList());
+            this.gPass= Arrays.stream(this.pass.split("[^\\d.%]+")).filter(BaseUtils::isNumber).map(Func::toInt).collect(Collectors.toList());
         }
         if(Func.isNotBlank(this.capacity)){
-            this.gCapacity= Arrays.stream(this.capacity.split("[^\\d.]+")).filter(Func::isNumeric).map(Func::toInt).collect(Collectors.toList());
+            this.gCapacity= Arrays.stream(this.capacity.split("[^\\d.]+")).filter(BaseUtils::isNumber).map(Func::toInt).collect(Collectors.toList());
         }
     }
 
+
     public void setSize(String size) {
         this.size = size;
     }

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

@@ -7,7 +7,6 @@ import org.springblade.manager.dto.ElementData;
 import org.springblade.manager.dto.FormData;
 
 import java.util.*;
-import java.util.logging.Handler;
 import java.util.stream.Collectors;
 
 /**