bri-components 1.2.52 → 1.2.54

package/src/components/controls/senior/selectUsers/{DepartmentMenu.vue → departMenu.vue}

@@ -1,16 +1,16 @@
 <template>
-    <div class="DepartmentMenu">
+    <div class="departMenu">
         <div
             v-if="!parent && canEdit"
             :class="{
-                'DepartmentMenu-item': true,
-                'DepartmentMenu-item-select': departSelected._key === 'noDepart' || departSelected === null
+                'departMenu-item': true,
+                'departMenu-item-select': departSelected._key === 'noDepart' || departSelected === null
             }"
         >
             <div
                 :class="{
-                    'DepartmentMenu-item-name': true,
-                    'DepartmentMenu-item-name-select': departSelected._key === 'noDepart' || departSelected === null
+                    'departMenu-item-name': true,
+                    'departMenu-item-name-select': departSelected._key === 'noDepart' || departSelected === null
                 }"
                 @click="departClick({'_key': 'noDepart'})"
             >
@@ -22,14 +22,14 @@
             v-for="(depart, departIndex) in list"
             :key="depart._key"
             :class="{
-                'DepartmentMenu-item': true,
-                'DepartmentMenu-item-select': departSelected._key ===  depart._key
+                'departMenu-item': true,
+                'departMenu-item-select': departSelected._key ===  depart._key
             }"
         >
             <div
                 :class="{
-                    'DepartmentMenu-item-name': true,
-                    'DepartmentMenu-item-name-select': departSelected._key === depart._key
+                    'departMenu-item-name': true,
+                    'departMenu-item-name-select': departSelected._key === depart._key
                 }"
                 @click.stop="departClick(depart)"
             >
@@ -39,8 +39,11 @@
                         :type="getIcon(depart)"
                         @click.stop="toggleChildren(depart)"
                     />
-                    <Icon custom="bico-font bri-qiye bico-qiye" />
-                    <span class="DepartmentMenu-item-name-text">
+                    <Icon
+                        v-if="useIcon"
+                        custom="bico-font bri-qiye bico-qiye"
+                    />
+                    <span class="departMenu-item-name-text">
                         {{ depart.name }}
                     </span>
                 </span>
@@ -54,7 +57,7 @@
             </div>
 
             <template v-if="depart.isShowChildren">
-                <department-menu
+                <depart-menu
                     style="margin-left: 15px"
                     :canEdit="canEdit"
                     :list="depart.children"
@@ -68,7 +71,7 @@
                     @departClick="departClick"
                     @removeDepartment="removeDepartment"
                     @upDownDepartment="upDownDepartment"
-                ></department-menu>
+                ></depart-menu>
             </template>
         </div>
     </div>
@@ -76,12 +79,17 @@
 
 <script>
     export default {
-        name: "DepartmentMenu",
+        name: "departMenu",
         props: {
             canEdit: {
                 type: Boolean,
                 default: false
             },
+            useIcon: {
+                type: Boolean,
+                default: true
+            },
+
             parent: Object,
             list: {
                 type: Array,
@@ -92,7 +100,9 @@
             propSelect: {
                 type: Object,
                 default: () => {
-                    return {_key: "noDepart"};
+                    return {
+                        _key: "noDepart"
+                    };
                 }
             },
             company: {
@@ -228,7 +238,7 @@
 </script>
 
 <style lang="less">
-    .DepartmentMenu {
+    .departMenu {
         font-size: 14px;
 
         &-item {

package/src/components/controls/senior/selectUsers/selectUsers.vue

@@ -98,13 +98,14 @@
                     <!-- 下 -->
                     <div class="content">
                         <!-- 左 部门 -->
-                        <department-menu
+                        <depart-menu
                             v-if="showModal"
                             class="content-menu"
                             :canEdit="false"
+                            :useIcon="false"
                             :list="departmentList"
                             @departClick="changeDepartment"
-                        ></department-menu>
+                        ></depart-menu>
 
                         <!-- 右 部门对应的成员 -->
                         <div class="content-users">
@@ -203,7 +204,7 @@
 
 <script>
     import controlMixin from "../../controlMixin.js";
-    import departmentMenu from "./DepartmentMenu.vue";
+    import departMenu from "./departMenu.vue";
 
     export default {
         name: "selectUsers",
@@ -211,7 +212,7 @@
             controlMixin
         ],
         components: {
-            departmentMenu
+            departMenu
         },
         props: {},
         data () {
@@ -309,14 +310,6 @@
         },
         created () {},
         methods: {
-            // 外部也在使用
-            openModal () {
-                this.showModal = true;
-            },
-            closeModal () {
-                this.showModal = false;
-            },
-
             clickInput () {
                 if (this.finalCanEdit) {
                     this.openModal();

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

@@ -3,7 +3,7 @@
         <!-- 左 表头列 -->
         <div
             class="DshCrossTable-left"
-            :style="renderTableBoxStyle"
+            :style="renderTableBoxStyle + `;width: ${propsObj.titleWidth ? propsObj.titleWidth : 160}px`"
         >
             <!-- 多选框 和 序号 -->
             <div
@@ -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/small/BriTooltip.vue

@@ -79,3 +79,9 @@
         }
     };
 </script>
+
+<style lang="less" scoped>
+    .BriTooltip {
+        display: flex;
+    }
+</style>

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,7 +79,7 @@ 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 departMenu from "./components/controls/senior/selectUsers/departMenu.vue";
 import selectDepartments from "./components/controls/senior/selectDepartments.vue";
 
 // import DshBack from "./components/controls/special/DshBack.vue";
@@ -184,6 +185,7 @@ export {
     DshList,
     DshTable,
     DshPage,
+    DshCrossTable,
 
     // form
     DshForm,
@@ -247,7 +249,7 @@ export {
     // DshBack,
     // DshUndeveloped,
     selectUsers,
-    DepartmentMenu,
+    departMenu,
     selectDepartments,
 
     DshMenuNav,

package/src/styles/components/index.less

@@ -29,7 +29,6 @@
 // small
 @import "./small/BriButton.less";
 @import "./small/BriDrawer.less";
-@import "./small/BriTooltip.less";
 @import "./small/DshButtons.less";
 @import "./small/DshDropdown.less";
 @import "./small/DshIcons.less";

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

@@ -15,12 +15,14 @@
         &-header {
             width: 100%;
         }
+
         &-body {
             width: 100%;
             flex: 1;
             min-height: 0px;
             overflow: scroll;
         }
+
         &-footer {
             width: 100%;
             height: 38px;
@@ -38,9 +40,15 @@
         &-header {
             overflow: hidden;
         }
+
         &-body {
             overflow: hidden;
+
+            td {
+                width: 100% !important;
+            }
         }
+
         &-footer {
             overflow: hidden;
         }
@@ -55,9 +63,11 @@
         &-header {
             overflow: hidden;
         }
+
         &-body {
             overflow: scroll;
         }
+
         &-footer {
             overflow: hidden;
         }
@@ -66,21 +76,20 @@
     &-row {
         // height: 40px;
     }
+
     &-col {
-        width: 160px!important;
+        width: 160px !important;
         font-weight: bold;
         color: #5D5D5D;
+
         &-checkbox,
         &-index,
-        &-operation {
-        }
+        &-operation {}
 
-        &-Checkbox {
+        &-Checkbox {}
 
-        }
-        &-index {
+        &-index {}
 
-        }
         &-content {
             .crossTable-col {
                 width: 100%;
@@ -98,36 +107,33 @@
                 }
             }
         }
-        &-operation {
 
-        }
+        &-operation {}
     }
+
     &-td {
+
         &-checkbox,
         &-index,
-        &-operation {
-        }
-
-        &-Checkbox {
+        &-operation {}
 
-        }
-        &-index {
+        &-Checkbox {}
 
-        }
-        &-content {
+        &-index {}
 
-        }
-        &-operation {
+        &-content {}
 
-        }
+        &-operation {}
     }
 
     table {
         width: 100%;
+
         tr {
             height: 39px;
             font-size: 12px;
             overflow: hidden;
+
             td {
                 display: inline-block;
                 width: 200px;
@@ -138,6 +144,7 @@
                 border-bottom: 1px solid #EDEDED;
                 cursor: pointer;
                 overflow: hidden;
+
                 .td-content {
                     width: 100%;
                     height: 100%;
@@ -148,14 +155,16 @@
             }
         }
     }
+
     .cross-table-box {
         height: 38px;
         padding: 7px 0;
+
         &-content {
             width: auto;
             border-radius: 2px;
             border: 1px solid #6daef2;
-            font-size: 12px!important;
+            font-size: 12px !important;
             color: #6DAEF2;
             cursor: pointer;
             height: 24px;
@@ -166,9 +175,10 @@
             word-break: keep-all;
             white-space: nowrap;
             text-overflow: ellipsis;
+
             i {
                 margin-right: 5px;
-                font-size: 12px!important;
+                font-size: 12px !important;
             }
         }
     }

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

@@ -1,25 +0,0 @@
-.BriTooltip {
-    display: flex;
-}
-
-.ivu-tooltip {
-    &-arrow {
-        border-bottom-color: @textColor !important;
-    }
-
-    &-inner {
-        padding: 5px 8px;
-        border-radius: 4px;
-        line-height: 22px;
-        background: @textColor;
-        font-size: 14px;
-        font-weight: 400;
-        color: @textWhColor;
-        max-height: 350px;
-        overflow: auto;
-    }
-
-    &-rel {
-        width: 100%;
-    }
-}

package/src/styles/global/base.less

@@ -42,14 +42,14 @@
     padding: 20px 10px;
     text-align: center;
     font-size: 14px;
-    color: @textColor;
+    color: @placeholderColor;
 }
 
 #btn-style {
     background: #F4F8FF;
-    color: @themeColor;
+    border: 1px solid #6694ED;
     border-radius: 4px;
     font-weight: bold;
     font-family: titleFontFamily;
-    border: 1px solid #6694ED;
+    color: @themeColor;
 }

package/src/styles/global/control.less

@@ -3,15 +3,15 @@
     border: 1px solid @borderColor;
     border-radius: @borderRadius;
     background: @inputBg;
-    cursor: pointer;
     color: @textColor;
+    cursor: pointer;
 }
 .bri-control-disabled {
     border: 1px solid @border-disabled;
     border-radius: @borderRadius;
     background: @inputBg-disabled;
-    cursor: not-allowed;
     color: @textColor;
+    cursor: not-allowed;
     
     &.bri-control-nodata {
         color: @placeholder-disabled-color;
@@ -21,8 +21,8 @@
 //     border: 1px solid @border-readonly;
 //     border-radius: @borderRadius;
 //     background: @inputBg-readonly;
-//     cursor: not-allowed;
 //     color: @textColor-readonly;
+//     cursor: not-allowed;
     
 //     .ivu-icon {
 //         color: @textColor-readonly;

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

@@ -0,0 +1,21 @@
+.ivu-tooltip {
+    &-arrow {
+        border-bottom-color: @textColor !important;
+    }
+
+    &-inner {
+        padding: 5px 8px;
+        border-radius: 4px;
+        line-height: 22px;
+        background: @textColor;
+        font-size: 14px;
+        font-weight: 400;
+        color: @textWhColor;
+        max-height: 350px;
+        overflow: auto;
+    }
+
+    &-rel {
+        width: 100%;
+    }
+}