1.处理下拉表格再某些条件下，显示错位异常bug

Min
1 parent 0960448f
Showing 3 changed files with 53 additions and 45 deletions
src/components/Common/CommonComponent/index.js
src/default.less
src/utils/config.js
@@ -982,44 +982,46 @@ export default class CommonComponent extends Component {
     });
     return (
-      <Option key="" className="select-table-option">
-        <div
-          style={{ width: scrollX + 8, maxWidth: "calc(100vw - 16px)", minWidth: "100%" }}
-          ref={ref => {
-            this.selectTableRef1 = ref;
+      <div
+        className="select-table-option ant-dropdown-menu ant-dropdown-menu-vertical"
+        // className="select-table-option"
+        style={{
+          width: scrollX + 8,
+          maxWidth: "calc(100vw - 16px)",
+          minWidth: "100%",
+        }}
+        ref={ref => { this.selectTableRef1 = ref; }}
+      >
+        <Table
+          size="small"
+          className="select-table"
+          rowClassName={(_, index) => {
+            return selectTableIndex === index ? "selected-record-row" : "";
           }}
-        >
-          <Table
-            size="small"
-            className="select-table"
-            rowClassName={(_, index) => {
-              return selectTableIndex === index ? "selected-record-row" : "";
-            }}
-            rowKey="sId"
-            onRow={(record, index) => {
-              return {
-                index,
-                onMouseEnter: () => {
-                  this.setState({
-                    selectTableIndex: index,
-                  });
-                },
-                onClick: () => {
-                  this.setState({ tempCurrentPage: null, bDropDownOpen: false, bNotFirstEnter: true });
-                  this.handleSelectOptionEvent(record.sSlaveId || record.sId);
-                },
-              };
-            }}
-            pagination={false}
-            scroll={{
-              y: 256 - 10 - 29 - 32,
-              x: scrollX,
-            }}
-            dataSource={selectTableData}
-            columns={columns}
-          />
-        </div>
-      </Option>
+          rowKey="sId"
+          onRow={(record, index) => {
+            return {
+              index,
+              onMouseEnter: () => {
+                this.setState({
+                  selectTableIndex: index,
+                });
+              },
+              onClick: () => {
+                this.setState({ tempCurrentPage: null, bDropDownOpen: false, bNotFirstEnter: true });
+                this.handleSelectOptionEvent(record.sSlaveId || record.sId);
+              },
+            };
+          }}
+          pagination={false}
+          scroll={{
+            y: 256 - 10 - 29 - 32,
+            x: scrollX,
+          }}
+          dataSource={selectTableData}
+          columns={columns}
+        />
+      </div>
     );
   };
@@ -1263,7 +1265,7 @@ export default class CommonComponent extends Component {
         </>
       );
     }
-   const removeExtension = (filename) => {
+    const removeExtension = (filename) => {
       const lastDotIndex = filename.lastIndexOf('.');
       if (lastDotIndex === -1) {
         // 如果字符串中没有点，则返回原字符串
@@ -7,6 +7,8 @@
 .select-table-option {
   max-width: 100wh;
   overflow: hidden;
+  background-color: #ff4d4f;
+  padding: 8px;
   .select-table {
     td {
@@ -16,6 +18,9 @@
       white-space: nowrap;
     }
   }
+  .ant-table-body{
+    overflow-x: hidden!important;
+  }
 }
 .select-search {
@@ -756,10 +761,10 @@ tbody {
   .ant-tabs:not(.noXlyTabs) {
     .ant-tabs-nav-wrap {
       background: #fff;
-  
+
       .ant-tabs-nav-list {
         background: #fff;
-  
+
         .ant-tabs-tab {
           border: 1px solid #d9d9d9;
           border-right: 0;
@@ -768,17 +773,17 @@ tbody {
           line-height: 30px;
           margin-left: 0;
           background: #fafafa;
-  
+
           &:nth-last-of-type(2) {
             border-right: 1px solid #d9d9d9;
           }
         }
-  
+
         .ant-tabs-tab-active {
           border-bottom: 1px solid transparent;
           background: #fff;
         }
-  
+
         .ant-tabs-ink-bar {
           top: 0;
           bottom: unset;
@@ -1248,4 +1253,4 @@ tbody {
   .ant-tooltip-arrow {
     display: block;
   }
-}
 \ No newline at end of file
+}
@@ -9,10 +9,11 @@ const API = process.env.API;
 const bHttps = localStorage.ipAddress ? false : location.protocol === 'https:';
 export const webSite = {
   faceAddress: isDev ? '//km5cjx.gnway.cc:36867/xlyFace' : '//' + location.host + '/xlyFace',
+  // ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//km5cjx.gnway.cc:36867/xlyEntry/' : '//' + location.host + '/xlyEntry/',
   ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//km5cjx.gnway.cc:36867/xlyEntry/' : '//' + location.host + '/xlyEntry/',
   // ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//118.178.19.35:8088/xlyEntry/' : '//' + location.host + '/xlyEntry/',
-  // ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//km5cjx.gnway.cc:36867/xlyEntry/' : '//' + location.host + '/xlyEntry/',
+  // ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//km5cjx.gnway.cc:37845/xlyEntry/' : '//' + location.host + '/xlyEntry/',
   // ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//8.130.144.93:8088/xlyEntry/' : '//' + location.host + '/xlyEntry/',
   interfaceAddress: localStorage.apiAddress ? localStorage.apiAddress : isDev ? '//km5cjx.gnway.cc:36867/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址
   fileAddress: isDev ? '//km5cjx.gnway.cc:36867/xlyEntry/' : '//' + location.host + '/xlyEntry/', // 接口地址