自适应高度调整

src/basic/css/common.scss

@@ -18,16 +18,8 @@
   // 弹窗左右结构
 .sheet-box {
   overflow: hidden;
-  .sheet-box-left {
-    height: calc(100vh - 25px);
-    overflow-y: auto;
-    .sheet-left-panel {
-      overflow-x: hidden;
-    }
-
-  }
 }
-.sheet-right-panel {
+.sheet-right-panel,.sheet-panel-record {
   height: 280px;
   overflow-x: hidden;
   overflow-y: auto;
@@ -35,10 +27,6 @@
 .sheet-btns {
   height: 54px;
 }
-.sheet-panel-record {
-  // height: 340px;
-  overflow-x: hidden;
-}
 
   background-color: $zh-red;
 }
@@ -185,7 +173,7 @@
 }
 
 .zh-block {
-  display:inline-block !important;
+  display:inline-block;
 }
 
 /** flex布局 */
@@ -458,24 +446,12 @@
 // 弹窗左右结构
 .sheet-box {
   overflow: hidden;
-  .sheet-box-left {
-    height: calc(100vh - 25px);
-    overflow-y: auto;
-    .sheet-left-panel {
-      overflow-x: hidden;
-    }
-
-  }
 }
-.sheet-right-panel {
-  height: 280px;
+.sheet-right-panel,.sheet-panel-record {
+  height: calc((100vh - 48px - 92px - 64px) / 2);
   overflow-x: hidden;
   overflow-y: auto;
 }
 .sheet-btns {
   height: 54px;
 }
-.sheet-panel-record {
-  // height: 340px;
-  overflow-x: hidden;
-}

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

@@ -1,5 +1,4 @@
 import { Tabs, List } from 'antd'
-import useAutoTable from '@/hooks/useAutoTable'
 import { dayjsFormat } from '@/utils/utils'
 
 const CompanyLowerList = props => {
@@ -7,14 +6,12 @@ const CompanyLowerList = props => {
     log: { log: logs = [], total = 0 }
   } = props
   const { TabPane } = Tabs
-  const needSubtractHeight = 48 + 48 + 48 + 64 + 24 // 需要被裁掉的高度
-  const [x, y] = useAutoTable(needSubtractHeight)
   return (
     <div>
       <div className="zh-pd-left-15">
         <Tabs>
           <TabPane tab="日志" key="日志">
-            <div className="sheet-panel-record" style={{ height: y - 250, overflowY: 'auto' }}>
+            <div className="sheet-panel-record">
               <List
                 dataSource={logs}
                 split={false}

src/pages/Customer/Contact/components/ContactDetail/ContanctLowerList.jsx

@@ -1,6 +1,5 @@
 import { Tabs, List, Row, Col } from 'antd'
 import React from 'react'
-import useAutoTable from '@/hooks/useAutoTable'
 import { dayjsFormat } from '@/utils/utils'
 
 const ContanctLowerList = props => {
@@ -15,16 +14,12 @@ const ContanctLowerList = props => {
     4: '在线服务'
   }
   const { TabPane } = Tabs
-  const needSubtractHeight = 48 + 48 + 48 + 64 + 24 // 需要被裁掉的高度
-  // const needSubtractWidth = (collapsed ? 208 : 48) + 48 + 48 + 48 // 需要被裁掉的高度
-
-  const [x, y] = useAutoTable(needSubtractHeight)
   return (
     <div>
       <div className="zh-pd-left-15">
         <Tabs>
           <TabPane tab="服务记录" key="服务记录">
-            <div className="sheet-panel-record" style={{ height: y - 310, overflowY: 'auto' }}>
+            <div className="sheet-panel-record">
               <Row>
                 <Col span="8">类型/时间</Col>
                 <Col span="16">服务内容</Col>
@@ -49,7 +44,7 @@ const ContanctLowerList = props => {
             </div>
           </TabPane>
           <TabPane tab="日志" key="日志">
-            <div className="sheet-panel-record" style={{ height: y - 310, overflowY: 'auto' }}>
+            <div className="sheet-panel-record">
               <List
                 dataSource={logs}
                 split={false}

src/pages/Product/Lock/Lockstore/components/LocksDetail/LockLowerList.jsx

@@ -1,5 +1,4 @@
 import { Tabs, List } from 'antd'
-import useAutoTable from '@/hooks/useAutoTable'
 import { dayjsFormat } from '@/utils/utils'
 
 const LockLowerList = props => {
@@ -8,14 +7,12 @@ const LockLowerList = props => {
     log: { log: logs = [], total = 0 }
   } = props
   const { TabPane } = Tabs
-  const needSubtractHeight = 48 + 48 + 48 + 64 + 24 // 需要被裁掉的高度
-  const [x, y] = useAutoTable(collapsed, needSubtractHeight)
   return (
     <div>
       <div className="zh-pd-left-15">
         <Tabs>
           <TabPane tab="日志" key="日志">
-            <div className="sheet-panel-record" style={{ height: y - 310, overflowY: 'auto' }}>
+            <div className="sheet-panel-record">
               <List
                 dataSource={logs}
                 split={false}

src/pages/Product/Lock/Lockstore/components/LocksDetail/LockModal.jsx

@@ -12,8 +12,8 @@ const LockModal = props => {
   const modalTitleEnum = {
     5: '升级软件锁',
     6: '更换软件锁',
-    8: '备注',
-    7: '回收软件锁'
+    8: '备注信息',
+    7: '确认收回'
   }
   const [form] = Form.useForm()
   const { Option } = Select
@@ -67,7 +67,7 @@ const LockModal = props => {
         {type === lockTypeEnum.RECOVER ? (
           <>
             <p>
-              回收锁号<span className="zh-fw-600">{keyNum}</span>
+              收回锁号<span className="zh-fw-600">{keyNum}</span>
             </p>
             <Form.Item name="longleId" hidden>
               <Input />

src/pages/Product/Lock/Lockstore/components/LocksDetail/LockRecover.jsx

@@ -1,33 +0,0 @@
-import { ModalForm } from '@ant-design/pro-form'
-import React from 'react'
-import { Button } from 'antd'
-
-const LockRecover = props => {
-  const { onConfirm } = props
-  const layout = {
-    layout: 'vertical'
-  }
-  return (
-    <div>
-      <ModalForm
-        width={500}
-        {...layout}
-        title="确认收回"
-        trigger={
-          <Button type="primary" ghost size="small" className="zh-mg-right-3">
-            收回
-          </Button>
-        }
-        onFinish={async values => {
-          await onConfirm(values)
-          return true
-        }}>
-        <div>
-          收回锁号<b>HNYH-0654</b>
-        </div>
-      </ModalForm>
-    </div>
-  )
-}
-
-export default LockRecover

src/pages/Product/Lock/Lockstore/components/LocksDetail/LockRemarks.jsx

@@ -1,31 +0,0 @@
-import { ModalForm, ProFormTextArea } from '@ant-design/pro-form'
-import React from 'react'
-import { Button } from 'antd'
-
-const LockRemarks = props => {
-  const { onConfirm } = props
-  const layout = {
-    layout: 'vertical'
-  }
-  return (
-    <div>
-      <ModalForm
-        width={500}
-        {...layout}
-        title="备注信息"
-        trigger={
-          <Button type="primary" ghost size="small" className="zh-mg-right-3">
-            备注
-          </Button>
-        }
-        onFinish={async values => {
-          await onConfirm(values)
-          return true
-        }}>
-        <ProFormTextArea label="备注" name="mark"></ProFormTextArea>
-      </ModalForm>
-    </div>
-  )
-}
-
-export default LockRemarks

src/pages/Product/Lock/Lockstore/components/LocksDetail/LockReplace.jsx

@@ -1,35 +0,0 @@
-import { ModalForm, ProFormText } from '@ant-design/pro-form'
-import React from 'react'
-import { Button } from 'antd'
-
-const LockReplace = props => {
-  const { onConfirm } = props
-  const layout = {
-    layout: 'vertical'
-  }
-  return (
-    <div>
-      <ModalForm
-        width={500}
-        {...layout}
-        title="更换软件锁"
-        trigger={
-          <Button type="primary" ghost size="small" className="zh-mg-right-3">
-            更换
-          </Button>
-        }
-        onFinish={async values => {
-          await onConfirm(values)
-          return true
-        }}>
-        <ProFormText
-          name="newLongleId"
-          label="新锁号"
-          placeholder="请选择新锁号"
-          rules={[{ required: true, message: '请选择新增产品' }]}></ProFormText>
-      </ModalForm>
-    </div>
-  )
-}
-
-export default LockReplace

src/pages/Product/Lock/Lockstore/components/LocksDetail/LockSales.jsx

@@ -1,7 +0,0 @@
-import React from 'react'
-
-const LockSales = () => {
-  return <div>借出</div>
-}
-
-export default LockSales

src/pages/Product/Lock/Lockstore/index.jsx

@@ -18,9 +18,11 @@ export const ProductLabel = ({ data }) => {
   return (
     <div>
       {newData.map((item, index) => (
-        <Tag key={index} color="#886ab5" className="zh-mg-bottom-5 zh-block">
-          {item}
-        </Tag>
+        <span className="zh-mg-bottom-5 zh-block">
+          <Tag key={index} color="#886ab5">
+            {item}
+          </Tag>
+        </span>
       ))}
     </div>
   )