centaline-data-driven 1.4.24 → 1.4.26

package/package.json

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

package/src/SearchList.vue

@@ -4,23 +4,23 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     
-    <!-- <ct-searchlist :apiParam="para"
+    <ct-searchlist :apiParam="para"
       :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'" 
       :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
       :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" 
       :searchStatsApi="'/ProfileWorklistList/getListStats'">
-    </ct-searchlist> -->
+    </ct-searchlist>
 
     <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/PropertyTrustList/getLayoutOfSearch'" 
       :searchDataApi="'/PropertyTrustList/getListOfSearchModel'">
     </ct-searchlist> -->
 
-    <ct-searchlist 
+    <!-- <ct-searchlist 
       :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" 
       :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" 
       :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -816,7 +816,14 @@ export default {
             ];
             if (field.action) {
               var callback = function (data) {
-                MediaAlbum[0].medias = data;
+                if(typeof data =='object'&&data.mediaAlbums)
+                {
+                MediaAlbum = data.mediaAlbums;
+                }
+                else
+                {
+                  MediaAlbum[0].medias = data;
+                }
                 self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0,mediaviewpagetype);
               }
               var vsubmitData = {

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -806,7 +806,14 @@ export default {
             ];
             if (field.action) {
               var callback = function (data) {
-                MediaAlbum[0].medias = data;
+                if(typeof data =='object'&&data.mediaAlbums)
+                {
+                MediaAlbum = data.mediaAlbums;
+                }
+                else
+                {
+                  MediaAlbum[0].medias = data;
+                }
                 self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0,mediaviewpagetype);
               } 
               var vsubmitData = {

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

@@ -2,7 +2,7 @@
   <div style="width: 100%" class="ct-searchtable" ref="searchTable"
        :style="{ 'margin-top': isLayout ? '0' : '', padding: isLayout ? '0' : '' }">
     <ct-tableStats ref="tableStats" class="ct-search-table-list-header" v-if="!isLoading && model && searchStatsApi"
-                   :api="searchStatsApi" @searchStats="searchStats" @setTableHeight="setTableHeight"
+                   :api="searchStatsApi" @searchStats="searchStats" @setTableHeight="setTableHeight" :flagDisabled="disabledStats"
                    :searchModel="model.searchModel">
     </ct-tableStats>
 
@@ -250,7 +250,8 @@ export default {
         trigger: "hover", //触发方式，传值可查看Popper UI组件trigger属性
         placement: "right-start", //方向，传值可查看Popper UI组件placement属性
       },
-      downloadUrl:""
+      downloadUrl:"",
+      disabledStats:false,
 
     };
   },
@@ -452,6 +453,7 @@ export default {
           self.tableLoading = false;
           self.rowColorChange();
         }
+        self.disabledStats=false;
         self.$emit("searchComplate", index);
       };
       self.tableLoading = true;
@@ -884,10 +886,17 @@ export default {
             var mediaviewpagetype=(field.isFormPageInTab||field.isSearchPageInTab)?2:0; 
             var MediaAlbum = [
               { albumName: self.model.title || "媒体", medias: [] },
-            ];
+            ]; 
             if (field.action) {
               var callback = function (data) {
-                MediaAlbum[0].medias = data;
+                if(typeof data =='object'&&data.mediaAlbums)
+                {
+                MediaAlbum = data.mediaAlbums;
+                }
+                else
+                {
+                  MediaAlbum[0].medias = data;
+                }
                 self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0,mediaviewpagetype);
               }
               self.model.getAction(field.action, submitData, callback);
@@ -1541,6 +1550,7 @@ export default {
       let self = this;
       self.model.searchStats = m;
       if (flagRefreshTable) {
+        self.disabledStats=true;
         self.getPage(1);
       }
     },

package/src/centaline/dynamicSearchList/src/dynamicTableStats.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="ct-table-Statistics" ref="tableStatistics">
+  <div class="ct-table-Statistics" :class="[flagDisabled?'domDisabled':'']" ref="tableStatistics">
     <!--计算占用宽度-->
     <div style="position: relative" v-if="FlagStatistics">
       <div style="position: absolute; left: -10000px" class="tab-list">
@@ -128,6 +128,10 @@ export default {
   props: {
     api: String,
     searchModel: Object,
+    flagDisabled: {
+      Boolean,
+      default: false,
+    },
   },
   data() {
     return {

package/src/centaline/dynamicTree/src/dynamicSearchTree.vue

@@ -95,7 +95,14 @@ export default {
             ];
             if (field.action) {
               var callback = function (data) {
-                MediaAlbum[0].medias = data;
+               if(typeof data =='object'&&data.mediaAlbums)
+                {
+                MediaAlbum = data.mediaAlbums;
+                }
+                else
+                {
+                  MediaAlbum[0].medias = data;
+                }
                 self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0,mediaviewpagetype);
               }
               self.model.getAction(field.action, submitData, callback);

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

@@ -82,17 +82,7 @@
           </template>
           <!--File-->
           <template v-else-if="itemFile.mediaTypeID == '6'">
-            <template v-if="'doc,docx,xlsx' .search(itemFile.fileExtension.toLowerCase())>-1">
-              <div class="viewerContent"
-                   style="max-height: 200px; text-align: center">
-                <a :href="resultObject">
-                  <img :src="itemFile.thumbnailUrl" /><br />{{
-                    itemFile.mediaLabelName || itemFile.fileName
-                  }}
-                </a>
-              </div>
-            </template>
-            <template v-else-if="'pdf' .search(itemFile.fileExtension.toLowerCase())>-1 ">
+            <template v-if="'pdf' .search(itemFile.fileExtension.toLowerCase())>-1 ">
               <ct-viewerPDF :pdfUrl="resultObject"
                             :displayAreaHeight="displayAreaHeight"
                             :displayAreaWidth="displayAreaWidth">
@@ -100,7 +90,14 @@
             </template>
           </template>
           <template v-else>
-            不支持此类型：{{ itemFile.mediaTypeID }}
+           <div class="viewerContent"
+                   style="max-height: 200px; text-align: center">
+                <a :href="resultObject">
+                  <img :src="itemFile.thumbnailUrl" /><br />{{
+                    itemFile.mediaLabelName || itemFile.fileName
+                  }}
+                </a>
+              </div>        
           </template>
 
           <template v-if="resultObject != ''">
@@ -148,7 +145,7 @@
                 :download="(itemFile.mediaLabelName || itemFile.fileName)"
                 @click="handDownload(resultObject)"
                 ></a>-->
-                <a href="javascript:void(0)"
+                <a href="javascript:void(0)" v-if="itemFile.rightDownload&&itemFile.mediaTypeID !='1'"
                    class="magnify-btn el-icon-download"
                    title="下载"
                    @click="handDownload(resultObject)"></a>

package/src/main.js

@@ -43,7 +43,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '3f518e5b-85c3-4a3e-9aa2-d476c6e43b75',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVbKOmt7nQ6c0HCIyLGNFCqUjwRC3B0QSZeeKaaY5r0nTEsPNdgV3NFG51ZwRxsdETtLpsWDsx7ZcIVCXtCz8Xxq2sofGygg329QkzFOrNhSFzCE-ResU9U3LFMez_nxj3PXefjMqkvUQUeFQVJG7lmjaEeYSgkmMFMsE7zeAAAA__8.ukJUtoKA3fqRkflees-rsM7t4LslfhjU0h3vZfHlOgs',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZMwu7OzO3S6YOMhiLBrgpURSDTGu6sROnpf8YrX_P-Ece6gAr-AG1ppdQE3tNISsXqSBnfqI7KwxUAxYGSJfKgbG_c1FJDvV6hIfGmDsewKGE7TLxh1-g3zmG_H_PjHucs0fGazpE5sCpjUBORsPQbtCImCc1KaPvVneL0BAAD__w.LezfS_6A9EFEtLVtmP5mNuSXjhOdHIsSR47oATD5KO4',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',