mali-applet-ui 0.2.77 → 0.2.79

package/components/ml-dict-type/ml-dict-type.vue

@@ -64,6 +64,7 @@ export default {
 .ml-dict-type {
   display: inline-block;
 	padding: 0 4rpx;
+  vertical-align: middle;
   &+.ml-dict-type {
     margin-left: 20rpx;
   }

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

@@ -257,6 +257,9 @@ export default {
   width: 100%;
   padding: 10rpx 0;
 }
+.ml-form-item-default-content {
+  vertical-align: middle;
+}
 .ml-form-item-content-error {
   position: absolute;
   left: 0;

package/components/ml-text/ml-text.vue

@@ -66,6 +66,7 @@ export default {
 .ml-text {
   display: inline-block;
   padding: 0 4rpx;
+  vertical-align: middle;
   &.is-underline {
     text-decoration: underline;
     // #ifdef H5

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

@@ -95,6 +95,9 @@ export default {
   },
   computed: {
 		isFromReadonly () {
+      if (this.readonly) {
+        return true
+      }
 			return this.form ? this.form.readonly : false
 		}
   },

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

@@ -1,5 +1,5 @@
 <template>
-	<view class="ml-upload" :class="[className || '']">
+	<view class="ml-upload" :class="[className || '', {'is-loading': loading}]">
 		<!-- 上传图片 -->
 		<view v-if="mediatype === 'image'" class="ml-upload-image-list">
 			<view class="ml-upload-image-item" v-for="(item, index) in fileList" :key="index">
@@ -8,22 +8,26 @@
 					<ml-icon name="close" />
 				</view>
 			</view>
-			<view v-if="!isFromReadonly" class="ml-upload-image-add">
+			<view v-if="!isFromReadonly && fileList.length < limit" 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" />
+						<ml-icon v-if="loading" name="loading" roll />
+						<ml-icon v-else name="add" />
+						<view v-if="loading" class="ml-upload-image-add-loading-text">上传中...</view>
 					</view>
 				</view>
 			</view>
 		</view>
 		<!-- 上传文件 -->
 		<view v-else class="ml-upload-file-list">
-			<view v-if="!isFromReadonly" class="ml-upload-file-add">
+			<view v-if="!isFromReadonly && fileList.length < limit" 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" />
+						<ml-icon v-if="loading" name="loading" roll />
+						<ml-icon v-else name="add" />
 					</text>
-					<text>添加文件</text>
+					<text v-if="loading">上传中...</text>
+					<text v-else>添加文件</text>
 				</view>
 			</view>
 			<view class="ml-upload-file-item" v-for="(item, index) in fileList" :key="index">
@@ -39,9 +43,9 @@
 						<ml-button status="primary" type="text" @click="downloadEvent(item)">下载</ml-button>
 					</view>
 				</view>
-				<view v-if="!isFromReadonly || fileList.length <= limit" class="ml-upload-file-right">
+				<view v-if="!isFromReadonly" class="ml-upload-file-right">
 					<view class="ml-upload-file-del-btn" @click="removeEvent(item)">
-						<ml-icon name="close" />
+          	<ml-icon name="close" />
 					</view>
 				</view>
 			</view>
@@ -106,6 +110,7 @@ export default {
   },
 	data () {
 		return {
+			loading: false,
 			fileList: [],
 			docsTypes: ['doc', 'xls', 'ppt', 'pdf', 'docx', 'xlsx', 'pptx'],
 			imgTypes: ['png', 'jpg']
@@ -173,7 +178,7 @@ export default {
 		},
 		loadList () {
 			if (this.simpleValue) {
-				this.fileList = this.urlList.map(url => {
+				this.fileList = (this.urlList || []).map(url => {
           const name = this.getUrlName(url)
 					const obj = {
 						id: null,
@@ -192,7 +197,7 @@ export default {
 				this.isUpdate = true
 				this.$emit('input', this.fileList)
 			} else {
-				this.fileList = this.value.map(item => {
+				this.fileList = (this.value || []).map(item => {
 					item.tempPath = this.getUrl(item)
 					return item
 				})
@@ -351,6 +356,9 @@ export default {
 			})
 		},
 		chooseEvent () {
+			if (this.loading) {
+				return
+			}
 			let chooseMethod = uploadAllFiles
 			if (this.mediatype === 'image') {
 				chooseMethod = uploadImageFiles
@@ -360,6 +368,7 @@ export default {
 				count: this.limit - this.fileList.length
 			}).then(res => {
 				const { tempFiles } = res
+				this.loading = true
 				Promise.all(
 					tempFiles.map(file => {
 						const fileSuffix = this.getSuffix(file.name)
@@ -389,9 +398,13 @@ export default {
 					this.fileList.push(...list)
 					this.isUpdate = true
 					this.updateModel()
+					this.loading = false
 				}).catch((e) => {
 					console.log(e)
+					this.loading = false
 				})
+			}).catch(e => {
+				console.log(e)
 			})
 		}
 	}
@@ -433,12 +446,23 @@ export default {
 	.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-add-icon {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		text-align: center;
+	}
+	.ml-upload-image-add-loading-text {
+		font-size: 24rpx;
+	}
 	.ml-upload-image-img {
 		width: 120rpx;
 		height: 120rpx;
@@ -475,6 +499,9 @@ export default {
 		border: 1px dashed #c8c8c9;
 		border-radius: $ml-border-radius;
 	}
+	.ml-upload-file-add-icon {
+		margin-right: 10rpx;
+	}
 	.ml-upload-file-del-btn {
 		width: 40rpx;
 		height: 40rpx;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "0.2.77",
+  "version": "0.2.79",
   "description": "码里云小程序组件库",
   "scripts": {
     "release": "node script/release.js && npm publish"

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

@@ -1,410 +0,0 @@
-<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>
-			</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>
-			</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'
-	
-export default {
-  name: 'MlUpload',
-	props: {
-		value: {
-			type: Array,
-			default: () => ([])
-		},
-		urlList: {
-		  type: Array,
-		  default: () => ([])
-		},
-		simpleValue: {
-		  type: Boolean,
-		  default: false
-		},
-		readonly: {
-		  type: Boolean,
-		  default: false
-		},
-    limit: {
-      type: Number,
-      default: 9
-    },
-		className: String,
-		mediatype: {
-			type: String,
-			default: 'all'
-		},
-    params: {
-      type: Object,
-      default: () => ({})
-    },
-    fileProps: {
-      type: Object,
-      default: () => ({})
-    },
-		getFileUrl: Function,
-		uploadFile: Function,
-		removeFile: Function
-	},
-  inject: {
-    currVM: {
-      from: '$pageVM',
-      default: null
-    },
-    form: {
-      from: 'mlForm',
-      default: null
-    }
-  },
-	data () {
-		return {
-			fileList: [],
-			selectUniFileList: [],
-			imageStyles: {
-				// "height": 60,	// 边框高度
-				// "width": 60,	// 边框宽度
-				// "border":{ // 如果为 Boolean 值，可以控制边框显示与否
-				// 	"color":"transparent",		// 边框颜色
-				// 	"width":"1px",		// 边框宽度
-				// 	"style":"solid", 	// 边框样式
-				// }
-			},
-			imgTypes: ['png', 'jpg']
-		}
-	},
-	computed: {
-		isFromReadonly () {
-			if (this.readonly) {
-				return true
-			}
-			return this.form ? this.form.readonly : false
-		},
-    imageList () {
-      return this.value ? this.value.filter(item => this.imgTypes.includes(item[this.typeField])) : []
-    },
-    fieldMaps () {
-      return { ...globalStore.upload.fileProps, ...this.fileProps }
-    },
-    urlField () {
-      return this.fieldMaps.fileUrl || 'fileUrl'
-    },
-    typeField () {
-      return this.fieldMaps.fileType || 'fileType'
-    },
-    nameField () {
-      return this.fieldMaps.fileName || 'fileName'
-    }
-	},
-	watch: {
-		value (val) {
-			if (!this.isUpdate) {
-				this.isUpdate = true
-				this.loadList()
-			}
-		},
-		urlList () {
-		  this.loadList()
-		}
-	},
-	created () {
-		this.loadList()
-	},
-	methods: {
-		loadList () {
-			if (this.simpleValue) {
-				this.fileList = this.urlList.map(url => {
-          const name = this.getUrlName(url)
-					const obj = {
-						id: null,
-						[this.nameField]: name,
-						[this.typeField]: this.getSuffix(name),
-						[this.urlField]: url
-					}
-					return {
-						id: null,
-						[this.nameField]: name,
-						[this.typeField]: this.getSuffix(name),
-						[this.urlField]: url,
-						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 {
-				this.fileList = this.value.map(item => {
-					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 () {
-			const urlList = this.fileList.map(item => item[this.urlField])
-		  this.$emit('update:urlList', urlList)
-		  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)
-			const removeMethod = this.removeFile ? this.removeFile : (globalStore.upload ? globalStore.upload.removeFile : null)
-			if (!item) {
-				console.error('删除出错！！！')
-			}
-			if (item && !item.id) {
-				if (removeMethod) {
-					removeMethod.call(this.currVM, {
-						item,
-						params: this.params
-					})
-				}
-			}
-			this.isUpdate = true
-			this.updateModel()
-		},
-    getUrl (item) {
-      const getFileMethod = this.getFileUrl ? this.getFileUrl : (globalStore.upload ? globalStore.upload.getFileUrl : null)
-      if (getFileMethod) {
-        return getFileMethod.call(this.currVM, {
-          item,
-          params: this.params
-        })
-      }
-      return item[this.urlField]
-    },
-    getUrlName (url) {
-      const urlRest = XEUtils.parseUrl(url)
-      return urlRest.pathname.split('/').slice(-1)[0] || ''
-    },
-		getSuffix (filename) {
-		  const pos = filename.lastIndexOf('.')
-		  let suffix = ''
-		  if (pos !== -1) {
-				suffix = filename.substring(pos + 1)
-		  }
-		  return suffix
-		},
-		previewEvent (item, index) {
-			if (this.previewStatus) {
-				return
-			}
-			this.previewStatus = true
-			Promise.all(
-				this.value.map(item => {
-					return new Promise((resolve) => {
-						uni.downloadFile({
-							url: this.getUrl(item), 
-							success: (downRes) => {
-								resolve({
-									url: downRes.tempFilePath
-								})
-							},
-							fail () {
-								resolve({
-									url: ''
-								})
-							}
-						})
-					})
-				})
-			).then(res => {
-				uni.previewImage({
-					current: index,
-					urls: res.map(item => item.url)
-				})
-				this.previewStatus = false
-			})
-		},
-		previewImg (item) {
-			uni.downloadFile({
-				url: this.getUrl(item), 
-				success: (downRes) => {
-					uni.previewImage({
-						urls: [
-							downRes.tempFilePath
-						],
-						longPressActions: {
-							itemList: ['保存图片']
-						}
-					})
-				}
-			})
-		},
-		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,
-								})
-							}
-						})
-
-					}
-				},
-				fail () {
-					uni.showModal({
-						content: '下载失败',
-						showCancel: false
-					});
-				}
-			})
-		}
-	}
-}
-</script>
-
-<style lang="scss">
-.ml-upload{
-	margin: 20rpx 0;
-	background: #fff;
-}
-.ml-upload-image-list {
-	.ml-upload-file-item {
-		display: inline-block;
-		width: 140rpx;
-		height: 140rpx;
-		padding: 0 10rpx;
-	}
-	.ml-upload-file-img {
-		width: 100%;
-		height: 100%;
-	}
-}
-.ml-upload-file-list {
-	display: block;
-	.ml-upload-file-item {
-		border: 1rpx solid rgba(39, 42, 48, 0.0200);
-		background-color: rgba(39, 42, 48, 0.0200);
-		margin: 10rpx 0;
-		border-radius: $ml-border-radius;
-    padding: 20rpx;
-	}
-	.ml-upload-file-name {
-		width: 600rpx;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
-}
-</style>