@zscreate/zhxy-app-component 1.0.116 → 1.0.117

package/components/evan-form-item/evan-form-item.vue

@@ -264,7 +264,7 @@
         {{ widget.name }}
       </view>
       <view class="evan-form-item-container__main" :style="mContentStyle">
-        <unploadFile :widget="widget" @imgUrlPost="imgUrlPost" :defaultImg="dataModel"></unploadFile>
+        <unploadFile :widget="widget" :action="getUploadFileUrl(widget)"  @filePost="filePost" @fileDelete="fileDelete"  :defaultImg="dataModel"></unploadFile>
       </view>
     </view>
 

package/components/evan-form-item/mixins/valueChangeMixin.js

@@ -2,26 +2,34 @@ export const valueChangeMixin = {
 	methods: {
 		/**文件dataModal**/
 		filePost(val) {
+			if (!Array.isArray(this.dataModel)) this.dataModel = []
 			this.dataModel.push(val)
-			this.updateEncryptFileIds()
+			if (this.widget.options.uploadEncrypt) {
+				this.updateStringModel('formFileIds', val.fileId , 'add')
+			}
 		},
 		//文件删除
 		fileDelete(idx) {
-			this.dataModel.splice(idx, 1)
-			this.updateEncryptFileIds()
-		},
-		updateEncryptFileIds() {
+			const data = this.dataModel.splice(idx, 1)
 			if (this.widget.options.uploadEncrypt) {
-				if (Array.isArray(this.dataModel)) {
-					this.models['formFileIds'] =  this.dataModel.map(item => {
-						return item['fileId']
-					}).join(',')
-					this.$emit('update:models', this.models)
-				} else {
-					this.models['formFileIds'] = ''
-					this.$emit('update:models', this.models)
-				}
+				this.updateStringModel('formFileIds', data[0].fileId , 'del')
+			}
+		},
+		updateStringModel(key ,data ,tag = 'add') {
+			const modelData = String(this.models[key] || '').split(',')
+			if (modelData[0] === '') modelData.shift()
+
+			if (tag === 'add' && !modelData.includes(data)) {
+				modelData.push(data)
+			}
+			else if (tag === 'del' && modelData.includes(data)) {
+				modelData.splice(modelData.indexOf(data), 1)
 			}
+			// 需要异步调用， 不然会影响 updateModels
+			setTimeout(() => {
+				this.models[key] = modelData.join(',')
+				this.$emit('update:models', this.models)
+			},0)
 		},
 		/**imgdataModal**/
 		imgUrlPost(val) {

package/components/form-container/css/style_2.less

@@ -172,7 +172,7 @@
       .evan-form-item-container__label {
         align-self: flex-start;
         padding-left: 0 !important;
-        color: #666;
+        color: #000;
         min-height: 96rpx;
         line-height: 96rpx;
         font-size: 26rpx;

package/components/l-file/l-file.vue

@@ -155,16 +155,17 @@
                   title: res.message || '文件上传失败',
                   icon: 'none'
                 })
-
+                let uid =  String(Math.random()).substr(2) - 0
                 let imgObj = {
-                  key: String(Math.random()).substr(2) - 0,
+                  uid,
+                  key: uid,
                   name: that.name,
                   status: "success",
                   url: res.message
                 }
                 if (that.widget.options.uploadEncrypt) {
                   imgObj['fileId'] = res.result.fileId
-                  imgObj['name'] = res.result.fileName || imgObj['name']
+                  imgObj['name'] = imgObj['name'] || res.result.fileName
                 }
 								that.$emit('filePost', imgObj)
 							},

package/components/uploadFile/uploadFile.vue

@@ -3,6 +3,7 @@
     <u-upload ref="uUpload" :file-list="fileList" :action="action" :deletable="!disabled"
               @afterRead="afterRead"
               @delete="onRemove"
+              :header="header"
               :upload-text="widget.options.placeholder"
               width="150" height="150" :multiple="false" :max-count="maxCount" :disabled="disabled"
               @on-remove="onRemove" @on-oversize="onOversize" @on-success="onSuccess"
@@ -35,12 +36,14 @@ export default {
       default: () => {
         return {}
       }
-    }
+    },
+    action: {
+      type: String,
+    },
   },
   data() {
     return {
-      actionUrl: this.uniEnv.uploadUrl,
-      action: '',
+
       percent: 0,
       upimg: '',
       maxCount: 8,
@@ -49,7 +52,10 @@ export default {
       fileList: [],
       emitList: [],
       uploadIng: false,
-      showProgress: true
+      showProgress: true,
+      header: {
+        'X-Access-Token': uni.getStorageSync('token') || this.$store.state.token || this.$store.getters.token
+      },
     };
   },
   created() {
@@ -116,19 +122,34 @@ export default {
       //   })
       // })
       for (let i = 0; i < lists.length; i++) {
-        const result = await this.uploadFilePromise(lists[i].url)
+
+        const { message, result = {}, success } = await this.uploadFilePromise(lists[i].url)
         let id = new Date().getTime();
+        if (!success) {
+          return uni.showToast({
+            title: message || '文件上传失败',
+            icon: 'none'
+          })
+        }
         const item = {
           key: id,
           uid: id,
-          url: result,
+          url: message,
           status: "done",
-          name: id
+          name:  id
+        }
+        let previewUrl = this.uniEnv.imgUrl + item.url
+
+        if (this.widget.options.uploadEncrypt) {
+          item.fileId = result.fileId
+          item.name = result.fileName || item.id
+          previewUrl = (process.uniEnv.BASE_API || process.uniEnv.apiUrl) + '/sys/common/downloadZip?fileId=' + result.fileId
         }
         this.emitList.push(item)
-        this.fileList.push(Object.assign({}, item, {url: this.uniEnv.imgUrl + item.url}))
+
+        this.fileList.push(Object.assign({}, item, { url: previewUrl }))
         this.uploadIng = false
-        this.$emit('imgUrlPost', this.emitList)
+        this.$emit('filePost', item)
       }
     },
     uploadFilePromise(url) {
@@ -137,9 +158,10 @@ export default {
           url: this.action,
           filePath: url,
           name: 'file',
+          header: this.header,
           success: (uploadFileRes) => {
             const res = JSON.parse(uploadFileRes.data)
-            resolve(res.message)
+            resolve(res)
           },
           complete: () => {
             setTimeout(() => {
@@ -166,6 +188,9 @@ export default {
                 ...item,
               };
               tempItem.url = this.uniEnv.imgUrl + tempItem.url;
+              if (tempItem.fileId) {
+                tempItem.url = (process.uniEnv.BASE_API || process.uniEnv.apiUrl) + '/sys/common/downloadZip?fileId=' + tempItem.fileId
+              }
               return tempItem;
             })
 
@@ -174,11 +199,11 @@ export default {
     },
     initWidget() {
       //action url
-      if (String(this.widget.options.action).startsWith('http')) {
-        this.action = this.widget.options.action;
-      } else {
-        this.action = this.actionUrl.includes('sys/common/upload') ? this.actionUrl : (this.actionUrl + '/sys/common/upload')
-      }
+      // if (String(this.widget.options.action).startsWith('http')) {
+      //   this.action = this.widget.options.action;
+      // } else {
+      //   this.action = this.actionUrl.includes('sys/common/upload') ? this.actionUrl : (this.actionUrl + '/sys/common/upload')
+      // }
       //文件大小限制
       this.maxSize = this.widget.options.fileSize ? this.widget.options.fileSize * 1024 : 300000;
 
@@ -203,23 +228,37 @@ export default {
 
     // },
     onSuccess(data, index, lists, name) {
+
+      if (!data.success) {
+        // this.fileList = []
+        lists[index].error = true
+        return uni.showToast({
+          title: data.message || '文件上传失败',
+          icon: 'none'
+        })
+      }
       let id = new Date().getTime();
       let imgArr = data.message.split('/');
       let _name = imgArr[imgArr.length - 1]
-      this.emitList.push({
+      const imgObj = {
         key: id,
         uid: id,
         url: data.message,
         status: "done",
         name: _name
-      });
-      this.$emit('imgUrlPost', this.emitList)
+      }
+      if (this.widget.options.uploadEncrypt) {
+        imgObj['fileId'] = data.result.fileId
+        imgObj['name'] = imgObj['name'] || data.result.fileName
+      }
+      this.emitList.push(imgObj)
+      this.$emit('filePost', imgObj)
     },
     onRemove(index, lists, name) {
       if (typeof (index) === 'object') index = index.index
       this.emitList.splice(index, 1);
       this.fileList.splice(index, 1);
-      this.$emit('imgUrlPost', this.emitList)
+      this.$emit('fileDelete', index)
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zscreate/zhxy-app-component",
-	"version": "1.0.116",
+	"version": "1.0.117",
 	"private": false,
 	"description": "zhxy-app-component",
 	"main": "index.js",