centaline-data-driven 1.4.88 → 1.4.90

package/package.json

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

package/src/SearchListTab.vue

@@ -0,0 +1,63 @@
+<template>
+  <div id="app-search" style="width:100%;height:100%;position: fixed;">
+    <!-- <ct-searchlistTab :apiParam="para"
+      :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'" 
+      :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
+      :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" 
+      :searchStatsApi="'/ProfileWorklistList/getListStats'">
+    </ct-searchlistTab> -->
+
+    <!-- <ct-searchlistTab 
+      :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" 
+      :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" 
+      :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
+    </ct-searchlistTab> -->
+
+    <!-- <ct-searchlistTab :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+      :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
+      :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
+      :searchStatsApi="'/PropertyRETList/getListStats'">
+    </ct-searchlistTab> -->
+
+    <ct-searchlistTab :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
+      :searchDataApi="'/PropertyOFIList/getListOfSearchModel'"
+      :searchCategoryApi="'/PropertyOFIList/getLayoutOfSearchCategory'"
+      :searchStatsApi="'/PropertyOFIList/getListStats'">
+    </ct-searchlistTab>
+
+    <ct-dialog-list></ct-dialog-list>
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue'
+  export default {
+    name: 'DataDrivenSearchTab',
+    data() {
+      return {
+        para:{
+          chanceID: "1569617379699331072"
+        },
+      }
+    },
+    mounted() {
+    },
+    created() {
+      //模拟客户端自定义方法
+      Vue.prototype.$clientScript = {
+        open: function (data) {
+          window.open("http://wwww.baidu.com?test1=" + data.vContractID + "&test2=" + data.vReportNo, "_blank");
+        }
+      }
+    },
+  }
+</script>
+<style>
+  body {
+    height:100%;
+    overflow:hidden;
+  }
+  html {
+    height:100%;
+  }
+</style>

package/src/SearchTree.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="app-Tree" style="height:100%;position: fixed;width:100%">
-    <ct-treelist :flagsearch="true" :apiParam="apiParam" :leftWidth="'180'"
-                 :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'"
-                 :searchDataApi="'/SystemParameterCatalogList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
+    <ct-treelist :flagsearch="true" :apiParam="apiParam" :leftWidth="'280'"
+                 :searchConditionApi="'/system/menulist/getTreeLayoutOfSearch'"
+                 :searchDataApi="'/system/menulist/getTreeList'" @loaded="loaded"></ct-treelist>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>

package/src/centaline/common/index.js

@@ -339,6 +339,9 @@ const common = {
       else if (parent.$options.name === 'DataDrivenSearch') {
         return parent;
       } 
+      else if (parent.$options.name === 'DataDrivenSearchTab') {
+        return parent;
+      } 
       else if (parent.$options.name === 'DataDrivenForm') {
         return parent;
       } 

package/src/centaline/css/max.css

@@ -133,6 +133,7 @@
     display: inline-block;
     float: left;
     margin-right: 2px;
+    margin-left: -8px;
 }
 .max-fold{
     background: url(../../assets/max-fold.png)no-repeat;
@@ -142,6 +143,7 @@
     display: inline-block;
     float: left;
     margin-right: 2px;
+    margin-left: -8px;
 }
 
 .ct-tableParent::-webkit-scrollbar-thumb{

package/src/centaline/dynamicCb/src/dynamicCb.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="field-top">
-    <div v-if="model !== null" class="ct-checkbox">
+    <div v-if="model !== null" class="ct-checkbox checkboxHeight">
       <div :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
         <div v-if="model.showLabel && model.label" class="el-input-group__prepend line-feed" :class="[model.labelClass]">
           {{model.label}}
@@ -77,7 +77,7 @@
 .ct-checkbox .ct-radios .el-checkbox {
     min-width: 0px;
 }
-.ct-form .ct-checkbox {
+.ct-form .checkboxHeight {
   height: 1px;
   min-height: 28px;
 }

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

@@ -1594,7 +1594,8 @@ export default {
         align-items: center;
         justify-content: space-between;
         .list-item {
-          width: 33.3%;
+          // width: 33.3%;
+          width: 120px;
           height: 62px;
           font-size: 14px;
           text-align: center;
@@ -1628,11 +1629,12 @@ export default {
             flex-flow: column;
             align-items: flex-start;
             border-right: 1px solid #e0e0e0;
+            justify-content: center;
             .i {
-              position: absolute;
-              top: 50%;
+              // position: absolute;
+              // top: 50%;
               // left: 50%;
-              transform: translateY(-50%);
+              // transform: translateY(-50%);
             }
             .t-but {
               font-size: 12px;
@@ -1640,11 +1642,11 @@ export default {
               width: 104px;
               // height: 100%;
               // margin: 12px 16px 0 16px;
-              margin-top: 12px;
+              margin-top: 8px;
               padding: 0;
             }
             .t-but:nth-last-child(1) {
-              margin-bottom: 12px;
+              margin-bottom: 8px;
             }
           }
           .t-item:nth-last-child(1) {

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

@@ -1607,7 +1607,8 @@ export default {
         align-items: center;
         justify-content: space-between;
         .list-item {
-          width: 33.3%;
+          // width: 33.3%;
+          width:120px;
           height: 62px;
           font-size: 14px;
           text-align: center;
@@ -1641,11 +1642,12 @@ export default {
             flex-flow: column;
             align-items: flex-start;
             border-right: 1px solid #e0e0e0;
+            justify-content: center;
             .i {
-              position: absolute;
-              top: 50%;
+              // position: absolute;
+              // top: 50%;
               // left: 50%;
-              transform: translateY(-50%);
+              // transform: translateY(-50%);
             }
             .t-but {
               font-size: 12px;
@@ -1653,11 +1655,11 @@ export default {
               width: 104px;
               // height: 100%;
               // margin: 12px 16px 0 16px;
-              margin-top: 12px;
+              margin-top: 8px;
               padding: 0;
             }
             .t-but:nth-last-child(1) {
-              margin-bottom: 12px;
+              margin-bottom: 8px;
             }
           }
           .t-item:nth-last-child(1) {

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

@@ -37,6 +37,7 @@
       <div style="padding-left: 20px;padding-right: 20px;">
         <div ref="title" style="margin-top: 18px;">
           <div style="font-weight: Bold;font-size: 16px;color: #333333;display: flex;">
+            <img v-if="model.actionRouterFavorite" :src="model.actionRouterFavorite.imgUrl" alt="" @click="fieldClickHandler(model.actionRouterFavorite, $event)" class="Simplecollection" />
             <span class="cursorLink" @click="fieldClickHandler(model.actionRouterEstate, $event)">{{model.fields1Dic.EstateName.value}}</span>
             <span>{{model.fields1Dic.BuildingName.value}}</span>
             <span>{{model.fields1Dic.RoomNo.value}}</span>
@@ -56,7 +57,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;    word-break: break-all;">
+               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;">
@@ -293,6 +294,9 @@
       loadBaseInfo() {
         this.model.loadBaseInfo();
       },
+      loadFavorite() {
+        this.model.loadFavorite();
+      },
       loadqrCode() {
         this.model.loadqrCode();
       },
@@ -320,7 +324,6 @@
         if(field == null || field==undefined){
           return;
         }
-
         var self = this;
         self.handleClose();
         var callBack=null;
@@ -344,6 +347,11 @@
             });
             callBack="loadOperation";
         }
+        if (router == undefined && this.model.actionRouterFavorite) {
+          if (field.id === this.model.actionRouterFavorite.id) {
+            router = this.model.actionRouterFavorite;
+          }
+        }
         if (router == undefined && this.model.routerForQRCode) {
           if (field.id === this.model.routerForQRCode.id) {
             router = this.model.routerForQRCode;
@@ -374,6 +382,9 @@
           if(router.id=="PropertyEdit"){
             callBack="loadBaseInfo"
           }
+          else if (router.id == "Favorite") {
+            callBack = "loadFavorite"
+          }
           else if (router.id == "qrCode") {
             callBack = "loadqrCode"
           }
@@ -386,6 +397,9 @@
           else if(callBack=='loadBaseInfo'){
             this.routerClickHandler(router, submitData, self.loadBaseInfo);
           }
+          else if (callBack == 'loadFavorite') {
+            this.routerClickHandler(router, submitData, self.loadFavorite);
+          }
           else if (callBack == 'loadqrCode') {
             self.loadqrCode();
           }
@@ -465,7 +479,9 @@
                         callBack();
                       }
                       self.$common.closeDialog(dialogOption.dialog);
-                      self.$emit('simpleRouterclickHandler',field,ev);
+                      if (field.id != "Favorite") {
+                        self.$emit('simpleRouterclickHandler', field, ev);
+                      }
                     }
                   }
                 }]
@@ -493,6 +509,11 @@
                         });
                       });
                       self.$common.closeDialog(dialogOption.dialog);
+                    },
+                    closeDialog(ev) {
+                      if (field.id == "Favorite" && callBack) {
+                        callBack();
+                      }
                     }
                   }
                 }]
@@ -677,6 +698,15 @@ color: #fff;
 .drawerMore .el-icon-close:before {
     content: "\E6DB";
 }
+  .Simplecollection {
+    font-size: 18px;
+    margin-right: 10px;
+    cursor: pointer;
+    vertical-align: -2.85px;
+    width: 18px;
+    height: 18px;
+    margin-top: 2px;
+  }
 </style>
 
 

package/src/centaline/dynamicLayout/src/dynamicLayoutLabel.vue

@@ -64,4 +64,7 @@
   .wb {
     word-break: break-all;
   }
+  .mazarine{
+    color: #541a8b;
+  }
 </style>