yusheng před 1 rokem
rodič
revize
5ffa5cffa8

+ 13 - 3
lib/vue-form-making-v3/src/components/Upload/file.vue

@@ -212,20 +212,30 @@ export default {
       }
       this.$refs.uploadInput.value = []
     },
+    getQueryParams(queryName) {
+        const urlSearchParams = new URLSearchParams(window.location.search);
+        const query = urlSearchParams.get(queryName);
+        return JSON.parse(query);
+    },
     uploadAction (res, file, key) {
       let changeIndex = this.fileList.findIndex(item => item.key === key)
       const xhr = new XMLHttpRequest()
-
+      let headers = this.getQueryParams('headers');
+        console.log(headers.Authorization,'this.headers.Authorization')
       const url = this.action
       xhr.open('POST', url, true)
       // xhr.setRequestHeader('Content-Type', 'multipart/form-data')
       this.headers.map(item => {
+        if (item.key == 'Authorization') {
+            item.value = headers.Authorization
+            console.log(item.value, '====111');
+          }
         item.key && xhr.setRequestHeader(item.key, item.fx ? executeExpression(item.value, {}, this.formContext) : item.value)
       })
 
       let formData = new FormData()
       formData.append('multiPartFile', file)
-      formData.append('file', file)
+      // formData.append('file', file)
       formData.append('fname', file.name)
       formData.append('key', key)
 
@@ -253,7 +263,7 @@ export default {
                 ...resData.data
               })
               console.log(this.fileList, '====');
-              this.$emit('input', this.fileList)
+              this.$emit('update:modelValue', this.fileList)
             }, 200)
           } else if (resData && resData.url) {
             this.fileList[this.fileList.findIndex(item => item.key === key)] = {

+ 15 - 5
lib/vue-form-making-v3/src/components/Upload/index.vue

@@ -233,20 +233,31 @@ export default {
       }
       this.$refs.uploadInput.value = []
     },
+    getQueryParams(queryName) {
+        const urlSearchParams = new URLSearchParams(window.location.search);
+        const query = urlSearchParams.get(queryName);
+        return JSON.parse(query);
+    },
+    
     uploadAction (res, file, key) {
       let changeIndex = this.fileList.findIndex(item => item.key === key)
       const xhr = new XMLHttpRequest()
-
+     let headers = this.getQueryParams('headers');
+        console.log(headers.Authorization,'this.headers.Authorization')
       const url = this.action
       xhr.open('POST', url, true)
       // xhr.setRequestHeader('Content-Type', 'multipart/form-data')
       this.headers.map(item => {
+            if (item.key == 'Authorization') {
+            item.value = headers.Authorization
+            console.log(item.value, '====111');
+          }
         item.key && xhr.setRequestHeader(item.key, item.fx ? executeExpression(item.value, {}, this.formContext) : item.value)
       })
 
       let formData = new FormData()
       formData.append('multiPartFile', file)
-      formData.append('file', file)
+      // formData.append('file', file)
       formData.append('fname', file.name)
       formData.append('key', key)
 
@@ -254,9 +265,9 @@ export default {
 
       xhr.onreadystatechange = () => {
         if (xhr.readyState === 4) {
-
           let resData = JSON.parse(xhr.response)
           if (resData && resData.code == 0) {
+            console.log('用的新的')
             this.$set(this.fileList, this.fileList.findIndex(item => item.key === key), {
               ...this.fileList[this.fileList.findIndex(item => item.key === key)],
               percent: 100,
@@ -273,8 +284,7 @@ export default {
                 status: 'success',
                 ...resData.data
               })
-              console.log(this.fileList, '====');
-              this.$emit('input', this.fileList)
+              this.$emit('update:modelValue', this.fileList)
             }, 200)
           } else if (resData && resData.url) {
             this.fileList[this.fileList.findIndex(item => item.key === key)] = {

+ 11 - 5
lib/vue-form-making/src/components/Upload/file.vue

@@ -236,14 +236,20 @@ export default {
       xhr.open('POST', url, true)
       // xhr.setRequestHeader('Content-Type', 'multipart/form-data')
       this.headers.map(item => {
+        if(item.key=='Authorization'){
+          item.value=Object.values(getToken())[0]
+          console.log(item.value, '====111');
+
+        }
         item.key && xhr.setRequestHeader(item.key, item.fx ? executeExpression(item.value, {}, this.formContext) : item.value)
       })
 
-      this.headers = [{
-        key: Object.keys(getToken())[0],
-        value: Object.values(getToken())[0]
-      }]
-      console.log(this.headers, '====');
+      // this.headers = [{
+      //   key: Object.keys(getToken())[0],
+      //   value: Object.values(getToken())[0]
+      // }]
+      console.log(this.headers, '====111');
+      // return
       let formData = new FormData()
       formData.append('multiPartFile', file)
       formData.append('fname', file.name)

+ 10 - 4
lib/vue-form-making/src/components/Upload/index.vue

@@ -239,12 +239,18 @@ export default {
       xhr.open('POST', url, true)
       // xhr.setRequestHeader('Content-Type', 'multipart/form-data')
       this.headers.map(item => {
+        if(item.key=='Authorization'){
+          item.value=Object.values(getToken())[0]
+          console.log(item.value, '====111');
+        }
         item.key && xhr.setRequestHeader(item.key, item.fx ? executeExpression(item.value, {}, this.formContext) : item.value)
       })
-      this.headers = [{
-        key: Object.keys(getToken())[0],
-        value: Object.values(getToken())[0]
-      }]
+      // this.headers = [{
+      //   key: Object.keys(getToken())[0],
+      //   value: Object.values(getToken())[0]
+      // }]
+     
+
       let formData = new FormData()
       formData.append('multiPartFile', file)
       formData.append('fname', file.name)

+ 1 - 1
src/BIZComponents/processSubmitDialog/processSubmitDialog.vue

@@ -384,7 +384,7 @@ this.postOptions.push(...response.data);
           }
           if (item.type == 'deptCascader') {
             if (item.options.isDefaultLoginUser) {
-              this.form.valueJson[item.model] = this.user.info.groupId;
+              this.form.valueJson[item.model] = this.user.info.groupIdList;
             }
           }
           if (item.type == 'userSelect') {