bri-components 1.2.0 → 1.2.1

package/src/styles/common/control.less

@@ -1,5 +1,5 @@
-// 表格展示-非通用
-.unit-show () {
+// 单元格标签式展示 -非全部类型通用
+.bri-unit-show () {
     background-color: @theme-focus;
     color: @themeColor;
     border-radius: @borderRadius;
@@ -8,93 +8,96 @@
     display: inline;
 }
 
-// 表单模式
-.control-edit {
+// 表单控件共用样式
+.bri-control-edit {
     border: 1px solid @borderColor;
     border-radius: @borderRadius;
     background: @inputBg;
     cursor: pointer;
     color: @textColor;
-    &.control-notext {
-        .control-placeholder();
+
+    &.bri-control-nodata {
+        .bri-control-nodata();
     }
 }
-.control-disabled {
+.bri-control-disabled {
     border: 1px solid @border-disabled;
     border-radius: @borderRadius;
     background: @inputBg-disabled;
     cursor: not-allowed;
     color: @textColor;
-    &.control-notext {
-        .control-disPlaceholder();
+
+    &.bri-control-nodata {
+        .bri-control-disabled-placeholder();
     }
 }
-.control-readonly {
-    border: 1px solid @border-readonly;
-    border-radius: @borderRadius;
-    background: @inputBg-readonly;
-    cursor: not-allowed;
-    color: @textColor-readonly;
-}
-.control-show {
+// .bri-control-readonly {
+//     border: 1px solid @border-readonly;
+//     border-radius: @borderRadius;
+//     background: @inputBg-readonly;
+//     cursor: not-allowed;
+//     color: @textColor-readonly;
+// }
+.bri-control-show {
     border: none;
     background-color: transparent;
-    &.control-notext {
-        .control-notext();
+
+    &.bri-control-nodata {
+        .bri-control-nodata();
     }
 }
-.control-unit {
+.bri-control-unit {
     border: none;
     background-color: transparent;
-    &.control-notext {
+
+    // unit 模式下不用特殊处理颜色
+    &.bri-control-nodata {
         color: @text-color;
     }
 }
-
-// 编辑模式下无数据
-.control-placeholder {
+// 无数据
+.bri-control-nodata {
     color: @placeholderColor;
 }
 // 编辑disabled模式下无数据
-.control-disPlaceholder {
+.bri-control-disabled-placeholder {
     color: @textColor-disabled;
 }
-// 查看模式下无数据
-.control-notext {
-    color: @placeholderColor;
-}
-
-// unit 模式下不用特殊处理颜色
-
 
 // 展示为tag标签公共样式
-.control-wrap {
-    width: 100%;
-    &-box {
-        height: 32px;
-        padding: 4px 0 4px 4px;
-        line-height: 24px;
-        .dsh-flex-row-between-center();
-        &:hover {
-            .control-wrap-close {
-                display: block;
-            }
-        }
+#bri-control-wrap () {
+    .dsh-flex-row-between-center();
+    height: 32px;
+    padding: 4px 0 4px 4px;
+    line-height: 24px;
+
+    .text {
+        .dsh-ellipsis();
     }
-    
-    .control-edit.control-notext {
-        padding-left: 7px;
+
+    .overflow {
+        overflow: auto;
+        .bri-scrollbar3();
     }
 
-    &-text {
-        .dsh-ellipsis();
+    .icon {
+        &-default {
+            padding: 5px;
+        }
+
+        &-close {
+            padding: 5px;
+            display: none;
+        }
     }
 
-    &-close {
-        padding: 5px;
-        display: none;
+    &:hover {
+        .icon-close {
+            display: block;
+        }
     }
-    &-icon {
-        padding: 5px;
+
+    &.bri-control-nodata {
+        padding-left: 7px;
     }
 }

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

@@ -132,7 +132,7 @@
     }
     
     &-disabled {
-        .control-disabled();
+        .bri-control-disabled();
     
         .uploadList {
             &-old {
@@ -147,12 +147,20 @@
             }
 
             &-nodata {
-                .control-disPlaceholder();
+                .bri-control-disabled-placeholder();
                 text-indent: 7px;
                 text-align: left;
             }
             &-inline-nodata {
-                .control-disPlaceholder();
+                .bri-control-disabled-placeholder();
+            }
+        }
+    }
+
+    &-unit {
+        .uploadList {
+            &-inline-nodata {
+                color: @text-color;
             }
         }
     }

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

@@ -1,106 +1,53 @@
 .DshCascader {
     width: 100%;
 
-    #multiple-content () {
-        .hasdata {
+    &-edit {
+        // 多选
+        &-multiple {
             width: 100%;
-            height: 100%;
-            padding: 0px 7px;
-            .bri-scrollbar3();
-            overflow-y: hidden;
-        }
-
-        .nodata {
-            padding: 0px 7px;
-            line-height: 28px;
-            color: @placeholderColor;
-        }
-
-        // 多选类型 且独自一行时
-        &-row {
-            height: 68px;
-    
-            .hasdata {
-                overflow-y: auto;
-                display: flex;
-                flex-wrap: wrap;
+            
+            &-edit {
+                #bri-control-wrap();
             }
         }
-    }
 
-    // 多选
-    &-multiple {
-        width: 100%;
-        
-        &-input {
+        // 单选 -新模式
+        &-custom {
             width: 100%;
-            height: 32px;
-            #multiple-content();
-
-            .hasdata {
-
-            }
-            .nodata {
-
-            }
-
-            // 多选类型 且独自一行时
-            &-row {
-
-            }
+            #bri-control-wrap();
         }
-    }
-
-    // 单选 -新模式
-    &-custom {
-        width: 100%;
-
-        &-input {
+        // 单选 -默认模式
+        &-single {
             width: 100%;
-            height: 32px;
-            padding: 0px 7px;
-            .dsh-flex-row-between-center();
-
-            .text {
-                .dsh-ellipsis();
-            }
-            
-            .clear {
-                margin-left: 5px;
-            }
         }
     }
-    
-    // 单选 -默认模式
-    &-single {
-        width: 100%;
-    }
-    
+
     // 查看
     &-show {
         &-multiple {
-            #multiple-content();
+            #bri-control-wrap();
 
-            .hasdata {
+            .overflow {
                 &-unit {
                     .dsh-ellipsis();
                 }
             }
-            .nodata {
-
-            }
-
-            // 多选类型 且独自一行时
-            &-row {
-                height: auto;
-                min-height: 32px;
-            }
         }
 
         &-single {
 
         }
     }
+
+    // 多选类型且独自一行时
+    &-row {
+        height: 68px;
+        
+        .overflow {
+            width: 100%;
+            height: 100%;
+        }
+    }
 }
 
 .ivu-cascader {

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组件里在混入此样式

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

@@ -163,7 +163,7 @@
 
     &-disabled {
         .ivu-select-selection {
-            .control-disabled();
+            .bri-control-disabled();
         }
     }
     
@@ -174,9 +174,9 @@
 }
 
 .ivu-select-disabled .ivu-select-selection {
-    .control-disabled();
+    .bri-control-disabled();
     &:hover {
-        border-color: transparent;
+        border-color: @border-disabled;
     }
 }
 .ivu-select-input[disabled] {