centaline-data-driven 1.4.95 → 1.4.96

package/package.json

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

package/src/centaline/css/common.css

@@ -860,7 +860,51 @@ color: var(--centalinePlaceholder);
 .ml10{
   margin-left: 10px;
 }
-.searchlistTab .el-tabs__header{
-  margin-bottom: 0px;
-}
 
+.ct-searchcategory {
+  margin-bottom: 10px !important;
+  line-height: 30px;
+}
+  .ct-searchcategory .el-input-group__prepend{
+    text-align: left;
+    padding-left: 0px!important;
+    color: var(--chinaRed) !important;
+    font-weight: Bold;
+    text-shadow: 0 2px 2px rgb(121 0 4 / 10%);
+    font-size: 16px;
+    vertical-align: middle;
+  }
+  .ct-searchcategory .ct-radios {
+    color: #606266;
+    border-radius: 4px;
+    /*border: 1px solid #dcdfe6;*/
+    line-height: 30px;
+    padding-left: 15px;
+    text-align: right;
+  }
+    .ct-searchcategory .ct-radios:hover {
+      border-color: #c0c4cc;
+    }
+    .ct-searchcategory .ct-radios .el-radio {
+      margin-left: 0px;
+      margin-right: 10px;
+    }
+  .ct-searchcategory .ct-radios .ct-Seg-label {
+    margin-right: 15px;
+  }
+.ct-searchcategory .el-radio-button__orig-radio:checked+.el-radio-button__inner {
+  color: #FFF;
+  background-color: var(--chinaRed);
+  border-color: var(--chinaRed);
+  -webkit-box-shadow: -1px 0 0 0 var(--chinaRed);
+  box-shadow: -1px 0 0 0 var(--chinaRed);
+  font-weight: 700;
+  font-size: 14px;
+}
+.ct-searchcategory .el-radio-button__inner{
+  font-size: 14px;
+  color: var(--centalineBlack); 
+}
+.ct-searchcategory .el-radio-button__inner:hover {
+  color: var(--chinaRed);
+}

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

@@ -1,16 +1,14 @@
 <template>
-  <div style="width:100%;display:flex" v-if="model !== null" class="ct-searchcategory" :class="[model.attrs.size?'ct-searchcategory-'+model.attrs.size:''
-      ]">
+  <div style="width:100%;display:flex" v-if="model !== null" class="ct-searchcategory" :class="[model.attrs.size?'ct-searchcategory-'+model.attrs.size:'']">
     <div style="flex:1;" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
       <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">        
-        <img v-if="model.preLabel" :src="model.preLabel" style="width: 1.3em;height: 1.3em;fill: currentColor;
-    overflow: hidden;vertical-align: middle;"/>
+        <img v-if="model.preLabel" :src="model.preLabel" style="width: 1.3em;height: 1.3em;fill: currentColor;overflow: hidden;vertical-align: middle;"/>
         {{model.label}}
       </div>
       <div class="ct-radios" :class="[model.showLabel?'showLabel':'',model.value !== ''?'hasValue':'']">
         <el-radio-group v-model="model.value" @change="changeHandler1($event)">
           <el-radio-button v-bind="model.attrs" v-for="(value, index) in model.segmentValue" :key="index" v-model="model.value"
-                    :label="value[model.optionAttrs.value]" :displayLabel="value[model.optionAttrs.displayLabel]" :disabled="model.lock">
+            :label="value[model.optionAttrs.value]" :displayLabel="value[model.optionAttrs.displayLabel]" :disabled="model.lock">
             {{value[model.optionAttrs.label]}}
           </el-radio-button >
         </el-radio-group>
@@ -85,51 +83,4 @@
   }
 </script>
 <style>
-.ct-searchcategory {
-  margin-bottom: 10px;
-    line-height: 30px;
-}
-  .ct-searchcategory .el-input-group__prepend{
-    text-align: left;
-    padding-left: 0px!important;
-    color: var(--chinaRed) !important;
-    font-weight: Bold;
-    text-shadow: 0 2px 2px rgb(121 0 4 / 10%);
-    font-size: 16px;
-    vertical-align: middle;
-  }
-  .ct-searchcategory .ct-radios {
-    color: #606266;
-    border-radius: 4px;
-    /*border: 1px solid #dcdfe6;*/
-    line-height: 30px;
-    padding-left: 15px;
-    text-align: right;
-  }
-    .ct-searchcategory .ct-radios:hover {
-      border-color: #c0c4cc;
-    }
-    .ct-searchcategory .ct-radios .el-radio {
-      margin-left: 0px;
-      margin-right: 10px;
-    }
-  .ct-searchcategory .ct-radios .ct-Seg-label {
-    margin-right: 15px;
-  }
-.ct-searchcategory .el-radio-button__orig-radio:checked+.el-radio-button__inner {
-  color: #FFF;
-  background-color: var(--chinaRed);
-  border-color: var(--chinaRed);
-  -webkit-box-shadow: -1px 0 0 0 var(--chinaRed);
-  box-shadow: -1px 0 0 0 var(--chinaRed);
-font-weight: 700;
-font-size: 14px;
-}
-.ct-searchcategory .el-radio-button__inner{
-font-size: 14px;
-color: var(--centalineBlack); 
-}
-.ct-searchcategory .el-radio-button__inner:hover {
-    color: var(--chinaRed);
-}
 </style>

package/src/centaline/dynamicSearchListTab/src/dynamicSearchListOne.vue

@@ -31,7 +31,7 @@
   import dynamicSearchSideMenu from '../../dynamicSearchList/src/dynamicSearchSideMenu.vue';
   import progress from '../../progress/src/progress.vue';
   export default {
-    name: 'ct-searchlist',
+    name: 'ct-searchlistOne',
     mixins: [dynamicElement],
     components: {
       'ct-searchscreen': dynamicSearchScreen,

package/src/centaline/dynamicSearchListTab/src/dynamicSearchListTab.vue

@@ -4,16 +4,28 @@
       <div slot="header" class="clearfix" v-if="typeof title !== 'undefined' && showTitle">
         <span style="font-weight:bold">{{title}}</span>
       </div>
-      <el-tabs v-if="categorySource" :value="activeIndex" @tab-click="handleClick" class="searchlistTab">
-        <el-tab-pane v-for="(col, index) in categorySource.selectItems1" :key="col.code"
-          :index="index.toString()" :name="index.toString()" :label="col.name">
-          <div>
-            <ct-searchlistOne :ref="'searchlist'+index" :searchConditionApi="searchConditionApi" :pageHeight="listHeight"
-              :searchStatsApi="searchStatsApi" :searchDataApi="searchDataApi" :apiParam="apiParam" @tableLoaded="tableLoaded">
-            </ct-searchlistOne>            
+      <div v-if="categorySource" class="el-tabs__header ct-searchcategory" style="width:100%;display:flex">
+        <div style="flex:1;" class="el-input-group">
+          <div v-if="showLabel && label" class="el-input-group__prepend">        
+            <img v-if="categorySource.preLabel1" :src="categorySource.preLabel1" style="width: 1.3em;height: 1.3em;fill: currentColor;overflow: hidden;vertical-align: middle;"/>
+            {{label}}
           </div>
-        </el-tab-pane>
-      </el-tabs>      
+          <div class="ct-radios">
+            <el-radio-group v-model="activeIndex" @change="categorychangeHandler($event)">
+              <el-radio-button v-bind="{class:'ct-font-size-mini'}" v-for="(col, index) in categorySource.selectItems1" :key="index" v-model="col.code" :label="index">
+                {{col.name}}
+              </el-radio-button >
+            </el-radio-group>
+          </div>
+        </div>
+      </div>
+      <div v-if="categorySource" class="el-tabs__content">
+        <div v-for="(col, index) in categorySource.selectItems1" v-show="activeIndex===index" v-loading="isLoading" :key="index" :index="index" class="el-tab-pane" role="tabpanel" aria-hidden="true">
+          <ct-searchlistOne :ref="'searchlist'+index" :searchConditionApi="searchConditionApi" :pageHeight="listHeight"
+            :searchStatsApi="searchStatsApi" :searchDataApi="searchDataApi" :apiParam="apiParam" @tableLoaded="tableLoaded">
+          </ct-searchlistOne>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -84,6 +96,10 @@
         isIframe: false,
         searchWidth:0,
         listHeight:'',
+        isLoading:true,
+
+        showLabel:true,
+        label:'',
       }
     },
     computed: {
@@ -100,9 +116,10 @@
           function (response) {
             if (response.rtnCode === 200) {
               self.categorySource=response.content.fields[0];
-              console.log(self.categorySource)
+              console.log('categorySource',self.categorySource)
               let parm={};
               parm[self.categorySource.fieldName1]=self.categorySource.selectItems1[self.activeIndex].code;
+              self.label=self.categorySource.selectItems1[self.activeIndex].displayName;
               self.$nextTick(function () {
                 self.categoryLoaded(parm);
               });
@@ -113,25 +130,28 @@
           }
         );
       },
-      handleClick(tab, event) {
-        let i = tab.index;
+      categorychangeHandler() {
+        console.log('activeIndex',this.activeIndex)
+        let i = this.activeIndex;
         let parm={};
         parm[this.categorySource.fieldName1]=this.categorySource.selectItems1[i].code;
+        this.label=this.categorySource.selectItems1[i].displayName;
         this.$nextTick(function () {
           if(!this.$refs['searchlist'+i][0].loaded.categoryTabLoaded){
+            this.isLoading=true;
             this.$refs['searchlist'+i][0].categoryLoaded(parm);
           }
         });
       },
       categoryLoaded(param) {
-        this.listHeight=(this.$refs.main.offsetHeight-40)+'px';
+        this.listHeight=(this.$refs.main.offsetHeight-42)+'px';
         this.$refs['searchlist'+this.activeIndex][0].categoryLoaded(param);
       },
       categoryLoadedError() {
         this.$refs['searchlist'+this.activeIndex][0].categoryLoadedError();
       },
       tableLoaded(){
-        this.iisLoading=false;
+        this.isLoading=false;
       },
       refreshParentHandler() {
         this.$emit('refreshParent');

package/src/main.js

@@ -50,7 +50,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '0bbcf3e8-cf7e-42de-adef-af54e2158fe4',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe-yNZPs7Ay7M3bsAo2HIAhLgpURSDTGu6tRO3tf8YvXvH8zy3YwO1NLZTm1BKlxJXAdSqjaIBCTiI0uEEfp9AP8mC8dImtA30ClIQF7JhBMAol94rZuKMXaFCZfTmaHXhxZG0gLM_frWzhkeoltyed9vv7j3HGdn1lHOrCzCmR1BCbM0FslQJ36kQWnHAZzfwAAAP__.-drHT8BOA8s5JAVSiKV9_NdkJ8clUTrkXDRh9hF_o6I',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOivZ2fXamy7xp-EQURJShAqRRAIh7o4R0NEzxRRPI725q3UfVaOQnbSJDQRLHoiNBaGcIWhmwawRY-zlE_hR3_TkgrRtckC6Y6BsE0gdMqDYLlJqXUysKjVfz6ox7GvUxciVWobtDWoj-gX2db4c5ts_zp22pWjJyIQDGhgJy5iMBz9pB3z02pGjchXV4wkAAP__.UJfbXztMu3Mir8CBo48y20zouMa8jMar9OMNWQtQBbA',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',