fix: 6.13bug修复

config/routes.js

@@ -70,13 +70,13 @@ export default [
         component: './Customer/Business',
         access: 'authRouteFilter',
         validatePerm: true
+      },
+      {
+        path: '/customer/test',
+        name: 'test',
+        icon: 'icon-usd-circle',
+        component: './Customer/Test'
       }
-      // {
-      //   path: '/customer/test',
-      //   name: 'test',
-      //   icon: 'icon-usd-circle',
-      //   component: './Customer/Test'
-      // }
     ]
   },
   {

package.json

@@ -57,7 +57,6 @@
     "@umijs/route-utils": "^2.0.5",
     "ahooks": "^2.10.0",
     "antd": "4.21.0",
-    "antd-dayjs-webpack-plugin": "^1.0.6",
     "antd-img-crop": "^3.16.0",
     "classnames": "^2.2.6",
     "crypto-js": "^4.0.0",
@@ -98,6 +97,7 @@
     "@umijs/preset-ant-design-pro": "^1.2.0",
     "@umijs/preset-react": "1.8.12",
     "@umijs/yorkie": "^2.0.3",
+    "antd-dayjs-webpack-plugin": "^1.0.6",
     "babel-plugin-import": "^1.13.5",
     "carlo": "^0.9.46",
     "compression-webpack-plugin": "4.0.1",

src/global.less

@@ -132,9 +132,7 @@ input:-webkit-autofill:active {
   width: 100% !important;
 }
 
-// .ant-modal-header {
-//   padding: 0;
-// }
+
 // 弹窗左右结构
 .sheet-box {
   // overflow: hidden;
@@ -151,28 +149,34 @@ input:-webkit-autofill:active {
   .sheet-box-right {
     background-color: #fafafa;
     border-left: 1px solid #eaeaea;
+    .sheet-right-panel,
+    .sheet-panel-record {
+      height: calc(50vh - 62px);
+      overflow-x: hidden;
+      overflow-y: auto;
+      // 带有按钮时需减去54px
+      &.sheet-panel-has-btn {
+        height: calc(50vh - 62px - 54px);
+      }
+    }
+    .sheet-btns {
+      height: 54px;
+    }
+    .sheet-right-panel {
+      & .ant-card, & .ant-table {
+        background: #fafafa;
+      }
+      // .ant-table-tbody {
+      //   & > tr.ant-table-placeholder > td {
+      //     border-bottom: none;
+      //   }
+      //   & > tr.ant-table-placeholder:hover > td {
+      //     background: none !important;
+      //   }
+      // }
+    }
   }
 }
-.sheet-right-panel,
-.sheet-panel-record {
-  height: calc((100vh - 48px - 92px - 44px) / 2);
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-
-.sheet-btns {
-  height: 54px;
-}
-.sheet-right-panel .ant-card,
-.sheet-right-panel .ant-table {
-  background: #fafafa;
-}
-.sheet-right-panel .ant-table-tbody > tr.ant-table-placeholder > td {
-  border-bottom: none;
-}
-.sheet-right-panel .ant-table-tbody > tr.ant-table-placeholder:hover > td {
-  background: none !important;
-}
 
 /** 滚动条自定义 */
 ::-webkit-scrollbar {
@@ -234,22 +238,3 @@ input:-webkit-autofill:active {
     width: 250px;
   }
 }
-
-.card-transition {
-  // display: flex;
-  // justify-content: center;
-  height: calc(11.11111vw - 20px);
-  min-height: 130px;
-  max-height: 280px;
-  -o-object-fit: cover;
-  object-fit: cover;
-  overflow: hidden;
-  border: 1px solid #f0f0f0;
-  border-radius: 6px;
-  transition: all 0.3s;
-}
-.card-transition:hover {
-  // border-color: transparent;
-  // box-shadow: 0 6px 16px rgb(107 147 224 / 14%);
-  // transform: translateY(-4px);
-}

src/pages/Customer/Client/components/ClientDetail/LowerList.tsx

@@ -170,7 +170,7 @@ const ClientLowerList: React.FC<ClientLowerListProps> = ({
   serviceList,
   updatePayload
 }) => {
-  const tableHeight = (document.body.clientHeight - 124 - 54 - 40 - 40 - 4) / 2
+  const tableHeight = (document.body.clientHeight - 124 - 78) / 2
   const columns: ProColumns<API.LogItem>[] = [
     {
       title: '日期',

src/pages/Customer/Client/components/ClientDetail/TabList.jsx

@@ -23,8 +23,7 @@ const ClientTabList = ({ clientId, software, updatePayload }) => {
     cloud: [],
     loading: false // 云版表格loading
   })
-  const clientHeight = (document.body.clientHeight - 48 - 92 - 64 - 120) / 2
-
+  const clientHeight = (document.body.clientHeight - 124 - 78) / 2 - 54
   const columns = [
     {
       title: '锁号',
@@ -194,8 +193,8 @@ const ClientTabList = ({ clientId, software, updatePayload }) => {
       <div className="pl-15px">
         <Tabs onChange={handleTabChange}>
           <TabPane tab={<span>软件锁{renderBadge(software.total, true)}</span>} key="1">
+            <div className="sheet-right-panel sheet-panel-has-btn">
             <ProTable
-              className="sheet-right-panel"
               size="small"
               columns={columns}
               search={false}
@@ -206,6 +205,8 @@ const ClientTabList = ({ clientId, software, updatePayload }) => {
               pagination={false}
               scroll={{ y: clientHeight }}
             />
+            </div>
+
           </TabPane>
           <TabPane tab="云版" key="2">
             <Table

src/pages/Customer/Company/components/CompanyDetail/LowerList.tsx

@@ -18,7 +18,7 @@ const CompanyLowerList: React.FC<CompanyLowerListProps> = ({
   serviceList,
   updatePayload
 }) => {
-  const tableHeight = (document.body.clientHeight - 124 - 54 - 40 - 40 - 4) / 2
+  const tableHeight = (document.body.clientHeight - 124 - 78) / 2
   const columns: ProColumns<API.LogItem>[] = [
     {
       title: '日期',

src/pages/Customer/Company/components/CompanyDetail/TabList.jsx

@@ -36,7 +36,7 @@ const CompanyTabList = ({ initData, customerId, client, software, customer, busi
     loading: false // 云版loading
   })
 
-  const tableHeight = (document.body.clientHeight - 48 - 92 - 64 - 120) / 2
+  const tableHeight = (document.body.clientHeight - 124 - 78) / 2 - 54
 
   const changePriority = async (key, clientId) => {
     const { code = -1 } = await updateClient({
@@ -373,7 +373,7 @@ const CompanyTabList = ({ initData, customerId, client, software, customer, busi
       <div className="pl-15px">
         <Tabs onChange={handleTabChange}>
           <TabPane tab={<span>客户{renderBadge(client.total, true)}</span>} key={tabEnum.CLIENT}>
-            <div className="sheet-right-panel">
+            <div className="sheet-right-panel sheet-panel-has-btn">
               <Table
                 rowKey="id"
                 size="small"
@@ -386,7 +386,7 @@ const CompanyTabList = ({ initData, customerId, client, software, customer, busi
             </div>
           </TabPane>
           <TabPane tab={<span>软件锁{renderBadge(software.total, true)}</span>} key={tabEnum.SOFTWARE}>
-            <div className="sheet-right-panel">
+            <div className="sheet-right-panel sheet-panel-has-btn">
               <ProTable
                 size="small"
                 columns={columnLongle}
@@ -401,7 +401,7 @@ const CompanyTabList = ({ initData, customerId, client, software, customer, busi
           </TabPane>
           <TabPane tab="云版" key={tabEnum.CLOUD}>
             <Table
-              className="sheet-right-panel"
+              className="sheet-right-panel sheet-panel-has-btn"
               size="small"
               loading={state.loading}
               columns={cloudColumns}

src/pages/Customer/Test/index.tsx

@@ -76,22 +76,9 @@ const Test = () => {
     }
   ]
   return (
-    <div className="h-full w-full flex flex-row overflow-scroll">
-      <div className="w-500px h-400px">
-        <TimeLineList<LogItem>
-          mode="line"
-          dataSource={dataSource}
-          renderItem={() => <div className="w-full h-150px bg-yellow-400 mb-4" />}
-        />
-      </div>
-
-      <div className="w-500px h-400px ml-9">
-        <TimeLineList<LogItem>
-          mode="card"
-          dataSource={dataSource1}
-          renderItem={() => <div className="w-full h-150px bg-green-400" />}
-        />
-      </div>
+    <div className="w-300px max-h-300px ">
+      <div className='h-full bg-red'>111</div>
+      <div className='h-100px bg-green'>222</div>
     </div>
   )
 }

src/pages/Product/Cloud/components/Detail/LowerList.jsx

@@ -1,93 +0,0 @@
-import React from 'react'
-import { Tabs, List, Row, Col, Table } from 'antd'
-import { dayjsFormat } from '@/utils/utils'
-import consts from '@/consts'
-import { isDevMode } from '@/utils/env'
-import { servicelogEnum } from '@/pages/Customer/Client/components/ClientDetail/LowerList'
-
-const RoadpricingLowerList = props => {
-  const {
-    log: { log = [] },
-    serviceLog
-  } = props
-  const { TabPane } = Tabs
-  const columns = [
-    {
-      title: '日期',
-      dataIndex: 'create_time',
-      key: 'create_time',
-      width: 100
-    },
-    {
-      title: '操作人',
-      dataIndex: 'operatorName',
-      key: 'operatorName',
-      width: 115,
-      render: (_, record) => (
-        <div className="flex items-center flex-row ml-2">
-          <img
-            className="w-full max-w-30px h-30px border rounded-30px"
-            src={
-              (isDevMode() ? 'http://cld2qa.com' : 'http://zhcld.com') +
-              (record?.avatar ?? consts.DEFAULT_AVATAR)
-            }
-          />
-          <span className="ml-1">{record.operatorName}</span>
-        </div>
-      )
-    },
-    {
-      title: '操作',
-      dataIndex: 'operationType',
-      key: 'operationType',
-      width: 75
-    },
-    {
-      title: '操作内容',
-      dataIndex: 'content',
-      key: 'content',
-      width: 150
-    }
-  ]
-  return (
-    <div>
-      <div className="pl-4">
-        <Tabs>
-          <TabPane tab="服务记录" key="服务记录">
-            <div className="sheet-panel-record">
-              <Row>
-                <Col span="8">类型/时间</Col>
-                <Col span="16">服务内容</Col>
-              </Row>
-              <List
-                dataSource={serviceLog}
-                split={false}
-                renderItem={item => (
-                  <List.Item>
-                    <Row className="w-full">
-                      <Col span="8">
-                        <a className="mr-1">@{item.staffName}</a>
-                        {servicelogEnum[item.status]}
-                        <List.Item.Meta description={dayjsFormat(item.date, 'YYYY-MM-DD')} />
-                      </Col>
-                      <Col span="16" className="whitespace-pre-line">
-                        {item.mark}
-                      </Col>
-                    </Row>
-                  </List.Item>
-                )}
-              />
-            </div>
-          </TabPane>
-          <TabPane tab="日志" key="日志">
-            <div className="sheet-panel-record">
-              <Table rowKey="id" columns={columns} dataSource={log} pagination={false} />
-            </div>
-          </TabPane>
-        </Tabs>
-      </div>
-    </div>
-  )
-}
-
-export default RoadpricingLowerList

src/pages/Product/Cloud/components/Detail/LowerList.tsx

@@ -0,0 +1,71 @@
+import React from 'react'
+import { Tabs, Table } from 'antd'
+import { ServiceLogItem, ServiceLogType } from '@/pages/Customer/Client/components/ClientDetail/LowerList'
+const { TabPane } = Tabs
+
+type RoadpricingLowerPorps = {
+  logList: {
+    log: any[]
+  }
+  serviceList: API.ServiceLogItem[]
+  updatePayload: { main: string; target: string }
+}
+
+
+const RoadpricingLowerList: React.FC<RoadpricingLowerPorps> = ({
+  logList: { log: logs = [] },
+  serviceList,
+  updatePayload
+}) => {
+  const tableHeight = (document.body.clientHeight - 124 - 78) / 2
+  const columns = [
+    {
+      title: '日期',
+      dataIndex: 'create_time',
+      key: 'create_time',
+      width: 160
+    },
+    {
+      title: '操作人',
+      dataIndex: 'operatorName',
+      key: 'operatorName',
+      ellipsis: true,
+      width: 115
+    },
+    {
+      title: '操作',
+      dataIndex: 'operationType',
+      key: 'operationType',
+      ellipsis: true,
+      width: 75
+    },
+    {
+      title: '操作内容',
+      dataIndex: 'content',
+      ellipsis: true,
+      key: 'content'
+    }
+  ]
+  return (
+      <div className="pl-4">
+        <Tabs>
+          <TabPane tab="服务记录" key="服务记录">
+            <div className="sheet-panel-record">
+            {serviceList.map(item => (
+                <div className="mb-3" key={item.id}>
+                  <ServiceLogItem item={item} logType={ServiceLogType.CLIENT} updatePayload={updatePayload} />
+                </div>
+              ))}
+            </div>
+          </TabPane>
+          <TabPane tab="日志" key="日志">
+            <div className="sheet-panel-record">
+              <Table rowKey="id" columns={columns} dataSource={logs} pagination={false} size="small" scroll={{ y: tableHeight }}/>
+            </div>
+          </TabPane>
+        </Tabs>
+      </div>
+  )
+}
+
+export default RoadpricingLowerList

src/pages/Product/Cloud/components/Detail/TabList.jsx

@@ -12,6 +12,11 @@ export const lockEnum = {
   3: '赠送'
 }
 
+const isUpgradeEnum = {
+  true: '已升级',
+  undefined: ''
+}
+
 const RoadpricingTabList = props => {
   const {
     compilationList,
@@ -20,10 +25,7 @@ const RoadpricingTabList = props => {
     ssoId,
     actionPayload = { main: 'cloud' }
   } = props
-  const isUpgradeEnum = {
-    true: '已升级',
-    undefined: ''
-  }
+  const tableHeight = (document.body.clientHeight - 124 - 78) / 2
   const { TabPane } = Tabs
   const dispatch = useDispatch()
   const tRef = useRef(null)
@@ -231,11 +233,10 @@ const RoadpricingTabList = props => {
     }
   ]
   return (
-    <div>
       <div className="pl-15px">
         <Tabs>
           <TabPane tab={titleEnum[projectType]} key={titleEnum[projectType]}>
-            <div className="sheet-right-panel" ref={tRef}>
+            <div className="sheet-right-panel">
               <ProTable
                 size="small"
                 columns={columns}
@@ -243,6 +244,7 @@ const RoadpricingTabList = props => {
                 toolBarRender={false}
                 rowKey={record => record._id}
                 dataSource={compilationList}
+                scroll={{ y: tableHeight }}
                 pagination={false}
               />
             </div>
@@ -256,22 +258,22 @@ const RoadpricingTabList = props => {
                 toolBarRender={false}
                 rowKey={record => record._id}
                 dataSource={online_list}
+                scroll={{ y: tableHeight }}
                 pagination={false}
               />
             </div>
           </TabPane>
         </Tabs>
+        <UpgradeModal
+          onConfirm={handleRoadPricingUpgrade}
+          onCancel={() => setRoadPricingUpgrade({ ...roadPricingUpgrade, visible: false })}
+          actionPayload={actionPayload}
+          projectType={projectType}
+          ssoId={ssoId}
+          cloudUser={{ mobile, username }}
+          roadPricingUpgrade={roadPricingUpgrade}
+        />
       </div>
-      <UpgradeModal
-        onConfirm={handleRoadPricingUpgrade}
-        onCancel={() => setRoadPricingUpgrade({ ...roadPricingUpgrade, visible: false })}
-        actionPayload={actionPayload}
-        projectType={projectType}
-        ssoId={ssoId}
-        cloudUser={{ mobile, username }}
-        roadPricingUpgrade={roadPricingUpgrade}
-      />
-    </div>
   )
 }
 

src/pages/Product/Cloud/components/Detail/index.jsx

@@ -145,7 +145,11 @@ const CloudDetail = props => {
                   projectType={projectType}
                   ssoId={state.cloudUser.ssoId}
                 />
-                <LowerList log={state.log} serviceLog={state.serviceLog} />
+                <LowerList
+                  logList={state.log}
+                  serviceList={state.serviceLog}
+                  updatePayload={{ main: updateKey, target: dataId }}
+                />
               </Col>
             </Row>
           </div>

src/pages/Product/Lock/LockStore/components/LockDetail/LowerList.tsx

@@ -10,7 +10,7 @@ type LockLowerListProps = {
 }
 
 const LockLowerList: React.FC<LockLowerListProps> = ({ logList: { log: logs = [] } }) => {
-  const tableHeight = (document.body.clientHeight - 124 - 54 - 40 - 40 - 4) / 2
+  const tableHeight = (document.body.clientHeight - 124 - 78) / 2
   const columns: ProColumns<API.LogItem>[] = [
     {
       title: '日期',
@@ -46,7 +46,6 @@ const LockLowerList: React.FC<LockLowerListProps> = ({ logList: { log: logs = []
     })
   }, [])
   return (
-    <div>
       <div className="pl-4">
         <Tabs>
           <TabPane tab="日志" key="日志">
@@ -66,7 +65,6 @@ const LockLowerList: React.FC<LockLowerListProps> = ({ logList: { log: logs = []
           </TabPane>
         </Tabs>
       </div>
-    </div>
   )
 }
 

src/pages/Product/Lock/LockStore/components/LockDetail/TabList.tsx

@@ -222,7 +222,7 @@ const LockTabList: React.FC<LockTabListProps> = ({
       <div className="pl-4">
         <Tabs>
           <TabPane tab="记录内容" key="记录内容">
-            <div className="sheet-panel-record">
+            <div className="sheet-panel-record sheet-panel-has-btn">
               <TimeLineList<API.ServiceLogItem>
                 rowkey="id"
                 mode="line"
@@ -235,63 +235,63 @@ const LockTabList: React.FC<LockTabListProps> = ({
         </Tabs>
       </div>
       <div className="sheet-btns pl-4 pt-4 flex">
-        {[StockStatus.CHUKU].includes(stockStatus) ? (
-          <Button
-            type="primary"
-            ghost
-            size="small"
-            className="mr-3px"
-            onClick={() => openLockModal(lockTypeEnum.RECEIVE)}>
-            接收
-          </Button>
-        ) : null}
-        {([StockStatus.CHUKU, StockStatus.CREATE].includes(stockStatus) &&
-          [SellStatus.NONE].includes(sellStatus)) ||
-        [PreserveStatus.REPLACE].includes(preserveStatus) ? (
-          <Button
-            type="primary"
-            ghost
-            size="small"
-            className="mr-1"
-            onClick={() => openLockModal(lockTypeEnum.SALE)}>
-            借销赠
-          </Button>
-        ) : null}
-        {[SellStatus.SALES, SellStatus.LENDING].includes(sellStatus) &&
-        [PreserveStatus.SAFEGUARD, PreserveStatus.REPLACE].includes(preserveStatus) ? (
-          <Button
-            type="primary"
-            ghost
-            size="small"
-            className="mr-1"
-            onClick={() => openLockModal(lockTypeEnum.CHANGE)}>
-            更换
-          </Button>
-        ) : null}
-        {[PreserveStatus.NONE, PreserveStatus.SAFEGUARD, PreserveStatus.UPGRADE].includes(preserveStatus) ? (
-          <Button
-            type="primary"
-            ghost
-            size="small"
-            className="mr-1"
-            onClick={() => openLockModal(lockTypeEnum.RECOVER)}>
-            收回
-          </Button>
-        ) : null}
-        {/* <Button
-          type="primary"
-          ghost
-          size="small"
-          className="mr-1"
-          onClick={() =>
-            setAddLonglelog({ ...setAddLonglelog, visible: true, type: lockTypeEnum.UPDATE })
-          }
-        >
-          升级
-        </Button> */}
-        <Button type="primary" ghost size="small" onClick={() => openLockModal(lockTypeEnum.REMARK)}>
-          备注
-        </Button>
+  {[StockStatus.CHUKU].includes(stockStatus) ? (
+    <Button
+      type="primary"
+      ghost
+      size="small"
+      className="mr-3px"
+      onClick={() => openLockModal(lockTypeEnum.RECEIVE)}>
+      接收
+    </Button>
+  ) : null}
+  {([StockStatus.CHUKU, StockStatus.CREATE].includes(stockStatus) &&
+    [SellStatus.NONE].includes(sellStatus)) ||
+  [PreserveStatus.REPLACE].includes(preserveStatus) ? (
+    <Button
+      type="primary"
+      ghost
+      size="small"
+      className="mr-1"
+      onClick={() => openLockModal(lockTypeEnum.SALE)}>
+      借销赠
+    </Button>
+  ) : null}
+  {[SellStatus.SALES, SellStatus.LENDING].includes(sellStatus) &&
+  [PreserveStatus.SAFEGUARD, PreserveStatus.REPLACE].includes(preserveStatus) ? (
+    <Button
+      type="primary"
+      ghost
+      size="small"
+      className="mr-1"
+      onClick={() => openLockModal(lockTypeEnum.CHANGE)}>
+      更换
+    </Button>
+  ) : null}
+  {[PreserveStatus.NONE, PreserveStatus.SAFEGUARD, PreserveStatus.UPGRADE].includes(preserveStatus) ? (
+    <Button
+      type="primary"
+      ghost
+      size="small"
+      className="mr-1"
+      onClick={() => openLockModal(lockTypeEnum.RECOVER)}>
+      收回
+    </Button>
+  ) : null}
+  {/* <Button
+    type="primary"
+    ghost
+    size="small"
+    className="mr-1"
+    onClick={() =>
+      setAddLonglelog({ ...setAddLonglelog, visible: true, type: lockTypeEnum.UPDATE })
+    }
+  >
+    升级
+  </Button> */}
+  <Button type="primary" ghost size="small" onClick={() => openLockModal(lockTypeEnum.REMARK)}>
+    备注
+  </Button>
       </div>
     </div>
   )

src/pages/Product/Road/Enterprise/components/Detail/TabList.jsx

@@ -9,6 +9,7 @@ import { useDispatch } from 'dva'
 import { dayjsFormat } from '@/utils/utils'
 import DeadlineModal from './DeadlineModal'
 import { upgradeTypeEnum } from '@/pages/Product/Cloud/components/Detail/UpgradeModal'
+const { TabPane } = Tabs
 
 const EnterpriseTabList = props => {
   const {
@@ -18,7 +19,7 @@ const EnterpriseTabList = props => {
     companyId,
     actionPayload = { main: 'enterprise' }
   } = props
-  const { TabPane } = Tabs
+  const tableHeight = (document.body.clientHeight - 124 - 78) / 2
   const dispatch = useDispatch()
   const dispatchModal = useModal()
   const [roadPricingDeadline, setRoadPricingDeadline] = useState({
@@ -119,7 +120,7 @@ const EnterpriseTabList = props => {
       <div className="pl-15px">
         <Tabs>
           <TabPane tab={<span>授权定额</span>} key="1">
-            <div className="sheet-right-panel">
+            <div className="sheet-right-panel sheet-panel-has-btn">
               <ProTable
                 size="small"
                 columns={columns}
@@ -128,11 +129,12 @@ const EnterpriseTabList = props => {
                 rowKey={record => record.compilationID}
                 dataSource={proCptList}
                 pagination={false}
+                scroll={{ y: tableHeight }}
               />
             </div>
           </TabPane>
           <TabPane tab={<span>授权用户</span>} key="2">
-            <div className="sheet-right-panel">
+            <div className="sheet-right-panel sheet-panel-has-btn">
               <ProTable
                 size="small"
                 columns={columnOnline}
@@ -141,6 +143,7 @@ const EnterpriseTabList = props => {
                 rowKey={record => record.userID}
                 dataSource={members}
                 pagination={false}
+                scroll={{ y: tableHeight }}
               />
             </div>
           </TabPane>

src/pages/Product/Road/Personal/components/Detail/TabList.jsx

@@ -90,12 +90,6 @@ const PersonalTabList = props => {
       title: '限期',
       dataIndex: 'deadline',
       width: '10%',
-      // renderText: text => {
-      //   if (text !== 0 && text !== null) {
-      //     return <>{dayjsFormat(text, 'YYYY-MM-DD HH:mm')}</>
-      //   }
-      //   return text
-      // }
       renderText: text => text && dayjsFormat(text, 'YYYY-MM-DD HH:mm')
     },
     {
@@ -166,94 +160,17 @@ const PersonalTabList = props => {
               </Button>
             </>
           ) : null}
-          {/* {record.isUpgrade ? (
-            <>
-              <Button
-                type="primary"
-                ghost
-                danger
-                size="small"
-                onClick={() =>
-                  setRoadPricingUpgradev2({
-                    ...setRoadPricingUpgradev2,
-                    visible: true,
-                    type: titleType.DEADLINE,
-                    deadline: record.deadline,
-                    // eslint-disable-next-line no-underscore-dangle
-                    compilationId: record.ID,
-                    compilationName: record.name,
-                    compilationListName: record.name,
-                    lockTypeEnum: record.lock,
-                    upgradeTypeEnum: upgradeTypeEnum.DEADLINE
-                  })
-                }>
-                限期
-              </Button>
-            </>
-          ) : (
-            <>
-              <Button
-                type="primary"
-                ghost
-                size="small"
-                className="m-2px"
-                onClick={() =>
-                  setRoadPricingUpgradev2({
-                    ...setRoadPricingUpgradev2,
-                    visible: true,
-                    type: titleType.LEND,
-                    salesType: salesTypeEnum.LEND,
-                    compilationId: record.ID,
-                    compilationName: record.name,
-                    lockTypeEnum: lockTypeEnum.LEND,
-                    upgradeTypeEnum: upgradeTypeEnum.UPGRADE
-                  })
-                }>
-                借出
-              </Button>
-              <Button
-                type="primary"
-                ghost
-                size="small"
-                className="m-2px"
-                onClick={() =>
-                  setRoadPricingUpgradev2({
-                    ...setRoadPricingUpgradev2,
-                    visible: true,
-                    type: titleType.SALE,
-                    salesType: salesTypeEnum.SALES,
-                    compilationId: record.ID,
-                    compilationName: record.name,
-                    lockTypeEnum: lockTypeEnum.SALE,
-                    upgradeTypeEnum: upgradeTypeEnum.UPGRADE
-                  })
-                }>
-                销售
-              </Button>
-            </>
-          )} */}
         </>
       )
     }
   ]
-  // const columnOnline = [
-  //   {
-  //     title: '日期',
-  //     dataIndex: 'dateString',
-  //     width: '12%'
-  //   },
-  //   {
-  //     title: '时长',
-  //     dataIndex: 'online_times',
-  //     width: '17%'
-  //   }
-  // ]
+
   return (
     <div>
       <div className="pl-15px">
         <Tabs>
           <TabPane tab="个人版" key="个人版">
-            <div className="sheet-right-panel">
+            <div className="sheet-right-panel sheet-panel-has-btn">
               <ProTable
                 size="small"
                 columns={columns}
@@ -265,19 +182,6 @@ const PersonalTabList = props => {
               />
             </div>
           </TabPane>
-          {/* <TabPane tab="在线时长" key="在线时长">
-            <div className="sheet-right-panel">
-              <ProTable
-                size="small"
-                columns={columnOnline}
-                search={false}
-                toolBarRender={false}
-                rowKey={record => record._id}
-                dataSource={online_list}
-                pagination={false}
-              />
-            </div>
-          </TabPane> */}
         </Tabs>
       </div>
       <UpgradeModalv2