diff --git a/.prettierrc.js b/.prettierrc.js index c626abc..980fef1 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -1,15 +1,15 @@ module.exports = { arrowParens: 'avoid', bracketSpacing: true, - // "embeddedLanguageFormatting": "auto", - // "htmlWhitespaceSensitivity": "css", - // "insertPragma": false, - // "jsxBracketSameLine": false, - // "jsxSingleQuote": false, - // "printWidth": 80, - // "proseWrap": "preserve", - // "quoteProps": "as-needed", - // "requirePragma": false, + // embeddedLanguageFormatting: 'auto', + // htmlWhitespaceSensitivity: 'css', + // insertPragma: false, + // jsxBracketSameLine: false, + // jsxSingleQuote: false, + printWidth: 80, + // proseWrap: 'preserve', + // quoteProps: 'as-needed', + // requirePragma: false, semi: false, singleQuote: true, tabWidth: 2, diff --git a/src/components/GGanttChart.vue b/src/components/GGanttChart.vue index 7262a5f..9eb5176 100644 --- a/src/components/GGanttChart.vue +++ b/src/components/GGanttChart.vue @@ -17,24 +17,22 @@ :grid-size="gridSize" /> - -
+ -
diff --git a/src/components/GGanttGrid.vue b/src/components/GGanttGrid.vue index 396a6a5..e2a50d3 100644 --- a/src/components/GGanttGrid.vue +++ b/src/components/GGanttGrid.vue @@ -2,12 +2,7 @@
({ - top: '0px', - height: '0px', - }), - computed: { allChildPoints() { let start = moment(this.chartStart) @@ -68,26 +58,6 @@ export default { return res }, }, - - mounted() { - this.$nextTick(() => this.onWindowResize()) - window.addEventListener('resize', this.onWindowResize) - }, - - destroyed() { - window.removeEventListener('resize', this.onWindowResize) - }, - - methods: { - onWindowResize() { - let gridContainer = this.$refs['g-grid-container'] - if (!gridContainer) return - let rowsContainer = gridContainer.nextSibling - if (!rowsContainer) return - this.top = `${rowsContainer.offsetTop}px` - this.height = `${rowsContainer.offsetHeight}px` - }, - }, } @@ -95,7 +65,7 @@ export default { .g-grid-container { position: absolute; top: 0; - height: calc(100% - 23px); + bottom: 0; overflow: hidden; } diff --git a/src/components/GGanttTimeaxis.vue b/src/components/GGanttTimeaxis.vue index 4fb00a3..dc95269 100644 --- a/src/components/GGanttTimeaxis.vue +++ b/src/components/GGanttTimeaxis.vue @@ -96,12 +96,14 @@ export default { this.initAxis() this.onWindowResize() window.addEventListener('resize', this.onWindowResize) - window.addEventListener('mousemove', event => this.moveTimemarker(event)) - window.addEventListener('dragover', event => this.moveTimemarker(event)) + window.addEventListener('mousemove', this.moveTimemarker) + window.addEventListener('dragover', this.moveTimemarker) }, destroyed() { window.removeEventListener('resize', this.onWindowResize) + window.removeEventListener('mousemove', this.moveTimemarker) + window.removeEventListener('dragover', this.moveTimemarker) }, methods: {