bri-components 1.1.1 → 1.1.3

package/src/index.js

@@ -8,8 +8,8 @@ import { VeTable, VeLocale } from "vue-easytable";
 import CN from "vue-easytable/libs/locale/lang/zh-CN.js";
 
 // list
-import { VTable } from "./components/list/easyTable/index.js";
-import EvTable from "./components/list/evTable/EvTable.vue"; // 大表格
+// import { VTable } from "./components/list/easyTable/index.js";
+// import EvTable from "./components/list/evTable/EvTable.vue"; // 大表格
 import DshBox from "./components/list/DshBox/DshBox.vue";
 import DshTable from "./components/list/DshBox/DshTable.vue";
 import DshList from "./components/list/DshBox/DshList.vue";
@@ -29,7 +29,6 @@ import DshUnit from "./components/unit/DshUnit.vue";
 import DshFormItem from "./components/unit/DshFormItem.vue";
 
 // controls
-import controlShow from "./components/controls/base/controlShow.vue";
 import DshInput from "./components/controls/base/DshInput.vue";
 import DshNumber from "./components/controls/base/DshNumber/DshNumber.vue";
 import DshSelect from "./components/controls/base/DshSelect.vue";
@@ -52,6 +51,7 @@ import BriTransfer from "./components/other/BriTransfer.vue";
 
 // small
 import DshModal from "./components/small/DshModal.vue";
+import BriDrawer from "./components/small/BriDrawer.vue";
 import DshDropdown from "./components/small/DshDropdown.vue";
 import DshRender from "./components/small/render.js";
 import DshTdRender from "./components/small/DshTdRender.js";
@@ -90,12 +90,11 @@ import YUploadImage from "./components/controls/base/ZUpload/YUploadImage.vue";
 import DshCoordinates from "./components/controls/base/DshCoordinates.vue";
 import DshEditor from "./components/controls/base/DshEditor.vue";
 import DshDivider from "./components/controls/base/DshDivider.vue";
-import DshLabels from "./components/controls/base/DshLabels.vue";
-import DshPackage from "./components/controls/base/DshPackage.vue";
-
-import DshBack from "./components/controls/base/DshBack.vue";
-import DshUndeveloped from "./components/controls/base/DshUndeveloped.vue";
 
+/* 不挂载全局 */
+import DshPackage from "./components/controls/senior/DshPackage.vue";
+import DshBack from "./components/controls/special/DshBack.vue";
+import DshUndeveloped from "./components/controls/special/DshUndeveloped.vue";
 // other
 import ZIframe from "./components/other/ZIframe.vue";
 
@@ -104,8 +103,8 @@ const map = {
     DshDraggable,
     DshCropper,
 
-    VTable,
-    EvTable,
+    // VTable,
+    // EvTable,
     DshBox,
     DshTable,
     DshList,
@@ -121,7 +120,6 @@ const map = {
     DshUnit,
     DshFormItem,
 
-    controlShow,
     DshInput,
     DshNumber,
     DshSelect,
@@ -142,6 +140,7 @@ const map = {
     BriTransfer,
 
     DshModal,
+    BriDrawer,
     DshDropdown,
     DshRender,
     DshTdRender,
@@ -211,7 +210,6 @@ export {
     DshUnit,
     DshFormItem,
 
-    controlShow,
     DshInput,
     DshNumber,
     DshSelect,
@@ -232,6 +230,7 @@ export {
     BriTransfer,
 
     DshModal,
+    BriDrawer,
     DshDropdown,
     DshRender,
     DshTdRender,
@@ -268,9 +267,8 @@ export {
     DshCoordinates,
     DshEditor,
     DshDivider,
-    DshLabels,
-    DshPackage,
 
+    DshPackage,
     DshBack,
     DshUndeveloped,
 

package/src/styles/common/box.less

@@ -41,6 +41,19 @@
     margin-right: 5px;
 }
 
+.dsh-margin-top8 {
+    margin-top: 8px;
+}
+.dsh-margin-bottom8 {
+    margin-bottom: 8px;
+}
+.dsh-margin-left8 {
+    margin-left: 8px;
+}
+.dsh-margin-right8 {
+    margin-right: 8px;
+}
+
 .dsh-margin-top10 {
     margin-top: 10px;
 }
@@ -115,6 +128,9 @@
 .dsh-padding20 {
     padding: 20px;
 }
+.dsh-padding24 {
+    padding: 24px;
+}
 .dsh-padding100 {
     padding: 100px;
 }
@@ -155,3 +171,16 @@
 .dsh-padding-right20 {
     padding-right: 20px;
 }
+.dsh-padding-top24 {
+    padding-top: 24px;
+}
+.dsh-padding-bottom24 {
+    padding-bottom: 24px;
+}
+.dsh-padding-left24 {
+    padding-left: 24px;
+}
+.dsh-padding-right24 {
+    padding-right: 24px;
+}
+

package/src/styles/common/control.less

@@ -8,6 +8,48 @@
     line-height: 24px;
 }
 
+// // 表单模式
+// .control {
+//     &-show {
+//         border: none;
+//         background-color: transparent;
+//     }
+
+//     &-edit {
+//         height: 32px;
+//         border: 1px solid @borderColor;
+//         border-radius: @borderRadius;
+//         background: @inputBg;
+//         line-height: 32px;
+//         color: @textColor;
+//         cursor: pointer;
+//     }
+
+//     &-placeholder {
+//         color: @placeholderColor;
+//     }
+
+//     &-readonly {
+//         border: 1px solid @border-readonly;
+//         border-radius: @borderRadius;
+//         background: @inputBg-readonly;
+//         line-height: 32px;
+//         color: @textColor-readonly;
+//     }
+
+//     &-disabled {
+//         color: @textColor-disabled;
+//         border: 1px solid @border-disabled;
+//         background: @inputBg-disabled;
+//         border-radius: @borderRadius;
+//         cursor: not-allowed;
+//     }
+
+//     &-notext {
+//         color: @placeholderColor;
+//     }
+// }
+
 // 表单模式
 .control-show {
     border: none;
@@ -15,39 +57,35 @@
 }
 .control-edit {
     height: 32px;
-    color: @textColor;
     border: 1px solid @borderColor;
-    background: @inputBg;
     border-radius: @borderRadius;
+    background: @inputBg;
+    line-height: 32px;
     cursor: pointer;
+    color: @textColor;
 }
 .control-placeholder {
     color: @placeholderColor;
 }
 .control-readonly {
-    color: @textColor-readonly;
     border: 1px solid @border-readonly;
-    background: @inputBg-readonly;
     border-radius: @borderRadius;
+    background: @inputBg-readonly;
+    line-height: 32px;
+    color: @textColor-readonly;
 }
 .control-disabled {
-    color: @textColor-disabled;
     border: 1px solid @border-disabled;
-    background: @inputBg-disabled;
     border-radius: @borderRadius;
+    background: @inputBg-disabled;
     cursor: not-allowed;
+    color: @textColor-disabled;
 }
 .control-notext {
     color: @placeholderColor;
 }
 
 // 暂时移到这里，部分需要删除
-.control-show-text {
-    display: inline-block;
-    width: 100%;
-    height: 100%;
-}
-
 .control-nodata-text {
     color: @placeholderColor ;
     font-weight: 400;

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

@@ -1,4 +1,5 @@
 .BriLabels {
+    display: flex;
     width: 100%;
 
     &-dropdown {
@@ -12,6 +13,11 @@
             border: 1px solid @borderColor;
             padding-left: 5px;
 
+            &-list {
+                display: flex;
+                align-items: center;
+            }
+
             &-active {
                 border-color: #64c6d1;
                 box-shadow: 0 0 0 2px rgba(61, 184, 197, 0.2);
@@ -66,6 +72,17 @@
                 }
             }
         }
+
+        &-btnWrap {
+            border-top: 1px solid #E7E7E7;
+            margin: 12px 8px 0;
+            padding-top: 8px;
+        }
+
+        &-add {
+            width: 300px;
+            margin-bottom: 8px;
+        }
     }
 
     .ivu-select-dropdown {
@@ -89,27 +106,26 @@
     }
 
     &-view {
-        .dsh-flex-row-start-start();
+        display: flex;
         flex-wrap: wrap;
+        align-items: center;
         height: 32px;
         overflow-y: hidden;
 
-        &-readonly {
-            width: 100%;
-            background: @white;
-            border: 1px solid #eee;
-            border-radius: 4px;
-            height: 32px;
-            cursor: not-allowed;
-
-            .DshLabels-view-nodata {
-                display: none;
-            }
-        }
-
-        &-tag {
-            width: fit-content;
-            margin-right: 10px;
+        &-item {
+            .unit-show();
+            .dsh-ellipsis();
+            display: inline-flex;
+            max-width: 100%;
+            height: fit-content;
+            padding: 0 8px;
+            background-color: @borderColor;
+            color: rgba(0, 0, 0, 0.9);
+            font-size: 12px;
+            font-weight: 400;
+            line-height: 24px;
+            border-radius: @borderRadius;
+            margin-right: 8px;
         }
 
         &-nodata {

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

@@ -18,18 +18,20 @@
 
             &-text {
                 .dsh-ellipsis();
+
                 &-disabled {
                     color: @borderColor;
                 }
             }
-            
+
             &-clear {
                 margin-left: 5px;
             }
         }
 
         &-placeholder {
-            color: @borderColor;
+            color: @placeholderColor;
+            padding: 0 7px;
         }
     }
 
@@ -57,6 +59,7 @@
             &-footer {
                 width: 100%;
                 padding: 10px;
+
                 .btn {
                     text-align: right;
                 }
@@ -66,7 +69,8 @@
 }
 
 .ivu-cascader-transfer {
-    max-height: 400px!important;
+    max-height: 400px !important;
+
     .ivu-cascader-menu {
         max-height: 400px;
         height: auto;

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

@@ -21,25 +21,7 @@
         }
     }
 
-    &-value {
-        height: 24px;
-        line-height: 20px;
-        padding: 2px 8px;
-        border-radius: 4px;
-        margin-right: 16px;
-
-        &:last-of-type {
-            margin-right: 0px;
-        }
-
-        &-wrapper {
-            display: flex;
-            min-height: 32px;
-            padding: 4px 0;
-        }
-    }
-
-    .Dshcheckbox-tip {
+    &-tip {
         cursor: pointer;
 
         .ivu-checkbox {
@@ -47,32 +29,34 @@
         }
     }
 
-    .ivu-select-multiple .ivu-select-selection {
-        height: 32px;
-
-        &>div {
-            overflow-x: auto;
-            overflow-y: hidden;
-            white-space: nowrap;
-
-            .ivu-tag {
-                margin: 2px 4px 4px 0;
-            }
-
-            &::-webkit-scrollbar {
-                height: 8px;
-            }
-
-            &:-webkit-scrollbar-thumb {
-                border-radius: 3px;
-                background: rgba(51, 51, 51, .1);
-                background-clip: border-box;
+    .ivu-select-multiple {
+        .ivu-select-selection {
+            height: 32px;
+    
+            &>div {
+                overflow-x: auto;
+                overflow-y: hidden;
+                white-space: nowrap;
+    
+                .ivu-tag {
+                    margin: 2px 4px 4px 0;
+                }
+    
+                &::-webkit-scrollbar {
+                    height: 8px;
+                }
+    
+                &:-webkit-scrollbar-thumb {
+                    border-radius: 3px;
+                    background: rgba(51, 51, 51, .1);
+                    background-clip: border-box;
+                }
             }
         }
-    }
 
-    .ivu-select-multiple .ivu-select-item-selected:after {
-        content: none;
+        .ivu-select-item-selected:after {
+            content: none;
+        }
     }
 }
 
@@ -153,4 +137,23 @@
         font-size: 14px;
         vertical-align: middle;
     }
+}
+
+// TODO：必须单独拿出来，DshSelect组件里在混入此样式
+.DshCheckbox-value {
+    height: 24px;
+    line-height: 20px;
+    padding: 2px 8px;
+    border-radius: 4px;
+    margin-right: 16px;
+
+    &:last-of-type {
+        margin-right: 0px;
+    }
+
+    &-wrapper {
+        display: flex;
+        min-height: 32px;
+        padding: 4px 0;
+    }
 }

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

@@ -1,15 +1,15 @@
 .DshCoordinates {
     width: 100%;
-    line-height: 32px;
+    line-height: 30px;
+
     .textRight {
         text-align: right;
     }
 
     &-wrap {
         position: relative;
-        padding: 0 8px;
-        .control-edit();
-        &-zuobiao{
+        padding: 0 32px 0 8px;
+        &-zuobiao {
             color: #e5e5e5;
             line-height: 32px;
             position: absolute;
@@ -30,7 +30,7 @@
     }
 
     &-notext {
-        .control-placeholder();
+        color: @placeholderColor;
     }
 
     &-message {
@@ -46,32 +46,29 @@
         height: 100%;
     }
 
-    &-readonly {
-        cursor: not-allowed;
-    }
     &-show {
         padding: 0 8px;
+        line-height: 32px;
     }
-}
-
-
-.DshCoordinates-modal {
-    &-header {
-        padding: 5px 0px;
-
-        &-text {
-            font-size: @textSize;
-            line-height: 18px;
+    
+    &-modal {
+        &-header {
+            padding: 5px 0px;
+    
+            &-text {
+                font-size: @textSize;
+                line-height: 18px;
+            }
         }
-    }
-
-    .ivu-modal-content {
-        overflow: hidden;
-        height: 100%;
-
-        .ivu-modal-body {
-            padding: 0px;
+    
+        .ivu-modal-content {
+            overflow: hidden;
             height: 100%;
+    
+            .ivu-modal-body {
+                padding: 0px;
+                height: 100%;
+            }
         }
     }
-}
+}

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

@@ -1,54 +1,3 @@
 .DshDate {
     width: 100%;
-}
-
-// .ivu-date-picker-cells-year .ivu-date-picker-cells-cell-focused,
-// .ivu-date-picker-cells-month .ivu-date-picker-cells-cell-focused {
-//     position: relative;
-
-//     em {
-//         background-color: transparent;
-//         color: @themeColor;
-//     }
-
-//     &::after {
-//         position: absolute;
-//         bottom: -5px;
-//         right: calc(50% - 3px);
-//         content: "";
-//         width: 6px;
-//         height: 6px;
-//         border-radius: 50%;
-//         background-color: @themeColor;
-//     }
-// }
-
-// .ivu-date-picker-cells {
-//     &-focused em {
-//         box-shadow: none;
-//     }
-
-//     span em {
-//         border-radius: 50%;
-//     }
-
-//     &-cell-today {
-//         em {
-//             position: relative;
-//             color: @themeColor;
-
-//             &::after {
-//                 content: '';
-//                 display: block;
-//                 width: 6px;
-//                 height: 6px;
-//                 border-radius: 50%;
-//                 background: #3DB8C5;
-//                 position: absolute;
-//                 top: auto;
-//                 bottom: -5px;
-//                 right: calc(50% - 3px);
-//             }
-//         }
-//     }
-// }
+}