Преглед изворни кода

feat: 调整云版 已升级专业版列显示ui

lanjianrong пре 5 година
родитељ
комит
702d7c1ec7
2 измењених фајлова са 13 додато и 11 уклоњено
  1. 2 0
      src/global.less
  2. 11 11
      src/pages/Product/Cloud/Building/index.jsx

+ 2 - 0
src/global.less

@@ -53,6 +53,8 @@ body,
 .ant-menu-inline .ant-menu-submenu-title {
   margin-bottom: 0;
 }
+
+// 修复proTable中的列设置,tree list hover效果异常
 .ant-pro-table-column-setting-list > .ant-tree .ant-tree-node-content-wrapper:hover {
   background-color: unset;
 }

+ 11 - 11
src/pages/Product/Cloud/Building/index.jsx

@@ -92,8 +92,8 @@ export const CloudTable = ({ columnStateType }) => {
     },
     {
       title: '最近使用',
-      dataIndex: 'latestUsedName',
-      key: 'latestUsedName',
+      dataIndex: 'latestUsed',
+      key: 'latestUsed',
       valueType: 'select',
       width: 50,
       valueEnum: roadpricing.reduce((prev, curr) => {
@@ -105,7 +105,8 @@ export const CloudTable = ({ columnStateType }) => {
         }
         return obj
       }, {}),
-      renderText: text => text && <Tag color="purple">{text}</Tag>
+      renderText: (_, record) =>
+        record.latestUsedName && <Tag color="purple">{record.latestUsedName}</Tag>
     },
     {
       title: '截至上一次登录时长',
@@ -157,11 +158,10 @@ export const CloudTable = ({ columnStateType }) => {
     },
     {
       title: '已升级专业版',
-      dataIndex: 'upgrade_list',
-      key: 'upgrade_list',
-      search: false,
-      filters: true,
+      dataIndex: 'upGrade',
+      key: 'upGrade',
       width: 150,
+      valueType: 'select',
       valueEnum: roadpricing.reduce((prev, curr) => {
         const obj = { ...prev }
         if (curr._id) {
@@ -171,9 +171,9 @@ export const CloudTable = ({ columnStateType }) => {
         }
         return obj
       }, {}),
-      renderText: text => (
-        <div>
-          {text
+      renderText: (_, record) => (
+        <div className="children:m-2px">
+          {record.upgrade_list
             .filter(item => item.isUpgrade)
             .map(item => {
               return (
@@ -231,7 +231,7 @@ export const CloudTable = ({ columnStateType }) => {
       toolbar={{
         search: (
           <Input.Search
-            style={{ width: '300px' }}
+            style={{ width: '250px' }}
             allowClear={true}
             placeholder="请输入手机、QQ进行搜索"
             onSearch={handleSearch}