bri-components 1.1.2 → 1.1.3

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

@@ -21,25 +21,7 @@
         }
     }
 
-    &-value {
-        height: 24px;
-        line-height: 20px;
-        padding: 2px 8px;
-        border-radius: 4px;
-        margin-right: 16px;
-
-        &:last-of-type {
-            margin-right: 0px;
-        }
-
-        &-wrapper {
-            display: flex;
-            min-height: 32px;
-            padding: 4px 0;
-        }
-    }
-
-    .Dshcheckbox-tip {
+    &-tip {
         cursor: pointer;
 
         .ivu-checkbox {
@@ -47,32 +29,34 @@
         }
     }
 
-    .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-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-multiple .ivu-select-item-selected:after {
-        content: none;
+        .ivu-select-item-selected:after {
+            content: none;
+        }
     }
 }
 
@@ -153,4 +137,23 @@
         font-size: 14px;
         vertical-align: middle;
     }
+}
+
+// TODO：必须单独拿出来，DshSelect组件里在混入此样式
+.DshCheckbox-value {
+    height: 24px;
+    line-height: 20px;
+    padding: 2px 8px;
+    border-radius: 4px;
+    margin-right: 16px;
+
+    &:last-of-type {
+        margin-right: 0px;
+    }
+
+    &-wrapper {
+        display: flex;
+        min-height: 32px;
+        padding: 4px 0;
+    }
 }

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

@@ -1,15 +1,15 @@
 .DshCoordinates {
     width: 100%;
-    line-height: 32px;
+    line-height: 30px;
+
     .textRight {
         text-align: right;
     }
 
     &-wrap {
         position: relative;
-        padding: 0 8px;
-        .control-edit();
-        &-zuobiao{
+        padding: 0 32px 0 8px;
+        &-zuobiao {
             color: #e5e5e5;
             line-height: 32px;
             position: absolute;
@@ -30,7 +30,7 @@
     }
 
     &-notext {
-        .control-placeholder();
+        color: @placeholderColor;
     }
 
     &-message {
@@ -46,32 +46,29 @@
         height: 100%;
     }
 
-    &-readonly {
-        cursor: not-allowed;
-    }
     &-show {
         padding: 0 8px;
+        line-height: 32px;
     }
-}
-
-
-.DshCoordinates-modal {
-    &-header {
-        padding: 5px 0px;
-
-        &-text {
-            font-size: @textSize;
-            line-height: 18px;
+    
+    &-modal {
+        &-header {
+            padding: 5px 0px;
+    
+            &-text {
+                font-size: @textSize;
+                line-height: 18px;
+            }
         }
-    }
-
-    .ivu-modal-content {
-        overflow: hidden;
-        height: 100%;
-
-        .ivu-modal-body {
-            padding: 0px;
+    
+        .ivu-modal-content {
+            overflow: hidden;
             height: 100%;
+    
+            .ivu-modal-body {
+                padding: 0px;
+                height: 100%;
+            }
         }
     }
-}
+}

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

@@ -1,54 +1,3 @@
 .DshDate {
     width: 100%;
-}
-
-// .ivu-date-picker-cells-year .ivu-date-picker-cells-cell-focused,
-// .ivu-date-picker-cells-month .ivu-date-picker-cells-cell-focused {
-//     position: relative;
-
-//     em {
-//         background-color: transparent;
-//         color: @themeColor;
-//     }
-
-//     &::after {
-//         position: absolute;
-//         bottom: -5px;
-//         right: calc(50% - 3px);
-//         content: "";
-//         width: 6px;
-//         height: 6px;
-//         border-radius: 50%;
-//         background-color: @themeColor;
-//     }
-// }
-
-// .ivu-date-picker-cells {
-//     &-focused em {
-//         box-shadow: none;
-//     }
-
-//     span em {
-//         border-radius: 50%;
-//     }
-
-//     &-cell-today {
-//         em {
-//             position: relative;
-//             color: @themeColor;
-
-//             &::after {
-//                 content: '';
-//                 display: block;
-//                 width: 6px;
-//                 height: 6px;
-//                 border-radius: 50%;
-//                 background: #3DB8C5;
-//                 position: absolute;
-//                 top: auto;
-//                 bottom: -5px;
-//                 right: calc(50% - 3px);
-//             }
-//         }
-//     }
-// }
+}

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

@@ -1,64 +1,81 @@
 .DshEditor {   
-    &-unit {
-        .unit-show();
-        display: inline-block;
+    .DshEditor-common () {
+
+    };
+
+
+    &-edit {
+        border: 1px solid @borderColor;
+        cursor: pointer;
+        
+        &:hover {
+            border-color: @theme-hover;
+        }
+
+        &-placeholder {
+            color: @input-placeholder-color;
+        }
     }
+
     &-wrap {
         border: 1px solid @themeColor;
         border-radius: 4px;
         background: #fff;
 
+        &-toolbar {
+            margin-top: 5px;
+        }
+    
+        &-text {
+            min-height: 130px;
+            ul li {
+                list-style: disc;
+            }
+    
+            ol li {
+                list-style: auto;
+            }
+        }
+
         &-btn {
             text-align: right;
             padding: 10px;
         }
     }
+    
+    &-unit {
+        .unit-show();
+        display: inline-block;
+
+        &-nodata {
+            .control-notext();
+        }
+    }
+
     &-show {
         height: 100%;
         min-height: 32px;
         padding: 4px 10px;
         border-radius: @borderRadius;
-        p {
-            font-size: 14px !important;
-        }
 
-        li {
-            margin-left: 20px;
-        }
-
-        ul li {
-            list-style: disc;
+        &-disabled {
+           .control-disabled();
         }
 
-        ol li {
-            list-style: auto;
-        }
         &-nodata {
+            padding-left: 0px;
             border: none;
             color: @grey3;
-            padding-left: 0px;
         }
-        &-disabled {
-            border: 1px solid @border-disabled;
-            cursor: not-allowed;
-        }
-    }
-    &-edit {
-        border: 1px solid @borderColor;
-        cursor: pointer;
-        &-placeholder {
-            color: @input-placeholder-color;
+
+        p {
+            font-size: 14px !important;
         }
-        &:hover {
-            border-color: @theme-hover;
+
+        li {
+            margin-left: 20px;
         }
-    }
-    .toolbar {
-        margin-top: 5px;
-    }
 
-    .text {
-        min-height: 130px;
         ul li {
             list-style: disc;
         }

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

@@ -1,46 +1,25 @@
 .DshInput {
     width: 100%;
 
-    &-notAllowed {
-        border: 1px solid #A7A7A7;
-        // border-radius: 4px;
-        height: 32px;
-        cursor: not-allowed;
-    }
-
-    &-ellipsis-readonly {
-        color: @textColor-readonly;
-        border-color: @border-readonly;
-    }
-
-    &-ellipsis-disabled {
-        background-color: @inputBg-disabled;
-        color: @textColor-disabled;
-        border-color: @border-readonly;
-    }
-
-    &-textarea-show {
-        white-space: pre-wrap;
-        min-height: 32px;
-        height: auto;
-
-        &.control-default-readonly{
-           height: auto;
+    &-show {
+        &-textarea {
+            display: inline-block;
+            width: 100%;
+            height: auto;
+            white-space: pre-wrap;
+            min-height: 32px;
         }
     }
-
-
 }
 
-.DshInput {
-    .ivu-tooltip {
-        width: 100%;
-        display: flex;
-    }
-}
 .ivu-input {
     .control-edit();
+    cursor: text;
+
     &[disabled] {
-        .control-disabled(); 
+        .control-disabled();
+        &:hover {
+            border-color: @border-disabled;
+        }
     }
 }

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

@@ -0,0 +1,33 @@
+.DshNumber {
+    width: 100%;
+
+    &-suffix {
+        min-width: 32px;
+        border-left: 1px solid @borderColor;
+        background-color: #F0F0F0;
+        text-align: center;
+        color: @textColor;
+    }
+}
+.ivu-input-number {
+    width: 100%;
+    
+    &-input {
+        background-color: transparent;
+        opacity: 1;
+    }
+
+    &-disabled {
+        .control-disabled();
+
+        &:hover {
+            border-color: @border-disabled;
+        }
+        
+        .DshNumber-suffix {
+            color: @textColor-disabled;
+            background-color: transparent;
+            border-color: transparent;
+        }
+    }
+}

package/src/styles/components/controls/DshNumberange.less

@@ -14,11 +14,16 @@
         color: @textColor;
     }
 
+    &-suffix {
+        padding-right: 24px; 
+        padding-left: 8px; 
+        line-height: 30px; 
+        white-space: nowrap;
+    }
+
     input {
         text-overflow: ellipsis;
         overflow: hidden;
         white-space: nowrap;
     }
-}
-
-.DshNumberange {}
+}

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

@@ -4,6 +4,67 @@
     &-radioGroup {
         width: 100%;
 
+        &-useColor {
+            .ivu-radio-border {
+                height: 32px;
+                line-height: 32px;
+                border-radius: 4px;
+                border: none;
+                color: #FFF;
+                margin-bottom: 5px;
+                margin-right: 16px;
+            }
+
+            .ivu-radio {
+                .ivu-radio-inner {
+                    border: 2px solid @themeColor;
+                    background-color: transparent;
+                    width: 14px;
+                    height: 14px;
+
+                    &::after {
+                        width: 6px;
+                        height: 6px;
+                        left: 2px;
+                        top: 2px;
+                        background-color: transparent;
+                        opacity: 1;
+                        transform: scale(1);
+                    }
+                }
+
+                .ivu-radio-focus {
+                    box-shadow: 0 0 0 0;
+                }
+            }
+
+            .ivu-radio-checked {
+                .ivu-radio-inner {
+                    &::after {
+                        background-color: @themeColor;
+                    }
+                }
+            }
+
+            each(@resourceColor, {
+                .color-@{index} {
+                    .ivu-radio {
+                        .ivu-radio-inner {
+                            border-color: @value;
+                        }
+                    }
+
+                    .ivu-radio-checked {
+                        .ivu-radio-inner {
+                            &::after {
+                                background-color: @value;
+                            }
+                        }
+                    }
+                }
+            });
+        }
+
         &-scroll {
             overflow-x: auto;
             overflow-y: hidden;
@@ -74,7 +135,11 @@
         }
     }
 
-    .Dshselect-tip {
+    &-value {
+        .DshCheckbox-value();
+    }
+
+    &-tip {
         cursor: pointer;
 
         .ivu-radio {
@@ -83,96 +148,6 @@
     }
 }
 
-.DshSelect {
-    &-radioGroup {
-        &-useColor {
-            .ivu-radio-border {
-                height: 32px;
-                line-height: 32px;
-                border-radius: 4px;
-                border: none;
-                color: #FFF;
-                margin-bottom: 5px;
-                margin-right: 16px;
-            }
-
-            .ivu-radio {
-                .ivu-radio-inner {
-                    border: 2px solid @themeColor;
-                    background-color: transparent;
-                    width: 14px;
-                    height: 14px;
-
-                    &::after {
-                        width: 6px;
-                        height: 6px;
-                        left: 2px;
-                        top: 2px;
-                        background-color: transparent;
-                        opacity: 1;
-                        transform: scale(1);
-                    }
-                }
-
-                .ivu-radio-focus {
-                    box-shadow: 0 0 0 0;
-                }
-            }
-
-            .ivu-radio-checked {
-                .ivu-radio-inner {
-                    &::after {
-                        background-color: @themeColor;
-                    }
-                }
-            }
-
-            each(@resourceColor, {
-                    .color-@{index} {
-                        .ivu-radio {
-                            .ivu-radio-inner {
-                                border-color: @value;
-                            }
-                        }
-
-                        .ivu-radio-checked {
-                            .ivu-radio-inner {
-                                &::after {
-                                    background-color: @value;
-                                }
-                            }
-                        }
-                    }
-                }
-
-            );
-        }
-    }
-
-    &-select-prefix {
-        color: @themeColor;
-    }
-
-    &-tooltip {
-        display: flex;
-        align-items: center;
-        width: 100%;
-    }
-
-    &-content {
-        display: inline-block;
-        text-align: center;
-        max-width: 100%;
-        line-height: 100%;
-        vertical-align: middle;
-        width: fit-content;
-        border-radius: 14px;
-        line-height: 100%;
-        padding: 5px 10px;
-        font-size: 14px;
-    }
-}
-
 .ivu-select-item {
     margin: 4px 8px;
     border-radius: @borderRadius;
@@ -185,4 +160,15 @@
         background-color: @theme-focus  !important;
         color: @themeColor;
     }
-}
+
+    &-disabled {
+        .ivu-select-selection {
+            .control-disabled();
+        }
+    }
+    
+    &-input[disabled] {
+        color: @textColor-disabled;
+        -webkit-text-fill-color: @textColor-disabled;
+    }
+}

package/src/styles/components/controls/ZUpload.less

@@ -421,8 +421,7 @@
 }
 
 .ZUpload-disabled {
-    cursor: not-allowed;
-    border-color: @border-disabled;
+    .control-disabled();
     .ZUploa-old-wrapper {
         margin: 0px;
     }