fix chechPermissions.js isPromise(bool)

e685dc68 · guowenfh · 陈帅 · a8f81804 · e685dc68
Commit e685dc68 authored Jun 14, 2018 by guowenfh Committed by 陈帅 Jun 18, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

src/components/Authorized/CheckPermissions.js src/components/Authorized/CheckPermissions.js +4 -4

No files found.
--- a/src/components/Authorized/CheckPermissions.js
+++ b/src/components/Authorized/CheckPermissions.js
@@ -49,11 +49,11 @@ const checkPermissions = (authority, currentAuthority, target, Exception) => {
  if (typeof authority === 'function') {
    try {
      const bool = authority(currentAuthority);
+      // 函数执行后返回值是 Promise
+      if (isPromise(bool)) {
+        return <PromiseRender ok={target} error={Exception} promise={bool} />;
+      }
      if (bool) {
-        // 函数执行后返回值是 Promise
-        if (isPromise(bool)) {
-          return <PromiseRender ok={target} error={Exception} promise={bool} />;
-        }
        return target;
      }
      return Exception;