bri-components 1.2.0 → 1.2.2

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

@@ -1,9 +1,63 @@
 .DshCheckbox {
     width: 100%;
 
-    &-checkboxGroup {
+    &-group {
         width: 100%;
 
+        // 选中时背景为白色
+        .ivu-checkbox-checked .ivu-checkbox-inner {
+            background-color: @themeColor;
+        }
+
+        &-color {
+            .ivu-checkbox-border {
+                margin-bottom: 5px;
+                margin-right: 16px;
+                height: 32px;
+                line-height: 32px;
+                border-radius: 4px;
+                border: none;
+                color: #FFF;
+            }
+
+            .ivu-checkbox {
+                .ivu-checkbox-inner {
+                    border: 2px solid @themeColor;
+                    background-color: transparent;
+                }
+
+                .ivu-checkbox-focus {
+                    box-shadow: 0 0 0 0;
+                }
+            }
+
+            .ivu-checkbox-disabled+span {
+                color: inherit;
+            }
+
+            each(@resourceColor, {
+                .color-@{index} {
+                    .ivu-checkbox {
+                        .ivu-checkbox-inner {
+                            border-color: @value;
+                        }
+                    }
+
+                    .ivu-checkbox-checked {
+                        .ivu-checkbox-inner {
+                            background-color: @value;
+                        }
+                    }
+                }
+            });
+        }
+
+        &-disabled {
+            .ivu-checkbox-disabled+span {
+                color: #515a6e;
+            }
+        }
+
         &-scroll {
             overflow-x: auto;
             overflow-y: hidden;
@@ -21,19 +75,19 @@
         }
     }
 
-    &-tip {
-        cursor: pointer;
+    &-item {
+
+    }
+
+    &-show {
 
-        .ivu-checkbox {
-            display: none;
-        }
     }
 
     .ivu-select-multiple {
         .ivu-select-selection {
             height: 32px;
     
-            &>div {
+            & > div {
                 overflow-x: auto;
                 overflow-y: hidden;
                 white-space: nowrap;
@@ -54,107 +108,22 @@
             }
         }
 
-        .ivu-select-item-selected:after {
-            content: none;
-        }
-    }
-}
-
-.DshCheckbox {
-    &-checkboxGroup {
-        &-useColor {
-            .ivu-checkbox-border {
+        &.ivu-select-default {
+            .ivu-select-selection {
                 height: 32px;
-                line-height: 32px;
-                border-radius: 4px;
-                border: none;
-                color: #FFF;
-                margin-bottom: 5px;
-                margin-right: 16px;
-            }
-
-            .ivu-checkbox {
-                .ivu-checkbox-inner {
-                    border: 2px solid @themeColor;
-                    background-color: transparent;
-                }
-
-                .ivu-checkbox-focus {
-                    box-shadow: 0 0 0 0;
+                overflow: hidden;
+        
+                & > div {
+                    width: 100%;
+                    height: 100%;
+                    .dsh-flex-row-start-center();
+                    flex-wrap: wrap;
                 }
             }
-
-            .ivu-checkbox-disabled+span {
-                color: inherit;
-            }
-
-            each(@resourceColor, {
-                    .color-@{index} {
-                        .ivu-checkbox {
-                            .ivu-checkbox-inner {
-                                border-color: @value;
-                            }
-                        }
-                    }
-
-                    .color-@{index}.myChecked {
-                        .ivu-checkbox-checked {
-                            .ivu-checkbox-inner {
-                                background-color: @value;
-                            }
-                        }
-                    }
-                }
-
-            );
-        }
-    }
-
-    // 选中时背景为白色
-    .myChecked {
-        .ivu-checkbox-checked .ivu-checkbox-inner {
-            background-color: @themeColor;
-        }
-    }
-
-    .readonlyCheckbox {
-        .ivu-checkbox-disabled+span {
-            color: #515a6e;
         }
-    }
 
-    .readonlyColorCheckbox {
-        .ivu-checkbox-disabled+span {
-            color: inherit;
+        .ivu-select-item-selected:after {
+            content: none;
         }
     }
-
-    &-content {
-        text-align: center;
-        border-radius: 12px;
-        line-height: 100%;
-        padding: 5px 10px;
-        font-size: 14px;
-        vertical-align: middle;
-    }
-}
-
-// TODO：必须单独拿出来，DshSelect组件里在混入此样式
-.DshCheckbox-value {
-    height: 24px;
-    line-height: 20px;
-    padding: 2px 8px;
-    border-radius: 4px;
-    margin-right: 8px;
-    display: inline-flex;
-
-    &:last-of-type {
-        margin-right: 0px;
-    }
-
-    &-wrapper {
-        min-height: 32px;
-        padding: 4px 0;
-        .dsh-ellipsis();
-    }
 }

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

@@ -1,37 +1,8 @@
 .DshCoordinates {
     width: 100%;
-    line-height: 30px;
 
     &-edit {
-        position: relative;
-        padding: 0 32px 0 8px;
-
-        .value {
-            width: 100%;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-
-            &-name {
-                .dsh-ellipsis();
-            }
-    
-            &-icon {
-                padding: 5px;
-            }
-        }
-
-        .nodata {
-            color: @placeholderColor;
-
-            &-icon {
-                color: #e5e5e5;
-                line-height: 32px;
-                position: absolute;
-                right: 6px;
-                top: 0;
-            }
-        }
+        #bri-control-wrap ();
     }
 
     &-modal {
@@ -76,9 +47,4 @@
             }
         }
     }
-
-    &-show {
-        padding: 0 8px;
-        line-height: 32px;
-    }
 }

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

@@ -24,7 +24,8 @@
         min-height: 32px;
         padding: 4px 7px;
         border-radius: @borderRadius;
-        &.control-notext {
+        
+        &.bri-control-nodata {
             line-height: 24px;
         }
     }
@@ -56,7 +57,7 @@
     }
 
     &-unit {
-        .unit-show();
+        .bri-unit-show();
     }
 
     &-show {

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

@@ -1,9 +1,5 @@
 .DshInput {
-    &-edit {
-        width: 100%;
-    }
-
-    &-unit {}
+    width: 100%;
 
     &-show {
         &-textarea {
@@ -17,16 +13,16 @@
 }
 
 .ivu-input {
-    .control-edit();
+    .bri-control-edit();
     cursor: text;
 
     &[disabled] {
-        .control-disabled();
+        .bri-control-disabled();
         &:hover {
             border-color: @border-disabled;
         }
         &::-webkit-input-placeholder {
-            .control-disPlaceholder();
+            .bri-control-disabled-placeholder();
         }
     }
     

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

@@ -24,7 +24,7 @@
     width: 100%;
 
     &-disabled {
-        .control-disabled();
+        .bri-control-disabled();
 
         &:hover {
             border-color: @border-disabled;
@@ -40,7 +40,7 @@
             background: @inputBg-disabled;
             color: @textColor;
             &::-webkit-input-placeholder {
-                .control-disPlaceholder();
+                .bri-control-disabled-placeholder();
             }
         }
     }

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

@@ -136,7 +136,22 @@
     }
 
     &-value {
-        .DshCheckbox-value();
+        height: 24px;
+        line-height: 20px;
+        padding: 2px 8px;
+        border-radius: 4px;
+        margin-right: 8px;
+        display: inline-flex;
+
+        &:last-of-type {
+            margin-right: 0px;
+        }
+
+        &-wrapper {
+            min-height: 32px;
+            padding: 4px 0;
+            .dsh-ellipsis();
+        }
     }
 
     &-tip {
@@ -163,7 +178,7 @@
 
     &-disabled {
         .ivu-select-selection {
-            .control-disabled();
+            .bri-control-disabled();
         }
     }
     
@@ -174,9 +189,9 @@
 }
 
 .ivu-select-disabled .ivu-select-selection {
-    .control-disabled();
+    .bri-control-disabled();
     &:hover {
-        border-color: transparent;
+        border-color: @border-disabled;
     }
 }
 .ivu-select-input[disabled] {

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

@@ -2,36 +2,6 @@
     width: 100%;
 
     &-show {
-        height: 24px;
-        padding: 2px 8px;
-        border-radius: 4px;
-        line-height: 20px;
-        flex-grow: 1;
-        display: flex;
-        justify-content: flex-start;
-    
-        &-name {
-            .dsh-ellipsis();
-            display: flex;
-            min-height: 32px;
-            padding: 4px;
-        }
-    }
-
-    .ivu-switch {
-        width: 50px;
-    }
-    .ivu-switch-checked:after {
-        left: 29px;
-    }
-    .ivu-switch-inner {
-        color: #fff;
-        font-size: 12px;
-        position: absolute;
-        left: auto;
-        right: 4px;
-    }
-    .ivu-switch-checked .ivu-switch-inner {
-        left: 3px;
+        .bri-unit-show();
     }
 }

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

@@ -1,110 +1,47 @@
 .BriLabels {
-    .control-wrap();
+    width: 100%;
+
+    &-edit {
+        #bri-control-wrap();
+    }
+    
+    &-show {
+        #bri-control-wrap();
+    }
 
     &-dropdown {
         width: 100%;
 
-        &-show {
-            .control-edit();
-            height: 32px;
-            display: flex;
-            justify-content: space-between;
-            padding-left: 4px;
-            
-
-            &-list {
-                display: flex;
-                align-items: center;
-                width: calc(100% - 14px);
-
-                &-show {
-                    width: 100%;
-                    white-space: nowrap;
-                    .bri-scrollbar3();
-                    overflow-y: hidden;
+        &-menu {
+            .item {
+                margin: 4px 8px;
+                border-radius: @borderRadius;
+    
+                &-active {
+                    background-color: @theme-focus;
+                    color: @themeColor;
                 }
-
-                &-placeholder {
-                    .control-placeholder();
+    
+                &-edit {
+    
                 }
-            }
-
-            &-active {
-                border-color: #64c6d1;
-                box-shadow: 0 0 0 2px rgba(61, 184, 197, 0.2);
-            }
-
-            &-disabled {
-                border: 1px solid @border-disabled;
-                border-radius: 4px;
-                background: @borderColor;
-                cursor: not-allowed;
-                color: @textColor-disabled  !important;
-                .BriLabels-dropdown-show-list-placeholder {
-                    .control-disPlaceholder();
+    
+                &-show {
+                    
                 }
             }
-
-            &-arrow {
-                display: flex;
-                align-items: center;
-                margin-right: 5px;
-            }
-        }
-
-        &-item {
-            margin: 4px 8px;
-            border-radius: @borderRadius;
-
-            &-active {
-                background-color: @theme-focus;
-                color: @themeColor;
-            }
-
-            &-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: 100%;
-            margin-bottom: 8px;
-        }
     }
 
     .ivu-select-dropdown {
@@ -126,27 +63,4 @@
             }
         }
     }
-
-    &-view {
-        display: flex;
-        flex-wrap: wrap;
-        align-items: center;
-        height: 32px;
-        overflow-y: hidden;
-
-        &-item {
-            .unit-show();
-            .dsh-ellipsis();
-            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;
-        }
-    }
 }

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;
+                }
+            }
+        }
+    }
+}