From 337ee9a938969ab0a9ebd01c8e709e4f6e2768ed Mon Sep 17 00:00:00 2001 From: chenjinsong <523037378@qq.com> Date: Fri, 19 Mar 2021 18:52:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BC=95=E5=85=A5eslint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/package.json | 9 +- nezha-fronted/src/App.vue | 20 +- nezha-fronted/src/assets/stylus/table.scss | 47 + .../components/charts/chart-alert-list.vue | 1449 ++++---- .../src/components/charts/chart-detail.vue | 611 ++- .../src/components/charts/chart-list.vue | 2862 +++++++------- .../src/components/charts/chart-pie.vue | 1037 +++--- .../components/charts/chart-single-stat.vue | 738 ++-- .../src/components/charts/chart-table.vue | 952 ++--- .../src/components/charts/chart-url.vue | 294 +- .../src/components/charts/chartDataFormat.js | 1144 +++--- .../src/components/charts/chartPreview.vue | 2729 +++++++------- .../components/charts/line-chart-block.vue | 3154 ++++++++-------- .../src/components/charts/richTextEditor.vue | 184 +- .../src/components/charts/text-chart.vue | 323 +- nezha-fronted/src/components/cli/console.vue | 477 ++- nezha-fronted/src/components/cli/webSSH.vue | 904 +++-- .../components/common/alert/alertLabel.vue | 215 +- .../components/common/alert/alertLabel2.vue | 325 +- .../common/alert/alertMessageTable.vue | 1300 ++++--- .../components/common/alert/alertRuleInfo.vue | 150 +- .../common/alert/selectAlertSilence.vue | 156 +- .../components/common/bottomBox/bottomBox.vue | 136 +- .../common/bottomBox/tabs/alertMessageTab.vue | 1216 +++--- .../common/bottomBox/tabs/cabinetTab.vue | 342 +- .../bottomBox/tabs/endpointQueryTab.vue | 1049 +++--- .../common/bottomBox/tabs/endpointTab.vue | 749 ++-- .../common/bottomBox/tabs/panelTab.vue | 755 ++-- .../bottomBox/tabs/terminalLogCMDTab.vue | 210 +- .../bottomBox/tabs/terminalLogMonitorTab.vue | 484 ++- .../bottomBox/tabs/terminalLogRecordTab.vue | 616 ++- .../src/components/common/chartUnit.vue | 56 +- .../src/components/common/deleteButton.vue | 81 +- .../src/components/common/elementSet.vue | 97 +- .../src/components/common/exportXLSX.vue | 445 ++- .../src/components/common/header.vue | 799 ++-- nezha-fronted/src/components/common/home.vue | 14 +- .../common/honeycomb/hexagonFigureSvg.vue | 1620 ++++---- nezha-fronted/src/components/common/i18n.js | 10 +- .../src/components/common/js/Xterm.js | 6 +- .../src/components/common/js/common.js | 79 +- .../src/components/common/js/constants.js | 222 +- .../src/components/common/js/divResize.js | 120 +- .../common/js/radomcolor/randomcolor.js | 486 ++- .../src/components/common/js/tools.js | 1034 +++--- .../src/components/common/js/validate.js | 95 +- .../src/components/common/language/cn.js | 2512 ++++++------- .../src/components/common/language/en.js | 2294 ++++++------ .../src/components/common/language/index.js | 6 +- .../src/components/common/leftMenu.vue | 1003 +++-- .../src/components/common/loading.vue | 22 +- nezha-fronted/src/components/common/login.vue | 77 +- .../src/components/common/nezhaColor.vue | 326 +- .../common/overView/messageAsset.vue | 538 ++- .../src/components/common/pagination.vue | 177 +- .../src/components/common/pickTime.vue | 200 +- .../common/popBox/cabinetConfig.vue | 194 +- .../components/common/popBox/selectArea.vue | 90 +- .../common/popBox/selectAssetType.vue | 86 +- .../components/common/popBox/selectPanel.vue | 170 +- .../components/common/popBox/selectWalk.vue | 168 +- .../common/project/L5/CanvasContextMenu.vue | 16 +- .../common/project/L5/CanvasProps.vue | 1273 ++++--- .../common/project/L5/services/canvas.js | 686 ++-- .../common/project/L5/topoTooltip.vue | 536 ++- .../common/project/L5/topologyTopTool.vue | 216 +- .../common/project/popData/Info.vue | 60 +- .../common/project/popData/Main.vue | 136 +- .../common/project/popData/alertTable.vue | 622 ++-- .../common/project/popData/assetTable.vue | 469 ++- .../common/project/popData/endpointTable.vue | 468 ++- .../common/project/popData/expressionInfo.vue | 88 +- .../components/common/project/topologyL5.vue | 3279 ++++++++-------- .../common/project/topologyPrev.vue | 3286 ++++++++--------- .../components/common/rightBox/accountBox.vue | 402 +- .../common/rightBox/addEndpointBox.vue | 1337 ++++--- .../common/rightBox/alertConfigBox.vue | 328 +- .../common/rightBox/alertSilenceBox.vue | 686 ++-- .../components/common/rightBox/assetBox.vue | 1026 ++--- .../common/rightBox/assetStateBox.vue | 154 +- .../common/rightBox/assetTypeBox.vue | 233 +- .../common/rightBox/batchEditAsset.vue | 940 +++-- .../components/common/rightBox/cabinetBox.vue | 186 +- .../src/components/common/rightBox/dcBox.vue | 280 +- .../common/rightBox/editEndpointBox.vue | 560 +-- .../common/rightBox/exprTempBox.vue | 271 +- .../common/rightBox/locationCascader.vue | 678 ++-- .../components/common/rightBox/menuBox.vue | 302 +- .../common/rightBox/metricPrePanelBox.vue | 495 ++- .../src/components/common/rightBox/mibBox.vue | 368 +- .../components/common/rightBox/modelBox.vue | 619 ++-- .../components/common/rightBox/moduleBox.vue | 702 ++-- .../components/common/rightBox/panelBox.vue | 173 +- .../common/rightBox/paramEditBox.vue | 6 +- .../components/common/rightBox/projectBox.vue | 161 +- .../common/rightBox/promServerBox.vue | 211 +- .../components/common/rightBox/roleBox.vue | 259 +- .../common/rightBox/trafficSetting/subBox.vue | 130 +- .../trafficSetting/trafficSettingBox.vue | 546 ++- .../trafficSetting/trafficSettingTab.vue | 692 ++-- .../src/components/common/searchInput.vue | 2112 ++++++----- .../src/components/common/searchInput2.vue | 13 - .../components/common/searchSelectInfo.vue | 252 +- .../common/table/nz-table-column.js | 19 + .../src/components/common/timePicker.vue | 355 +- .../src/components/page/alert/config.vue | 764 ++-- .../src/components/page/alert/list.vue | 1139 +++--- .../src/components/page/alert/nzAlertTag.vue | 22 +- .../src/components/page/alert/silence.vue | 659 ++-- .../src/components/page/asset/Console.vue | 29 +- .../components/page/asset/accountConfig.vue | 186 +- .../src/components/page/asset/asset.vue | 1269 ++++--- .../src/components/page/asset/cloneChat.vue | 76 +- .../page/asset/components/alert.vue | 50 + .../page/asset/components/endpoint.vue | 39 + .../page/asset/components/operation.vue | 65 + .../components/page/asset/components/ping.vue | 41 + .../page/asset/endpointStatusPop.vue | 225 +- .../components/page/asset/moduleListPop.vue | 38 +- .../src/components/page/config/about.vue | 38 +- .../src/components/page/config/account.vue | 681 ++-- .../src/components/page/config/assetState.vue | 518 +-- .../src/components/page/config/assetType.vue | 546 +-- .../src/components/page/config/changePwd.vue | 142 +- .../src/components/page/config/dc.vue | 756 ++-- .../src/components/page/config/exprTemp.vue | 605 ++- .../src/components/page/config/menus.vue | 454 ++- .../src/components/page/config/mib.vue | 536 +-- .../src/components/page/config/mibBrowser.vue | 739 ++-- .../src/components/page/config/model.vue | 540 +-- .../components/page/config/operationlog.vue | 422 +-- .../src/components/page/config/promServer.vue | 692 ++-- .../src/components/page/config/roles.vue | 436 +-- .../src/components/page/config/setup.vue | 476 +-- .../src/components/page/config/system.vue | 1288 ++++--- .../components/page/config/terminallog.vue | 584 +-- .../src/components/page/config/util.vue | 100 +- .../page/dashboard/alertChartParam.vue | 349 +- .../components/page/dashboard/chartBox.vue | 2184 ++++++----- .../components/page/dashboard/chartMetric.vue | 1190 +++--- .../page/dashboard/chartMetricForPreview.vue | 523 ++- .../page/dashboard/explore/editor.vue | 1573 ++++---- .../page/dashboard/explore/explore.vue | 921 +++-- .../page/dashboard/explore/promqlInput.vue | 717 ++-- .../page/dashboard/explore/suggestions.vue | 792 ++-- .../page/dashboard/metricPreview.vue | 434 ++- .../components/page/dashboard/metricSet.vue | 383 +- .../page/dashboard/overview/chart.vue | 1008 +++-- .../page/dashboard/overview/chartConfig.vue | 1060 +++--- .../page/dashboard/overview/overview2.vue | 2409 ++++++------ .../src/components/page/dashboard/panel.vue | 976 +++-- .../src/components/page/project/project.vue | 1286 ++++--- nezha-fronted/src/http.js | 94 +- nezha-fronted/src/libs/bus.js | 438 +-- nezha-fronted/src/main.js | 332 +- nezha-fronted/src/permission.js | 123 +- nezha-fronted/src/router/index.js | 50 +- nezha-fronted/src/store/index.js | 148 +- nezha-fronted/src/store/user.js | 93 +- 159 files changed, 47146 insertions(+), 47387 deletions(-) create mode 100644 nezha-fronted/src/assets/stylus/table.scss delete mode 100644 nezha-fronted/src/components/common/searchInput2.vue create mode 100644 nezha-fronted/src/components/common/table/nz-table-column.js create mode 100644 nezha-fronted/src/components/page/asset/components/alert.vue create mode 100644 nezha-fronted/src/components/page/asset/components/endpoint.vue create mode 100644 nezha-fronted/src/components/page/asset/components/operation.vue create mode 100644 nezha-fronted/src/components/page/asset/components/ping.vue diff --git a/nezha-fronted/package.json b/nezha-fronted/package.json index 03720947f..8f561dba5 100644 --- a/nezha-fronted/package.json +++ b/nezha-fronted/package.json @@ -7,7 +7,8 @@ "scripts": { "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", "start": "npm run dev", - "build": "node build/build.js" + "build": "node build/build.js", + "lint": "eslint --fix --ext .js,.vue src" }, "dependencies": { "@riophae/vue-treeselect": "^0.4.0", @@ -57,6 +58,12 @@ "chalk": "^2.0.1", "copy-webpack-plugin": "^4.0.1", "css-loader": "^0.28.0", + "eslint": "^7.22.0", + "eslint-config-standard": "^16.0.2", + "eslint-plugin-import": "^2.22.1", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^4.3.1", + "eslint-plugin-vue": "^7.7.0", "extract-text-webpack-plugin": "^3.0.0", "file-loader": "^1.1.4", "filemanager-webpack-plugin": "^2.0.5", diff --git a/nezha-fronted/src/App.vue b/nezha-fronted/src/App.vue index fe9faed43..a12594375 100644 --- a/nezha-fronted/src/App.vue +++ b/nezha-fronted/src/App.vue @@ -9,16 +9,16 @@ diff --git a/nezha-fronted/src/components/charts/chart-detail.vue b/nezha-fronted/src/components/charts/chart-detail.vue index 68ffd25a5..fe11e3431 100644 --- a/nezha-fronted/src/components/charts/chart-detail.vue +++ b/nezha-fronted/src/components/charts/chart-detail.vue @@ -35,7 +35,7 @@ diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue index 832140153..121f2ef52 100644 --- a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue +++ b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue @@ -73,7 +73,7 @@
-
+
@@ -101,7 +101,7 @@
-
+
@@ -136,297 +136,297 @@ diff --git a/nezha-fronted/src/components/common/rightBox/promServerBox.vue b/nezha-fronted/src/components/common/rightBox/promServerBox.vue index 61a9807d9..3dafea6f4 100644 --- a/nezha-fronted/src/components/common/rightBox/promServerBox.vue +++ b/nezha-fronted/src/components/common/rightBox/promServerBox.vue @@ -66,116 +66,115 @@
diff --git a/nezha-fronted/src/components/common/rightBox/roleBox.vue b/nezha-fronted/src/components/common/rightBox/roleBox.vue index 290cdbfbf..cd43e75ac 100644 --- a/nezha-fronted/src/components/common/rightBox/roleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/roleBox.vue @@ -33,10 +33,10 @@
--> -
+
- - + + {{$t(data.i18n)}}
@@ -59,142 +59,141 @@
diff --git a/nezha-fronted/src/components/common/searchSelectInfo.vue b/nezha-fronted/src/components/common/searchSelectInfo.vue index ac8bafa31..35efe09d4 100644 --- a/nezha-fronted/src/components/common/searchSelectInfo.vue +++ b/nezha-fronted/src/components/common/searchSelectInfo.vue @@ -1,128 +1,128 @@ diff --git a/nezha-fronted/src/components/common/table/nz-table-column.js b/nezha-fronted/src/components/common/table/nz-table-column.js new file mode 100644 index 000000000..7d343c85c --- /dev/null +++ b/nezha-fronted/src/components/common/table/nz-table-column.js @@ -0,0 +1,19 @@ +export default { + name: 'nz-data-table-column', + functional: true, + render (h, { data, props }) { + let children = [] + const align = props.align + if (props.columns) { + children = props.columns.map(column => + h('nz-data-table-column', { + props: Object.assign({}, { align }, column) + }) + ) + } + data.props = { + ...data.props + } + return h('el-table-column', data, children) + } +} diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue index 7af537cbe..af2a7fe08 100644 --- a/nezha-fronted/src/components/common/timePicker.vue +++ b/nezha-fronted/src/components/common/timePicker.vue @@ -120,8 +120,8 @@ - - - diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index 26ec837e4..e62dbc028 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -125,7 +125,7 @@ - diff --git a/nezha-fronted/src/components/page/alert/nzAlertTag.vue b/nezha-fronted/src/components/page/alert/nzAlertTag.vue index 3f253ab33..f4431d9cd 100644 --- a/nezha-fronted/src/components/page/alert/nzAlertTag.vue +++ b/nezha-fronted/src/components/page/alert/nzAlertTag.vue @@ -6,18 +6,18 @@ \ No newline at end of file + diff --git a/nezha-fronted/src/components/page/asset/accountConfig.vue b/nezha-fronted/src/components/page/asset/accountConfig.vue index b954ab96d..97d3ef8bd 100644 --- a/nezha-fronted/src/components/page/asset/accountConfig.vue +++ b/nezha-fronted/src/components/page/asset/accountConfig.vue @@ -95,107 +95,105 @@ diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 0431a5056..43a992b26 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -70,7 +70,7 @@ :prop="$tableSet.propTitle(item.prop,'asset')" :sort-orders="['ascending', 'descending']" > -