bri-components 1.1.1 → 1.1.3

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

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

@@ -1,33 +1,19 @@
 .cascaderTable {
+
     &-unit {
-        .unit-show()
+        .unit-show();
+
+        &-text {
+            
+        }
     }
+
     &-btns {
         text-align: right;
         color: @textColor;
-    }
-    &-con {
-        width:100%;
-        overflow:hidden;
-        background-color: #FFF;
-        &-icon {
-            font-size: 18px;
-            color: @themeColor;
-        }
-        &-outspan {
-            display: inline-block;
-            height: 24px;
-            line-height: 24px;
-            padding: 0 5px;
-            margin: auto;
-            background: rgba(96, 144, 237, 0.15);
-            border-radius: 12px;
-            text-align: center;
-            color: @themeColor;
-        }
-        &-innerspan {
-            font-size: 14px;
-            color: @themeColor;
+
+        &-item {
+
         }
     }
 }

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

@@ -1,9 +1,11 @@
 .controlShow {
     &-val {
+        .dsh-ellipsis();
         height: 100%;
     }
-
+    
     &-nodata {
+        .dsh-ellipsis();
         color: rgba(0, 0, 0, 0.4);
         font-weight: 400;
     }

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

@@ -1,33 +1,20 @@
 .flatTable {
     width: 100%;
+
     &-unit {
-        .unit-show()
+        .unit-show();
+
+        &-text {
+            
+        }
     }
+    
     &-btns {
         text-align: right;
         color: @textColor;
-    }
-    &-con {
-        width:100%;
-        overflow:hidden;
-        &-icon {
-            font-size: 18px;
-            color: @themeColor;
-        }
-        &-outspan {
-            display: inline-block;
-            height: 24px;
-            line-height: 24px;
-            padding: 0 5px;
-            margin: auto;
-            background: rgba(96, 144, 237, 0.15);
-            border-radius: 12px;
-            text-align: center;
-            color: @themeColor;
-        }
-        &-innerspan {
-            font-size: 14px;
-            color: @themeColor;
+
+        &-item {
+
         }
     }
 }

package/src/styles/components/form/DshAdvSearchForm.less

@@ -111,15 +111,6 @@
                     }
                 }
             }
-
-            &.DshFormItem-labels{
-                overflow: initial;
-                .DshLabels {
-                    width: 100%;
-                    padding: 0;
-                }
-
-            }
         }
     }
 

package/src/styles/components/form/DshDefaultSearch.less

@@ -1,14 +1,6 @@
 .DshDefaultSearch {
     position: relative;
 
-    // .ivu-input {
-    //     border-radius: 0;
-    // }
-
-    // .DshLabels-show {
-    //     border-radius: 0;
-    // }
-
     &-item {
         padding: 0 !important;
         padding-bottom: 6px !important;
@@ -17,18 +9,6 @@
         margin-bottom: 0px !important;
 
         &-name {}
-
-        &.DshFormItem-labels {
-            .DshLabels {
-                position: static;
-                width: 100%;
-                padding: 0;
-
-                &-searchResult {
-                    position: fixed;
-                }
-            }
-        }
     }
 
     &-form {

package/src/styles/components/index.less

@@ -4,13 +4,13 @@
 @import "./controls/DshDaterange.less";
 @import "./controls/DshDivider.less";
 @import "./controls/DshInput.less";
+@import "./controls/DshNumber.less";
 @import "./controls/DshNumberange.less";
 @import "./controls/DshSelect.less";
 @import "./controls/ZUpload.less";
 @import "./controls/DshCascader.less";
 @import "./controls/DshEditor.less";
 @import "./controls/MultipleInput.less";
-@import "./controls/DshLabels.less";
 @import "./controls/BriLabels.less";
 @import "./controls/DshPackage.less";
 @import "./controls/flatTable.less";
@@ -53,7 +53,8 @@
 @import "./small/DshSteps.less";
 @import "./small/DshControlDefine.less";
 @import "./small/BriButton.less";
-@import "./small/BriTree.less";
+@import "./small/BriDrawer.less";
+@import "./small/DshModal.less";
 
 // unit
 @import "./unit/DshFormItem.less";

package/src/styles/components/other/InfoCascader.less

@@ -43,6 +43,10 @@
             color: #3D84EE;
             background-color: #eee;
         }
+
+        .ivu-tree-empty {
+            text-align: center;
+        }
     }
 
     &-footer {

package/src/styles/components/other/ZLoading.less

@@ -19,18 +19,34 @@
         width: 100%;
         height: 100%;
 
+        @keyframes spin {
+            from { transform: rotate(0deg); }
+            to { transform: rotate(360deg); }
+        }
+
         .ZLoading-main {
             width: 100%;
             height: 100%;
-
-            img {
-                width: auto;
-                height: auto;
-                max-width: 100%;
-                max-height: 100%;
+            .dsh-flex();
+            
+            &-content {
+                display: flex;
+                flex-direction: column;
+                align-items: center;
             }
 
-            .dsh-flex();
+            &-loading {
+                border-radius: 50%;
+                background: conic-gradient(#5EC4CF 50%, white);
+                --mask: radial-gradient(closest-side, transparent 70%, black 71%);
+                -webkit-mask-image: var(--mask);
+                mask-image: var(--mask);
+                animation: spin 1s linear infinite;
+            }
+            &-loadingText {
+                margin-top: 8px;
+                color: @themeColor;
+            }
         }
     }
 }

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

@@ -0,0 +1,34 @@
+.BriDrawer {
+    .ivu-drawer-header {
+        padding: 16px 16px 15px;
+    }
+    .ivu-drawer-body {
+        padding: 0px;
+    }
+    .ivu-drawer-close {
+        top: 18px;
+        right: 18px
+    }
+    &-header {
+        color: @textColor;
+        font-weight: 500;
+        font-size: @smallTitleSize;
+        line-height: @smallTitleHeight;
+    }
+    &-close {
+        color: @contentColor;
+    }
+    &-main {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+    }
+    &-body {
+        flex: 1;
+        overflow: auto;
+    }
+    &-footer {
+        border-top: 1px solid @borderColor;
+        padding: 11px 16px 12px;
+    }
+}