centaline-data-driven 1.5.22 → 1.5.23

package/package.json

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

package/release-log.md

@@ -1,5 +1,16 @@
+## v1.5.23
+2023-06-12
+
+优化
+
+表单保存时，根据保存按钮的actionType来关闭Tab
+
+bug修复
+
+合并行刷新bug处理
+
 ## v1.5.22
-2023-06-05
+2023-06-09
 
 优化
 

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="'/api/third-dept-tran/transaction/edit'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/api/data-driven-file/downTemplate'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "originalTraId":"1663810304614531074","actionType":"3","pageStyle":"2","pageTitle":"修改成交单","pageOnly":"true"
+          "key":"excel:12be9cb7-fd3a-4f82-a583-d7e240dc7aab"
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -9,6 +9,11 @@
       :searchDataApi="'/api/third-dept-tran/tran-list'">
     </ct-searchlist> -->
 
+    <!-- <ct-searchlist :apiParam="para"
+      :searchConditionApi="'/api/transaction/adjustRecord/getLayoutOfSearch'" 
+      :searchDataApi="'/api/transaction/adjustRecord/getTableList'">
+    </ct-searchlist> -->
+
     <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/wf/todo/wx/layout'" 
       :searchDataApi="'/wf/todo/wx/list'">

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

@@ -390,6 +390,12 @@
                             });
                           }
                           else {
+                            if (self.$common.dialogList && self.$common.dialogList.List.length === 0 
+                              && field.actionType && field.actionType===2 && data.notification !== 17) {
+                              if (typeof self.$common.getDataDrivenOpts().handler.closeTab === 'function') {
+                                self.$common.getDataDrivenOpts().handler.closeTab();
+                              }
+                            }
                             self.$emit('submit', { formData: self.model, responseData: data });
                           }
                           if (self.parentModel) {

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

@@ -640,7 +640,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             if (response.rtnCode === Enum.ReturnCode.Successful) {
               if (response.content.rows.length > 0) {
                 if (router.flagAddRowAfterAction) {
-                  rtn.setStyleRow(response.content.rows);
+                  // rtn.setStyleRow(response.content.rows);
                   response.content.rows.forEach((nr) => {
                     rtn.listData.unshift(nr);
                   });
@@ -663,6 +663,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                   }
                 }
               }
+              rtn.setRow(rtn.listData);
 
               if (typeof response.content.foot !== 'undefined') {
                 self.footer = response.content.foot;
@@ -786,36 +787,35 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         if (rtn.rowMergedColumns.length === 0) {
           return;
         }
+        rtn._lastRowspan=null;
 
         for (let i = 0; i < rows.length; i++) {
           let row = rows[i];
-          if (typeof row.$rowspan === 'undefined') {
-            if (rtn._lastRowspan !== null) {
-              let equalNum = 0;
-              for (let j = 0; j < rtn.rowMergedColumns.length; j++) {
-                let rowMerged = rtn.rowMergedColumns[j];
-                if (row[rowMerged] === rtn._lastRowspan[rowMerged]) {
-                  equalNum++;
-                } 
-                else {
-                  break;
-                }
-              }
-
-              //当所有列都相等时
-              if (equalNum === rtn.rowMergedColumns.length) {
-                row.$rowspan = 0;
-                rtn._lastRowspan.$rowspan++;
+          if (rtn._lastRowspan !== null) {
+            let equalNum = 0;
+            for (let j = 0; j < rtn.rowMergedColumns.length; j++) {
+              let rowMerged = rtn.rowMergedColumns[j];
+              if (row[rowMerged] === rtn._lastRowspan[rowMerged]) {
+                equalNum++;
               } 
               else {
-                row.$rowspan = 1;
-                rtn._lastRowspan = row;
+                break;
               }
+            }
+
+            //当所有列都相等时
+            if (equalNum === rtn.rowMergedColumns.length) {
+              row.$rowspan = 0;
+              rtn._lastRowspan.$rowspan++;
             } 
             else {
               row.$rowspan = 1;
               rtn._lastRowspan = row;
             }
+          } 
+          else {
+            row.$rowspan = 1;
+            rtn._lastRowspan = row;
           }
         }
       },

package/src/main.js

@@ -24,6 +24,7 @@ Vue.use(centaline, {
   // baseUrl: "http://10.88.22.40:8080/api/",
   // baseUrl: "http://10.58.2.108:8080/",
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
+  // baseUrl: "http://tjcpuat.centaline.com.cn:9090/",
   flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
@@ -52,13 +53,13 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '5156e8b3-4bd5-416d-b84e-9d637650f106',
+        oldToken: 'c4ca2b41-a50c-4727-9154-a8cf0d4e47cb',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgjAURf-lMy_pa1_bVzbawuJHEAolwckIJBrjv6tRN3fPcIeznHsT655FLRI3kmKnIbbKACVnoOkcQ4jMMiinKXDvP8CP-dIjkndoW2i8i0CWNDBGhkg2UpdaHUMSlSiXk6jRskXFnk0llmF7C0nKvMS-lvOhXP9x7rgtzyyykVO2BSacBqA8F8jKS9DjrNmOOLGy4v4AAAD__w.46fuMsFGlimupRnvMrGjObjrKqkO9CrBIJsxjHFurso"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOwjAQBP_iOif54vP5nC62k4ZHRLbiIlSIJBII8XdAQEfPFFtMM3tT615Up5L0muJoIA6tBUrOQj86gRBFdGidoSCT_wA_5suESN4hD9B7F4GYDAhGgUgcaUyDiSGpRtXLSXXIwoyiW2zUkre3sAb5Jfa1ng_1-o9zx215ZjOLSPYWtKMWqMwZCvsMmXUpc6W5VFT3BwAAAP__.7YpCSX-0-868bPUSiaNCErO_7JxtgS210pSEmnTyaWs"}',
 
         originalRequestURL: 'http://10.88.22.67:8080',
-        EstateInfo: '{"estateId":"230517135133E8893C89FA2A4C8386C0","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',
-        estateId: '230517135133E8893C89FA2A4C8386C0',
+        EstateInfo: '{"estateId":"201806071109550C867184E8BCA56EC3","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',
+        estateId: '201806071109550C867184E8BCA56EC3',
 
         // authObject: '{"currentEstate":{"estateId":"20191114134322C29C9B83A84F192964","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"ce04f173da7df2e78a9da25595111387","token":"","random":"XNEYyu","time":1683686365201,"sign":"79be68006872c6a088eb49f7e3dab45a"}',
         AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjYyOTk5ZDhjLTYwY2MtNGM0OS05MzM4LWY1MTBhNjI5OGVjYiJ9.A7lCMb4mBHjse6DlvFLVV5jEQSWzREtlbeZJ6StCW4kVyyRG4RlkhRl2FJvaBZEdtoEItI52IEgBsX4X_H1m4w',