centaline-data-driven 1.2.44 → 1.2.47

package/package.json

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

package/src/SearchList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="app-search" style="height:100%;position: fixed;">
+  <div id="app-search" style="width:100%;height:100%;position: fixed;">
     <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/transaction-workflow/getLayoutOfSearch'" :searchDataApi="'/api/third-dept-tran/transaction-workflow/list'"></ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->

package/src/centaline/css/common.css

@@ -324,7 +324,7 @@ html {
    height:initial;
  }
  .st-serach-screen .el-input__icon {
-  line-height:initial!important;
+  line-height:26px;
 }
 .ct-checkbox .cover-list-item-span{
   line-height: initial!important;
@@ -798,3 +798,6 @@ html {
 .el-radio__input.is-checked + .el-radio__label {
   color: #409eff;
 }
+.el-input-group{
+  line-height: 26px;
+}

package/src/centaline/css/max.css

@@ -208,7 +208,7 @@
   }
   .ct-Seg.ct-Seg-mini .ct-radios, .ct-Seg.ct-Seg-mini .ct-radios .el-radio__label {
     min-height: initial;
-    line-height: initial;
+    line-height: 26px;
 }
 .el-input-group__append, .el-input-group__prepend {
     color: #666;

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/dynamicIti/src/dynamicIti.vue

@@ -27,7 +27,7 @@
                  :class="model.lock ? 'ct-is-disabled' : ''" :disabled="model.lock" @keyup.enter="search()"/>
           </div>
           <span  class="el-input__suffix el-input--mini"  v-if="showClear.input2">
-            <span  class="el-input__suffix-inner ct-close" style="display: flex;">
+            <span  class="el-input__suffix-inner ct-close">
               <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event,'input2')"></i>
             </span>
           </span>

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

@@ -1,6 +1,6 @@
 <template>
-  <div style="width: 100%;height: 100%;position: inherit;">
-    <div class="ct-search-list" :style="searchListStyle"  :class="{'domDisabled':pageDisabled}"> 
+  <div ref="main" style="width: 100%;height: 100%;display: flex;" :class="{'domDisabled':pageDisabled}">
+    <div class="ct-search-list" :style="{'height': pageHeight? pageHeight:'100%','width':searchWidth?searchWidth+'px':'100%'}" > 
       <div slot="header" class="clearfix" v-if="typeof title !== 'undefined' && showTitle">
             <span style="font-weight:bold">{{title}}</span>
       </div>
@@ -12,12 +12,16 @@
       :categoryLoaded="loaded.categoryLoaded" @search="search()" 
       @showTitle="showTitleScreenHandler"></ct-searchscreen>
 
-      <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from"
+      <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from" @loaded="tableLoaded"
       @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" :sideBarStatus="sideBarStatus" 
+      @sideMenuClickHandler="sideMenuClickHandler"></ct-SearchSideMenu>
     </div>
   </div>
 </template>
@@ -26,6 +30,7 @@
   import dynamicSearchCategory from './dynamicSearchCategory.vue';
   import dynamicSearchScreen from './dynamicSearchScreen.vue';
   import dynamicSearchTable from './dynamicSearchTable.vue';
+  import dynamicSearchSideMenu from './dynamicSearchSideMenu.vue';
   import progress from '../../progress/src/progress.vue';
   export default {
     name: 'ct-searchlist',
@@ -34,7 +39,8 @@
       'ct-searchscreen': dynamicSearchScreen,
       'ct-searchtable': dynamicSearchTable,
       'ct-progress': progress,
-      'ct-searchcategory': dynamicSearchCategory
+      'ct-searchcategory': dynamicSearchCategory,
+      'ct-SearchSideMenu': dynamicSearchSideMenu
     },
     props: {
       vmodel: Object,
@@ -60,12 +66,6 @@
       }
     },
     computed: {
-      searchListStyle: function() {
-        if (this.pageHeight) {
-          return { 'height': this.pageHeight };
-        }
-        return {};
-      },
     },
     data() {
       return {
@@ -82,9 +82,15 @@
         reloadKeyTable:'t0',
         isReload:false,
         pageDisabled:false,
+
         flagSideBar:false,
+        flagSideBarOfData:true,
         flagDefaultDisplaySideBar:false,
-        sideBarWidth:360,
+        sideBarWidth:0,
+        searchWidth:0,
+        sideBarRight:0,
+        sideBarMenuRight:0,
+        sideBarStatus:'',
       }
     },
     methods: {
@@ -108,7 +114,7 @@
       search(btn) {
         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);
@@ -118,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) {
@@ -145,6 +161,51 @@
           this.showTitle=this.$refs.screen.model.flagShowTitle;
         }
       },
+      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.sideMenuClickHandler('close');
+            }
+            else{              
+              this.sideMenuClickHandler('open');
+            }
+          }
+        }
+      },
+      sideMenuClickHandler(v) {
+        if(v=='open'){
+          this.sideBarStatus ='close';
+          this.sideBarRight=-this.sideBarWidth;
+          this.searchWidth=0;
+          this.sideBarMenuRight=0;
+        }
+        else if(v=='close'){
+          this.sideBarStatus ='open';
+          this.sideBarRight=0;
+          this.searchWidth=this.$refs.main.clientWidth-this.sideBarWidth;
+          this.sideBarMenuRight=this.sideBarWidth-2;
+        }
+      },
     }
   }
 </script>
+<style lang="scss" scoped>
+.sidebar {
+    z-index: 1000;
+    top: -1px;
+    bottom: -1px;
+    padding: 0px;
+    width: auto;
+    background-color: #fff;
+    -webkit-background-clip: padding-box;
+    background-clip: padding-box;
+    border: 1px solid #ccc;
+    border: 1px solid rgba(0, 0, 0, .15);
+    -webkit-box-shadow: 0 6px 12px rgb(0 0 0 / 18%);
+    box-shadow: 0 6px 12px rgb(0 0 0 / 18%);
+}
+</style>

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

@@ -0,0 +1,59 @@
+<template>
+  <div class="searchSideMenu toggler" :style="{right:sideBarMenuRight+'px'}" @click="clickHandler()" >
+    <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>
+  export default {
+    name: 'ct-SearchSideMenu',
+    props: {
+      sideBarMenuRight: Number,
+      sideBarStatus: String,
+    },
+    data() {
+      return {
+        side:'open',
+      }
+    },
+    created() {
+      if(this.sideBarStatus){
+        this.side = this.sideBarStatus;
+      }
+    },
+    methods: {
+      clickHandler() {
+        let v=this.side;
+        if(v=='close')this.side ='open';
+        else if(v=='open')this.side ='close';
+        this.$emit('sideMenuClickHandler',v);
+      },
+    }
+  }
+</script>
+<style lang="scss" scoped>
+.toggler {
+    -webkit-background-clip: padding-box;
+    background-clip: padding-box;
+    border: 1px solid rgba(0, 0, 0, .15);
+    width: 15px;
+    height: 48px;
+    position: absolute;
+    top: 45%;
+    cursor: pointer;
+    background-color: #fff;
+}
+.toggler >span{
+  margin-top: 15px;
+}
+.sidebar > .toggler {
+    -webkit-border-top-left-radius: 4px;
+    -webkit-border-bottom-left-radius: 4px;
+    -moz-border-radius-topleft: 4px;
+    -moz-border-radius-bottomleft: 4px;
+    border-top-left-radius: 4px;
+    border-bottom-left-radius: 4px;
+    -webkit-box-shadow: -1px 0px 8px rgb(0 0 0 / 18%);
+    box-shadow: -1px 0px 8px rgb(0 0 0 / 18%);
+}
+</style>

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

@@ -376,7 +376,6 @@
             self.rowColorChange();
           }
           self.$emit('searchComplate');
-
         }
         self.tableLoading = true;