fusions-ui 1.2.6 → 1.2.7

package/components/fu-icon/fu-icon.vue

@@ -16,10 +16,10 @@
 <script>
 	import mpMixin from '../../libs/mixin/mpMixin.js'
 	import props from './props.js'
-	import icon from './icon.js'
+	import icon from './fuicon.js'
 	// #ifdef APP-NVUE
 	var domModule = weex.requireModule('dom');
-	import iconUrl from './icon.ttf'
+	import iconUrl from './fuicon.ttf'
 	domModule.addRule('fontFace', {
 		'fontFamily': "fusionsicon",
 		'src': "url('" + iconUrl + "')"
@@ -32,6 +32,9 @@
 	 * @property {String} color 图标颜色
 	 * @property {Number} size 图标大小（默认 16）
 	 * @property {String} fontFamily 自定义图标
+	 * @property {String} imgMode 图片模式，当name为图片地址时生效
+	 * @property {String,Number} width 显示图片小图标时，图片的宽度
+	 * @property {String,Number} width 显示图片小图标时，图片的高度
 	 * 
 	 * @event {Function} click 点击图标触发
 	 * @example <fu-icon name="success" size="40" color="#ff0000"></fu-icon>
@@ -87,10 +90,10 @@
 <style lang="scss" scoped>
 	@import '../../libs/style/components.scss';
 	/* #ifndef APP-NVUE */
-	@import './icon.css';
+	@import './fuicon.css';
 	@font-face {
 		font-family: fusionsicon;
-		src: url('./icon.ttf') format('truetype');
+		src: url('./fuicon.ttf') format('truetype');
 	}
 	/* #endif */
 	

package/components/fu-sign-board/fu-sign-board.vue

@@ -3,7 +3,7 @@
 		<!-- 签名canvas -->
 		<view class="fu-sign-board__content">
 			<view class="fu-sign-board__content__wrapper">
-				<canvas class="fu-sign-board__content__canvas" :canvas-id="canvasName" :disableScroll="true" @touchstart="onTouchStart" @touchmove="onTouchMove" @touchend="onTouchEnd"></canvas>
+				<canvas class="fu-sign-board__content__canvas" :canvas-id="canvasId" :disableScroll="true" @touchstart="onTouchStart" @touchmove="onTouchMove" @touchend="onTouchEnd"></canvas>
 			</view>
 		</view>
 
@@ -52,8 +52,9 @@
 		emits: ['save', 'close'],
 		mixins: [mpMixin, mixin, props],
 		data() {
+			const canvasId = this.$fu.uuid();
 			return {
-				canvasName: 'fu-sign-canvas',
+				canvasId,
 				ctx: null,
 				canvasWidth: 0,
 				canvasHeight: 0,
@@ -95,7 +96,7 @@
 		},
 		created() {
 			// 创建canvas
-			this.ctx = uni.createCanvasContext(this.canvasName, this);
+			this.ctx = uni.createCanvasContext(this.canvasId, this);
 		},
 		methods: {
 			// 获取画板的相关信息
@@ -127,12 +128,13 @@
 				// #ifdef APP
 				if(e.type != 'onTouchstart') return false
 				// #endif
-				// #ifndef APP || MP-ALIPAY
-				if (e.type != 'touchstart') return false
-				// #endif
 				// #ifdef MP-ALIPAY
 				if(e.type != 'touchStart') return false
 				// #endif
+				// #ifndef APP || MP-ALIPAY
+				if (e.type != 'touchstart') return false
+				// #endif
+				
 				// 设置线条颜色
 				this.ctx.setFillStyle(this.currentSelectColor)
 				// 设置透明度
@@ -168,12 +170,12 @@
 				// #ifdef APP
 				if(e.type != 'onTouchmove') return false
 				// #endif
-				// #ifndef APP || MP-ALIPAY
-				if (e.type != 'touchmove') return false
-				// #endif
 				// #ifdef MP-ALIPAY
 				if(e.type != 'touchMove') return false
 				// #endif
+				// #ifndef APP || MP-ALIPAY
+				if (e.type != 'touchmove') return false
+				// #endif
 				if (e.cancelable) {
 					// 判断默认行为是否已经被禁用
 					if (!e.defaultPrevented) {
@@ -226,12 +228,12 @@
 				// #ifdef APP
 				if(e.type != 'onTouchend') return false
 				// #endif
-				// #ifndef APP || MP-ALIPAY
-				if (e.type != 'touchend') return false
-				// #endif
 				// #ifdef MP-ALIPAY
 				if(e.type != 'touchEnd') return false
 				// #endif
+				// #ifndef APP || MP-ALIPAY
+				if (e.type != 'touchend') return false
+				// #endif
 				let point = {
 					x: e.changedTouches[0].x,
 					y: e.changedTouches[0].y
@@ -274,7 +276,7 @@
 			save() {
 				// 在组件内使用需要第二个参数this
 				uni.canvasToTempFilePath({
-					canvasId: this.canvasName,
+					canvasId: this.canvasId,
 					fileType: 'png',
 					quality: 1,
 					success: (res) => {
@@ -298,7 +300,7 @@
 			previewImage() {
 				// 在组件内使用需要第二个参数this
 				uni.canvasToTempFilePath({
-					canvasId: this.canvasName,
+					canvasId: this.canvasId,
 					fileType: 'png',
 					quality: 1,
 					success: (res) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "fusions-ui",
-	"version": "1.2.6",
+	"version": "1.2.7",
 	"description": "FusionsUI Component library",
 	"main": "index.js",
 	"scripts": {