bri-components 1.2.51 → 1.2.53

package/src/components/form/DshForm.vue

@@ -415,4 +415,4 @@
             }
         }
     }
-</style>
+</style>

package/src/components/list/DshBox/DshCrossTable.vue

@@ -540,13 +540,13 @@
                 erd.listenTo(document.getElementById("DshCrossTable-right"), function (element) {
                     // 计算宽度
                     let tableWidth = that.$refs["DshCrossTable-right"].clientWidth;
-                    let nums = tableWidth / 240;
+                    let nums = tableWidth / 200;
                     let dataTotal = that.data.length;
                     if (nums >= dataTotal) {
                         that.rowWidth = tableWidth;
                         that.colWidth = (tableWidth - 10) / dataTotal;
                     } else {
-                        that.rowWidth = dataTotal * 240;
+                        that.rowWidth = dataTotal * 200;
                     }
 
                     // that.rowWidth = 200 * that.data.length;

package/src/components/unit/DshFormUnit.vue

@@ -166,7 +166,7 @@
         padding: 0px 10px 10px;
 
         &-label {
-            min-width: 0px;
+            min-width: 50px;
             padding: 5px 0px 5px;
             line-height: 20px;
             font-size: @smallSize;

package/src/index.js

@@ -14,6 +14,7 @@ import DshBox from "./components/list/DshBox/DshBox.vue";
 import DshList from "./components/list/DshBox/DshList.vue";
 import DshTable from "./components/list/DshBox/DshTable.vue";
 import DshPage from "./components/list/DshPage.vue";
+import DshCrossTable from "./components/list/DshBox/DshCrossTable.vue";
 // import DshCascaderTable from "./components/list/DshCascaderTable.vue";
 
 // form
@@ -78,10 +79,11 @@ import DshDivider from "./components/controls/base/DshDivider.vue";
 
 import DshPackage from "./components/controls/senior/DshPackage.vue";
 import selectUsers from "./components/controls/senior/selectUsers/selectUsers.vue";
+import DepartmentMenu from "./components/controls/senior/selectUsers/DepartmentMenu.vue";
 import selectDepartments from "./components/controls/senior/selectDepartments.vue";
 
-import DshBack from "./components/controls/special/DshBack.vue";
-import DshUndeveloped from "./components/controls/special/DshUndeveloped.vue";
+// import DshBack from "./components/controls/special/DshBack.vue";
+// import DshUndeveloped from "./components/controls/special/DshUndeveloped.vue";
 
 // other
 import DshMenuNav from "./components/other/DshMenuNav.vue";
@@ -183,6 +185,7 @@ export {
     DshList,
     DshTable,
     DshPage,
+    DshCrossTable,
 
     // form
     DshForm,
@@ -243,9 +246,10 @@ export {
     DshEditor,
     DshDivider,
     DshPackage,
-    DshBack,
-    DshUndeveloped,
+    // DshBack,
+    // DshUndeveloped,
     selectUsers,
+    DepartmentMenu,
     selectDepartments,
 
     DshMenuNav,

package/src/styles/components/index.less

@@ -15,20 +15,6 @@
 @import "./list/BriTree.less";
 @import "./list/BriTreeItem.less";
 
-@import "./controls/base/DshInput.less";
-@import "./controls/base/BriInputs.less";
-@import "./controls/base/DshCascader/index.less";
-@import "./controls/base/BriUpload/index.less";
-@import "./controls/base/DshCoordinates.less";
-@import "./controls/base/DshDivider.less";
-
-@import "./controls/senior/selectUsers/index.less";
-@import "./controls/senior/selectDepartments.less";
-@import "./controls/senior/flatTable.less";
-@import "./controls/senior/cascaderTable.less";
-@import "./controls/senior/BriLabels.less";
-@import "./controls/senior/DshPackage.less";
-
 // other
 @import "./other/BriAvatar.less";
 @import "./other/BriIframe.less";

package/src/styles/reset-iview-controls.less

@@ -101,4 +101,23 @@
             -webkit-text-fill-color: @textColor-disabled;
         }
     }
+}
+
+.ivu-cascader {
+    &-rel {
+        display: block;
+    }
+
+    &-label {
+        padding-right: 24px;
+    }
+
+    &-transfer {
+        max-height: 400px !important;
+
+        .ivu-cascader-menu {
+            max-height: 400px;
+            height: auto;
+        }
+    }
 }

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

@@ -1,55 +0,0 @@
-.BriInputs {
-    width: 100%;
-
-    i {
-        font-size: 16px;
-        cursor: pointer;
-    }
-
-    &-show {
-        display: flex;
-        align-items: center;
-        border: 1px solid #e5e5e5;
-        border-radius: 4px;
-        color: #515a6e;
-        padding-left: 5px;
-        height: 34px;
-
-        &-content {
-            display: flex;
-            width: calc(100% - 30px);
-            overflow: hidden;
-
-            &-item {
-                display: flex;
-                margin: 2px 4px 2px 0;
-                padding-left: 8px;
-                border: 1px solid #e8eaec;
-                border-radius: 3px;
-                background: #f7f7f7;
-                font-size: 14px;
-                max-width: 50%;
-                cursor: pointer;
-
-                &-content {
-                    vertical-align: middle;
-                    display: inline-block;
-                    width: calc(100% - 20px);
-                    .dsh-ellipsis();
-                }
-
-                &-del {
-                    display: inline-block;
-                    width: 20px;
-                    vertical-align: middle;
-                }
-            }
-        }
-
-        &-add {
-            flex: 1;
-            height: 34px;
-            line-height: 34px;
-        }
-    }
-}

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

@@ -1,167 +0,0 @@
-.BriUpload {
-    width: 100%;
-    height: 100%;
-    position: relative;
-    overflow: hidden;
-    border: 1px solid @borderColor;
-    border-radius: @borderRadius;
-    background-color: @white;
-
-    // 外围
-    &-old {
-        overflow: hidden;
-        display: flex;
-
-        &-wrapper {
-            min-width: 120px;
-            height: 100%;
-            margin: 16px 0px 16px 16px;
-            border-radius: 0px;
-            border: none;
-            &:hover {
-                border: none
-            }
-        }
-
-        &-imageadd {
-            .dsh-flex-col-center-center();
-            width: 120px;
-            height: 120px;
-            position: relative;
-            border: 1px @borderColor dashed;
-            color: @themeColor;
-            border-radius: @borderRadius;
-            cursor: pointer;
-            &:hover {
-                border-color: @themeColor;
-                background-color: @theme-focus;
-            }
-        }
-
-        &-circle {
-            position: absolute;
-            top: 50%;
-            left: 50%;
-            width: 50px !important;
-            height: 50px !important;
-            margin-top: -25px;
-            margin-left: -25px;
-            border-radius: 50%;
-            background-color: @inputBg-readonly;
-
-            i {
-                color: @scuess-color;
-                font-size: 40px;
-            }
-        }
-    }
-
-    &-new,
-    &-inline {
-        display: flex;
-
-        &-wrapper {
-            min-width: 30px;
-            background-color: @border-readonly;
-            height: 30px;
-            line-height: 30px;
-            border: none;
-            border-radius: 0px !important;
-            &:hover {
-                border: none
-            }
-        }
-
-        &-imageadd {
-            .dsh-flex-row-center-center();
-            height: 30px;
-            background-color: @btn-hover;
-            color: @textColor;
-            border: none;
-            border-radius: 0px;
-            &:hover {
-                color: @themeColor;
-                background-color: @theme-focus;
-            }
-        }
-
-        &-circle {
-            position: absolute;
-            top: 50%;
-            left: 50%;
-            width: 24px !important;
-            height: 24px !important;
-            margin-top: -12px;
-            margin-left: -12px;
-            background-color: #f4f5fa;
-            border-radius: 50%;
-            i {
-                color: @scuess-color;
-                font-size: 24px;
-            }
-        }
-    }
-
-    &-readonly {
-        border: none;
-        border-radius: 0px;
-        background-color: transparent;
-    
-        .uploadList {
-            &-old {
-                margin: 0px;
-            }
-    
-            &-list {
-                .item {
-                    flex: 0 0 80px;
-                    height: 80px;  
-                }
-            }
-    
-            &-inline {
-                .bri-scrollbar6();
-                height: 48px;
-                line-height: 48px;
-    
-                .item {
-                    flex: 0 0 48px
-                }
-            }
-        }
-    }
-    
-    &-disabled {
-        .bri-control-disabled();
-    
-        .uploadList {
-            &-old {
-                margin: 0px;
-            }
-    
-            &-list {
-                .item {
-                    flex: 0 0 80px;
-                    height: 80px;  
-                }
-            }
-
-            &-nodata {
-                color: @placeholder-disabled-color;
-                text-indent: 7px;
-                text-align: left;
-            }
-            &-inline-nodata {
-                color: @placeholder-disabled-color;
-            }
-        }
-    }
-
-    &-unit {
-        .uploadList {
-            &-inline-nodata {
-                .bri-control-nodata();
-            }
-        }
-    }
-}

package/src/styles/components/controls/base/BriUpload/BriUploadImage.less

@@ -1,87 +0,0 @@
-.BriUploadImage {
-    position: relative;
-
-    &-set {
-        width: 100%;
-
-        &-img {
-            width: 100px;
-            height: 100px;
-            float: left;
-            background-repeat: no-repeat;
-            background-position: center;
-            background-size: contain;
-            background-color: #fff;
-            border: 1px solid @borderColor;
-            border-radius: 0px;
-            position: relative;
-            overflow: hidden;
-
-            &-action {
-                color: @themeColor;
-                cursor: pointer;
-            }
-
-            &-circle {
-                position: absolute;
-                top: 0px;
-                bottom: 0px;
-                left: 0px;
-                right: 0px;
-                background-color: #f4f5fa;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-
-                .circle {
-                    width: 50px !important;
-                    height: 50px !important;
-                }
-
-                i {
-                    color: #5cb85c;
-                    font-size: 40px;
-                }
-            }
-        }
-
-        &-avatar {
-            background-size: cover;
-        }
-
-        .wrap {
-            width: 100px;
-            height: 32px;
-            position: relative;
-            overflow: hidden;
-            display: inline-block;
-            line-height: 18px;
-            text-align: center;
-            vertical-align: middle;
-            cursor: pointer;
-
-            button {
-                position: absolute;
-                bottom: 0;
-                left: 0;
-            }
-
-            .file {
-                position: absolute;
-                bottom: 0;
-                left: 0;
-                margin: 0;
-                border: solid transparent;
-                opacity: 0;
-                filter: alpha(opacity=0);
-                cursor: pointer;
-            }
-        }
-    }
-
-    &-cropper {
-        width: 400px;
-        height: 400px;
-        margin: 0 auto;
-    }
-}

package/src/styles/components/controls/base/BriUpload/index.less

@@ -1,3 +0,0 @@
-@import "./BriUpload.less";
-@import "./BriUploadImage.less";
-@import "./uploadList.less";

package/src/styles/components/controls/base/BriUpload/uploadList.less

@@ -1,164 +0,0 @@
-// 列表样式
-.uploadList {
-    width: 100%;
-    overflow: auto;
-
-    // 普通文件
-    &-old {
-        margin: 16px;
-    }
-
-    &-nodata {
-        width: 100%;
-        height: 100%;
-        text-align: center;
-        line-height: 120px;
-        color: @placeholderColor;
-        white-space: nowrap;
-
-        span {
-            margin-left: 5px;
-        }
-    }
-
-    &-list {
-        display: flex;
-        flex-wrap: nowrap;
-
-        .item {
-            flex: 0 0 120px;
-            height: 120px;
-            margin-right: 10px;
-            border-radius: @borderRadius;
-            background: #f4f5fa;
-            text-align: center;
-            overflow: hidden;
-            display: inline-flex;
-            flex-direction: column;
-            justify-content: space-between;
-            position: relative;
-    
-            &:hover {
-                .item-action {
-                    display: flex !important;
-                }
-            }
-    
-            &-show {
-                display: flex;
-                overflow: hidden;
-                align-items: center;
-                justify-content: center;
-                flex: 2;
-                min-height: 50px;
-    
-                img {
-                    max-width: 100%;
-                    max-height: 100%;
-                }
-            }
-    
-            &-name {
-                flex: 1;
-                display: flex;
-                max-height: 32px;
-    
-                &-title {
-                    padding: 0 8px;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    white-space: nowrap;
-                    color: @themeColor;
-                }
-            }
-    
-            &-action {
-                background-color: @placeholderColor;
-                display: none !important;
-                position: absolute;
-                right: 0px;
-                top: 0px;
-                left: 0px;
-                bottom: 0px;
-                align-items: center;
-                justify-content: center;
-    
-                &-icon {
-                    width: 22px;
-                    height: 22px;
-                    line-height: 22px;
-                    color: #fff;
-                    margin-left: 2px;
-                }
-            }
-        }
-    }
-
-    // 内部表格inline模式
-    &-inline {
-        height: 30px;
-        line-height: 30px;
-
-        &-list {
-            width: 100%;
-            height: 100%;
-            display: flex;
-            flex-wrap: nowrap;
-            overflow-x: auto;
-            overflow-y: hidden;
-            padding-left: 3px;
-
-            .item {
-                flex: 0 0 48px;
-                background: #f4f5fa;
-                margin-right: 3px;
-                position: relative;
-                border-radius: @borderRadius;
-
-                &:hover {
-                    .item-action {
-                        display: flex !important;
-                        animation: toTop 0.1s;
-                    }
-                }
-
-                img {
-                    max-width: 100%;
-                    max-height: 100%;
-                    margin: auto;
-                }
-    
-                &-action {
-                    display: none !important;
-                    position: absolute;
-                    left: 0;
-                    right: 0;
-                    top: 0;
-                    bottom: 0;
-                    background-color: @placeholderColor;
-                    color: #fff;
-                    align-items: center;
-                    justify-content: center;
-                    i {
-                        margin: 0px;
-                    }
-                }
-    
-                @keyframes toTop {
-                    from {
-                        top: 100%;
-                    }
-    
-                    to {
-                        top: 0;
-                    }
-                }
-            }
-        }
-
-        &-nodata {
-            padding-left: 7px;
-            color: @placeholderColor;
-        }
-    }
-}

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

@@ -1,67 +0,0 @@
-.DshCascader {
-    width: 100%;
-
-    &-edit {
-
-        // 多选
-        &-multiple {
-            width: 100%;
-
-            &-edit {}
-        }
-
-        // 单选 -新模式
-        &-custom {
-            width: 100%;
-        }
-
-        // 单选 -默认模式
-        &-single {
-            width: 100%;
-        }
-    }
-
-    // 查看
-    &-show {
-        &-multiple {}
-
-        &-single {}
-    }
-
-    // 多选类型且独自一行时
-    &-row {
-        &-edit {}
-
-        &-show {
-            height: auto;
-
-            .text,
-            .overflow {
-                width: 100%;
-                height: 100%;
-                white-space: normal;
-                overflow: auto;
-                .bri-scrollbar3();
-            }
-        }
-    }
-}
-
-.ivu-cascader {
-    &-rel {
-        display: block;
-    }
-
-    &-label {
-        padding-right: 24px;
-    }
-
-    &-transfer {
-        max-height: 400px !important;
-
-        .ivu-cascader-menu {
-            max-height: 400px;
-            height: auto;
-        }
-    }
-}