centaline-data-driven 1.2.40 → 1.2.43

package/package.json

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

package/src/SearchList.vue

@@ -1,6 +1,6 @@
 <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> -->

package/src/centaline/css/common.css

@@ -320,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;
@@ -643,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{

package/src/centaline/css/max.css

@@ -158,7 +158,7 @@
     white-space: nowrap;
 }
 .max-cover-list-item .el-input__icon{
-    line-height: 25px!important;
+    line-height:initial;
 }
 .el-card{
     border: none;
@@ -202,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: 25px!important;
+    min-height: initial;
+    line-height: initial;
 }
 .el-input-group__append, .el-input-group__prepend {
     color: #666;

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

@@ -105,7 +105,6 @@
   .ct-checkbox .cover-list-item-span {
     display: none;
     min-height: 26px;
-    line-height: 25px!important;
     font-size: 12px;
   }
 

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

@@ -92,16 +92,16 @@
                     v-if="!router.rightField || row[router.rightField] == 1" :isOperationalColumn="true"
                     :router="router" :colValue="router.label" :rowData="row" @click="rolRouterClickHandler">
                   </ct-tablecurrency>
-                  <el-popover :append-to-table="option.appendId?option.appendId:''" class="Stats-popover" popper-class="el-popover1"
-                    :placement="option.placement?option.placement:'left'"
+                  <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"
+                        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>
+                    <span :slot="getRowRouterDisplay(row).length>0?'reference':''" class="icon-more"></span>
                   </el-popover>
                 </div>
 
@@ -195,7 +195,7 @@
           showNum: 3,//如果isHidden为true时，个数大于3就会隐藏，默认是3
           appendId: '',//将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
           trigger: 'hover',//触发方式，传值可查看Popper UI组件trigger属性
-          placement: 'bottom-start'//方向，传值可查看Popper UI组件placement属性
+          placement: 'right-start',//方向，传值可查看Popper UI组件placement属性
         },
       }
     },
@@ -670,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];
         });
@@ -951,17 +955,14 @@
     outline: 0;
     border-top: 1px solid #fff;
   }
-
   .ct-searchtable .ct-table {
     min-width: 100%;
     border-collapse: collapse;
   }
-
     .ct-searchtable .ct-table th {
       background-color: #f4f7fa !important;
       border-top: 1px solid #ebeef5;
     }
-
   .ct-searchtable .ct-tr > .ct-td {
     /*border: 1px solid #e7e8eb;
     border-bottom: 1px solid #e7e8eb;
@@ -971,69 +972,53 @@
     cursor: default;
     background-color: #ffffff;
   }
-
   .ct-searchtable .ct-tr > .ct-td1 {
     border-right: 1px solid #e7e8eb;
     border-left: 1px solid #e7e8eb;
   }
-
   .ct-searchtable .ct-tr:last-child > .ct-td1 {
     border-bottom: 1px solid #e7e8eb;
   }
-
   .ct-searchtable .ct-tr > .ct-td2 {
     border-bottom: 1px solid #e7e8eb;
   }
-
   .ct-searchtable .ct-tr > .ct-td3 {
     border: 1px solid #e7e8eb;
   }
-
   .shadowLeft {
     border-right: 1px solid #e7e8eb;
     box-shadow: 2px 0 3px -1px rgba(0,0,0,0.1);
   }
-
   .shadowRight {
     box-shadow: -2px 0 3px -1px rgba(0,0,0,0.1);
   }
-
   .ct-searchtable body:last-child > .ct-td {
     border-bottom: 0px;
   }
-
   .ct-searchtable .ct-tr > .ct-td.nowidth {
     white-space: nowrap;
   }
-  /*.ct-searchtable tbody .ct-tr:hover .ct-td {
-    background-color: #ebeef5 !important;
-  }*/
-
   .ct-table {
     color: #606266;
     font-size: 18px;
     line-height: 40px;
     min-height: 40px;
   }
-
   .ct-table-mini {
     font-size: 12px;
     line-height: 26px;
     min-height: 28px;
   }
-
   .ct-table-small {
     font-size: 14px;
     line-height: 32px;
     min-height: 32px;
   }
-
   .ct-table-medium {
     font-size: 16px;
     line-height: 36px;
     min-height: 36px;
   }
-
   .ct-table .ct-td > .caret-wrapper {
     display: inline-flex;
     flex-direction: column;
@@ -1045,7 +1030,6 @@
     overflow: initial;
     position: relative;
   }
-
     .ct-table .ct-td > .caret-wrapper > .sort-caret {
       width: 0;
       height: 0;
@@ -1053,36 +1037,28 @@
       position: absolute;
       left: 7px;
     }
-
       .ct-table .ct-td > .caret-wrapper > .sort-caret.ascending {
         border-bottom-color: #c0c4cc;
         top: 5px;
       }
-
       .ct-table .ct-td > .caret-wrapper > .sort-caret.descending {
         border-top-color: #c0c4cc;
         bottom: 7px;
       }
-
   .ct-table .ct-td.select {
     background-color: #ecf5ff !important;
   }
-
   .ct-table .ct-tr:hover .ct-td.select {
     background-color: #ecf5ff !important;
   }
-
   .ct-table .ct-td.asc > .caret-wrapper > .sort-caret.ascending {
     border-bottom-color: #409eff;
     top: 5px;
   }
-
   .ct-table .ct-td.desc > .caret-wrapper > .sort-caret.descending {
     border-top-color: #409eff;
     bottom: 7px;
   }
-
-
   .ct-table .cell {
     /*white-space: nowrap;*/
     text-overflow: ellipsis;
@@ -1090,7 +1066,6 @@
     overflow: hidden;
     /*padding-right: 10px;*/
   }
-
   /*强制换行 todo 可去掉改成强制不换行*/
   .ct-table .cell {
     /* 这两个在技术上是一样的, 为了兼容了浏览器两个都加上 */
@@ -1107,53 +1082,35 @@
     -webkit-hyphens: auto;
     hyphens: auto;
   }
-
   .ct-table .lineFeedCell {
     min-width: 40px;
-    /*padding-right: 10px;*/
   }
-
-  /*.ct-table .cell.ct-tooltip:hover {
-      text-overflow: inherit;
-      overflow: visible;
-    }*/
-
   .ct-table .left-fixation {
     position: sticky;
   }
-
   .ct-table .right-fixation {
     position: sticky;
   }
-
   .ct-table .left-fixation-th {
     position: sticky;
     top: 0px;
     z-index: 99;
   }
-
   .ct-table .right-fixation-th {
     position: sticky;
     top: 0px;
     z-index: 99;
   }
-
   .ct-table .right-no-fixation-th {
     position: sticky;
     top: 0px;
     z-index: 50;
   }
-
-  .ct-table .ct-searchtable-th {
-    /*text-align: center*/
-  }
-
   .ct-table .checkbox-td {
     min-width: 20px;
     width: 20px;
     left: 0px;
   }
-
     .ct-table .checkbox-td .checkbox-td-1 {
       vertical-align: inherit;
     }
@@ -1163,19 +1120,27 @@
     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;
+    cursor: pointer;
+  }
+  .div_allinline .Stats-popover {
+    float: right;
+    margin-top: 3px;
+    margin-left: 4px;
+    height: 16px;
   }
   .icon-more {
-    color: #ee5d56;
-    font-size: 20px;
-    font-weight: 900;
-    display: inline-block;
-    vertical-align: 0.5em;
-    margin-top: -3px;
+    background: url('../../../assets/XL.png')no-repeat;
+    background-size: 100% 100%;
+    width: 16px;
+    height: 16px;
+    display: table-caption;
     cursor: pointer;
   } 
   .el-popover1 {

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

@@ -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/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);" />
+  <div :class="isOperationalColumn?'subdiv_allinline':''" v-if="isShowLabel" @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);
       }
     }
   }
@@ -58,5 +63,4 @@
     width: 24px;
     margin-top: 2px;
   }
-
 </style>

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',