centaline-data-driven 1.5.0 → 1.5.2

package/package.json

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

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

@@ -71,7 +71,7 @@
             <tr v-for="(row, rowindex) in model.listData" :key="rowindex"
                 v-if="pageRowMin <= rowindex && rowindex <= pageRowMax" :ref="'rows.' + rowindex"
                 @click="rowClickHandle($event, rowindex)" class="ct-tr" :style="row.$style">
-              <td v-if="model.isMulti" class="ct-td tdFiexd left-fixation checkbox-td" :class="[model.tdClass]"
+              <td v-if="model.isMulti" class="ct-td tdFiexd left-fixation checkbox-td" :class="[model.tdClass,rowindex === model.selectIndex ? 'select' : null,]"
                   align="center">
                 <label v-if="!model.rightMulti || $common.getDataOfUpperLower(row, model.rightMulti) == 1"
                        class="el-checkbox is-checked">
@@ -87,6 +87,7 @@
                   :rowspan="tdRowspan(column, row)" class="ct-td" :class="[
                   colHasWidth[colIndex],
                   model.tdClass,
+                  rowindex === model.selectIndex ? 'select' : null,
                   colIndex === leftShadow ? 'shadowLeft' : null,
                   colIndex === rightShadow ? 'shadowRight' : null,
                   column.fixed === 'left' ? 'left-fixation' : null,
@@ -292,6 +293,7 @@ export default {
   activated() {
     this.$nextTick(() => {
       this.setTableHeight();
+      this.resetScroll();
     });
   },
   methods: {
@@ -588,18 +590,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;
@@ -607,7 +603,8 @@ export default {
         for (; index < this.model.listData.length; index++) {
           if (topHeigth >= scrollTop) {
             break;
-          } else {
+          } 
+          else {
             topHeigth = topHeigth + this.model.listData[index].$heigth;
           }
         }
@@ -625,10 +622,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;
@@ -776,7 +770,7 @@ export default {
     },
     resetScroll: function () {
       var self = this;
-      if(self.$refs.tableParent && self.$refs["rows." + self.model.selectIndex]){
+      if(self.$refs.tableParent && self.$refs["rows." + self.model.selectIndex] && self.$refs["rows." + self.model.selectIndex][0]){
         if (self.$refs.tableParent.scrollTop > self.$refs["rows." + self.model.selectIndex][0].offsetTop - self.$refs.tableHead.offsetHeight) {
           self.$refs.tableParent.scrollTop = self.$refs["rows." + self.model.selectIndex][0].offsetTop - self.$refs.tableHead.offsetHeight;
         }

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

@@ -134,8 +134,11 @@
         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.categorySource.selectItems1[i].loaded=true;
           this.$nextTick(function () {
             this.isLoading=true;

package/src/centaline/dynamicViewerFile/src/dynamicViewerFile.vue

@@ -46,7 +46,7 @@
           <!--Photo-->
           <template v-else-if="itemFile.mediaTypeID == '2'">
             <ct-viewerImage ref="viewerImage"
-                            :imgUrl="resultObject"
+                            :imgUrl="resultObject+'/'+displayAreaWidth+'/'+displayAreaHeight"
                             :rotate="rotate"></ct-viewerImage>
           </template>
           <!--ThreeDimensional-->

package/src/main.js

@@ -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.eNrEjjsOwjAQBe_iOiv5s15n0yX-NBwisuUghQqRRAIh7k4Q0NEzxSumeXMXy1ZEJww57iMp8BZbQFIWGFMCL4nYJGlMCCN_gB_zZUTnue-jA5QDASYbgbVPYNgOAWPvQiTRiOl6Fp2iVtvWWqsaMef1LZBZvcS2TJfDdPtH3Gmd91upc60VC7g6VcCjk9CSqpC1KyWj3kNIPJ4AAAD__w.3I7QJ69KHIdBfYNzrurJKS6Xx02DG75sMCuV49wcIME',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',