amis 1.9.1-beta.24 → 1.9.1-beta.27

package/src/renderers/Dialog.tsx

@@ -4,7 +4,6 @@ import {Renderer, RendererProps} from '../factory';
 import {SchemaNode, Schema, Action} from '../types';
 import {filter} from '../utils/tpl';
 import Modal from '../components/Modal';
-import findLast from 'lodash/findLast';
 import {
   guid,
   isVisible,

package/src/renderers/Form/index.tsx

@@ -943,13 +943,13 @@ export default class Form extends React.Component<FormProps, object> {
     );
   }
 
-  handleAction(
+  async handleAction(
     e: React.UIEvent<any> | void,
     action: Action,
     data: object,
     throwErrors: boolean = false,
     delegate?: IScopedContext
-  ): any {
+  ): Promise<any> {
     const {
       store,
       onSubmit,
@@ -987,38 +987,31 @@ export default class Form extends React.Component<FormProps, object> {
     if (data === this.props.data) {
       data = store.data;
     }
+
     if (Array.isArray(action.required) && action.required.length) {
       store.clearErrors(); // 如果是按钮指定了required，则校验前先清空一下遗留的校验报错
-
       const fields = action.required.map(item => ({
         name: item,
         rules: {isRequired: true}
       }));
+      const validationRes = await store.validateFields(fields);
 
-      return store.validateFields(fields).then(async result => {
-        if (!result) {
-          const dispatcher = await dispatchEvent(
-            'validateError',
-            this.props.data
-          );
-          if (!dispatcher?.prevented) {
-            env.notify('error', __('Form.validateFailed'));
-          }
+      if (!validationRes) {
+        const dispatcher = await dispatchEvent(
+          'validateError',
+          this.props.data
+        );
 
-          /** 抛异常是为了在dialog中catch这个错误，避免弹窗直接关闭 */
-          return Promise.reject(__('Form.validateFailed'));
-        } else {
-          dispatchEvent('validateSucc', this.props.data);
-          this.handleAction(
-            e,
-            {...action, required: undefined},
-            data,
-            throwErrors,
-            delegate
-          );
-          return;
+        if (!dispatcher?.prevented) {
+          env.notify('error', __('Form.validateFailed'));
         }
-      });
+
+        /** 抛异常是为了在dialog中catch这个错误，避免弹窗直接关闭 */
+        return Promise.reject(__('Form.validateFailed'));
+      } else {
+        /** 重置validated状态，保证submit时触发表单中的校验项 */
+        store.clearErrors();
+      }
     }
     if (
       action.type === 'submit' ||

package/src/utils/helper.ts

@@ -22,7 +22,7 @@ import {
   resolveVariable,
   resolveVariableAndFilter
 } from 'amis-formula';
-import {isObservable} from 'mobx';
+import {isObservable, isObservableArray} 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)) {
+  if (!Array.isArray(tree) && !isObservableArray(tree)) {
     return false;
   }
   return tree.every((item, index) => {