centaline-data-driven 1.2.27 → 1.2.30

package/build/centaline/centaline.path.js

@@ -7,6 +7,7 @@ const paths = {
     "dynamicMt": "./src/centaline/dynamicMt/index.js",//多行文本组件
     "dynamicSo": "./src/centaline/dynamicSo/index.js",//单选下拉菜单
     "dynamicSos": "./src/centaline/dynamicSos/index.js",//单选搜索下拉菜单
+    "dynamicSosTt": "./src/centaline/dynamicSosTt/index.js",//电话号码编辑框
     "dynamicT": "./src/centaline/dynamicT/index.js",//文本input组件
     "dynamicL": "./src/centaline/dynamicL/index.js",//文本label组件
     "dynamicTags": "./src/centaline/dynamicTags/index.js",//多选搜索下拉菜单组件

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.27",
+  "version": "1.2.30",
   "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/SearchList.vue

@@ -3,7 +3,7 @@
     <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
-    <ct-searchlist :searchConditionApi="'/exampleList/getLayoutOfSearch'" :searchDataApi="'/exampleList/getListOfSearchModel'"></ct-searchlist>
+    <ct-searchlist :searchConditionApi="'/PropertyPublishLogList/getLayoutOfSearch'" :searchDataApi="'/PropertyPublishLogList/getListOfSearchModel'"></ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
                    :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
@@ -24,7 +24,7 @@
     data() {
       return {
         //para: { agentId: "1424932685198864386", estateId: "L201402181627000007233", estateName: "271医院宿舍区", pageOnly: "true", pageTitle: "销控房源列表" }
-        para: {}
+        para: {publishID: "1503900718229229568"}
         // para: {paramKey: "PropertyStatusID", code: "002.001", name: "盘源状态", paramName: "盘源状态"}
       }
     },

package/src/centaline/css/common.css

@@ -777,3 +777,6 @@ 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;
+}

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,
@@ -63,8 +65,13 @@
                     v-for="(column,colIndex) in model.dataFieldcolumns" :key="colIndex"
                     v-if="tdShow(column, row)"
                     :rowspan="tdRowspan(column, row)"
+                    :colspan="tdColspan(column, row)"
                     class="ct-td"
                     :class="[colHasWidth[colIndex],model.tdClass,
+                    //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,
@@ -72,8 +79,12 @@
                     column.fixed === 'right'?'right-fixation':null]"
                     v-bind="column.attrs">
                   <!--操作列-->
-                  <div v-if="column.id==='operation'" class="div_allinline" :class="column.autoRowHeight ? 'lineFeedCell':'cell'">
-                    <ct-tablecurrency v-for="(router,rowRouterIndex) in model.rowRouter" :key="rowRouterIndex" v-if="!router.rightField || row[router.rightField] == 1" :isOperationalColumn="true"
+                  <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" 
+                                      v-if="!router.rightField || row[router.rightField] == 1" :isOperationalColumn="true"
                                       :router="router" :colValue="router.label" :rowData="row" @click="rolRouterClickHandler">
                     </ct-tablecurrency>
                   </div>
@@ -83,7 +94,7 @@
                   </ct-tablecurrency>
                   <!--正常的列-->
                   <div v-else-if="typeof column.template === 'undefined'" :class="column.autoRowHeight ? 'lineFeedCell':'cell'">
-                    {{row[column.id]}}
+                    {{row.rowHiddenColumns && row.rowHiddenColumns.includes(column.id)?"":row[column.id]}}
                   </div>
                 </td>
               </tr>
@@ -119,6 +130,10 @@
         colHasWidth: {},//有无列宽集合
         pageRowMin: 0,//页面实际的第一行号
         pageRowMax: 100,//页面实际的第后行号   
+        rowMergedColumns:['contactNameDesc','propertyIdentityTypeID','operation'],
+        rowBorderLeftColumns:['contactNameDesc','operation'],
+        rowBorderRightColumns:['propertyIdentityTypeID','operation'],
+        selectKey:'',
       }
     },
     mounted() {    
@@ -149,13 +164,31 @@
         });
         this.model.scripts.formData = this.model.formData;
         this.model.scripts.formData.formTable = this.model;
+        this.model.setHiddenRow();
         console.log(this.model);
       },
       lookOwner(router) {
         var self = this; 
-        var submitData=router.getActionPara({}).para;
-        router.doAction(submitData, (res) => {
+        var submitData={
+          action: router.action,
+          para: {
+            searchFields: null,
+            pageAttribute: { pageIndex: 1 },
+            flagSearch: true
+          }
+        };
+        submitData.para.searchFields=router.getSearchPara();
+        submitData.para.searchFields.fields.push({
+            fieldName1: 'flagLookFromButton',
+            groupName: 'flagLookFromButton',
+            operation: 1,
+            searchDataType: 3,
+            searchValue1: '1',
+          });
+        router.doSearch(submitData, (res) => {
           if (res.rtnCode === 200) {
+            res.apiRouter=self.apiRouter;            
+            res.rowMergedColumns=self.rowMergedColumns;
             self.loaderObj.ContactList(res,null,self.load);
             self.flagLook = true;
           }
@@ -179,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) {
@@ -199,19 +234,28 @@
         }
 
         //合并行
-        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 && row.columnShow===column.id) {
+          return row.colspan;
+        }
+      },
       tdShow(column, row) {
         if (!column.show) {
           return false;
         }
 
         //合并行
-        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 && !row.rowHiddenColumns.includes(column.id)){
           return false;
         }
 
@@ -222,13 +266,7 @@
         field.submitListField.forEach((k) => {
           submitData[k] = rowData[k];
         });
-
-        let action = field.action;
-        if (field.actionField) {
-          action = rowData[field.actionField];
-        }
-
-        this.routerClickHandler(field, submitData, action);
+        this.routerClickHandler(field, submitData, null);
       },
       fieldClickHandler(field) {
         var self = this;
@@ -462,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;
   }
@@ -492,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/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

@@ -113,7 +113,7 @@
                 </ct-tablecurrency>
 
                 <!--正常的列-->
-                <div v-else-if="typeof column.template === 'undefined'" :class="column.autoRowHeight ? 'lineFeedCell':'cell'">
+                <div v-else-if="typeof column.template === 'undefined'" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" :style="column.style ? column.style:''">
                   {{row[column.id]}}
                 </div>
 

package/src/centaline/dynamicSosTt/index.js

@@ -0,0 +1,14 @@
+import dynamicSosTt from './src/dynamicSosTt';
+import api from '../api/index'
+
+dynamicSosTt.install = function (Vue) {
+  Vue.component(dynamicSosTt.name, dynamicSosTt);
+
+  Vue.use(api);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(dynamicSosTt);
+}
+
+export default dynamicSosTt;