centaline-data-driven 1.2.46 → 1.2.47

package/package.json

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

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

@@ -110,13 +110,13 @@
                       <img src="../../../assets/jsq.png" class="img-jsq" alt="">
                       </div>
                       <div class="row-i"><span>{{model.fields1Dic.PriceUnit.label}}</span><span class="base-clolr">{{model.fields1Dic.PriceUnit.value}}</span><span class="base-clolr">{{model.fields1Dic.PriceUnit.unitName}}</span></div>
-                      <div class="row-i"><span>{{model.fields1Dic.PriceLine.label}}</span><div>{{model.fields1Dic.PriceLine.value}}{{model.fields1Dic.PriceLine.unitName}}</div></div></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}}</div></div></div>
                    <div class="info-row">
-                      <div class="row-i">
+                      <div v-if="model.fields1Dic.PriceLine" class="row-i">
                         <span >{{model.fields1Dic.MarketRateOfReturn.label}}</span><span>{{model.fields1Dic.MarketRateOfReturn.value}} </span><span>{{model.fields1Dic.MarketRateOfReturn.unitName}}</span>
                       </div>                     
-                      <div class="row-i"><span>{{model.fields1Dic.EstimatePriceRent.label}}</span><div>{{model.fields1Dic.EstimatePriceRent.value}}<span>{{model.fields1Dic.EstimatePriceRent.unitName}}</span></div></div>
-                      <div class="row-i"><span>{{model.fields1Dic.EstimatePriceRentUnit.label}}</span><span>{{model.fields1Dic.EstimatePriceRentUnit.value}}</span><span>{{model.fields1Dic.EstimatePriceRentUnit.unitName}}</span></div>
+                      <div v-if="model.fields1Dic.EstimatePriceRent" class="row-i"><span>{{model.fields1Dic.EstimatePriceRent.label}}</span><div>{{model.fields1Dic.EstimatePriceRent.value}}<span>{{model.fields1Dic.EstimatePriceRent.unitName}}</span></div></div>
+                      <div v-if="model.fields1Dic.EstimatePriceRentUnit" class="row-i"><span>{{model.fields1Dic.EstimatePriceRentUnit.label}}</span><span>{{model.fields1Dic.EstimatePriceRentUnit.value}}</span><span>{{model.fields1Dic.EstimatePriceRentUnit.unitName}}</span></div>
                   </div>
                   
                     <div class="info-mid">

package/src/centaline/dynamicSearchList/src/dynamicSearchList.vue

@@ -16,11 +16,11 @@
       @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate()" 
       @showTitle="showTitleHandler"></ct-searchtable>
     </div>
-    <div v-if="flagSideBar" 
+    <div v-if="flagSideBar && flagSideBarOfData" 
     :style="{'height': pageHeight? pageHeight:'100%','width':sideBarWidth+'px',right:this.sideBarRight+'px'}" 
     class="sidebar">
       <div>1111111111111111111111111111111111</div>
-      <ct-SearchSideMenu :sideBarMenuRight="sideBarMenuRight" :sideBarSide="sideBarSide" 
+      <ct-SearchSideMenu :sideBarMenuRight="sideBarMenuRight" :sideBarStatus="sideBarStatus" 
       @sideMenuClickHandler="sideMenuClickHandler"></ct-SearchSideMenu>
     </div>
   </div>
@@ -84,12 +84,13 @@
         pageDisabled:false,
 
         flagSideBar:false,
+        flagSideBarOfData:true,
         flagDefaultDisplaySideBar:false,
         sideBarWidth:0,
         searchWidth:0,
         sideBarRight:0,
         sideBarMenuRight:0,
-        sideBarSide:'',
+        sideBarStatus:'',
       }
     },
     methods: {
@@ -111,10 +112,9 @@
         this.reloadKeyTable='t'+this.reloadKey;
       },
       search(btn) {
-        debugger
         if (this.$refs.table.model) {
           this.pageDisabled=true;
-          this.$refs.table.getPage(1);
+          this.$refs.table.getPage(1);          
         }
         else {
           this.$refs.table.searchComplate(this.$refs.screen.model);
@@ -124,6 +124,16 @@
       },
       searchComplate() {
         this.pageDisabled=false;
+        if(this.$refs.table.model.listData.length>0){
+          if(!this.flagSideBarOfData){
+            this.flagSideBarOfData=true;
+            this.sideMenuClickHandler(this.sideBarStatus =='close'?'open':'close');
+          }
+        }
+        else{
+          this.flagSideBarOfData=false;
+          this.searchWidth=0;
+        }
       },
       toolbarClickHandler(field, submitData) {
         if (field.isExport) {
@@ -151,36 +161,30 @@
           this.showTitle=this.$refs.screen.model.flagShowTitle;
         }
       },
-      tableLoaded(table) {
-        if(table.model.listData.length>0){
-          this.flagSideBar=table.model.flagSideBar;
-          this.flagDefaultDisplaySideBar=table.model.flagDefaultDisplaySideBar;
-          this.sideBarWidth=table.model.sideBarWidth;
+      tableLoaded() {
+        if(this.$refs.table.model.listData.length>0){
+          this.flagSideBar=this.$refs.table.model.flagSideBar;
+          this.flagDefaultDisplaySideBar=this.$refs.table.model.flagDefaultDisplaySideBar;
+          this.sideBarWidth=this.$refs.table.model.sideBarWidth;
           if(this.flagSideBar){
             if(this.flagDefaultDisplaySideBar){
-              this.sideBarSide='right';
-              this.sideBarRight=0;
-              this.searchWidth=this.$refs.main.clientWidth-this.sideBarWidth;
-              this.sideBarMenuRight=this.sideBarWidth-2;
+              this.sideMenuClickHandler('close');
             }
-            else{
-              this.sideBarSide='left';
-              this.sideBarRight=-this.sideBarWidth;
-              this.searchWidth=0;
-              this.sideBarMenuRight=0;
+            else{              
+              this.sideMenuClickHandler('open');
             }
           }
         }
       },
       sideMenuClickHandler(v) {
-        if(v=='right'){
-          this.sideBarSide ='left';
+        if(v=='open'){
+          this.sideBarStatus ='close';
           this.sideBarRight=-this.sideBarWidth;
           this.searchWidth=0;
           this.sideBarMenuRight=0;
         }
-        else if(v=='left'){
-          this.sideBarSide ='right';
+        else if(v=='close'){
+          this.sideBarStatus ='open';
           this.sideBarRight=0;
           this.searchWidth=this.$refs.main.clientWidth-this.sideBarWidth;
           this.sideBarMenuRight=this.sideBarWidth-2;

package/src/centaline/dynamicSearchList/src/dynamicSearchSideMenu.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="searchSideMenu toggler" :style="{right:sideBarMenuRight+'px'}" @click="clickHandler()" >
-    <span class="el-icon-arrow-right" v-show="side=='right'"></span> 
-    <span class="el-icon-arrow-left" v-show="side=='left'"></span>
+    <span class="el-icon-arrow-right" v-show="side=='open'"></span> 
+    <span class="el-icon-arrow-left" v-show="side=='close'"></span>
   </div>
 </template>
 <script>
@@ -9,23 +9,23 @@
     name: 'ct-SearchSideMenu',
     props: {
       sideBarMenuRight: Number,
-      sideBarSide: String,
+      sideBarStatus: String,
     },
     data() {
       return {
-        side:'right',
+        side:'open',
       }
     },
     created() {
-      if(this.sideBarSide){
-        this.side = this.sideBarSide;
+      if(this.sideBarStatus){
+        this.side = this.sideBarStatus;
       }
     },
     methods: {
       clickHandler() {
         let v=this.side;
-        if(v=='right')this.side ='left';
-        if(v=='left')this.side ='right';
+        if(v=='close')this.side ='open';
+        else if(v=='open')this.side ='close';
         this.$emit('sideMenuClickHandler',v);
       },
     }

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -235,7 +235,7 @@
         this.model.scripts.formData = this.model.formData;
         this.model.scripts.formData.formTable = this.model;
 
-        self.$emit('loaded',self);
+        self.$emit('loaded');
         self.$emit('showTitle');
         if (this.tempSearchModel !== null) {
           self.model.searchModel = this.tempSearchModel;
@@ -375,7 +375,7 @@
             self.tableLoading = false;
             self.rowColorChange();
           }
-          self.$emit('searchComplate',self);
+          self.$emit('searchComplate');
         }
         self.tableLoading = true;