amis 1.9.1-beta.0 → 1.9.1-beta.4

package/src/store/form.ts

@@ -326,10 +326,7 @@ export const FormStore = ServiceStore.named('FormStore')
         }
 
         if (!json.ok) {
-          // 验证错误
-          if (options && options.onFailed) {
-            options.onFailed(json);
-          }
+
           if (json.status === 422 && json.errors) {
             setFormItemErrors(json.errors);
 
@@ -349,18 +346,19 @@ export const FormStore = ServiceStore.named('FormStore')
           throw new ServerError(self.msg, json);
         } else {
           updateSavedData();
-          if (options && options.onSuccess) {
-            const ret = options.onSuccess(json);
-
-            if (ret && ret.then) {
-              yield ret;
-            }
+          let ret = options && options.onSuccess && options.onSuccess(json);
+          if (ret?.then) {
+            ret = yield ret;
+          }
+          if (ret?.cbResult?.then) {
+            yield ret.cbResult;
           }
           self.markSaving(false);
           self.updateMessage(
             json.msg ?? self.__(options && options.successMessage)
           );
-          self.msg &&
+          if (!ret?.dispatcher?.prevented) {
+            self.msg &&
             getEnv(self).notify(
               'success',
               self.msg,
@@ -371,15 +369,21 @@ export const FormStore = ServiceStore.named('FormStore')
                   }
                 : undefined
             );
+          }
           return json.data;
         }
       } catch (e) {
         self.markSaving(false);
-
+        let ret = options && options.onFailed && options.onFailed(e.response || {});
+        if (ret?.then) {
+          ret = yield ret;
+        }
         if (!isAlive(self) || self.disposed) {
           return;
         }
-
+        if (ret?.dispatcher?.prevented) {
+          return;
+        }
         if (e.type === 'ServerError') {
           const result = (e as ServerError).response;
           getEnv(self).notify(
@@ -395,7 +399,6 @@ export const FormStore = ServiceStore.named('FormStore')
         } else {
           getEnv(self).notify('error', e.message);
         }
-
         throw e;
       }
     });
@@ -479,9 +482,13 @@ export const FormStore = ServiceStore.named('FormStore')
         ) {
           let msg = failedMessage ?? self.__('Form.validateFailed');
           const env = getEnv(self);
-
-          msg && env.notify('error', msg);
-          validateErrCb && validateErrCb();
+          let dispatcher: any = validateErrCb && validateErrCb();
+          if (dispatcher?.then) {
+            dispatcher = yield dispatcher;
+          }
+          if (!dispatcher?.prevented){
+            msg && env.notify('error', msg);
+          }
           throw new Error(msg);
         }
 

package/src/utils/api.ts

@@ -307,7 +307,7 @@ export function responseAdaptor(ret: fetcherResult, api: ApiObject) {
   if (data.hasOwnProperty('errorCode')) {
     // 阿里 Java 规范
     data.status = data.errorCode;
-    data.msg = data.errorMessage;
+    data.msg = data.errorMessage || data.errorMsg;
   } else if (data.hasOwnProperty('errno')) {
     data.status = data.errno;
     data.msg = data.errmsg || data.errstr || data.msg;

package/src/utils/renderer-event.ts

@@ -138,7 +138,6 @@ export async function dispatchEvent(
 
     unbindEvent = bindEvent(renderer);
   }
-
   // 没有可处理的监听
   if (!rendererEventListeners.length) {
     return Promise.resolve();
@@ -152,7 +151,6 @@ export async function dispatchEvent(
       data,
       scoped
     });
-
   // 过滤&排序
   const listeners = rendererEventListeners
     .filter(