@bit-sun/business-component 4.0.11 → 4.0.12-alpha.2

package/src/styles/bsDefault.less

@@ -1256,13 +1256,6 @@ ol {
   }
 }
 
-.ant-tabs-tab + .ant-tabs-tab {
-  margin: 0;
-}
-.ant-tabs-tab {
-  margin: 0 20px 0 0 !important;
-}
-
 // 滚动条
 /* 滚动槽（轨道）宽高 */
 
@@ -1325,6 +1318,24 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
       }
     }
   }
+
+  .ant-modal-header {
+    padding: 5px 16px;
+    font-size: 14px;
+    font-weight: 500px;
+  }
+
+  .ant-modal-close-x {
+    display: block;
+    width: 32px;
+    height: 32px;
+    font-size: 14px;
+    font-style: normal;
+    line-height: 32px;
+    text-align: center;
+    text-transform: none;
+    text-rendering: auto;
+  }
 }
 
 // 详情组件样式处理  start
@@ -1517,9 +1528,6 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
 
 .clomnsImg {
   :global {
-    .ant-image {
-      margin: 8px;
-    }
     .ant-image-mask-info {
       font-size: 12px !important;
       padding: 0;
@@ -1528,10 +1536,9 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
   }
 }
 .clomnsImg2 {
-  margin: 8px;
   img {
-    width: 28px;
-    height: 28px;
+    width: 16px;
+    height: 16px;
   }
 }
 
@@ -1755,7 +1762,7 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
 
     .sort_table_column_wrapper {
       width: 560px;
-      margin-right: 10px;
+      margin-right: 8px;
     }
 
     .sort_table_content_wrapper {
@@ -1767,12 +1774,12 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
       height: 20px;
       font-family: PingFangSC-Regular;
       font-weight: 400;
-      font-size: 14px;
+      font-size: 12px;
       color: #000000;
       letter-spacing: 0;
 
       span {
-        color: #848484;
+        color: #8E8E8E;
       }
     }
 
@@ -1797,7 +1804,7 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
           text-align: center;
           font-family: PingFangSC-Regular;
           font-weight: 400;
-          font-size: 14px;
+          font-size: 12px;
           color: #848484;
         }
       }
@@ -1808,34 +1815,33 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
         height: 20px;
         font-family: PingFangSC-Regular;
         font-weight: 400;
-        font-size: 14px;
+        font-size: 12px;
         color: #848484;
         letter-spacing: 0;
       }
 
-      :global {
-        .ant-checkbox-wrapper {
-          width: 144px;
-          margin-top: 16px;
-        }
+      .ant-checkbox-wrapper {
+        width: 144px;
+        height: 16px;
+        line-height: 16px;
+        margin-top: 16px;
+      }
 
-        .ant-checkbox-wrapper + .ant-checkbox-wrapper {
-          margin-left: 0px;
-        }
+      .ant-checkbox-wrapper + .ant-checkbox-wrapper {
+        margin-left: 0px;
       }
     }
 
     .sort_table_content {
+      height: 430px;
       margin-top: 10px;
       padding-top: 10px;
       padding-bottom: 10px;
       border: 1px solid #d9d9d9;
       border-radius: 5px;
 
-      :global {
-        .ant-table-wrapper {
-          padding: 0px !important;
-        }
+      .ant-table-wrapper {
+        padding: 0px !important;
       }
       .sort_table_title {
         height: 32px;
@@ -1845,135 +1851,125 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
       }
     }
   }
-  :global {
-    div.ant-modal-header {
-      width: 820px;
-      height: 64px;
-      background: #ffffff;
-      padding: 20px;
-      border: 0px;
+  
 
-      div.ant-modal-title {
-        height: 24px;
-        font-family: PingFangSC-Medium;
-        font-weight: 500;
-        font-size: 18px;
-        color: #000000;
-        letter-spacing: 0;
-        line-height: 24px;
-      }
-    }
+  .ant-modal-body {
+    padding: 10px 16px;
+  }
+  .ant-modal-close-x {
+    height: 24px;
+    font-family: PingFangSC-Medium;
+    font-weight: 500;
+    font-size: 18px;
+    color: #000000;
+    letter-spacing: 0;
+  }
 
-    .ant-modal-body {
-      padding: 0 20px !important;
-    }
+  .ant-input-affix-wrapper {
+    padding: 0px;
+    padding-right: 10px;
+  }
 
-    .ant-modal-close-x {
-      height: 24px;
-      font-family: PingFangSC-Medium;
-      font-weight: 500;
-      font-size: 18px;
-      color: #000000;
-      letter-spacing: 0;
-    }
+  input {
+    height: 22px;
+    padding: 6px 4px;
+    border-radius: 5px;
+  }
 
-    .ant-input-affix-wrapper {
-      padding: 0px;
-      padding-right: 10px;
-    }
+  .ant-input-prefix {
+    width: 24px;
+    height: 24px;
+    margin: 0 4px;
+    // border: 1px dashed #d9d9d9;
+    display: flex;
+    justify-content: center;
+  }
 
-    input {
-      height: 32px;
-      padding: 6px 4px;
-      border-radius: 5px;
-    }
+  .ant-modal-footer {
+    padding: 8px 16px;
+    display: flex;
+    justify-content: space-between;
+    
+    .ant-btn {
+      width: 80px;
+      height: 28px;
 
-    .ant-select-selector, .ant-input-prefix {
-      width: 24px;
-      height: 24px;
-      margin: 4px;
-      // border: 1px dashed #d9d9d9;
-      display: flex;
-      justify-content: center;
+      span {
+        font-family: PingFangSC-Medium;
+        font-weight: 600;
+        font-size: 12px;
+        letter-spacing: 0;
+        text-align: center;
+        line-height: 20px;
+      }
+
+      // &:first-child {
+      //   margin-right: 524px;
+      // }
     }
+  }
 
-    .ant-modal-footer {
-      height: 70px;
-      border: 0;
-      padding: 20px;
+  .ant-table-wrapper::-webkit-scrollbar {
+    display: none;
+  }
 
-      .ant-btn {
-        width: 80px;
-        height: 34px;
-        border-radius: 5px;
+  .ant-table-wrapper {
+    margin-top: 10px;
+    height: 364px;
+    overflow: scroll;
+    padding-bottom: 50px;
+
+    tr {
+      height: 30px;
+      td {
+        width: 24px !important;
+        height: 30px !important;
+        font-family: PingFangSC-Regular;
+        font-weight: 400;
+        font-size: 12px;
+        color: #000000;
+        letter-spacing: 0;
 
-        span {
-          font-family: PingFangSC-Medium;
-          font-weight: 600;
-          font-size: 14px;
-          letter-spacing: 0;
-          text-align: center;
-          line-height: 20px;
+        &:first-child {
+          padding-left: 10px !important;
+          padding-right: 0px !important;
+          width: 108px !important;
+          display: inline-block;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          height: 30px !important;
+          line-height: 30px !important;
         }
 
-        &:first-child {
-          margin-right: 524px;
+        img {
+          // border: 1px dashed #d9d9d9;
+          cursor: pointer;
         }
-      }
-    }
 
-    .ant-table-wrapper::-webkit-scrollbar {
-      display: none;
-    }
+        &:not(:first-child) {
+          padding-left: 0px !important;
+          padding-right: 0px !important;
+        }
 
-    .ant-table-wrapper {
-      margin-top: 10px;
-      height: 364px;
-      overflow: scroll;
-      padding-bottom: 50px;
-
-      tr {
-        height: 36px;
-        td {
-          width: 24px !important;
-          height: 36px !important;
-          font-family: PingFangSC-Regular;
-          font-weight: 400;
-          font-size: 14px;
-          color: #000000;
-          letter-spacing: 0;
-
-          &:first-child {
-            padding-left: 10px !important;
-            padding-right: 0px !important;
-            width: 115px !important;
-          }
+        &:last-child {
+          padding-left: 0px !important;
+          padding-right: 3px !important;
+          width: 30px !important;
 
           img {
             // border: 1px dashed #d9d9d9;
-            cursor: pointer;
-          }
-
-          &:not(:first-child) {
-            padding-left: 0px !important;
-            padding-right: 0px !important;
-          }
-
-          &:last-child {
-            padding-left: 0px !important;
-            padding-right: 3px !important;
-            width: 34px !important;
-
-            img {
-              // border: 1px dashed #d9d9d9;
-              position: relative;
-              top: 1px;
-            }
+            position: relative;
+            top: 1px;
           }
         }
       }
     }
   }
+
+  .ant-dropdown-link {
+    cursor: pointer;
+  }
 }
 
 // 表单特性

package/src/utils/TableUtils.tsx

@@ -339,7 +339,7 @@ const tableColumnsImage = (url?: string, paramsObj?: tableColumnsImageType) => {
     <>
       {url ? (
         <div className={`clomnsImg`}>
-          <Image src={url} width="44px" height="44px" {...paramsObj}></Image>
+          <Image src={url} width="16px" height="16px" {...paramsObj}></Image>
         </div>
       ) : (
         <img {...paramsObj} src={noImg}></img>

package/src/utils/utils.ts

@@ -11,6 +11,7 @@ import {
   handleTooltip,
   handleTooltipHours,
   tableColumnsImage,
+  handleTextOverflowNoTooltip,
 } from '@/components/Business/BsSulaQueryTable/utils';
 
 export function downloadExcel(data: any, fileName?: any, isResUrl?: boolean) {
@@ -88,8 +89,10 @@ export const handleBssulaColumnsSpecialParams = (col: any) => {
     col.render = ({ text }: any) => handleTooltip(text, col.timeRender);
   } else if (col.textOverflow) {
     // 处理文字太长
-    const colWidth = typeof col?.width === 'number' ? col.width : (col.width && parseWidth(col.width))
-    col.render = ({ text }: any) => handleTextOverflow(text, colWidth);
+    const colWidth = typeof col?.width === 'number' ? col.width : (col.width && parseWidth(col.width));
+    const originalRender = col?.render;
+    const renderText = (params) => originalRender ? originalRender(params) : params.text;
+    col.render = (params) => handleTextOverflowNoTooltip(renderText(params), colWidth);
   } else if (col.images) {
     col.render = ({ text }: any) => tableColumnsImage(text);
   } else if (col.double) {