bri-components 1.1.1 → 1.1.3

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

@@ -3,8 +3,8 @@
 
     &-multiplerow {
         height: 70px;
-
         .dsh-control-define-text {
+            overflow-y: auto;
             .DshTags {
                 flex-wrap: wrap;
             }
@@ -23,20 +23,18 @@
         width: 100%;
         height: 100%;
         display: flex;
-        justify-content: space-between;
-        align-items: center;
-        overflow-x: auto;
+        padding: 2px 8px;
+        .bri-scrollbar3();
         overflow-y: hidden;
-        padding: 0 8px;
-        .bri-scrollbar6();
-
+    
         .DshTags {
             display: flex;
             white-space: nowrap;
         }
     }
-    
+
     &-nodata {
         .control-notext();
+        padding: 0 7px;
     }
 }

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

@@ -1,6 +1,6 @@
 .DshDropdown {
     &-rel {
-        color: #aaaaaa!important;
+        color: @contentColor;
         cursor: pointer;
     }
 
@@ -18,21 +18,19 @@
             overflow: auto;
 
             .list {
-                .item {
-                    padding: 7px 16px 5px 10px;
-                    color: #979797;
+                .list-item {
                     display: flex;
                     flex-direction: row;
                     align-items: center;
-                    
+                    border-radius: @borderRadius;
+                    padding: 9px 8px;
                     &:hover {
-                        background-color: #FFF;
+                        background-color: @theme-focus;
                         color: @themeColor;
                     }
         
                     &-disabled {
-                        background-color: #f5f5f5!important;
-                        color: #979797!important;
+                        color: @textColor-disabled
                     }
                     &-icon {
                         margin-right: 3px;
@@ -58,4 +56,10 @@
             }
         }
     }
+}
+.ivu-select-dropdown {
+    border: 0.5px solid rgba(229,229,229,1);
+    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

@@ -0,0 +1,207 @@
+.DshModal {
+    &-header {
+        width: 100%;
+        height: 100%;
+    }
+    &-close {
+        padding: 2px;
+        position: absolute;
+        top: 10px;
+        right: 10px;
+        cursor: pointer;
+    }
+
+    &-default,
+    &-middle,
+    &-large,
+    &-small {
+        .ivu-modal-wrap {
+            .ivu-modal {
+                margin: auto;
+                position: absolute;
+                top: 0px;
+                bottom: 0px;
+                left: 0px;
+                right: 0px;
+                .ivu-modal-content {
+                    width: 100%;
+                    height: 100%;
+                    display: flex;
+                    flex-direction: column;
+                    .ivu-modal-close {}
+
+                    .ivu-modal-header {
+                        width: 100%;
+                        height: 44px;
+                        padding: 10px 40px 10px 16px;
+                    }
+                    .ivu-modal-body {
+                        width: 100%;
+                        flex: 1;
+                        min-height: 200px;
+                        padding: 0px;
+                        overflow: auto;
+                    }
+                    .ivu-modal-footer {
+                        width: 100%;
+                        height: 50px;
+                    }
+                }
+            }
+        }
+    }
+
+    &-default {
+        .ivu-modal-wrap {
+            .ivu-modal {
+                width: 750px !important;
+                height: 550px !important;
+                max-height: 100%;
+                max-width: 100%;
+            }
+        }
+    }
+    &-small {
+         .ivu-modal-wrap {
+             .ivu-modal {
+                width: 500px !important;
+                height: 400px !important;
+                max-height: 100%;
+                max-width: 100%;
+                .ivu-modal-content{
+                    .DshModal-close {
+                        top: 20px;
+                        right: 24px;
+                        color: rgba(0,0,0,0.6);
+                        font-size: 16px!important;
+                    }
+
+                    .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;
+                        }
+                    }
+                    .ivu-modal-body {
+                        padding: 16px 24px 20px;
+                    }
+                }
+            }
+        }
+    }
+    &-middle {
+         .ivu-modal-wrap {
+             .ivu-modal {
+                width: 1000px !important;
+                height: 800px !important;
+                max-height: 100%;
+                max-width: 100%;
+            }
+        }
+    }
+    &-large {
+         .ivu-modal-wrap {
+             .ivu-modal {
+                width: 80% !important;
+                height: 90% !important;
+                min-width: 1000px !important;
+                max-height: 100%;
+                max-width: 100%;
+            }
+        }
+    }
+    &-auto {
+         .ivu-modal-wrap {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+             .ivu-modal {
+                top: 0px;
+                max-height: 100%;
+            }
+        }
+    }
+}
+
+.bri-modal-flex {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .ivu-modal {
+        top: 0px
+    }
+
+    .ivu-modal-content {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+    }
+
+    .ivu-modal-body {
+        flex: 1;
+        overflow: auto;
+        padding: 0px;
+    }
+}
+
+// 默认模态框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;
+    }
+
+    .ivu-modal-footer {
+        display: flex;
+        justify-content: space-between;
+        padding: 20px;
+
+        button {
+            width: 48%;
+            height: 44px;
+            line-height: 44px;
+        }
+    }
+
+    &-content {
+        padding: 20px 0;
+    }
+
+    &-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;
+            }
+        }
+    }
+}

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

@@ -4,7 +4,7 @@
     align-items: center;
     cursor: pointer;
     &-name {
-        margin-left: 10px;
+        margin-left: 8px;
         font-size: @smallTitleSize;
     }
 }

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

@@ -41,9 +41,15 @@
         }
 
         &-name {
-            color: @contentColor;
             font-size: @textSize;
+            .dsh-ellipsis();
 
+            &-edit {
+                color: @textColor;
+            }
+            &-show {
+                color: @contentColor
+            }
             &-sign {
                 #dsh-sign-change();
             }
@@ -115,8 +121,6 @@
         }
     }
 
-
-
     .ivu-tooltip {
         display: flex;
     }

package/src/styles/plugin/iview.less

@@ -5,9 +5,14 @@
 @primary-color          : #3DB8C5; // @themeColor;
 @text-color             : rgba(0, 0, 0, 0.9);
 @border-radius-base     : 4px;
+@border-color-split     : #E5E5E5;
 @border-color-base      : #E5E5E5;
 @background-color-base  : #F5F5F5;
 @font-family            : "PingFang SC","Microsoft YaHei","微软雅黑";
+@processing-color       : @primary-color;
+@normal-color           : red;
+@link-color             : #3DB8C5;
+@info-color             : #2db7f5;
 
 // Button
 @btn-primary-color      : rgba(255, 255,255, 0.9);
@@ -23,12 +28,11 @@
 
 // input
 @input-placeholder-color: rgba(0, 0, 0, 0.4);
-@input-disabled-bg      : #E5E5E5
-
+@input-disabled-bg      : #E5E5E5;
 // @btn-padding-base-icon  : 5px 15px 6px;
 // @btn-padding-large-icon : 6px 15px 6px 15px;
 // @btn-padding-small-icon : 1px 7px 2px;
 // @btn-padding-base       : 0 @padding-md - 1px;
 // @btn-padding-large      : @btn-padding-base;
 // @btn-padding-small      : 0 @padding-xs - 1px;
-
+  

package/src/styles/reset.less

@@ -12,8 +12,8 @@ html {
     "Helvetica Neue", "PingFang SC", "Noto Sans", "Noto Sans CJK SC", 
     "Microsoft YaHei",
      sans-serif; */
-    font-family: SourceHanSansCN-Heavy, SourceHanSansCN;
-    font-size: 12px;
+    font-family: PingFang SC, Microsoft YaHei, 微软雅黑;
+    font-size: 14px;
     // color: @textColor;
 }
 
@@ -60,6 +60,20 @@ li {
     }
 }
 
+.bri-scrollbar3 {
+    overflow: auto;
+    &::-webkit-scrollbar {
+        width: 6px;
+        height: 6px;
+    }
+
+    &:-webkit-scrollbar-thumb {
+        border-radius: 3px;
+        background: rgba(51, 51, 51, .1);
+        background-clip: border-box;
+    }
+}
+
 .dsh-scrollbar3::-webkit-scrollbar {
     height: 3px;
     width: 3px;

package/src/utils/table.js

@@ -36,11 +36,10 @@ const transformToColumns = function (form) {
                                 renderBodyCell: ({ row, column, rowIndex }, h) => {
                                     return h("dsh-unit", {
                                         props: {
-                                            formData: row,
-                                            formItem: col,
-                                            rowIndex: rowIndex,
                                             canEdit: false,
-                                            isUnit: true
+                                            rowIndex: rowIndex,
+                                            formData: row,
+                                            formItem: col
                                         }
                                     });
                                 }
@@ -50,7 +49,7 @@ const transformToColumns = function (form) {
                 ...(
                     ["select", "checkbox"].includes(col._type)
                         ? {
-                            filter: {
+                            filter: this.listPropsObj && this.listPropsObj.headerFilter ? {
                                 isMultiple: true,
                                 maxHeight: 300,
                                 filterList: col._data.map(item => ({
@@ -79,7 +78,7 @@ const transformToColumns = function (form) {
                                     };
                                     this.filterReset && this.filterReset(conditionItem);
                                 }
-                            }
+                            } : null
                         }
                         : {}
                 ),