bri-components 1.1.6 → 1.2.1

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

@@ -1,68 +1,16 @@
 .DshCheckbox {
     width: 100%;
 
-    &-checkboxGroup {
+    &-group {
         width: 100%;
 
-        &-scroll {
-            overflow-x: auto;
-            overflow-y: hidden;
-            white-space: nowrap;
-
-            &::-webkit-scrollbar {
-                height: 6px;
-            }
-
-            &:-webkit-scrollbar-thumb {
-                border-radius: 3px;
-                background: rgba(51, 51, 51, .1);
-                background-clip: border-box;
-            }
-        }
-    }
-
-    &-tip {
-        cursor: pointer;
-
-        .ivu-checkbox {
-            display: none;
-        }
-    }
-
-    .ivu-select-multiple {
-        .ivu-select-selection {
-            height: 32px;
-    
-            &>div {
-                overflow-x: auto;
-                overflow-y: hidden;
-                white-space: nowrap;
-    
-                .ivu-tag {
-                    margin: 2px 4px 4px 0;
-                }
-    
-                &::-webkit-scrollbar {
-                    height: 8px;
-                }
-    
-                &:-webkit-scrollbar-thumb {
-                    border-radius: 3px;
-                    background: rgba(51, 51, 51, .1);
-                    background-clip: border-box;
-                }
+        &-disabled {
+            .ivu-checkbox-disabled+span {
+                color: #515a6e;
             }
         }
 
-        .ivu-select-item-selected:after {
-            content: none;
-        }
-    }
-}
-
-.DshCheckbox {
-    &-checkboxGroup {
-        &-useColor {
+        &-color {
             .ivu-checkbox-border {
                 height: 32px;
                 line-height: 32px;
@@ -108,24 +56,34 @@
 
             );
         }
-    }
 
-    // 选中时背景为白色
-    .myChecked {
-        .ivu-checkbox-checked .ivu-checkbox-inner {
-            background-color: @themeColor;
+        &-disabled-color {
+            .ivu-checkbox-disabled+span {
+                color: inherit;
+            }
         }
-    }
 
-    .readonlyCheckbox {
-        .ivu-checkbox-disabled+span {
-            color: #515a6e;
+        &-scroll {
+            overflow-x: auto;
+            overflow-y: hidden;
+            white-space: nowrap;
+
+            &::-webkit-scrollbar {
+                height: 6px;
+            }
+
+            &:-webkit-scrollbar-thumb {
+                border-radius: 3px;
+                background: rgba(51, 51, 51, .1);
+                background-clip: border-box;
+            }
         }
     }
 
-    .readonlyColorCheckbox {
-        .ivu-checkbox-disabled+span {
-            color: inherit;
+    // 选中时背景为白色
+    .myChecked {
+        .ivu-checkbox-checked .ivu-checkbox-inner {
+            background-color: @themeColor;
         }
     }
 
@@ -137,6 +95,44 @@
         font-size: 14px;
         vertical-align: middle;
     }
+
+    &-tip {
+        cursor: pointer;
+
+        .ivu-checkbox {
+            display: none;
+        }
+    }
+
+    .ivu-select-multiple {
+        .ivu-select-selection {
+            height: 32px;
+    
+            &>div {
+                overflow-x: auto;
+                overflow-y: hidden;
+                white-space: nowrap;
+    
+                .ivu-tag {
+                    margin: 2px 4px 4px 0;
+                }
+    
+                &::-webkit-scrollbar {
+                    height: 8px;
+                }
+    
+                &:-webkit-scrollbar-thumb {
+                    border-radius: 3px;
+                    background: rgba(51, 51, 51, .1);
+                    background-clip: border-box;
+                }
+            }
+        }
+
+        .ivu-select-item-selected:after {
+            content: none;
+        }
+    }
 }
 
 // TODO：必须单独拿出来，DshSelect组件里在混入此样式
@@ -145,15 +141,16 @@
     line-height: 20px;
     padding: 2px 8px;
     border-radius: 4px;
-    margin-right: 16px;
+    margin-right: 8px;
+    display: inline-flex;
 
     &:last-of-type {
         margin-right: 0px;
     }
 
     &-wrapper {
-        display: flex;
         min-height: 32px;
         padding: 4px 0;
+        .dsh-ellipsis();
     }
 }

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

@@ -1,3 +1,15 @@
 .DshDate {
     width: 100%;
+
+    &-edit {
+        width: 100%;
+    }
+
+    &-unit {
+        
+    }
+
+    &-show {
+        
+    }
 }

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

@@ -1,19 +1,32 @@
-.DshEditor {   
-    .DshEditor-common () {
+.DshEditor {
+    width: 100%;
+    #show {
+        p {
+            font-size: 14px !important;
+        }
 
-    };
+        li {
+            margin-left: 20px;
+        }
 
+        ul li {
+            list-style: disc;
+        }
 
-    &-edit {
-        border: 1px solid @borderColor;
-        cursor: pointer;
-        
-        &:hover {
-            border-color: @theme-hover;
+        ol li {
+            list-style: auto;
         }
+    }
 
-        &-placeholder {
-            color: @input-placeholder-color;
+    &-edit {
+        #show();
+        height: 100%;
+        min-height: 32px;
+        padding: 4px 7px;
+        border-radius: @borderRadius;
+        
+        &.bri-control-nodata {
+            line-height: 24px;
         }
     }
 
@@ -42,46 +55,12 @@
             padding: 10px;
         }
     }
-    
-    &-unit {
-        .unit-show();
-        display: inline-block;
 
-        &-nodata {
-            .control-notext();
-        }
+    &-unit {
+        .bri-unit-show();
     }
 
     &-show {
-        height: 100%;
-        min-height: 32px;
-        padding: 4px 10px;
-        border-radius: @borderRadius;
-
-        &-disabled {
-           .control-disabled();
-        }
-
-        &-nodata {
-            padding-left: 0px;
-            border: none;
-            color: @grey3;
-        }
-
-        p {
-            font-size: 14px !important;
-        }
-
-        li {
-            margin-left: 20px;
-        }
-
-        ul li {
-            list-style: disc;
-        }
-
-        ol li {
-            list-style: auto;
-        }
+        #show();
     }
 }

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

@@ -13,13 +13,17 @@
 }
 
 .ivu-input {
-    .control-edit();
+    .bri-control-edit();
     cursor: text;
 
     &[disabled] {
-        .control-disabled();
+        .bri-control-disabled();
         &:hover {
             border-color: @border-disabled;
         }
+        &::-webkit-input-placeholder {
+            .bri-control-disabled-placeholder();
+        }
     }
+    
 }

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

@@ -1,24 +1,30 @@
 .DshNumber {
     width: 100%;
 
-    &-suffix {
-        min-width: 32px;
-        border-left: 1px solid @borderColor;
-        background-color: #F0F0F0;
-        text-align: center;
-        color: @textColor;
+    &-edit {
+        &-suffix {
+            min-width: 32px;
+            border-left: 1px solid @borderColor;
+            background-color: #F0F0F0;
+            text-align: center;
+            color: @textColor;
+        }
+    }
+
+    &-unit {
+
+    }
+
+    &-show {
+        
     }
 }
+
 .ivu-input-number {
     width: 100%;
-    
-    &-input {
-        background-color: transparent;
-        opacity: 1;
-    }
 
     &-disabled {
-        .control-disabled();
+        .bri-control-disabled();
 
         &:hover {
             border-color: @border-disabled;
@@ -29,23 +35,34 @@
             background-color: transparent;
             border-color: transparent;
         }
-    }
-}
-.ivu-input-number-handler {
-    &-wrap {
-        // opacity: 1;
-        border-left: none;
-    }
-    &-down {
-        border: none;
-    }
-    &:hover {
-        background-color: @hoverBg;
-        .ivu-input-number-handler-down-inner, .ivu-input-number-handler-up-inner {
+        .ivu-input-number-input {
+            opacity: 1;
+            background: @inputBg-disabled;
             color: @textColor;
+            &::-webkit-input-placeholder {
+                .bri-control-disabled-placeholder();
+            }
         }
     }
-    &-down-inner, &-up-inner {
-        color: @contentColor;
+
+    &-handler {
+        &-wrap {
+            // opacity: 1;
+            border-left: none;
+        }
+        &-down {
+            border: none;
+        }
+        &:hover {
+            background-color: @hoverBg;
+
+            .ivu-input-number-handler-down-inner, 
+            .ivu-input-number-handler-up-inner {
+                color: @textColor;
+            }
+        }
+        &-down-inner, &-up-inner {
+            color: @contentColor;
+        }
     }
 }

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

@@ -163,7 +163,7 @@
 
     &-disabled {
         .ivu-select-selection {
-            .control-disabled();
+            .bri-control-disabled();
         }
     }
     
@@ -172,3 +172,14 @@
         -webkit-text-fill-color: @textColor-disabled;
     }
 }
+
+.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-disabled;
+}

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

@@ -1,88 +1,47 @@
 .BriLabels {
-    display: flex;
     width: 100%;
 
+    &-dit {
+        #bri-control-wrap();
+    }
+    
+    &-show {
+        #bri-control-wrap();
+    }
+
     &-dropdown {
         width: 100%;
 
-        &-show {
-            display: flex;
-            justify-content: space-between;
-            cursor: pointer;
-            border-radius: @borderRadius;
-            border: 1px solid @borderColor;
-            padding-left: 5px;
-
-            &-list {
-                display: flex;
-                align-items: center;
-            }
-
-            &-active {
-                border-color: #64c6d1;
-                box-shadow: 0 0 0 2px rgba(61, 184, 197, 0.2);
-            }
-
-            &-arrow {
-                display: flex;
-                align-items: center;
-                margin-right: 5px;
-            }
-        }
-
-        &-item {
-            margin: 4px 8px;
-            border-radius: @borderRadius;
-
-            &-active {
-                background-color: @theme-focus;
-                color: @themeColor;
+        &-menu {
+            .item {
+                margin: 4px 8px;
+                border-radius: @borderRadius;
+    
+                &-active {
+                    background-color: @theme-focus;
+                    color: @themeColor;
+                }
+    
+                &-edit {
+    
+                }
+    
+                &-show {
+                    
+                }
             }
-
-            &-show {
-                // width: 100%;
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-
-                &-icons {
-                    margin-left: 10px;
-
-                    i {
-                        padding: 3px;
-                        border-radius: @borderRadius;
-                        color: rgba(0, 0, 0, 0.4);
-
-                        &:hover {
-                            background-color: #fff;
-                        }
-                    }
-
-                    &-edit {
-                        &:hover {
-                            color: @themeColor;
-                        }
-                    }
-
-                    &-del {
-                        &:hover {
-                            color: @error-color;
-                        }
-                    }
+    
+            .btns {
+                border-top: 1px solid #E7E7E7;
+                margin: 12px 8px 0;
+                padding-top: 8px;
+    
+                &-add {
+                    width: 100%;
+                    margin-bottom: 8px;
                 }
             }
         }
-
-        &-btnWrap {
-            border-top: 1px solid #E7E7E7;
-            margin: 12px 8px 0;
-            padding-top: 8px;
-        }
-
-        &-add {
-            width: 300px;
-            margin-bottom: 8px;
-        }
     }
 
     .ivu-select-dropdown {
@@ -104,32 +63,4 @@
             }
         }
     }
-
-    &-view {
-        display: flex;
-        flex-wrap: wrap;
-        align-items: center;
-        height: 32px;
-        overflow-y: hidden;
-
-        &-item {
-            .unit-show();
-            .dsh-ellipsis();
-            display: inline-flex;
-            max-width: 100%;
-            height: fit-content;
-            padding: 0 8px;
-            background-color: @borderColor;
-            color: rgba(0, 0, 0, 0.9);
-            font-size: 12px;
-            font-weight: 400;
-            line-height: 24px;
-            border-radius: @borderRadius;
-            margin-right: 8px;
-        }
-
-        &-nodata {
-            color: @textColor;
-        }
-    }
 }

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

@@ -1,7 +1,7 @@
 .cascaderTable {
 
     &-unit {
-        .unit-show();
+        .bri-unit-show();
 
         &-text {
             

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

@@ -2,7 +2,7 @@
     width: 100%;
 
     &-unit {
-        .unit-show();
+        .bri-unit-show();
 
         &-text {
             

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

@@ -0,0 +1,106 @@
+.selectDepartments {
+    width: 100%;
+
+    &-edit {
+        #bri-control-wrap();
+    }
+
+    &-show {
+        #bri-control-wrap();
+    }
+
+    // 传到子组件里的class！！！
+    &-modal {
+        .ivu-modal {
+            width: 800px!important;
+        }
+    }
+    // 传到子组件里的class！！！
+    &-cascaderModal {
+        .ivu-modal {
+            width: 600px !important;
+        }
+    }
+
+    &-list {
+        height: 600px;
+        padding: 15px 20px;
+        .dsh-flex-col-start-stretch();
+
+        .list {
+            &-selected {
+                padding: 0 15px;
+                line-height: 30px;
+                display: flex;
+                flex-wrap: wrap;
+                align-items: center;
+    
+                &-label {
+
+                }
+                
+                .item {
+                    max-width: 230px;
+                    height: 24px;
+                    padding: 2px 6px 2px 10px;
+                    margin: 3px 5px;
+                    border-radius: 20px;
+                    background-color: @themeColor;
+                    color: #ffffff;
+                    font-size: 12px;
+                    display: flex;
+                    align-items: center;
+
+                    &-name {
+                        .dsh-ellipsis();
+                    }
+
+                    &-delete {
+                        padding: 3px;
+                        margin-left: 5px;
+                        font-size: 14px;
+                        cursor: pointer;
+                    }
+                }
+            }
+    
+            &-search {
+                padding: 10px 15px;
+            }
+    
+            &-center {
+                flex: 1;
+                min-height: 100px;
+                padding: 5px 0 10px;
+                overflow: auto;
+    
+                &-tree {
+                    .tree {
+                        &-nodata {
+                            #dsh-nodata();
+                        }
+                    }
+                }
+                
+                &-card {
+                    .card {
+                        &-high-title {
+                            padding: 10px 0px;
+                            clear: both;
+                            text-align: left;
+                        }
+                    }
+                }
+            }
+    
+            &-footer {
+                text-align: right;
+    
+                .ivu-btn {
+                    width: 120px;
+                    height: 38px;
+                }
+            }
+        }
+    }
+}