centaline-data-driven 1.2.53 → 1.2.56

package/package.json

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

package/src/Form.vue

@@ -1,9 +1,9 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :api="'/api/third-dept-tran/profit-return/applyUI'" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form>
+    <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <!--<ct-form :api="'/api/form/formdata/contractDetail'" :apiParam="apiParam"></ct-form>-->
+    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -17,7 +17,7 @@
         // apiParam: {profitReturnId: "1504359257134055426", actionType: 1, pageStyle: 2, pageTitle: "查看返利", pageOnly: true} ,
         // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
         // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
-        apiParam: {actionType: "2", propertyID: "", estateID: "1", buildingID: "1", floorID: "1", roomNo: "1504",tradeID: "100"}
+        apiParam: {originalTraId: "1516290587463507969", actionType: "3", pageStyle: "2", pageTitle: "成交报告",pageOnly: "true"}
       }
     },
     methods: {

package/src/centaline/css/common.css

@@ -804,5 +804,9 @@ html {
   line-height: 26px;
 }
 
+.el-popoverabsolute{
+  position: absolute !important;
+  top: 20px !important;
+}
 
 

package/src/centaline/dynamicBtn/src/dynamicBtn.vue

@@ -34,30 +34,31 @@
              <div>{{model.label}}</div>
              <div style="color:red;font-weight:700;">{{model.subText}}</div>             
   </el-button>
-  <el-button v-else-if="model.isCallTel"
+  <el-button v-else-if="model.isCallTel" :id="model.id"
     :type="model.isHyperLink ? 'text' : 'primary'"
     v-bind="model.attrs" @click="clickHandle"
-    :style="{color:model.textColor,backgroundColor:model.bgColor,borderColor:model.borderColor}"
+    :style="{color:model.textColor,backgroundColor:model.imgUrl?'transparent':model.bgColor,borderColor:model.imgUrl?'transparent':model.borderColor,padding:model.imgUrl?'0px':null}"
     :icon="model.icon"
     :disabled="model.disabled || model.locked">
-    <el-popover :ref="'popover'+model.id" :append-to-table="option.appendId?option.appendId:''" 
-    class="Stats-popover" popper-class="el-popover1" :placement="option.placement?option.placement:'left'" 
-    v-model="visible"
-    :trigger="option.trigger?option.trigger:''">
-    <div style="border-bottom:none">
-      <div style="color: #388cd3;text-align: center;">{{message}}</div>
-      <img v-show="qrCode" :src="qrCode" style="margin-top: 5px;" :style="{'width':width+'px','height':height+'px'}" />
-    </div>
-    <span slot="reference">{{model.label}}</span>
-  </el-popover>
+    <el-popover :ref="'popover'+model.id" :append-to-body="false"
+      class="Stats-popover" :popper-class="flagAbsolute?'el-popoverabsolute':'el-popover1'" :placement="option.placement?option.placement:'left'" 
+      v-model="visible" :trigger="option.trigger?option.trigger:''">
+      <div style="border-bottom:none">
+        <div style="color: #388cd3;text-align: center;">{{message}}</div>
+        <img v-show="qrCode" :src="qrCode" style="margin-top: 5px;" :style="{'width':width+'px','height':height+'px'}" />
+      </div>
+      <img v-if="model.imgUrl" slot="reference" :title="model.label" :src="tellImgUrl?tellImgUrl:model.imgUrl" height="24px" />
+      <span v-else slot="reference">{{model.label}}</span>
+    </el-popover>
   </el-button>
   <el-button v-else 
     :type="model.isHyperLink ? 'text' : 'primary'"
     v-bind="model.attrs" @click="$emit('click',model)"
-    :style="{color:model.textColor,backgroundColor:model.bgColor,borderColor:model.borderColor}"
+    :style="{color:model.textColor,backgroundColor:model.imgUrl?'transparent':model.bgColor,borderColor:model.imgUrl?'transparent':model.borderColor,padding:model.imgUrl?'0px':null}"
     :icon="model.icon"
     :disabled="model.disabled || model.locked">
-    {{model.label}}
+    <img v-if="model.imgUrl" :title="model.label" :src="model.imgUrl" height="24px"/>
+     <span v-else>{{model.label}}</span>
   </el-button>
 </template>
 <script>
@@ -68,6 +69,7 @@
       vmodel: Object,
       fileData: Object,
       optionApi:String,
+      flagAbsolute:Boolean,
     },
     mixins: [dynamicElement],
     data: function () {
@@ -77,10 +79,11 @@
         qrCode:'',
         width:300,
         height:300,
+        tellImgUrl:'',
         option: {
           isHidden: true,//是否开启操作栏隐藏设置，默认开启
           showNum: 3,//如果isHidden为true时，个数大于3就会隐藏，默认是3
-          appendId: '',//将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
+          appendId: '.el-button',//将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
           trigger: 'manual',//触发方式，传值可查看Popper UI组件trigger属性
           placement: 'bottom-start',//方向，传值可查看Popper UI组件placement属性
         },
@@ -138,6 +141,7 @@
         if(this.model.isCallTel){
           if(this.visible){
             this.visible=false;
+            this.tellImgUrl='';
           }
           else{
             this.$emit('click',this.model);
@@ -150,16 +154,19 @@
       callTelClick(data){
         this.message='';
         this.qrCode='';
+        this.tellImgUrl='';
         if(data.content.actionType=='显示消息'){
           this.visible=true;
           this.message=data.content.message;
+          if(data.content.imgUrl)this.tellImgUrl=data.content.imgUrl;
         }
         else if(data.content.actionType=='扫码拨号'){
           this.visible=true;
           this.message=data.content.message;
-          this.qrCode='data:image/png;base64,' + data.content.qrCode;
+          this.qrCode = data.content.qrCode;
           if(data.content.width)this.width=data.content.width;
           if(data.content.height)this.height=data.content.height;
+          if(data.content.imgUrl)this.tellImgUrl=data.content.imgUrl;
         }
       },
     }

package/src/centaline/dynamicContact/src/dynamicContact.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="apiRouter!=={} && model && model.listData.length>0" style="border: 1px solid #ECEFF2;box-shadow: 0 2px 4px 0 rgba(0,0,0,0.06);border-radius: 6px;
   padding-bottom: 10px;padding-top: 10px;padding-left: 10px;display: flex;font-size: 12px;">
-    <div class="ct-so" style="width:180px;">        
+    <div class="ct-so" style="width:auto;margin-right: 10px;">        
       <el-popover ref="pop" placement="bottom-start" v-model="showDrop" trigger="click">
         <div>
           <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
@@ -18,8 +18,8 @@
       </span>
     </div>
     <div style="margin-left: 5px;display: flex;">
-      <component v-for="(router, index) in model.rowRouter" :key="index" :ref="'router'+router.id"
-      v-if="!router.rightField || model.listData[model.value][router.rightField] == 1"
+      <component v-for="(router, index) in model.rowRouter" :key="index" :ref="'router'+router.id" :flagAbsolute="true"
+      v-if="!router.rightField || model.listData[model.value][router.rightField] == 1" :style="{position: router.isCallTel ?'relative':null}"
       :is="router.is" :vmodel="router" :api="model.optionApi" @click="fieldClickHandler(router)">
       </component>
     </div>

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

@@ -177,9 +177,10 @@
                   <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"><span class="i" :class="'operation'+col.flagKey" :style="{color:col.descColor}">{{col.desc}}</span></div>
                   <div class="t-item" style="min-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>
+                    <component v-for="(router, routerIndex) in col.routers" :key="routerIndex" :is="router.is" :vmodel="router" :api="model.optionApi" 
+                    @click="fieldClickHandler(router,$event)" class="el-button t-but el-button--info max-info"></component>
                   </div>
                 </div>                  
               </div>
@@ -594,10 +595,10 @@
   }
 </script>
 <style lang="scss" scoped>
-.operation0{
+.operation0,.operation20,.operation-1000{
   color: #000000;
 }
-.operation1{
+.operation1,.operation10{
   color: #388cd3;
 }
 .operation2{

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

@@ -27,8 +27,8 @@
             <span>{{model.fields1Dic.DistrictName.value}}</span>
             <span>{{model.fields1Dic.AreaName.value}}</span>
           </div>
-          <div style="margin-top: 7px;display: flex;">
-            <div v-for="(tag, index) in model.actionRouterLabel" :key="index" class="t-tag"
+          <div style="display: flex;flex-wrap: wrap;">
+            <div v-for="(tag, index) in model.actionRouterLabel" :key="index" class="t-tag" style="margin-top: 7px;"
             :style="{color:tag.textColor,backgroundColor:tag.bgColor,borderColor:tag.borderColor}">
             {{tag.label}}
             </div>
@@ -48,7 +48,7 @@
             <div style="margin-top: 7px;font-size: 14px;font-weight: Bold;color: #EE6B6B;">{{model.fields1Dic.FloorName.value}}</div>
           </div>
         </div>
-        <div ref="contact" style="margin-top: 16px;" v-if="model.contactApiRouter!==null" >
+        <div ref="contact" id="contact" style="margin-top: 16px;" v-if="model.contactApiRouter!==null" >
           <ct-contact :apiRouter="model.contactApiRouter" :api="model.contactApiRouter.action" :apiParam="model.contactApiRouter.getSearchPara()"></ct-contact>
         </div>
         <div ref="routers" style="margin-top: 16px;display: flex;">
@@ -152,11 +152,13 @@
           let moreWidth = 20;
           self.model.actionRoutersSimple.forEach((v,i) => {
             if(!v.rightField || (self.model.fields1Dic[v.rightField] && self.model.fields1Dic[v.rightField].value == 1)){
-              if(sumWidth+self.$refs['routers'+i][0].$el.offsetWidth+moreWidth+10>totalWidth && self.showIndex===0){
-                self.showIndex=i;
-              }
-              else{
-                sumWidth=sumWidth+self.$refs['routers'+i][0].$el.offsetWidth+(i>0?10:0);
+              if(self.$refs['routers'+i][0] && self.$refs['routers'+i][0].$el){
+                if(sumWidth+self.$refs['routers'+i][0].$el.offsetWidth+moreWidth+10>totalWidth && self.showIndex===0){
+                  self.showIndex=i;
+                }
+                else{
+                  sumWidth=sumWidth+self.$refs['routers'+i][0].$el.offsetWidth+(i>0?10:0);
+                }
               }
             }
           });

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -105,7 +105,7 @@
       var self = this;
       return {
         loading: true,
-        activeName: '0',
+        activeName: '-1',
         collapse: [],//分组数组
         collapseActiveNames: [],//默认展开的分组name
         collapseFieldsRow: [],//分组数组对应的行列布局
@@ -172,6 +172,9 @@
           }
           else if (v.is === 'ct-group') {
             self.collapse.push(v);
+            if(v.isExpand && self.activeName=='-1'){
+              self.activeName=(self.collapse.length-1).toString();
+            }
             if (v.lock || v.isExpand) {
               realCollapseActiveNames.push(self.collapse.length - 1);
             }
@@ -186,10 +189,11 @@
             collapseItem.push(v);
           }
         });
+        if(self.activeName==='-1')self.activeName='0';
         if (collapseItem.length > 0) {
           collapseItemArr.push(collapseItem);
         }
-
+        
         //遍历分组里的组件，计算行列布局
         for (var i = 0; i < collapseItemArr.length; i++) {
           var myFilter = collapseItemArr[i];

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

@@ -306,6 +306,7 @@ const Detail = function (source,para ,callBack) {
                       rtn._operationList=response.content;
                       if(rtn._operationList && rtn._operationList.length>0){
                         rtn._operationList.forEach((v,i) => {
+                          rtn._operationList[i].routers=[];
                           if (v.modelRouters) {
                             v.modelRouters.forEach((f,i2) => {
                               var router = Router(f);
@@ -314,7 +315,10 @@ const Detail = function (source,para ,callBack) {
                               if(router.rightField){
                                 router.show=v[router.rightField];
                               } 
-                              if(router.show)rtn._operationList[i].router=router;
+                              if(router.show){
+                                // rtn._operationList[i].router=router;
+                                rtn._operationList[i].routers.push(router);
+                              }
                               rtn._operationRouters.push(router);
                             });
                           }

package/src/main.js

@@ -13,8 +13,7 @@ Vue.use(ElementUI, { size: 'mini'});
 Vue.config.productionTip = false;
 Vue.use(centaline, {
   baseUrl: "http://10.88.22.46:7070/v1/form/router",
-  // baseUrl: "http://tjcptest.centaline.com.cn/",  
-  // baseUrl: "http://10.88.22.46:7070/", 
+  // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // flagRouterSelf: true,
   zindex: 999,
   showRequestErrorMessage: true,
@@ -36,7 +35,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'fd2b9945-9709-4608-a57b-13a8ad61030a',
+        oldToken: '1c37d6b7-9259-4835-88f6-a389900244f7',
         estateId: '20210729104021C49F04B55C50F6AF58',
         originalRequestURL: 'http://10.88.22.67:8080',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE0NmU5ZjEzLTVjMmYtNGVlMy1hM2U5LWIxM2QyZThjZTBhZSJ9.Gl8K5lbG7t5DyCqouu7Ux7Oh9xuAxqdOXr4JnoHCN-YwC3b2zPO-C2sHbYJUZHYQPa7kTNRmg1xJiwugpVo5Xw',