ai.touchui-vue 1.32.2 → 1.32.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ai.touchui-vue",
-	"version": "1.32.2",
+	"version": "1.32.3",
 	"description": "TouchUI Component Library for Vue.js.",
 	"main": "lib/ai.touchui-vue.common.js",
 	"files": [

package/packages/cascader/src/cascader.vue

@@ -12,7 +12,7 @@
 			<span v-if="multiple && selected.length > 0" class="to-selectTag">
 				<template v-if="selected.length > 0">
 					<template v-for="(item, index) in selected">
-						<to-tag :key="index" color="fg" mode="plain" :deletable="!disabled" @delete="removeCheck(item.value); setSelected()">{{ item.labelPath }}</to-tag>
+						<to-tag v-if="true" :key="index" color="fg" mode="plain" :deletable="!disabled" @delete="removeCheck(item.value); setSelected()">{{ item.labelPath }}</to-tag>
 					</template>
 				</template>
 			</span>
@@ -481,7 +481,7 @@ export default {
 					}
 				} else {
 					this.label = this.getLabelPath(val.value)
-					this.$emit('change', val.value)
+					this.$emit('change', val.value, val)
 				}
 			}
 		}
@@ -589,7 +589,7 @@ export default {
 			let that = this
 			function set(node, level = 0, path = '', labelPath = '', parent = '__root__') {
 				for (let i = 0; i < node.length; i++) {
-					arr.push({
+					arr.push(Object.assign(node[i], {
 						label: node[i][that.labelText] || '',
 						value: node[i][that.valueText] || '',
 						level: level,
@@ -597,7 +597,7 @@ export default {
 						labelPath: (labelPath + ' / ' + node[i][that.labelText]).substr(3),
 						parent: parent,
 						isLeaf: !(node[i][that.childrenText] && node[i][that.childrenText].length > 0)
-					})
+					}))
 					if (node[i][that.childrenText]) {
 						set(
 							node[i][that.childrenText],

package/packages/float/src/main.vue

@@ -10,10 +10,6 @@
 export default {
 	name: 'ToFloat',
 	props: {
-		color: {
-			type: String,
-			default: ''
-		},
 		slide: Boolean,
 		lazy: {
 			type: Boolean,
@@ -79,15 +75,6 @@ export default {
 		beforeClose: {
 			type: Function,
 			default: null
-		},
-		// 偏移量
-		dx: {
-			type: [String, Number],
-			default: 0
-		},
-		dy: {
-			type: [String, Number],
-			default: 0
 		}
 	},
 	data() {
@@ -110,9 +97,6 @@ export default {
 			if (this.show) {
 				arr.push('to-float-show')
 			}
-			if (this.color) {
-				arr.push(`to-float-color-${this.color}`)
-			}
 			if (this.slide) {
 				arr.push('to-float-slide')
 			} else {
@@ -289,8 +273,6 @@ export default {
 						let leftSpace; // 左侧空间宽度
 						let rightSpace; // 右侧空间宽度
 						let useSpace // 使用的空间高度
-						let dx = Number(this.dx) * this.$TouchUI.em() // 横坐标偏移
-						let dy = Number(this.dy) * this.$TouchUI.em() // 纵坐标偏移
 
 						// 传入的是触点
 						if (link.clientX || link.touches) {
@@ -367,38 +349,35 @@ export default {
 						// 设置显示位置
 						if (this.iposition === 'top') {
 							this.$el.style.top = ''
-							this.$el.style.bottom = bottomSpace + linkHeight - 1 - dy + 'px'
+							this.$el.style.bottom = bottomSpace + linkHeight - 1 + 'px'
 						}
 						if (this.iposition === 'bottom') {
-							this.$el.style.top = topSpace + linkHeight - 1 + dy + 'px'
+							this.$el.style.top = topSpace + linkHeight - 1 + 'px'
 							this.$el.style.bottom = ''
 						}
 						if (this.iposition === 'top' || this.iposition === 'bottom') {
 							if (this.ialign === 'left') {
-								this.$el.style.left = leftSpace + dx + 'px'
-								this.$el.style.right = ''
-							} else if (this.ialign === 'center') {
-								this.$el.style.left = leftSpace - contentWidth / 2 + linkWidth / 2 + 'px'
+								this.$el.style.left = leftSpace + 'px'
 								this.$el.style.right = ''
 							} else {
-								this.$el.style.right = rightSpace - dx + 'px'
+								this.$el.style.right = rightSpace + 'px'
 								this.$el.style.left = ''
 							}
 						}
 						if (this.iposition === 'left') {
-							this.$el.style.right = rightSpace + linkWidth - dx - 1 + 'px'
+							this.$el.style.right = rightSpace + linkWidth - 1 + 'px'
 							this.$el.style.left = ''
 						}
 						if (this.iposition === 'right') {
-							this.$el.style.left = leftSpace + linkWidth + dx - 1 + 'px'
+							this.$el.style.left = leftSpace + linkWidth - 1 + 'px'
 							this.$el.style.right = ''
 						}
 						if (this.iposition === 'left' || this.iposition === 'right') {
 							if (this.ialign === 'bottom') {
 								this.$el.style.top = ''
-								this.$el.style.bottom = bottomSpace - dy + 'px'
+								this.$el.style.bottom = bottomSpace + 'px'
 							} else {
-								this.$el.style.top = topSpace + dy + 'px'
+								this.$el.style.top = topSpace + 'px'
 								this.$el.style.bottom = ''
 							}
 						}

package/packages/tab/src/tab-item.vue

@@ -33,8 +33,7 @@ export default {
 			default: ''
 		},
 		lazy: Boolean,
-		on: Boolean,
-		disabled: Boolean
+		on: Boolean
 	},
 	data() {
 		return {
@@ -50,8 +49,8 @@ export default {
 			}
 		},
 		listenChange() {
-			const { value, label, icon, deletable, number, pic, on, data, disabled } = this;
-			return { value, label, icon, deletable, number, pic, on, data, disabled };
+			const { value, label, icon, deletable, number, pic, on, data } = this;
+			return { value, label, icon, deletable, number, pic, on, data };
 		}
 	},
 	watch: {
@@ -79,7 +78,7 @@ export default {
 				if (this.$parent.data.length === 0) {
 					this.$parent.generateTabsFromSubTabItem();
 				}
-			})
+			});
 		}
 	}
 };

package/packages/tab/src/tab.vue

@@ -7,10 +7,7 @@
 			<div ref="list" class="list">
 				<ul ref="ul" class="to-tab-ul" :style="setUlStyle" @mouseleave="taboutHandle" @mouseover="isOnTab = true">
 					<template v-for="(item, index) in itabs">
-						<li v-if="$slots.center && Math.floor(itabs.length / 2) === index" :key="index" class="center">
-							<slot name="center"></slot>
-						</li>
-						<li v-else :key="index" :style="setTabStyle(item)" :class="{ on: item.value === iValue, deletable, disabled: item.disabled}" @click="changeTab(item, index, 'click')" @mouseover="changeTab(item, index, 'mouseover')">
+						<li v-if="item.label" :key="index" :style="setTabStyle(item)" :class="{ on: item.value === iValue, deletable }" @click="changeTab(item, index, 'click')" @mouseover="changeTab(item, index, 'mouseover')">
 							<div class="content">
 								<slot name="item" :item="item">
 									<div v-if="item.pic" class="pic">
@@ -33,11 +30,11 @@
 				</ul>
 			</div>
 			<div v-if="$slots.fn || overSize" class="fn">
-				<template v-if="(position==='top' || position === 'bottom')&&tabOver === 'control'&&overSize && !$phone">
+				<template v-if="position==='top'&&tabOver === 'control'&&overSize && !$phone">
 					<to-button v-dis="left >= 0" mode="none" color="primary" icon="back" fillet="normal" @mousedown.native="moveToLeft" @mouseout.native="moveStop" @mouseup.native="moveStop"></to-button>
 					<to-button v-dis="left <= dis * -1" mode="none" color="primary" icon="next" fillet="normal" @mousedown.native="moveToRight" @mouseout.native="moveStop" @mouseup.native="moveStop"></to-button>
 				</template>
-				<template v-if="(position==='top' || position === 'bottom')&&tabOver === 'float'&&overSize&&moreTabs.length">
+				<template v-if="position==='top'&&tabOver === 'float'&&overSize&&moreTabs.length">
 					<to-button ref="more" icon="unfold" color="primary" mode="none" fillet="normal" @click="$refs.float.toggle('more')"></to-button>
 				</template>
 				<slot name="fn"></slot>
@@ -161,6 +158,7 @@ export default {
 			tabs: [],
 			em: 0,
 			moreTabs: [],
+			timestamp: 0,
 			currentUlWidth: 0
 		};
 	},
@@ -175,6 +173,10 @@ export default {
 					return {
 						width: this.tabWidth + 'em'
 					}
+				} else if (item.label) {
+					// return {
+					// 	width: item.label.length*2 + 'em'
+					// };
 				} else {
 					return '';
 				}
@@ -279,7 +281,12 @@ export default {
 
 			// 点击层外关闭
 			document.body.addEventListener('click', this.blur)
+
+			// 默认隐藏 page
+			// this.showPage = false
 		}
+		this.em = this.$TouchUI.getRatio() * 12
+		this.timestamp = Math.round(new Date())
 	},
 	beforeDestroy() {
 		if (this.contentType === 'float') {
@@ -383,7 +390,6 @@ export default {
 		},
 		changeTab(item, index, event) {
 			if (event === 'click') {
-				if (item.disabled) return
 				this.$emit('tab-click', item.value, item, index)
 			}
 			if (event === 'mouseover') {
@@ -523,7 +529,7 @@ export default {
 			tabsItem.map(({ componentOptions = { propsData: {} } }) => {
 				const {
 					tag,
-					propsData: { label, value, icon, pic, number, on, data, disabled}
+					propsData: { label, value, icon, pic, number, on, data }
 				} = componentOptions;
 				if (String(tag) === 'to-tab-item') {
 					tabs.push({
@@ -532,8 +538,7 @@ export default {
 						icon,
 						pic,
 						number,
-						data,
-						disabled: disabled !== undefined
+						data
 					});
 				}
 				if (on === '' || on === true) {