amis 1.9.1-beta.21 → 1.9.1-beta.24

package/src/store/formItem.ts

@@ -326,70 +326,83 @@ export const FormItemStore = StoreNode.named('FormItemStore')
     }
 
     let validateCancel: Function | null = null;
-    const validate: (data: Object, hook?: any) => Promise<boolean> = flow(
-      function* validate(data: Object, hook?: any) {
-        if (self.validating && !isEffectiveApi(self.validateApi, data)) {
-          return self.valid;
-        }
-
-        self.validating = true;
-        clearError();
-        if (hook) {
-          yield hook();
-        }
+    const validate: (
+      data: Object,
+      hook?: any,
+      /**
+       * customRules主要是为了支持action.require的验证方式
+       * 这样可以基于不同的action实现不同的校验规则
+       */
+      customRules?: {[propName: string]: any}
+    ) => Promise<boolean> = flow(function* validate(
+      data: Object,
+      hook?: any,
+      customRules?: {[propName: string]: any}
+    ) {
+      if (self.validating && !isEffectiveApi(self.validateApi, data)) {
+        return self.valid;
+      }
 
-        addError(
-          doValidate(self.tmpValue, data, self.rules, self.messages, self.__)
-        );
+      self.validating = true;
+      clearError();
+      if (hook) {
+        yield hook();
+      }
 
-        if (!self.errors.length && isEffectiveApi(self.validateApi, data)) {
-          if (validateCancel) {
-            validateCancel();
-            validateCancel = null;
-          }
+      addError(
+        doValidate(
+          self.tmpValue,
+          data,
+          customRules ? str2rules(customRules) : self.rules,
+          self.messages,
+          self.__
+        )
+      );
 
-          const json: Payload = yield getEnv(self).fetcher(
-            self.validateApi,
-            /** 如果配置validateApi，需要将用户最新输入同步到数据域内 */
-            createObject(data, {[self.name]: self.tmpValue}),
-            {
-              cancelExecutor: (executor: Function) =>
-                (validateCancel = executor)
-            }
-          );
+      if (!self.errors.length && isEffectiveApi(self.validateApi, data)) {
+        if (validateCancel) {
+          validateCancel();
           validateCancel = null;
+        }
 
-          if (!json.ok && json.status === 422 && json.errors) {
-            addError(
-              String(
-                json.errors || json.msg || `表单项「${self.name}」校验失败`
-              )
-            );
+        const json: Payload = yield getEnv(self).fetcher(
+          self.validateApi,
+          /** 如果配置validateApi，需要将用户最新输入同步到数据域内 */
+          createObject(data, {[self.name]: self.tmpValue}),
+          {
+            cancelExecutor: (executor: Function) => (validateCancel = executor)
           }
+        );
+        validateCancel = null;
+
+        if (!json.ok && json.status === 422 && json.errors) {
+          addError(
+            String(json.errors || json.msg || `表单项「${self.name}」校验失败`)
+          );
         }
+      }
 
-        self.validated = true;
+      self.validated = true;
 
-        if (self.unique && self.form?.parentStore?.storeType === 'ComboStore') {
-          const combo = self.form.parentStore as IComboStore;
-          const group = combo.uniques.get(self.name) as IUniqueGroup;
+      if (self.unique && self.form?.parentStore?.storeType === 'ComboStore') {
+        const combo = self.form.parentStore as IComboStore;
+        const group = combo.uniques.get(self.name) as IUniqueGroup;
 
-          if (
-            group.items.some(
-              item =>
-                item !== self &&
-                self.tmpValue !== undefined &&
-                item.value === self.tmpValue
-            )
-          ) {
-            addError(self.__('Form.unique'));
-          }
+        if (
+          group.items.some(
+            item =>
+              item !== self &&
+              self.tmpValue !== undefined &&
+              item.value === self.tmpValue
+          )
+        ) {
+          addError(self.__('Form.unique'));
         }
-
-        self.validating = false;
-        return self.valid;
       }
-    );
+
+      self.validating = false;
+      return self.valid;
+    });
 
     function setError(msg: string | Array<string>, tag: string = 'builtin') {
       clearError();

package/src/utils/formula.ts

@@ -169,7 +169,7 @@ export function formulaExec(
     // 非字符串类型，直接返回，比如：boolean、number类型、Object、Array类型
     return value;
   } else if (curExecMode && FormulaExec[curExecMode]) {
-    return FormulaExec[curExecMode](value, data);;
+    return FormulaExec[curExecMode];
   }
 
   const curValue = value.trim(); // 剔除前后空格
@@ -183,7 +183,7 @@ export function formulaExec(
   } else if (curValue.startsWith('${') && curValue.endsWith('}')) {
     // ${ xxx } 格式 使用 formula 运算器
     return FormulaExec['formula'](curValue, data);
-  } else if (isExpression(curValue)) {
+  } else if (isExpression(test)) {
     // 表达式格式使用 formula 运算器
     return FormulaExec['formula'](curValue, data);
   } else if (/(\${).+(\})/.test(curValue)) {

package/src/utils/helper.ts

@@ -22,7 +22,7 @@ import {
   resolveVariable,
   resolveVariableAndFilter
 } from 'amis-formula';
-import {isObservable, isObservableArray} from 'mobx';
+import {isObservable} from 'mobx';
 
 export {
   createObject,
@@ -937,7 +937,7 @@ export function everyTree<T extends TreeItem>(
   paths: Array<T> = [],
   indexes: Array<number> = []
 ): boolean {
-  if (!Array.isArray(tree) && !isObservableArray(tree)) {
+  if (!Array.isArray(tree)) {
     return false;
   }
   return tree.every((item, index) => {