@zscreate/zhxy-app-component 1.0.4 → 1.0.7

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

@@ -117,8 +117,8 @@
 				{{widget.name}}
 			</view>
 			<view class="evan-form-item-container__main" :style="mContentStyle">
-				<switch :checked="dataModel" @change="switch1Change" color="#007AFF" style="transform: scale(0.8,0.8)"
-					:disabled="widget.options.disabled" />
+        <form-switch :checked="dataModel" @change="switch1Change" color="#007AFF" style="transform: scale(0.8,0.8)"
+                     :disabled="widget.options.disabled" />
 			</view>
 		</view>
 
@@ -388,9 +388,9 @@
 			</view>
 			<view class="evan-form-item-container__main" :style="mContentStyle"
 				@click="handleSeclet(widget.options.multiple)">
-				<div class="option-font-size">{{dataModelShow ? dataModelShow : widget.options.placeholder}}</div>
+				<div class="option-font-size">{{dataModelShow ? dataModelShow : widget.options.placeholder }}</div>
 			</view>
-			<icon type="clear" size="14" v-if="item.options.canView" />
+<!--			<icon type="clear" size="14" v-if="widget.options.canView" />-->
 		</view>
 
 		<!-- userSelector  -->
@@ -469,9 +469,11 @@
 	import {
 		getMode
 	} from './utilForForm'
+  import FormSwitch from "../form-switch/form-switch";
 	export default {
 		mixins: [computedMixin, validateFormMixin, pubSubMixin, valueChangeMixin],
 		components: {
+      FormSwitch,
       UniRate,
 			tColorPicker,
 			unploadFile,

package/components/form-switch/form-switch.vue

@@ -0,0 +1,32 @@
+<template>
+  <switch :checked="dataModel"  @change="change" v-bind="$attrs"
+          :disabled="disabled" />
+</template>
+
+<script>
+export default {
+  name: "form-switch",
+  props: {
+    checked: Boolean,
+    disabled: Boolean,
+    defaultValue: Boolean,
+  },
+  data() {
+    return {
+      dataModel: false
+    }
+  },
+  created() {
+    this.dataModel = this.defaultValue
+  },
+  methods: {
+    change(e) {
+      this.$emit('change', e)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -1,267 +1,273 @@
-<template>
-	<view>
-		<view class="file_conten">
-			<view class="file_upload option-font-size" @click="chooseMessageFile"
-				v-if="isShow">
-				点击上传
-			</view>
-			<view>
-				<view class="file_item" v-for="(item,idx) in defaultFile" :key="idx">
-					<view @click="downLoadFile(item.url,item.name)">{{item.name}}</view>
-					<icon type="clear" size="16" @click="handleDelete(idx)" v-if="!disabled" />
-				</view>
-			</view>
-		</view>
-		<!-- <view class="name" v-show="!show">{{name}}</view>
-			<view class="name SXcolor" v-if="fileName" @click="downLoadFile(defaultFile[0]['url'])">{{fileName}}</view>
-		</view>
-		<view v-if="fileName" class="tips option-font-size">更多文件详情请于电脑端查看</view> -->
-		<view v-if="!disabled">
-			<progress :percent="percent" stroke-width="5" activeColor="#007AFF" backgroundColor="#FFFFFF"
-				style="width: 200upx;" v-show="show"></progress>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		props: {
-			widget: {
-				type: Object,
-				default: {}
-			},
-			url: {
-				type: String,
-				default: ''
-			},
-			disabled: {
-				type: Boolean,
-				default: false
-			},
-			defaultFile: {
-				type: Array,
-				default: () => []
-			}
-		},
-		data() {
-			return {
-				name: "",
-				percent: 0,
-				show: true,
-				imgViewUrl: this.LFileBaseUrl,
-		    isShow:true,//是否展示点击上传
-			}
-		},
-		watch:{
-		//当上传的数量超过了设置的数量 就不让上传
-			defaultFile(val){
-				this.getShow(val)
-			}
-		},
-		mounted() {
-			if(this.disabled){
-				this.isShow =!this.disabled
-			}
-			else{
-				this.getShow(this.defaultFile)
-			}
-		},
-		methods: {
-			getShow(val){
-				if(val && val.length>=this.widget.length){
-					this.isShow = false
-				}
-				else{
-					this.isShow = true
-				}
-			},
-			//删除文件
-			handleDelete(idx) {
-				this.$emit('fileDelete', idx)
-			},
-			downLoadFile(path, name) {
-        //#ifdef H5
-        const a = document.createElement("a")
-        a.href = this.downLoadUrl + path
-        a.target = '_blank'
-        a.click()
-        return
-        //#endif
-				// if (path.includes('.pdf')) {
-				// 	uni.navigateTo({
-				// 		url: '/pages/home/Singlepoint?url=' + this.downLoadUrl + path + "&download=true"
-				// 	})
-				// 	return false;
-				// }
-				let type = '';
-				let fileType = '';
-				let fileTypesIndex = -1;
-				const fileTypes = ['doc', 'docx', 'pdf', 'xls', 'xlsx', 'ppt', 'pptx'];
-				if (path) {
-					let str = path.split('.');
-					type = str[str.length - 1]
-				}
-
-				if (type) {
-					fileTypesIndex = fileTypes.indexOf(type);
-					console.log(fileTypesIndex)
-				}
-
-				if (fileTypesIndex != -1) {
-					fileType = fileTypes[fileTypesIndex]
-				}
-        // #ifdef H5
-        window.open(this.uniEnv.imgUrl + path)
-        return
-        // #endif
-				uni.downloadFile({
-					url: this.uniEnv.imgUrl + path, //下载地址接口返回
-					filePath: wx.env.USER_DATA_PATH + "/" + name,
-					success: (data) => {
-						console.log(data)
-						if (data.statusCode === 200) {
-							uni.openDocument({
-								filePath: data.filePath,
-								showMenu: true,
-								fileType: fileType,
-								success: function(res) {
-									// console.log('打开文档成功');
-								},
-								fail(res) {
-									console.log(res)
-									uni.showToast({
-										icon: 'none',
-										mask: true,
-										title: '下载失败',
-										duration: 3000,
-									});
-								},
-							});
-						}
-					},
-				})
-				// uni.downloadFile({
-				// 	url: this.downLoadUrl + path, //下载地址接口返回
-				// 	success: (data) => {
-				// 		if (data.statusCode === 200) {
-				// 			//文件保存到本地
-				// 			uni.saveFile({
-				// 				tempFilePath: data.tempFilePath, //临时路径
-				// 				success: function(res) {
-				// 					uni.showToast({
-				// 						icon: 'none',
-				// 						mask: true,
-				// 						title: '文件已保存：' + res.savedFilePath, //保存路径
-				// 						duration: 3000,
-				// 					});
-				// 					setTimeout(() => {
-				// 						// escape(res.savedFilePath)
-				// 						//打开文档查看
-				// 						uni.openDocument({
-				// 							filePath: res.savedFilePath,
-				// 							fileType: fileType,
-				// 							success: function(res) {
-				// 								// console.log('打开文档成功');
-				// 							},
-				// 							fail(res) {
-				// 								console.log(res)
-				// 								uni.showToast({
-				// 									icon: 'none',
-				// 									mask: true,
-				// 									title: '文件打开失败！', //保存路径
-				// 									duration: 3000,
-				// 								});
-				// 							},
-				// 						});
-				// 					}, 3000)
-				// 				}
-				// 			});
-				// 		}
-				// 	}
-				// })
-			},
-			chooseMessageFile: function(e) {
-				console.log(this.widget, )
-				if (this.disabled || (this.defaultFile.length && this.defaultFile.length >= this.widget.length)) return false;
-				var that = this;
-				wx.chooseMessageFile({
-					count: 1,
-					type: 'all',
-					success(res) {
-						console.log(res.tempFiles)
-						const path = res.tempFiles
-						that.name = res.tempFiles[0].name
-						const uploadTask = uni.uploadFile({
-							url: that.url,
-							filePath: path[0].path,
-							name: 'file',
-							formData: {},
-							success: function(res) {
-								let imgObj = {
-									key: String(Math.random()).substr(2) - 0,
-									name: that.name,
-									status: "success",
-									url: JSON.parse(res.data).message
-								}
-								that.$emit('filePost', imgObj)
-							}
-						});
-
-						uploadTask.onProgressUpdate(function(res) {
-							that.percent = res.progress;
-							if (Number(res.progress) == 100) {
-								that.show = false
-							}
-						});
-					},
-					error: function(e) {
-						console.log(e);
-					}
-				});
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.file_conten {
-		// display: flex;
-		// flex-direction: row;
-		// align-items: center;
-		// justify-content: flex-start;
-	}
-
-	.file_upload {
-		color: #666;
-		margin-right: 20rpx;
-
-	}
-
-	.option-font-size {
-		font-size: $uni-form-content-font-size;
-	}
-
-	.name {
-		padding-top: 4upx;
-		font-size: 22upx;
-	}
-
-	.SXcolor {
-		color: #539DFA;
-	}
-
-	.tips {
-		color: #999;
-		font-size: 22upx;
-	}
-
-	.file_item {
-		width: 700upx;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		view{
-			margin-top: 10upx;
-		}
-	}
-</style>
+<template>
+	<view>
+		<view class="file_conten">
+			<view class="file_upload option-font-size" @click="chooseMessageFile"
+				v-if="isShow">
+				点击上传
+			</view>
+			<view>
+				<view class="file_item" v-for="(item,idx) in defaultFile" :key="idx">
+					<view @click="downLoadFile(item.url,item.name)">{{item.name}}</view>
+					<icon type="clear" size="16" @click="handleDelete(idx)" v-if="!disabled" />
+				</view>
+			</view>
+		</view>
+		<!-- <view class="name" v-show="!show">{{name}}</view>
+			<view class="name SXcolor" v-if="fileName" @click="downLoadFile(defaultFile[0]['url'])">{{fileName}}</view>
+		</view>
+		<view v-if="fileName" class="tips option-font-size">更多文件详情请于电脑端查看</view> -->
+		<view v-if="!disabled">
+			<progress :percent="percent" stroke-width="5" activeColor="#007AFF" backgroundColor="#FFFFFF"
+				style="width: 200upx;" v-show="show"></progress>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			widget: {
+				type: Object,
+				default: {}
+			},
+			url: {
+				type: String,
+				default: ''
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			defaultFile: {
+				type: Array,
+				default: () => []
+			}
+		},
+		data() {
+			return {
+				name: "",
+				percent: 0,
+				show: true,
+				imgViewUrl: this.LFileBaseUrl,
+		    isShow:true,//是否展示点击上传
+			}
+		},
+		watch:{
+		//当上传的数量超过了设置的数量 就不让上传
+			defaultFile(val){
+				this.getShow(val)
+			}
+		},
+		mounted() {
+			if(this.disabled){
+				this.isShow =!this.disabled
+			}
+			else{
+				this.getShow(this.defaultFile)
+			}
+		},
+		methods: {
+			getShow(val){
+				if(val && val.length>=this.widget.length){
+					this.isShow = false
+				}
+				else{
+					this.isShow = true
+				}
+			},
+			//删除文件
+			handleDelete(idx) {
+				this.$emit('fileDelete', idx)
+			},
+			downLoadFile(path, name) {
+        //#ifdef H5
+        const a = document.createElement("a")
+        a.href = this.downLoadUrl + path
+        a.target = '_blank'
+        a.click()
+        return
+        //#endif
+				// if (path.includes('.pdf')) {
+				// 	uni.navigateTo({
+				// 		url: '/pages/home/Singlepoint?url=' + this.downLoadUrl + path + "&download=true"
+				// 	})
+				// 	return false;
+				// }
+				let type = '';
+				let fileType = '';
+				let fileTypesIndex = -1;
+				const fileTypes = ['doc', 'docx', 'pdf', 'xls', 'xlsx', 'ppt', 'pptx'];
+				if (path) {
+					let str = path.split('.');
+					type = str[str.length - 1]
+				}
+
+				if (type) {
+					fileTypesIndex = fileTypes.indexOf(type);
+					console.log(fileTypesIndex)
+				}
+
+				if (fileTypesIndex != -1) {
+					fileType = fileTypes[fileTypesIndex]
+				}
+        // #ifdef H5
+        window.open(this.uniEnv.imgUrl + path)
+        return
+        // #endif
+				uni.downloadFile({
+					url: this.uniEnv.imgUrl + path, //下载地址接口返回
+					filePath: wx.env.USER_DATA_PATH + "/" + name,
+					success: (data) => {
+						console.log(data)
+						if (data.statusCode === 200) {
+							uni.openDocument({
+								filePath: data.filePath,
+								showMenu: true,
+								fileType: fileType,
+								success: function(res) {
+									// console.log('打开文档成功');
+								},
+								fail(res) {
+									console.log(res)
+									uni.showToast({
+										icon: 'none',
+										mask: true,
+										title: '下载失败',
+										duration: 3000,
+									});
+								},
+							});
+						}
+					},
+				})
+				// uni.downloadFile({
+				// 	url: this.downLoadUrl + path, //下载地址接口返回
+				// 	success: (data) => {
+				// 		if (data.statusCode === 200) {
+				// 			//文件保存到本地
+				// 			uni.saveFile({
+				// 				tempFilePath: data.tempFilePath, //临时路径
+				// 				success: function(res) {
+				// 					uni.showToast({
+				// 						icon: 'none',
+				// 						mask: true,
+				// 						title: '文件已保存：' + res.savedFilePath, //保存路径
+				// 						duration: 3000,
+				// 					});
+				// 					setTimeout(() => {
+				// 						// escape(res.savedFilePath)
+				// 						//打开文档查看
+				// 						uni.openDocument({
+				// 							filePath: res.savedFilePath,
+				// 							fileType: fileType,
+				// 							success: function(res) {
+				// 								// console.log('打开文档成功');
+				// 							},
+				// 							fail(res) {
+				// 								console.log(res)
+				// 								uni.showToast({
+				// 									icon: 'none',
+				// 									mask: true,
+				// 									title: '文件打开失败！', //保存路径
+				// 									duration: 3000,
+				// 								});
+				// 							},
+				// 						});
+				// 					}, 3000)
+				// 				}
+				// 			});
+				// 		}
+				// 	}
+				// })
+			},
+			chooseMessageFile: function(e) {
+				console.log(this.widget, )
+				if (this.disabled || (this.defaultFile.length && this.defaultFile.length >= this.widget.length)) return false;
+				var that = this;
+        //#ifdef H5
+        uni.chooseFile
+        //#endif
+        // #ifdef MP-WEIXIN
+        wx.chooseMessageFile
+        // #endif
+        ({
+					count: 1,
+					type: 'all',
+					success(res) {
+						console.log(res.tempFiles)
+						const path = res.tempFiles
+						that.name = res.tempFiles[0].name
+						const uploadTask = uni.uploadFile({
+							url: that.url,
+							filePath: path[0].path,
+							name: 'file',
+							formData: {},
+							success: function(res) {
+								let imgObj = {
+									key: String(Math.random()).substr(2) - 0,
+									name: that.name,
+									status: "success",
+									url: JSON.parse(res.data).message
+								}
+								that.$emit('filePost', imgObj)
+							}
+						});
+
+						uploadTask.onProgressUpdate(function(res) {
+							that.percent = res.progress;
+							if (Number(res.progress) == 100) {
+								that.show = false
+							}
+						});
+					},
+					error: function(e) {
+						console.log(e);
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.file_conten {
+		// display: flex;
+		// flex-direction: row;
+		// align-items: center;
+		// justify-content: flex-start;
+	}
+
+	.file_upload {
+		color: #666;
+		margin-right: 20rpx;
+
+	}
+
+	.option-font-size {
+		font-size: $uni-form-content-font-size;
+	}
+
+	.name {
+		padding-top: 4upx;
+		font-size: 22upx;
+	}
+
+	.SXcolor {
+		color: #539DFA;
+	}
+
+	.tips {
+		color: #999;
+		font-size: 22upx;
+	}
+
+	.file_item {
+		width: 700upx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		view{
+			margin-top: 10upx;
+		}
+	}
+</style>

package/package.json

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