centaline-data-driven 1.5.22 → 1.5.24

package/package.json

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

package/release-log.md

@@ -1,5 +1,29 @@
+## v1.5.24
+2023-06-13
+ 
+bug修复
+
+解决固定列拖动，固定列中间出现空白
+
+拖动某列，会改变另一列的宽
+
+TimeSelect返回没有值处理
+
+容器主键js赋值优化
+
+## 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,16 @@
       :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="'/api/transfer_subscribe_master/layout'" 
+      :searchDataApi="'/api/transfer_subscribe_master/transferSubscribeMasterList'">
+    </ct-searchlist>
+
     <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/wf/todo/wx/layout'" 
       :searchDataApi="'/wf/todo/wx/list'">
@@ -62,7 +72,7 @@
       :searchDataApi="'/DistrictList/getListOfSearchModel'">
     </ct-searchlist> -->
     
-    <ct-searchlist :searchConditionApi="'/RoleList/getLayoutOfSearch'" :searchStatsApi="'/RoleList/getListStats'" :searchDataApi="'/RoleList/getListOfSearchModel'"></ct-searchlist>
+    <!-- <ct-searchlist :searchConditionApi="'/RoleList/getLayoutOfSearch'" :searchStatsApi="'/RoleList/getListStats'" :searchDataApi="'/RoleList/getListOfSearchModel'"></ct-searchlist> -->
 
     <ct-dialog-list></ct-dialog-list>
   </div>

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/dynamicSearchList/src/dynamicSearchTable.vue

@@ -52,7 +52,8 @@
                 column.width === undefined ? 'ct-table-auto' : null,
                 typeof column.fixed === 'undefined' ? 'right-no-fixation-th' : null,
                 model.columnWidthSaveAction ?'theadLine':'',
-                ]" @mousemove="thMouseMoveHandle($event)" @mousedown="thMouseDownHandle($event, colIndex)" @mouseover="theadTitleHover" @mouseout="theadTitleLeave"
+                ]" @mousemove="thMouseMoveHandle($event)" @mousedown="thMouseDownHandle($event, colIndex)" 
+                @mouseover="theadTitleHover" @mouseout="theadTitleLeave"
                   v-bind="column.attrs" id="thHeight">
                 <span>{{ column.name }}</span>
                 <span class="caret-wrapper" v-if="column.sort" @click="toSort($event, column)"
@@ -441,6 +442,8 @@ export default {
     thMouseDownHandle(ev, colIndex) {
       var self = this;
       var col = self.model.columns[colIndex];
+         var  PrevCol;
+         var NextCol;
        var oldWidth=col.width;
       if (ev.currentTarget.canResize) {
         ev.currentTarget.isDown = true;
@@ -453,6 +456,8 @@ export default {
           document.removeEventListener("mouseup", MouseUpHandle, false);
           document.removeEventListener("mousemove", MouseMoveHandle, false);
           
+       
+   
           //保存列宽
           if(oldWidth!=col.width&&self.model.columnWidthSaveAction&&self.model.columnWidthSaveAction.length>0)
           {
@@ -462,6 +467,7 @@ export default {
             window.localStorage.setItem(self.model.title+"_"+ col.id, col.width);
           }
 
+         
           //如果是高度可变的列，重新计算整个表的高度
           if (col.autoRowHeight) {
             self.model.listData.forEach((v) => {
@@ -474,6 +480,9 @@ export default {
         };
         var MouseMoveHandle = function () {
           var ev1 = event || e;
+         if(ev1.stopPropagation) ev1.stopPropagation();
+         if(ev1.preventDefault) ev1.preventDefault();
+
           if (self.currentTh.isDown) {
             if (self.currentTh) {
               if (typeof col.width === "undefined") {
@@ -505,6 +514,28 @@ export default {
               ) {
                 self.currentTh.style.minWidth = col.width + "px";
                 self.currentTh.style.width = col.width + "px";
+
+
+    //解决固定列拖动，列与列中间出现空白  
+    if(col.attrs.style.left&&parseInt(col.attrs.style.left)>0)
+    // 解决固定列左边的空白
+          { 
+                PrevCol= self.model.columns[colIndex-1];
+                if( PrevCol)
+                {
+                  self.model.columns[colIndex].fixedSize=PrevCol.width;
+                }
+          }  
+          // 解决固定列右边的空白      
+            NextCol= self.model.columns[colIndex+1];
+                if( NextCol)
+                {
+                  if(NextCol.attrs.style.left)
+                  { 
+                  self.model.columns[colIndex+1].fixedSize=col.width;
+                }
+               }
+
                 self.getScrollAttr();
               }
             }

package/src/centaline/dynamicTimeSelect/src/dynamicTimeSelect.vue

@@ -14,7 +14,7 @@
                           :disabled="model.lock"
                           :picker-options="{
                             start:  model.min,
-                              step: model.step,
+                            step: model.step,
                             end:  model.max
                            }">
           </el-time-select>

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

@@ -48,20 +48,13 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         rtn._fieldsDic = {};
         if (rtn.fields) {
           rtn.fields.forEach((f) => {
-            if (f.type == Enum.ControlType.Compound) {
+            if (f.type == Enum.ControlType.Compound || f.type == Enum.ControlType.ContainerControl) {
               if (f.fields) {
                 f.fields.forEach((v) => {
                   rtn._fieldsDic[v.id] = v;
                 });
               }
             }
-            // else if (f.type == Enum.ControlType.ContainerControl) {
-            //   if (f.compoundFields) {
-            //     f.compoundFields.forEach((v) => {
-            //       rtn._fieldsDic[v.id] = v;
-            //     });
-            //   }
-            // }
             rtn._fieldsDic[f.id] = f;
           });
         }
@@ -227,22 +220,22 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         //设置Field的属性attrKey的值
         setValueByFieldName(id, attrKey, attrValue) {
           attrKey = this.common.initialsToLowerCase(attrKey);
-            var rtn1 = this.fieldsDic[id];
-            if (rtn1) {
-              if(attrKey=='code1' && rtn1.source.controlType===4 
-              && attrValue!=undefined && attrValue!=null && attrValue!=''){
-                if(rtn1.source.decimals1 != undefined && rtn1.source.decimals1 != null && rtn1.source.decimals1>-1){
-                  attrValue = Number(attrValue).toFixed(rtn1.source.decimals1)
-                }
+          var rtn1 = this.fieldsDic[id];
+          if (rtn1) {
+            if(attrKey=='code1' && rtn1.source.controlType===4 
+            && attrValue!=undefined && attrValue!=null && attrValue!=''){
+              if(rtn1.source.decimals1 != undefined && rtn1.source.decimals1 != null && rtn1.source.decimals1>-1){
+                attrValue = Number(attrValue).toFixed(rtn1.source.decimals1)
               }
-              rtn1.source[attrKey] = attrValue;
-              this.form.hatchHandle(id, attrKey, attrValue, rtn1);
+            }
+            rtn1.source[attrKey] = attrValue;
+            this.form.hatchHandle(id, attrKey, attrValue, rtn1);
 
-              //用于处理源数据改动,强制更新视图数据 todo
-              if (rtn1.self.$forceUpdate) {
-                  rtn1.self.$forceUpdate();
-              }
+            //用于处理源数据改动,强制更新视图数据 todo
+            if (rtn1.self.$forceUpdate) {
+                rtn1.self.$forceUpdate();
             }
+          }
         },
         setValueByFieldNameFromParent(id, attrKey, attrValue) {
           if(this.form && this.form.self && this.form.self.$parent){
@@ -494,7 +487,8 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
             }
             );
         },
-        //消息提示 type主题:success/warning/info/error。 duration 显示时间, 毫秒。设为 0 则不会自动关闭。 showClose 是否显示关闭按钮。
+        //消息提示 type主题:success/warning/info/error。 center是否居中true/flase。  duration 显示时间, 毫秒。设为 0 则不会自动关闭。 
+        //showClose 是否显示关闭按钮。dangerouslyUseHtmlString 属性设置为 true ,message 就会被当做 HTML 片段处理。
         message(message, type, center, duration, showClose, dangerouslyUseHTMLString) {
           if (typeof center === 'undefined') {
             center = true;

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/centaline/loader/src/ctl/TimeSelect.js

@@ -59,7 +59,7 @@ const TimeSelect = function (source, isRange, dateType) {
         var rtnFormObj = {};
         Object.defineProperty(rtnFormObj, source.fieldName1, {
           get: function () {
-            if(source.code1){
+            if(source.code1 && source.format != "HH:mm" && Object.prototype.toString.call(source.code1) === "[object Date]"){
               return common.formatDate(source.code1, rtn.valueFormat);
             }
             return source.code1;
@@ -69,7 +69,7 @@ const TimeSelect = function (source, isRange, dateType) {
         });
         Object.defineProperty(rtnFormObj, source.fieldName2, {
           get: function () {
-            if(source.code2){
+            if(source.code2 && source.format != "HH:mm" && Object.prototype.toString.call(source.code2) === "[object Date]"){
               return common.formatDate(source.code2, rtn.valueFormat);
             }
             return source.code2;

package/src/main.js

@@ -14,7 +14,7 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
+  // baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
   // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:9999/service-api/v1/form/router",
@@ -23,7 +23,8 @@ Vue.use(centaline, {
   // baseUrl: "http://10.88.22.69:8080/api/", 
   // baseUrl: "http://10.88.22.40:8080/api/",
   // baseUrl: "http://10.58.2.108:8080/",
-  // baseUrl: "http://tjcptest.centaline.com.cn/", 
+  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: '11c12506-253c-4995-83fb-84cf51cb23a0',
         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_iOif57LPvnC62k4ZHRAk4UqgQSSQQ4u-AgI6eKbaYZvamlm1UtcrSaEqdhdQaB5TZQdOxQEwiOhq2FKUPH-DHfOkRKTD6FprACciTBcEkkMgn6nJrU8yqUuVyUjV68ayFJVRqHta38MbYl9iWct6V6z_OHdf5mS2ekSc3QgmTB9JGYERBkINDa4aw1yTq_gAAAP__.1gZ4BknjckS1IuDq6im1VqDqoeZyKfS44jQ9_8Bifs8"}',
 
         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',