JImageupload，JUpload组件修改，清除没必要的log

jero-web/src/components/jero/JImageUpload.vue

@@ -19,6 +19,7 @@
       :class="!isMultiple?'imgupload':''">
       <div :style="{'width':(!isMultiple?'104px':'auto'),'height':(!isMultiple?'104px':'auto')}">
         <img v-if="!isMultiple && picUrl" :src="getAvatarView()" style="width:100%;height:100%"/>
+        <!--<img v-if="!isMultiple && picUrl" src="http://localhost:3000/jero-boot/sys/common/download/1379989167782797313?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MTc4NTA1OTgsInVzZXJuYW1lIjoiYWRtaW4ifQ.1xRpivI0TzTqAnISJICNm-PoMxSDUITH5uaEcvwheIQ&fullfilename=3.jpeg" style="width:100%;height:100%"/>-->
         <div v-else class="iconp">
           <a-icon :type="uploadLoading ? 'loading' : 'plus'" />
           <div class="ant-upload-text">{{ text }}</div>
@@ -39,13 +40,6 @@
   const uidGenerator=()=>{
     return '-'+parseInt(Math.random()*10000+1,10);
   }
-  const getFileName=(path)=>{
-    if(path.lastIndexOf("\\")>=0){
-      let reg=new RegExp("\\\\","g");
-      path = path.replace(reg,"/");
-    }
-    return path.substring(path.lastIndexOf("/")+1);
-  }
   export default {
     name: 'JImageUpload',
     data(){
@@ -115,27 +109,20 @@
     },
     methods:{
       initFileList(paths){
-        if(!paths || paths.length==0){
+        if(!paths || paths.length === 0){
           this.fileList = [];
           return;
         }
         this.picUrl = true;
-        let fileList = [];
-        let arr = paths.split(",")
+        let arr = paths.join(",")
         for(var a=0;a<arr.length;a++){
-          let url = getFileAccessHttpUrl(arr[a]);
-          fileList.push({
-            uid: uidGenerator(),
-            name: getFileName(arr[a]),
-            status: 'done',
-            url: url,
-            response:{
-              status:"history",
-              message:arr[a]
+          this.fileList.forEach((item)=>{
+            if (item.url === arr[a]){
+              item.uid = uidGenerator()
+              item.response.status = 'history'
             }
           })
         }
-        this.fileList = fileList
       },
       beforeUpload: function(file){
         var fileType = file.type;
@@ -157,7 +144,7 @@
             this.picUrl = true;
             fileList = fileList.map((file) => {
               if (file.response) {
-                file.url = file.response.message;
+                file.url = `${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.response.result.fileName}`;
               }
               return file;
             });
@@ -180,8 +167,8 @@
       },
       getAvatarView(){
         if(this.fileList.length>0){
-          let url = this.fileList[0].url
-          return url
+          let url = this.fileList[this.fileList.length-1].url
+          return getFileAccessHttpUrl(url)
         }
       },
       handlePathChange(){
@@ -192,12 +179,12 @@
         }
         let arr = [];
         if(!this.isMultiple){
-          arr.push(uploadFiles[uploadFiles.length-1].response.message)
+          arr.push(uploadFiles[uploadFiles.length-1].url)
         }else{
           for(let a=0;a<uploadFiles.length;a++){
             // update-begin-author:taoyan date:20200819 for:【开源问题z】上传图片组件 LOWCOD-783
             if(uploadFiles[a].status === 'done' ) {
-              arr.push(uploadFiles[a].response.message)
+              arr.push(uploadFiles[a].url)
             }else{
               return;
             }
@@ -211,7 +198,6 @@
       },
       handleDelete(file){
         //如有需要新增 删除逻辑
-        console.log(file)
       },
       handleCancel() {
         this.close();

jero-web/src/components/jero/JUpload.vue

@@ -46,6 +46,7 @@
   import Vue from 'vue'
   import { ACCESS_TOKEN } from "@/store/mutation-types"
   import { getFileAccessHttpUrl } from '@/api/manage';
+  const Base64 = require('js-base64').Base64
 
   const FILE_TYPE_ALL = "all"
   const FILE_TYPE_IMG = "image"
@@ -53,13 +54,6 @@
   const uidGenerator=()=>{
     return '-'+parseInt(Math.random()*10000+1,10);
   }
-  const getFileName=(path)=>{
-    if(path.lastIndexOf("\\")>=0){
-      let reg=new RegExp("\\\\","g");
-      path = path.replace(reg,"/");
-    }
-    return path.substring(path.lastIndexOf("/")+1);
-  }
   export default {
     name: 'JUpload',
     data(){
@@ -176,46 +170,29 @@
           this.fileList = [];
           return;
         }
-        let fileList = [];
         for(var a=0;a<val.length;a++){
-          let url = getFileAccessHttpUrl(val[a].filePath);
-          fileList.push({
-            uid:uidGenerator(),
-            name:val[a].fileName,
-            status: 'done',
-            url: url,
-            response:{
-              status:"history",
-              message:val[a].filePath
+          this.fileList.forEach((item)=>{
+            if (item.url === val[a]){
+              item.uid = uidGenerator()
+              item.response.status = 'done'
             }
           })
         }
-        this.fileList = fileList
       },
       initFileList(paths){
         if(!paths || paths.length==0){
-          //return [];
-          // update-begin- --- author:os_chengtgen ------ date:20190729 ---- for:issues:326,Jupload组件初始化bug
           this.fileList = [];
           return;
-          // update-end- --- author:os_chengtgen ------ date:20190729 ---- for:issues:326,Jupload组件初始化bug
         }
-        let fileList = [];
         let arr = paths.split(",")
         for(var a=0;a<arr.length;a++){
-          let url = getFileAccessHttpUrl(arr[a]);
-          fileList.push({
-            uid:uidGenerator(),
-            name:getFileName(arr[a]),
-            status: 'done',
-            url: url,
-            response:{
-              status:"history",
-              message:arr[a]
+          this.fileList.forEach((item)=>{
+            if (item.url === arr[a]){
+              item.uid = uidGenerator()
+              item.response.status = 'history'
             }
           })
         }
-        this.fileList = fileList
       },
       handlePathChange(){
         let uploadFiles = this.fileList
@@ -226,13 +203,11 @@
         let arr = [];
 
         for(var a=0;a<uploadFiles.length;a++){
-          // update-begin-author:lvdandan date:20200603 for:【TESTA-514】【开源issue】多个文件同时上传时，控制台报错
           if(uploadFiles[a].status === 'done' ) {
-            arr.push(uploadFiles[a].response.message)
+            arr.push(uploadFiles[a].url)
           }else{
             return;
           }
-          // update-end-author:lvdandan date:20200603 for:【TESTA-514】【开源issue】多个文件同时上传时，控制台报错
         }
         if(arr.length>0){
           path = arr.join(",")
@@ -253,7 +228,6 @@
         return true
       },
       handleChange(info) {
-        console.log("--文件列表改变--")
         if(!info.file.status && this.uploadGoOn === false){
           info.fileList.pop();
         }
@@ -265,7 +239,7 @@
           if(info.file.response.success){
             fileList = fileList.map((file) => {
               if (file.response) {
-                let reUrl = file.response.message;
+                let reUrl = `${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.response.result.fileName}`;
                 file.url = getFileAccessHttpUrl(reUrl);
               }
               return file;
@@ -290,7 +264,7 @@
               if(fileList[a].status === 'done' ) {
                 var fileJson = {
                   fileName:fileList[a].name,
-                  filePath:fileList[a].response.message,
+                  filePath:fileList[a].url,
                   fileSize:fileList[a].size
                 };
                 this.newFileList.push(fileJson);
@@ -307,12 +281,16 @@
         //如有需要新增 删除逻辑
         console.log(file)
       },
-      handlePreview(file){
+      handlePreview(file) {
         if(this.fileType === FILE_TYPE_IMG){
           this.previewImage = file.url || file.thumbUrl;
           this.previewVisible = true;
         }else{
-          location.href=file.url
+          if (file && file.url) {
+            var fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}`
+            let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}`
+            window.open(url)
+          }
         }
       },
       handleCancel(){
@@ -320,20 +298,17 @@
       },
       //---------------------------- begin 图片左右换位置 -------------------------------------
       moveLast(){
-        //console.log(ev)
-        //console.log(this.fileList)
-        //console.log(this.currentImg)
         let index = this.getIndexByUrl();
-        if(index==0){
+        if(index == 0){
           this.$message.warn('未知的操作')
         }else{
           let curr = this.fileList[index].url;
           let last = this.fileList[index-1].url;
           let arr =[]
           for(let i=0;i<this.fileList.length;i++){
-            if(i==index-1){
+            if(i == index-1){
               arr.push(curr)
-            }else if(i==index){
+            }else if(i == index){
               arr.push(last)
             }else{
               arr.push(this.fileList[i].url)
@@ -345,16 +320,16 @@
       },
       moveNext(){
         let index = this.getIndexByUrl();
-        if(index==this.fileList.length-1){
+        if(index == this.fileList.length-1){
           this.$message.warn('已到最后~')
         }else{
           let curr = this.fileList[index].url;
           let next = this.fileList[index+1].url;
           let arr =[]
           for(let i=0;i<this.fileList.length;i++){
-            if(i==index+1){
+            if(i === index+1){
               arr.push(curr)
-            }else if(i==index){
+            }else if(i == index){
               arr.push(next)
             }else{
               arr.push(this.fileList[i].url)
@@ -366,7 +341,7 @@
       },
       getIndexByUrl(){
         for(let i=0;i<this.fileList.length;i++){
-          if(this.fileList[i].url === this.currentImg || encodeURI(this.fileList[i].url) === this.currentImg){
+          if(this.fileList[i].url == this.currentImg || encodeURI(this.fileList[i].url) == this.currentImg){
             return i;
           }
         }
@@ -390,7 +365,7 @@
         picList[0].addEventListener('mouseover',(ev)=>{
           ev = ev || window.event;
           let target = ev.target || ev.srcElement;
-          if('ant-upload-list-item-info' == target.className){
+          if('ant-upload-list-item-info' === target.className){
             this.showMoverTask=false
             let item = target.parentElement
             this.left = item.offsetLeft
@@ -405,14 +380,14 @@
           ev = ev || window.event;
           let target = ev.target || ev.srcElement;
           //console.log('移除',target)
-          if('ant-upload-list-item-info' == target.className){
+          if('ant-upload-list-item-info' === target.className){
             this.showMoverTask=true
             setTimeout(()=>{
               if(this.moverHold === false)
                 this.moveDisplay = 'none';
             },100)
           }
-          if('ant-upload-list-item ant-upload-list-item-done' == target.className || 'ant-upload-list ant-upload-list-picture-card'== target.className){
+          if('ant-upload-list-item ant-upload-list-item-done' === target.className || 'ant-upload-list ant-upload-list-picture-card'=== target.className){
             this.moveDisplay = 'none';
           }
         })

jero-web/src/components/jerobiz/JSelectDepart.vue

@@ -88,7 +88,6 @@
         //返回字段不为id时，根据返回字段获取id
         if(this.customReturnField !== 'id' && this.value){
           const dataList = this.$refs.innerDepartSelectModal.dataList;
-          console.log('this.value',this.value)
           this.departIds = this.value.split(',').map(item => {
             const data = dataList.filter(d=>d[this.customReturnField] === item)
             return data.length > 0 ? data[0].id : ''

jero-web/src/components/jerobiz/JSelectRole.vue

@@ -31,9 +31,6 @@
           { title: '角色编码', dataIndex: 'roleCode', align: 'center', width: 120 }
         ]
       }
-    },
-    created(){
-      console.log(this.$attrs)
     }
   }
 </script>

jero-web/src/components/layouts/RouteView.vue

@@ -17,17 +17,13 @@
       //update-begin--Author:scott  Date:20201015 for：路由缓存问题，关闭了tab页时再打开就不刷新 #842
       includedComponents() {
         const includedRouters = Vue.ls.get(CACHE_INCLUDED_ROUTES)
-        console.log("includedRouters：" + includedRouters)
-
         //如果是缓存路由，则加入到 cache_included_routes
         if (this.$route.meta.keepAlive && this.$route.meta.componentName) {
           let cacheRouterArray = Vue.ls.get(CACHE_INCLUDED_ROUTES) || []
           if(!cacheRouterArray.includes(this.$route.meta.componentName)){
             cacheRouterArray.push(this.$route.meta.componentName)
             // cacheRouterArray.push("OnlCgformHeadList")
-            console.log("Vue ls set componentName ：" + this.$route.meta.componentName)
             Vue.ls.set(CACHE_INCLUDED_ROUTES, cacheRouterArray)
-            console.log("Vue ls includedRouterArrays ：" + Vue.ls.get(CACHE_INCLUDED_ROUTES))
             return cacheRouterArray;
           }
         }