bri-components 1.2.14 → 1.2.16

package/src/styles/components/controls/base/DshSelect.less

@@ -147,44 +147,44 @@
     .ivu-select-selection {
         // .bri-control-edit();
     }
-}
-
-.ivu-select-disabled {
-    .ivu-select-selection {
-        .bri-control-disabled();
-
-        &:hover {
-            border-color: @border-disabled;
-        }
-    }
-
-    .ivu-select-input[disabled] {
-        color: @textColor;
-        -webkit-text-fill-color: @textColor;
-    }
-}
-
-.ivu-select-item {
-    margin: 4px 8px;
-    border-radius: @borderRadius;
-
-    &:hover {
-        background: @bgColor;
-    }
-
-    &-selected {
-        background-color: @theme-focus;
-        color: @themeColor;
-    }
-
+    
     &-disabled {
         .ivu-select-selection {
             .bri-control-disabled();
+    
+            &:hover {
+                border-color: @border-disabled;
+            }
+        }
+    
+        .ivu-select-input[disabled] {
+            color: @textColor;
+            -webkit-text-fill-color: @placeholder-disabled-color;
         }
     }
-
-    &-input[disabled] {
-        color: @textColor-disabled;
-        -webkit-text-fill-color: @textColor-disabled;
+    
+    &-item {
+        margin: 4px 8px;
+        border-radius: @borderRadius;
+    
+        &:hover {
+            background: @bgColor;
+        }
+    
+        &-selected {
+            background-color: @theme-focus;
+            color: @themeColor;
+        }
+    
+        &-disabled {
+            .ivu-select-selection {
+                .bri-control-disabled();
+            }
+        }
+    
+        &-input[disabled] {
+            color: @textColor-disabled;
+            -webkit-text-fill-color: @textColor-disabled;
+        }
     }
-}
+}

package/src/styles/components/controls/senior/selectDepartments.less

@@ -1,30 +1,8 @@
 .selectDepartments {
     width: 100%;
 
-    &-edit {
-
-    }
-
-    &-show {
-
-    }
-
-    // 传到子组件里的class！！！
-    &-modal {
-        .ivu-modal {
-            width: 800px!important;
-        }
-    }
-    // 传到子组件里的class！！！
-    &-cascaderModal {
-        .ivu-modal {
-            width: 600px !important;
-        }
-    }
-
     &-list {
-        height: 600px;
-        padding: 15px 20px;
+        height: 500px;
         .dsh-flex-col-start-stretch();
 
         .list {
@@ -34,11 +12,9 @@
                 display: flex;
                 flex-wrap: wrap;
                 align-items: center;
-    
-                &-label {
 
-                }
-                
+                &-label {}
+
                 .item {
                     max-width: 230px;
                     height: 24px;
@@ -63,17 +39,17 @@
                     }
                 }
             }
-    
+
             &-search {
                 padding: 10px 15px;
             }
-    
+
             &-center {
                 flex: 1;
                 min-height: 100px;
                 padding: 5px 0 10px;
                 overflow: auto;
-    
+
                 &-tree {
                     .tree {
                         &-nodata {
@@ -81,7 +57,7 @@
                         }
                     }
                 }
-                
+
                 &-card {
                     .card {
                         &-high-title {
@@ -92,15 +68,6 @@
                     }
                 }
             }
-    
-            &-footer {
-                text-align: right;
-    
-                .ivu-btn {
-                    width: 120px;
-                    height: 38px;
-                }
-            }
         }
     }
 }

package/src/styles/components/controls/senior/selectUsers/selectUsers.less

@@ -1,75 +1,71 @@
 .selectUsers {
     width: 100%;
 
-    &-edit {
+    &-edit {}
 
-    }
-    &-show {
-        
-    }
+    &-show {}
 
     // 弹框部分
     &-modal {
         &-wrap {
             display: flex;
-            padding: 20px;
-            height: 550px;
+            height: 500px;
 
             &-left {
                 width: 520px;
                 overflow-y: auto;
                 background: @white;
                 border: 1px solid #E5E5E5;
-    
+
                 .search {
                     padding: 10px 20px;
                 }
-    
+
                 .content {
                     display: flex;
                     height: calc(100% - 52px);
                     border-top: 1px solid #E5E5E5;
-    
+
                     &-menu {
                         flex: 3;
                         height: 100%;
                         overflow: auto;
                     }
-    
+
                     &-users {
                         flex: 2;
                         position: relative;
-    
+
                         .ivu-checkbox-checked .ivu-checkbox-inner {
                             border-color: @themeColor;
                             background-color: @themeColor;
                         }
-    
+
                         &-list {
                             border-left: 1px solid #E5E5E5;
                             height: 100%;
                             display: flex;
                             flex-direction: column;
-    
-    
+
+
                             &-checkAll {
                                 height: 40px;
                                 line-height: 40px;
                                 border-bottom: 1px solid #E5E5E5;
                                 padding-left: 15px;
                             }
-    
+
                             &-selects {
                                 flex: 1;
                                 overflow: auto;
                                 padding: 15px;
-    
+
                                 &-item {
                                     margin-bottom: 5px;
                                 }
                             }
                         }
-    
+
                         &-nodata {
                             position: absolute;
                             top: 50%;
@@ -77,17 +73,17 @@
                             text-align: center;
                             transform: translateY(-50%);
                         }
-    
+
                     }
                 }
             }
-    
+
             &-center {
                 width: 100px;
                 display: flex;
                 justify-content: center;
                 align-items: center;
-    
+
                 .icon {
                     width: 24px;
                     height: 24px;
@@ -99,7 +95,7 @@
                     text-align: center;
                 }
             }
-    
+
             &-right {
                 flex: 1;
                 width: 0px;
@@ -111,12 +107,12 @@
                 overflow: auto;
                 display: flex;
                 flex-direction: column;
-    
+
                 .list {
                     display: flex;
                     flex-wrap: wrap;
                     align-items: center;
-            
+
                     &-item {
                         max-width: 150px;
                         height: 24px;
@@ -128,11 +124,11 @@
                         font-size: 12px;
                         display: flex;
                         align-items: center;
-            
+
                         &-name {
                             .dsh-ellipsis();
                         }
-            
+
                         &-delete {
                             padding: 3px;
                             margin-left: 5px;
@@ -142,15 +138,15 @@
                     }
                 }
             }
-    
+
             &-footer {
                 padding-bottom: 10px;
-    
+
                 .DshButtons {
                     text-align: right;
                     padding-right: 24px;
-    
-    
+
+
                     .ivu-btn {
                         width: 70px;
                         height: 32px;

package/src/styles/components/index.less

@@ -6,13 +6,14 @@
 @import "./list/DshBox/DshPanel.less";
 @import "./list/DshBox/DshSingleData.less";
 @import "./list/DshBox/DshList.less";
+@import "./list/BriTable.less"; 
+@import "./list/DshPage.less";
+
+@import "./list/BriFlatTable.less"; // 不能注释flatTable在用
+@import "./list/DshCascaderTable.less"; // 不能注释cascaderTable在用
 @import "./list/BriCard.less";
-@import "./list/BriFlatTable.less";
-@import "./list/BriTable.less";
 @import "./list/BriTree.less";
 @import "./list/BriTreeItem.less";
-@import "./list/DshCascaderTable.less";
-@import "./list/DshPage.less";
 
 // form
 @import "./form/DshForm.less";
@@ -51,25 +52,21 @@
 @import "./controls/special/DshUndeveloped.less";
 
 // other
-@import "./other/BriCode.less";
-@import "./other/BriCollapseTree.less";
-@import "./other/BriGantt.less";
-@import "./other/BriIframe.less";
 @import "./other/BriLoading.less";
 @import "./other/DshAvatar.less";
-@import "./other/DshBtnModal.less";
 @import "./other/DshColorPanel.less";
-@import "./other/DshEditPanel.less";
-@import "./other/DshMenu.less";
+
 @import "./other/DshMenuNav.less";
+@import "./other/BriCode.less";
+@import "./other/BriCollapseTree.less";
+@import "./other/BriGantt.less";
+@import "./other/BriIframe.less";
 
 // small
 @import "./small/BriButton.less";
 @import "./small/BriDrawer.less";
 @import "./small/BriTooltip.less";
 @import "./small/DshButtons.less";
-@import "./small/DshCrumbs.less";
-@import "./small/DshCrumbItem.less";
 @import "./small/DshDropdown.less";
 @import "./small/DshIcons.less";
 @import "./small/DshModal.less";
@@ -77,3 +74,5 @@
 @import "./small/DshTabs.less";
 @import "./small/DshTags.less";
 @import "./small/DshTitle.less";
+
+@import "./small/DshBtnModal.less";

package/src/styles/components/list/BriTable.less

@@ -50,7 +50,7 @@
 
     &-ellipsis {
         max-width: calc(100% - 20px);
-    } 
+    }
 
     td {
         white-space: normal !important;
@@ -59,6 +59,7 @@
     &-th {
         border-bottom: none !important;
     }
+
     &-td {
         position: relative;
     }
@@ -92,7 +93,7 @@
 
 // 排序
 .ve-table-sort {
-    position: absolute!important;
+    position: absolute !important;
     top: 7px;
     right: 20px;
 
@@ -119,6 +120,11 @@
 }
 
 .ve-dropdown-popper {
+    .ve-dropdown-items-warpper {
+        max-width: 200px;
+        min-width: 100px;
+    }
+
     .ve-dropdown-dd .ve-dropdown-items {
         border-radius: @borderRadius;
         border: none;
@@ -128,7 +134,7 @@
     // 重置
     .ve-dropdown-operation .ve-dropdown-operation-item:first-of-type {
         background-color: @borderColor;
-        color: @textColor  !important;
+        color: @textColor !important;
         margin-right: 8px;
     }
 
@@ -137,7 +143,7 @@
         width: 40px;
         height: 24px;
         opacity: 1;
-        color: @white  !important;
+        color: @white !important;
         font-weight: 500;
         font-family: "PingFang SC";
         text-align: center;

package/src/styles/components/list/DshBox/DshTable.less

@@ -1,13 +1,21 @@
 .DshTable {
-    width: 100%; 
+    width: 100%;
     height: 100%;
+
+    .table-operation {
+        display: flex;
+        justify-content: center;
+    }
+
     .table-operation-btn {
         margin-left: 16px;
         padding: 0px;
+
         &:first-of-type {
             margin: 0px;
         }
     }
+
     .DshButtons-dropdown-more {
         padding: 0px;
         margin-left: 16px;

package/src/styles/components/small/DshButtons.less

@@ -17,24 +17,17 @@
                 justify-content: center;
                 align-items: center;
 
-                &-name {
-
-                }
+                &-name {}
             }
         }
     }
 
     &-item {
-        > span {
+        >span {
             width: 100%;
             .dsh-ellipsis();
         }
 
         &-name {}
     }
-
-    .ivu-btn-text {
-        background-color: transparent;
-        color: @themeColor;
-    }
 }