centaline-data-driven 1.5.51 → 1.5.52

package/package.json

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

package/release-log.md

@@ -1,3 +1,16 @@
+## v1.5.52
+2023-08-22
+
+bug修复
+
+侧边栏关闭再打开后,拨打按钮的popover显示有问题
+
+优化
+
+弹层form表单点击X关闭时，不触发刷新行事件
+
+表单列表记录横向滚动条位置，编辑保存时自动滚动到上一次位置
+
 ## v1.5.51
 2023-08-18
 

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/distribution/commission_presentiment/detail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/api/distribution/commission_presentiment/task'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "transactionId":["1661661776303677441","1667002679704797185"],"actionType":2,"pageStyle":2,"pageTitle":"新增预结","pageOnly":true
+          "stepId":"1689521582976049153","businessId":"1689521146390945793","actionType":"1","pageStyle":"2","pageOnly":"true"
         },
         topHeight:10,
       }

package/src/centaline/dynamicBtn/src/dynamicBtn.vue

@@ -40,8 +40,8 @@
              :style="{color:model.textColor,backgroundColor:model.imgUrl?'transparent':model.bgColor,borderColor:model.imgUrl?'transparent':model.borderColor,padding:model.imgUrl?'0px':null}"
              :icon="model.icon"
              :disabled="model.disabled || model.locked">
-    <el-popover class="Stats-popover" :popper-class="'el-popoverCallTel'" :placement="option.placement?option.placement:'left'"
-                v-model="visible" :trigger="option.trigger?option.trigger:''">
+    <el-popover class="Stats-popover" :popper-class="visible ? 'isBlock':'isNone'" :placement="option.placement?option.placement:'left'"
+                v-model="visible" :trigger="option.trigger?option.trigger:''" >
       <div style="border-bottom:none">
         <div style="color: #388cd3;text-align: center;">{{message}}</div>
         <img v-show="qrCode" :src="qrCode" style="margin-top: 5px;" :style="{'width':width+'px','height':height+'px'}" />
@@ -281,8 +281,13 @@
 .labelText{
 -webkit-transform: scale(0.85);
 }
-.el-popoverCallTel{
+.isBlock{
   margin-left: 5px;
+  display: block !important;
+}
+.isNone{
+  margin-left: 5px;
+  display: none !important;
 }
 .subText{
   color:var(--chinaRed);;

package/src/centaline/dynamicDetail/src/dynamicCustomerSimpleDetail.vue

@@ -638,7 +638,7 @@ export default {
                     }
                   },                  
                   closeDialog(ev) {
-                    self.$emit('simpleRouterclickHandler', field, ev);
+                    // self.$emit('simpleRouterclickHandler', field, ev);
                   }
                 }
               }]

package/src/centaline/dynamicDetail/src/dynamicEstateSimpleDetail.vue

@@ -506,7 +506,7 @@ export default {
                     }
                   },                  
                   closeDialog(ev) {
-                    self.$emit('simpleRouterclickHandler', field, ev);
+                    // self.$emit('simpleRouterclickHandler', field, ev);
                   }
                 }
               }]

package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -505,7 +505,7 @@ export default {
                     }
                   },
                   closeDialog(ev) {
-                    self.$emit('simpleRouterclickHandler', field, ev);
+                    // self.$emit('simpleRouterclickHandler', field, ev);
                   }
                 }
               }]

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

@@ -169,6 +169,7 @@
         itemKey: Math.random(),
 		    tableColumnWith: 0,
         fixedButtons:false,
+        scrollLeft:0,
       }
     },
     created() {
@@ -183,6 +184,7 @@
       });
     },
     mounted() {
+      let self=this;
       this.$nextTick(function () {
         let domT=document.querySelector('#listTable');
         if(domT){
@@ -190,6 +192,11 @@
           if(domB && domB.scrollWidth>domB.offsetWidth){
             this.fixedButtons='right';
           }
+          if(domB){
+            domB.addEventListener("scroll", function(){
+              self.scrollLeft=domB.scrollLeft;
+            });
+          }
         }
       });
     },
@@ -223,6 +230,7 @@
           app.model.currentRow.isNew = true;
           app.model.currentRow.index = app.model.tableData.length - 1;
         }
+        app.resetScroll();
       },
       //修改
       saveRow(row, index, isCancel) {
@@ -251,6 +259,7 @@
           }
           row.isSet = !row.isSet;
           app.itemKey = Math.random();
+          app.resetScroll();
           return ;
         }
 
@@ -279,6 +288,7 @@
               app.itemKey = Math.random();
               this.model.change = this.model.formListChange;
               app.$emit('change');
+              app.resetScroll();
             }
           }
         }
@@ -289,6 +299,7 @@
           app.model.currentRow.isSet = true;
           row.isSet = true;
           app.itemKey = Math.random();
+          app.resetScroll();
         }     
       },
       //删除
@@ -324,6 +335,7 @@
             }
           });
           self.itemKey = Math.random();
+          self.resetScroll();
         });
       },
       fieldsValidExcute() {
@@ -490,7 +502,24 @@
         // 移除 document 中临时的 span
         document.body.removeChild(span);
         return h('span', column.label);
-      }
+      },
+      resetScroll(){
+        let self=this;
+        this.$nextTick(function () {
+          let domT=document.querySelector('#listTable');
+          if(domT){
+            let domB=domT.querySelector('.el-table__body-wrapper');
+            if(domB){
+              if(this.scrollLeft>0){
+                domB.scrollLeft=this.scrollLeft;
+              }
+              domB.addEventListener("scroll", function(){
+                self.scrollLeft=domB.scrollLeft;
+              });
+            }
+          }
+        });
+      },
     }
   }
 </script>

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

@@ -1338,7 +1338,7 @@ export default {
                         self.$common.closeDialog(dialogOption.dialog);
                       },
                       closeDialog() {
-                        self.updateCurrentRow(field);
+                        // self.updateCurrentRow(field);
                       },
                     },
                   },
@@ -1625,7 +1625,7 @@ export default {
                         self.$common.closeDialog(dialogOption.dialog);
                       },
                       closeDialog() {
-                        self.updateCurrentRow(field);
+                        // self.updateCurrentRow(field);
                       },
                     },
                   },

package/src/centaline/dynamicTree/src/dynamicSearchTree.vue

@@ -282,7 +282,7 @@ export default {
                         self.$common.closeDialog(dialogOption.dialog);
                       },
                       closeDialog() {
-                        self.updateCurrentRow(field);
+                        // self.updateCurrentRow(field);
                       },
                     },
                   },

package/src/main.js

@@ -56,9 +56,9 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '681f7eeb-e659-4c3b-a8c4-88d60c36a518',
+        oldToken: '2e1a6bc6-2cbe-435d-ba01-8e65d29e1e2a',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOwjAMRe-SuZbixI2dbo3bLhwCNSiVyoRoK4EQdwcEbOy84Q9vef9mli2bxnTSWtLBg_auBuq4hnZggaQiNjn2lGQfP8CP-bJHpMgYemgjK1AgD4IqoBSUhq73mjpTmXI5mQZDdMgBLVZmHte3sBL5JbalnHfl-o9zx3V-ZicX-cBZYJqIgNAVkBgQfBYXQ03Zjc7cHwAAAP__.-lkfBY8Qlu2nt6fc_7LyMJb2c8Ki5dxMCR6fga2a1Ec"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOis59nrXTuf403CIyCFGggqRRAIh7k4Q0NHziimeRpq5i3kdRSc0sfOJWggGLSC1BhzmDEESOZ2l1jEO7gP8iC8DcnDeJwaUPQFmk8CpkEE700dMnmMi0Yh6PYuuJaeYUbJpxLEsb0GW6SXWuV529faPc6fluM2O-0KHggpUtQhoEbdyUYCGpsnayeBYxeMJAAD__w.3jtdole2dvyRTAFLiUyYiLbrekR9ZsmkA3x1LCyg2DY"}',
 
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201806071109550C867184E8BCA56EC3","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',