centaline-data-driven 1.4.56 → 1.4.57

package/package.json

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

package/src/Detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="appDetail" style="height:100%;">
-    <ct-Detail :api="'PropertyRET/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailRET'"></ct-Detail>
+    <ct-Detail :api="'PropertyOFI/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailOFI'"></ct-Detail>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>
@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "1603623689855832064"} ,
+        apiParam: {actionType: 1,chanceID: "1620973360810954752"} ,
       }
     },
     mounted() {

package/src/SearchList.vue

@@ -22,17 +22,17 @@
       :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
     </ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
       :searchStatsApi="'/PropertyRETList/getListStats'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
+    <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyOFIList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyOFIList/getLayoutOfSearchCategory'"
       :searchStatsApi="'/PropertyOFIList/getListStats'">
-    </ct-searchlist> -->
+    </ct-searchlist>
 
     <ct-dialog-list></ct-dialog-list>
   </div>

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

@@ -2,7 +2,7 @@
   <div ref="main" class="main" v-if="model !== null">
     <div class="details-content">
       <div ref="header" class="details-head base-box mb10">
-        <div class="head-type" :style="{background:model.fields1Dic.flagActive.value=='0'?'rgba(153, 153, 153, 1)':'#ee6b6b'}">
+        <div class="head-type" :style="{background:model.fields1Dic && model.fields1Dic.flagActive && model.fields1Dic.flagActive.value=='0'?'rgba(153, 153, 153, 1)':'#ee6b6b'}">
           {{ model.fields1Dic.Trade.value }}
         </div>
         <div class="head-info">
@@ -30,8 +30,7 @@
             </div>
           </div>
           <div v-if="model.fields1Dic.PropertyDepict && model.fields1Dic.PropertyDepict.value !== ''" v-html="model.fields1Dic.PropertyDepict.value"
-            style=" font-weight: bold; font-size: 13px; margin-top: 10px; background: rgb(236, 249, 255);
-              flex: 1; align-items: center; padding: 5px; border-radius: 5px;">
+            style="font-weight: bold; font-size: 13px; margin-top: 10px; background: rgb(236, 249, 255); flex: 1; align-items: center; padding: 5px; border-radius: 5px;">
           </div>
         </div>
         <div class="head-but" :key="actionRoutersKey">
@@ -67,7 +66,10 @@
           </div>
         </div>
       </div>
-      <div ref="detail" class="details-mid y-auto" @scroll="scrollHandle($event)" :style="{height: model.detailHeight ? model.detailHeight + 'px' : '780px',}">
+      <div v-if="model.flagHiddenSensitiveInfo" :style="{height:flagHiddenSensitiveInfoHeight+'px'}" style="display: flex;align-items: center;justify-content: center;">
+        <div v-html="model.hiddenSensitiveInfoReason"></div>
+      </div>
+      <div v-if="!model.flagHiddenSensitiveInfo" ref="detail" class="details-mid y-auto" @scroll="scrollHandle($event)" :style="{height: model.detailHeight ? model.detailHeight + 'px' : '780px',}">
         <div ref="midl" class="mid-l" :style="{width: model.midlWidth ? model.midlWidth + 'px' : '1200px',}">
           <!-- 图片内容部分 -->
           <div class="hous-info base-box">
@@ -484,6 +486,7 @@ export default {
       dropDownSelected: false,
       iconSort: require("../../../assets/sort.png"),
       actionRoutersKey: Math.random(),
+      flagHiddenSensitiveInfoHeight:0,
     };
   },
   mounted() {
@@ -599,6 +602,7 @@ export default {
     },
     loadFields() {
       var self = this;
+      if(!self.model.fields2Dic) return;
       self.collapse = [];
       var collapseItemArr = [];
       var col = 0;
@@ -678,7 +682,13 @@ export default {
           var w1 = this.$refs.detail.clientWidth | 0;
           var w2 = this.$refs.midr.clientWidth | 0;
           this.model.midlWidth = w1 - w2 - 10;
-		  this.showStats();
+
+		      this.showStats();
+        }
+        if(this.$refs.main){
+          var m1 = document.body.clientHeight | 0;
+          var m2 = this.$refs.header.clientHeight | 0;
+          this.flagHiddenSensitiveInfoHeight=m1-m2-this.top;
         }
       });
     },

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

@@ -2,7 +2,7 @@
   <div ref="main" class="main" v-if="model !== null">
     <div class="details-content">
       <div ref="header" class="details-head base-box mb10">
-        <div class="head-type" :style="{background:model.fields1Dic.flagActive.value=='0'?'rgba(153, 153, 153, 1)':'#ee6b6b'}">
+        <div class="head-type" :style="{background:model.fields1Dic && model.fields1Dic.flagActive && model.fields1Dic.flagActive.value=='0'?'rgba(153, 153, 153, 1)':'#ee6b6b'}">
           {{ model.fields1Dic.Trade.value }}
         </div>
         <div class="head-info">
@@ -66,7 +66,10 @@
           </div>
         </div>
       </div>
-      <div ref="detail" class="details-mid y-auto" @scroll="scrollHandle($event)" :style="{height: model.detailHeight ? model.detailHeight + 'px' : '780px',}">
+      <div v-if="model.flagHiddenSensitiveInfo" :style="{height:flagHiddenSensitiveInfoHeight+'px'}" style="display: flex;align-items: center;justify-content: center;">
+        <div v-html="model.hiddenSensitiveInfoReason"></div>
+      </div>
+      <div v-if="!model.flagHiddenSensitiveInfo" ref="detail" class="details-mid y-auto" @scroll="scrollHandle($event)" :style="{height: model.detailHeight ? model.detailHeight + 'px' : '780px',}">
         <div ref="midl" class="mid-l" :style="{ width: model.midlWidth ? model.midlWidth + 'px' : '1200px',}">
           <div class="hous-info base-box">
             <div class="info-conten">
@@ -480,6 +483,7 @@ export default {
       dropDownSelected: false,
 	    iconSort: require("../../../assets/sort.png"),
       actionRoutersKey: Math.random(),
+      flagHiddenSensitiveInfoHeight:0,
     };
   },
   mounted() {
@@ -606,6 +610,7 @@ export default {
     },
     loadFields() {
       var self = this;
+      if(!self.model.fields2Dic) return;
       self.collapse = [];
       var collapseItemArr = [];
       var col = 0;
@@ -687,6 +692,11 @@ export default {
           this.model.midlWidth = w1 - w2 - 10;
           this.showStats();
         }
+        if(this.$refs.main){
+          var m1 = document.body.clientHeight | 0;
+          var m2 = this.$refs.header.clientHeight | 0;
+          this.flagHiddenSensitiveInfoHeight=m1-m2-this.top;
+        }
       });
     },
     handleSelect(key, keyPath) {

package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -42,9 +42,12 @@
           </div>
           <div v-if="model.fields1Dic.PropertyDepict && model.fields1Dic.PropertyDepict.value !== ''" v-html="model.fields1Dic.PropertyDepict.value"
           style="font-weight: bold;font-size: 13px; margin-top: 10px;background: rgb(236, 249, 255); flex: 1;align-items: center;padding: 5px;border-radius: 5px;    word-break: break-all;">
+          </div>
         </div>
+        <div v-if="model.flagHiddenSensitiveInfo" style="display: flex;align-items: center;justify-content: center;margin-top: 50%;height: 0px;">
+          <div v-html="model.hiddenSensitiveInfoReason"></div>
         </div>
-        <div style="margin-top: 16px;display: flex;height: 65px;border: 1px solid #ECEFF2;box-shadow: 0 2px 4px 0 rgba(0,0,0,0.06);border-radius: 6px;text-align: center;">
+        <div v-if="!model.flagHiddenSensitiveInfo" style="margin-top: 16px;display: flex;height: 65px;border: 1px solid #ECEFF2;box-shadow: 0 2px 4px 0 rgba(0,0,0,0.06);border-radius: 6px;text-align: center;">
           <div style="width: 33.33%;">
             <div style="margin-top: 13px;font-size: 12px;">{{model.fields1Dic.Area.label.replace('：','')}}</div>
             <div style="margin-top: 7px;font-size: 14px;font-weight: Bold;color: #EE6B6B;">{{model.fields1Dic.Area.value}}{{model.fields1Dic.Area.unitName}}</div>
@@ -58,10 +61,10 @@
             <div style="margin-top: 7px;font-size: 14px;font-weight: Bold;color: #EE6B6B;">{{model.fields1Dic.FloorName.value}}</div>
           </div>
         </div>
-        <div ref="contact" id="contact" style="margin-top: 16px;" v-if="model.contactApiRouter!==null">
+        <div ref="contact" id="contact" style="margin-top: 16px;" v-if="!model.flagHiddenSensitiveInfo && model.contactApiRouter!==null">
           <ct-contact :key="refreshKey" :apiRouter="model.contactApiRouter" :api="model.contactApiRouter.action" :apiParam="model.contactApiRouter.getSearchPara()"></ct-contact>
         </div>
-        <div ref="routers" v-if="model.actionRoutersSimple!==null" style="margin-top: 16px;display: flex;">
+        <div ref="routers" v-if="!model.flagHiddenSensitiveInfo && model.actionRoutersSimple!==null" style="margin-top: 16px;display: flex;">
           <component v-for="(router, index) in model.actionRoutersSimple.slice(0,showIndex>0?showIndex:model.actionRoutersSimple.length)" :key="index"
                      :ref="'routers'+index"
                      v-if="!router.rightField || (model.fields1Dic[router.rightField] && model.fields1Dic[router.rightField].value == 1)"
@@ -79,10 +82,10 @@
             <span :slot="showIndex>0?'reference':''" class="more" style="margin-left: 10px;"></span>
           </el-popover> 
         </div>
-        <div ref="shortcutFollow" v-if="model.shortcutFollowForm!==undefined && model.shortcutFollowForm!==null" class="shortcutFollow" style="margin-top: 16px;">
+        <div ref="shortcutFollow" v-if="!model.flagHiddenSensitiveInfo && model.shortcutFollowForm!==undefined && model.shortcutFollowForm!==null" class="shortcutFollow" style="margin-top: 16px;">
           <ct-form :source="model.shortcutFollowForm" @submit="saveShortcutFollow"></ct-form>
         </div>
-        <div class="tablist-info base-box">
+        <div v-if="!model.flagHiddenSensitiveInfo" class="tablist-info base-box">
           <div class="details-tabs-box">
             <el-tabs :value="model.activeIndex1" @tab-click="handleSelect">
               <el-tab-pane v-for="(col, index) in model.tags1" :key="col.appID"
@@ -198,7 +201,7 @@
           if(self.$refs.routers){
             totalWidth=self.$refs.routers.offsetWidth;
           }
-          if(self.model.actionRoutersSimple!==null){
+          if(self.model && self.model.actionRoutersSimple){
             self.model.actionRoutersSimple.forEach((v,i) => {
               if(!v.rightField || (self.model.fields1Dic[v.rightField] && self.model.fields1Dic[v.rightField].value == 1)){
                 if(self.$refs['routers'+i] && self.$refs['routers'+i].length>0 && self.$refs['routers'+i][0] && self.$refs['routers'+i][0].$el){
@@ -221,6 +224,7 @@
       },
       loadFields() {
         var self = this;
+        if(!self.model.fields2Dic) return;
         self.collapse=[];
         var collapseItemArr = [];
         var col=0;

package/src/centaline/loader/src/ctl/Detail.js

@@ -69,6 +69,18 @@ const Detail = function (source, para, callBack) {
       get title() {
         return data.title;
       },
+      get flagHiddenSensitiveInfo() {
+        return data.flagHiddenSensitiveInfo;
+      },
+      set flagHiddenSensitiveInfo(v) {
+        data.flagHiddenSensitiveInfo=v;
+      },
+      get hiddenSensitiveInfoReason() {
+        return data.hiddenSensitiveInfoReason;
+      },
+      set hiddenSensitiveInfoReason(v) {
+        data.hiddenSensitiveInfoReason=v;
+      },
       get fields1() {
         return data.fields1;
       },

package/src/main.js

@@ -13,7 +13,7 @@ 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.25.10.63:9999/v1/form/router",
+  // baseUrl: "http://10.25.10.63:9999/v1/form/router",
   // baseUrl: "http://10.88.22.42:9999/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
   // baseUrl: "http://10.88.22.40:8080/api/",
@@ -44,7 +44,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '3ba3f510-93fd-4103-9249-73c13f3f6fc2',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgkAQRP9lazZhb9e9Wzo9sPEjCJ6QYGUEEo3x38UIHb2vmGReM_OCYTpDAX4BN2KltgXciJWaSMyTVrg3H1FUGAPFgFE0yrGsOB5KyKB93KAg9crqWDWDvhl_wvmdfcU0tPdT-_zHuevYz7POMRHnHTZdYJQgOQZLhEkvJnO13Cd4fwAAAP__.ZcU7DcrdnOJOI8uvg7C4vmkNyMWpO44tMwKK4jf2ERI',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZMw7DizQ6cLNh6CsGFJsDICicZ4d9FAR-8rXvGb_14wzhFK0BXc0UZjK7ijjYaITUlqPJoGZGGHnoLHwBL4XNUunCrIID1uUJKo5izqLIOhnX6DmOTuO8xjul_S8x9x12lYbpeY2JnvsVdPyDE5jFYYprY7kKOiW7rh_QEAAP__.5JCaEz5Jd4ZZk9bHH5f2BtSoZLapz5MX2JzWPHwZapA',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',