centaline-data-driven 1.2.39 → 1.2.42

package/package.json

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

package/src/Form.vue

@@ -1,7 +1,7 @@
 <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="'/Flow/readDetail'" :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/Form/formdata'"></ct-form>-->
@@ -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",jsonData: {}},
+        apiParam: {actionType: "2", propertyID: "", estateID: "1", buildingID: "1", floorID: "1", roomNo: "1504",tradeID: "100"}
       }
     },
     methods: {

package/src/SearchList.vue

@@ -1,15 +1,15 @@
 <template>
   <div id="app-search" style="height:100%;position: fixed;">
-    <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-layout'" :searchDataApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-list'"></ct-searchlist>
+    <!-- <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> -->
     <!-- <ct-searchlist :searchConditionApi="'/PropertyPublishLogList/getLayoutOfSearch'" :searchDataApi="'/PropertyPublishLogList/getListOfSearchModel'"></ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
                    :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
                    :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
                     :searchStatsApi="'/exampleList/getListStats'"
-                   ></ct-searchlist> -->
+                   ></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> -->
@@ -23,7 +23,8 @@
     name: 'DataDrivenSearch',
     data() {
       return {
-        para: {searchFields: {fields: []}, pageAttribute: {pageIndex: 1}, flagSearch: true}
+        para:{},
+        // para: {searchFields: {fields: []}, pageAttribute: {pageIndex: 1}, flagSearch: true}
         // para: {publishID: "1503900718229229568"}
         // para: {paramKey: "PropertyStatusID", code: "002.001", name: "盘源状态", paramName: "盘源状态"}
       }

package/src/centaline/css/common.css

@@ -114,7 +114,6 @@ html {
    display:initial;
  }
  .ct-Seg .ct-radios .el-input__suffix-inner {
-   float: right;
    display: none;
  }
    .ct-Seg .ct-radios .el-input__suffix-inner .el-icon-circle-close {
@@ -321,7 +320,12 @@ html {
  .el-input__icon {
    height:initial;
  }
- 
+ .st-serach-screen .el-input__icon {
+  line-height:initial!important;
+}
+.ct-checkbox .cover-list-item-span{
+  line-height: initial!important;
+}
  /*两个div在同一行并居中*/
  .div_allinline {
    text-align: center;
@@ -644,8 +648,8 @@ html {
   padding: 0 15px 0 5px;
 } */
 .ct-Seg .ct-radios .el-input__icon.el-icon-circle-close{
-  min-height: 25px;
-  line-height: 25px;
+  min-height: initial;
+  line-height: initial;
 
 }
 .list-field .el-input-group__append, .list-field .el-input-group__prepend{
@@ -783,4 +787,11 @@ html {
 }
 .list-button .max-btn-add{
   width: 85px;
-}
+}
+.el-radio__input.is-checked .el-radio__inner {
+  border-color: #409eff;
+  background: #409eff;
+}
+.el-radio__input.is-checked + .el-radio__label {
+  color: #409eff;
+}

package/src/centaline/css/max.css

@@ -105,6 +105,8 @@
 }
 .ct-checkbox .ct-checkbox-mian{
     padding-left: 0!important;
+    min-height: 26px;
+    line-height: 25px;
 }
 .cover-list-item .el-checkbox{
     margin-right: 10px!important;
@@ -156,7 +158,7 @@
     white-space: nowrap;
 }
 .max-cover-list-item .el-input__icon{
-    line-height: 40px!important;
+    line-height:initial;
 }
 .el-card{
     border: none;
@@ -200,13 +202,13 @@
       padding: 5px 10px;
   }
   .ct-Seg .ct-radios .el-input__icon.el-icon-circle-close{
-    min-height: 26px;
-    line-height: 26px;
+    min-height: initial;
+    line-height: initial;
   
   }
   .ct-Seg.ct-Seg-mini .ct-radios, .ct-Seg.ct-Seg-mini .ct-radios .el-radio__label {
-    min-height: 26px;
-    line-height: 26px;
+    min-height: initial;
+    line-height: initial;
 }
 .el-input-group__append, .el-input-group__prepend {
     color: #666;
@@ -228,3 +230,10 @@
  .hyperLinkList .el-button + .el-button{
       margin-left: 0!important;
   }
+  .el-radio__input.is-checked .el-radio__inner {
+    border-color: #409eff;
+    background: #409eff;
+}
+.el-radio__input.is-checked + .el-radio__label {
+    color: #409eff;
+}

package/src/centaline/dynamicCheckbox/src/dynamicCheckbox.vue

@@ -6,15 +6,12 @@
           {{model.label}}
         </div>
         <div class="ct-checkbox-mian cover-list-item" :class="[model.showLabel?'showLabel':'',model.value !== ''?'hasValue':'']">
-          <span>
-            <el-checkbox-group v-model="model.checkedItemArr" @change="changeHandler1">
-              <el-checkbox :disabled="model.lock" v-for="item in model.options" :label="item[model.optionAttrs.value]" :key="item[model.optionAttrs.value]">{{item[model.optionAttrs.label]}}</el-checkbox>
-            </el-checkbox-group>
-          </span>
-
-          <span v-if="!model.lock" class="cover-list-item-span max-cover-list-item">
-          <i class="el-input__icon el-icon-circle-close" @click="clearClickHandle"></i>
-        </span>
+          <el-checkbox-group v-model="model.checkedItemArr" @change="changeHandler1">
+            <el-checkbox :disabled="model.lock" v-for="item in model.options" :label="item[model.optionAttrs.value]" :key="item[model.optionAttrs.value]">{{item[model.optionAttrs.label]}}</el-checkbox>          
+            <span v-if="!model.lock" class="cover-list-item-span max-cover-list-item">
+              <i class="el-input__icon el-icon-circle-close" @click="clearClickHandle"></i>
+            </span>
+          </el-checkbox-group>
         </div>
       </div>
       <span v-show="!valid" class="errorMessage">
@@ -103,14 +100,12 @@
   }
 
   .ct-checkbox .cover-list-item {
-    position: relative;
   }
 
   .ct-checkbox .cover-list-item-span {
-    position: absolute;
-    top: -6px;
-    right: 0px;
     display: none;
+    min-height: 26px;
+    font-size: 12px;
   }
 
   .ct-checkbox .ct-checkbox-mian .el-icon-circle-close:hover {

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

@@ -404,9 +404,6 @@
       lookOwner() {
         this.codeOwner = true
       },
-      onSearch() {
-        console.log('submit!');
-      },
       handleClick(tab, event) {
         let i=tab.index;
         if(this.model.tags2 && this.model.tags2[i]){

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

@@ -534,8 +534,9 @@
                     if (f.$el.offsetParent && f.$el.offsetParent.offsetParent) {
                       let total = f.$el.offsetParent.offsetParent.offsetTop;
                       //this.$common.setScrollTop(total);
-
-                      if (f.$el.offsetParent.offsetParent.offsetParent === null || f.$el.offsetParent.offsetParent.classList[0] === 'app-main') {
+                      if (f.$el.offsetParent.offsetParent.offsetParent === null 
+                      || f.$el.offsetParent.offsetParent.offsetParent.classList[0] === 'app-main'
+                      || f.$el.offsetParent.offsetParent.classList[0] === 'app-main') {
                         total = f.$el.offsetParent.offsetTop;
                         this.$common.setScrollTop(total);
                       }

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

@@ -88,9 +88,21 @@
                   v-bind="column.attrs">
                 <!--操作列-->
                 <div v-if="column.id==='operation'" class="div_allinline" :class="column.autoRowHeight ? 'lineFeedCell':'cell'">
-                  <ct-tablecurrency v-for="(router,rowRouterIndex) in model.rowRouter" :key="rowRouterIndex" v-if="!router.rightField || row[router.rightField] == 1" :isOperationalColumn="true"
-                                    :router="router" :colValue="router.label" :rowData="row" @click="rolRouterClickHandler">
+                  <ct-tablecurrency v-for="(router,rowRouterIndex) in getRowRouterShow(row)" :key="rowRouterIndex" 
+                    v-if="!router.rightField || row[router.rightField] == 1" :isOperationalColumn="true"
+                    :router="router" :colValue="router.label" :rowData="row" @click="rolRouterClickHandler">
                   </ct-tablecurrency>
+                  <el-popover :ref="'popover'+rowindex" :append-to-table="option.appendId?option.appendId:''" class="Stats-popover" popper-class="el-popover1"
+                    :placement="option.placement?option.placement:'left'" 
+                    :trigger="option.trigger?option.trigger:''">
+                    <div class="tab-list" style="border-bottom:none">
+                      <ct-tablecurrency v-for="(router,rowRouterIndex) in getRowRouterDisplay(row)" :key="rowRouterIndex" 
+                        v-if="!router.rightField || row[router.rightField] == 1" :isOperationalColumn="true" :isShowImg="false" :rowindex="rowindex"
+                        :router="router" :colValue="router.label" :rowData="row" @click="rolRouterClickHandler">
+                      </ct-tablecurrency>
+                    </div>
+                    <span :slot="getRowRouterDisplay(row).length>0?'reference':''" class="icon-more"></span>
+                  </el-popover>
                 </div>
 
                 <!--可点击的列-->
@@ -178,6 +190,13 @@
         pageRowMax: 100,//页面实际的第后行号
         displayRowNumber: 30,
         selectAllType:1,
+        option: {
+          isHidden: true,//是否开启操作栏隐藏设置，默认开启
+          showNum: 3,//如果isHidden为true时，个数大于3就会隐藏，默认是3
+          appendId: '',//将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
+          trigger: 'hover',//触发方式，传值可查看Popper UI组件trigger属性
+          placement: 'right-start',//方向，传值可查看Popper UI组件placement属性
+        },
       }
     },
     activated() {
@@ -508,9 +527,8 @@
             var h4 = this.$refs.footer.$el.offsetHeight | 0;
             var h5 = this.$refs.listHeader.$el.offsetHeight | 0;
             var h6 = this.$refs.listFooter.$el.offsetHeight | 0;
-              var h7 =  this.$refs.tableStats?(this.$refs.tableStats.$el.offsetHeight+7 | 0):0;
+            var h7 =  this.$refs.tableStats?(this.$refs.tableStats.$el.offsetHeight+7 | 0):0;
             let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7-22;
-            console.log(tableHeight+"   "+h7);
             this.model.tableHeight = tableHeight < 40 ? 350 : tableHeight;
             this.$nextTick(() => {
               self.getScrollAttr();
@@ -652,9 +670,13 @@
 
         this.routerClickHandler(field, submitData, action);
       },
-      rolRouterClickHandler(field, rowData) {
+      rolRouterClickHandler(field, rowData,rowindex) {
+        if(this.$refs['popover'+rowindex]){
+          this.$refs['popover'+rowindex][0].doClose();
+        }
+
         var self = this;
-        var submitData = {};
+        var submitData = {};        
         field.submitListField.forEach((k) => {
           submitData[k] = rowData[k];
         });
@@ -896,7 +918,33 @@
         let self = this;
         self.model.searchStats = m;
         self.getPage(1);
-      }
+      },
+      getRowRouterShow(row) {
+        let self=this;
+        let rowRouterShow=[];
+        self.model.rowRouter.forEach((v) => {
+          if (!v.rightField || row[v.rightField] == 1) {
+            if(rowRouterShow.length<self.model.rowMenuDisplayCount){
+              rowRouterShow.push(v);
+            }
+          }
+        });
+        return rowRouterShow;
+      },
+      getRowRouterDisplay(row) {
+        let self=this;
+        let rowRouterDisplay=[];
+        let i=0;
+        self.model.rowRouter.forEach((v) => {
+          if (!v.rightField || row[v.rightField] == 1) {
+            i=i+1;
+            if(i>self.model.rowMenuDisplayCount){
+              rowRouterDisplay.push(v);
+            }
+          }
+        });
+        return rowRouterDisplay;
+      },
     },
   }</script>
 <style>
@@ -1113,4 +1161,35 @@
     .ct-table .checkbox-td .checkbox-td-1 {
       vertical-align: inherit;
     }
+    
+  .tab-list {
+    position: relative;
+    margin-bottom: 0px !important;;
+    height: auto !important;;
+    display: block;
+    padding-left: 8px;
+    padding-right: 4px;
+  }
+  .tab-list .subdiv_allinline {    
+    float: none;
+    display: block;
+    width: -webkit-fill-available;
+  }
+  .div_allinline .Stats-popover {
+    float: right;
+    margin-top: 3px;
+    margin-left: 4px;
+    height: 16px;
+  }
+  .icon-more {
+    background: url('../../../assets/XL.png')no-repeat;
+    background-size: 100% 100%;
+    width: 16px;
+    height: 16px;
+    display: table-caption;
+    cursor: pointer;
+  } 
+  .el-popover1 {
+    min-width: inherit !important;
+  }
 </style>

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

@@ -44,7 +44,7 @@
               <br />
             </div>
           </div>
-          <sapn slot="reference" class="icon-more">⋮</sapn>
+          <span slot="reference" class="icon-more">⋮</span>
 
         </el-popover>
       </template>
@@ -265,10 +265,13 @@
       cursor: pointer;
     }
 
-  .Stats-popover {
-    position: absolute;
-    right: 5px;
+   .Stats-popover {
+    float: left;
+    margin-top: 4px;
+    margin-left: 4px;
+    height: 16px;
   }
+
 </style>
 <style>
   .el-popover1 {

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

@@ -9,7 +9,6 @@ import Vue from 'vue';
 
 const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
   var init = function (source) {
-    //source.layoutOrientation = Enum.Orientation.Horizontal;
     let rtn = {
       get source() {
         return source;

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

@@ -255,8 +255,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       },
       set selectAllType(v1) {
         source.selectAllType = v1;
-      },
-      
+      },      
       getSelectRowData(router) {
         if (rtn.listData.length === 0) {
           return null;
@@ -841,6 +840,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         }
         return c;
       },
+      get rowMenuDisplayCount() {
+        return source.content.rowMenuDisplayCount && source.content.rowMenuDisplayCount>0?source.content.rowMenuDisplayCount : 4;
+      },
     };
     if (rtn.template) {
       var tempLoader = template.loader(rtn.template).default;

package/src/centaline/templateControls/src/dynamicTableCurrency.vue

@@ -1,6 +1,6 @@
 <template>
   <div :class="isOperationalColumn?'subdiv_allinline':''" v-if="isShowLabel">
-    <img v-if="router.imgUrl" class="ct-tablecurrencyImg ct-tablecurrencyItem" :src="router.imgUrl" :title="router.label" @click="clickHandler($event);" />
+    <img v-if="router.imgUrl && isShowImg" class="ct-tablecurrencyImg ct-tablecurrencyItem" :src="router.imgUrl" :title="router.label" @click="clickHandler($event);" />
     <a v-else href="javascript:void(0);" class="ct-tablecurrencyItem" @click="clickHandler($event)">
       {{label}}
     </a>
@@ -14,9 +14,14 @@
       router: Object,
       rowData: Object,
       colValue: String,
+      rowindex: Number,
       isOperationalColumn: {
         type: Boolean,
         default: false
+      },
+      isShowImg: {
+        type: Boolean,
+        default: true
       }
     },
     computed: {
@@ -38,7 +43,7 @@
     },
     methods: {
       clickHandler(ev) {
-        this.$emit('click', this.router, this.rowData);
+        this.$emit('click', this.router, this.rowData,this.rowindex);
       }
     }
   }

package/src/main.js

@@ -13,7 +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://10.1.245.111:38028/v1/form/router",  
+  // baseUrl: "http://tjcptest.centaline.com.cn/",  
   // baseUrl: "http://10.88.22.46:7070/", 
   // flagRouterSelf: true,
   zindex: 999,
@@ -36,7 +36,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '5e730b63-1439-4850-9e88-4a83c8609525',
+        oldToken: 'fd2b9945-9709-4608-a57b-13a8ad61030a',
         estateId: '20210729104021C49F04B55C50F6AF58',
         originalRequestURL: 'http://10.88.22.67:8080',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE0NmU5ZjEzLTVjMmYtNGVlMy1hM2U5LWIxM2QyZThjZTBhZSJ9.Gl8K5lbG7t5DyCqouu7Ux7Oh9xuAxqdOXr4JnoHCN-YwC3b2zPO-C2sHbYJUZHYQPa7kTNRmg1xJiwugpVo5Xw',