bri-components 1.4.42 → 1.4.44

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.4.42",
+    "version": "1.4.44",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",

package/src/components/controls/base/BriUpload/BriUpload.vue

@@ -17,16 +17,17 @@
             'BriUpload-unit': !canEdit && isInTable,
             [`BriUpload-${showMode}`]: true,
         }"
+        @click="clickUpload"
+        @drop.prevent="handleDrop"
+        @paste="handlePaste"
+        @dragover.prevent="dragOver = true"
+        @dragleave.prevent="dragOver = false"
     >
+
         <!-- 编辑 -->
         <div
             v-if="!disabled"
             :class="classes"
-            @click="clickUpload"
-            @drop.prevent="handleDrop"
-            @paste="handlePaste"
-            @dragover.prevent="dragOver = true"
-            @dragleave.prevent="dragOver = false"
         >
             <input
                 ref="input"

package/src/components/controls/base/DshDate/DshDaterange.vue

@@ -53,7 +53,7 @@
                 :options="options1"
                 :open="open1"
                 :transfer="true"
-                :transfer-class-name="propsObj._transferClassName"
+                :transfer-class-name="selfPropsObj._transferClassName"
                 @on-change="changeVal($event, 1)"
                 @on-open-change="changeOpen($event, 1)"
             >
@@ -119,27 +119,27 @@
                         dateTypes: ["date", "datetime"]
                     },
                     {
-                        _key: "dyn_subtract_7_days",
-                        name: "七天前",
-                        numbers: [0],
+                        _key: "dyn_add_3_days",
+                        name: "三天后",
+                        numbers: [1],
                         dateTypes: ["date", "datetime"]
                     },
                     {
-                        _key: "dyn_subtract_30_days",
-                        name: "三十天前",
+                        _key: "dyn_subtract_7_days",
+                        name: "七天前",
                         numbers: [0],
                         dateTypes: ["date", "datetime"]
                     },
                     {
-                        _key: "dyn_add_3_days",
-                        name: "三天后",
+                        _key: "dyn_add_7_days",
+                        name: "七天后",
                         numbers: [1],
                         dateTypes: ["date", "datetime"]
                     },
                     {
-                        _key: "dyn_add_7_days",
-                        name: "七天后",
-                        numbers: [1],
+                        _key: "dyn_subtract_30_days",
+                        name: "三十天前",
+                        numbers: [0],
                         dateTypes: ["date", "datetime"]
                     },
                     {
@@ -148,16 +148,24 @@
                         numbers: [1],
                         dateTypes: ["date", "datetime"]
                     },
+
+                    // 月
                     {
                         _key: "last_month_start",
                         name: "上月初",
                         numbers: [0],
                         dateTypes: ["month", "date", "datetime"]
                     },
+                    {
+                        _key: "dyn_month_start",
+                        name: "上月末",
+                        numbers: [1],
+                        dateTypes: ["month", "date", "datetime"]
+                    },
                     {
                         _key: "dyn_month_start",
                         name: "月初",
-                        numbers: [0, 1],
+                        numbers: [0],
                         dateTypes: ["month", "date", "datetime"]
                     },
                     {
@@ -166,6 +174,32 @@
                         numbers: [1],
                         dateTypes: ["month", "date", "datetime"]
                     },
+                    {
+                        _key: "dyn_nextmonth_start",
+                        name: "下月初",
+                        numbers: [0],
+                        dateTypes: ["month", "date", "datetime"]
+                    },
+                    {
+                        _key: "dyn_nextmonth_end",
+                        name: "下月末",
+                        numbers: [1],
+                        dateTypes: ["month", "date", "datetime"]
+                    },
+                    {
+                        _key: "last_month_21",
+                        name: "上月21日",
+                        numbers: [0],
+                        dateTypes: ["month", "date", "datetime"]
+                    },
+                    {
+                        _key: "dyn_month_21",
+                        name: "本月21日",
+                        numbers: [0, 1],
+                        dateTypes: ["month", "date", "datetime"]
+                    },
+
+                    // 季度、年
                     {
                         _key: "dyn_quarter_start",
                         name: "本季初",
@@ -201,18 +235,6 @@
                         name: "次年末",
                         numbers: [1],
                         dateTypes: ["year", "date", "datetime"]
-                    },
-                    {
-                        _key: "last_month_21",
-                        name: "上月21日",
-                        numbers: [0],
-                        dateTypes: ["month", "date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_month_21",
-                        name: "本月21日",
-                        numbers: [0, 1],
-                        dateTypes: ["month", "date", "datetime"]
                     }
                 ]
             };
@@ -222,6 +244,7 @@
                 return {
                     _icon: "ios-calendar-outline",
                     _useShortcuts: true,
+                    _transferClassName: "DshDaterange-dropdown",
 
                     ...this.propsObj,
                     ...this.commonDealPropsObj
@@ -336,7 +359,7 @@
     };
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
     .DshDaterange {
         width: 100%;
         display: flex;
@@ -356,3 +379,12 @@
         }
     }
 </style>
+<style lang="less">
+    .DshDaterange {
+        &-dropdown {
+            .ivu-picker-panel-sidebar {
+                width: 100px;
+            }
+        }
+    }
+</style>

package/src/components/controls/base/DshNumber/DshNumber.vue

@@ -28,7 +28,7 @@
 
         <!-- 查看 -->
         <template v-else>
-            <!-- 单元格的查看 进度条模式 -->
+            <!-- 单元格的查看-进度条模式 -->
             <div
                 v-if="selfPropsObj._showProgress"
                 :class="{
@@ -45,7 +45,7 @@
                 </Progress>
             </div>
 
-            <!-- 单元格和查看页的查看 -->
+            <!-- 单元格的查看-非进度条模式  和 详情页的查看 -->
             <template v-else>
                 <bri-tooltip
                     :content="showVal"
@@ -160,12 +160,10 @@
             progressNum () {
                 return this.$isEmptyData(this.curVal) || this.curVal < 0
                     ? 0
-                    : this.curVal > 100
-                        ? 100
-                        : Math.round(this.curVal * 100) / 100;
+                    : Math.round((this.curVal > 100 ? 100 : this.curVal) * 100) / 100;
             },
             progressStr () {
-                return `${this.$isEmptyData(this.curVal) ? 0 : Math.round(this.curVal * 100) / 100}%`;
+                return this.$numToStrAndUnit(this.$isEmptyData(this.curVal) ? 0 : this.curVal, this.selfPropsObj);
             },
             showVal () {
                 return this.$isEmptyData(this.curVal)

package/src/components/controls/mixins/userAndDepartMixin.js

@@ -84,9 +84,9 @@ export default {
             return this.tmpValList.map(item => item._key);
         },
         showVal () {
-            return this.$isEmptyData(this.curShowValList)
+            return this.$isEmptyData(this.curValShowList)
                 ? this.emptyShowVal
-                : this.curShowValList
+                : this.curValShowList
                     .map(item => this.getShowName(item))
                     .join("、");
         }
@@ -96,7 +96,7 @@ export default {
             if (newBool) {
                 this.modalInited = true;
                 this.showModalContent = true;
-                this.tmpValList = this.$deepCopy(this.curShowValList);
+                this.tmpValList = this.$deepCopy(this.curValShowList);
 
                 if (this.loadinged !== true) {
                     this.getData();

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

@@ -16,7 +16,7 @@
                     <dsh-control-input
                         v-if="canEdit"
                         :class="commonClass"
-                        :value="curShowValList"
+                        :value="curValShowList"
                         :disabled="disabled"
                         :heightAuto="isHeightAuto"
                         :propsObj="selfPropsObj"
@@ -28,7 +28,7 @@
             </div>
         </bri-tooltip>
 
-        <!-- label后可自定义内容 -->
+        <!-- 点击选中项后的自定义内容 -->
         <dsh-render :render="itemTipRender"></dsh-render>
 
         <!-- 搜索选择框 -->
@@ -119,7 +119,7 @@
         class="selectDepartments-show"
     >
         <!-- 有值 -->
-        <template v-if="!$isEmptyData(curShowValList)">
+        <template v-if="!$isEmptyData(curValShowList)">
             <!-- 高度自由时 -->
             <dsh-tags
                 v-if="isHeightAuto"
@@ -128,7 +128,7 @@
                     'selectDepartments-show-auto': true
                 }"
                 itemClass="selectDepartments-show-auto-tag"
-                :list="curShowValList"
+                :list="curValShowList"
             ></dsh-tags>
 
             <!-- 高度不自由（不换行） -->
@@ -145,7 +145,7 @@
                         'selectDepartments-show-ellipsis': true
                     }"
                     itemClass="selectDepartments-show-ellipsis-tag"
-                    :list="curShowValList"
+                    :list="curValShowList"
                 ></dsh-tags>
             </bri-tooltip>
         </template>
@@ -265,11 +265,11 @@
                 return this.transformDepartList(departList, this.tmpValKeys);
             },
 
-            curShowValList () {
-                return this.curValList.map(depart => {
+            curValShowList () {
+                return this.curValList.map(itemObj => {
                     return {
-                        ...depart,
-                        full_name: this.useFullName ? depart.full_name : undefined
+                        ...itemObj,
+                        full_name: this.useFullName ? this.getFullName(itemObj) : undefined
                     };
                 });
             }
@@ -278,10 +278,13 @@
         methods: {
             /* ----------- 接口方法和加工方法 --------- */
             // 获取显示名
-            getShowName (selectItem) {
+            getShowName (itemObj) {
                 return this.useFullName
-                    ? selectItem.full_name || selectItem.name
-                    : selectItem.name;
+                    ? this.getFullName(itemObj)
+                    : itemObj.name;
+            },
+            getFullName (itemObj) {
+                return itemObj.full_name || this.$getTreeLinealDatasByNode(itemObj, this.departShowList, "_key").map(levelObj => levelObj.name).join("/") || itemObj.name;
             },
 
             getData () {
@@ -385,29 +388,30 @@
                     display: flex;
                     flex-wrap: wrap;
                     align-items: center;
-                    line-height: 30px;
 
                     &-label {}
 
                     &-item {
-                        max-width: 230px;
-                        height: 24px;
+                        height: auto;
                         padding: 2px 6px 2px 10px;
                         margin: 3px 5px;
-                        border-radius: 20px;
+                        border-radius: 14px;
                         background-color: @themeColor;
                         color: #ffffff;
-                        font-size: 12px;
                         display: flex;
                         align-items: center;
 
                         &-name {
-                            .dsh-ellipsis();
+                            padding: 2px 0px;
+                            line-height: 16px;
+                            font-size: 12px;
+                            // .dsh-ellipsis();
                         }
 
                         &-delete {
-                            padding: 3px;
+                            padding: 2px;
                             margin-left: 5px;
+                            line-height: 16px;
                             font-size: 14px;
                             cursor: pointer;
                         }

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

@@ -14,7 +14,7 @@
                 <slot>
                     <dsh-control-input
                         :class="commonClass"
-                        :value="curShowValList"
+                        :value="curValShowList"
                         :disabled="disabled"
                         :heightAuto="isHeightAuto"
                         :propsObj="selfPropsObj"
@@ -26,7 +26,7 @@
             </div>
         </bri-tooltip>
 
-        <!-- label后可自定义内容 -->
+        <!-- 点击选中项后的自定义内容 -->
         <dsh-render :render="itemTipRender"></dsh-render>
 
         <!-- 搜索选择框 -->
@@ -171,7 +171,7 @@
         class="selectUsers-show"
     >
         <!-- 有值 -->
-        <template v-if="!$isEmptyData(curShowValList)">
+        <template v-if="!$isEmptyData(curValShowList)">
             <!-- 单元格查看 -->
             <template v-if="isUnitShow">
                 <!-- 高度自由时 -->
@@ -183,7 +183,7 @@
                         'selectUsers-show-unit': true
                     }"
                 >
-                    <template v-for="item in curShowValList">
+                    <template v-for="item in curValShowList">
                         <img
                             :src="getAvatarUrl(item)"
                             :key="item._key"
@@ -211,7 +211,7 @@
                         'selectUsers-show-ellipsis': true,
                         'selectUsers-show-unit': true
                     }">
-                        <template v-for="item in curShowValList">
+                        <template v-for="item in curValShowList">
                             <img
                                 :src="getAvatarUrl(item)"
                                 :key="item._key"
@@ -238,7 +238,7 @@
                         'selectUsers-show-auto': true
                     }"
                     itemClass="selectUsers-show-auto-tag"
-                    :list="curShowValList"
+                    :list="curValShowList"
                 ></dsh-tags>
 
                 <!-- 高度不自由（不换行） -->
@@ -255,7 +255,7 @@
                             'selectUsers-show-ellipsis': true
                         }"
                         itemClass="selectUsers-show-ellipsis-tag"
-                        :list="curShowValList"
+                        :list="curValShowList"
                     ></dsh-tags>
                 </bri-tooltip>
             </template>
@@ -441,7 +441,7 @@
                     this.tmpValKeys.includes(userKey)
                 );
             },
-            curShowValList () {
+            curValShowList () {
                 return this.curValList;
             }
         },

package/src/components/list/BriCard.vue

@@ -50,3 +50,46 @@
         }
     };
 </script>
+
+<style lang="less">
+    .BriCard {
+        .item {
+            height: 50px;
+            margin-bottom: 10px;
+            float: left;
+            width: 33.3%;
+            padding: 0 10px;
+            min-width: 160px;
+
+            &-normal {
+                width: 100%;
+                height: 100%;
+                border: 1px solid #eaeaea;
+                position: relative;
+                border-radius: 5px;
+                cursor: pointer;
+
+                .label {
+                    .dsh-ellipsis();
+                    display: block;
+                    width: 160px;
+                    height: 100%;
+                    position: absolute;
+                    left: 50%;
+                    margin-left: -80px;
+                    line-height: 50px;
+                    text-align: center;
+                }
+            }
+
+            &-active {
+                background-color: @themeColor;
+                color: #fff;
+            }
+        }
+
+        &-nodata {
+            #dsh-nodata();
+        }
+    }
+</style>

package/src/components/list/BriTree.vue

@@ -186,7 +186,6 @@
             this.treeData = loop(this.data);
         },
         methods: {
-
             // 点击添加节点按钮
             clickAddNode (item, node, a) {
                 this.treeFormData = {
@@ -469,3 +468,62 @@
         }
     };
 </script>
+
+<style lang="less">
+    .BriTree {
+        max-width: 1200px;
+        min-width: 720px;
+        height: 100%;
+        margin: 0px auto;
+        background: #fff;
+        display: flex;
+        flex-direction: column;
+
+        &-action {
+            padding: 10px;
+            display: flex;
+            justify-content: flex-end;
+
+            &-create {
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+
+                .ivu-icon {
+                    font-size: 20px;
+                    font-weight: bold;
+                    margin-right: -10px;
+                    vertical-align: middle;
+                    transform: translate(0, -1px);
+                }
+            }
+        }
+
+        &-tree {
+            width: 100%;
+            flex: 1;
+            min-height: 0px;
+            overflow: auto;
+
+            .ivu-tree-title {
+                width: calc(100% - 18px);
+            }
+            .ivu-tree-arrow {
+                margin-top: 5px;
+            }
+        }
+
+        &-modal {
+            &-content {
+                &-btns {
+                    .dsh-padding20();
+                    text-align: right;
+                }
+            }
+        }
+
+        &-dropdown-menu {
+            width: 242px!important;
+        }
+    }
+</style>

package/src/components/list/BriTreeItem.vue

@@ -108,3 +108,56 @@
         }
     };
 </script>
+
+<style lang="less">
+    .BriTreeItem {
+        padding-left: 16px;
+
+        &-content {
+            line-height: 36px;
+            cursor: pointer;
+            display: flex;
+
+            &:hover {
+                background-color: @btn-hover;
+            }
+
+            &-expand {
+                width: 28px;
+                text-align: center;
+            }
+
+            &-select {
+                width: 100%;
+                color: rgba(36, 36, 63, 0.9);
+
+                .ivu-checkbox-inner {
+                    border-color: rgba(36, 36, 63, 0.3)
+                }
+                .ivu-checkbox {
+                    margin-right: 2px;
+                }
+
+                &-radio {
+                    .ivu-checkbox-inner {
+                        border-radius: 50%;
+                    }
+                }
+            }
+
+            &-text {
+
+            }
+        }
+
+        .default-enter,
+        .default-leave-to {
+            opacity: 0;
+            max-height: 0;
+        }
+
+        &-children {
+
+        }
+    }
+</style>