centaline-data-driven 1.3.51 → 1.3.54

package/package.json

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

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/commissionmanage/apply'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          
+          originalTraId: "1562313224974503937", actionType: 3, pageStyle: 2, pageTitle: "成交报告", pageOnly: true
         },
         topHeight:10,
       }

package/src/centaline/dialogList/src/dialog.vue

@@ -152,8 +152,20 @@
                                     if(item.attrs.height){
                                       ph=parseInt(item.attrs.height.replace('px',''));
                                     }
-                                    if(self.vmodel.pane && self.vmodel.pane.$el && self.vmodel.pane.$el.clientHeight<ph){
-                                      item.attrs.height=(self.vmodel.pane.$el.clientHeight-60)+'px';
+                                    
+                                    if(item.attrs.documentHeight && item.attrs.documentHeight!='auto'){
+                                      let dh=parseInt(item.attrs.documentHeight.replace('px',''));
+                                      if(dh<ph){
+                                        item.attrs.height=item.attrs.documentHeight;
+                                      }
+                                    }
+                                    else if(self.vmodel.pane && self.vmodel.pane.$el){
+                                      if(self.vmodel.pane.$el.clientHeight<ph) {
+                                        item.attrs.height=(self.vmodel.pane.$el.clientHeight-60)+'px';
+                                      }
+                                      if(item.component=='ct-form'){
+                                        item.attrs.documentHeight=(self.vmodel.pane.$el.clientHeight-60)+'px';
+                                      }
                                     }
                                     
                                     return h('div', {

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

@@ -10,7 +10,8 @@
         <!--头部元素-->
         <el-row v-if="collapseFieldsRow.length > 0">
           <el-col v-for="(col, index) in collapseFieldsRow[0]" :key="index" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
-            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" :fileData="getFileData(col)" :from="'form'"
+            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" 
+                      :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight"
                        @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                        @input="inputHandler(col,$event)" @importComplete="importComplete"
                        @popupSearchList="popupSearchListHandler"
@@ -24,7 +25,8 @@
                        v-for="(item, index) in collapse" v-if="item.show !== false" :key="index">
             <el-row>
               <el-col v-for="(col, index) in collapseFieldsRow[index + 1]" :key="index" :span="col.colspan" v-if="col.show !== false" style="padding:5px">
-                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" :fileData="getFileData(col)" :from="'form'"
+                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" 
+                           :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight"
                            @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                            @input="inputHandler(col,$event)" @importComplete="importComplete"
                            @popupSearchList="popupSearchListHandler"
@@ -43,7 +45,8 @@
             </template>
             <el-row>
               <el-col v-for="(col, index) in collapseFieldsRow[index + 1]" :key="index" :span="col.colspan" v-if="col.show !== false" style="padding:5px">
-                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" :fileData="getFileData(col)" :from="'form'"
+                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" 
+                           :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight"
                            @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                            @input="inputHandler(col,$event)" @importComplete="importComplete"
                            @popupSearchList="popupSearchListHandler"
@@ -56,7 +59,8 @@
         <!--尾部元素-->
         <el-row v-if="independentItem.length > 0" style="margin-top: 20px;">
           <el-col v-for="(col, index) in independentItem" :key="index" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
-            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" :fileData="getFileData(col)" :from="'form'"
+            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" 
+                       :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight"
                        @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)"
                        @input="inputHandler(col,$event)" @importComplete="importComplete"
                        @popupSearchList="popupSearchListHandler"
@@ -105,7 +109,11 @@
       showTitle: {
         type: Boolean,
         default: false
-      }
+      },
+      documentHeight:{
+        String,
+        default: 'auto',
+      },
     },
     data() {
       return {
@@ -117,17 +125,16 @@
         collapseActiveNames: [],//默认展开的分组name
         collapseFieldsRow: [],//分组数组对应的行列布局
         independentItem: [],//最后一个独立分组的行列布局
-        minHeight:'auto'
+        minHeight:'auto',
       };
     },
     mounted() {
       this.init();
-      if(this.topHeight>-1){
-        this.minHeight=(document.documentElement.clientHeight-this.topHeight-20)+'px';
-      }
+      this.setCss();
     },
     updated(){
       if(this.$el.parentElement.scrollHeight>this.$el.parentElement.clientHeight 
+      && this.model
       && !this.model.isHorizontalLayout){
         this.isScroll=true;
       }
@@ -356,12 +363,12 @@
                   content: [{
                     component: 'ct-form',
                     attrs: {
-                      //ssource: data.content,
                       api: field.action,
                       apiParam: field.getActionPara(submitData).para,
                       showTitle: false,
                       width: field.dialogWidth + 'px',
-                      height: field.dialogHeight + 'px'
+                      height: field.dialogHeight + 'px',
+                      documentHeight:self.documentHeight,
                     },
                     on: {
                       submit(ev) {
@@ -692,7 +699,8 @@
           self.$message.warning(checkMsg);
           return;
         }
-
+        
+        submitData = router.getActionPara(submitData).para;
         var dialogOption = {
           title: router.pageTitle,
           pane: self.$common.getParentPane(self),
@@ -704,7 +712,8 @@
               apiParam: submitData,
               singleSelectio: singleSelectio,
               width: router.dialogWidth + 'px',
-              height: (router.dialogHeight || 500) + 'px'
+              height: (router.dialogHeight || 500) + 'px',
+              documentHeight:self.documentHeight,
             },
             on: {
               submit(option) {
@@ -751,8 +760,8 @@
               i++;
 
               if (!jump) {
-                if (this.model.isHorizontalLayout) {//水平布局
-                  this.activeName = f.model.collapseName.toString()==='-1'?self.activeName:f.model.collapseName.toString();
+                if (self.model.isHorizontalLayout) {//水平布局
+                  self.activeName = f.model.collapseName.toString()==='-1'?self.activeName:f.model.collapseName.toString();
                   jump = true;
                 }
                 else {//垂直布局
@@ -827,6 +836,11 @@
         }
         return submitData;
       },
+      setCss() {
+        if(this.topHeight>-1){
+          this.minHeight=(document.documentElement.clientHeight-this.topHeight-20)+'px';
+        }
+      },
     }
   }
 </script>

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

@@ -159,11 +159,17 @@
             return false;
           }
         }
+
         //是否是取消操作
         if (!isCancel) {
-          if (app.model.currentRow.isNew) app.model.tableData.splice(index, 1);
-          return row.isSet = !row.isSet;
+          if (app.model.currentRow.isNew) {
+            app.model.tableData.splice(index, 1);
+          }
+          row.isSet = !row.isSet;
+          app.itemKey = Math.random();
+          return ;
         }
+
         //提交数据
         if (row.isSet) {//保存
           if (app.fieldsValidExcute()) {
@@ -194,7 +200,7 @@
           app.model.currentRow.isNew = false;
           app.model.currentRow.index = index;
           app.model.currentRow.isSet = true;
-          row.isSet = true;          
+          row.isSet = true;
           app.itemKey = Math.random();
         }
       },

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

@@ -12,7 +12,8 @@
       :categoryLoaded="loaded.categoryLoaded" @search="search()" @saveShortcut="saveShortcut" 
       @showTitle="showTitleScreenHandler"></ct-searchscreen>
 
-      <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from" :isIframe="isIframe" @loaded="tableLoaded"
+      <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from" :isIframe="isIframe" :documentHeight="documentHeight" 
+      @loaded="tableLoaded"
       @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate" 
       @rowClickHandle="rowClickHandle" @scrollHandle="scrollHandle" @refreshRowHandle="refreshRowHandle" @doClosePopoverHandle="doClosePopoverHandle" 
       @showTitle="showTitleHandler"></ct-searchtable>
@@ -62,12 +63,11 @@
         String,
         default:'searchlist'
       },
+      documentHeight:{
+        String,
+        default: 'auto',
+      },
     },
-  data() {
-    return {
-      isIframe: false,
-    };
-  },
     created() {
       this.model = this.vmodel;
       this.screenPara=this.apiParam;
@@ -120,6 +120,7 @@
         selectIndex:-1,
         rowCount:0,
         detailKey:0,
+        isIframe: false,
       }
     },
     methods: {

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

@@ -195,6 +195,10 @@ export default {
       Boolean,
       default: false,
     },
+    documentHeight:{
+      String,
+      default: 'auto',
+    },
   },
   computed: {},
   data() {
@@ -216,7 +220,6 @@ export default {
       rightShadow: -1, //右阴影个数
       currentRow: null,
       colHasWidth: {}, //有无列宽集合
-      test: true,
       firstRow: 0, //展示出来可视的第一行号
       pageRowMin: 0, //页面实际的第一行号
       pageRowMax: 100, //页面实际的第后行号
@@ -957,12 +960,12 @@ export default {
                   {
                     component: field.navToNewPageName,
                     attrs: {
-                      //source: data.content,
                       api: action,
                       apiParam: field.getActionPara(submitData).para,
                       showTitle: false,
                       width: field.dialogWidth + "px",
                       height: field.dialogHeight + "px",
+                      documentHeight:self.documentHeight,
                     },
                     on: {
                       submit(ev) {
@@ -1035,6 +1038,7 @@ export default {
                       apiParam: submitData,
                       width: field.dialogWidth + "px",
                       height: field.dialogHeight + "px",
+                      documentHeight:self.documentHeight,
                     },
                     on: {
                       refreshParent() {

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

@@ -250,7 +250,8 @@ const Router = function (source) {
             jsonData: data
           }
         };
-      } else {
+      } 
+      else {
         data.actionType = rtn.actionType;
         data = Object.assign(data, rtn.queryPara);
         if (rtn.isDropdown && rtn.selectOptionCode) {

package/src/main.js

@@ -12,7 +12,7 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  // baseUrl: "http://10.88.22.13:7070/v1/form/router",
+  // baseUrl: "http://10.88.22.46:7070/v1/form/router",
   // baseUrl: "http://10.88.23.25:9999/v1/form/router",
   // baseUrl: "http://10.88.22.40:8080/", 
   baseUrl: "http://tjcptest.centaline.com.cn/", 
@@ -41,10 +41,11 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '925105ab-273a-4d9e-bb9c-83dca3282a8a',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEKg0AQRP9laxe8u3X31i6epslHyMkpmCpEhYSQf48h2tnnFa8YBmZeMC0dlCAbeKCdVjfwQDutMaRiuMGTSkBicuhN8BiIA53rxoWqhgz6xw1Kw5w7ESeUwRjnX2A112-wTP390j__ce46j-vsIAN5ch1alrSWhTCqRiRbJEtc-MQM7w8AAAD__w.dYqgv0MHo3uvKDGcRKsCZt4UCdSl1qVTNQt628giu6k',
+        oldToken: '77791819-ac7d-4a5d-bd16-5278b9f0b5d7',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO-ydVbK2ou9TgdOaDhEZGNHChXKRwIh7k4QSZeeV4xGr5l5wThHqMCu4E5stG4Fd2KjJWJnyTR4dNYjG9Yo5AU9G8_nutH-VEMB-XGHiowhrcQKFdCH6ScUK_0V85iHS37-49xt6pdZHfUhx2RRkmLkjpbWOcYyBbmW7DhkB-8PAAAA__8.oX2sKPWfJx-cxaoLU5NyK7dX-vrkTDtyOuiONphQ-yI',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
+        estateId: '20210729104021C49F04B55C50F6AF58',
         authObject: '{"currentEstate":{"estateId":"20111122105652A2A701D48134542934","estateName":"%E9%BE%99%E5%85%89%E5%9F%8E"},"platform":1,"OSVersion":"","clientVersion":"","machineCode":""}',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjdjZjU3ZDhlLTUzNDItNGFhZC1iYThjLTg3OGNjNTcwZTc5MCJ9.X_b6c_D69_IX8dvQ90cfOqIXi-hTy449sJvzFw_rsXbyVc9obiybHSDycdJ6bgdbJW94XRjbqj9hPwiWyL3XSg',
       };