bri-components 1.2.44 → 1.2.46

package/package.json

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

package/src/abolish/DshFlatTable.vue

@@ -447,7 +447,7 @@
                     this.selections = this.selections.filter(checkItem => checkItem._id !== row._id);
                 }
 
-                this.$emit("selectChange", this.selections, row, bool);
+                this.$emit("changeSelect", this.selections, row, bool);
             },
             // 点击 -添加行
             clickCreate (operationItem, row, index, list) {

package/src/components/list/BriFlatTable.vue

@@ -6,7 +6,7 @@
             :columns="showColumns"
             :data="listData"
             :footer-data="footerData"
-            @selectChange="changeSelect"
+            @changeSelect="changeSelect"
             @selectAll="changeSelect"
         ></bri-table>
 
@@ -378,7 +378,7 @@
                 });
             },
             changeSelect (list) {
-                this.$emit("selectChange", list);
+                this.$emit("changeSelect", list);
             },
             // 表单控件值改变
             changeVal (operationItem, col, row, rowIndex, params) {

package/src/components/list/BriTable.vue

@@ -145,7 +145,7 @@
                     // 行选择改变事件
                     selectedRowChange: ({ row, isSelected, selectedRowKeys }) => {
                         this.$emit(
-                            "selectChange",
+                            "changeSelect",
                             this.data.filter(dataItem => selectedRowKeys.includes(dataItem[this.selfPropsObj.rowKeyFieldName])),
                             { row, isSelected, selectedRowKeys }
                         );

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

@@ -16,7 +16,7 @@
                 :noDataText="listPropsObj && listPropsObj.noDataText || '暂无内容...'"
                 @clickRow="clickRow"
                 @sortChange="changeSort"
-                @selectChange="changeSelect"
+                @changeSelect="changeSelect"
                 @selectAll="selectAll"
                 @select="select"
                 @groupScroll="groupScroll"
@@ -117,7 +117,7 @@
             },
             // 改变选择项
             changeSelect (...params) {
-                this.$emit("selectChange", ...params);
+                this.$emit("changeSelect", ...params);
             },
             // 切换全选
             selectAll (...params) {

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

@@ -605,7 +605,7 @@
             },
             // 改变选择项
             changeSelect () {
-                this.$emit("selectChange", this.selectIds, this.selections);
+                this.$emit("changeSelect", this.selectIds, this.selections);
             }
             // change (...params) {
             //     this.$emit("change", ...params);

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

@@ -21,7 +21,6 @@
                 class="list-cols-right row"
                 :style="{
                     paddingLeft: multiple ? '48px' : '0px',
-                    background: useColBg ? '#f0f0f0' : 'none'
                 }"
             >
                 <div
@@ -57,20 +56,13 @@
 
         <!-- 行 -->
         <div class="list-rows">
-            <!-- 加载中 -->
-            <div
+            <!-- 加载 -->
+            <bri-loading
                 v-if="isLoading"
                 class="list-loading"
-            >
-                <div class="list-loading-wrap"></div>
-                <div class="list-loading-content">
-                    <span>
-                        <i class="list-loading-content-icon"></i>
-                    </span>
-                </div>
-            </div>
-
-            <!-- 加载完 -->
+                mode="middle"
+                center
+            />
             <template v-else>
                 <!-- 有数据 -->
                 <template v-if="data.length">
@@ -196,7 +188,6 @@
                 default () {
                     return {
                         multiple: true,
-                        useColBg: true,
                         sequence: false
                     };
                 }
@@ -237,9 +228,6 @@
             multiple () {
                 return this.propsObj.multiple !== false;
             },
-            useColBg () {
-                return this.propsObj.useColBg !== false;
-            },
             sequence () {
                 return this.propsObj.sequence && this.propsObj.sequence !== false;
             }
@@ -274,7 +262,7 @@
             },
             // 改变选择项
             changeSelect () {
-                this.$emit("selectChange", this.selectIds, this.selections);
+                this.$emit("changeSelect", this.selectIds, this.selections);
             },
 
             change (...params) {

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

@@ -6,7 +6,7 @@
             :propsObj="propsObj"
             :isLoading="isLoading"
             :noDataText="noDataText"
-            @selectChange="changeSelect"
+            @changeSelect="changeSelect"
             @selectAll="changeSelect"
             @click-row="clickRow"
             @sort-change="changeSort"
@@ -189,7 +189,7 @@
             },
             // 改变选择项
             changeSelect (...params) {
-                this.$emit("selectChange", params[0].map(item => item._id), ...params);
+                this.$emit("changeSelect", params[0].map(item => item._id), ...params);
             }
             // // 切换全选
             // selectAll (...params) {

package/src/styles/common/common.less

@@ -1,5 +1,29 @@
-.pointer {
-    cursor: pointer;
+.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;
+    }
+}
+// 宽度为6
+.bri-scrollbar6 {
+    &::-webkit-scrollbar {
+        height: 6px;
+        width: 6px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+        border-radius: 3px;
+        background: rgba(51, 51, 51, .1);
+        background-clip: border-box;
+    }
 }
 
 #dsh-sign-change () {

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

@@ -3,49 +3,20 @@
     
     .list {
         &-loading {
-            min-height: 100px;
-
-            &-wrap {
-                display: block;
-                height: 100%;
-                width: 100%;
-                background-color: #fff;
-                z-index: 99999;
-                position: relative;
-                opacity: 0.6;
-            }
-
-            &-content {
-                z-index: 9999999;
-                position: absolute;
-                top: 30px;
-                left: 50%;
-            }
-
-            &-icon {
-                -moz-animation: spin 2.3s infinite linear;
-                -o-animation: spin 2.3s infinite linear;
-                -webkit-animation: spin 2.3s infinite linear;
-                animation: spin 2.3s infinite linear;
-                display: inline-block;
-                font-size: 28px;
-                opacity:0.6;
-
-                &:before {
-                    content: '\e838';
-                }
-            }
+            margin-top: 120px;
         }
 
         &-cols,
         &-rows {
             position: relative;
+
             &-left {
                 width: 48px;
                 text-align: center;
                 position: absolute;
                 left: 0;
                 top: 0;
+
                 label {
                     display: inline-block;
                     height: 36px;
@@ -60,6 +31,7 @@
                 line-height: 20px;
                 display: flex;
                 justify-content: space-between;
+
                 &-item {
                     min-width: 120px;
                     height: 100%;
@@ -73,16 +45,21 @@
         &-cols {
             height: @height;
             background: #f0f0f0;
+
             &-left {}
-            &-right {}
+            &-right {
+
+            }
 
             .row {
                 font-weight: 700;
+
                 &-item {
                     padding: 10px 16px;
                     border-top: 1px #e5e5e5 solid;
                     border-bottom: 1px #f0f0f0 solid;
                     border-left: 1px #e5e5e5 solid;
+                    background: #f0f0f0;
 
                     &:last-child{
                        border-right: 1px #e5e5e5 solid;
@@ -107,19 +84,20 @@
                     line-height: 20px;
                 }
             }
+
             &-right {}
 
             .row {
                 height: 44px;
                 line-height: 20px;
-
                 cursor: pointer;
+
                 &-item {
                     display: flex;
                     border: 1px solid #E5E5E5;
                     border-width: 0 0 1px 1px;
 
-                    &:last-child{
+                    &:last-child {
                         border-width: 0 1px 1px 1px;
                     }
 

package/src/styles/reset.less

@@ -44,54 +44,4 @@ li {
     background: rgba(187, 187, 187, 0.8);
     background-clip: padding-box;
     border: 2px solid rgba(0, 0, 0, 0);
-}
-
-// 宽度为6
-.bri-scrollbar6 {
-    &::-webkit-scrollbar {
-        height: 6px;
-        width: 6px;
-    }
-
-    &::-webkit-scrollbar-thumb {
-        border-radius: 3px;
-        background: rgba(51, 51, 51, .1);
-        background-clip: border-box;
-    }
-}
-
-.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;
-
-    &::-webkit-scrollbar-thumb {
-        border-radius: 3px;
-        background: rgba(225, 232, 237, 1);
-        background-clip: border-box;
-    }
-}
-
-.dsh-scrollbar6::-webkit-scrollbar {
-    height: 6px;
-    width: 6px;
-
-    &::-webkit-scrollbar-thumb {
-        border-radius: 5px;
-        background: rgba(225, 232, 237, 1);
-        background-clip: border-box;
-    }
 }