From 409f9117714bf6ff258a5ede4564c5df6d33477b Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 21 Dec 2021 14:25:13 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E4=BF=AE=E6=94=B9=20=E6=8B=96?= =?UTF-8?q?=E6=8B=BD=E9=AB=98=E5=BA=A6=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=20chart-line=20nodata=E7=9A=84=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/build/webpack.base.conf.js | 9 +- nezha-fronted/package.json | 2 +- nezha-fronted/src/components/chart/chart.vue | 13 +- .../src/components/chart/chart/chartGauge.vue | 20 +- .../chart/chart/grid/CustomDragElement.vue | 41 + .../src/components/chart/chart/grid/DOM.js | 46 + .../components/chart/chart/grid/GridItem.vue | 864 ++++++++++++++++++ .../chart/chart/grid/GridLayout.vue | 462 ++++++++++ .../chart/chart/grid/TestElement.vue | 25 + .../chart/chart/grid/aspectRatio.js | 147 +++ .../chart/chart/grid/draggableUtils.js | 50 + .../src/components/chart/chart/grid/index.js | 34 + .../chart/chart/grid/responsiveUtils.js | 107 +++ .../src/components/chart/chart/grid/utils.js | 583 ++++++++++++ .../src/components/chart/chartList.vue | 19 +- .../src/components/chart/chartMixin.js | 10 +- .../common/rightBox/chart/chartConfig.vue | 4 +- 17 files changed, 2418 insertions(+), 18 deletions(-) create mode 100644 nezha-fronted/src/components/chart/chart/grid/CustomDragElement.vue create mode 100644 nezha-fronted/src/components/chart/chart/grid/DOM.js create mode 100644 nezha-fronted/src/components/chart/chart/grid/GridItem.vue create mode 100644 nezha-fronted/src/components/chart/chart/grid/GridLayout.vue create mode 100644 nezha-fronted/src/components/chart/chart/grid/TestElement.vue create mode 100644 nezha-fronted/src/components/chart/chart/grid/aspectRatio.js create mode 100644 nezha-fronted/src/components/chart/chart/grid/draggableUtils.js create mode 100644 nezha-fronted/src/components/chart/chart/grid/index.js create mode 100644 nezha-fronted/src/components/chart/chart/grid/responsiveUtils.js create mode 100644 nezha-fronted/src/components/chart/chart/grid/utils.js diff --git a/nezha-fronted/build/webpack.base.conf.js b/nezha-fronted/build/webpack.base.conf.js index 88adc5d03..265610633 100644 --- a/nezha-fronted/build/webpack.base.conf.js +++ b/nezha-fronted/build/webpack.base.conf.js @@ -37,7 +37,14 @@ module.exports = { { test: /\.(js)$/, loader: 'babel-loader', - include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client'), resolve('node_modules/element-ui/packages/scrollbar')], + include: [ + resolve('src'), + resolve('test'), + resolve('node_modules/webpack-dev-server/client'), + resolve('node_modules/element-ui/packages/scrollbar'), + resolve('node_modules/@interactjs'), + resolve('node_modules/vue-grid-layout') + ], exclude: '/node_modules/', options: { presets: [ diff --git a/nezha-fronted/package.json b/nezha-fronted/package.json index a8ea145ff..3f59bf20d 100644 --- a/nezha-fronted/package.json +++ b/nezha-fronted/package.json @@ -38,7 +38,7 @@ "vue-color": "^2.8.1", "vue-countupjs": "^1.0.0", "vue-draggable-resizable": "^2.3.0", - "vue-grid-layout": "2.3.7", + "vue-grid-layout": "^2.3.12", "vue-i18n": "^8.15.1", "vue-quill-editor": "^3.0.6", "vue-resource": "^1.5.1", diff --git a/nezha-fronted/src/components/chart/chart.vue b/nezha-fronted/src/components/chart/chart.vue index 731429024..a7115ccff 100644 --- a/nezha-fronted/src/components/chart/chart.vue +++ b/nezha-fronted/src/components/chart/chart.vue @@ -1,7 +1,7 @@