vue-editify 0.0.51 → 0.1.1

package/src/components/base/Button.vue

@@ -31,7 +31,7 @@
 import Tooltip from './Tooltip'
 import Layer from './Layer'
 import Icon from './Icon'
-import Dap from 'dap-util'
+import { common as DapCommon, color as DapColor } from 'dap-util'
 export default {
 	name: 'Button',
 	emits: ['operate', 'layerShow', 'layerShown', 'layerHidden'],
@@ -131,10 +131,10 @@ export default {
 			let options = []
 			let width = ''
 			let maxHeight = ''
-			if (Dap.common.isObject(this.selectConfig)) {
+			if (DapCommon.isObject(this.selectConfig)) {
 				if (Array.isArray(this.selectConfig.options)) {
 					options = this.selectConfig.options.map(item => {
-						if (Dap.common.isObject(item)) {
+						if (DapCommon.isObject(item)) {
 							return {
 								label: item.label,
 								value: item.value,
@@ -167,13 +167,13 @@ export default {
 			let width = ''
 			let maxHeight = ''
 			let value = ''
-			if (Dap.common.isObject(this.displayConfig)) {
+			if (DapCommon.isObject(this.displayConfig)) {
 				if (typeof this.displayConfig.value == 'string' || typeof this.displayConfig.value == 'number') {
 					value = this.displayConfig.value
 				}
 				if (Array.isArray(this.displayConfig.options)) {
 					options = this.displayConfig.options.map(item => {
-						if (Dap.common.isObject(item)) {
+						if (DapCommon.isObject(item)) {
 							return {
 								label: item.label,
 								value: item.value,
@@ -209,7 +209,7 @@ export default {
 		},
 		//十六进制颜色转换的rgb颜色数组
 		parseColor() {
-			return Dap.color.hex2rgb(this.color)
+			return DapColor.hex2rgb(this.color)
 		},
 		//按钮样式
 		btnStyle() {

package/src/components/base/Checkbox.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import Dap from 'dap-util'
+import { common as DapCommon } from 'dap-util'
 import Icon from './Icon'
 export default {
 	name: 'Checkbox',
@@ -54,7 +54,7 @@ export default {
 			type: String,
 			default: '',
 			validator(value) {
-				return Dap.common.matchingText(value, 'hex')
+				return DapCommon.matchingText(value, 'hex')
 			}
 		}
 	},
@@ -66,7 +66,7 @@ export default {
 			if (Array.isArray(this.modelValue)) {
 				//数组中是否已包含此复选框的值
 				return this.modelValue.some(item => {
-					return Dap.common.equal(item, this.value)
+					return DapCommon.equal(item, this.value)
 				})
 			}
 			return false
@@ -94,7 +94,7 @@ export default {
 				//取消且包含
 				else if (this.check) {
 					arr = arr.filter(item => {
-						return !Dap.common.equal(item, this.value)
+						return !DapCommon.equal(item, this.value)
 					})
 				}
 				this.$emit('update:modelValue', arr)

package/src/components/base/Layer.vue

@@ -10,7 +10,7 @@
 </template>
 <script>
 import { getCurrentInstance } from 'vue'
-import Dap from 'dap-util'
+import { element as DapElement, event as DapEvent } from 'dap-util'
 import Triangle from './Triangle'
 export default {
 	name: 'Layer',
@@ -123,8 +123,8 @@ export default {
 		if (this.modelValue) {
 			this.setPosition()
 		}
-		Dap.event.on(window, `click.editify_layer_${this.uid}`, this.handleClick)
-		Dap.event.on(window, `resize.editify_layer_${this.uid}`, this.handleResize)
+		DapEvent.on(window, `click.editify_layer_${this.uid}`, this.handleClick)
+		DapEvent.on(window, `resize.editify_layer_${this.uid}`, this.handleResize)
 	},
 	methods: {
 		//显示时
@@ -148,10 +148,10 @@ export default {
 		},
 		//点击定位父元素外的元素关闭浮层
 		handleClick(e) {
-			if (!Dap.element.isElement(this.$el)) {
+			if (!DapElement.isElement(this.$el)) {
 				return
 			}
-			if (Dap.element.isContains(this.$el.offsetParent, e.target)) {
+			if (DapElement.isContains(this.$el.offsetParent, e.target)) {
 				return
 			}
 			if (this.modelValue) {
@@ -211,7 +211,7 @@ export default {
 		//根据node设置三角形位置
 		setTrianglePositionByNode() {
 			const node = this.getNode()
-			if (!Dap.element.isElement(node)) {
+			if (!DapElement.isElement(node)) {
 				return
 			}
 			if (this.realPlacement == 'top') {
@@ -265,7 +265,7 @@ export default {
 					//range的最后一个位置
 					const lastRect = rects[rects.length - 1]
 					//定位父元素的位置
-					const parentRect = Dap.element.getElementBounding(this.$el.offsetParent)
+					const parentRect = DapElement.getElementBounding(this.$el.offsetParent)
 					//可视窗口高度
 					const documentHeight = document.documentElement.clientHeight || window.innerHeight
 					//可视窗口宽度
@@ -482,15 +482,15 @@ export default {
 		//根据node设置位置
 		setPositionByNode() {
 			const node = this.getNode()
-			if (!Dap.element.isElement(node)) {
+			if (!DapElement.isElement(node)) {
 				return
 			}
 			//重置
 			this.realPlacement = null
 			//关联元素位置
-			const nodeRect = Dap.element.getElementBounding(node)
+			const nodeRect = DapElement.getElementBounding(node)
 			//定位父元素位置
-			const parentRect = Dap.element.getElementBounding(this.$el.offsetParent)
+			const parentRect = DapElement.getElementBounding(this.$el.offsetParent)
 			//设置真实的位置
 			if (this.placement == 'top' || this.placement == 'top-start' || this.placement == 'top-end') {
 				if (nodeRect.top >= 0 && nodeRect.top >= parentRect.top && nodeRect.top >= this.$el.offsetHeight) {
@@ -648,14 +648,14 @@ export default {
 			if (!this.node) {
 				return null
 			}
-			if (Dap.element.isElement(this.node)) {
+			if (DapElement.isElement(this.node)) {
 				return this.node
 			}
 			return document.body.querySelector(this.node)
 		}
 	},
 	beforeUnmount() {
-		Dap.event.off(window, `click.editify_layer_${this.uid} resize.editify_layer_${this.uid}`)
+		DapEvent.off(window, `click.editify_layer_${this.uid} resize.editify_layer_${this.uid}`)
 	}
 }
 </script>

package/src/components/{bussiness → common}/InsertImage.vue

@@ -20,7 +20,7 @@
 	</div>
 </template>
 <script>
-import Dap from 'dap-util'
+import { file as DapFile } from 'dap-util'
 import Icon from '../base/Icon'
 export default {
 	name: 'InsertImage',
@@ -133,21 +133,21 @@ export default {
 			}
 			//有文件可上传
 			if (filterFiles.length) {
+				let images = []
 				//自定义上传方法
 				if (typeof this.customUpload == 'function') {
-					this.customUpload.apply(this, [filterFiles])
+					images = (await this.customUpload.apply(this, [filterFiles])) || []
 				}
 				//默认上传方法
 				else {
-					let images = []
 					for (let i = 0; i < filterFiles.length; i++) {
-						const url = await Dap.file.dataFileToBase64(filterFiles[i])
+						const url = await DapFile.dataFileToBase64(filterFiles[i])
 						images.push(url)
 					}
-					images.forEach(url => {
-						this.$emit('insert', url)
-					})
 				}
+				images.forEach(url => {
+					this.$emit('insert', url)
+				})
 			}
 			//清空文件选择框
 			inputEle.value = ''

package/src/components/{bussiness → common}/InsertVideo.vue

@@ -20,7 +20,7 @@
 	</div>
 </template>
 <script>
-import Dap from 'dap-util'
+import { file as DapFile } from 'dap-util'
 import Icon from '../base/Icon'
 export default {
 	name: 'InsertVideo',
@@ -133,21 +133,21 @@ export default {
 			}
 			//有文件可上传
 			if (filterFiles.length) {
+				let videos = []
 				//自定义上传方法
 				if (typeof this.customUpload == 'function') {
-					this.customUpload.apply(this, [filterFiles])
+					videos = (await this.customUpload.apply(this, [filterFiles])) || []
 				}
 				//默认上传方法
 				else {
-					let videos = []
 					for (let i = 0; i < filterFiles.length; i++) {
-						const url = await Dap.file.dataFileToBase64(filterFiles[i])
+						const url = await DapFile.dataFileToBase64(filterFiles[i])
 						videos.push(url)
 					}
-					videos.forEach(url => {
-						this.$emit('insert', url)
-					})
 				}
+				videos.forEach(url => {
+					this.$emit('insert', url)
+				})
 			}
 			//清空文件选择框
 			inputEle.value = ''