centaline-data-driven 1.2.41 → 1.2.44

package/package.json

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

package/src/SearchList.vue

@@ -3,7 +3,9 @@
     <!-- <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="'/cache/getLayoutOfSearchForCache'" 
+    :searchDataApi="'/cache/getListOfSearchModelForCache'"></ct-searchlist> -->
 
     <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
                    :searchDataApi="'/PropertyRETList/getListOfSearchModel'"

package/src/centaline/common/index.js

@@ -205,7 +205,6 @@ const common = {
    * @desc 打开弹窗
    */
   openDialog(vmodel) {
-
     //this.dialogList.List.push(vmodel);
     this.dialogList.addDialog(vmodel);
   },
@@ -216,7 +215,6 @@ const common = {
    * @desc 关闭指定弹窗
    */
   closeDialog(vmodel) {
-
     if (vmodel) {
       if (vmodel.name === 'ct-comfirm' || vmodel.$options.name === 'ctDialog' || vmodel.$options.name === 'ct-dialog') {
         //vmodel.dialogTableVisible = false;

package/src/centaline/css/common.css

@@ -95,6 +95,9 @@ html {
  .ct-close{
    cursor: pointer;
  }
+ .cursor{
+  cursor: pointer !important;
+}
  .ct-so .ct-close > .el-select__caret.is-show-close:hover, .ct-tags .ct-close > .el-select__caret.is-show-close:hover {
    color: #909399;
  }
@@ -648,8 +651,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

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

@@ -45,7 +45,7 @@
           document.addEventListener("touchmove", mo, false);//禁止页面滑动
         }
       },
-      deleteDialog(model) {       
+      deleteDialog(model) {
         model.dialogTableVisible = false;
         //改成删除
         let index = this.List.findIndex(v => {

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

@@ -1,19 +1,24 @@
 <template>
-  <div class="ct-search-list" :style="searchListStyle"  :class="{'domDisabled':pageDisabled}"> 
-    <div slot="header" class="clearfix" v-if="typeof title !== 'undefined' && showTitle">
-          <span style="font-weight:bold">{{title}}</span>
-    </div>
-    <ct-searchcategory v-if="searchCategoryApi" ref="category" :api="searchCategoryApi"  @loadedCategory="categoryLoaded"
-    @changeCategory="categorychange" ></ct-searchcategory>
+  <div style="width: 100%;height: 100%;position: inherit;">
+    <div class="ct-search-list" :style="searchListStyle"  :class="{'domDisabled':pageDisabled}"> 
+      <div slot="header" class="clearfix" v-if="typeof title !== 'undefined' && showTitle">
+            <span style="font-weight:bold">{{title}}</span>
+      </div>
+      <ct-searchcategory v-if="searchCategoryApi" ref="category" :api="searchCategoryApi"  @loadedCategory="categoryLoaded"
+      @changeCategory="categorychange" ></ct-searchcategory>
+
+      <ct-searchscreen ref="screen" :api="searchConditionApi" :key="reloadKeyScreen"
+      @loaded="screenLoaded" :screenPara="screenPara" 
+      :categoryLoaded="loaded.categoryLoaded" @search="search()" 
+      @showTitle="showTitleScreenHandler"></ct-searchscreen>
 
-    <ct-searchscreen ref="screen" :api="searchConditionApi" :key="reloadKeyScreen"
-    @loaded="screenLoaded" :screenPara="screenPara" 
-    :categoryLoaded="loaded.categoryLoaded" @search="search()" 
-    @showTitle="showTitleScreenHandler"></ct-searchscreen>
+      <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from"
+      @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate()" 
+      @showTitle="showTitleHandler"></ct-searchtable>
+    </div>
+    <div v-if="flagSideBar">
 
-    <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from"
-    @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate()" 
-    @showTitle="showTitleHandler"></ct-searchtable>
+    </div>
   </div>
 </template>
 <script>
@@ -77,6 +82,9 @@
         reloadKeyTable:'t0',
         isReload:false,
         pageDisabled:false,
+        flagSideBar:false,
+        flagDefaultDisplaySideBar:false,
+        sideBarWidth:360,
       }
     },
     methods: {

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

@@ -80,6 +80,7 @@
                   :rowspan="tdRowspan(column, row)"
                   class="ct-td"
                   :class="[colHasWidth[colIndex],model.tdClass,
+                  column.router?'cursor':null,
                   colIndex === leftShadow?'shadowLeft':null,
                   colIndex === rightShadow?'shadowRight':null,
                   column.fixed === 'left'?'left-fixation':null,
@@ -955,17 +956,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;
@@ -975,69 +973,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;
@@ -1049,7 +1031,6 @@
     overflow: initial;
     position: relative;
   }
-
     .ct-table .ct-td > .caret-wrapper > .sort-caret {
       width: 0;
       height: 0;
@@ -1057,36 +1038,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;
@@ -1094,7 +1067,6 @@
     overflow: hidden;
     /*padding-right: 10px;*/
   }
-
   /*强制换行 todo 可去掉改成强制不换行*/
   .ct-table .cell {
     /* 这两个在技术上是一样的, 为了兼容了浏览器两个都加上 */
@@ -1111,53 +1083,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;
     }
@@ -1174,6 +1128,7 @@
     float: none;
     display: block;
     width: -webkit-fill-available;
+    cursor: pointer;
   }
   .div_allinline .Stats-popover {
     float: right;

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

@@ -843,6 +843,15 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       get rowMenuDisplayCount() {
         return source.content.rowMenuDisplayCount && source.content.rowMenuDisplayCount>0?source.content.rowMenuDisplayCount : 4;
       },
+      get flagSideBar() {
+        return source.content.flagSideBar || false;
+      },
+      get flagDefaultDisplaySideBar() {
+        return source.content.flagDefaultDisplaySideBar || false;
+      },
+      get sideBarWidth() {
+        return source.content.sideBarWidth || 360;
+      },
     };
     if (rtn.template) {
       var tempLoader = template.loader(rtn.template).default;

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

@@ -1,7 +1,7 @@
 <template>
-  <div :class="isOperationalColumn?'subdiv_allinline':''" v-if="isShowLabel">
-    <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)">
+  <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" />
+    <a v-else href="javascript:void(0);" class="ct-tablecurrencyItem" >
       {{label}}
     </a>
   </div>
@@ -63,5 +63,4 @@
     width: 24px;
     margin-top: 2px;
   }
-
 </style>