centaline-data-driven 1.5.1 → 1.5.3

package/package.json

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

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

@@ -589,18 +589,12 @@ export default {
       }
     },
     getScrollAttr(e) {
-      if (
-        typeof this.$refs.tableParent !== "undefined" &&
-        typeof this.$refs.headThs !== "undefined"
-      ) {
+      if ( typeof this.$refs.tableParent !== "undefined" && typeof this.$refs.headThs !== "undefined") {
         this.calculatingRowHeight();
 
         var scrollTop = this.$refs.tableParent.scrollTop;
         var scrollLeft = this.$refs.tableParent.scrollLeft;
-        var scrollRight =
-          this.$refs.tableParent.scrollWidth -
-          scrollLeft -
-          this.$refs.tableParent.clientWidth;
+        var scrollRight = this.$refs.tableParent.scrollWidth - scrollLeft - this.$refs.tableParent.clientWidth;
 
         //计算可视范围的第一条数据
         let index = 0;
@@ -608,7 +602,8 @@ export default {
         for (; index < this.model.listData.length; index++) {
           if (topHeigth >= scrollTop) {
             break;
-          } else {
+          } 
+          else {
             topHeigth = topHeigth + this.model.listData[index].$heigth;
           }
         }
@@ -626,10 +621,7 @@ export default {
       this.pageRowMax = this.firstRow + this.displayRowNumber;
       this.pageRowMin = this.firstRow - this.displayRowNumber;
       this.pageRowMin = this.pageRowMin > 0 ? this.pageRowMin : 0;
-      if (
-        this.pageRowMin > 0 &&
-        this.model.listData[this.pageRowMin].$rowspan === 0
-      ) {
+      if ( this.pageRowMin > 0 && this.model.listData[this.pageRowMin].$rowspan === 0) {
         for (let i = this.pageRowMin; i >= 0; i--) {
           if (this.model.listData[i].$rowspan > 0) {
             this.pageRowMin = i;

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="screenPara" @tableLoaded="tableLoaded">
           </ct-searchlistOne>
         </div>
       </div>
@@ -116,13 +116,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.screenPara=parm;
+              self.listHeight=(self.$refs.main.offsetHeight-42)+'px';
+              self.categorySource.selectItems1[0].loaded=true;
             }
             else{
               self.categoryLoadedError();
@@ -134,13 +133,14 @@
         let i = this.activeIndex;
         let parm={};
         parm[this.categorySource.fieldName1]=this.categorySource.selectItems1[i].code;
-        this.label=this.categorySource.selectItems1[i].displayName;        
-        if(!this.categorySource.selectItems1[i].loaded){
+        this.label=this.categorySource.selectItems1[i].displayName;
+        if(this.categorySource.selectItems1[i].loaded){
+          this.$refs['searchlist'+i][0].resize();
+        }
+        else {
+          this.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_iOitt7PXamy7xp-EQUUKMBBUiiQRC3J0goKNnildMM--u5nVUjTLspE1cQ7Dkgbi2IJQzBGQWk9GYGHv5AD_mS08uSNsmB4QdA2WbQHTIYMR2kVLrYmJVqXI9q6Zmr8khMlbqOCxvYbzhl1jnctmV2z_OnZbjli2T9QOzB0TZsrS1R9x70EYmLtoerGX1eAIAAP__.0wvOuo6VUjar3ngMidARPex7UIAp9IPBRS4bI5vYWwQ',
+        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"}',