Forráskód Böngészése

Merge branch 'master' of http://192.168.1.41:3000/outaozhen/cldV2react

outaozhen 5 éve
szülő
commit
a9728fe70b
3 módosított fájl, 13 hozzáadás és 9 törlés
  1. 8 8
      src/app.tsx
  2. 1 1
      src/layouts/BasicLayout.jsx
  3. 4 0
      src/pages/document.ejs

+ 8 - 8
src/app.tsx

@@ -9,16 +9,16 @@ const PermDataList = [
     value: 2
   }
 ]
-export async function render(oldRender) {
+export function render(oldRender) {
   const path = window.location.pathname
   if (path !== '/user/login') {
-    const { data = [] } = await apiGetRoles()
-    const permVal = PermDataList.find(item => path.startsWith(item.key))?.value
-    if (permVal) {
-      const prem = await getDataPerm()
-      setAuthCache(PERM_LIST_KEY, prem?.data || [])
-    }
-    setAuthority(data)
+    apiGetRoles().then(roles => {
+      setAuthority(roles.data)
+      const permVal = PermDataList.find(item => path.startsWith(item.key))?.value
+      if (permVal) {
+        getDataPerm().then(prem => setAuthCache(PERM_LIST_KEY, prem?.data || []))
+      }
+    })
   }
   oldRender()
 }

+ 1 - 1
src/layouts/BasicLayout.jsx

@@ -28,7 +28,7 @@ const menuDataRender = menuList =>
       children: item.children ? menuDataRender(item.children) : undefined
     }
     if (item.icon) {
-      localItem.icon = <iconpark-icon name={item.icon} size="16" className="anticon anticon-form" />
+      localItem.icon = <iconpark-icon name={item.icon} size="16" class="anticon anticon-form" />
     }
     return Authorized.check(item.authority, localItem, null)
   })

+ 4 - 0
src/pages/document.ejs

@@ -23,6 +23,10 @@
     <script src="https://sf1-hscdn-tos.pstatp.com/obj/iconpark/icons_1832_39.57820ea46a42d8bbbaa87c0d7a61ad8d.js"></script>
   </head>
   <body>
+    <script
+      defer
+      src="https://sf1-hscdn-tos.pstatp.com/obj/iconpark/icons_1832_39.57820ea46a42d8bbbaa87c0d7a61ad8d.js"
+    ></script>
     <noscript>Out-of-the-box mid-stage front/design solution!</noscript>
     <div id="root">
       <style>