centaline-data-driven 1.3.21 → 1.3.22

package/package.json

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

package/src/centaline/css/common.css

@@ -829,3 +829,7 @@ html {
   display: inline-block;
 }
 
+.ml10{
+  margin-left: 10px;
+}
+

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

@@ -101,31 +101,23 @@
                 />
                 <div class="info-row mb20 mt5">
                   <div class="row-i">
-                    <span>{{ model.fields1Dic.Price.label }}</span
-                    ><span
-                      class="base-clolr expand-f"
-                      v-html="model.fields1Dic.Price.value"
-                    ></span
-                    ><span class="base-clolr">{{
-                      model.fields1Dic.Price.unitName
-                    }}</span>
-                    <img src="../../../assets/jsq.png" class="img-jsq" alt="" />
+                    <span>{{ model.fields1Dic.Price.label }}</span>
+                    <span class="base-clolr expand-f" v-html="model.fields1Dic.Price.value"></span>
+                    <span class="base-clolr">{{model.fields1Dic.Price.unitName}}</span>                    
+                    <component v-if="model.actionRouterPrice" class="ml10" style="display: flex;"
+                      :is="model.actionRouterPrice.is" :vmodel="model.actionRouterPrice" :api="model.optionApi" 
+                      @click="fieldClickHandler(model.actionRouterPrice, $event)">
+                    </component>
                   </div>
                   <div class="row-i">
-                    <span>{{ model.fields1Dic.PriceUnit.label }}</span
-                    ><span
-                      class="base-clolr expand-f"
-                      v-html="model.fields1Dic.PriceUnit.value"
-                    ></span
-                    ><span class="base-clolr">{{
-                      model.fields1Dic.PriceUnit.unitName
-                    }}</span>
+                    <span>{{ model.fields1Dic.PriceUnit.label }}</span>
+                    <span class="base-clolr expand-f" v-html="model.fields1Dic.PriceUnit.value"></span>
+                    <span class="base-clolr">{{model.fields1Dic.PriceUnit.unitName}}</span>
                   </div>
                   <div v-if="model.fields1Dic.PriceLine" class="row-i">
                     <span>{{ model.fields1Dic.PriceLine.label }}</span>
                     <div>
-                      {{ model.fields1Dic.PriceLine.value
-                      }}{{ model.fields1Dic.PriceLine.unitName }}
+                      {{ model.fields1Dic.PriceLine.value}}{{ model.fields1Dic.PriceLine.unitName }}
                     </div>
                   </div>
                 </div>
@@ -691,14 +683,9 @@ export default {
       var self = this;
       var callBack = null;
       let submitData = {};
-      var router = this.model.actionRouters.find((v) => {
+      var router = this.model.actionRoutersAll.find((v) => {
         return v.id === field.id;
       });
-      if (router == undefined && this.model.actionRoutersMoreList) {
-        router = this.model.actionRoutersMoreList.find((v) => {
-          return v.id === field.id;
-        });
-      }
       if (router == undefined && this.model.otherTradeActionRouter) {
         if (field.id === this.model.otherTradeActionRouter.id) {
           router = this.model.otherTradeActionRouter;

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

@@ -19,16 +19,9 @@
             <img :src="model.fields1Dic.LocationUrl.value" alt="" class="location"/>
           </div>
           <div class="title-tags">
-            <div
-              class="t-tag"
-              v-for="(tag, index) in model.actionRouterLabel"
-              :key="index"
-              :style="{
-                color: tag.textColor,
-                backgroundColor: tag.bgColor,
-                borderColor: tag.borderColor,
-              }"
-            >
+            <div class="t-tag"
+              v-for="(tag, index) in model.actionRouterLabel"  :key="index"
+              :style="{ color: tag.textColor, backgroundColor: tag.bgColor,borderColor: tag.borderColor,}">
               {{ tag.label }}
             </div>
           </div>
@@ -38,49 +31,21 @@
         </div>
         <div class="head-but">
           <div>
-            <component
-              v-if="model.otherTradeActionRouter !== null"
-              v-bind="model.otherTradeActionRouter"
-              class="max-default w93"
-              :is="model.otherTradeActionRouter.is"
-              :vmodel="model.otherTradeActionRouter"
-              :api="model.optionApi"
-              @click="fieldClickHandler(model.otherTradeActionRouter, $event)"
-            ></component>
-            <img
-              :class="{ domDisabled: flagDisabledPrev }"
-              @click="clickPrevHandler"
-              src="../../../assets/T.png"
-              alt=""
-              style="
-                width: 26px;
-                height: 26px;
-                vertical-align: bottom;
-                margin-left: 20px;
-                cursor: pointer;
-              "
-            />
-            <img
-              :class="{ domDisabled: flagDisabledNext }"
-              @click="clickNextHandler"
-              src="../../../assets/B.png"
-              alt=""
-              style="
-                width: 26px;
-                height: 26px;
-                vertical-align: bottom;
-                margin-left: 15px;
-                margin-right: 13px;
-                cursor: pointer;
-              "
-            />
+            <component v-if="model.otherTradeActionRouter !== null" v-bind="model.otherTradeActionRouter" class="max-default w93"
+              :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi"
+              @click="fieldClickHandler(model.otherTradeActionRouter, $event)">
+            </component>
+            <img :class="{ domDisabled: flagDisabledPrev }" @click="clickPrevHandler"
+              src="../../../assets/T.png" alt=""
+              style=" width: 26px; height: 26px;vertical-align: bottom; margin-left: 20px;cursor: pointer;"/>
+            <img :class="{ domDisabled: flagDisabledNext }" @click="clickNextHandler"
+              src="../../../assets/B.png" alt=""
+              style=" width: 26px; height: 26px;vertical-align: bottom; margin-left: 15px; margin-right: 13px; cursor: pointer;"/>
           </div>
           <div class="mt5">
             <component
               class="max-report w93"
-              v-if="
-                model.actionRouters !== null && model.actionRouters[0] !== null
-              "
+              v-if=" model.actionRouters !== null && model.actionRouters[0] !== null"
               :is="model.actionRouters[0].is"
               :vmodel="model.actionRouters[0]"
               :api="model.optionApi"
@@ -98,26 +63,14 @@
             ></component>
           </div>
           <div class="mt5">
-            <button
-              type="button"
-              class="
-                el-button el-button--info el-button--mini
-                max-report
-                rel
-                w93
-              "
-              v-if="
-                model.actionRoutersMoreList !== null &&
-                model.actionRoutersMoreList.length > 0
-              "
-            >
+            <button type="button"
+              class="el-button el-button--info el-button--mini max-report rel w93"
+              v-if=" model.actionRoutersMoreList !== null && model.actionRoutersMoreList.length > 0">
               <img src="../../../assets/dian.png" alt="" class="report" />
               <ul class="report-cont">
-                <li
-                  v-for="(col, index) in model.actionRoutersMoreList"
+                <li v-for="(col, index) in model.actionRoutersMoreList"
                   :key="index"
-                  v-if="col.show !== false"
-                >
+                  v-if="col.show !== false">
                   <component
                     class="max-report w93"
                     :is="col.is"
@@ -129,9 +82,7 @@
               </ul>
             </button>
             <component
-              v-else-if="
-                model.actionRouters !== null && model.actionRouters.length === 3
-              "
+              v-else-if=" model.actionRouters !== null && model.actionRouters.length === 3 "
               class="max-report w93"
               :is="model.actionRouters[2].is"
               :vmodel="model.actionRouters[2]"
@@ -158,7 +109,10 @@
                     <span>{{ model.fields1Dic.Price.label }}</span>
                     <span class="base-clolr expand-f" v-html="model.fields1Dic.Price.value"></span>
                     <span class="base-clolr">{{ model.fields1Dic.Price.unitName}}</span>
-                    <img src="../../../assets/jsq.png" class="img-jsq" alt="" />
+                    <component v-if="model.actionRouterPrice" class="ml10" style="display: flex;"
+                      :is="model.actionRouterPrice.is" :vmodel="model.actionRouterPrice" :api="model.optionApi" 
+                      @click="fieldClickHandler(model.actionRouterPrice, $event)">
+                    </component>
                   </div>
                   <div class="row-i">
                     <span>{{ model.fields1Dic.PriceUnit.label }}</span>
@@ -242,17 +196,8 @@
               <div style="position: relative">
                 <div ref="tabsbox" style="position: absolute; left: -10000px">
                   <el-tabs>
-                    <el-tab-pane
-                      v-for="(col, index) in model.tags1"
-                      :key="col.appID"
-                      :index="index.toString()"
-                      :name="index.toString()"
-                    >
-                      <div
-                        slot="label"
-                        v-html="col.appName"
-                        :ref="'StatisticsItem' + index"
-                      ></div>
+                    <el-tab-pane v-for="(col, index) in model.tags1" :key="col.appID" :index="index.toString()" :name="index.toString()">
+                      <div slot="label" v-html="col.appName" :ref="'StatisticsItem' + index"></div>
                     </el-tab-pane>
                   </el-tabs>
                 </div>
@@ -869,14 +814,9 @@ export default {
       var self = this;
       var callBack = null;
       let submitData = {};
-      var router = this.model.actionRouters.find((v) => {
+      var router = this.model.actionRoutersAll.find((v) => {
         return v.id === field.id;
       });
-      if (router == undefined && this.model.actionRoutersMoreList) {
-        router = this.model.actionRoutersMoreList.find((v) => {
-          return v.id === field.id;
-        });
-      }
       if (router == undefined && this.model.otherTradeActionRouter) {
         if (field.id === this.model.otherTradeActionRouter.id) {
           router = this.model.otherTradeActionRouter;
@@ -1007,9 +947,7 @@ export default {
           else if (field.isSearchPageInTab) {
             // 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
-            self.$common
-              .getDataDrivenOpts()
-              .handler.openTabSearch(field, submitData);
+            self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
           } 
           else if (field.isBrowserNewTab) {
             // 浏览器打开

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

@@ -12,6 +12,8 @@ const Detail = function (source, para, callBack) {
       _fields2Dic: null,//数组，方便遍历 
       _actionRouterLabel: null,//标签
       _otherTradeActionRouter: null,//对应另外种交易的 router 如：本盘出售 则可能对应的出租的交易，没有则为空
+      _actionRoutersAll: null,//页面上的动作行为
+      _actionRoutersShow: null,//页面上的动作行为
       _actionRouters: null,//页面上的动作行为
       _actionRoutersMoreList: null,//页面上的更多动作行为
       _actionRoutersSimple: null,//页面上的动作行为
@@ -187,23 +189,65 @@ const Detail = function (source, para, callBack) {
           return rtn._contactApiRouter;
         }
       },
+      get actionRoutersAll() {
+        if (rtn._actionRoutersAll !== null) {
+          return rtn._actionRoutersAll;
+        }
+        else {
+          if (data.actionRouters) {
+            rtn._actionRoutersAll = [];
+            data.actionRouters.forEach((v, i) => {
+              var router = Router(v);
+              router.is = "ct-btn";
+              router.attrs = { size: "mini" }
+              rtn._actionRoutersAll.push(router);
+            });
+          }
+        }
+        return rtn._actionRoutersAll;
+      },
+      get actionRoutersShow() {        
+        if (rtn._actionRoutersShow !== null) {
+          return rtn._actionRoutersShow;
+        }
+        else {
+          if (data.actionRouters) {
+            rtn._actionRoutersShow = [];
+            data.actionRouters.forEach((v, i) => {
+              var router = Router(v);
+              router.is = "ct-btn";
+              router.attrs = { size: "mini" }
+              if (router.show) {
+                rtn._actionRoutersShow.push(router);
+              }
+            });
+          }
+        }
+        return rtn._actionRoutersShow;
+      },
+      get actionRouterPrice() {
+        let routerPrice=null; 
+        if (rtn.actionRoutersAll) {
+          rtn.actionRoutersAll.forEach((v, i) => {
+            if(v.id=='PropertyPriceLog') routerPrice=v;
+          });
+        }
+        return routerPrice;
+      },
       get actionRouters() {
         if (rtn._actionRouters !== null) {
           return rtn._actionRouters;
         }
         else {
-          if (data.actionRouters) {
+          if (rtn.actionRoutersShow) {
             rtn._actionRouters = [];
             let indexMore = 1;
-            if (data.actionRouters.length <= 3) {
+            if (rtn.actionRoutersShow.length <= 3) {
               indexMore = 2;
             }
-            data.actionRouters.forEach((v, i) => {
+            rtn.actionRoutersShow.forEach((v, i) => {
               if (i <= indexMore) {
-                var router = Router(v);
-                router.is = "ct-btn";
-                router.attrs = { size: "mini" }
-                rtn._actionRouters.push(router);
+                rtn._actionRouters.push(v);
               }
             });
           }
@@ -215,14 +259,11 @@ const Detail = function (source, para, callBack) {
           return rtn._actionRoutersMoreList;
         }
         else {
-          if (data.actionRouters && data.actionRouters.length > 3) {
+          if (rtn.actionRoutersShow && rtn.actionRoutersShow.length > 3) {
             rtn._actionRoutersMoreList = [];
-            data.actionRouters.forEach((v, i) => {
+            rtn.actionRoutersShow.forEach((v, i) => {
               if (i >= 2) {
-                var router = Router(v);
-                router.is = "ct-btn";
-                router.attrs = { size: "mini" }
-                rtn._actionRoutersMoreList.push(router);
+                rtn._actionRoutersMoreList.push(v);
               }
             });
           }