centaline-data-driven 1.2.30 → 1.2.31

package/package.json

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

package/src/centaline/css/common.css

@@ -780,3 +780,6 @@ html {
 .current-row .el-table__cell .el-input-group__prepend{
   min-width: 0!important;
 }
+.list-button .max-btn-add{
+  width: 85px;
+}

package/src/centaline/css/max.css

@@ -47,7 +47,6 @@
     height: 26px;
     background: #EE6B6B;
     border-color:#EE6B6B;
-    width: 85px;
     box-shadow: 0px 2px 4px 0px rgba(238,107,107,0.25);
     border-radius: 6px;
 }

package/src/centaline/dynamicDetail/src/dynamicContactList.vue

@@ -71,6 +71,7 @@
                     //row.flagRow && row.columnShow===column.id?'ct-td3':null,
                     rowBorderLeftColumns.includes(column.id)?'ct-td4':null,
                     rowBorderRightColumns.includes(column.id)?'ct-td5':null,
+                    model.rowHiddenKeyData.indexOf(row[model.rowHiddenKey])%2?'ct-tdDouble':'ct-tdSingle',
                     selectKey===row[model.rowHiddenKey]?'select':null,
                     colIndex === leftShadow?'shadowLeft':null,
                     colIndex === rightShadow?'shadowRight':null,
@@ -503,6 +504,7 @@
     border-bottom: 0px;
     width: 100%;
     outline: 0;
+    padding: 0px;
   }
 .ct-searchtable .ct-table {
     min-width: 100%;
@@ -536,6 +538,12 @@
   .ct-searchtable .ct-tr > .ct-td5 {
     border-right: 1px solid #e7e8eb;
   }
+  .ct-searchtable .ct-tr > .ct-tdSingle {
+    background-color: rgb(255 243 244);
+  }
+  .ct-searchtable .ct-tr > .ct-tdDouble {
+    background-color: rgb(239 255 239);
+  }
   .shadowLeft {
     border-right: 1px solid #e7e8eb;
     box-shadow: 2px 0 3px -1px rgba(0,0,0,0.1);

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

@@ -26,7 +26,7 @@
                :class="['ct-table',model.attrs.size?'ct-table-'+model.attrs.size:'']">
           <!--表头-->
           <thead ref="tableHead">
-            <tr class="ct-tr" ref="headTr" v-for="(columns,columnsIndex) in model.columnsArr">
+            <tr class="ct-tr" ref="headTr" v-for="(columns,columnsIndex) in model.columnsArr" :key="columnsIndex">
               <th v-if="model.isMulti && columnsIndex === 0" ref="headLeftThs" class="ct-td left-fixation-th checkbox-td" :class="[model.tdClass]">
                 <label class="el-checkbox"><span class="el-checkbox__input" :class="model.selectAllType">
                   <span class="el-checkbox__inner"></span>
@@ -37,7 +37,7 @@
 
                 
               </th>
-              <th :ref="column.fixed?(column.fixed==='left'?'headLeftThs':'headRightThs'):'headThs'" v-for="(column,colIndex) in columns"
+              <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"
                   :rowspan="column.rowspan"
                   :colspan="column.colspan"
@@ -75,7 +75,7 @@
               </td>
             </tr>-->
             <!--可视区域的行数据-->
-            <tr v-for="(row,rowindex) in model.listData"
+            <tr v-for="(row,rowindex) in model.listData" :key="rowindex"
                 v-if="pageRowMin <= rowindex && rowindex <= pageRowMax"
                 :ref="'rows.'+rowindex" @click="rowClickHandle($event,rowindex)"
                 class="ct-tr"
@@ -89,7 +89,7 @@
               </label>
               </td>
               <td :ref="column.fixed?(column.fixed==='left'?'headLeftTds':'headRightTds'):null"
-                  v-for="(column,colIndex) in model.dataFieldcolumns"
+                  v-for="(column,colIndex) in model.dataFieldcolumns" :key="colIndex"
                   v-if="tdShow(column, row)"
                   :rowspan="tdRowspan(column, row)"
                   class="ct-td"

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

@@ -15,6 +15,7 @@ const ContactList = function (source,para ,callBack) {
       _columns: [],
       _columnsArr: [],
       _dataFieldcolumns: [],
+      _dataFieldcolumnsShow: [],
       _listData: [],
       _scripts: null,
       isMergeTitle: false,//是否合并标题    
@@ -23,6 +24,7 @@ const ContactList = function (source,para ,callBack) {
       rowHiddenKey:'contactID',
       rowHiddenColumns:['contactNameDesc','propertyIdentityTypeID'],
       columnShow:'contactNoTypeDesc',
+      rowHiddenKeyData:[],
       attrs: {
         size: 'mini'
       },
@@ -91,7 +93,7 @@ const ContactList = function (source,para ,callBack) {
                   var newRow = {};
                   newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
                   newRow.descNewRow = v.descNewRow;
-                  newRow.colspan = rtn.dataFieldcolumns.length-rtn.rowMergedColumns.length;
+                  newRow.colspan = rtn.dataFieldcolumnsShow.length-rtn.rowMergedColumns.length;
                   newRow.columnShow=rtn.columnShow;
                   newRow.flagRow=true;
                   rtn._listData.push(newRow);
@@ -101,6 +103,11 @@ const ContactList = function (source,para ,callBack) {
         }
         return rtn._listData;
       },
+      set listData(v) {
+        if (v) {
+          rtn._listData=v;
+        }
+      },
       get columns() {
         var self = this;
         if (self._columns.length > 0) {
@@ -282,6 +289,20 @@ const ContactList = function (source,para ,callBack) {
           self._dataFieldcolumns = arr;
           return self._dataFieldcolumns;
         }
+      },      
+      get dataFieldcolumnsShow() {
+        var self = this;
+        if (self._dataFieldcolumnsShow.length > 0) {
+          return self._dataFieldcolumnsShow;
+        }
+        else {
+          var arr = self.columns.filter(v => {
+            return v.isDataField !== false && v.show
+          });
+
+          self._dataFieldcolumnsShow = arr;
+          return self._dataFieldcolumnsShow;
+        }
       },
       get rowMergedColumns() {
         return source.rowMergedColumns || [];
@@ -314,44 +335,10 @@ const ContactList = function (source,para ,callBack) {
           if (response.rtnCode === Enum.ReturnCode.Successful) {
             if (response.content.rows.length > 0) {
               if(router.flagAddRowAfterAction){
-                response.content.rows.forEach((v) => {
-                  if(v.descNewRow){
-                    var newRow = {};
-                    newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
-                    newRow.descNewRow = v.descNewRow;
-                    newRow.colspan = rtn.dataFieldcolumns.length-rtn.rowMergedColumns.length;
-                    newRow.columnShow=rtn.columnShow;
-                    newRow.flagRow=true;
-                    rtn._listData.unshift(newRow);
-                  }
-                  rtn._listData.unshift(v);
-                });
-                rtn.setHiddenRow();
+                rtn.doNew(response.content.rows);   
               }
               else{
-                let updateData=[];
-                response.content.rows.forEach((v) => {
-                  updateData.push(v);
-                  if(v.descNewRow){
-                    var newRow = {};
-                    newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
-                    newRow.descNewRow = v.descNewRow;
-                    newRow.colspan = rtn.dataFieldcolumns.length-rtn.rowMergedColumns.length;
-                    newRow.columnShow=rtn.columnShow;
-                    newRow.flagRow=true;
-                    updateData.push(newRow);
-                  }
-                });
-                let strat=0;
-                let count=0;
-                rtn._listData.forEach((v,i) => {
-                  if(v[rtn.rowHiddenKey]===searchValue1){
-                    if(strat===0)strat=i;
-                    count=count+1;
-                  }
-                });
-                rtn._listData.splice(strat, count,updateData);
-                rtn.setHiddenRow();
+                rtn.doUpdate(response.content.rows,searchValue1);
               }
             }
           }
@@ -387,46 +374,12 @@ const ContactList = function (source,para ,callBack) {
               break;
             case Enum.ActionType.New://新增
             case Enum.ActionType.CloseTabThenNew://新增  
-              response.content.forEach((v) => {
-                if(v.descNewRow){
-                  var newRow = {};
-                  newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
-                  newRow.descNewRow = v.descNewRow;
-                  newRow.colspan = rtn.dataFieldcolumns.length-rtn.rowMergedColumns.length;
-                  newRow.columnShow=rtn.columnShow;
-                  newRow.flagRow=true;
-                  rtn._listData.unshift(newRow);
-                }
-                rtn._listData.unshift(v);
-              });
-              rtn.setHiddenRow();
+              rtn.doNew(response.content);              
               break;
             case Enum.ActionType.Update://修改
             case Enum.ActionType.CloseTabThenUpdate://修改
               var searchValue1=rtn.listData[rtn.selectIndex][self.primaryKey];
-              let updateData=[];
-              response.content.forEach((v) => {
-                updateData.push(v);
-                if(v.descNewRow){
-                  var newRow = {};
-                  newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
-                  newRow.descNewRow = v.descNewRow;
-                  newRow.colspan = rtn.dataFieldcolumns.length-rtn.rowMergedColumns.length;
-                  newRow.columnShow=rtn.columnShow;
-                  newRow.flagRow=true;
-                  updateData.push(newRow);
-                }
-              });
-              let strat=0;
-              let count=0;
-              rtn._listData.forEach((v,i) => {
-                if(v[rtn.rowHiddenKey]===searchValue1){
-                  if(strat===0)strat=i;
-                  count=count+1;
-                }
-              });
-              rtn._listData.splice(strat, count,updateData);
-              rtn.setHiddenRow();
+              rtn.doUpdate(response.content,searchValue1);
               break;
             default:
               break;
@@ -434,6 +387,63 @@ const ContactList = function (source,para ,callBack) {
         }
         rtn.$vue.$forceUpdate();
       },
+      doNew(data){
+        data.forEach((v) => {
+          if(v.descNewRow){
+            var newRow = {};
+            newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
+            newRow.descNewRow = v.descNewRow;
+            newRow.colspan = rtn.dataFieldcolumnsShow.length-rtn.rowMergedColumns.length;
+            newRow.columnShow=rtn.columnShow;
+            newRow.flagRow=true;
+            rtn._listData.unshift(newRow);
+          }
+          rtn._listData.unshift(v);
+        });
+        rtn.setHiddenRow();
+      },
+      doUpdate(data,searchValue1){
+        let updateData=[];
+        data.forEach((v) => {
+          updateData.push(v);
+          if(v.descNewRow){
+            var newRow = {};
+            newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
+            newRow.descNewRow = v.descNewRow;
+            newRow.colspan = rtn.dataFieldcolumnsShow.length-rtn.rowMergedColumns.length;
+            newRow.columnShow=rtn.columnShow;
+            newRow.flagRow=true;
+            updateData.push(newRow);
+          }
+        });
+        let strat=0;
+        let count=0;
+        rtn._listData.forEach((v,i) => {
+          if(v[rtn.rowHiddenKey]===searchValue1){
+            if(strat===0)strat=i;
+            count=count+1;
+          }
+        });
+        if(updateData.length===1){
+          rtn._listData.splice(strat, count,updateData[0]);
+        }        
+        else if(updateData.length===2){
+          rtn._listData.splice(strat, count,updateData[0],updateData[1]);
+        }       
+        else if(updateData.length===3){
+          rtn._listData.splice(strat, count,updateData[0],updateData[1],updateData[2]);
+        }       
+        else if(updateData.length===4){
+          rtn._listData.splice(strat, count,updateData[0],updateData[1],updateData[2],updateData[3]);
+        }       
+        else if(updateData.length===5){
+          rtn._listData.splice(strat, count,updateData[0],updateData[1],updateData[2],updateData[3],updateData[4]);
+        }       
+        else if(updateData.length===6){
+          rtn._listData.splice(strat, count,updateData[0],updateData[1],updateData[2],updateData[3],updateData[4],updateData[5]);
+        }
+        rtn.setHiddenRow();
+      },
       get scripts() {
         if (rtn._scripts !== null) {
           return rtn._scripts;
@@ -471,7 +481,11 @@ const ContactList = function (source,para ,callBack) {
         let lastKey='';
         let count=1;
         let firstIndex=0;
+        rtn.rowHiddenKeyData=[];
         for (let i = 0; i < rtn.listData.length; i++) {
+          if(!rtn.rowHiddenKeyData.includes(rtn.listData[i][rtn.rowHiddenKey])){
+            rtn.rowHiddenKeyData.push(rtn.listData[i][rtn.rowHiddenKey])
+          }
           rtn.listData[i].$rowspan=0;
           if(lastKey){
             if(rtn.listData[i][rtn.rowHiddenKey]){