bri-components 1.1.6 → 1.2.0

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

@@ -1,19 +1,31 @@
-.DshEditor {   
-    .DshEditor-common () {
+.DshEditor {
+    width: 100%;
+    #show {
+        p {
+            font-size: 14px !important;
+        }
 
-    };
+        li {
+            margin-left: 20px;
+        }
 
+        ul li {
+            list-style: disc;
+        }
 
-    &-edit {
-        border: 1px solid @borderColor;
-        cursor: pointer;
-        
-        &:hover {
-            border-color: @theme-hover;
+        ol li {
+            list-style: auto;
         }
+    }
 
-        &-placeholder {
-            color: @input-placeholder-color;
+    &-edit {
+        #show();
+        height: 100%;
+        min-height: 32px;
+        padding: 4px 7px;
+        border-radius: @borderRadius;
+        &.control-notext {
+            line-height: 24px;
         }
     }
 
@@ -42,46 +54,12 @@
             padding: 10px;
         }
     }
-    
+
     &-unit {
         .unit-show();
-        display: inline-block;
-
-        &-nodata {
-            .control-notext();
-        }
     }
 
     &-show {
-        height: 100%;
-        min-height: 32px;
-        padding: 4px 10px;
-        border-radius: @borderRadius;
-
-        &-disabled {
-           .control-disabled();
-        }
-
-        &-nodata {
-            padding-left: 0px;
-            border: none;
-            color: @grey3;
-        }
-
-        p {
-            font-size: 14px !important;
-        }
-
-        li {
-            margin-left: 20px;
-        }
-
-        ul li {
-            list-style: disc;
-        }
-
-        ol li {
-            list-style: auto;
-        }
+        #show();
     }
 }

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

@@ -1,5 +1,9 @@
 .DshInput {
-    width: 100%;
+    &-edit {
+        width: 100%;
+    }
+
+    &-unit {}
 
     &-show {
         &-textarea {
@@ -21,5 +25,9 @@
         &:hover {
             border-color: @border-disabled;
         }
+        &::-webkit-input-placeholder {
+            .control-disPlaceholder();
+        }
     }
+    
 }

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

@@ -1,21 +1,27 @@
 .DshNumber {
     width: 100%;
 
-    &-suffix {
-        min-width: 32px;
-        border-left: 1px solid @borderColor;
-        background-color: #F0F0F0;
-        text-align: center;
-        color: @textColor;
+    &-edit {
+        &-suffix {
+            min-width: 32px;
+            border-left: 1px solid @borderColor;
+            background-color: #F0F0F0;
+            text-align: center;
+            color: @textColor;
+        }
+    }
+
+    &-unit {
+
+    }
+
+    &-show {
+        
     }
 }
+
 .ivu-input-number {
     width: 100%;
-    
-    &-input {
-        background-color: transparent;
-        opacity: 1;
-    }
 
     &-disabled {
         .control-disabled();
@@ -29,23 +35,34 @@
             background-color: transparent;
             border-color: transparent;
         }
-    }
-}
-.ivu-input-number-handler {
-    &-wrap {
-        // opacity: 1;
-        border-left: none;
-    }
-    &-down {
-        border: none;
-    }
-    &:hover {
-        background-color: @hoverBg;
-        .ivu-input-number-handler-down-inner, .ivu-input-number-handler-up-inner {
+        .ivu-input-number-input {
+            opacity: 1;
+            background: @inputBg-disabled;
             color: @textColor;
+            &::-webkit-input-placeholder {
+                .control-disPlaceholder();
+            }
         }
     }
-    &-down-inner, &-up-inner {
-        color: @contentColor;
+
+    &-handler {
+        &-wrap {
+            // opacity: 1;
+            border-left: none;
+        }
+        &-down {
+            border: none;
+        }
+        &:hover {
+            background-color: @hoverBg;
+
+            .ivu-input-number-handler-down-inner, 
+            .ivu-input-number-handler-up-inner {
+                color: @textColor;
+            }
+        }
+        &-down-inner, &-up-inner {
+            color: @contentColor;
+        }
     }
 }

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

@@ -172,3 +172,14 @@
         -webkit-text-fill-color: @textColor-disabled;
     }
 }
+
+.ivu-select-disabled .ivu-select-selection {
+    .control-disabled();
+    &:hover {
+        border-color: transparent;
+    }
+}
+.ivu-select-input[disabled] {
+    color: @textColor;
+    -webkit-text-fill-color: @textColor-disabled;
+}

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

@@ -1,21 +1,32 @@
 .BriLabels {
-    display: flex;
-    width: 100%;
+    .control-wrap();
 
     &-dropdown {
         width: 100%;
 
         &-show {
+            .control-edit();
+            height: 32px;
             display: flex;
             justify-content: space-between;
-            cursor: pointer;
-            border-radius: @borderRadius;
-            border: 1px solid @borderColor;
-            padding-left: 5px;
+            padding-left: 4px;
+            
 
             &-list {
                 display: flex;
                 align-items: center;
+                width: calc(100% - 14px);
+
+                &-show {
+                    width: 100%;
+                    white-space: nowrap;
+                    .bri-scrollbar3();
+                    overflow-y: hidden;
+                }
+
+                &-placeholder {
+                    .control-placeholder();
+                }
             }
 
             &-active {
@@ -23,6 +34,17 @@
                 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();
+                }
+            }
+
             &-arrow {
                 display: flex;
                 align-items: center;
@@ -80,7 +102,7 @@
         }
 
         &-add {
-            width: 300px;
+            width: 100%;
             margin-bottom: 8px;
         }
     }
@@ -115,7 +137,6 @@
         &-item {
             .unit-show();
             .dsh-ellipsis();
-            display: inline-flex;
             max-width: 100%;
             height: fit-content;
             padding: 0 8px;
@@ -127,9 +148,5 @@
             border-radius: @borderRadius;
             margin-right: 8px;
         }
-
-        &-nodata {
-            color: @textColor;
-        }
     }
 }

package/src/styles/components/controls/special/DshBack.less

@@ -0,0 +1,3 @@
+.DshBack {
+    width: 100%;
+}

package/src/styles/components/controls/special/DshUndeveloped.less

@@ -0,0 +1,3 @@
+.DshUndeveloped {
+    width: 100%;
+}

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

@@ -1,5 +1,4 @@
 .DshAdvSearchForm {
-
     #title {
         font-weight: 400;
         color: #999999;

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

@@ -22,7 +22,7 @@
         width: 100%;
         text-align: center;
         position: absolute;
-        bottom: -10px;
+        bottom: -24px;
         left: 0px;
 
         &-icon {

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,3 +1,25 @@
+// list
+@import "./list/DshBox/DshBox.less";
+@import "./list/DshBox/DshTable.less";
+@import "./list/DshBox/DshCrossTable.less";
+@import "./list/DshBox/DshCard.less";
+@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/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";
@@ -8,9 +30,8 @@
 @import "./controls/base/DshCheckbox.less";
 @import "./controls/base/DshDate.less";
 @import "./controls/base/DshDaterange.less";
-@import "./controls/base/DshCascader.less";
-@import "./controls/base/InfoCascader.less";
-@import "./controls/base/BriUpload.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";
@@ -20,47 +41,33 @@
 @import "./controls/senior/BriLabels.less";
 @import "./controls/senior/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";
-@import "./list/DshBox/DshCrossTable.less";
-@import "./list/DshBox/DshCard.less";
-@import "./list/DshBox/DshPanel.less";
-@import "./list/DshBox/DshSingleData.less";
-@import "./list/DshBox/DshList.less";
-
-@import "./list/BriTable.less";
-@import "./list/BriFlatTable.less";
-@import "./list/DshCascaderTable.less";
-@import "./list/ZTree.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 {
+    
+}