diff --git a/ui/package.json b/ui/package.json index 9ee4a9c..cec38d7 100644 --- a/ui/package.json +++ b/ui/package.json @@ -63,7 +63,6 @@ "husky": "^4.0.7", "lint-staged": "^9.5.0", "node-notifier": "^5.1.2", - "node-sass": "^4.13.0", "optimize-css-assets-webpack-plugin": "^3.2.0", "ora": "^1.2.0", "portfinder": "^1.0.21", @@ -71,6 +70,7 @@ "postcss-loader": "^2.0.8", "postcss-url": "^7.2.1", "rimraf": "^2.6.0", + "sass": "^1.77.5", "sass-loader": "^7.1.0", "semver": "^5.3.0", "shelljs": "^0.7.6", diff --git a/ui/src/locale/i18n/en-US.json b/ui/src/locale/i18n/en-US.json index 9b453db..8809342 100755 --- a/ui/src/locale/i18n/en-US.json +++ b/ui/src/locale/i18n/en-US.json @@ -225,5 +225,8 @@ "header_title": "Terminal", "asset": "Asset", "t_asset": "Asset", - "jump_server": "Jump Server" + "jump_server": "Jump Server", + "total": "Total ", + "items": "items", + "page": "/page" } diff --git a/ui/src/locale/i18n/zh-CN.json b/ui/src/locale/i18n/zh-CN.json index 1635d95..2748ddd 100755 --- a/ui/src/locale/i18n/zh-CN.json +++ b/ui/src/locale/i18n/zh-CN.json @@ -227,5 +227,8 @@ "header_title": "Terminal", "asset": "终端", "t_asset": "终端资产", - "jump_server": "跳板机" + "jump_server": "跳板机", + "total": "总计 ", + "items": "条", + "page": "条/页" } diff --git a/ui/src/pages/components/table-page/table.vue b/ui/src/pages/components/table-page/table.vue index 775125c..6dc32c4 100755 --- a/ui/src/pages/components/table-page/table.vue +++ b/ui/src/pages/components/table-page/table.vue @@ -990,7 +990,7 @@ export default { margin: 2px 4px; line-height: 18px; } -.multiFilter /deep/.ivu-checkbox-group-item { +.multiFilter ::deep.ivu-checkbox-group-item { display: block; padding: 0 16px; margin: 0; @@ -1114,7 +1114,7 @@ export default { .cell { overflow: hidden; } - /deep/ .ivu-tooltip-rel { + ::deep .ivu-tooltip-rel { display: block; } .poplableSty { diff --git a/ui/src/pages/terminal-operation.vue b/ui/src/pages/terminal-operation.vue index 52003cc..65441a4 100755 --- a/ui/src/pages/terminal-operation.vue +++ b/ui/src/pages/terminal-operation.vue @@ -74,15 +74,30 @@ - +
+ + +