centaline-data-driven 1.5.3 → 1.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -779,6 +779,22 @@ export default {
         self.scrollTop = self.$refs.tableParent.scrollTop;
       }
     },
+    resetScrollActivated: function () {
+      if(this.$refs.tableParent){
+        if(this.scrollTop>this.$refs.tableParent.scrollTop) {  
+          this.$refs.tableParent.scrollTop = this.scrollTop;
+        }
+        else if(this.model.selectIndex > 5  && this.$refs.tableParent.scrollTop===0){
+          let index = 0;
+          let topHeigth = 0;
+          for (; index < this.model.selectIndex; index++) {
+            topHeigth = topHeigth + (this.model.listData[index].$heigth ? this.model.listData[index].$heigth : 31);
+          }
+          this.scrollTop = topHeigth;
+          this.$refs.tableParent.scrollTop = this.scrollTop;
+        }
+      }
+    },
     rowKeyDownHandle(ev, action) {
       var self = this;
       if (action === 1) {

package/src/centaline/dynamicSearchListTab/src/dynamicSearchListOne.vue

@@ -191,6 +191,11 @@
           this.$refs.table.setTableHeight();
         }
       },
+      resetScrollActivated() {
+        if(this.$refs.table){
+          this.$refs.table.resetScrollActivated();
+        }
+      },
       resizeSearchList() {
         if(this.flagSideBar && this.flagSideBarOfData){
           if(this.sideBarStatus=='open' && this.$refs.main){

package/src/centaline/dynamicSearchListTab/src/dynamicSearchListTab.vue

@@ -22,7 +22,7 @@
       <div v-if="categorySource" class="el-tabs__content">
         <div v-for="(col, index) in categorySource.selectItems1" v-show="activeIndex===index" v-loading="isLoading" :key="index" :index="index" class="el-tab-pane" role="tabpanel" aria-hidden="true">
           <ct-searchlistOne v-if="col.loaded" :ref="'searchlist'+index" :searchConditionApi="searchConditionApi" :pageHeight="listHeight"
-            :searchStatsApi="searchStatsApi" :searchDataApi="searchDataApi" :apiParam="screenPara" @tableLoaded="tableLoaded">
+            :searchStatsApi="searchStatsApi" :searchDataApi="searchDataApi" :apiParam="col.screenPara" @tableLoaded="tableLoaded">
           </ct-searchlistOne>
         </div>
       </div>
@@ -76,10 +76,8 @@
     },
     activated() {
       this.$nextTick(() => {
-        if(this.$refs.detail){
-          if(this.$refs.detail.$children && this.$refs.detail.$children.length>0){
-            this.$refs.detail.$children[0].refreshPage();
-          }
+        if(this.categorySource) {    
+          this.$refs['searchlist'+this.activeIndex][0].resetScrollActivated();
         }
       })
     },
@@ -119,7 +117,7 @@
               let parm={};
               parm[self.categorySource.fieldName1]=self.categorySource.selectItems1[self.activeIndex].code;
               self.label=self.categorySource.selectItems1[self.activeIndex].displayName;
-              self.screenPara=parm;
+              self.categorySource.selectItems1[0].screenPara=parm;
               self.listHeight=(self.$refs.main.offsetHeight-42)+'px';
               self.categorySource.selectItems1[0].loaded=true;
             }
@@ -136,9 +134,10 @@
         this.label=this.categorySource.selectItems1[i].displayName;
         if(this.categorySource.selectItems1[i].loaded){
           this.$refs['searchlist'+i][0].resize();
+          this.$refs['searchlist'+i][0].resetScrollActivated();
         }
         else {
-          this.screenPara=parm;
+          this.categorySource.selectItems1[i].screenPara=parm;
           this.categorySource.selectItems1[i].loaded=true;
           this.isLoading=true;
         };