bri-components 1.1.2 → 1.1.3

package/src/styles/components/controls/cascaderTable.less

@@ -1,33 +1,19 @@
 .cascaderTable {
+
     &-unit {
-        .unit-show()
+        .unit-show();
+
+        &-text {
+            
+        }
     }
+
     &-btns {
         text-align: right;
         color: @textColor;
-    }
-    &-con {
-        width:100%;
-        overflow:hidden;
-        background-color: #FFF;
-        &-icon {
-            font-size: 18px;
-            color: @themeColor;
-        }
-        &-outspan {
-            display: inline-block;
-            height: 24px;
-            line-height: 24px;
-            padding: 0 5px;
-            margin: auto;
-            background: rgba(96, 144, 237, 0.15);
-            border-radius: 12px;
-            text-align: center;
-            color: @themeColor;
-        }
-        &-innerspan {
-            font-size: 14px;
-            color: @themeColor;
+
+        &-item {
+
         }
     }
 }

package/src/styles/components/controls/controlShow.less

@@ -1,9 +1,11 @@
 .controlShow {
     &-val {
+        .dsh-ellipsis();
         height: 100%;
     }
-
+    
     &-nodata {
+        .dsh-ellipsis();
         color: rgba(0, 0, 0, 0.4);
         font-weight: 400;
     }

package/src/styles/components/controls/flatTable.less

@@ -1,33 +1,20 @@
 .flatTable {
     width: 100%;
+
     &-unit {
-        .unit-show()
+        .unit-show();
+
+        &-text {
+            
+        }
     }
+    
     &-btns {
         text-align: right;
         color: @textColor;
-    }
-    &-con {
-        width:100%;
-        overflow:hidden;
-        &-icon {
-            font-size: 18px;
-            color: @themeColor;
-        }
-        &-outspan {
-            display: inline-block;
-            height: 24px;
-            line-height: 24px;
-            padding: 0 5px;
-            margin: auto;
-            background: rgba(96, 144, 237, 0.15);
-            border-radius: 12px;
-            text-align: center;
-            color: @themeColor;
-        }
-        &-innerspan {
-            font-size: 14px;
-            color: @themeColor;
+
+        &-item {
+
         }
     }
 }

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

@@ -111,15 +111,6 @@
                     }
                 }
             }
-
-            &.DshFormItem-labels{
-                overflow: initial;
-                .DshLabels {
-                    width: 100%;
-                    padding: 0;
-                }
-
-            }
         }
     }
 

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

@@ -1,14 +1,6 @@
 .DshDefaultSearch {
     position: relative;
 
-    // .ivu-input {
-    //     border-radius: 0;
-    // }
-
-    // .DshLabels-show {
-    //     border-radius: 0;
-    // }
-
     &-item {
         padding: 0 !important;
         padding-bottom: 6px !important;
@@ -17,18 +9,6 @@
         margin-bottom: 0px !important;
 
         &-name {}
-
-        &.DshFormItem-labels {
-            .DshLabels {
-                position: static;
-                width: 100%;
-                padding: 0;
-
-                &-searchResult {
-                    position: fixed;
-                }
-            }
-        }
     }
 
     &-form {

package/src/styles/components/index.less

@@ -4,13 +4,13 @@
 @import "./controls/DshDaterange.less";
 @import "./controls/DshDivider.less";
 @import "./controls/DshInput.less";
+@import "./controls/DshNumber.less";
 @import "./controls/DshNumberange.less";
 @import "./controls/DshSelect.less";
 @import "./controls/ZUpload.less";
 @import "./controls/DshCascader.less";
 @import "./controls/DshEditor.less";
 @import "./controls/MultipleInput.less";
-@import "./controls/DshLabels.less";
 @import "./controls/BriLabels.less";
 @import "./controls/DshPackage.less";
 @import "./controls/flatTable.less";
@@ -54,6 +54,7 @@
 @import "./small/DshControlDefine.less";
 @import "./small/BriButton.less";
 @import "./small/BriDrawer.less";
+@import "./small/DshModal.less";
 
 // unit
 @import "./unit/DshFormItem.less";

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

@@ -43,6 +43,10 @@
             color: #3D84EE;
             background-color: #eee;
         }
+
+        .ivu-tree-empty {
+            text-align: center;
+        }
     }
 
     &-footer {
@@ -52,8 +56,4 @@
             padding-right: 16px;
         }
     }
-
-    .ivu-tree-empty {
-        text-align: center;
-    }
 }

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,13 +23,10 @@
         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;

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

@@ -61,4 +61,5 @@
     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/unit/DshFormItem.less

@@ -42,6 +42,8 @@
 
         &-name {
             font-size: @textSize;
+            .dsh-ellipsis();
+
             &-edit {
                 color: @textColor;
             }

package/src/styles/reset.less

@@ -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,7 +36,7 @@ const transformToColumns = function (form) {
                                 renderBodyCell: ({ row, column, rowIndex }, h) => {
                                     return h("dsh-unit", {
                                         props: {
-                                            isUnit: true,
+                                            canEdit: false,
                                             rowIndex: rowIndex,
                                             formData: row,
                                             formItem: col
@@ -49,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 => ({
@@ -78,7 +78,7 @@ const transformToColumns = function (form) {
                                     };
                                     this.filterReset && this.filterReset(conditionItem);
                                 }
-                            }
+                            } : null
                         }
                         : {}
                 ),