centaline-data-driven 1.1.26 → 1.1.27

package/config/dev.env.js

@@ -5,8 +5,8 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://10.88.1.151:8085/v1/form/router"',//aplus黄兰
-  // BASE_API: '"http://10.88.22.46:7070/v1/form/router"',//max本地
+  BASE_API: '"http://10.88.22.46:7070/v1/form/router"',//max本地
   //BASE_API: '"http://10.88.22.71:5008/api/doaction/router"',
-  BASE_API: '"http://tjcptest.centaline.com.cn/v1/form/router"',
+  // BASE_API: '"http://tjcptest.centaline.com.cn/v1/form/router"',
   // BASE_API: '"http://10.88.200.31:5000/gateway/redirect"',
 })

package/package.json

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

package/src/Form.vue

@@ -1,7 +1,7 @@
 <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/selfProject/selfProjectListLayout'" :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>-->
@@ -17,6 +17,7 @@
       return {
         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"},
       }
     },
     methods: {

package/src/SearchList.vue

@@ -1,7 +1,7 @@
 <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="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getList'"></ct-searchlist> -->
+    <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
+    <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'" :searchDataApi="'/PropertyOFIList/getList'"></ct-searchlist>
     <!--<ct-searchlist :searchConditionApi="'/api/invoice-info/search-condition'" :searchDataApi="'/api/invoice-info/list'" :searchDataStatisticsApi="'api/ContractList/GetLayoutOfStatisticsTool'" :apiParam="para"></ct-searchlist>-->
     <ct-dialog-list></ct-dialog-list>
   </div>

package/src/centaline/css/common.css

@@ -417,9 +417,9 @@ html {
  
  
  /*主要按钮*/
- .el-button{
+ /* .el-button{
   border: none;
-}
+} */
 /*.el-button:active {
   background-color: #b3caf5;
   border: none;
@@ -433,31 +433,31 @@ html {
 } */
  .el-button--primary {
    background-color: #EE6B6B ;
-   /* border-color: #EE6B6B ; */
+   border-color: #EE6B6B ;
  }
  .el-button--primary:hover ,.el-button--warning:hover{
    background: #f1706b;
-   /* border-color: #f1706b; */
+   border-color: #f1706b;
    color: #FFF;
  }
  .el-button--primary:focus {
    background: #de534d;
-   /* border-color: #de534d; */
+   border-color: #de534d;
    color: #FFF;
  }
  .el-button--success {
    background-color: #EE6B6B ;
-   /* border-color: #EE6B6B ; */
+   border-color: #EE6B6B ;
  }
  
  .el-button--success:focus {
    background: #de534d;
-   /* border-color: #de534d; */
+   border-color: #de534d;
    color: #FFF;
  }
  .el-button--success:hover {
    background: #f1706b;
-   /* border-color: #f1706b; */
+   border-color: #f1706b;
    color: #FFF;
  }
 /* 工具栏按钮置灰 */

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

@@ -224,7 +224,7 @@
         this.model.scripts.$fd = field.id;
         this.model.scripts.$result = [];
 
-        var clickAcion = function (field) {
+        var clickAcion = function (field) {  
           if (field.isSubmit) {
             let verified = true;
             if (self.validExcute()) {
@@ -234,7 +234,7 @@
 
               if (verified) {
                 //action有值，提交到后台
-                if (field.action) {                 
+                if (field.action) {
                   field.disabled = true;//提交按钮禁用
                   self.model.pageDisabled= true;
                   field.doAction(self.getFormObj(), (data) => {
@@ -513,7 +513,7 @@
       getFormObj()
       {
         let formData=this.model.getFormObj();
-        if(this.$route.query.pageStyle)
+        if(this.$route && this.$route.query && this.$route.query.pageStyle)
         {
            return Object.assign(formData,{'pageStyle':this.$route.query.pageStyle});
         }

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

@@ -35,7 +35,7 @@
                   column.fixed === 'left'?'left-fixation-th':null,
                   column.fixed === 'right'?'right-fixation-th':null,
                   typeof column.fixed === 'undefined'?'right-no-fixation-th':null]"
-                  @mousemove="thMouseMoveHandle($event)" @mousedown="thMouseDownHandle($event,colIndex)"                 
+                  @mousemove="thMouseMoveHandle($event)" @mousedown="thMouseDownHandle($event,colIndex)"
                   v-bind="column.attrs">
 
                 <span>{{column.name}}</span>
@@ -46,21 +46,21 @@
               </th>
 
               <!--<th v-if="model.rowRouter.length > 0" class="ct-td tdFiexd" :class="[-1 === rightShadow?'shadowRight':null]" :style="{'min-width':'20px','transform':'translate('+scrollRight+'px, '+scrollTop+'px)'}">
-              操作
-            </th>-->
+                操作
+              </th>-->
             </tr>
           </thead>
           <!--表体-->
           <tbody>
             <!--这一行仅用于设置未加载数据时的列宽-->
             <!--<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.dataFieldcolumns" class="ct-td" v-if="column.show">
-              <div :style="{'width': column.width + 'px'}">
-              </div>
-            </td>
-          </tr>-->
+              <td v-if="model.isMulti">
+              </td>
+              <td v-for="(column,colIndex) in model.dataFieldcolumns" class="ct-td" v-if="column.show">
+                <div :style="{'width': column.width + 'px'}">
+                </div>
+              </td>
+            </tr>-->
             <!--可视区域的行数据-->
             <tr v-for="(row,rowindex) in model.listData"
                 v-if="pageRowMin <= rowindex && rowindex <= pageRowMax"
@@ -100,10 +100,10 @@
 
                 <!--模版列(启用)-->
                 <!--<component v-else :is="column.template(row).component" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" :vmodel="column.template(row)" :style="{'width': column.width + 'px'}">
-                <template slot="value">
-                  {{row[column.id]}}
-                </template>
-              </component>-->
+                  <template slot="value">
+                    {{row[column.id]}}
+                  </template>
+                </component>-->
               </td>
             </tr>
 
@@ -481,9 +481,8 @@
             var h4 = this.$refs.footer.$el.offsetHeight | 0;
             var h5 = this.$refs.listHeader.$el.offsetHeight | 0;
             var h6 = this.$refs.listFooter.$el.offsetHeight | 0;
-            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - 30;
-            
-            this.model.tableHeight = tableHeight < 50 ? 350 : tableHeight;
+            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - 22;
+            this.model.tableHeight = tableHeight < 40 ? 350 : tableHeight;
             this.$nextTick(() => {
               self.getScrollAttr();
             });
@@ -641,15 +640,14 @@
       routerClickHandler(field, submitData, action) {
         let self = this;
         action = action || field.action;
-        
+
         var clickAcion = function () {
           //若不是客户端方法，则直接访问接口
           if (!field.isClientFuntion) {
             if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
               submitData = field.getActionPara(submitData).para;
-               if(field.pageStyle)
-              {
-                 submitData.pageStyle=field.pageStyle;
+              if (field.pageStyle) {
+                submitData.pageStyle = field.pageStyle;
               }
               self.$common.getDataDrivenOpts().handler.openTab(action, submitData, field.pageTitle, self.model);
             }
@@ -791,15 +789,14 @@
       calculatingRowHeight() {
         let self = this;
         let count = 0;
-      
+
         //查询出所有没有设置$heigth的数据并重新设置$heigth
-       let notHeigthData=  self.model.listData.filter(item=>{
-           return item.$heigth=== undefined || item.$heigth<=0
+        let notHeigthData = self.model.listData.filter(item => {
+          return item.$heigth === undefined || item.$heigth <= 0
         })
-        if(notHeigthData&&notHeigthData.length>0)
-        {
-           notHeigthData.forEach((v, i) => {
-           if (self.$refs["rows." + i] && self.$refs["rows." + i].length > 0) {
+        if (notHeigthData && notHeigthData.length > 0) {
+          notHeigthData.forEach((v, i) => {
+            if (self.$refs["rows." + i] && self.$refs["rows." + i].length > 0) {
               self.$set(v, "$heigth", self.$refs["rows." + i][0].clientHeight);
             }
           });
@@ -853,7 +850,7 @@
         if (self.model.checkCloseTabThen(ev.notification)) {
           self.model.doAction(ev);
           self.$forceUpdate();
-          self.$refs.footer.$forceUpdate();        
+          self.$refs.footer.$forceUpdate();
         }
       }
     },
@@ -1049,7 +1046,8 @@
     width: 20px;
     left: 0px;
   }
-  .ct-table .checkbox-td .checkbox-td-1{
-    vertical-align: inherit;
-  }
+
+    .ct-table .checkbox-td .checkbox-td-1 {
+      vertical-align: inherit;
+    }
 </style>

package/src/centaline/dynamicTree/src/dynamicTreeList.vue

@@ -1,11 +1,13 @@
 <template>
-  <div id="app-Tree" style="height:100%;position: fixed;">
-    <el-container style="height: 100vh;width:100vw; border: 1px solid #eee">
-      <el-aside width="200px" style="background-color:#eceff2">
+  <div id="app-Tree" style="height:100%;">
+    <el-container style="height:  calc(100vh - 98px);width:100vw; border: 1px solid #eee">
+      <el-aside width="200px" style="background-color:white">
         <ct-searchtree :flagsearch="true" :searchConditionApi="searchConditionApi" :searchDataApi="searchDataApi" @loaded="loaded"></ct-searchtree>
       </el-aside>
       <el-main v-if="isShowSearchlist">
-        <ct-searchlist :searchConditionApi="searchTableConditionApi" :searchDataApi="searchTableDataApi" :api-param="apiParam"></ct-searchlist>
+        <div style="height: calc(100vh - 98px);overflow-y: auto;">
+          <ct-searchlist :searchConditionApi="searchTableConditionApi" :searchDataApi="searchTableDataApi" :api-param="apiParam"></ct-searchlist>
+        </div>
       </el-main>
     </el-container>
   </div>
@@ -42,10 +44,10 @@
       loaded(data) {
         var self = this;
         self.isShowSearchlist = false;
-        if (data&&data.rowRouter) {
+        if (data && data.rowRouter) {
           self.searchTableConditionApi = data.rowRouter.getLayoutOfSearch;
           self.searchTableDataApi = data.rowRouter.getList;
-          var defaultPara = self.$common.deepClone(data); 
+          var defaultPara = self.$common.deepClone(data);
           delete defaultPara.rowRouter;
           delete defaultPara.getLayoutOfSearch;
           delete defaultPara.getList;
@@ -55,7 +57,7 @@
           });
         }
       },
-      
+
     },
     created() {
       this.model = this.vmodel;
@@ -63,3 +65,13 @@
   }
 
 </script>
+<style lang="scss">
+  #app-Tree .el-main {
+    padding: 0 0px 0px 10px;
+  }
+    #app-Tree .el-main .ct-searchtable {
+      margin-top: 0px;
+    }
+
+ 
+</style>