diff --git a/package.json b/package.json index 80fd6795..d294b4a2 100644 --- a/package.json +++ b/package.json @@ -16,9 +16,7 @@ "lint": "vue-cli-service lint", "build": "vue-cli-service build --target lib --name pev2 ./src/components/Plan.vue && EXTRACT_CSS=true vue-cli-service build --target lib --name pev2 ./src/components/Plan.vue --dest ./dist/components && cp -R ./src/assets/scss ./dist/scss", "build-app": "vue-cli-service build --dest dist-app", - "test:unit": "jest", - "snyk-protect": "snyk protect", - "prepare": "npm run snyk-protect" + "test:unit": "jest" }, "dependencies": { "@types/dragscroll": "0.0.0", @@ -27,6 +25,7 @@ "@types/moment-duration-format": "^2.2.3", "bootstrap": "^4.6.0", "clarinet": "^0.12.3", + "classnames": "^2.3.1", "core-js": "^3.16.0", "highlight.js": "^10.7.2", "jquery": "^3.6.0", @@ -60,7 +59,6 @@ "prettier": "2.0.5", "raw-loader": "^4.0.2", "sass-loader": "^8.0.0", - "snyk": "^1.334.0", "ts-jest": "^25.2.0", "typescript": "^3.6.3", "vue-jest": "^3.0.5", @@ -102,6 +100,5 @@ "moduleNameMapper": { "^@/(.*)$": "/src/$1" } - }, - "snyk": true + } } diff --git a/src/assets/scss/_plan-node.scss b/src/assets/scss/_plan-node.scss index 6237513c..568ca309 100644 --- a/src/assets/scss/_plan-node.scss +++ b/src/assets/scss/_plan-node.scss @@ -1,6 +1,8 @@ $compact-width: 50px; $bg-color: #fff; + .plan-node { + user-select: none; text-decoration: none; color: $text-color; display: inline-block; @@ -255,7 +257,6 @@ ul.node-children.collapsed { display: none; } } - .classic .plan & li::before { top: 7px; } diff --git a/src/assets/scss/_pev2.scss b/src/assets/scss/global.scss similarity index 100% rename from src/assets/scss/_pev2.scss rename to src/assets/scss/global.scss diff --git a/src/components/Diagram.vue b/src/components/Diagram.vue index edab7046..230edd0d 100644 --- a/src/components/Diagram.vue +++ b/src/components/Diagram.vue @@ -58,7 +58,7 @@ - + --> + + + + +
@@ -200,10 +214,28 @@
- - - - + + + +
@@ -211,7 +243,7 @@
-
+ +
@@ -244,9 +276,9 @@ import { Splitpanes, Pane } from 'splitpanes'; import { Component, Prop, Vue, Watch } from 'vue-property-decorator'; import PlanNode from '@/components/PlanNode.vue'; -import Copy from '@/components/Copy.vue'; -import Diagram from '@/components/Diagram.vue'; -import Stats from '@/components/Stats.vue'; +// import Copy from '@/components/Copy.vue'; +// import Diagram from '@/components/Diagram.vue'; +// import Stats from '@/components/Stats.vue'; import { HelpService, scrollChildIntoParentView } from '@/services/help-service'; import { PlanService } from '@/services/plan-service'; import { cost, duration, durationClass, json, pgsql, rows } from '@/filters'; @@ -263,12 +295,12 @@ Vue.component('tippy', TippyComponent); @Component({ name: 'plan', components: { - Copy, - Diagram, + // Copy, + // Diagram, Pane, PlanNode, Splitpanes, - Stats, + // Stats, }, directives: { }, @@ -285,7 +317,7 @@ export default class Plan extends Vue { public $refs!: { plan: InstanceType, root: PlanNode, - diagram: InstanceType, + // diagram: InstanceType, }; @Prop(String) private planSource!: string; @@ -335,8 +367,6 @@ export default class Plan extends Vue { private mounted(): void { this.handleScroll(); - this.eventBus.$on('mouseovernode', this.onMouseOverNode); - this.eventBus.$on('mouseoutnode', this.onMouseOutNode); this.eventBus.$on('clickcte', this.centerCTE); } @@ -561,7 +591,7 @@ export default class Plan extends Vue { if (cmp) { cmp.selected = true; } - this.$refs.diagram.selected = newVal; + // this.$refs.diagram.selected = newVal; cmp = this.findPlanNode((o: PlanNode) => o.node.nodeId === oldVal); if (cmp) { @@ -577,5 +607,5 @@ export default class Plan extends Vue { @import '~highlight.js/styles/github.css'; @import '../assets/scss/variables'; -@import '../assets/scss/pev2'; +@import '../assets/scss/global'; diff --git a/src/components/PlanNode.vue b/src/components/PlanNode.vue index da77846a..a83570f3 100644 --- a/src/components/PlanNode.vue +++ b/src/components/PlanNode.vue @@ -1,34 +1,41 @@