bri-components 1.5.10 → 1.5.11

package/package.json

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

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

@@ -57,6 +57,7 @@
                 <input
                     id="fileupload"
                     class="file"
+                    :accept="acceptType"
                     :type="inputType"
                     @change="setImage"
                 />
@@ -155,6 +156,9 @@
             },
             finalRequestOssType () {
                 return this.propsObj._requestOssType || this.requestOssType || "default";
+            },
+            acceptType () {
+                return this.propsObj._acceptType || "*";
             }
         },
         created () {

package/src/components/list/DshFlatTable.vue

@@ -74,12 +74,12 @@
         >
             <dsh-page
                 :mode="pageMode"
-                :total="selfTotal"
+                :total="totalNum"
                 :propsObj="pagePropsObj"
                 @changePage="changePage"
                 @changePageSize="changePageSize"
             >
-                共 {{ selfTotal }} 条
+                共 {{ totalNum }} 条
 
                 <span
                     class="DshFlatTable-sort"
@@ -183,12 +183,12 @@
                 >
                     <dsh-page
                         :mode="pageMode"
-                        :total="selfTotal"
+                        :total="totalNum"
                         :propsObj="pagePropsObj"
                         @changePage="changePage"
                         @changePageSize="changePageSize"
                     >
-                        共 {{ selfTotal }} 条
+                        共 {{ totalNum }} 条
 
                         <span
                             class="DshFlatTable-sort"

package/src/components/list/mixins/DshCascaderTableMixin.js

@@ -35,7 +35,7 @@ export default {
         },
         // 替换tableBaseMixin里的
         searchTitle () {
-            return `${this.isSearching ? "筛选" : "全部"}数据，共 ${this.selfTotal} 条；`;
+            return `${this.isSearching ? "筛选" : "全部"}数据，共 ${this.totalNum} 条；`;
         },
 
         /* --- 列字段 --- */

package/src/components/list/mixins/DshFlatTableMixin.js

@@ -60,7 +60,7 @@ export default {
         },
         // 替换tableBaseMixin里的
         searchTitle () {
-            return `${this.isSearching ? "筛选" : "全部"}数据${this.isMergeRowTable ? `，共 ${this.selfTotal}条；` : "；"}`;
+            return `${this.isSearching ? "筛选" : "全部"}数据${this.isMergeRowTable ? `，共 ${this.totalNum}条；` : "；"}`;
         },
 
         /* --- 列字段 --- */
@@ -168,17 +168,17 @@ export default {
             const pagesize = this.pagePropsObj.pagesize;
 
             return page >= 1
-                ? (page - 1) * pagesize >= this.showListData.length
+                ? page > this.totalPage
                     ? this.showListData.slice(-(this.showListData.length % pagesize || pagesize))
                     : this.showListData.slice((page - 1) * pagesize, page * pagesize)
                 : [];
         },
         // 全部数据 或 筛选时符合条件的数据 -共多少分（！！！最小为1）
-        pageNum () {
+        totalPage () {
             return (
-                this.selfTotal % this.pagePropsObj.pagesize > 0
-                    ? Math.ceil(this.selfTotal / this.pagePropsObj.pagesize)
-                    : this.selfTotal / this.pagePropsObj.pagesize
+                this.totalNum % this.pagePropsObj.pagesize > 0
+                    ? Math.ceil(this.totalNum / this.pagePropsObj.pagesize)
+                    : this.totalNum / this.pagePropsObj.pagesize
             ) || 1;
         }
     },
@@ -203,15 +203,15 @@ export default {
                     this.changePage(1);
                 }
             } else {
-                if (this.pagePropsObj.page !== this.pageNum) {
-                    this.changePage(this.pageNum);
+                if (this.pagePropsObj.page !== this.totalPage) {
+                    this.changePage(this.totalPage);
                 }
             }
         },
         // 也供外部使用 -删除数据时，更正this.pagePropsObj.page
         fixCurPage () {
-            if (this.pagePropsObj.page > this.pageNum) {
-                this.changePage(this.pageNum);
+            if (this.pagePropsObj.page > this.totalPage) {
+                this.changePage(this.totalPage);
             }
         },
         // 暂未供外部使用 -判断是否要转到下一页（在本页最后一条上插入一行时，要转到下一页）

package/src/components/list/mixins/tableBaseMixin.js

@@ -643,7 +643,7 @@ export default {
                 .filter(id => !!id);
         },
         // 全部数据（或筛选出的数据）-总数
-        selfTotal () {
+        totalNum () {
             return this.showListData.length;
         },