centaline-data-driven 1.4.89 → 1.4.90

package/package.json

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

package/src/SearchListTab.vue

@@ -1,15 +1,5 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-    <!-- <ct-searchlistTab :searchConditionApi="'/api/third-dept-tran/transaction-workflow/getLayoutOfSearch'" :searchDataApi="'/api/third-dept-tran/transaction-workflow/list'"></ct-searchlistTab> -->
-
-    <!-- <ct-searchlistTab :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlistTab> -->
-    
-    <!-- <ct-searchlistTab :apiParam="para"
-      :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" 
-      :searchDataApi="'/api/third-dept-tran/tran-list'">
-    </ct-searchlistTab> -->
-
-
     <!-- <ct-searchlistTab :apiParam="para"
       :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'" 
       :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
@@ -17,11 +7,6 @@
       :searchStatsApi="'/ProfileWorklistList/getListStats'">
     </ct-searchlistTab> -->
 
-    <!-- <ct-searchlistTab :apiParam="para"
-      :searchConditionApi="'/RightValueList/getLayoutOfSearch'" 
-      :searchDataApi="'/RightValueList/getListOfSearchModel'">
-    </ct-searchlistTab> -->
-
     <!-- <ct-searchlistTab 
       :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" 
       :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" 
@@ -53,9 +38,6 @@
         para:{
           chanceID: "1569617379699331072"
         },
-        // para: {searchFields: {fields: []}, pageAttribute: {pageIndex: 1}, flagSearch: true}
-        // para: {publishID: "1503900718229229568"}
-        // para: {paramKey: "PropertyStatusID", code: "002.001", name: "盘源状态", paramName: "盘源状态"}
       }
     },
     mounted() {

package/src/centaline/common/index.js

@@ -339,6 +339,9 @@ const common = {
       else if (parent.$options.name === 'DataDrivenSearch') {
         return parent;
       } 
+      else if (parent.$options.name === 'DataDrivenSearchTab') {
+        return parent;
+      } 
       else if (parent.$options.name === 'DataDrivenForm') {
         return parent;
       } 

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

@@ -1,6 +1,6 @@
 <template>
   <div ref="main" style="width: 100%;height: 100%;display: flex;" :class="{'domDisabled':pageDisabled}">
-    <div class="ct-search-list" :style="{'height': pageHeight? pageHeight:'100%','width':searchWidth?searchWidth+'px':'100%'}" > 
+    <div class="ct-search-list-tab" :style="{'height': pageHeight? pageHeight:'100%','width':searchWidth?searchWidth+'px':'100%'}" > 
       <div slot="header" class="clearfix" v-if="typeof title !== 'undefined' && showTitle">
         <span style="font-weight:bold">{{title}}</span>
       </div>
@@ -151,7 +151,7 @@
     methods: {
       categoryLoad() {
         var self=this;
-        Vue.prototype.$api.postHandler(common.globalUri(), { action: self.searchCategoryApi,para:{} }).then(
+        this.$api.postHandler(this.$common.globalUri(), { action: this.searchCategoryApi,para:{} }).then(
           function (response) {
             if (response.rtnCode === Enum.ReturnCode.Successful) {
               console.log(response.content.fields[0]);              

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

@@ -39,10 +39,11 @@
                 </label>
               </th>
               <th :ref="column.fixed ? column.fixed === 'left' ? 'headLeftThs' : 'headRightThs' : 'headThs'"
-                  v-for="(column, colIndex) in columns" :key="colIndex" v-if="column.show" class="ct-td ct-searchtable-th theadLine" data-tooltip="左右拖动竖线调整列宽"
+                  v-for="(column, colIndex) in columns" :key="colIndex" v-if="column.show" class="ct-td ct-searchtable-th" data-tooltip="左右拖动竖线调整列宽"
                   :rowspan="column.rowspan" :colspan="column.colspan" :class="[colHasWidth[colIndex], column.sortAction, model.tdClass,
                 colIndex === leftShadow ? 'shadowLeft' : null,
                 colIndex === rightShadow ? 'shadowRight' : null,
+                colIndex === leftShadow || colIndex+1 === rightShadow ? '': 'theadLine',
                 column.fixed === 'left' ? 'left-fixation-th' : null,
                 column.fixed === 'right' ? 'right-fixation-th' : null,
                 column.width === undefined ? 'ct-table-auto' : null,
@@ -2066,12 +2067,15 @@ export default {
 	position: absolute; /*绝对定位*/
 	top: 50%; /*Y轴方向偏移自身高度的50%*/
 	transform: translatey(-50%); /*Y轴方向偏移微调*/
-	left: 0; /*紧靠容器左边缘*/
+	right: 0; /*紧靠容器右边缘*/
 	content: ''; /*伪元素需要有内容才能显示*/
 	width: 1px; /*伪元素宽度*/
 	height: 18px; /*伪元素高度*/
 	background-color: #919296; /*伪元素颜色*/
 }
+.theadLine:last-child::before{
+  width: 0px !important;
+}
 .theadBorder::after {
   content: attr(data-tooltip);
   position: absolute;

package/src/main.js

@@ -4,6 +4,8 @@ import Vue from 'vue';
 import ElementUI from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';
 import './centaline/css/common.css'
+import './centaline/css/max.css'
+// import './centaline/css/ccai.css'
 import App from './App';
 import router from './router';
 import centaline from './centaline/index';