centaline-data-driven 1.1.66 → 1.1.67

package/package.json

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

package/src/SearchList.vue

@@ -2,7 +2,7 @@
   <div id="app-search" style="height:100%;position: fixed;">
     <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist>
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     <!-- <ct-searchlist :searchConditionApi="'/WorklistList/getLayoutOfSearch'" :searchDataApi="'/WorklistList/getListOfSearchModel'" :searchCategoryApi="'/WorklistList/getLayoutOfSearchCategory'"></ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
@@ -12,6 +12,7 @@
                    ></ct-searchlist> -->
 
     <!--<ct-searchlist :searchConditionApi="'/api/invoice-info/search-condition'" :searchDataApi="'/api/invoice-info/list'" :searchDataStatisticsApi="'api/ContractList/GetLayoutOfStatisticsTool'" :apiParam="para"></ct-searchlist>-->
+    <ct-searchlist :searchConditionApi="'/PropertyStatusList/getLayoutOfSearch'" :searchDataApi="'/PropertyStatusList/getListOfSearchModel'"  :apiParam="para"></ct-searchlist>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>
@@ -23,7 +24,8 @@
     data() {
       return {
         //para: { agentId: "1424932685198864386", estateId: "L201402181627000007233", estateName: "271医院宿舍区", pageOnly: "true", pageTitle: "销控房源列表" }
-        para: {}
+        // para: {}
+        para: {paramKey: "PropertyStatusID", code: "002.001", name: "盘源状态", paramName: "盘源状态"}
       }
     },
     mounted() {

package/src/centaline/css/max.css

@@ -147,8 +147,8 @@
     height:6px;
 }
 .ct-selectOptionVertical::-webkit-scrollbar {
-    width: 6px!important;
-    height:6px!important;
+    width: 2px!important;
+    height:2px!important;
     background-color: #f1f1f1!important;
     display: block!important;
    }
@@ -222,7 +222,7 @@
   .details-content .ct-search-list .ct-searchtable .ct-table-content{
       padding: 0;
   }
-  .ct-unitname {
+  .lableinput .ct-unitname {
       display: contents;
   }
  .hyperLinkList .el-button + .el-button{

package/src/centaline/dynamicSeg/src/dynamicSeg.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="field-top">
-    <div style="width:100%;display:flex" v-if="model !== null" class="ct-Seg" :class="[model.attrs.size?'ct-Seg-'+model.attrs.size:''
-       ]">
+    <div style="width:100%;display:flex" v-if="model !== null" class="ct-Seg" :class="[model.attrs.size?'ct-Seg-'+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]">
           {{model.label}}
@@ -38,7 +37,7 @@
     },
     mounted() {
       var self = this;
-      this.$nextTick(function () {        
+      this.$nextTick(function () {
         if (self.vmodel) {
           self.load(self.vmodel);
           self.$emit('loaded');
@@ -61,16 +60,14 @@
       },
       clearClickHandle: function (event) {
         this.model.value = '';
-        //this.$emit('input', this.model.value);
-        //this.$emit('change', this.model.value);
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);
+        if(this.model.autoSearch) this.$emit('click');
       },
       changeHandler1: function (event) {
-        //this.$emit('input', this.model.value);
-        //this.$emit('change', this.model.value);
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);
+        if(this.model.autoSearch) this.$emit('click');
       }
     }
   }

package/src/centaline/loader/src/ctl/lib/LibFunction.js

@@ -75,6 +75,13 @@ const LibFunction = {
       else if (field.controlType === Enum.ControlType.NumericRange) {
         field.width = field.width || 280;
       }
+      else if (field.controlType === Enum.ControlType.RadioButton) {
+        if(!field.displayLabelAfterSelected){
+          showLabel = false;
+        }
+        field.width = field.width || 300;
+        field.placeholder1 = field.placeholder1 || field.controlLabel || '';
+      }
       else {
         showLabel = false;
         field.width = field.width || 200;
@@ -288,7 +295,7 @@ const LibFunction = {
         item = HyperLink(field, moreActionRouter);
         item.is = 'ct-hyperLink';
         break;
-        case Enum.ControlType.HyperlinkListWithLabel://带标签的超链接列表
+      case Enum.ControlType.HyperlinkListWithLabel://带标签的超链接列表
           item = HyperLinkList(field);
           item.is = 'ct-hyperLinkList';
           break;