centaline-data-driven 1.5.2 → 1.5.4

package/package.json

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

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

@@ -293,7 +293,6 @@ export default {
   activated() {
     this.$nextTick(() => {
       this.setTableHeight();
-      this.resetScroll();
     });
   },
   methods: {
@@ -780,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="apiParam" @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();
         }
       })
     },
@@ -116,13 +114,12 @@
           function (response) {
             if (response.rtnCode === 200) {
               self.categorySource=response.content.fields[0];
-              self.categorySource.selectItems1[0].loaded=true;
               let parm={};
               parm[self.categorySource.fieldName1]=self.categorySource.selectItems1[self.activeIndex].code;
               self.label=self.categorySource.selectItems1[self.activeIndex].displayName;
-              self.$nextTick(function () {
-                self.categoryLoaded(parm);
-              });
+              self.categorySource.selectItems1[0].screenPara=parm;
+              self.listHeight=(self.$refs.main.offsetHeight-42)+'px';
+              self.categorySource.selectItems1[0].loaded=true;
             }
             else{
               self.categoryLoadedError();
@@ -137,13 +134,12 @@
         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.categorySource.selectItems1[i].screenPara=parm;
           this.categorySource.selectItems1[i].loaded=true;
-          this.$nextTick(function () {
-            this.isLoading=true;
-            this.$refs['searchlist'+i][0].categoryLoaded(parm);
-          });
+          this.isLoading=true;
         };
       },
       categoryLoaded(param) {

package/src/main.js

@@ -14,8 +14,8 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.46:7070/max-uplink-api/v1/form/router",
-  // baseUrl: "http://10.6.1.162:17070/max-uplink-api/v1/form/router",
+  // baseUrl: "http://10.88.22.46:7070/max-uplink-api/v1/form/router",
+  baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:9999/service-api/v1/form/router",
   // baseUrl: "http://10.88.22.42:9999/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
@@ -50,7 +50,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '9dac5622-e8b2-46c4-aa90-b5bfd0d1b1e8',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOiv5s15n0yX-NBwisuUghQqRRAIh7k4Q0NEzxSumeXMXy1ZEJww57iMp8BZbQFIWGFMCL4nYJGlMCCN_gB_zZUTnue-jA5QDASYbgbVPYNgOAWPvQiTRiOl6Fp2iVtvWWqsaMef1LZBZvcS2TJfDdPtH3Gmd91upc60VC7g6VcCjk9CSqpC1KyWj3kNIPJ4AAAD__w.3I7QJ69KHIdBfYNzrurJKS6Xx02DG75sMCuV49wcIME',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjr0OgjAURt-lMzdpe3_KZYPSLj4EAQIJTkYg0RjfXY26uXuGbzjL-W5m3QdTGZSgdRIHkakEEseglDNEK6KYLWLbdvoBfsyXjkLUuk4ByDYClDmB-pgBlZuWUh3aJKYw0-VkKielF0JkV5il396CWfQl9nU6H6brP84dt-WZ1ZFtL0TAQRGoVw9D8Aw0DzzPOgYUNfcHAAAA__8.sJA4ggjcul71iwN0kmGK210TEUKaipDHTsvmEHQSHBM',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',