bri-components 1.1.3 → 1.1.5

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

@@ -0,0 +1,59 @@
+.DshCard {
+    display: flex;
+    flex-wrap: wrap;
+    background-color: #ffffff;
+    padding: 0 40px;
+    
+    &-item {
+        width: 250px;
+        height: 210px;
+        box-sizing: border-box;
+        margin: 10px 16px 30px;
+        border-radius: 6px;
+        overflow: hidden;
+        box-shadow: 0px 4px 8px 0px rgba(222, 222, 222, 0.75);
+        cursor: pointer;
+        display: flex;
+        flex-direction: column;
+        position: relative;
+
+        &-dropdown {
+            position: absolute;
+            top: 5px;
+            right: 5px;
+        }
+        &-image {
+            padding-top: 20px;
+            height: 122px;
+        }
+        &-info {
+            flex: 1;
+            padding: 8px 15px;
+            overflow: hidden;
+            background: #F7FBFF;
+            &-title {
+                font-size: 14px;
+                font-weight: 600;
+            }
+            &-col {
+                height: 24px;
+            }
+
+            .unit {
+                display: flex;
+                flex-direction: row;
+                &-label {
+                    max-width: 60px;
+                    font-weight: 400;
+                    color: #515A6E;
+                }
+                &-colon {
+
+                }
+                &-value {
+                    flex: 1;
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,142 @@
+.DshList {
+    @height:44px;
+    
+    .list {
+        &-loading {
+            min-height: 100px;
+
+            &-wrap {
+                display: block;
+                height: 100%;
+                width: 100%;
+                background-color: #fff;
+                z-index: 99999;
+                position: relative;
+                opacity: 0.6;
+            }
+
+            &-content {
+                z-index: 9999999;
+                position: absolute;
+                top: 30px;
+                left: 50%;
+            }
+
+            &-icon {
+                -moz-animation: spin 2.3s infinite linear;
+                -o-animation: spin 2.3s infinite linear;
+                -webkit-animation: spin 2.3s infinite linear;
+                animation: spin 2.3s infinite linear;
+                display: inline-block;
+                font-size: 28px;
+                opacity:0.6;
+
+                &:before {
+                    content: '\e838';
+                }
+            }
+        }
+
+        &-cols,
+        &-rows {
+            position: relative;
+            &-left {
+                width: 48px;
+                text-align: center;
+                position: absolute;
+                left: 0;
+                top: 0;
+                label {
+                    display: inline-block;
+                    height: 36px;
+                    padding: 9px 5px;
+                    margin: 0px;
+                    line-height: 18px;
+                }
+            }
+
+            .row {
+                width: 100%;
+                line-height: 20px;
+                display: flex;
+                justify-content: space-between;
+                &-item {
+                    min-width: 120px;
+                    height: 100%;
+                    padding: 0 16px;
+                    font-size: 14px;
+                    align-items: center;
+                }
+            }
+        }
+
+        &-cols {
+            height: @height;
+            background: #f0f0f0;
+            &-left {}
+            &-right {}
+
+            .row {
+                font-weight: 700;
+                &-item {
+                    padding: 10px 16px;
+                    border-top: 1px #e5e5e5 solid;
+                    border-bottom: 1px #f0f0f0 solid;
+                    border-left: 1px #e5e5e5 solid;
+
+                    &:last-child{
+                       border-right: 1px #e5e5e5 solid;
+                    }
+
+                    &-inner {
+                        .dsh-ellipsis{
+                            font-size: 14px;
+                            color: #666;
+                            font-weight: 700;
+                            line-height: 24px;
+                        }
+                    }
+                }
+            }
+        }
+
+        &-rows {
+            &-left {
+                label {
+                    height: 44px;
+                    line-height: 20px;
+                }
+            }
+            &-right {}
+
+            .row {
+                height: 44px;
+                line-height: 20px;
+
+                cursor: pointer;
+                &-item {
+                    display: flex;
+                    border: 1px solid #E5E5E5;
+                    border-width: 0 0 1px 1px;
+
+                    &:last-child{
+                        border-width: 0 1px 1px 1px;
+                    }
+
+                    &-inner {
+                        width: 100%;
+                        font-size: 14px;
+                        color: #333;
+                        font-weight: 400;
+                        line-height: 24px;
+                    }
+                }
+            }
+        }
+
+        &-noData {
+            padding: 10px 0px;
+            text-align: center;
+        }
+    }
+}

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

@@ -0,0 +1,107 @@
+.DshPanel {
+    min-width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: row;
+
+    &-group {
+        width: 300px;
+        min-width: 300px;
+        max-width: 300px;
+        height: 100%;
+        padding: 10px;
+        overflow: hidden;
+        display: flex;
+        flex-direction: column;
+
+        &-title {
+            width: 100%;
+            height: 50px;
+            padding: 15px 10px;
+            display: flex;
+            border-radius: 10px 10px 0px 0px;
+            font-size: 14px;
+
+            &-name {
+                max-width: 120px;
+            }
+            &-number {
+                font-weight: bold;
+            }
+        }
+
+        &-list {
+            width: 100%;
+            flex: 1;
+            min-height: 0px;
+            border: 1px dashed #cccccc;
+            border-top: none;
+            display: flex;
+            flex-direction: column;
+
+            .list-drag {
+                width: 100%;
+                flex: 1;
+                min-height: 0px;
+
+                &-transition {
+                    display: block;
+                    width: 100%;
+                    height: 100%;
+                    padding: 10px;
+                    overflow: auto;
+
+                    .item {
+                        height: 60px;
+                        padding: 10px 17px;
+                        margin-bottom: 10px;
+                        border: 1px solid rgba(102, 110, 126, 0.1);
+                        border-radius: 4px;
+                        background: #FFFFFF;
+                        cursor: pointer;
+                        position: relative;
+
+                        &-dropdown {
+                            position: absolute;
+                            top: 5px;
+                            right: 5px;
+                        }
+
+                        &-title {
+                            width: calc(100% - 22px);
+                            margin-bottom: 2px;
+                            font-family: Source Han Sans CN;
+                            font-size: 14px;
+                            font-weight: 500;
+                            color: #515A6E;
+                        }
+
+                        &-cols {}
+
+                        .unit {
+                            display: flex;
+                            flex-direction: row;
+                            color: #515A6E;
+                            &-label {
+                                max-width: 60px;
+                            }
+                            &-colon {
+
+                            }
+                            &-value {
+                                flex: 1;
+                            }
+                        }
+                    }
+                }
+            }
+
+            .list-btns {
+                width: 100%;
+                height: 40px;
+                padding: 0px 10px;
+                text-align: center;
+            }
+        }
+    }
+}

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

@@ -0,0 +1,4 @@
+.DshTable {
+    width: 100%; 
+    height: 100%;
+}

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

@@ -0,0 +1,52 @@
+.ZTree {
+    max-width: 1200px;
+    min-width: 720px;
+    height: 100%;
+    margin: 0px auto;
+    background: #fff;
+    display: flex;
+    flex-direction: column;
+
+    &-action {
+        padding: 10px;
+        display: flex;
+        justify-content: flex-end;
+
+        &-create {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+
+            .ivu-icon {
+                font-size: 20px;
+                font-weight: bold;
+                margin-right: -10px;
+                vertical-align: middle;
+                transform: translate(0, -1px);
+            }
+        }
+    }
+
+    &-tree {
+        width: 100%;
+        flex: 1;
+        min-height: 0px;
+        overflow: auto;
+
+        .ivu-tree-title {
+            width: calc(100% - 18px);
+        }
+        .ivu-tree-arrow {
+            margin-top: 5px;
+        }
+    }
+    &-dropdown-menu.DshColorPanel-list {
+        width: 242px!important;
+    }
+
+    &-create-content {
+        .textRight {
+            text-align: right;
+        }
+    }
+}

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

@@ -27,13 +27,7 @@
         .ZLoading-main {
             width: 100%;
             height: 100%;
-            .dsh-flex();
-            
-            &-content {
-                display: flex;
-                flex-direction: column;
-                align-items: center;
-            }
+            .dsh-flex-col();
 
             &-loading {
                 border-radius: 50%;
@@ -47,6 +41,10 @@
                 margin-top: 8px;
                 color: @themeColor;
             }
+            &-noText {
+                color: @textColor;
+                margin-top: 16px;
+            }
         }
     }
 }

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

@@ -42,12 +42,6 @@
         
                 .ivu-dropdown-item-divided:before {
                     margin: 0px;
-                    // content: '';
-                    // height: 5px;
-                    // display: block;
-                    // background-color: #fff;
-                    // position: relative;
-                    // top: -7px;
                 }
             }
 
@@ -58,7 +52,7 @@
     }
 }
 .ivu-select-dropdown {
-    border: 0.5px solid rgba(229,229,229,1);
+    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

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

@@ -64,7 +64,7 @@
     &-small {
          .ivu-modal-wrap {
              .ivu-modal {
-                width: 500px !important;
+                // width: 500px !important;
                 height: 400px !important;
                 max-height: 100%;
                 max-width: 100%;

package/src/styles/variables.less

@@ -11,6 +11,7 @@
 
 // 背景色
 @bgColor               : #F5F5F5;
+@hoverBg               : #F0F0F0;
 @white                 : #FFF;
 @black                 : #000;
 

package/src/utils/table.js

@@ -1,6 +1,7 @@
 /* -------------------- 表格 -------------- */
 // 转化表单字段属性 to 表格参数, 是否需要过滤tag
 const transformToColumns = function (form) {
+    let headerFilter = this.listPropsObj && this.listPropsObj.headerFilter;
     return form
         .filter(col => col._type !== "tag")
         .map(col => {
@@ -12,7 +13,7 @@ const transformToColumns = function (form) {
                 key: col._key,
                 align: col._align || typeData.align,
                 width: col._width || typeData.width,
-                sortBy: col._sortBy || typeData.sortBy,
+                sortBy: headerFilter ? col._sortBy || typeData.sortBy : undefined,
 
                 ...(
                     col._type
@@ -49,7 +50,7 @@ const transformToColumns = function (form) {
                 ...(
                     ["select", "checkbox"].includes(col._type)
                         ? {
-                            filter: this.listPropsObj && this.listPropsObj.headerFilter ? {
+                            filter: headerFilter ? {
                                 isMultiple: true,
                                 maxHeight: 300,
                                 filterList: col._data.map(item => ({