From af24ba2733d9a7946c0df415e810ba96b7ca450e Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 30 Mar 2021 16:11:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=B0=81=E8=A3=85=E7=94=BB=E5=B8=83?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/index.vue | 169 ++ .../components/vue-drag-resize-rotate/dom.js | 60 - .../components/vue-drag-resize-rotate/fns.js | 40 - .../vue-drag-resize-rotate/index.vue | 1551 ----------------- .../src/components/vue-drag-resize/dom.js | 60 - .../src/components/vue-drag-resize/fns.js | 40 - .../src/components/vue-drag-resize/index.vue | 1277 -------------- .../src/views/panel/DrawingBoard/index.vue | 262 --- frontend/src/views/panel/index.vue | 3 +- frontend/src/views/panel/list/PanelView.vue | 393 ----- frontend/src/views/panel/preview/index.vue | 8 +- 11 files changed, 173 insertions(+), 3690 deletions(-) create mode 100644 frontend/src/components/canvas/index.vue delete mode 100644 frontend/src/components/vue-drag-resize-rotate/dom.js delete mode 100644 frontend/src/components/vue-drag-resize-rotate/fns.js delete mode 100644 frontend/src/components/vue-drag-resize-rotate/index.vue delete mode 100644 frontend/src/components/vue-drag-resize/dom.js delete mode 100644 frontend/src/components/vue-drag-resize/fns.js delete mode 100644 frontend/src/components/vue-drag-resize/index.vue delete mode 100644 frontend/src/views/panel/DrawingBoard/index.vue delete mode 100644 frontend/src/views/panel/list/PanelView.vue diff --git a/frontend/src/components/canvas/index.vue b/frontend/src/components/canvas/index.vue new file mode 100644 index 0000000000..e3a752eb32 --- /dev/null +++ b/frontend/src/components/canvas/index.vue @@ -0,0 +1,169 @@ + + + + + diff --git a/frontend/src/components/vue-drag-resize-rotate/dom.js b/frontend/src/components/vue-drag-resize-rotate/dom.js deleted file mode 100644 index 9e36dba6ea..0000000000 --- a/frontend/src/components/vue-drag-resize-rotate/dom.js +++ /dev/null @@ -1,60 +0,0 @@ -import { isFunction } from './fns' - -// 将选择器与父元素匹配 -export function matchesSelectorToParentElements (el, selector, baseNode) { - let node = el - - const matchesSelectorFunc = [ - 'matches', - 'webkitMatchesSelector', - 'mozMatchesSelector', - 'msMatchesSelector', - 'oMatchesSelector' - ].find(func => isFunction(node[func])) - - if (!isFunction(node[matchesSelectorFunc])) return false - - do { - if (node[matchesSelectorFunc](selector)) return true - if (node === baseNode) return false - node = node.parentNode - } while (node) - - return false -} - -export function getComputedSize ($el) { - const style = window.getComputedStyle($el) - - return [ - parseFloat(style.getPropertyValue('width'), 10), - parseFloat(style.getPropertyValue('height'), 10) - ] -} -// 添加事件 -export function addEvent (el, event, handler) { - if (!el) { - return - } - if (el.attachEvent) { - el.attachEvent('on' + event, handler) - } else if (el.addEventListener) { - el.addEventListener(event, handler, true) - } else { - el['on' + event] = handler - } -} - -// 删除事件 -export function removeEvent (el, event, handler) { - if (!el) { - return - } - if (el.detachEvent) { - el.detachEvent('on' + event, handler) - } else if (el.removeEventListener) { - el.removeEventListener(event, handler, true) - } else { - el['on' + event] = null - } -} diff --git a/frontend/src/components/vue-drag-resize-rotate/fns.js b/frontend/src/components/vue-drag-resize-rotate/fns.js deleted file mode 100644 index 004f1682e1..0000000000 --- a/frontend/src/components/vue-drag-resize-rotate/fns.js +++ /dev/null @@ -1,40 +0,0 @@ -export function isFunction (func) { - return (typeof func === 'function' || Object.prototype.toString.call(func) === '[object Function]') -} - -// 对其栅格 -export function snapToGrid (grid, pendingX, pendingY, scale = 1) { - const x = Math.round((pendingX / scale) / grid[0]) * grid[0] - const y = Math.round((pendingY / scale) / grid[1]) * grid[1] - return [x, y] -} - -// 获取rect模型 -export function getSize (el) { - const rect = el.getBoundingClientRect() - - return [ - parseInt(rect.width), - parseInt(rect.height) - ] -} - -export function computeWidth (parentWidth, left, right) { - return parentWidth - left - right -} - -export function computeHeight (parentHeight, top, bottom) { - return parentHeight - top - bottom -} - -export function restrictToBounds (value, min, max) { - if (min !== null && value < min) { - return min - } - - if (max !== null && max < value) { - return max - } - - return value -} diff --git a/frontend/src/components/vue-drag-resize-rotate/index.vue b/frontend/src/components/vue-drag-resize-rotate/index.vue deleted file mode 100644 index a6f1e1eedf..0000000000 --- a/frontend/src/components/vue-drag-resize-rotate/index.vue +++ /dev/null @@ -1,1551 +0,0 @@ - - - - - diff --git a/frontend/src/components/vue-drag-resize/dom.js b/frontend/src/components/vue-drag-resize/dom.js deleted file mode 100644 index 9e36dba6ea..0000000000 --- a/frontend/src/components/vue-drag-resize/dom.js +++ /dev/null @@ -1,60 +0,0 @@ -import { isFunction } from './fns' - -// 将选择器与父元素匹配 -export function matchesSelectorToParentElements (el, selector, baseNode) { - let node = el - - const matchesSelectorFunc = [ - 'matches', - 'webkitMatchesSelector', - 'mozMatchesSelector', - 'msMatchesSelector', - 'oMatchesSelector' - ].find(func => isFunction(node[func])) - - if (!isFunction(node[matchesSelectorFunc])) return false - - do { - if (node[matchesSelectorFunc](selector)) return true - if (node === baseNode) return false - node = node.parentNode - } while (node) - - return false -} - -export function getComputedSize ($el) { - const style = window.getComputedStyle($el) - - return [ - parseFloat(style.getPropertyValue('width'), 10), - parseFloat(style.getPropertyValue('height'), 10) - ] -} -// 添加事件 -export function addEvent (el, event, handler) { - if (!el) { - return - } - if (el.attachEvent) { - el.attachEvent('on' + event, handler) - } else if (el.addEventListener) { - el.addEventListener(event, handler, true) - } else { - el['on' + event] = handler - } -} - -// 删除事件 -export function removeEvent (el, event, handler) { - if (!el) { - return - } - if (el.detachEvent) { - el.detachEvent('on' + event, handler) - } else if (el.removeEventListener) { - el.removeEventListener(event, handler, true) - } else { - el['on' + event] = null - } -} diff --git a/frontend/src/components/vue-drag-resize/fns.js b/frontend/src/components/vue-drag-resize/fns.js deleted file mode 100644 index 004f1682e1..0000000000 --- a/frontend/src/components/vue-drag-resize/fns.js +++ /dev/null @@ -1,40 +0,0 @@ -export function isFunction (func) { - return (typeof func === 'function' || Object.prototype.toString.call(func) === '[object Function]') -} - -// 对其栅格 -export function snapToGrid (grid, pendingX, pendingY, scale = 1) { - const x = Math.round((pendingX / scale) / grid[0]) * grid[0] - const y = Math.round((pendingY / scale) / grid[1]) * grid[1] - return [x, y] -} - -// 获取rect模型 -export function getSize (el) { - const rect = el.getBoundingClientRect() - - return [ - parseInt(rect.width), - parseInt(rect.height) - ] -} - -export function computeWidth (parentWidth, left, right) { - return parentWidth - left - right -} - -export function computeHeight (parentHeight, top, bottom) { - return parentHeight - top - bottom -} - -export function restrictToBounds (value, min, max) { - if (min !== null && value < min) { - return min - } - - if (max !== null && max < value) { - return max - } - - return value -} diff --git a/frontend/src/components/vue-drag-resize/index.vue b/frontend/src/components/vue-drag-resize/index.vue deleted file mode 100644 index 30e41152f7..0000000000 --- a/frontend/src/components/vue-drag-resize/index.vue +++ /dev/null @@ -1,1277 +0,0 @@ - - - - - diff --git a/frontend/src/views/panel/DrawingBoard/index.vue b/frontend/src/views/panel/DrawingBoard/index.vue deleted file mode 100644 index cfdd29507e..0000000000 --- a/frontend/src/views/panel/DrawingBoard/index.vue +++ /dev/null @@ -1,262 +0,0 @@ - - - - diff --git a/frontend/src/views/panel/index.vue b/frontend/src/views/panel/index.vue index 67ddddfee1..56fa1c6e92 100644 --- a/frontend/src/views/panel/index.vue +++ b/frontend/src/views/panel/index.vue @@ -33,13 +33,12 @@ import DeContainer from '@/components/dataease/DeContainer' import DeAsideContainer from '@/components/dataease/DeAsideContainer' // import Group from './group/Group' import PanelList from './list/PanelList' -import PanelView from './list/PanelView' import PanelViewShow from './list/PanelViewShow' import ShareTree from './GrantAuth/shareTree' export default { name: 'Panel', - components: { DeMainContainer, DeContainer, DeAsideContainer, PanelList, PanelView, PanelViewShow, ShareTree }, + components: { DeMainContainer, DeContainer, DeAsideContainer, PanelList, PanelViewShow, ShareTree }, data() { return { component: PanelViewShow, diff --git a/frontend/src/views/panel/list/PanelView.vue b/frontend/src/views/panel/list/PanelView.vue deleted file mode 100644 index f2ff68f4d1..0000000000 --- a/frontend/src/views/panel/list/PanelView.vue +++ /dev/null @@ -1,393 +0,0 @@ - - - - - diff --git a/frontend/src/views/panel/preview/index.vue b/frontend/src/views/panel/preview/index.vue index f0b033395f..611d92ccf3 100644 --- a/frontend/src/views/panel/preview/index.vue +++ b/frontend/src/views/panel/preview/index.vue @@ -20,7 +20,7 @@ - + @@ -29,13 +29,11 @@