cfel-base-components 2.5.40 → 2.5.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfel-base-components",
-  "version": "2.5.40",
+  "version": "2.5.41",
   "description": "cfel-base-components",
   "main": "/src/index.tsx",
   "types": "src/index.d.ts",
@@ -54,6 +54,7 @@
     "dayjs": "^1.11.9",
     "html2canvas": "^1.4.1",
     "qrcode.react": "^3.1.0",
+    "react-json-view": "^1.21.3",
     "sass": "^1.77.6"
   }
 }

package/src/components/universal-pages/cpcRole/api.ts

@@ -1,4 +1,4 @@
-import request from '@/api/config'
+import request from "../../../apiRequest/config"
 
 export const pageRequest = (data?: any) => {
   return request.post('/api/permission/role/page.json', { ...data })

package/src/components/universal-pages/cpcRole/index.tsx

@@ -117,6 +117,9 @@ export default function Role({ historyAction }: RoleProps) {
       hidden: !(productCode === 'puhui-operation-customer'),
       key: 'metaData',
       render: (cell: any, record: any) => {
+        if (record.roleCode === 'admin') {
+          return '-'
+        }
         if (cell !== undefined) {
           return (
             <span

package/src/components/universal-pages/cpcRoleInfo/api.ts

@@ -1,4 +1,5 @@
-import request from "../../../apiRequest/config"
+import request from '../../../apiRequest/config'
+
 //根据角色分页查询绑定的账号
 export const pageBoundAccounts = (data?: any) => {
   return request.post('/api/permission/accountRole/pageBoundAccounts.json', { ...data })

package/src/components/universal-pages/cpcRoleInfo/index.tsx

@@ -65,15 +65,23 @@ export default function RoleInfo({ isShowTab, getAuthTree, getRoleAuthTree, empo
 
   const renderMetaData = () => {
     //如果详情为的metadata为null则显示false
-    if (roleInfo.metadata === null) {
+    if (roleInfo?.metaData === null) {
       return Object.keys(metaData).map((key) => {
-        return <Descriptions.Item key={key} label={metaData[key]}>false</Descriptions.Item>
+        return (
+          <Descriptions.Item key={key} label={metaData[key]}>
+            false
+          </Descriptions.Item>
+        )
       })
     }
 
     //如果有数据则根据metadata翻译成中文
     return Object.keys(metaData).map((key) => {
-      return <Descriptions.Item key={key} label={metaData[key]}>{roleInfo.metadata[key]}</Descriptions.Item>
+      return (
+        <Descriptions.Item key={key} label={metaData[key]}>
+          {roleInfo?.metaData[key]}
+        </Descriptions.Item>
+      )
     })
   }
 
@@ -484,7 +492,7 @@ export default function RoleInfo({ isShowTab, getAuthTree, getRoleAuthTree, empo
           <Descriptions.Item label="角色描述">{roleInfo?.description || ''}</Descriptions.Item>
           <Descriptions.Item label="创建时间">{timeFormatter(roleInfo?.gmtCreate) || ''}</Descriptions.Item>
           <Descriptions.Item label="更新时间">{timeFormatter(roleInfo?.gmtModified) || ''}</Descriptions.Item>
-          {isCustomer && renderMetaData()}
+          {roleInfo?.roleCode === 'admin' ? null : <>{isCustomer && roleInfo?.id && renderMetaData()}</>}
         </Descriptions>
 
         <div>