表单相关：d:t分数 格式支持 减法

blade-service/blade-manager/src/main/java/com/jfireel/expression/node/CalculateNode.java

@@ -11,4 +11,6 @@ public interface CalculateNode {
     TokenType type();
 
     String literals();
+    String COLON=":";
+    String DXD_REG="[0-9.-]+(\\*[0-9.-]+)+";
 }

blade-service/blade-manager/src/main/java/com/jfireel/expression/node/impl/MinusNode.java

@@ -1,11 +1,13 @@
 package com.jfireel.expression.node.impl;
 
+import com.jfireel.expression.Expression;
 import com.jfireel.expression.token.Operator;
 import com.jfireel.expression.util.number.SubtractUtil;
 import com.mixsmart.utils.CustomFunction;
 import com.mixsmart.utils.StringUtils;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.Map;
 
 public class MinusNode extends OperatorResultNode {
@@ -17,9 +19,12 @@ public class MinusNode extends OperatorResultNode {
     public Object calculate(Map<String, Object> variables) {
         Object leftValue = leftOperand.calculate(variables);
         Object rightValue = rightOperand.calculate(variables);
-        String reg = "[0-9.-]+(\\*[0-9.-]+)+";
-        if (StringUtils.handleNull(leftValue).matches(reg) && StringUtils.handleNull(rightValue).matches(reg)) {
+        String leftStr=StringUtils.handleNull(leftValue);
+        String rightStr=StringUtils.handleNull(rightValue);
+        if (leftStr.matches(DXD_REG) && rightStr.matches(DXD_REG)) {
             return CustomFunction.dXd(rightValue, leftValue);
+        }else if(leftStr.contains(COLON)&&rightStr.contains(COLON)){
+            return fraction(leftStr)-fraction(rightStr);
         }
         if (leftValue instanceof String && StringUtils.isNumber(leftValue)) {
             leftValue = new BigDecimal(leftValue.toString());
@@ -36,13 +41,17 @@ public class MinusNode extends OperatorResultNode {
         return SubtractUtil.calculate((Number) leftValue, (Number) rightValue);
     }
 
+    public static double fraction(String s){
+        String[] arr = s.split(COLON);
+        return Double.parseDouble(arr[0])/Double.parseDouble(arr[1]);
+    }
 
 
 /*    public static void main(String[] args) {
         Map<String,Object> map = new HashMap<>();
-        map.put("A","1*2");
-        map.put("B","1*2");
-        System.out.println(Expression.parse("A*B").calculate(map).toString());
+        map.put("A","1:2.36");
+        map.put("B","1:4");
+        System.out.println(Expression.parse("A-B").calculate(map).toString());
     }*/
 
 //	public Object calculateOld(Map<String, Object> variables) {

blade-service/blade-manager/src/main/java/com/jfireel/expression/node/impl/OperatorResultNode.java

@@ -36,6 +36,7 @@ public abstract class OperatorResultNode implements CalculateNode {
         return Token.OPERATOR_RESULT;
     }
 
+    @Override
     public String literals() {
         return leftOperand.literals() + type.getLiterals() + rightOperand.literals();
     }

blade-service/blade-manager/src/main/java/com/mixsmart/utils/CustomFunction.java

@@ -2582,11 +2582,11 @@ public class CustomFunction {
         return dXd(design, data, xN, scale, mode);
     }
 
-    public static void main(String[] args) {
+/*    public static void main(String[] args) {
         String a="100/200";
         List<Object>list  = new ArrayList<>(Arrays.asList(101,102,201,198));
         list.forEach(d-> System.out.println(dXd(a,d)));
-    }
+    }*/
 
     /**
      * @return java.lang.Object