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']" > -