@zscreate/zhxy-app-component 1.0.114 → 1.0.116

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

@@ -787,11 +787,17 @@ export default {
       return findComponent(data.list)
     },
     getUploadFileUrl(widget) {
-      let action = ''
+      let action = action = this.widget.options.action;
+
       if (String(widget.options.action).startsWith('http')) {
         action = this.widget.options.action;
       } else {
-        action = this.actionUrl.includes('sys/common/upload') ? this.actionUrl : (this.actionUrl + '/sys/common/upload')
+        if (action !== '/sys/common/upload') {
+          const apiUrl = process.uniEnv.BASE_API || process.uniEnv.apiUrl
+          action = apiUrl + action
+        } else {
+          action = this.actionUrl.includes('sys/common/upload') ? this.actionUrl : (this.actionUrl + '/sys/common/upload')
+        }
       }
       return action
     },
@@ -817,10 +823,7 @@ export default {
         }
       })
     },
-    //文件删除
-    fileDelete(idx) {
-      this.dataModel.splice(idx, 1)
-    },
+
     //切换时间
     dateChange(val) {
       if (this.tableKey) {
@@ -864,7 +867,7 @@ export default {
         let params = {
           formId: this.formId,
           model: this.widget.model,
-          value: this.models,
+          value: Object.assign({} , this.getFormData() , this.models),
         };
         // if (typeof(this.formDataId) == 'object' && this.formDataId.id) {
         // 	params.formDataId = this.formDataId.id

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

@@ -20,10 +20,10 @@ export default {
             }
         },
         httpApiActions(args) {
-            const { method = 'get', api, data, showError } = args
+            const { method = 'get', api, data, showError, handleData } = args
             let func = method === 'get' ? this.$u.get : this.$u.post
             func(api, data).then(res => {
-               res.success && this.updateModelByPulish(res.result)
+               res.success && this.updateModelByPulish(handleData ? handleData(res) : res.result)
 
                 if (!res.success && showError) {
                     uni.showToast({ title: res.message, icon: 'none' })

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

@@ -3,6 +3,25 @@ export const valueChangeMixin = {
 		/**文件dataModal**/
 		filePost(val) {
 			this.dataModel.push(val)
+			this.updateEncryptFileIds()
+		},
+		//文件删除
+		fileDelete(idx) {
+			this.dataModel.splice(idx, 1)
+			this.updateEncryptFileIds()
+		},
+		updateEncryptFileIds() {
+			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)
+				}
+			}
 		},
 		/**imgdataModal**/
 		imgUrlPost(val) {

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

@@ -7,7 +7,7 @@
 			</view>
 			<view>
 				<view class="file_item" v-for="(item,idx) in defaultFile" :key="idx">
-					<view @click="downLoadFile(item.url,item.name)" style="max-width: 640rpx;color: rgb(0, 122, 255); overflow: hidden" :style="{maxWidth: disabled ? '100%': '640rpx'}">{{item.name}}</view>
+					<view @click="downLoadFile(item.url,item.name, item)" style="max-width: 640rpx;color: rgb(0, 122, 255); overflow: hidden" :style="{maxWidth: disabled ? '100%': '640rpx'}">{{item.name}}</view>
 					<icon type="clear" size="16" @click="handleDelete(idx)" v-if="!disabled" />
 				</view>
 			</view>
@@ -81,8 +81,13 @@
 			handleDelete(idx) {
 				this.$emit('fileDelete', idx)
 			},
-			downLoadFile(path, name) {
-        downloadFile(this.downLoadUrl, { path, name })
+			downLoadFile(path, name, item) {
+        let baseUrl = this.downLoadUrl
+        if (this.widget.options.uploadEncrypt) {
+          path = '/sys/common/downloadZip?fileId=' + item.fileId
+          baseUrl = process.uniEnv.BASE_API || process.uniEnv.apiUrl
+        }
+        downloadFile(baseUrl, { path, name })
 			},
 			chooseMessageFile: function(e) {
 				console.log(this.widget, )
@@ -140,13 +145,27 @@
 							filePath: path[0].path,
 							name: 'file',
 							formData: {},
+              // header['X-Access-Token'] = uni.getStorageSync('token') || vm.$store.state.token
+              header: {
+                'X-Access-Token': uni.getStorageSync('token') || this.$store.state.token || this.$store.getters.token
+              },
 							success: function(res) {
-								let imgObj = {
-									key: String(Math.random()).substr(2) - 0,
-									name: that.name,
-									status: "success",
-									url: JSON.parse(res.data).message
-								}
+                res = JSON.parse(res.data)
+                if (!res.success) return uni.showToast({
+                  title: res.message || '文件上传失败',
+                  icon: 'none'
+                })
+
+                let imgObj = {
+                  key: String(Math.random()).substr(2) - 0,
+                  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']
+                }
 								that.$emit('filePost', imgObj)
 							},
               complete() {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zscreate/zhxy-app-component",
-	"version": "1.0.114",
+	"version": "1.0.116",
 	"private": false,
 	"description": "zhxy-app-component",
 	"main": "index.js",
@@ -8,6 +8,7 @@
 		"zhxy-app-component"
 	],
 	"scripts": {
+		"postversion": "git push && git push --tags",
 		"test": "echo \"Error: no test specified\" && exit 1"
 	},
 	"files": [

package/utils/util.js

@@ -110,8 +110,9 @@ function downloadFile(downLoadUrl, { path, name }) {
 	let type = '';
 	const fileTypes = ['doc', 'docx', 'pdf', 'xls', 'xlsx', 'ppt', 'pptx'];
 	const imageTypes = ['png', 'jpeg', 'jpg', 'gif']
-	if (path) {
-		let str = path.split('.');
+	let tempPath = name || path
+	if (tempPath) {
+		let str = tempPath.split('.');
 		type = str[str.length - 1]
 		type = type.toString().toLowerCase()
 	}