From 2af5a3290c57755b50d2c9c389e2f98e05d63183 Mon Sep 17 00:00:00 2001 From: ShawnPhang Date: Mon, 31 Jul 2023 09:36:32 +0800 Subject: [PATCH] code: remove some invalid --- src/components/modules/widgets/pageStyle.vue | 4 --- src/mixins/mouseDragging.ts | 37 -------------------- src/mixins/move.ts | 28 +++++++-------- src/utils/axios.ts | 4 +-- 4 files changed, 13 insertions(+), 60 deletions(-) delete mode 100644 src/mixins/mouseDragging.ts diff --git a/src/components/modules/widgets/pageStyle.vue b/src/components/modules/widgets/pageStyle.vue index 2da4b15..227d8df 100644 --- a/src/components/modules/widgets/pageStyle.vue +++ b/src/components/modules/widgets/pageStyle.vue @@ -25,10 +25,6 @@ - - diff --git a/src/mixins/mouseDragging.ts b/src/mixins/mouseDragging.ts deleted file mode 100644 index 7b31b37..0000000 --- a/src/mixins/mouseDragging.ts +++ /dev/null @@ -1,37 +0,0 @@ -/* - * @Author: ShawnPhang - * @Date: 2022-03-28 09:23:10 - * @Description: 全局拖动检测 - * @LastEditors: ShawnPhang - * @LastEditTime: 2022-03-28 10:08:38 - */ -import store from '@/store' -import { onMounted, onBeforeUnmount, nextTick } from 'vue' - -export default async (elName: string | Element) => { - onMounted(async () => { - await nextTick() - - const el: any = typeof elName === 'string' ? document.querySelector(elName) : elName - - el.onmousedown = function(ev: any) { - console.log('点击') - - const distanceX = ev.clientX - el.offsetLeft - const distanceY = ev.clientY - el.offsetTop - document.onmousemove = function(ev) { - console.log('拖动') - - // var oevent = ev || event; - // entrance.style.left = oevent.clientX - distanceX + 'px'; - // entrance.style.top = oevent.clientY - distanceY + 'px'; - } - document.onmouseup = function(ev) { - console.log('释放') - - document.onmousemove = null - document.onmouseup = null - } - } - }) -} diff --git a/src/mixins/move.ts b/src/mixins/move.ts index 1428a42..af4e5bf 100644 --- a/src/mixins/move.ts +++ b/src/mixins/move.ts @@ -2,23 +2,19 @@ * @Author: ShawnPhang * @Date: 2021-08-19 18:43:22 * @Description: - * @LastEditors: ShawnPhang - * @LastEditTime: 2021-10-08 18:27:13 + * @LastEditors: ShawnPhang + * @LastEditTime: 2023-07-31 09:31:52 */ -// import { moveByDom, resizeByDom, initLine } from 'view-line' -// import 'view-line/dist/view-line.css' -// let isDraging = false -// const offset = { top: 0, left: 0 } import store from '@/store' const move = { methods: { initmovement(e: any) { - // let target = this.$store.state.pageDesign.dActiveElement - const target = this.$store.getters.dActiveElement + // let target = store.state.pageDesign.dActiveElement + const target = store.getters.dActiveElement // 设置移动状态初始值 - this.$store.dispatch('initDMove', { + store.dispatch('initDMove', { startX: e.pageX, startY: e.pageY, originX: target.left, @@ -32,11 +28,11 @@ const move = { document.addEventListener('mouseup', this.handlemouseup, true) }, - handlemousemove(e) { + handlemousemove(e: any) { e.stopPropagation() e.preventDefault() - this.$store.dispatch('dMove', { + store.dispatch('dMove', { x: e.pageX, y: e.pageY, }) @@ -45,7 +41,7 @@ const move = { handlemouseup() { document.removeEventListener('mousemove', this.handlemousemove, true) document.removeEventListener('mouseup', this.handlemouseup, true) - this.$store.dispatch('stopDMove') + store.dispatch('stopDMove') }, }, } @@ -56,11 +52,11 @@ const moveInit = { if (!store.getters.dAltDown) { // 设置mouseevent给moveable初始 // 在组合操作时排除 - this.$store.commit('setMouseEvent', e) + store.commit('setMouseEvent', e) } - const target = this.$store.getters.dActiveElement - this.$store.dispatch('initDMove', { + const target = store.getters.dActiveElement + store.dispatch('initDMove', { startX: e.pageX, startY: e.pageY, originX: target.left, @@ -69,7 +65,7 @@ const moveInit = { const handlemouseup = () => { // 销毁选中即刻移动 - this.$store.commit('setMouseEvent', null) + store.commit('setMouseEvent', null) document.removeEventListener('mouseup', handlemouseup, true) } document.addEventListener('mouseup', handlemouseup, true) diff --git a/src/utils/axios.ts b/src/utils/axios.ts index 8483683..190a683 100644 --- a/src/utils/axios.ts +++ b/src/utils/axios.ts @@ -3,7 +3,7 @@ * @Date: 2021-07-13 02:48:38 * @Description: 接口规则:只有正确code为200时返回result结果对象,错误返回整个结果对象 * @LastEditors: ShawnPhang - * @LastEditTime: 2023-07-12 10:43:34 + * @LastEditTime: 2023-07-31 09:34:34 */ import axios from 'axios' import store from '@/store' @@ -11,8 +11,6 @@ import app_config from '@/config' axios.defaults.timeout = 30000 // axios.defaults.headers.Authorization = 'Bearer '; -// axios.defaults.headers.AppKey = '9e8nbMCqDkMhSRkTo8nYb7VF3qUa43EI' - // const version = app_config.VERSION; const baseUrl = app_config.API_URL