centaline-data-driven 1.2.74 → 1.2.75

package/package.json

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

package/src/Form.vue

@@ -1,9 +1,9 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
-    <ct-form :api="'/salematter/squareupload/readDetail'" :apiParam="apiParam"></ct-form>
+    <!-- <ct-form :api="'/salematter/squareupload/readDetail'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <!-- <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="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -18,7 +18,11 @@
         // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
         // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
         // apiParam: {originalTraId: "1516290587463507969", actionType: "3", pageStyle: "2", pageTitle: "成交报告",pageOnly: "true"}
-        apiParam:{"actionType":2,"jsonData":{}}
+        apiParam:{actionType: "3",
+originalTraId: "1522961155108978690",
+pageOnly: "true",
+pageStyle: "2",
+pageTitle: "成交报告"}
       }
     },
     methods: {

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

@@ -150,7 +150,6 @@
         if (!isCancel) {
           if (app.model.currentRow.isNew) app.model.tableData.splice(index, 1);
           return row.isSet = !row.isSet;
-          app.model.currentRow.isSet = false;
         }
         //提交数据
         if (row.isSet) {//保存

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

@@ -1,5 +1,5 @@
 <template>
-  <div style="width:100%;" class="ct-searchtable" ref="searchTable">
+  <div style="width:100%;" class="ct-searchtable" ref="searchTable" :style="{'margin-top':isLayout?'0':'','padding':isLayout?'0':''}">
     <ct-tableStats ref="tableStats" class="ct-search-table-list-header"
                    v-if="!isLoading&&searchStatsApi"
                    :api="searchStatsApi"
@@ -16,7 +16,7 @@
     <div v-loading="operationLoading">
     </div>
     <div class="ct-tableParent" ref="tableParent" v-bind="model.attrs" v-if="!isLoading"
-         :style="{'height':from=='form'?'100%':model.tableHeight+'px'}"
+         :style="{'height':from=='form'?'100%':model.tableHeight+'px','border-bottom':isLayout?'none':''}"
          @scroll="scrollHandle($event)" :v-focus="model.flagFocus"
          @keydown.up="rowKeyDownHandle($event,0)" @keydown.down="rowKeyDownHandle($event,1)"
          tabindex="-1">
@@ -549,7 +549,10 @@
             if (this.$parent.$parent.$vnode.componentOptions.tag === 'ct-PropertySimpleDetailRET') {
               var h2 = this.$parent.$parent.$refs.contact.offsetHeight | 0;
               var h3 = this.$parent.$parent.$refs.title.offsetHeight | 0;
-              let tableHeight = h1 - h2-h3 - 300;
+              let tableHeight = h1 - h2 - h3 - 270;
+              if (h2 == 0) {
+                tableHeight = tableHeight + 15;
+              }
               this.model.tableHeight = tableHeight;
               this.$nextTick(() => {
                 self.getScrollAttr();

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

@@ -118,6 +118,7 @@ const FormList = function (source, master) {
         source.rows.forEach((r) => {
           var row = rtn.initRow(r);
           this._rows.push(row);
+          rtn._rows[rtn._rows.length - 1].$sourceIndex = rtn._rows.length - 1;
         });
         return this._rows;
       }
@@ -362,6 +363,7 @@ const FormList = function (source, master) {
       let iRow = this.initRow(sourceRow);
       iRow.isNewFlag = true;
       rtn._rows.push(iRow);
+      rtn._rows[rtn._rows.length - 1].$sourceIndex = rtn._rows.length - 1;
       Vue.set(row, 'edit', iRow.edit);
       Vue.set(row, 'delete', iRow.delete);
       row.$sourceIndex = rtn._rows.length - 1;
@@ -405,6 +407,7 @@ const FormList = function (source, master) {
               if (!isRepeat) {
                 source.rows.push(row);
                 rtn.rows.push(rowItem);
+                rtn._rows[rtn._rows.length - 1].$sourceIndex = rtn._rows.length - 1;
 
                 rowData.$sourceIndex = source.rows.length - 1;
                 

package/src/main.js

@@ -13,9 +13,9 @@ 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.23.22:9999/v1/form/router",
-  // baseUrl: "http://10.1.245.111:38028/api", 
-  // flagRouterSelf: true,
+  // baseUrl: "http://10.88.23.22:9999/v1/form/router",
+  baseUrl: "http://tjcptest.centaline.com.cn/", 
+  flagRouterSelf: true,
   zindex: 999,
   showRequestErrorMessage: true,
   handler: {
@@ -36,7 +36,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '6613f67c-ba83-4065-9570-175c2f74e6d5',
+        oldToken: 'c72af00a-da9a-430a-b986-2935092b42f6',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: ' {"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"undefined"}',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImI2ZjYwZTBjLWFhYzEtNDgxYy1hYTBkLWMxNjZlNzdjOWZhYyJ9.56V1V4HOhrAdO58i-bg5XG5ZKSSJ-rN1trTEjs0lZCCID0CM8LLBswqrt4_wsbApIdT1QaTA4TtmWmlR3UvxXQ',