From baf0d2948dba975fad5d127ecf4df347e8f9a5e3 Mon Sep 17 00:00:00 2001 From: "20932067@zju.edu.cn" Date: Fri, 14 May 2021 22:53:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9top=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hchyun-ui/.env.development | 4 +- hchyun-ui/package.json | 1 + .../src/views/system/top/demo-topology.vue | 648 +++--------- .../system/top/packages/elements/checkbox.vue | 4 +- .../system/top/packages/elements/dropdown.vue | 386 +++---- .../system/top/packages/elements/index.js | 4 +- .../system/top/packages/elements/loading.vue | 4 +- .../system/top/packages/{top.js => index.js} | 4 +- .../system/top/packages/topology/index.js | 4 +- .../topology/src/behavior/click-add-edge.js | 4 +- .../topology/src/behavior/click-event-edit.js | 188 ++-- .../topology/src/behavior/drag-add-edge.js | 4 +- .../topology/src/behavior/drag-event-edit.js | 2 +- .../topology/src/behavior/hover-event-edit.js | 42 +- .../packages/topology/src/behavior/index.js | 2 +- .../topology/src/behavior/keyup-event-edit.js | 2 +- .../top/packages/topology/src/config/edge.js | 2 +- .../top/packages/topology/src/config/index.js | 2 +- .../top/packages/topology/src/edge/base.js | 2 +- .../top/packages/topology/src/edge/index.js | 10 +- .../{cc-brokenline.js => top-brokenline.js} | 4 +- .../src/edge/{cc-cubic.js => top-cubic.js} | 4 +- .../src/edge/{cc-line.js => top-line.js} | 4 +- .../edge/{cc-polyline.js => top-polyline.js} | 4 +- .../packages/topology/src/edge/top-table.js | 128 +++ .../top/packages/topology/src/graph/index.js | 4 +- .../top/packages/topology/src/node/base.js | 2 +- .../packages/topology/src/node/er-table.js | 21 - .../top/packages/topology/src/node/index.js | 12 +- .../packages/topology/src/node/top-ertable.js | 243 +++++ .../packages/topology/src/node/top-image.js | 2 +- .../packages/topology/src/node/top-rect.js | 2 +- .../packages/topology/src/node/top-test.js | 3 + .../topology/src/plugins/d3-installer.js | 2 +- .../packages/topology/src/theme/dark-style.js | 2 +- .../topology/src/theme/default-style.js | 13 +- .../top/packages/topology/src/theme/index.js | 2 +- .../topology/src/theme/office-style.js | 2 +- .../packages/topology/src/toolbar-edit.vue | 23 +- .../packages/topology/src/toolbar-preview.vue | 6 +- .../top/packages/topology/src/topology.vue | 964 ++++++++++-------- .../topology/src/utils/anchor/draw.js | 3 +- .../topology/src/utils/anchor/er-draw.js | 48 + .../topology/src/utils/anchor/index.js | 6 +- .../topology/src/utils/anchor/set-state.js | 3 +- .../topology/src/utils/anchor/update.js | 2 +- .../topology/src/utils/collapse/index.js | 11 + .../topology/src/utils/collapse/move.js | 57 ++ .../topology/src/utils/collapse/set-state.js | 33 + .../packages/topology/src/utils/edge/index.js | 2 +- .../topology/src/utils/edge/set-state.js | 2 +- .../top/packages/topology/src/utils/index.js | 4 +- .../packages/topology/src/utils/node/index.js | 2 +- .../topology/src/utils/node/set-state.js | 7 +- .../src/views/system/top/{ => utils}/index.js | 2 +- 55 files changed, 1654 insertions(+), 1294 deletions(-) rename hchyun-ui/src/views/system/top/packages/{top.js => index.js} (92%) rename hchyun-ui/src/views/system/top/packages/topology/src/edge/{cc-brokenline.js => top-brokenline.js} (96%) rename hchyun-ui/src/views/system/top/packages/topology/src/edge/{cc-cubic.js => top-cubic.js} (77%) rename hchyun-ui/src/views/system/top/packages/topology/src/edge/{cc-line.js => top-line.js} (78%) rename hchyun-ui/src/views/system/top/packages/topology/src/edge/{cc-polyline.js => top-polyline.js} (98%) create mode 100644 hchyun-ui/src/views/system/top/packages/topology/src/edge/top-table.js delete mode 100644 hchyun-ui/src/views/system/top/packages/topology/src/node/er-table.js create mode 100644 hchyun-ui/src/views/system/top/packages/topology/src/node/top-ertable.js create mode 100644 hchyun-ui/src/views/system/top/packages/topology/src/node/top-test.js create mode 100644 hchyun-ui/src/views/system/top/packages/topology/src/utils/anchor/er-draw.js create mode 100644 hchyun-ui/src/views/system/top/packages/topology/src/utils/collapse/index.js create mode 100644 hchyun-ui/src/views/system/top/packages/topology/src/utils/collapse/move.js create mode 100644 hchyun-ui/src/views/system/top/packages/topology/src/utils/collapse/set-state.js rename hchyun-ui/src/views/system/top/{ => utils}/index.js (97%) diff --git a/hchyun-ui/.env.development b/hchyun-ui/.env.development index e3bbe48..8dc5e46 100644 --- a/hchyun-ui/.env.development +++ b/hchyun-ui/.env.development @@ -3,9 +3,9 @@ ENV = 'development' # 宏驰云管理系统/开发环境 #VUE_APP_BASE_API = '/dev-api' -#VUE_APP_BASE_API = 'http://localhost:8085/dev-api' +VUE_APP_BASE_API = 'http://localhost:8085/dev-api' #VUE_APP_BASE_API = 'http://apibase.hchyun.com/dev-api' -VUE_APP_BASE_API = 'http://apig.odliken.top/dev-api' +#VUE_APP_BASE_API = 'http://apig.odliken.top/dev-api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/hchyun-ui/package.json b/hchyun-ui/package.json index 09861f1..d2e6639 100644 --- a/hchyun-ui/package.json +++ b/hchyun-ui/package.json @@ -48,6 +48,7 @@ "file-saver": "2.0.1", "fuse.js": "3.4.4", "highlight.js": "9.18.5", + "jquery": "^3.6.0", "js-beautify": "1.10.2", "js-cookie": "2.2.0", "jsencrypt": "3.0.0-rc.1", diff --git a/hchyun-ui/src/views/system/top/demo-topology.vue b/hchyun-ui/src/views/system/top/demo-topology.vue index 5dc1759..3c0c0e9 100644 --- a/hchyun-ui/src/views/system/top/demo-topology.vue +++ b/hchyun-ui/src/views/system/top/demo-topology.vue @@ -15,555 +15,209 @@ diff --git a/hchyun-ui/src/views/system/top/packages/elements/index.js b/hchyun-ui/src/views/system/top/packages/elements/index.js index 03d3e71..81367e7 100644 --- a/hchyun-ui/src/views/system/top/packages/elements/index.js +++ b/hchyun-ui/src/views/system/top/packages/elements/index.js @@ -1,7 +1,7 @@ /** * @author: clay - * @data: 2021/11/14 - * @description: cceditor内部的通用组件 + * @data: 2019/11/14 + * @description: ClayTop内部的通用组件 */ import Checkbox from './checkbox' diff --git a/hchyun-ui/src/views/system/top/packages/elements/loading.vue b/hchyun-ui/src/views/system/top/packages/elements/loading.vue index a746470..f410a92 100644 --- a/hchyun-ui/src/views/system/top/packages/elements/loading.vue +++ b/hchyun-ui/src/views/system/top/packages/elements/loading.vue @@ -1,6 +1,6 @@