centaline-data-driven 1.2.29 → 1.2.30

package/package.json

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

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

@@ -33,6 +33,8 @@
                     :rowspan="column.rowspan"
                     :colspan="column.colspan"
                     :class="[colHasWidth[colIndex],column.sortAction,model.tdClass,
+                    rowBorderLeftColumns.includes(column.id)?'ct-td4':null,
+                    rowBorderRightColumns.includes(column.id)?'ct-td5':null,
                     colIndex === leftShadow?'shadowLeft':null,
                     colIndex === rightShadow?'shadowRight':null,
                     column.fixed === 'left'?'left-fixation-th':null,
@@ -66,7 +68,10 @@
                     :colspan="tdColspan(column, row)"
                     class="ct-td"
                     :class="[colHasWidth[colIndex],model.tdClass,
-                    row.flagRow?'ct-td3':null,
+                    //row.flagRow && row.columnShow===column.id?'ct-td3':null,
+                    rowBorderLeftColumns.includes(column.id)?'ct-td4':null,
+                    rowBorderRightColumns.includes(column.id)?'ct-td5':null,
+                    selectKey===row[model.rowHiddenKey]?'select':null,
                     colIndex === leftShadow?'shadowLeft':null,
                     colIndex === rightShadow?'shadowRight':null,
                     column.fixed === 'left'?'left-fixation':null,
@@ -74,8 +79,8 @@
                     column.fixed === 'right'?'right-fixation':null]"
                     v-bind="column.attrs">
                   <!--操作列-->
-                  <div v-if="row.flagRow" :class="column.autoRowHeight ? 'lineFeedCell':'cell'">
-                    {{row.descNewRow}}
+                  <div v-if="row.flagRow" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" style="color: #999;">
+                    {{row.rowHiddenColumns && row.rowHiddenColumns.includes(column.id)?"":row.descNewRow}}
                   </div>
                   <div v-else-if="column.id==='operation' && row.rowHiddenColumns==undefined" class="div_allinline" :class="column.autoRowHeight ? 'lineFeedCell':'cell'">
                     <ct-tablecurrency v-for="(router,rowRouterIndex) in model.rowRouter" :key="rowRouterIndex" 
@@ -125,6 +130,10 @@
         colHasWidth: {},//有无列宽集合
         pageRowMin: 0,//页面实际的第一行号
         pageRowMax: 100,//页面实际的第后行号   
+        rowMergedColumns:['contactNameDesc','propertyIdentityTypeID','operation'],
+        rowBorderLeftColumns:['contactNameDesc','operation'],
+        rowBorderRightColumns:['propertyIdentityTypeID','operation'],
+        selectKey:'',
       }
     },
     mounted() {    
@@ -178,7 +187,8 @@
           });
         router.doSearch(submitData, (res) => {
           if (res.rtnCode === 200) {
-            res.apiRouter=self.apiRouter;
+            res.apiRouter=self.apiRouter;            
+            res.rowMergedColumns=self.rowMergedColumns;
             self.loaderObj.ContactList(res,null,self.load);
             self.flagLook = true;
           }
@@ -202,19 +212,21 @@
       },
       rowColorChange() {
         var index = this.model.selectIndex;
-        if (typeof this.$refs['rows.' + index] !== "undefined" && this.currentRow !== this.$refs['rows.' + index][0]) {
-          if (this.currentRow !== null) {
-            for (var i = 0; i < this.currentRow.children.length; i++) {
-              this.currentRow.children[i].classList.remove('select');
-            }
-          }
-          if (this.$refs['rows.' + index][0]) {
-            for (var j = 0; j < this.$refs['rows.' + index][0].children.length; j++) {
-              this.$refs['rows.' + index][0].children[j].classList.add('select');
-            }
-          }
-          this.currentRow = this.$refs['rows.' + index][0] || null;
-        }
+        this.selectKey=this.model.listData[index][this.model.rowHiddenKey];
+        this.currentRow = this.$refs['rows.' + index][0] || null;
+        // if (typeof this.$refs['rows.' + index] !== "undefined" && this.currentRow !== this.$refs['rows.' + index][0]) {
+        //   if (this.currentRow !== null) {
+        //     for (var i = 0; i < this.currentRow.children.length; i++) {
+        //       this.currentRow.children[i].classList.remove('select');
+        //     }
+        //   }
+        //   if (this.$refs['rows.' + index][0]) {
+        //     for (var j = 0; j < this.$refs['rows.' + index][0].children.length; j++) {
+        //       this.$refs['rows.' + index][0].children[j].classList.add('select');
+        //     }
+        //   }
+        //   this.currentRow = this.$refs['rows.' + index][0] || null;
+        // }
       },
       tdRowspan(column, row) {
         if (!column.show) {
@@ -222,17 +234,16 @@
         }
 
         //合并行
-        if (row.$rowspan !== 0 && this.model.rowMergedColumns.indexOf(column.id) > -1) {
+        if (row.$rowspan !== 0 && this.rowMergedColumns.includes(column.id)) {
           return row.$rowspan;
         }
 
         return '';
       },
       tdColspan(column, row) {
-        if (row.colspan !== 0) {
+        if (row.colspan !== 0 && row.columnShow===column.id) {
           return row.colspan;
         }
-        return '';
       },
       tdShow(column, row) {
         if (!column.show) {
@@ -240,11 +251,11 @@
         }
 
         //合并行
-        if (row.$rowspan === 0 && this.model.rowMergedColumns.indexOf(column.id) > -1) {
+        if (row.$rowspan === 0 && this.rowMergedColumns.indexOf(column.id) > -1) {
           return false;
         }
 
-        if(row.flagRow && row.columnShow!==column.id){
+        if(row.flagRow && row.columnShow!==column.id && !row.rowHiddenColumns.includes(column.id)){
           return false;
         }
 
@@ -489,11 +500,11 @@
 
 .ct-tableParent {
     overflow: auto;
-    border-bottom: 1px solid #ebeef5;
+    border-bottom: 0px;
     width: 100%;
     outline: 0;
   }
-  .ct-searchtable .ct-table {
+.ct-searchtable .ct-table {
     min-width: 100%;
     border-collapse: separate;
   }
@@ -519,6 +530,12 @@
   .ct-searchtable .ct-tr > .ct-td3 {
     border: 1px solid #e7e8eb;
   }
+  .ct-searchtable .ct-tr > .ct-td4 {
+    border-left: 1px solid #e7e8eb;
+  }
+  .ct-searchtable .ct-tr > .ct-td5 {
+    border-right: 1px solid #e7e8eb;
+  }
   .shadowLeft {
     border-right: 1px solid #e7e8eb;
     box-shadow: 2px 0 3px -1px rgba(0,0,0,0.1);

package/src/centaline/dynamicSosTt/src/dynamicSosTt.vue

@@ -7,35 +7,40 @@
           <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
             {{model.label}}
           </div>
-          <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(!model.paramName || model.lock)? 'manual' : 'click'">
-            <div>
-              <div>
-                <el-input ref="searchInput" :size="model.attrs.size" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
-              </div>
-              <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
+          <div class="ct-sostt">
+            <div  :class="[model.w1=='0'?'ct-input-editor':'ct-input-editorw']" :style="{'width':(model.w1!='0'?model.w1+'px':'auto')}">
+              <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(!model.paramName || model.lock)? 'manual' : 'click'">
+                <div>
+                  <div>
+                    <el-input ref="searchInput" :size="model.attrs.size" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
+                  </div>
+                  <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
+                </div>
+                <input slot="reference" v-bind="model.attrs" readonly="readonly" v-model="model.text" :placeholder="soPlaceholder"
+                       ref="ct-input" :style="{height:inputHeight + 'px','line-height':inputLineHeight + 'px'}"
+                       @focus="focusHandle" @blur="blurHandle" @click="clickHandle" @input="inputHandler($event)" @change="changeHandler($event)"
+                       :disabled="model.lock" :class="model.lock ? 'ct-is-disabled' : 'ct-input_inner'" />
+              </el-popover>
+              <span v-if="!model.lock" class="el-input__suffix" @click="clickHandle" :class="[model.attrs.size?'el-input--'+model.attrs.size:'']">
+                <span v-if="showClear === false" class="el-input__suffix-inner">
+                  <i class="el-select__caret el-input__icon el-icon-arrow-up" :class="{'is-reverse':showDrop}"></i>
+                </span>
+                <span v-if="showClear === true" class="el-input__suffix-inner ct-close">
+                  <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event)"></i>
+                </span>
+              </span>
             </div>
-            <input slot="reference" v-bind="model.attrs" readonly="readonly" v-model="model.text" :placeholder="soPlaceholder"
-                   ref="ct-input" :style="{height:inputHeight + 'px','line-height':inputLineHeight + 'px'}"
-                   @focus="focusHandle" @blur="blurHandle" @click="clickHandle" @input="inputHandler($event)" @change="changeHandler($event)"
-                   :disabled="model.lock" :class="model.lock ? 'ct-is-disabled' : 'ct-input_inner'" />
-          </el-popover>
-          <span v-if="!model.lock" class="el-input__suffix" @click="clickHandle" :class="[model.attrs.size?'el-input--'+model.attrs.size:'']">
-            <span v-if="showClear === false" class="el-input__suffix-inner">
-              <i class="el-select__caret el-input__icon el-icon-arrow-up" :class="{'is-reverse':showDrop}"></i>
-            </span>
-            <span v-if="showClear === true" class="el-input__suffix-inner ct-close">
-              <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event)"></i>
-            </span>
-          </span>
+            <div class="ml10" :class="[model.w2=='0'?'ct-input-editor':'ct-input-editorw']" :style="{'width':(model.w2!='0'?model.w2+'px':'auto')}">
+              <el-input :title="model.lock?model.value1:''" :type="model.inputType" v-model="model.value1" v-bind="model.attrs" @input="inputHandler($event);isShowClear()" @change="changeHandler($event)"
+                        class="ct-flex-div-input max-input" :class="[model.showLabel?'showLabel':'',!valid?'inputError':'']" :disabled="model.lock" :rows="model.rows"
+                        :readonly="model.readonly" :show-password="model.isPassword" autocomplete="on" :maxlength="model.max" :show-word-limit="model.showWordLimit"
+                        @keyup.enter.native="search()">
+              </el-input>
+            </div>
+          </div>
         </div>
       </div>
-      <div style="width:40%; margin-left:10px;">
-        <el-input :title="model.lock?model.value1:''" :type="model.inputType" v-model="model.value1" v-bind="model.attrs" @input="inputHandler($event);isShowClear()" @change="changeHandler($event)"
-                  class="ct-flex-div-input max-input" :class="[model.showLabel?'showLabel':'',!valid?'inputError':'']" :disabled="model.lock" :rows="model.rows"
-                  :readonly="model.readonly" :show-password="model.isPassword" autocomplete="on" :maxlength="model.max" :show-word-limit="model.showWordLimit"
-                  @keyup.enter.native="search()">
-        </el-input>
-      </div>
+     
       <span v-if="model.sufLabel" class="spanMessage ct-flex-div-span">{{model.sufLabel}}</span>
       <transition name="el-fade-in">
         <span v-show="!valid" class="errorMessage">
@@ -243,7 +248,8 @@
       },
       //不能共用的数据校验
       selfValidExcute: function (eventName) {
-        if (this.required == true && this.model.value1 == "") {
+        if (this.model.required && this.model.value1 == "") {
+          this.validMessage = "必填";
           this.valid = false;
           return false;
         }
@@ -280,4 +286,27 @@
 .h26{
   height: 26px;
 }
+  .ct-so .ct-sostt {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+  }
+
+    .ct-so .ct-sostt .ct-input-editor {
+      flex: 1 0 0;
+      position: relative;
+    }
+    .ct-so .ct-sostt .ct-input-editorw {
+      position: relative;
+      display:inline-block;
+    }
+
+    .ct-so .ct-sostt .ml10 {
+    margin-left:10px;
+    }
+  .ct-sostt .showLabel input {
+    border-top-left-radius: 4px !important;
+    border-bottom-left-radius: 4px !important;
+    text-align: left !important;
+  }
 </style>

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

@@ -21,7 +21,8 @@ const ContactList = function (source,para ,callBack) {
       selectIndex: 0,
       formData: formData,
       rowHiddenKey:'contactID',
-      rowHiddenColumns:['contactName','propertyIdentityTypeID'],
+      rowHiddenColumns:['contactNameDesc','propertyIdentityTypeID'],
+      columnShow:'contactNoTypeDesc',
       attrs: {
         size: 'mini'
       },
@@ -90,8 +91,8 @@ const ContactList = function (source,para ,callBack) {
                   var newRow = {};
                   newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
                   newRow.descNewRow = v.descNewRow;
-                  newRow.colspan = rtn.dataFieldcolumns.length;
-                  newRow.columnShow=rtn.dataFieldcolumns[0].id;
+                  newRow.colspan = rtn.dataFieldcolumns.length-rtn.rowMergedColumns.length;
+                  newRow.columnShow=rtn.columnShow;
                   newRow.flagRow=true;
                   rtn._listData.push(newRow);
               }
@@ -283,7 +284,7 @@ const ContactList = function (source,para ,callBack) {
         }
       },
       get rowMergedColumns() {
-        return source.content.rowMergedColumns || [];
+        return source.rowMergedColumns || [];
       },
       get apiRouter() {
         return source.apiRouter;
@@ -291,13 +292,14 @@ const ContactList = function (source,para ,callBack) {
       getCurrentRowApiData(rtnData,router) {
         var self = this;
         var searchFields = self.apiRouter.getSearchPara();
+        var searchValue1=router.flagAddRowAfterAction? rtnData.content: rtn.listData[rtn.selectIndex][self.primaryKey];
         if (self.primaryKey) {
           searchFields.fields.push({
             fieldName1: self.primaryFieldMappingDBName ? self.primaryFieldMappingDBName : self.primaryKey,
             groupName: self.primaryKey,
             operation: Enum.SearchOperation.等于,
             searchDataType: Enum.SearchDataType.Text,
-            searchValue1: router.flagAddRowAfterAction? rtnData.content: rtn.listData[rtn.selectIndex][self.primaryKey],
+            searchValue1: searchValue1,
           });
         }
         Vue.prototype.$api.postHandler(common.globalUri(), {
@@ -317,8 +319,8 @@ const ContactList = function (source,para ,callBack) {
                     var newRow = {};
                     newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
                     newRow.descNewRow = v.descNewRow;
-                    newRow.colspan = rtn.dataFieldcolumns.length;
-                    newRow.columnShow=rtn.dataFieldcolumns[0].id;
+                    newRow.colspan = rtn.dataFieldcolumns.length-rtn.rowMergedColumns.length;
+                    newRow.columnShow=rtn.columnShow;
                     newRow.flagRow=true;
                     rtn._listData.unshift(newRow);
                   }
@@ -327,11 +329,29 @@ const ContactList = function (source,para ,callBack) {
                 rtn.setHiddenRow();
               }
               else{
-                // response.content.rows.forEach((row) => {
-                //   for (var vkey in row) {
-                //     rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
-                //   }
-                // });
+                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();
               }
             }
           }
@@ -372,8 +392,8 @@ const ContactList = function (source,para ,callBack) {
                   var newRow = {};
                   newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
                   newRow.descNewRow = v.descNewRow;
-                  newRow.colspan = rtn.dataFieldcolumns.length;
-                  newRow.columnShow=rtn.dataFieldcolumns[0].id;
+                  newRow.colspan = rtn.dataFieldcolumns.length-rtn.rowMergedColumns.length;
+                  newRow.columnShow=rtn.columnShow;
                   newRow.flagRow=true;
                   rtn._listData.unshift(newRow);
                 }
@@ -383,11 +403,30 @@ const ContactList = function (source,para ,callBack) {
               break;
             case Enum.ActionType.Update://修改
             case Enum.ActionType.CloseTabThenUpdate://修改
-              response.content.forEach((row) => {
-                for (var vkey in row) {
-                  rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
+              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();
               break;
             default:
               break;
@@ -430,19 +469,31 @@ const ContactList = function (source,para ,callBack) {
           return;
         }
         let lastKey='';
+        let count=1;
+        let firstIndex=0;
         for (let i = 0; i < rtn.listData.length; i++) {
+          rtn.listData[i].$rowspan=0;
           if(lastKey){
             if(rtn.listData[i][rtn.rowHiddenKey]){
               if(rtn.listData[i][rtn.rowHiddenKey]===lastKey){
                 rtn.listData[i].rowHiddenColumns=rtn.rowHiddenColumns;
+                count++;
+                if(i===rtn.listData.length-1){
+                  rtn.listData[firstIndex].$rowspan=count;
+                }
               }
               else{
+                rtn.listData[firstIndex].$rowspan=count;
                 lastKey=rtn.listData[i][rtn.rowHiddenKey];
+                count=1;
+                firstIndex=i;
               }
             }
           }
           else{
             lastKey=rtn.listData[i][rtn.rowHiddenKey];
+            count=1;
+            firstIndex=i;
           }
         }
       },

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

@@ -22,6 +22,22 @@ const SosTt = function (source, moreActionRouter) {
         source.name1 = v;
       }
     },
+    get w1() {
+      if (typeof source.width1 !== 'undefined' && source.width1 != "0") {
+        return source.width1;
+      }
+      else {
+        return '0';
+      }
+    },
+    get w2() {
+      if (typeof source.width2 !== 'undefined' && source.width2 != "0") {
+        return source.width2;
+      }
+      else {
+        return '0';
+      }
+    },
     get optionColCount() {
       return parseInt(source.optCount) || 5;
     },