mali-applet-ui 0.2.71 → 0.2.73

package/components/ml-amount-input/ml-amount-input.vue

@@ -253,6 +253,9 @@ export default {
 			text-align: right;
 		}
 	}
+	.ml-amount-input-inp {
+		outline: 0;
+	}
 	.ml-amount-input-inp,
 	.ml-amount-input-simulate {
 		font-size: $uni-font-size-base;

package/components/ml-input/ml-input.vue

@@ -140,6 +140,9 @@ export default {
 	.ml-input-readonly-content {
 		padding: 20rpx 4rpx;
 	}
+	.ml-input-inp {
+		outline: 0;
+	}
 	.ml-input-inp,
 	.ml-input-simulate {
 		padding: 0 10rpx;

package/components/ml-number-input/ml-number-input.vue

@@ -247,6 +247,9 @@ export default {
 		color: #c0c4cc;
   	border-radius: 0 $ml-border-radius $ml-border-radius 0;
 	}
+	.ml-number-input-inp {
+		outline: 0;
+	}
 	.ml-number-input-minus-btn,
 	.ml-number-input-plus-btn {
 		display: flex;

package/components/ml-province-city-picker/ml-province-city-picker.vue

@@ -87,7 +87,7 @@ export default {
     },
     provinceList () {
       if (this.isAll) {
-        return [{ name: '全部', code: '' }].concat(provinceCity)
+        return [{ name: '全部', code: '', _all: true }].concat(provinceCity)
       }
       return provinceCity
     },
@@ -137,7 +137,10 @@ export default {
       this.closePopup()
     },
     confirmEvent () {
-      const value = [this.selectProvinceValue, this.selectCityValue]
+      let  value = [this.selectProvinceValue, this.selectCityValue]
+      if (this.isAll && this.selectProvinceItem && this.selectProvinceItem._all) {
+        value = ['', '']
+      }
       this.$emit('update:province', value[0])
       this.$emit('update:city', value[1])
       this.$emit('input', value)

package/components/ml-tabbar/ml-tabbar.vue

@@ -67,7 +67,7 @@ export default {
 .ml-tabbar {
   display: flex;
   position: fixed;
-  z-index: 22;
+  z-index: 20;
   padding: 6rpx 0 12rpx 0;
   color: $uni-text-color;
   background: #FFFFFF;

package/components/ml-textarea/ml-textarea.vue

@@ -154,7 +154,6 @@ export default {
   }
   .ml-textarea-inp,
   .ml-textarea-simulate {
-    color: rgba(39, 42, 48, 0.4500);
     height: 280rpx;
     width: 100%;
 		font-size: $uni-font-size-base;

package/components/ml-upload/ml-upload.vue

@@ -1,33 +1,58 @@
 <template>
 	<view class="ml-upload" :class="[className || '']">
-		<view v-if="isFromReadonly">
-			<view v-if="mediatype === 'image'" class="ml-upload-image-list">
-				<view class="ml-upload-file-item" v-for="(item, index) in value" :key="index">
-					<image class="ml-upload-file-img" mode="aspectFill" :src="getUrl(item)" @click="previewEvent(item, index)"></image>
+		<!-- 上传图片 -->
+		<view v-if="mediatype === 'image'" class="ml-upload-image-list">
+			<view class="ml-upload-image-item" v-for="(item, index) in fileList" :key="index">
+				<image class="ml-upload-image-img" mode="aspectFit" :src="getUrl(item)" @click="previewImageEvent(item, index)"></image>
+				<view class="ml-upload-image-del-btn" @click="removeEvent(item)">
+					<ml-icon name="close" />
 				</view>
 			</view>
-			<view v-else class="ml-upload-file-list">
-				<view class="ml-upload-file-item" v-for="(item, index) in value" :key="index">
-					<view class="ml-upload-file-name" @click="downloadEvent(item)">{{ item[nameField] }}</view>
+			<view v-if="!isFromReadonly" class="ml-upload-image-add">
+				<view class="ml-upload-image-add-btn" @tap="chooseEvent">
+					<view class="ml-upload-image-add-icon">
+						<ml-icon name="add" />
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 上传文件 -->
+		<view v-else class="ml-upload-file-list">
+			<view v-if="!isFromReadonly" class="ml-upload-file-add">
+				<view class="ml-upload-file-add-btn" @tap="chooseEvent">
+					<text class="ml-upload-file-add-icon">
+						<ml-icon name="add" />
+					</text>
+					<text>添加文件</text>
+				</view>
+			</view>
+			<view class="ml-upload-file-item" v-for="(item, index) in fileList" :key="index">
+				<view class="ml-upload-file-left">
+					<view class="ml-upload-file-icon">
+						<ml-icon :name="getFileIcon(item)" />
+					</view>
+				</view>
+				<view class="ml-upload-file-info">
+					<view class="ml-upload-file-name">{{ item[nameField] }}</view>
+					<view class="ml-upload-file-desc">
+						<ml-button v-if="previewTypes.includes(item[typeField])" status="primary" type="text" @click="previewDocs(item)">预览</ml-button>
+						<ml-button status="primary" type="text" @click="downloadEvent(item)">下载</ml-button>
+					</view>
+				</view>
+				<view class="ml-upload-file-right">
+					<view class="ml-upload-file-del-btn" @click="removeEvent(item)">
+						<ml-icon name="close" />
+					</view>
 				</view>
 			</view>
 		</view>
-		<uni-file-picker
-			v-else
-			v-model="selectUniFileList" 
-			:limit="limit"
-			file-mediatype="image"
-			:image-styles="imageStyles"
-			:auto-upload="false"
-			@select="selectFile"
-			@delete="removeEvent">
-		</uni-file-picker>
 	</view>
 </template>
 
 <script>
 import XEUtils from 'xe-utils'
 import globalStore from '../../config/store'
+import { uploadAllFiles, uploadImageFiles } from './file-handle'
 	
 export default {
   name: 'MlUpload',
@@ -82,16 +107,7 @@ export default {
 	data () {
 		return {
 			fileList: [],
-			selectUniFileList: [],
-			imageStyles: {
-				// "height": 60,	// 边框高度
-				// "width": 60,	// 边框宽度
-				// "border":{ // 如果为 Boolean 值，可以控制边框显示与否
-				// 	"color":"transparent",		// 边框颜色
-				// 	"width":"1px",		// 边框宽度
-				// 	"style":"solid", 	// 边框样式
-				// }
-			},
+			docsTypes: ['doc', 'xls', 'ppt', 'pdf', 'docx', 'xlsx', 'pptx'],
 			imgTypes: ['png', 'jpg']
 		}
 	},
@@ -102,6 +118,9 @@ export default {
 			}
 			return this.form ? this.form.readonly : false
 		},
+		previewTypes () {
+			return this.docsTypes.concat(this.imgTypes)
+		},
     imageList () {
       return this.value ? this.value.filter(item => this.imgTypes.includes(item[this.typeField])) : []
     },
@@ -119,7 +138,7 @@ export default {
     }
 	},
 	watch: {
-		value (val) {
+		value () {
 			if (!this.isUpdate) {
 				this.isUpdate = true
 				this.loadList()
@@ -133,6 +152,25 @@ export default {
 		this.loadList()
 	},
 	methods: {
+		getFileIcon (item) {
+			switch (item[[this.typeField]]) {
+				case 'png':
+				case 'jpg':
+					return 'file-image'
+				case 'doc':
+				case 'docx':
+					return 'file-word'
+				case 'xls':
+				case 'xlsx':
+					return 'file-excel'
+				case 'ppt':
+				case 'pptx':
+					return 'file-ppt'
+				case 'pdf':
+					return 'file-pdf'
+			}
+			return 'file-txt'
+		},
 		loadList () {
 			if (this.simpleValue) {
 				this.fileList = this.urlList.map(url => {
@@ -151,21 +189,6 @@ export default {
 						tempPath: this.getUrl(obj)
 					}
 				})
-				this.selectUniFileList = this.urlList.map(url => {
-          const name = this.getUrlName(url)
-					const extname = this.getSuffix(name)
-					const obj = {
-						[this.nameField]: name,
-						[this.typeField]: extname,
-						[this.urlField]: url
-					}
-					return {
-						...obj,
-						name: name,
-						extname: extname,
-						url: this.getUrl(obj)
-					}
-				})
 				this.isUpdate = true
 				this.$emit('input', this.fileList)
 			} else {
@@ -173,14 +196,6 @@ export default {
 					item.tempPath = this.getUrl(item)
 					return item
 				})
-				this.selectUniFileList = this.value.map(item => {
-					return {
-						...item,
-						name: item[this.nameField],
-						extname: item[this.typeField],
-						url: this.getUrl(item)
-					}
-				})
 			}
 		},
 		updateModel () {
@@ -189,61 +204,8 @@ export default {
 		  this.$emit('input', this.fileList)
 			this.$emit('change', { value: this.simpleValue ? urlList : this.fileList })
 		},
-		async selectFile (e) {
-			const { tempFiles } = e
-			if (this.$loading) {
-				this.$loading.show('上传中')
-			}
-			const uploadMethod = this.uploadFile ? this.uploadFile : (globalStore.upload ? globalStore.upload.uploadFile : null)
-			Promise.all(
-				tempFiles.map(file => {
-      		const fileSuffix = this.getSuffix(file.name)
-					if (uploadMethod) {
-						return Promise.resolve(
-							uploadMethod.call(this.currVM, {
-								file,
-								params: this.params
-							})
-						).then(res => {
-							const item = {
-								...res,
-								[this.nameField]: res[this.nameField] || file.name,
-								[this.typeField]: res[this.typeField] || fileSuffix,
-								tempPath: file.path
-							}
-							this.selectUniFileList.push(file)
-							this.fileList.push(item)
-							this.isUpdate = true
-							this.updateModel()
-						})
-					} else {
-						const item = {
-							[this.nameField]: file.name,
-							[this.typeField]: file.extname,
-							[this.urlField]: file.path,
-							tempPath: file.path
-						}
-						this.selectUniFileList.push(file)
-						this.fileList.push(item)
-						this.isUpdate = true
-						this.updateModel()
-					}
-				})
-			).then(res => {
-				if (this.$loading) {
-					this.$loading.hide()
-				}
-			}).catch((e) => {
-				if (this.$loading) {
-					this.$loading.hide()
-				}
-			})
-		},
-		removeEvent (e) {
-			const { tempFilePath } = e
-			const item = this.fileList.find(item => item.tempPath === tempFilePath)
-			this.selectUniFileList = this.selectUniFileList.filter(item => item.url !== tempFilePath)
-			this.fileList = this.fileList.filter(item => item.tempPath !== tempFilePath)
+		removeEvent (item) {
+			this.fileList = this.fileList.filter(obj => obj.tempPath !== item.tempPath)
 			const removeMethod = this.removeFile ? this.removeFile : (globalStore.upload ? globalStore.upload.removeFile : null)
 			if (!item) {
 				console.error('删除出错！！！')
@@ -281,7 +243,7 @@ export default {
 		  }
 		  return suffix
 		},
-		previewEvent (item, index) {
+		previewImageEvent (item, index) {
 			if (this.previewStatus) {
 				return
 			}
@@ -327,40 +289,52 @@ export default {
 				}
 			})
 		},
+		previewDocs (item) {
+			// 仅支持文档和图片
+			if (previewTypes.includes(item[this.typeField])) {
+				uni.downloadFile({
+					url: this.getUrl(item), 
+					success: (downRes) => {
+						if (this.docsTypes.includes(item[this.typeField])) {
+							uni.openDocument({
+								filePath: downRes.tempFilePath,
+								showMenu: true,
+								success () {},
+								fail () {
+									uni.showModal({
+										content: '打开失败',
+										showCancel: false
+									})
+								}
+							})
+						} else if (this.imgTypes.includes(item[this.typeField])) {
+							this.previewImg(item)
+						}
+					},
+					fail () {
+						uni.showModal({
+							content: '下载失败',
+							showCancel: false
+						})
+					}
+				})
+			}
+		},
 		downloadEvent (item) {
 			uni.downloadFile({
 				url: this.getUrl(item), 
 				success: (downRes) => {
-					// 仅支持类型
-					if (['doc', 'xls', 'ppt', 'pdf', 'docx', 'xlsx', 'pptx'].includes(item[this.typeField])) {
-						uni.openDocument({
-							filePath: downRes.tempFilePath,
-							showMenu: true,
-							success (saveRes) {
-							},
-							fail () {
-								uni.showModal({
-									content: '打开失败',
-									showCancel: false
-								});
-							}
-						})
-					} else if (['png', 'jpg'].includes(item[this.typeField])) {
-						this.previewImg(item)
-					} else {
-						uni.saveFile({
-							tempFilePath: downRes.tempFilePath,
-							success: function(res) {
-								uni.showToast({
-									icon: 'none',
-									mask: true,
-									title: '文件已保存：' + res.savedFilePath, //保存路径
-									duration: 3000,
-								})
-							}
-						})
-
-					}
+					uni.saveFile({
+						tempFilePath: downRes.tempFilePath,
+						success: function(res) {
+							uni.showToast({
+								icon: 'none',
+								mask: true,
+								title: '文件已保存：' + res.savedFilePath, //保存路径
+								duration: 3000,
+							})
+						}
+					})
 				},
 				fail () {
 					uni.showModal({
@@ -369,6 +343,50 @@ export default {
 					});
 				}
 			})
+		},
+		chooseEvent () {
+			let chooseMethod = uploadAllFiles
+			if (this.mediatype === 'image') {
+				chooseMethod = uploadImageFiles
+			}
+			const uploadMethod = this.uploadFile ? this.uploadFile : (globalStore.upload ? globalStore.upload.uploadFile : null)
+			chooseMethod({
+				count: this.limit
+			}).then(res => {
+				const { tempFiles } = res
+				Promise.all(
+					tempFiles.map(file => {
+						const fileSuffix = this.getSuffix(file.name)
+						if (uploadMethod) {
+							return Promise.resolve(
+								uploadMethod.call(this.currVM, {
+									file,
+									params: this.params
+								})
+							).then(res => {
+								return {
+									...res,
+									[this.nameField]: res[this.nameField] || file.name,
+									[this.typeField]: res[this.typeField] || fileSuffix,
+									tempPath: file.path
+								}
+							})
+						}
+						return {
+							[this.nameField]: file.name,
+							[this.typeField]: file.extname,
+							[this.urlField]: file.path,
+							tempPath: file.path
+						}
+					})
+				).then(list => {
+					this.fileList.push(...list)
+					this.isUpdate = true
+					this.updateModel()
+				}).catch((e) => {
+					console.log(e)
+				})
+			})
 		}
 	}
 }
@@ -380,31 +398,105 @@ export default {
 	background: #fff;
 }
 .ml-upload-image-list {
-	.ml-upload-file-item {
-		display: inline-block;
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	.ml-upload-image-item,
+	.ml-upload-image-add {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		position: relative;
 		width: 140rpx;
 		height: 140rpx;
-		padding: 0 10rpx;
+		text-align: center;
+	}
+	.ml-upload-image-del-btn {
+		position: absolute;
+		right: 0;
+		top: 0;
+		width: 40rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		font-size: 28rpx;
+		text-align: center;
+		border-radius: 50%;
+		color: #ffffff;
+		background: #c8c8c9;
 	}
-	.ml-upload-file-img {
-		width: 100%;
-		height: 100%;
+	.ml-upload-image-add-btn {
+		width: 120rpx;
+		height: 120rpx;
+		line-height: 120rpx;
+		font-size: 60rpx;
+		color: #c8c8c9;
+		border: 1px dashed #c8c8c9;
+		border-radius: $ml-border-radius;
+	}
+	.ml-upload-image-img {
+		width: 120rpx;
+		height: 120rpx;
+		line-height: 120rpx;
+		border-radius: $ml-border-radius;
 	}
 }
 .ml-upload-file-list {
-	display: block;
+	.ml-upload-file-add,
 	.ml-upload-file-item {
-		border: 1rpx solid rgba(39, 42, 48, 0.0200);
-		background-color: rgba(39, 42, 48, 0.0200);
-		margin: 10rpx 0;
+		margin: 20rpx 0;
+	}
+	.ml-upload-file-item {
+		display: flex;
+		flex-direction: row;
+	}
+	.ml-upload-file-item {
+		padding-bottom: 10rpx;
+		border-bottom: 1px solid #f1f1f1;
+	}
+	.ml-upload-file-left,
+	.ml-upload-file-right {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		flex-shrink: 0;
+	}
+	.ml-upload-file-add-btn {
+		height: 70rpx;
+		line-height: 70rpx;
+		text-align: center;
+		color: #8a8686;
+		border: 1px dashed #c8c8c9;
 		border-radius: $ml-border-radius;
-    padding: 20rpx;
 	}
-	.ml-upload-file-name {
-		width: 600rpx;
+	.ml-upload-file-del-btn {
+		width: 40rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		text-align: center;
+		font-size: 28rpx;
+		color: #ffffff;
+		background: #c8c8c9;
+		border-radius: 50%;
+	}
+	.ml-upload-file-left {
+		width: 80rpx;
+	}
+	.ml-upload-file-icon {
+		font-size: 60rpx;
+		color: #666666;
+	}
+	.ml-upload-file-info {
+		flex-grow: 1;
 		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
+		.ml-upload-file-name {
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+		}
+	}
+	.ml-upload-file-right {
+		width: 60rpx;
 	}
 }
 </style>