centaline-data-driven 1.2.23 → 1.2.24

package/package.json

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

package/src/centaline/css/common.css

@@ -772,7 +772,7 @@ html {
 
 .el-message__content{
   white-space: pre-line;
-  line-height: 20px;
+  line-height: 20px!important;
 }
 .details-mid .st-serach-screen,.details-mid .ct-searchtable{
   border-radius: initial;

package/src/centaline/dynamicDetail/src/dynamicContactList.vue

@@ -7,9 +7,14 @@
                 v-if="apiRouter!==null && !flagLook" :is="apiRouter.is" :vmodel="apiRouter" 
                 @click="lookOwner(apiRouter,$event)"></component>
             <div class="contacts-tips" v-else>
-                <button class="el-button el-button--primary el-button--mini max-btn-add">新增联系人</button>
+                <!-- <button class="el-button el-button--primary el-button--mini max-btn-add">新增联系人</button>
                 <button class="el-button el-button--primary el-button--mini max-btn-add">通话记录</button>
-                <button class="el-button el-button--primary el-button--mini max-btn-add">查看历史号码</button>
+                <button class="el-button el-button--primary el-button--mini max-btn-add">查看历史号码</button> -->
+                <component class="el-button el-button--primary el-button--mini max-btn-add" 
+                v-if="model && model.buttons!==null && model.buttons.length>0" 
+                v-for="(col, index) in model.buttons" :key="index"
+                :is="col.is" :vmodel="col" 
+                @click="fieldClickHandler(col,$event)"></component>
             </div>
         </div>
         <!-- 表格 -->
@@ -106,7 +111,7 @@
         opening:'first',      
       }
     },
-    mounted() {      
+    mounted() {    
     },
     activated() {
       this.$nextTick(() => {
@@ -126,8 +131,8 @@
         var self = this; 
         var submitData=router.getActionPara({}).para;
         router.doAction(submitData, (res) => {
-          if (res.rtnCode === Enum.ReturnCode.Successful) {
-            self.loaderObj.ContactList(res.content,null,self.load);
+          if (res.rtnCode === 200) {
+            self.loaderObj.ContactList(res,null,self.load);
             self.flagLook = true;
           }
         });
@@ -146,11 +151,11 @@
         var self = this;
         var callBack=null;
         let submitData={};
-        var router = this.model.actionRouters.find((v) => {
+        var router = this.model.buttons.find((v) => {
           return v.id === field.id;
         });
-        if(router==undefined && this.model.actionRoutersMoreList){
-          router = this.model.actionRoutersMoreList.find((v) => {
+        if(router==undefined && this.model.actionRouter){
+          router = this.model.actionRouter.find((v) => {
             return v.id === field.id;
           });
         }

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

@@ -189,6 +189,17 @@
                   <div>该房源共<span class="red-text">{{model.fields1Dic.LookCustomerCount.value}}</span>位客户看房</div>
                   <div>最近7天带看<span class="red-text">{{model.fields1Dic.CustomerLookCount7.value}}</span>次,总带看<span class="red-text">{{model.fields1Dic.CustomerLookCountAll.value}}</span>次。</div>
               </div>
+              <div v-if="model.operationList!==null" :key="model.operationKey" class="operation-table base-box">
+                <div v-for="(col, index) in model.operationList" :key="index" class="table-box">
+                  <div class="t-item">
+                    <span class="i">{{col.operationName}}</span>
+                  </div>
+                  <div class="t-item"><span class="i" :class="'operation'+col.flagKey">{{col.desc}}</span></div>
+                  <div class="t-item" style="height: 50px;">
+                    <component class="el-button t-but el-button--info max-info" v-if="col.router && col.router.show" :is="col.router.is" :vmodel="col.router" :api="model.optionApi" @click="fieldClickHandler(col.router,$event)"></component>
+                  </div>
+                </div>                  
+              </div>
               <div class="staff-info base-box">
                 <el-tabs :value="model.activeIndex2" @tab-click="handleClick">
                   <el-tab-pane v-for="(col, index) in model.tags2" :key="col.appID" 
@@ -221,17 +232,6 @@
                   </el-tab-pane>
                 </el-tabs>
               </div>
-              <div v-if="model.operationList!==null" :key="model.operationKey" class="operation-table base-box">
-                <div v-for="(col, index) in model.operationList" :key="index" class="table-box">
-                  <div class="t-item">
-                    <span class="i">{{col.operationName}}</span>
-                  </div>
-                  <div class="t-item"><span class="i" :class="'operation'+col.flagKey">{{col.desc}}</span></div>
-                  <div class="t-item" style="height: 50px;">
-                    <component class="el-button t-but el-button--info max-info" v-if="col.router && col.router.show" :is="col.router.is" :vmodel="col.router" :api="model.optionApi" @click="fieldClickHandler(col.router,$event)"></component>
-                  </div>
-                </div>                  
-              </div>
               <div class="customer">
                   <div class="customer-title">
                       匹配客户

package/src/centaline/dynamicPhotoSelectList/src/dynamicPhotoSelectList.vue

@@ -107,6 +107,7 @@
           });
           self.FlagPhoto = true;
           self.imageList = sourceRows;
+          //self.imageList=[{thumbnailUrl:'lmg.jj20.com/up/allimg/tp01/1ZZH250054149-0-lp.jpg',mediaUrl:'lmg.jj20.com/up/allimg/tp01/1ZZH250054149-0-lp.jpg'}];
         } catch (e) {
           self.$message.warning(e);
         }
@@ -139,7 +140,7 @@
         if (this.chooseList && this.chooseList.length > 0) {
           this.$emit('handlePhoto', this.chooseList);
         } else {
-          self.$message.warning("请选择至少一张图片");
+          this.$message.warning("请选择至少一张图片");
         }
         
       },

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

@@ -7,8 +7,60 @@ import Vue from 'vue';
 const ContactList = function (source,para ,callBack) {
   var init = function (data) {
     var rtn = {
-        $vue: null,
-        
+      $vue: null,        
+      _buttons: null,
+      _actionRouter: null,
+      _rowRouter: null,
+      get buttons() {
+        if (rtn._buttons !== null) {
+          return rtn._buttons;
+        }
+        else {
+          if (source.content.toolButtons) {
+            rtn._buttons = [];
+            source.content.toolButtons.forEach((v) => {
+              var button = Router(v);
+              button.is = "ct-btn";
+              button.attrs = { size: "mini", class: 'max-btn-gray' }
+              rtn._buttons.push(button);
+            });
+          }
+          return rtn._buttons;
+        }
+      },      
+      get actionRouter() {
+        if (rtn._actionRouter !== null) {
+          return rtn._actionRouter;
+        }
+        else {
+          rtn._actionRouter = [];
+          if (source.content.actionRouters) {
+            source.content.actionRouters.forEach((v) => {
+              var router = Router(v);
+              //router.is = "ct-btn";
+              //router.attrs = { size: "mini" }
+              rtn._actionRouter.push(router);
+            });
+          }
+          return rtn._actionRouter;
+        }
+      },
+      get rowRouter() {
+        if (rtn._rowRouter !== null) {
+          return rtn._rowRouter;
+        }
+        else {
+          rtn._rowRouter = [];
+          if (rtn.actionRouter) {
+            rtn.actionRouter.forEach((v) => {
+              if (v.show) {
+                rtn._rowRouter.push(v);
+              }
+            });
+          }
+          return rtn._rowRouter;
+        }
+      },
     };
     return rtn;
   }
@@ -25,7 +77,10 @@ const ContactList = function (source,para ,callBack) {
     );
   }
   else {
-    return init(source);
+    var rtn = init(source);
+    if (callBack) {
+      callBack(rtn);
+    }
   }
 }
 export default ContactList;