bri-components 1.2.13 → 1.2.15

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

@@ -11,7 +11,6 @@
                 border-radius: 4px;
                 border: none;
                 color: #FFF;
-                margin-bottom: 5px;
                 margin-right: 16px;
             }
 
@@ -47,146 +46,145 @@
             }
 
             each(@resourceColor, {
-                    .color-@{index} {
-                        .ivu-radio {
-                            .ivu-radio-inner {
-                                border-color: @value;
-                            }
+                .color-@{index} {
+                    .ivu-radio {
+                        .ivu-radio-inner {
+                            border-color: @value;
                         }
+                    }
 
-                        .ivu-radio-checked {
-                            .ivu-radio-inner {
-                                &::after {
-                                    background-color: @value;
-                                }
+                    .ivu-radio-checked {
+                        .ivu-radio-inner {
+                            &::after {
+                                background-color: @value;
                             }
                         }
                     }
                 }
+            });
+    }
 
-            );
-        }
-
-        &-scroll {
-            overflow-x: auto;
-            overflow-y: hidden;
-            white-space: nowrap;
+    &-scroll {
+        overflow-x: auto;
+        overflow-y: hidden;
+        white-space: nowrap;
 
-            &::-webkit-scrollbar {
-                height: 6px;
-            }
+        &::-webkit-scrollbar {
+            height: 6px;
+        }
 
-            &:-webkit-scrollbar-thumb {
-                border-radius: 3px;
-                background: rgba(51, 51, 51, .1);
-                background-clip: border-box;
-            }
+        &:-webkit-scrollbar-thumb {
+            border-radius: 3px;
+            background: rgba(51, 51, 51, .1);
+            background-clip: border-box;
         }
     }
+}
 
-    &-modal {
-        .ivu-modal-wrap {
-            display: flex;
-            align-items: center;
-            justify-content: center;
-        }
+&-modal {
+    .ivu-modal-wrap {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
 
-        .ivu-modal {
-            width: 544px !important;
-            position: static;
-        }
+    .ivu-modal {
+        width: 544px !important;
+        position: static;
+    }
 
-        .ivu-modal-content {
-            border-radius: 8px;
-        }
+    .ivu-modal-content {
+        border-radius: 8px;
+    }
 
-        .ivu-modal-header {
-            border-bottom: none;
-            padding: 32px 32px 0;
+    .ivu-modal-header {
+        border-bottom: none;
+        padding: 32px 32px 0;
 
-            .ivu-modal-header-inner {
-                font-size: 18px;
-                font-family: Microsoft YaHei-Semibold, Microsoft YaHei;
-                font-weight: 600;
-                color: #252F36;
-            }
+        .ivu-modal-header-inner {
+            font-size: 18px;
+            font-family: Microsoft YaHei-Semibold, Microsoft YaHei;
+            font-weight: 600;
+            color: #252F36;
         }
+    }
 
 
-        .DshModal-close {
-            right: 30px !important;
-            top: 30px !important;
-            background: #F4F6F8;
-            border-radius: 4px 4px 4px 4px;
-        }
+    .DshModal-close {
+        right: 30px !important;
+        top: 30px !important;
+        background: #F4F6F8;
+        border-radius: 4px 4px 4px 4px;
+    }
 
-        .ivu-modal-body {
-            padding: 24px 32px 32px;
-        }
+    .ivu-modal-body {
+        padding: 24px 32px 32px;
+    }
 
-        &-footer {
-            margin-top: 24px;
-            text-align: right;
+    &-footer {
+        margin-top: 24px;
+        text-align: right;
 
-            .ivu-btn {
-                font-size: 16px;
-                font-family: Microsoft YaHei-Semibold, Microsoft YaHei;
-                font-weight: 600;
-                border-radius: 4px;
-            }
+        .ivu-btn {
+            font-size: 16px;
+            font-family: Microsoft YaHei-Semibold, Microsoft YaHei;
+            font-weight: 600;
+            border-radius: 4px;
         }
     }
+}
 
-    &-tip {
-        cursor: pointer;
+&-tip {
+    cursor: pointer;
 
-        .ivu-radio {
-            display: none;
-        }
+    .ivu-radio {
+        display: none;
     }
 }
+}
 
 .ivu-select {
     .ivu-select-selection {
         // .bri-control-edit();
     }
-}
-
-.ivu-select-disabled {
-    .ivu-select-selection {
-        .bri-control-disabled();
     
-        &:hover {
-            border-color: @border-disabled;
-        }
-    }
-    .ivu-select-input[disabled] {
-        color: @textColor;
-        -webkit-text-fill-color: @textColor;
-    }
-}
-
-.ivu-select-item {
-    margin: 4px 8px;
-    border-radius: @borderRadius;
-
-    &:hover {
-        background: @bgColor;
-    }
-
-    &-selected {
-        background-color: @theme-focus;
-        color: @themeColor;
-    }
-
     &-disabled {
         .ivu-select-selection {
             .bri-control-disabled();
+    
+            &:hover {
+                border-color: @border-disabled;
+            }
+        }
+    
+        .ivu-select-input[disabled] {
+            color: @textColor;
+            -webkit-text-fill-color: @placeholder-disabled-color;
         }
     }
-
-    &-input[disabled] {
-        color: @textColor-disabled;
-        -webkit-text-fill-color: @textColor-disabled;
+    
+    &-item {
+        margin: 4px 8px;
+        border-radius: @borderRadius;
+    
+        &:hover {
+            background: @bgColor;
+        }
+    
+        &-selected {
+            background-color: @theme-focus;
+            color: @themeColor;
+        }
+    
+        &-disabled {
+            .ivu-select-selection {
+                .bri-control-disabled();
+            }
+        }
+    
+        &-input[disabled] {
+            color: @textColor-disabled;
+            -webkit-text-fill-color: @textColor-disabled;
+        }
     }
-}
+}

package/src/styles/components/index.less

@@ -6,13 +6,14 @@
 @import "./list/DshBox/DshPanel.less";
 @import "./list/DshBox/DshSingleData.less";
 @import "./list/DshBox/DshList.less";
+@import "./list/BriTable.less"; 
+@import "./list/DshPage.less";
+
+@import "./list/BriFlatTable.less"; // 不能注释flatTable在用
+@import "./list/DshCascaderTable.less"; // 不能注释cascaderTable在用
 @import "./list/BriCard.less";
-@import "./list/BriFlatTable.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";
@@ -51,25 +52,21 @@
 @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/BriCode.less";
+@import "./other/BriCollapseTree.less";
+@import "./other/BriGantt.less";
+@import "./other/BriIframe.less";
 
 // small
 @import "./small/BriButton.less";
 @import "./small/BriDrawer.less";
 @import "./small/BriTooltip.less";
 @import "./small/DshButtons.less";
-@import "./small/DshCrumbs.less";
-@import "./small/DshCrumbItem.less";
 @import "./small/DshDropdown.less";
 @import "./small/DshIcons.less";
 @import "./small/DshModal.less";
@@ -77,3 +74,5 @@
 @import "./small/DshTabs.less";
 @import "./small/DshTags.less";
 @import "./small/DshTitle.less";
+
+@import "./small/DshBtnModal.less";

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

@@ -50,7 +50,7 @@
 
     &-ellipsis {
         max-width: calc(100% - 20px);
-    } 
+    }
 
     td {
         white-space: normal !important;
@@ -59,6 +59,7 @@
     &-th {
         border-bottom: none !important;
     }
+
     &-td {
         position: relative;
     }
@@ -92,7 +93,7 @@
 
 // 排序
 .ve-table-sort {
-    position: absolute!important;
+    position: absolute !important;
     top: 7px;
     right: 20px;
 
@@ -119,6 +120,11 @@
 }
 
 .ve-dropdown-popper {
+    .ve-dropdown-items-warpper {
+        max-width: 200px;
+        min-width: 100px;
+    }
+
     .ve-dropdown-dd .ve-dropdown-items {
         border-radius: @borderRadius;
         border: none;
@@ -128,7 +134,7 @@
     // 重置
     .ve-dropdown-operation .ve-dropdown-operation-item:first-of-type {
         background-color: @borderColor;
-        color: @textColor  !important;
+        color: @textColor !important;
         margin-right: 8px;
     }
 
@@ -137,7 +143,7 @@
         width: 40px;
         height: 24px;
         opacity: 1;
-        color: @white  !important;
+        color: @white !important;
         font-weight: 500;
         font-family: "PingFang SC";
         text-align: center;

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

@@ -1,13 +1,21 @@
 .DshTable {
-    width: 100%; 
+    width: 100%;
     height: 100%;
+
+    .table-operation {
+        display: flex;
+        justify-content: center;
+    }
+
     .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/small/DshButtons.less

@@ -17,24 +17,17 @@
                 justify-content: center;
                 align-items: center;
 
-                &-name {
-
-                }
+                &-name {}
             }
         }
     }
 
     &-item {
-        > span {
+        >span {
             width: 100%;
             .dsh-ellipsis();
         }
 
         &-name {}
     }
-
-    .ivu-btn-text {
-        background-color: transparent;
-        color: @themeColor;
-    }
 }

package/src/utils/table.js

@@ -1,7 +1,8 @@
 /* -------------------- 表格 -------------- */
 // 转化表单字段属性 to 表格参数, 是否需要过滤tag
-const transformToColumns = function (form) {
-    let headerFilter = this.listPropsObj && this.listPropsObj.headerFilter;
+const transformToColumns = function (form, {
+    headerFilter = false
+} = {}) {
     return form
         .filter(col => col._type !== "tag")
         .map(col => {
@@ -60,7 +61,7 @@ const transformToColumns = function (form) {
                         ? {
                             filter: headerFilter ? {
                                 isMultiple: true,
-                                maxHeight: 300,
+                                maxHeight: 250,
                                 filterList: col._data.map(item => ({
                                     ...item,
                                     value: item._key,