Merge branch 'dev' into master

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

@@ -1993,11 +1993,11 @@ public class CustomFunction {
                 double xND = Double.parseDouble(xN.toString());
                 List<Object> outList = new ArrayList<>();
                 if (o instanceof List) {
-                    List<Object> datas = (List<Object>) o;
+                    List<Object> datas = obj2ListNe(o);
                     for (Object e : datas) {
                         if (StringUtils.isNotEmpty(e)) {
-                            String[] as = e.toString().split("[^\\d.]");
-                            Object m = matcherFindGroup("[^\\d.]", e.toString(), 0, false);
+                            String[] as = e.toString().split("[^\\d.-]");
+                            Object m = matcherFindGroup("[^\\d.-]", e.toString(), 0, false);
                             StringBuilder d = new StringBuilder();
                             for (int i = 0; i < as.length; i++) {
                                 String s = as[i];
@@ -2045,6 +2045,11 @@ public class CustomFunction {
         return "";
     }
 
+/*    public static void main(String[] args) {
+        List<Object> list = Arrays.asList(1,-1,"-4*8");
+        obj2ListNe(xN(list,10)).forEach(System.out::println);
+    }*/
+
     public static Object repeat(Object data) {
         List<Object> result = new ArrayList<>();
         if (data != null) {
@@ -2381,19 +2386,7 @@ public class CustomFunction {
         return result;
     }
 
-    /**
-     * @return java.lang.Object
-     * @Description 删除列表最后一个数据
-     * @Param [o]
-     * @Author yangyj
-     * @Date 2021.07.28 15:47
-     **/
-    public static Object remLast(Object o) {
-        if (o instanceof List) {
-            rem(o, ((List<Object>) o).size() - 1);
-        }
-        return o;
-    }
+
 
     /**
      * @return java.lang.Object
@@ -2438,7 +2431,6 @@ public class CustomFunction {
     }
 
     /**
-     * @return void
      * @Description 删除下标为index的元素
      * @Param [o, index]
      * @Author yangyj
@@ -2473,10 +2465,7 @@ public class CustomFunction {
     }
 
 
-    public static boolean isNumeric(String str) {
-        Pattern pattern = Pattern.compile("[0-9.]*");
-        return pattern.matcher(str).matches();
-    }
+
 
 
     /**