centaline-data-driven 1.5.51 → 1.5.53

package/package.json

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

package/release-log.md

@@ -1,3 +1,23 @@
+## v1.5.53
+2023-08-24
+
+新增
+
+扫码上传
+
+## 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/dynamicFile/src/dynamicFile.vue

@@ -27,6 +27,22 @@
         </div>
         <div slot="tip" v-show="model.description" v-html="model.description">
         </div>
+          <img  class="qrcode-target" @click.stop="qrcodeFn" ref="QRCodeRef"  v-if="model.QRCodeAction"  :src="require('../../../assets/serw1.png')" style="width: 35px;height: 35px;" alt="扫码上传" title="扫码上传">
+          <div class="ScanUploadPhoto" v-if="qrcodeVisible"  @click.stop="qrcodeVisible=true" :style="{ top: QRCodeRefTop + 'px', left: QRCodeRefLeft + 'px' }">
+              <div style="border-bottom:none">
+                <div style="text-align: center;margin-bottom:10px;margin-top:5px;color:#666666;font-size: 14px;">扫码上传</div>
+                <i class="jiao"></i>
+                <div style="width:200px; height:200px;">
+                  <img :src="qrCodeImg" width="200" height="200" :style="isQrCode?'opacity: 0.1':''" />
+                  <div class="div-fail" v-if="isQrCode">
+                      <span class="ScanText" style="color:#666666;">{{scanStatusDesc}}</span>
+                      <div style="text-align: center;" v-if="FlagbtnScan">
+                          <el-button type="success" class=" max-btn-add" size="mini" @click.stop="ShowQRcode">扫码上传</el-button>
+                      </div>
+                  </div>
+                </div>
+              </div>
+          </div>
         <div slot="file" slot-scope="{ file }" :title="file.fileName">
           <div class="cover-list-item">
             <div  @click="viewerfile(file)">
@@ -116,6 +132,22 @@
         </div>
         <div slot="tip" v-show="model.description" v-html="model.description">
         </div>
+        <img  class="qrcode-target" @click.stop="qrcodeFn" ref="QRCodeRef" v-if="model.QRCodeAction"  :src="require('../../../assets/serw1.png')" style="width: 35px;height: 35px;" alt="扫码上传" title="扫码上传">
+          <div class="ScanUploadPhoto" v-if="qrcodeVisible"  @click.stop="qrcodeVisible=true" :style="{ top: QRCodeRefTop + 'px', left: QRCodeRefLeft + 'px' }">
+              <div style="border-bottom:none">
+                <div style="text-align: center;margin-bottom:10px;margin-top:5px;color:#666666;font-size: 14px;">扫码上传</div>
+                <i class="jiao"></i>
+                <div style="width:200px; height:200px;">
+                  <img :src="qrCodeImg" width="200" height="200" :style="isQrCode?'opacity: 0.1':''" />
+                  <div class="div-fail" v-if="isQrCode">
+                      <span class="ScanText" style="color:#666666;">{{scanStatusDesc}}</span>
+                      <div style="text-align: center;" v-if="FlagbtnScan">
+                          <el-button type="success" class=" max-btn-add" size="mini" @click.stop="ShowQRcode">扫码上传</el-button>
+                      </div>
+                  </div>
+                </div>
+              </div>
+          </div>
         <div slot="file" slot-scope="{ file }" :title="file.fileName">
           <div class="cover-list-item">
             <div @click="viewerfile(file)">
@@ -194,6 +226,15 @@
     data() {
       return {
         disableUpload: false,
+        qrcodeVisible:false,
+        isQrCode:false,
+        SSID:'',
+        qrtimer:null,
+        qrCodeImg:'',
+        scanStatusDesc:"",
+        FlagbtnScan:false,
+        QRCodeRefTop:'',
+        QRCodeRefLeft:''
       };
     },
     computed: {
@@ -251,6 +292,10 @@
         }).then(() => {
           this.model.deleteFile(file, false);
           this.selfValidExcute("remove");
+          setTimeout(() => {
+             this.QRCodeLocate();
+          }, 1080);
+         
         }).catch(() => { });
       },
       handlePictureCardPreview(file) {
@@ -596,6 +641,7 @@
                 self.model.fileList[self.model.fileList.length - 1].height = img.height;
               };
               this.handleChange();
+              this.QRCodeLocate();
             }
             return true;
           }
@@ -605,10 +651,97 @@
           return false;
         }
       },
-
-
-
+      
+      ShowQRcode(){
+         this.isQrCode=false;
+         this.FlagbtnScan=false;
+         this.GetQRCodeUploadPhoto();
+      },
+      HideQRcode(){
+        this.isQrCode=false;
+        clearTimeout(this.qrtimer);
+      },
+      CheckQRCodeStatus(){
+         var self=this;
+         if(self.SSID){
+            self.model.getQRCodeStatus(self.SSID,function(data){
+              if(data.enumScanStatus=="已扫码"||data.enumScanStatus=="已完成"){
+                 self.scanStatusDesc=data.scanStatusDesc;
+                 self.isQrCode=true;
+              }
+              if(data.enumScanStatus=="已完成"){
+                 clearTimeout(self.qrtimer);
+                 self.FlagbtnScan=true;
+                 data.photos.forEach((v) => {
+                    if(self.model.fileList.length<parseInt(self.model.max || 999)){
+                      let img = new Image();
+                      img.src = v.mediaUrl;
+                      img.onload = function () {
+                        v.videoCoverFileName=v.videoCoverFileName||null;
+                        v.thumbnailUrl=v.thumbnailUrl||'';
+                        v.mediaSourceTypeID=v.mediaSourceTypeID||null;
+                        v.mediaSourceID=v.mediaSourceID||null;
+                        v.mediaPrintDesc=v.mediaPrintDesc||null;
+                        v.mediaID=v.mediaID||null;
+                        v.mediaFormData=v.mediaFormData||null;
+                        v.mediaDescEN=v.mediaDescEN||null;
+                        v.mediaDescCN=v.mediaDescCN||null;
+                        v.mediaDataBase64=v.mediaDataBase64||null;
+                        v.mediaCode=v.mediaCode||null;
+                        v.groupID=v.groupID||null;
+                        self.model.AddSourceList(v);
+                        var FileData = self.model.getFileData(v);
+                        FileData.width = img.width;
+                        FileData.height = img.height;
+                        FileData.uid=self.uploadguid();
+                        self.model.fileList.push(FileData);
+                        self.$nextTick(() => {
+                          self.QRCodeLocate();
+                        });
+                      };
+                    }
+                 });
+              }
+              else {
+                 self.qrtimer = setTimeout(self.CheckQRCodeStatus, 1000); 
+              }
+           });
+         }
+      },
+      GetQRCodeUploadPhoto(){
+        var self=this;
+         clearInterval(self.qrtimer);
+         self.model.getQRCode(function(data){
+             self.qrCodeImg=data.qrCode;
+             self.SSID=data.ssid;
+             self.qrtimer = setTimeout(self.CheckQRCodeStatus, 1000); 
+         });
+      },
+      qrcodeFn() {
+        let self = this;
+        self.qrcodeVisible = !self.qrcodeVisible;
+          if(self.qrcodeVisible){
+            self.QRCodeLocate();
+            self.ShowQRcode();
+          }
+          else{
+              self.HideQRcode();
+          }
+      },
+      QRCodeLocate(){
+        let self = this;
+        let QRCodeRef = self.$refs.QRCodeRef;
+        if (QRCodeRef) {
+          var QRCodeRefWith = QRCodeRef.width;
+          self.QRCodeRefTop = QRCodeRef.getBoundingClientRect().top;
+          self.QRCodeRefLeft = QRCodeRef.getBoundingClientRect().left + QRCodeRefWith + 20;
+        }
+      },
     },
+    beforeDestroy() {
+      clearTimeout(this.qrtimer);
+    },
+
   };
 </script>
 <style>
@@ -698,6 +831,7 @@
     height: 100px;
     line-height: initial;
     padding: 34px;
+        position: relative;
   }
 
     .el-upload--picture-card i {
@@ -762,4 +896,58 @@
       left: 50%;
       transform: translate(-50%, -50%);
     }
+    
+    .qrcode-target {
+    position: absolute;
+    top: 3px;
+    right: 3px;
+    width: 35px;
+    height: 35px;
+}
+.ScanUploadPhoto {
+    width: 220px;
+    height: 250px;
+    border: solid 1px #ccc;
+    position: fixed;
+    left: 120px;
+    background-color: #fff;
+    text-align: center;
+    padding: 5px 10px;
+    top: 5px;
+    box-shadow: 0 0 8px #bfbfbf;
+    z-index:1899;
+}
+.ScanUploadPhoto:hover{
+  cursor:default;
+}
+.jiao {
+    position: absolute;
+    display: inline-block;
+    top: 16px;
+    left: -6px;
+    width: 0;
+    height: 0px;
+    content: '';
+    border-style: solid;
+    border-width: 6px;
+    border-color: transparent transparent #fff #fff;
+    transform: rotate( 45deg );
+    box-shadow: -1px 1px 0px #ccc;
+}
+.div-fail {
+    width: 200px;
+    height: 200px;
+    position: absolute;
+    top: 60px;
+
+}
+.ScanText {
+    width:200px;
+    float:left;
+    margin-top:40px;
+    line-height:40px;
+    font-size:14px;
+    text-align: center;
+}
 </style>
+

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

@@ -9,6 +9,7 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
   var self = this;
   var init = function (data) {
     var rtn = {
+      QRCodeStatusAction:'',
       get min2() {
         return source.minValue2;
       },
@@ -18,6 +19,10 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
       get action() {
         return router && router.action ? router.action : "";//上传完整地址
       },
+      get QRCodeAction() {
+        return router && router.actionForSearchRightPageKey ? router.actionForSearchRightPageKey : "";
+      },
+      
       get sourceList() {
         return fileSourceList;
       },
@@ -107,6 +112,50 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
           }
         });
       },
+      //获取扫码上传图片的二维码
+      getQRCode(callBack) {
+        var self = this;
+        if (!self.QRCodeAction) {
+          return false;
+        }
+        var params = {
+          action: self.QRCodeAction,
+          para: {
+            fileAccept:self.fileAccept||''
+          }
+        };
+        Vue.prototype.$api.postHandler(common.globalUri(), params).then((response) => {
+          if (response.rtnCode === 200) {
+            self.QRCodeStatusAction=response.content.actionForStatus;
+            if (callBack) {
+              callBack(response.content);
+            }
+          }
+        });
+      },
+      //获取扫码上传的状态
+      getQRCodeStatus(ssid,callBack) {
+        var self = this;
+        if (!self.QRCodeStatusAction) {
+          return false;
+        }
+        var params = {
+          action: self.QRCodeStatusAction,
+          para: {
+            ssid: ssid
+          }
+        };
+        Vue.prototype.$api.postHandler(common.globalUri(), params).then((response) => {
+          if (response.rtnCode === 200) {
+            if (callBack) {
+              callBack(response.content);
+            }
+          }
+        });
+      },
+      AddSourceList(v){
+        fileSourceList.push(v);
+      },
       //是否是复杂分类
       get isComplexClassify() {
         if (source.paramAction1) {

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.eNrEjjsOwjAQBe_iOivZ8Xo3S5f403CIKA6OFCpEEgmEuDuKgI6eKV4xzbyHWrasDsoSSxvJgHfYAJJxIJgSeE0kNmlrQ-jlA_yYLz2yl7aNDKg7AkwugtQ-gRXXBYwth0iqUuV2UQdDUjeEmqRS87C-BTPTLralXI_l_o9z53Xes4MTrGUCZOsAT43AoEsGm_OYp5F1tkY9XwAAAP__.DK8s99gy40lr9upLBMaVPSiNl0fYUFYPFjCqu-C9KHE"}',
 
         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"}',