bri-components 1.3.62 → 1.3.64

package/package.json

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

package/src/components/list/common/quoteListModal.vue

@@ -138,12 +138,12 @@
                 this.$https({
                     url: {
                         module: "sheet",
-                        name: "index"
+                        name: "customFilter"
                     },
                     params: this.listParams,
                     loadingName: "listPropsObj.isLoading",
                     callback: data => {
-                        this.listData = data.list;
+                        this.listData = data.list.slice(0, 50);
                         this.curDataItem = this.listData[0];
                     }
                 });

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

@@ -73,7 +73,13 @@ export default {
                 ...(this.useSelection === true ? [this.selectionColumn] : []),
                 ...(this.useIndex === true ? [this.indexColumn] : []),
                 ...this.$transformToColumns(this.contentColumns),
-                ...(this.$getOperationList(["canDelete"]).length ? [this.operationColumn] : [])
+                ...(
+                    this.isSearching
+                        ? []
+                        : this.$getOperationList(["canDelete"]).length
+                            ? [this.operationColumn]
+                            : []
+                )
             ];
         },
         indexColumn () {

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

@@ -104,11 +104,13 @@ export default {
                 this.expandColumn,
                 ...(this.useIndex === true ? [this.indexColumn] : []),
                 ...this.$transformToColumns(this.contentColumns),
-                ...(this.isSearching
-                    ? []
-                    : this.$getOperationList(["canDelete"]).length
-                        ? [this.operationColumn]
-                        : [])
+                ...(
+                    this.isSearching
+                        ? []
+                        : this.$getOperationList(["canDelete"]).length
+                            ? [this.operationColumn]
+                            : []
+                )
             ];
         },
         expandColumn () {

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

@@ -313,14 +313,16 @@ export default {
             return this.selfPropsObj._searchLabelWidth;
         },
         rowsNum () {
-            return this.showListData.length;
+            return this.isSearching
+                ? this.showListData.length
+                : this.allListData.length;
         },
         rowsNumStr () {
             return `当前“${this.isSearching ? "筛选" : "全部"}”范围, 共 ${this.rowsNum} 行`;
         },
 
-        showListData () {
-            console.log("showListData");
+        renderedListData () {
+            console.log("renderedListData");
             return this.allListData.filter(row => {
                 if (this.isSearching) {
                     const bool = this.$isAdvRelyAccord(this.finalTableAdvSearch, row);
@@ -331,21 +333,17 @@ export default {
                         row.__isRendered__ = true;
                         row.__isSearchShow__ = true;
                     }
-
-                    return bool;
-                } else {
-                    return true;
                 }
+
+                return row.__isRendered__;
             });
         },
-        renderedListData () {
-            console.log("renderedListData");
-            return this.allListData.filter(row =>
-                row.__isRendered__ || (
-                    this.isSearching
-                        ? this.$isAdvRelyAccord(this.finalTableAdvSearch, row)
-                        : false
-                )
+        showListData () {
+            console.log("showListData");
+            return this.renderedListData.filter(row =>
+                this.isSearching
+                    ? !!row.__isSearchShow__
+                    : !!row.__isShow__
             );
         },
         parentDataId () {
@@ -768,7 +766,8 @@ export default {
                 params: {
                     screenKey: this.screenKey,
                     _id: this.parentObj._id,
-                    _key: this.controlKey
+                    _key: this.controlKey,
+                    advSearch: this.finalTableAdvSearch
                 },
                 callback: data => {
                     this.getJobStatus(operationItem, data.jobId, data.excel_url);