bri-components 1.2.0 → 1.2.2

package/src/styles/components/controls/senior/selectUsers/DepartmentMenu.less

@@ -0,0 +1,37 @@
+.DepartmentMenu {
+   
+    font-size: 14px;
+
+    &-item {
+        width: 100%;
+        line-height: 38px;
+        text-align: left;
+        cursor: pointer;
+        overflow: hidden;
+
+        .ivu-icon {
+            color: @textColor;
+        }
+    }
+
+    &-item-name {
+        display: flex;
+        justify-content: space-between;
+        align-items: flex-start;
+        padding: 8px 5px 8px 20px;
+        font-weight: 400;
+        color: @textColor;
+        line-height: 24px;
+
+        &:hover {
+            background-color: rgba(36, 36, 63, 0.03);
+        }
+
+        &-select {
+            font-weight: 700;
+            color: @themeColor;
+            background: rgba(235, 240, 232, 1);
+            position: relative;
+        }
+    }
+}

package/src/styles/components/controls/senior/selectUsers/index.less

@@ -0,0 +1,2 @@
+@import "./selectUsers.less";
+@import "./DepartmentMenu.less";

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

@@ -0,0 +1,167 @@
+.selectUsers {
+    width: 100%;
+
+    &-edit {
+        #bri-control-wrap();
+    }
+    &-show {
+        #bri-control-wrap();
+    }
+
+    // 弹框部分
+    &-modal {
+        &-wrap {
+            display: flex;
+            padding: 20px;
+            height: 550px;
+
+            &-left {
+                width: 520px;
+                overflow-y: auto;
+                background: @white;
+                border: 1px solid #E5E5E5;
+    
+                .search {
+                    padding: 10px 20px;
+                }
+    
+                .content {
+                    display: flex;
+                    height: calc(100% - 52px);
+                    border-top: 1px solid #E5E5E5;
+    
+                    &-menu {
+                        flex: 3;
+                        height: 100%;
+                        overflow: auto;
+                    }
+    
+                    &-users {
+                        flex: 2;
+                        position: relative;
+    
+                        .ivu-checkbox-checked .ivu-checkbox-inner {
+                            border-color: @themeColor;
+                            background-color: @themeColor;
+                        }
+    
+                        &-list {
+                            border-left: 1px solid #E5E5E5;
+                            height: 100%;
+                            display: flex;
+                            flex-direction: column;
+    
+    
+                            &-checkAll {
+                                height: 40px;
+                                line-height: 40px;
+                                border-bottom: 1px solid #E5E5E5;
+                                padding-left: 15px;
+                            }
+    
+                            &-selects {
+                                flex: 1;
+                                overflow: auto;
+                                padding: 15px;
+    
+                                &-item {
+                                    margin-bottom: 5px;
+                                }
+                            }
+                        }
+    
+                        &-nodata {
+                            position: absolute;
+                            top: 50%;
+                            width: 100%;
+                            text-align: center;
+                            transform: translateY(-50%);
+                        }
+    
+                    }
+                }
+            }
+    
+            &-center {
+                width: 100px;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+    
+                .icon {
+                    width: 24px;
+                    height: 24px;
+                    line-height: 24px;
+                    font-size: 18px;
+                    background-color: @themeColor;
+                    border-radius: 50%;
+                    color: #fff;
+                    text-align: center;
+                }
+            }
+    
+            &-right {
+                flex: 1;
+                width: 0px;
+                height: 100%;
+                padding: 20px;
+                margin-left: 10px;
+                border: 1px solid #E5E5E5;
+                background: @white;
+                overflow: auto;
+                display: flex;
+                flex-direction: column;
+    
+                .list {
+                    display: flex;
+                    flex-wrap: wrap;
+                    align-items: center;
+            
+                    &-item {
+                        max-width: 150px;
+                        height: 24px;
+                        padding: 2px 6px 2px 10px;
+                        margin: 3px 5px;
+                        border-radius: 20px;
+                        background-color: @themeColor;
+                        color: #ffffff;
+                        font-size: 12px;
+                        display: flex;
+                        align-items: center;
+            
+                        &-name {
+                            .dsh-ellipsis();
+                        }
+            
+                        &-delete {
+                            padding: 3px;
+                            margin-left: 5px;
+                            font-size: 14px;
+                            cursor: pointer;
+                        }
+                    }
+                }
+            }
+    
+            &-footer {
+                padding-bottom: 10px;
+    
+                .DshButtons {
+                    text-align: right;
+                    padding-right: 24px;
+    
+    
+                    .ivu-btn {
+                        width: 70px;
+                        height: 32px;
+                        margin-right: 13px;
+                    }
+                }
+            }
+        }
+
+        .ivu-modal {
+            width: 900px !important;
+        }
+    }
+}

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

@@ -76,8 +76,7 @@
             text-align: left;
         }
     }
-    .control-edit {
+    .bri-control-edit {
         border-radius: 0px;
     }
-
 }

package/src/styles/components/index.less

@@ -6,11 +6,13 @@
 @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/BriCard.less";
 @import "./list/BriFlatTable.less";
-@import "./list/DshCascaderTable.less";
+@import "./list/BriTable.less";
 @import "./list/BriTree.less";
+@import "./list/BriTreeItem.less";
+@import "./list/DshCascaderTable.less";
+@import "./list/DshPage.less";
 
 // form
 @import "./form/DshForm.less";
@@ -36,6 +38,8 @@
 @import "./controls/base/DshEditor.less";
 @import "./controls/base/DshDivider.less";
 
+@import "./controls/senior/selectUsers/index.less";
+@import "./controls/senior/selectDepartments.less";
 @import "./controls/senior/flatTable.less";
 @import "./controls/senior/cascaderTable.less";
 @import "./controls/senior/BriLabels.less";

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

@@ -0,0 +1,50 @@
+.BriCard {
+    .item {
+        height: 50px;
+        margin-bottom: 10px;
+        float: left;
+        width: 33.3%;
+        padding: 0 10px;
+        min-width: 160px;
+
+        &-normal {
+            width: 100%;
+            height: 100%;
+            border: 1px solid #eaeaea;
+            position: relative;
+            border-radius: 5px;
+            cursor: pointer;
+
+            .label {
+                .dsh-ellipsis();
+                display: block;
+                width: 160px;
+                height: 100%;
+                position: absolute;
+                left: 50%;
+                margin-left: -80px;
+                line-height: 50px;
+                text-align: center;
+            }
+
+            .avatar {
+                position: absolute;
+                width: 40px;
+                height: 40px;
+                display: block;
+                border-radius: 50%;
+                left: 10px;
+                top: 5px;
+            }
+        }
+
+        &-active {
+            background-color: @themeColor;
+            color: #fff;
+        }
+    }
+
+    &-nodata {
+        #dsh-nodata();
+    }
+}

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

@@ -1,5 +1,5 @@
 .BriFlatTable {
-    &-main {
+    .BriFlatTable-main {
         height: auto;
     }
     &-create {

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

@@ -0,0 +1,50 @@
+.BriTreeItem {
+    padding-left: 16px;
+
+    &-content {
+        line-height: 36px;
+        cursor: pointer;
+        display: flex;
+        
+        &:hover {
+            background-color: @btn-hover;
+        }
+
+        &-expand {
+            width: 28px;
+            text-align: center;
+        }
+
+        &-select {
+            width: 100%;
+            color: rgba(36, 36, 63, 0.9);
+            
+            .ivu-checkbox-inner {
+                border-color: rgba(36, 36, 63, 0.3)
+            }
+            .ivu-checkbox {
+                margin-right: 2px;
+            }
+
+            &-radio {
+                .ivu-checkbox-inner {
+                    border-radius: 50%;
+                }
+            }
+        }
+        
+        &-text {
+
+        }
+    }
+
+    .default-enter, 
+    .default-leave-to {
+        opacity: 0;
+        max-height: 0;
+    }
+    
+    &-children {
+        
+    }
+}

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

@@ -154,54 +154,32 @@
 
 // 默认模态框brimodal
 .bri-modal {
-    .ivu-modal-header {
-        padding: 14px 36px;
-
-        .ivu-modal-header-inner {
-            color: @titleColor;
-            font-size: @titleSize;
-            font-weight: bold;
-        }
-    }
-
-    .ivu-modal-body {
-        padding: 16px;
+    .DshModal-close {
+        top: 20px;
+        right: 24px;
+        color: rgba(0,0,0,0.6);
+        font-size: 16px;
     }
 
-    .ivu-modal-footer {
-        display: flex;
-        justify-content: space-between;
-        padding: 20px;
-
-        button {
-            width: 48%;
-            height: 44px;
-            line-height: 44px;
+    .ivu-modal-header {
+        width: 100%;
+        height: 44px;
+        padding: 20px 24px 0px 24px;
+        border-bottom: none;
+        &-inner {
+            color: rgba(0,0,0,0.9);
+            font-size: 16px;
+            font-weight: 500;
+            line-height: 24px;
+            height: 24px;
         }
     }
-
-    &-content {
-        padding: 20px 0;
+    .ivu-modal-body {
+        padding: 16px 24px 20px;
     }
 
     &-footer {
-        display: flex;
-        justify-content: space-between;
-        padding: 20px 0;
-
-        button {
-            flex: 1;
-            margin: 0 10px;
-            height: 44px;
-            line-height: 44px;
-
-            &:first-child {
-                margin-left: 0;
-            }
-
-            &:last-child {
-                margin-right: 0;
-            }
-        }
+        text-align: right;
+        margin-top: 16px;
     }
 }

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

@@ -1,17 +1,35 @@
-.DshTags {   
-    .ivu-tag {
-        &-default {
-            border: none;
-            background-color: @borderColor;
-            color: @text-color;
+.DshTags {
+    &-autoEllipsis {
+        overflow: hidden;
+        width: 100%;
+    }
+    &-poptip {
+        &-tag {
+            margin: 2px 0;
+            .dsh-flex-row-between-center();
         }
-        &-size-medium {
-            height: 24px;
-            line-height: 26px;
-            padding: 0 8px;
+        .ivu-tag-text {
+            .dsh-ellipsis();
         }
-        &[disabled] {
-            background-color: @border-disabled;
-        }
-    }   
+    }
+}
+
+.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;
+    }
+
+    .ivu-tag-text {
+        color: inherit;
+    }
 }

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

@@ -1,7 +1,6 @@
 .DshFormItem {
     margin: 5px 6px;
     padding: 3px 10px;
-    overflow: hidden;
 
     &-required {
         .DshFormItem-label-name:before {
@@ -47,7 +46,7 @@
                 color: @textColor;
             }
             &-show {
-                color: @contentColor
+                color: @contentColor;
             }
             &-sign {
                 #dsh-sign-change();
@@ -60,12 +59,7 @@
     }
 
     &-control {
-        min-height: 30px;
-
-        .DshPackage-edit {
-            border: none;
-            padding: 0;
-        }
+        min-height: 32px;
     }
 
     &-line {
@@ -80,6 +74,7 @@
             overflow: hidden;
             margin: 0px;
             margin-right: 8px;
+
             // fixedbug:line模式下显示必填
             margin-left: -10px;
             padding-left: 10px;
@@ -103,24 +98,6 @@
             display: flex;
             justify-content: flex-end;
             align-items: center;
-
-            .ivu-select-default.ivu-select-multiple {
-                .ivu-select-selection {
-                    height: 32px;
-                    overflow: hidden;
-
-                    &>div {
-                        width: 100%;
-                        height: 100%;
-                        .dsh-flex-row-start-center();
-                        flex-wrap: wrap;
-                    }
-                }
-            }
         }
     }
-
-    .ivu-tooltip {
-        display: flex;
-    }
 }