amis-core 2.9.0 → 3.1.0

package/lib/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.9.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -358,12 +358,16 @@ var validateMessages = {
     isVariableName: 'validate.isVariableName'
 };
 function validate(value, values, rules, messages, __) {
+    var _a;
     if (__ === void 0) { __ = function (str) { return str; }; }
     var errors = [];
-    rules &&
-        Object.keys(rules).forEach(function (ruleName) {
+    if (rules) {
+        var ruleNames = Object.keys(rules);
+        var length_1 = ruleNames.length;
+        for (var index = 0; index < length_1; index++) {
+            var ruleName = ruleNames[index];
             if (!rules[ruleName] && rules[ruleName] !== 0) {
-                return;
+                continue;
             }
             else if (typeof validations[ruleName] !== 'function') {
                 throw new Error('Validation `' + ruleName + '` not exists!');
@@ -375,19 +379,30 @@ function validate(value, values, rules, messages, __) {
                 }
                 return item;
             });
-            if (!fn.apply(void 0, tslib.__spreadArray([values, value], tslib.__read(args), false))) {
+            var validateRes = fn.apply(void 0, tslib.__spreadArray([values, value], tslib.__read(args), false));
+            // addRule 允许返回
+            //   {error: true, msg: '错误提示'}
+            // 格式的信息来灵活展示错误
+            var fnResErrorMsg = '';
+            if (typeof validateRes === 'object' &&
+                validateRes.error === true) {
+                fnResErrorMsg = (_a = validateRes === null || validateRes === void 0 ? void 0 : validateRes.msg) !== null && _a !== void 0 ? _a : '';
+            }
+            if (!validateRes || fnResErrorMsg) {
                 var msgRuleName = ruleName;
                 if (Array.isArray(value)) {
                     msgRuleName = "".concat(ruleName, "Array");
                 }
-                errors.push({
-                    rule: ruleName,
-                    msg: tpl.filter(__((messages && messages[ruleName]) ||
-                        validateMessages[msgRuleName] ||
-                        validateMessages[ruleName]), tslib.__assign({}, [''].concat(args)))
-                });
+                return [{
+                        rule: ruleName,
+                        msg: tpl.filter(__((messages && messages[ruleName]) ||
+                            fnResErrorMsg ||
+                            validateMessages[msgRuleName] ||
+                            validateMessages[ruleName]), tslib.__assign({}, [''].concat(args)))
+                    }];
             }
-        });
+        }
+    }
     return errors;
 }
 function validateObject(values, rules, messages, __) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-core",
-  "version": "2.9.0",
+  "version": "3.1.0",
   "description": "amis-core",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -45,7 +45,7 @@
     "esm"
   ],
   "dependencies": {
-    "amis-formula": "^2.9.0",
+    "amis-formula": "^3.1.0",
     "classnames": "2.3.1",
     "file-saver": "^2.0.2",
     "hoist-non-react-statics": "^3.3.2",
@@ -101,5 +101,5 @@
       "/.rollup.cache/"
     ]
   },
-  "gitHead": "cc289e56da53504995df57c84b517f5801d9fd0f"
+  "gitHead": "020b12d0be43215664e0c0e53cd33486c43fde86"
 }