centaline-data-driven 1.1.7 → 1.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "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/layout'" :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist>
+    <ct-searchlist :searchConditionApi="'/api/agenttrans/transactionList/getLayoutOfSearch'" :searchDataApi="'/api/agenttrans/transactionList/getTableList'" :apiParam="para"></ct-searchlist>
     <!--<ct-searchlist :searchConditionApi="'/api/invoice-info/search-condition'" :searchDataApi="'/api/invoice-info/list'" :apiParam="para"></ct-searchlist>-->
     <ct-dialog-list></ct-dialog-list>
   </div>
@@ -12,7 +12,7 @@
     name: 'App',
     data() {
       return {
-        para: { agentId: "1424932685198864386", estateId: "L201402181627000007233", estateName: "271医院宿舍区", pageOnly: "true", pageTitle: "销控房源列表" }
+        para: { invoiceId: "81" }
       }
     },
     mounted() {

package/src/centaline/css/common.css

@@ -419,7 +419,7 @@ html {
    background-color: #ee5d56;
    border-color: #ee5d56;
  }
- .el-button--primary:hover {
+ .el-button--primary:hover ,.el-button--warning:hover{
    background: #f1706b;
    border-color: #f1706b;
    color: #FFF;
@@ -650,7 +650,7 @@ html {
 }
 .el-col .ct-tableToolbar{
   background-color: #fff;
-}
+}
 
 .el-button--primary.is-disabled, .el-button--primary.is-disabled:active, .el-button--primary.is-disabled:focus, .el-button--primary.is-disabled:hover {
   color: #FFF;
@@ -660,4 +660,4 @@ html {
 
 .ct-dialog_app {
   position: relative
-}
+}

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

@@ -1,7 +1,7 @@
 <template>
   <div class="st-serach-screen">
     <div v-bind="model.attrs" style="width:100%" v-if="!isLoading">
-      <div class="ct-ptb5">
+      <div class="ct-ptb5" v-if="showScreen">
         <template v-for="(col, index) in model.screen" v-if="col.show !== false">
           <br v-if="col.is === 'ct-linefeed'" />
           <component v-else class="list-field" v-bind="col.listBind" :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
@@ -54,8 +54,9 @@
       return {
         isLoading: true,
         screenRow: [],
-        highScreenRow:[],
-        highScreen:false
+        highScreenRow: [],
+        highScreen: false,
+        showScreen: true
       }
     },
     mounted() {
@@ -89,7 +90,7 @@
           default:
             break;
         }
-        
+
       },
       loadScreen() {
         var self = this;
@@ -122,6 +123,20 @@
             v.parent = parent;
           }
         });
+      },
+      //无任何筛选条件时，不显示该div
+      setScreenShow() {
+        let showField = this.model.screen.find((v) => {
+          return v.show !== false;
+        });
+        if (!showField) {
+          showField = this.model.btnScreen.find((v) => {
+            return v.show !== false;
+          });
+          if (!showField) {
+            this.showScreen = false;
+          }
+        }
       },
       load(data) {
         var self = this;
@@ -129,6 +144,7 @@
         self.model.$vue = self;
         self.loadScreen();
         self.loadHighScreen();
+        self.setScreenShow();
         self.isLoading = false;
         self.$emit('loaded', self.model.defaultSearch);
       }

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

@@ -20,12 +20,14 @@
                :class="['ct-table',model.attrs.size?'ct-table-'+model.attrs.size:'']">
           <!--表头-->
           <thead ref="tableHead">
-            <tr class="ct-tr" ref="headTr">
-              <th v-if="model.isMulti" ref="headLeftThs" class="ct-td left-fixation-th" :style="{'min-width':'20px', 'left':'0px'}">
+            <tr class="ct-tr" ref="headTr" v-for="(columns,columnsIndex) in model.columnsArr">
+              <th v-if="model.isMulti && columnsIndex === 0" ref="headLeftThs" class="ct-td left-fixation-th" :style="{'min-width':'20px', 'left':'0px'}">
                 <input type="checkbox" @click="selectAll($event)" />
               </th>
-              <th :ref="column.fixed?(column.fixed==='left'?'headLeftThs':'headRightThs'):'headThs'" v-for="(column,colIndex) in model.columns"
-                  v-if="column.show" class="ct-td ct-searchtable-th"
+              <th :ref="column.fixed?(column.fixed==='left'?'headLeftThs':'headRightThs'):'headThs'" v-for="(column,colIndex) in columns"
+                  v-if="column.show" class="ct-td ct-searchtable-th"
+                  :rowspan="column.rowspan"
+                  :colspan="column.colspan"
                   :class="[colHasWidth[colIndex],column.sortAction,
                   colIndex === leftShadow?'shadowLeft':null,
                   colIndex === rightShadow?'shadowRight':null,
@@ -54,7 +56,7 @@
             <tr v-if="model.listData.length === 0" class="ct-tr" style="visibility: hidden;">
               <td v-if="model.isMulti">
               </td>
-              <td v-for="(column,colIndex) in model.columns" class="ct-td" v-if="column.show">
+              <td v-for="(column,colIndex) in model.dataFieldcolumns" class="ct-td" v-if="column.show">
                 <div :style="{'width': column.width + 'px'}">
                 </div>
               </td>
@@ -70,7 +72,7 @@
                 <input v-if="!model.rightMulti || row[model.rightMulti] == 1" type="checkbox" v-model="row.$select" />
               </td>
               <td :ref="column.fixed?(column.fixed==='left'?'headLeftTds':'headRightTds'):null"
-                  v-for="(column,colIndex) in model.columns"
+                  v-for="(column,colIndex) in model.dataFieldcolumns"
                   v-if="tdShow(column, row)"
                   :rowspan="tdRowspan(column, row)"
                   class="ct-td"
@@ -273,7 +275,7 @@
 
                 //col.width = (self.currentTh.oldWidth + (ev1.x - self.currentTh.oldX));
                 self.$set(col, "width", (self.currentTh.oldWidth + (ev1.x - self.currentTh.oldX)));
-                if (typeof self.$refs.headTr !== 'undefined') {
+                if (typeof self.$refs.headTr !== 'undefined' && this.$refs.headTr.length > 0) {
                   self.currentTh.style.minWidth = col.width + 'px';
                   self.currentTh.style.width = col.width + 'px';
                   self.getScrollAttr();
@@ -361,10 +363,10 @@
         Object.freeze(this.model.listData);
       },
       setfixedSize() {
-        if (typeof this.$refs.headTr !== 'undefined') {
+        if (typeof this.$refs.headTr !== 'undefined' && this.$refs.headTr.length > 0) {
           let fixedSize = 0;
           let j = 0;
-          let fixationThArr = this.$refs.headTr.getElementsByClassName('left-fixation-th');
+          let fixationThArr = this.$refs.headTr[0].getElementsByClassName('left-fixation-th');
           if (fixationThArr.length > 0) {
             if (this.model.isMulti) {
               fixedSize = fixationThArr[j++].offsetWidth
@@ -377,7 +379,7 @@
             }
 
             fixedSize = 0;
-            fixationThArr = this.$refs.headTr.getElementsByClassName('right-fixation-th');
+            fixationThArr = this.$refs.headTr[0].getElementsByClassName('right-fixation-th');
             j = fixationThArr.length - 1;
             for (let i = this.model.columns.length - 1; i > 0; i--) {
               if (this.model.columns[i].fixed === 'right' && this.model.columns[i].show) {

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

@@ -27,16 +27,10 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         }
         else {
           var lockLeft = true;
-
-          //手动添加操作列（可考虑放在后台设置）
-          //if (rtn.rowRouter.length > 0) {
-          //  var operationColSource = {
-          //    fd: 'Operation',
-          //    dn: '操作',
-          //    fz: '1'
-          //  }
-          //  source.content.Columns.push(operationColSource);
-          //}
+
+          self.isMergeTitle = source.content.columns.some(v => {
+            return v.trOrder === 2;
+          });
 
           source.content.columns.forEach((v) => {
             v.columnWidth = v.columnWidth ? v.columnWidth : 'auto';
@@ -45,7 +39,10 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             //}
 
             var col = {
-              fixedSize : 0,
+              fixedSize: 0,
+              get source() {
+                return v;
+              },
               get id() {
                 return common.initialsToUpperCase(v.fieldName);
               },
@@ -70,6 +67,18 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               get show() {
                 return v.visible;
               },
+              get rowspan() {
+                return v.rowSpan || 1;
+              },
+              get colspan() {
+                return v.colSpan || 1;
+              },
+              get trOrder() {
+                return v.trOrder || 1;
+              },
+              get isDataField() {
+                return v.isDataField;
+              },
               get width() {
                 return v.columnWidth ? v.columnWidth : undefined;
               },
@@ -137,8 +146,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                 }
               }
             };
-            if (col.show) {
-              if (col.lock) {
+            if (col.show) {
+              //合并表头时暂不支持固定列
+              if (col.lock && !self.isMergeTitle) {
                 if (lockLeft) {
                   col.fixed = 'left';
                 }
@@ -158,6 +168,44 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       set columns(v) {
         this._columns = [];
         source.content.columns = v;
+      },
+      //因合并表头需要
+      isMergeTitle: false,//是否合并标题
+      _columnsArr: [],
+      get columnsArr() {
+        var self = this;
+        if (self._columnsArr.length > 0) {
+          return self._columnsArr;
+        }
+        else {
+          let i = 1;
+          for (; i <= 4; i++) {
+            var arr = self.columns.filter(v => {
+              return v.trOrder === i
+            });
+            if (arr.length === 0) {
+              break;
+            }
+
+            self._columnsArr.push(arr);
+          }
+          return self._columnsArr;
+        }
+      },
+      _dataFieldcolumns: [],
+      get dataFieldcolumns() {
+        var self = this;
+        if (self._dataFieldcolumns.length > 0) {
+          return self._dataFieldcolumns;
+        }
+        else {
+          var arr = self.columns.filter(v => {
+            return v.isDataField === true
+          });
+
+          self._dataFieldcolumns = arr;
+          return self._dataFieldcolumns;
+        }
       },
       get listData() {
         if (!source.content.rows) {
@@ -168,7 +216,10 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       set listData(v) {
         source.content.rows = v;
       },
-      get isMulti() {//是否多选
+      get isMulti() {//是否多选
+        if (this.isMergeTitle) {
+          return false;//合并表头暂不支持多选
+        }
         return source.content.flagCheckBoxColumn === true;
       },
       get rightMulti() {//多选权限列

package/src/main.js

@@ -12,7 +12,7 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: 'http://10.88.22.76:8080/v1/form/router',
+  baseUrl: 'http://10.88.200.24:8080/v1/form/router',
   zindex: 999,
   handler: {
     // 打开tab页
@@ -26,8 +26,8 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '72727a5d-bd85-456c-86a0-0ccce2ef513b',
-        estateId: '20180316114528B8A4D7FF758E173A7C',
+        oldToken: '83cdec3e-edf2-4ea7-afc1-def491569594',
+        estateId: '',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作