cfel-base-components 2.5.40 → 2.5.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfel-base-components",
-  "version": "2.5.40",
+  "version": "2.5.42",
   "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/AddModal/index.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import { Button, Modal, Form, Input, Checkbox } from 'antd'
+import { Button, Modal, Form, Input, Checkbox, Space, Radio } from 'antd'
 export default function Index({
   ModalOpen, //弹框状态
   editOpenStatus, //关闭弹框
@@ -28,12 +28,8 @@ export default function Index({
       })
       if (isCustomer && editingData.metaData) {
         form.setFieldsValue({
-          metaData: Object.keys(editingData.metaData).map(key => {
-            if (editingData.metaData[key] === 'true') {
-              return key
-            }
-            return null
-          })
+          readOnly: editingData?.metaData?.readOnly,
+          hypervisorManager: editingData?.metaData?.hypervisorManager
         })
       }
     }
@@ -74,15 +70,10 @@ export default function Index({
         value.roleCode = editingData.roleCode
       }
       if (isCustomer) {
-        let myMeta: Record<string, boolean> = {}
-        Object.keys(metaData).forEach((item: any) => {
-          if (value.metaData.includes(item)) {
-            myMeta[item] = true
-          } else {
-            myMeta[item] = false
-          }
-        })
-        value.metaData = myMeta
+        value.metaData = {
+          readOnly: value.readOnly,
+          hypervisorManager: value.hypervisorManager
+        }
       }
       actionFunc(value, editingData ? 'edit' : 'add').then(() => {
         form.resetFields()
@@ -119,21 +110,28 @@ export default function Index({
     >
       <Form form={form} layout={'vertical'} initialValues={{ remember: true }} autoComplete='off'>
         {isCustomer && (
-          <Form.Item
-            label='规则配置'
-            name='metaData'
-            rules={[{ required: true, message: '请选择至少一个规则权限' }]}
-          >
-            <Checkbox.Group>
-              {Object.keys(metaData).map((item: any, index: number) => {
-                return (
-                  <Checkbox key={index} value={item}>
-                    {metaData[item]}
-                  </Checkbox>
-                )
-              })}
-            </Checkbox.Group>
-          </Form.Item>
+          <Space size={50}>
+            <Form.Item
+              label='读写规则'
+              name='readOnly'
+              rules={[{ required: true, message: '请选择读写规则' }]}
+            >
+              <Radio.Group>
+                <Radio value='false'>只读</Radio>
+                <Radio value='true'>读写</Radio>
+              </Radio.Group>
+            </Form.Item>
+            <Form.Item
+              label='云厂商/租户规则'
+              name='hypervisorManager'
+              rules={[{ required: true, message: '请选择云厂商/租户规则' }]}
+            >
+              <Radio.Group>
+                <Radio value='true'>云厂商</Radio>
+                <Radio value='false'>租户</Radio>
+              </Radio.Group>
+            </Form.Item>
+          </Space>
         )}
         {formDom.map((item: any, index: number) => {
           return <div key={index}>{showCom(item)}</div>

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

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

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

@@ -6,6 +6,7 @@ import ProTable from '../../base-component/ProTable'
 import Pagination from '../../base-component/Pagination'
 import useTableHooks from '../../../hooks/useTableHooks'
 import DocumentEntry from '../../document-entry/index'
+
 import { timeFormatter, getUrlParams } from '../../../utils'
 
 import { get } from 'lodash'
@@ -43,11 +44,12 @@ export default function Role({ historyAction }: RoleProps) {
   const [openJson, setOpenJson] = useState({})
 
   const lookMoreJson = (data: any) => {
-    const translatedData: Record<string, boolean> = {}
+    const translatedData: Record<string, string> = {}
 
-    Object.entries(metaData).forEach(([key, value]) => {
-      translatedData[value] = data[key]
-    })
+    console.log(data)
+
+    translatedData['读写规则'] = data.readOnly === 'true' ? '读写' : '只读'
+    translatedData['云厂商/租户规则'] = data.hypervisorManager === 'true' ? '云厂商' : '租户'
 
     setOpen(true)
     setOpenJson(translatedData)
@@ -117,6 +119,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
@@ -124,9 +129,10 @@ export default function Role({ historyAction }: RoleProps) {
               onClick={() => {
                 let initialValues: Record<string, boolean> = {}
                 if (record.metaData === null) {
-                  Object.entries(metaData).forEach(([key, value]) => {
-                    initialValues[key] = false
-                  })
+                  initialValues = {
+                    readOnly: false,
+                    hypervisorManager: false,
+                  }
                 } else {
                   initialValues = record.metaData
                 }
@@ -273,9 +279,9 @@ export default function Role({ historyAction }: RoleProps) {
   return (
     <PageContainer>
       <JsonViewDialog open={open} jsonData={openJson} closeModel={() => setOpen(false)} />
-      <QueryFilter onReset={handleOnReset} onFinish={handleOnFinish}>
-        <ProFormText name="roleName" label="角色名称" />
-      </QueryFilter>
+      {/* <QueryFilter onReset={handleOnReset} onFinish={handleOnFinish}>
+        <ProFormText name='roleName' label='角色名称' />
+      </QueryFilter> */}
 
       <ProTable
         columnsState={{

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

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

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

@@ -65,16 +65,21 @@ export default function RoleInfo({ isShowTab, getAuthTree, getRoleAuthTree, empo
 
   const renderMetaData = () => {
     //如果详情为的metadata为null则显示false
-    if (roleInfo.metadata === null) {
-      return Object.keys(metaData).map((key) => {
-        return <Descriptions.Item key={key} label={metaData[key]}>false</Descriptions.Item>
-      })
+    if (roleInfo?.metaData === null) {
+      return (
+        <>
+          <Descriptions.Item label="读写规则">只读</Descriptions.Item>
+          <Descriptions.Item label="云厂商/租户规则">租户</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 label="读写规则">{roleInfo?.metaData?.readOnly === 'true' ? '读写' : '只读'}</Descriptions.Item>
+        <Descriptions.Item label="云厂商/租户规则">{roleInfo?.metaData?.hypervisorManager === 'true' ? '云厂商' : '租户'}</Descriptions.Item>
+      </>
+    )
   }
 
   const columns: any = [
@@ -484,7 +489,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>