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

package/src/plugin/TableColumnSetting/index.less

@@ -1,11 +1,10 @@
-// 列自定义
 .sort_table_wrapper {
   .sort_table {
     display: flex;
 
     .sort_table_column_wrapper {
       width: 560px;
-      margin-right: 10px;
+      margin-right: 8px;
     }
 
     .sort_table_content_wrapper {
@@ -17,12 +16,12 @@
       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;
       }
     }
 
@@ -47,7 +46,7 @@
           text-align: center;
           font-family: PingFangSC-Regular;
           font-weight: 400;
-          font-size: 14px;
+          font-size: 12px;
           color: #848484;
         }
       }
@@ -58,22 +57,25 @@
         height: 20px;
         font-family: PingFangSC-Regular;
         font-weight: 400;
-        font-size: 14px;
+        font-size: 12px;
         color: #848484;
         letter-spacing: 0;
       }
 
       .ant-checkbox-wrapper {
         width: 144px;
+        height: 16px;
+        line-height: 16px;
         margin-top: 16px;
       }
 
-      .ant-checkbox-wrapper+.ant-checkbox-wrapper {
+      .ant-checkbox-wrapper + .ant-checkbox-wrapper {
         margin-left: 0px;
       }
     }
 
     .sort_table_content {
+      height: 430px;
       margin-top: 10px;
       padding-top: 10px;
       padding-bottom: 10px;
@@ -83,7 +85,6 @@
       .ant-table-wrapper {
         padding: 0px !important;
       }
-
       .sort_table_title {
         height: 32px;
         line-height: 32px;
@@ -92,29 +93,11 @@
       }
     }
   }
-
-  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: 0 20px !important;
+    padding: 10px 16px;
   }
-
   .ant-modal-close-x {
     height: 24px;
     font-family: PingFangSC-Medium;
@@ -130,7 +113,7 @@
   }
 
   input {
-    height: 32px;
+    height: 22px;
     padding: 6px 4px;
     border-radius: 5px;
   }
@@ -138,34 +121,33 @@
   .ant-input-prefix {
     width: 24px;
     height: 24px;
-    margin: 4px;
+    margin: 0 4px;
     // border: 1px dashed #d9d9d9;
     display: flex;
     justify-content: center;
   }
 
   .ant-modal-footer {
-    height: 70px;
-    border: 0;
-    padding: 20px;
-
+    padding: 8px 16px;
+    display: flex;
+    justify-content: space-between;
+    
     .ant-btn {
       width: 80px;
-      height: 34px;
-      border-radius: 5px;
+      height: 28px;
 
       span {
         font-family: PingFangSC-Medium;
         font-weight: 600;
-        font-size: 14px;
+        font-size: 12px;
         letter-spacing: 0;
         text-align: center;
         line-height: 20px;
       }
 
-      &:first-child {
-        margin-right: 524px;
-      }
+      // &:first-child {
+      //   margin-right: 524px;
+      // }
     }
   }
 
@@ -180,21 +162,26 @@
     padding-bottom: 50px;
 
     tr {
-      height: 36px;
-
+      height: 30px;
       td {
         width: 24px !important;
-        height: 36px !important;
+        height: 30px !important;
         font-family: PingFangSC-Regular;
         font-weight: 400;
-        font-size: 14px;
+        font-size: 12px;
         color: #000000;
         letter-spacing: 0;
 
         &:first-child {
           padding-left: 10px !important;
           padding-right: 0px !important;
-          width: 115px !important;
+          width: 108px !important;
+          display: inline-block;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          height: 30px !important;
+          line-height: 30px !important;
         }
 
         img {
@@ -210,7 +197,7 @@
         &:last-child {
           padding-left: 0px !important;
           padding-right: 3px !important;
-          width: 34px !important;
+          width: 30px !important;
 
           img {
             // border: 1px dashed #d9d9d9;
@@ -221,27 +208,8 @@
       }
     }
   }
-}
-
-.global_tab_nav_style {
-  top: 2px !important;
-}
-
-.row-dragging {
-  background: #fafafa;
-  border: 1px solid #ccc;
-  z-index: 10000;
-}
-
-.row-dragging td {
-  padding: 7px 16px;
-  display: none;
-
-}
-.row-dragging td:first-child {
-  display: inline-block;
-}
-
-.row-dragging .drag-visible {
-  visibility: visible;
-}
+
+  .ant-dropdown-link {
+    cursor: pointer;
+  }
+}

package/src/plugin/TableColumnSetting/index.tsx

@@ -525,7 +525,7 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
     return (
       <div className={'sort_table_wrapper'}>
         <Modal
-          title="设置表头内容"
+          title="筛选条件设置"
           wrapClassName={'sort_table_wrapper'}
           width={820}
           visible={visible}
@@ -546,15 +546,15 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
           <div className={'sort_table'}>
             <div className={'sort_table_column_wrapper'}>
               <span className={'sort_table_column_count'}>
-                可选字段 <span>（共{dataSource.length}个）</span>
+                <span>勾选你想使用的筛选条件</span>
               </span>
               <div className={'sort_table_column'}>
                 <Input
                   prefix={<SearchOutlined className="site-form-item-icon" />}
-                  placeholder="搜索"
+                  placeholder="输入筛选条件名称搜索"
                   allowClear
                   onChange={this.onSearch}
-                  style={{ width: 540 }}
+                  style={{ width: 525 }}
                 />
                 <div>
                   {!searchDataSource && (
@@ -678,7 +678,7 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
             </div>
             <div className={'sort_table_content_wrapper'}>
               <span className={'sort_table_content_count'}>
-                已选字段 <span>（共{sortDataSource.length}个）</span>
+                <span>已选择的搜索条件排序</span>
               </span>
               <div className={'sort_table_content'}>
                 <span style={{ paddingLeft: '10px' }}>

package/src/styles/bsDefault.less

@@ -1318,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
@@ -1744,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 {
@@ -1756,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;
       }
     }
 
@@ -1786,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;
         }
       }
@@ -1797,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;
@@ -1834,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;
+  }
 }
 
 // 表单特性