centaline-data-driven 1.2.28 → 1.2.31

package/package.json

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

package/src/Form.vue

@@ -1,40 +1,25 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
-    <!-- <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form> -->
+    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
+    <!-- <ct-form :api="'/PropertyPublish/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
     <!--:api="'FormSample/formdata'"-->
     <!--<ct-form :source="formdata.content"></ct-form>-->
     <!--<ct-form :api="'/api/form/formdata/contractDetail'" :apiParam="apiParam"></ct-form>-->
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
-    <!-- <ct-form :api="'/forminfo/readDetail'" :apiParam="apiParam"></ct-form> -->
-    <!-- <ct-form :api="'PropertyKey/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'PropertyDuty/getLayoutOfClearDuty'" :apiParam="para"></ct-form>
-    <!-- <ct-form :api="'/api/distribution/transaction/add'" :apiParam="apiParam"></ct-form> -->
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
 
 <script>
   export default {
-    name: 'DataDrivenForm',
+    name: 'App',
     data() {
       return {
-        // apiParam: {originalTraId: "1481454808274235394", actionType: 3, pageTitle: "成交报告", pageOnly: true} ,
+        // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
+        apiParam: {originalTraId: "1475658732246241281", actionType: 3, pageTitle: "成交报告", pageOnly: true} ,
         // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
         // apiParam: {SN: "13557_132", UserID: "wuhan3"},
-        // apiParam: {actionType: 3,formId: "2c12649f-09c5-4aa9-8011-b6d1c7b56a41"} ,
-        // apiParam: {chanceID: "1", actionType: 2} ,
-        // apiParam: {worklistID: "1494206747714392064", actionType: 2}
-        para: {propertyID: "1", actionType: 2}
-        // apiParam: {
-        //   actionType: 2,
-        //   agentId: "1450283160825425922",
-        //   estateId: "B6E6B3D8-FDF2-4AF8-91E6-B348D637E993",
-        //   pageOnly: true,
-        //   pageStyle: 2,
-        //   propertyId: "14102015-0736-9265-205A-451687BF7062",
-        //   relProId: "1475708315466829833",
-        // }
       }
     },
     methods: {

package/src/centaline/css/common.css

@@ -777,3 +777,9 @@ html {
 .details-mid .st-serach-screen,.details-mid .ct-searchtable{
   border-radius: initial;
 }
+.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/dialogList/src/dialog.vue

@@ -149,10 +149,10 @@
                                     if(item.attrs.height){
                                       ph=parseInt(item.attrs.height.replace('px',''));
                                     }
-                                    if(self.vmodel.pane && self.vmodel.pane.$el.offsetHeight<ph){
-                                      item.attrs.height=(self.vmodel.pane.$el.offsetHeight-30)+'px';
+                                    if(self.vmodel.pane && self.vmodel.pane.$el.clientHeight<ph){
+                                      item.attrs.height=(self.vmodel.pane.$el.clientHeight-40)+'px';
                                     }
-                                    // console.log(document.body.offsetHeight);
+                                    // console.log(document.body.clientHeight);可见区域高度
                                     // console.log(item.attrs.height)
                                     return h('div', {
                                       style: {

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,11 @@
                     :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,
+                    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,
                     column.fixed === 'left'?'left-fixation':null,
@@ -74,8 +80,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 +131,10 @@
         colHasWidth: {},//有无列宽集合
         pageRowMin: 0,//页面实际的第一行号
         pageRowMax: 100,//页面实际的第后行号   
+        rowMergedColumns:['contactNameDesc','propertyIdentityTypeID','operation'],
+        rowBorderLeftColumns:['contactNameDesc','operation'],
+        rowBorderRightColumns:['propertyIdentityTypeID','operation'],
+        selectKey:'',
       }
     },
     mounted() {    
@@ -178,7 +188,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 +213,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 +235,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 +252,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 +501,12 @@
 
 .ct-tableParent {
     overflow: auto;
-    border-bottom: 1px solid #ebeef5;
+    border-bottom: 0px;
     width: 100%;
     outline: 0;
+    padding: 0px;
   }
-  .ct-searchtable .ct-table {
+.ct-searchtable .ct-table {
     min-width: 100%;
     border-collapse: separate;
   }
@@ -519,6 +532,18 @@
   .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;
+  }
+  .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/dynamicFile/src/dynamicFile.vue

@@ -34,16 +34,16 @@
           <span class="cover-list-item-span" v-if="model.lock||model.paramName">
             <!--锁定-->
             <span v-if="model.lock || !file.rightEdit" class="el-dropdown-link">
-              &nbsp;{{file.mediaLabelName}}
+              <span style="width:80px;height:26px;display: inline-flex">&nbsp;{{file.mediaLabelName}}</span>
             </span>
             <!--复杂分类-->
             <span v-else-if="model.isComplexClassify" class="el-dropdown-link" @click="classifyFormClickHandle(file)">
-              &nbsp;{{file.mediaLabelName}}<i class="el-icon-arrow-down el-icon--right"></i>
+              <span style="width:80px;height:26px;display: inline-flex">&nbsp;{{file.mediaLabelName}}</span><i class="el-icon-arrow-down el-icon--right"></i>
             </span>
             <!--简单分类-->
             <el-dropdown v-else class="el-upload-list__item-preview" trigger="click" placement="top" @command="classifySelectedClickHandle">
               <span class="el-dropdown-link" @click="classifyClickHandle">
-                &nbsp;{{file.mediaLabelName}}<i class="el-icon-arrow-down el-icon--right"></i>
+                <span style="width:80px;height:26px;display: inline-flex">&nbsp;{{file.mediaLabelName}}</span><i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown" class="el-upload-list__item-preview">
                 <el-dropdown-item v-for="(option, index) in model.optionModel.options" :key="index" :command="{option:option,file:file}">
@@ -331,6 +331,19 @@
     background-color: #544f48;
     opacity: 0.8;
   }
+  .ct-file .el-dropdown-link{
+    cursor: pointer;
+    color: #fff;
+    position: relative;
+    width: 100px;
+    height: 26px;
+    display: inline-block;
+  }
+  .el-icon--right {
+      position: absolute;
+      right: 5px;
+      top: 6px;
+  }
   .ct-file .cover-list-item-span-delete {
     position: inherit;
     bottom: 160px;

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -554,8 +554,7 @@
       },
       getFormObj(){
         let formData=this.model.getFormObj();
-        if(this.$route && this.$route.query && this.$route.query.pageStyle)
-        {
+        if(this.$route && this.$route.query && this.$route.query.pageStyle){
            return Object.assign(formData,{'pageStyle':this.$route.query.pageStyle});
         }
         return formData;

package/src/centaline/dynamicL/src/dynamicL.vue

@@ -12,8 +12,8 @@
       </el-input>
       <span v-if="model.sufLabel" style="width:auto" class="spanMessage">{{model.sufLabel}}</span> -->
       <div class="el-input el-input--mini el-input-group el-input-group--prepend el-input--suffix showLabel lableinput">
-        <div class="el-input-group__prepend">
-          <div v-if="model.showLabel && model.label" slot="prepend" class="" :class="[model.labelClass]">
+        <div v-if="model.showLabel && model.label" class="el-input-group__prepend">
+          <div slot="prepend" class="" :class="[model.labelClass]">
             {{model.label}}
           </div>
         </div>

package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchListTable.vue

@@ -19,7 +19,7 @@
                          :prop="col.id" :label="col.name" :min-width="col.width">
         </el-table-column>
       </el-table>
-      <div style="margin-top: 20px; width:100%;">
+      <div style="margin-top: 20px;width: 100%;display: inline-block;height: 30px;margin-bottom: 10px;">
         <el-input v-if="jumpBtnName" size="mini" v-model="jumpStr" placeholder="定位" style="width:150px"></el-input>
         <el-button v-if="jumpBtnName" size="mini" @click="jumpClickHandler()">{{jumpBtnName}}</el-button>
         <el-button v-if="filterBtnName" size="mini" @click="filterClickHandler()" style="margin-left: 0px;">{{filterBtnName}}</el-button>

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/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>