bri-components 1.1.5 → 1.2.0

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

@@ -1,5 +1,6 @@
 .DshDefaultSearch {
     position: relative;
+    background: #fff;
 
     &-item {
         padding: 0 !important;
@@ -21,17 +22,9 @@
         width: 100%;
         text-align: center;
         position: absolute;
-        bottom: -20px;
+        bottom: -24px;
         left: 0px;
 
-        &-zhanwei {
-            width: 100%;
-            height: 15px;
-            background: #fff;
-            position: relative;
-            z-index: 1;
-        }
-
         &-icon {
             width: 48px;
             height: 20px;
@@ -48,4 +41,43 @@
             }
         }
     }
+
+    // 输入框/下拉框
+    input,
+    .ivu-select-selection,
+    .ivu-cascader-size-default,
+    .DshCascader-multiple-input,
+    .DshDaterange-item {
+        border-radius: 0;
+
+        .ivu-select-input{
+            top: 0px!important;
+        }
+    }
+
+    .DshCascader-multiple-input {
+        height: 32px;
+        padding: 1px 6px;
+        overflow: hidden!important;
+    }
+
+    .DshFormItem-label {
+        width: 80px;
+        text-align: right;
+        margin-right: 16px;
+
+        .DshFormItem-label-left {
+            .DshFormItem-label-name {
+                font-family: "Microsoft YaHei";            
+            }
+        }
+        
+        .DshFormItem-label-right {
+            text-align: left;
+        }
+    }
+    .control-edit {
+        border-radius: 0px;
+    }
+
 }

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

@@ -0,0 +1,13 @@
+.DshForm {
+    &-item-FormItem {
+        margin-bottom: 0px!important;
+    }
+
+    .ivu-form-item-content {
+        line-height: normal;
+    }
+    .ivu-form-item-error-tip {
+        top: 90%;
+        left: 15px;
+    }
+}

package/src/styles/components/index.less

@@ -1,30 +1,3 @@
-// controls
-@import "./controls/DshInput.less";
-@import "./controls/BriInputs.less";
-@import "./controls/DshNumber.less";
-@import "./controls/DshNumberange.less";
-@import "./controls/DshCheckbox.less";
-@import "./controls/DshSelect.less";
-@import "./controls/DshDate.less";
-@import "./controls/DshDaterange.less";
-@import "./controls/DshCascader.less";
-@import "./controls/InfoCascader.less";
-@import "./controls/DshCoordinates.less";
-@import "./controls/DshEditor.less";
-@import "./controls/DshDivider.less";
-
-@import "./controls/BriUpload.less";
-@import "./controls/flatTable.less";
-@import "./controls/cascaderTable.less";
-@import "./controls/BriLabels.less";
-@import "./controls/DshPackage.less";
-
-@import "./controls/controlShow.less";
-
-// form
-@import "./form/DshAdvSearchForm.less";
-@import "./form/DshDefaultSearch.less";
-
 // list
 @import "./list/DshBox/DshBox.less";
 @import "./list/DshBox/DshTable.less";
@@ -33,33 +6,68 @@
 @import "./list/DshBox/DshPanel.less";
 @import "./list/DshBox/DshSingleData.less";
 @import "./list/DshBox/DshList.less";
-
+@import "./list/DshPage.less";
 @import "./list/BriTable.less";
 @import "./list/BriFlatTable.less";
 @import "./list/DshCascaderTable.less";
-@import "./list/ZTree.less";
+@import "./list/BriTree.less";
+
+// form
+@import "./form/DshForm.less";
+@import "./form/DshAdvSearchForm.less";
+@import "./form/DshDefaultSearch.less";
+// unit
+@import "./unit/DshFormItem.less";
+@import "./unit/DshUnit.less";
+
+// controls
+@import "./controls/base/DshInput.less";
+@import "./controls/base/BriInputs.less";
+@import "./controls/base/DshNumber.less";
+@import "./controls/base/DshNumberange.less";
+@import "./controls/base/DshSwitch.less";
+@import "./controls/base/DshSelect.less";
+@import "./controls/base/DshCheckbox.less";
+@import "./controls/base/DshDate.less";
+@import "./controls/base/DshDaterange.less";
+@import "./controls/base/DshCascader/index.less";
+@import "./controls/base/BriUpload/index.less";
+@import "./controls/base/DshCoordinates.less";
+@import "./controls/base/DshEditor.less";
+@import "./controls/base/DshDivider.less";
+
+@import "./controls/senior/flatTable.less";
+@import "./controls/senior/cascaderTable.less";
+@import "./controls/senior/BriLabels.less";
+@import "./controls/senior/DshPackage.less";
+
+@import "./controls/special/DshBack.less";
+@import "./controls/special/DshUndeveloped.less";
 
 // other
+@import "./other/BriCode.less";
+@import "./other/BriCollapseTree.less";
+@import "./other/BriGantt.less";
+@import "./other/BriIframe.less";
+@import "./other/BriLoading.less";
+@import "./other/DshAvatar.less";
+@import "./other/DshBtnModal.less";
+@import "./other/DshColorPanel.less";
 @import "./other/DshEditPanel.less";
 @import "./other/DshMenu.less";
 @import "./other/DshMenuNav.less";
-@import "./other/ZCode.less";
-@import "./other/ZCollapseTree.less";
-@import "./other/ZGantt.less";
-@import "./other/ZLoading.less";
-@import "./other/BriTransfer.less";
 
 // small
+@import "./small/BriButton.less";
+@import "./small/BriDrawer.less";
+@import "./small/BriTooltip.less";
 @import "./small/DshButtons.less";
-@import "./small/Ctooltip.less";
+@import "./small/DshCrumbs.less";
+@import "./small/DshCrumbItem.less";
 @import "./small/DshDropdown.less";
-@import "./small/DshPage.less";
+@import "./small/DshIcons.less";
+@import "./small/DshModal.less";
+@import "./small/DshSteps.less";
 @import "./small/DshTabs.less";
+@import "./small/DshTags.less";
 @import "./small/DshTitle.less";
-@import "./small/DshSteps.less";
-@import "./small/BriButton.less";
-@import "./small/BriDrawer.less";
-@import "./small/DshModal.less";
-
-// unit
-@import "./unit/DshFormItem.less";

package/src/styles/components/list/BriTable.less

@@ -48,9 +48,9 @@
         .dsh-flex-row-center-center();
     }
 
-    &-loading {
-        color: @themeColor;
-    }
+    &-ellipsis {
+        max-width: calc(100% - 20px);
+    } 
 
     td {
         white-space: normal !important;
@@ -75,7 +75,6 @@
     td.ve-table-last-left-fixed-column {
         box-shadow: 4px 0 7px -2px rgba(0, 0, 0, 0.1);
     }
-
 }
 
 .ve-table .ve-table-container.ve-table-container-left-scrolling .ve-table-last-left-fixed-column {
@@ -90,8 +89,9 @@
 
 // 排序
 .ve-table-sort {
-    float: right;
-    margin-top: -4px;
+    position: absolute!important;
+    top: 7px;
+    right: 20px;
 
     .icon-vet-sort-top-arrow:before {
         content: "\e6347";
@@ -104,9 +104,9 @@
 
 // 筛选
 .ve-dropdown {
-    float: right;
-    margin-right: 24px;
-    margin-top: -4px;
+    position: absolute;
+    top: 9px;
+    right: 42px;
 }
 
 .ve-table .ve-table-container .ve-table-content-wrapper table.ve-table-content thead.ve-table-header .ve-table-header-tr .ve-table-header-th .ve-table-filter .ve-table-filter-icon {

package/src/styles/components/list/{ZTree.less → BriTree.less}

@@ -1,4 +1,4 @@
-.ZTree {
+.BriTree {
     max-width: 1200px;
     min-width: 720px;
     height: 100%;
@@ -40,13 +40,17 @@
             margin-top: 5px;
         }
     }
-    &-dropdown-menu.DshColorPanel-list {
-        width: 242px!important;
-    }
 
-    &-create-content {
-        .textRight {
-            text-align: right;
+    &-modal {
+        &-content {
+            &-btns {
+                .dsh-padding20();
+                text-align: right;
+            }
         }
     }
+
+    &-dropdown-menu.DshColorPanel-list {
+        width: 242px!important;
+    }
 }

package/src/styles/components/list/DshBox/DshTable.less

@@ -1,4 +1,15 @@
 .DshTable {
     width: 100%; 
     height: 100%;
+    .table-operation-btn {
+        margin-left: 16px;
+        padding: 0px;
+        &:first-of-type {
+            margin: 0px;
+        }
+    }
+    .DshButtons-dropdown-more {
+        padding: 0px;
+        margin-left: 16px;
+    }
 }

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

@@ -0,0 +1,5 @@
+
+.BriCode {
+    width: 100%;
+    height: 100%;
+}

package/src/styles/components/other/{ZCollapseTree.less → BriCollapseTree.less}

@@ -1,4 +1,4 @@
-.ZCollapseTree {
+.BriCollapseTree {
     &-listItem {
             display: flex;
             justify-content: space-between;
@@ -29,7 +29,7 @@
     }
 }
 
-.ZCollapseTree {
+.BriCollapseTree {
     &-collapse {
         border: none;
         .ivu-collapse-item>.ivu-collapse-header {

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

@@ -0,0 +1,16 @@
+.BriIframe {
+    display: flex;
+    width: 100%;
+    height: 100%;
+    position: relative;
+
+    &-iframe {
+        flex: 1;
+        overflow: auto;
+    }
+    
+    &-nodata {
+        width: 100%;
+        height: 100%;
+    }
+}

package/src/styles/components/other/{ZLoading.less → BriLoading.less}

@@ -1,4 +1,4 @@
-.ZLoading {
+.BriLoading {
     &-fix {
         position: absolute;
         top: 0;
@@ -7,7 +7,7 @@
         width: 100%;
         height: 100%;
 
-        .ZLoading-main {
+        .BriLoading-main {
             position: absolute;
             top: 50%;
             left: 50%;
@@ -24,7 +24,7 @@
             to { transform: rotate(360deg); }
         }
 
-        .ZLoading-main {
+        .BriLoading-main {
             width: 100%;
             height: 100%;
             .dsh-flex-col();

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

@@ -0,0 +1,64 @@
+.DshAvatar {
+    position: relative;
+
+    span {
+        display: inline-block;
+        margin-left: 20px;
+        line-height: 22px;
+    }
+
+    &-img {
+        width: 22px;
+        height: 22px;
+        padding: 1px;
+        display: inline-block;
+        line-height: 20px;
+        background: #fff;
+        border-radius: 50%;
+        img {
+            width: 20px;
+            height: 20px;
+            display: inline-block;
+            border-radius: 50%;
+        }
+        &:nth-child(1) {
+            position: absolute;
+            left: 0px;
+            top: 50%;
+            margin-top: -10px;
+        }
+        &:nth-child(2) {
+            position: absolute;
+            left: 12px;
+            top: 50%;
+            margin-top: -10px;
+        }
+        &:nth-child(3) {
+            position: absolute;
+            left: 24px;
+            top: 50%;
+            margin-top: -10px;
+        }
+        &:nth-child(4) {
+            position: absolute;
+            left: 36px;
+            top: 50%;
+            margin-top: -10px;
+        }
+    }
+
+    &-round {
+        display: inline-block;
+        margin-right: 8px;
+    }
+    
+    &-box {
+        position: relative;
+        img {
+            width: 20px;
+            height: 20px;
+            display: inline-block;
+            border-radius: 50%;
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+.DshBtnModal {
+    
+}

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

@@ -0,0 +1,40 @@
+.DshColorPanel {
+    &-rel {
+        cursor: pointer;
+    }
+
+    &-list {
+        font-size: 15px;
+        display: flex;
+        width: 293px;
+        height: 72px;
+        flex-wrap: wrap;
+        justify-content: space-around;
+        align-items: center;
+
+        &-item {
+            padding: 6px;
+
+            &-big {
+                width: 15px;
+                height: 15px;
+                display: inline-block;
+                border-radius: 50%;
+            }
+
+            &-small {
+                width: 12px;
+                height: 12px;
+                position: absolute;
+                display: inline-block;
+                transform: translate(1.5px,1.5px);
+                border-radius: 50%;
+                
+                &:hover + span {
+                    border-width: 1px;
+                    border-style: solid;
+                }
+            }
+        }
+    }
+}

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

@@ -2,6 +2,7 @@
     width: 220px;
     height: 240px;
     text-align: left;
+
     &-name {}
     &-colors {
         padding: 40px 0 0 0;
@@ -30,6 +31,7 @@
             }
         }
     }
+
     &-icons {
         padding: 40px 0px 0px 0;
         &-item {
@@ -59,9 +61,7 @@
             }
         }
     }
-}
 
-.DshEditPanel {
     &-form {
         .ivu-form-item {
             margin-bottom: 15px;

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

@@ -100,16 +100,21 @@
  }
 .ivu-btn-linkText {
     color: @themeColor;
+    border: none;
     &:hover {
         background-color: transparent;
+        color: @theme-hover;
     }
     &:active {
         background-color: transparent;
+        color: @theme-active;
     }
     &[disabled] {
         color: @theme-disabled;
+        background-color: transparent;
         &:hover, &:active {
             color: @theme-disabled;
+            background-color: transparent;
         }
     }
 }
@@ -152,6 +157,7 @@
         }
     }
 }
+
 .ivu-btn-default, .ivu-btn-dashed {
     color: @textColor;
     border-color: @btnCancelBg;
@@ -176,6 +182,33 @@
         }
     }
 }
+
+.ivu-btn-primaryLine {
+    color: @themeColor;
+    border-color: @themeColor;
+    background-color: #fff;
+    &:hover {
+        background-color: #fff;
+        border-color: @btnBgclick;
+        color: @btnBgHover;
+    }
+    &:active {
+        background-color: #fff;
+        border-color: @btnBgclick;
+        color: @btnBgclick;
+    }
+    &[disabled] {
+        background-color: #fff;
+        border-color: @btnBgDisabled;
+        color: @btnBgDisabled;
+        &:hover, &:active {
+            background-color: #fff;
+            border-color: @btnBgDisabled;
+            color: @btnBgDisabled;
+        }
+    }
+}
+
 .ivu-btn-errorLine {
     color: @btnWarningBg;
     border-color: @btnWarningBg;
@@ -190,11 +223,11 @@
         color: @btnWarningBgClick;
     }
     &[disabled] {
-        background-color: @btnCancelBg;
+        background-color: #fff;
         border-color: @btnWarningBgDisabled;
         color: @btnWarningBgDisabled;
         &:hover, &:active {
-            background-color: @btnCancelBg;
+            background-color: #fff;
             border-color: @btnWarningBgDisabled;
             color: @btnWarningBgDisabled;
         }

package/src/styles/components/small/{Ctooltip.less → BriTooltip.less}

@@ -1,5 +1,6 @@
-.Ctooltip {
+.BriTooltip {
     display: flex;
+    
     .ivu-tooltip-arrow {
         border-bottom-color: rgba(0, 0, 0, 0.9) !important;
     }

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

@@ -24,6 +24,8 @@
                     align-items: center;
                     border-radius: @borderRadius;
                     padding: 9px 8px;
+                    margin: 0 8px;
+                    line-height: 22px;
                     &:hover {
                         background-color: @theme-focus;
                         color: @themeColor;
@@ -51,9 +53,9 @@
         }
     }
 }
+
 .ivu-select-dropdown {
     border: 0.5px solid #e5e5e5;
     box-shadow: 0 3px 14px 2px rgba(0,0,0,0.05), 0 8px 10px 1px rgba(0,0,0,0.06), 0 5px 5px -3px rgba(0,0,0,0.1);
-    padding: 8px;
-    max-height: 500px
-}
+    max-height: 500px;
+}

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

@@ -0,0 +1,7 @@
+.DshIcons {
+    display: inline-block;
+    
+    &-item {
+        cursor: pointer;
+    }
+}

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

@@ -0,0 +1,17 @@
+.DshTags {   
+    .ivu-tag {
+        &-default {
+            border: none;
+            background-color: @borderColor;
+            color: @text-color;
+        }
+        &-size-medium {
+            height: 24px;
+            line-height: 26px;
+            padding: 0 8px;
+        }
+        &[disabled] {
+            background-color: @border-disabled;
+        }
+    }   
+}

package/src/styles/components/unit/DshFormItem.less

@@ -20,22 +20,21 @@
     }
 
     &-label {
-        padding: 5px 0px 5px;
         min-width: 0px;
+        padding: 5px 0px 5px;
         line-height: 20px;
         font-size: @smallSize;
-        margin-bottom: 3px;
         display: flex;
         align-items: center;
 
         &-left {
-            flex: 3;
+            flex: 2;
             min-width: 150px;
             position: relative;
         }
 
         &-right {
-            flex: 2;
+            flex: 1;
             min-width: 0px;
             text-align: right;
         }
@@ -92,9 +91,9 @@
 
             &-right {
                 flex: none;
+                max-width: 50%;
                 min-width: 0px;
                 text-align: right;
-                max-width: 50%;
             }
         }
 
@@ -113,7 +112,7 @@
                     &>div {
                         width: 100%;
                         height: 100%;
-                        .dsh-flex-row-start-center;
+                        .dsh-flex-row-start-center();
                         flex-wrap: wrap;
                     }
                 }

package/src/styles/components/unit/DshUnit.less

@@ -0,0 +1,5 @@
+.DshUnit {
+    .ivu-input {
+        font-size: 12px;
+    }
+}