diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index a2e9b390f..f98636b69 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -163,8 +163,8 @@ } } .icon { - width: 1em; - height: 1em; + width: 5rem; + height: 5rem; vertical-align: -0.15em; fill: currentColor; overflow: hidden; diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss index 1e2a4dfa3..96c82ebeb 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -482,3 +482,10 @@ .fade-leave-active { transition: opacity 1s; } +.right-no-data /deep/ .icon { + width: 5rem; + height: 5rem; +} +.right-no-data { + line-height: 21px; +} diff --git a/nezha-fronted/src/assets/css/font/iconfont.js b/nezha-fronted/src/assets/css/font/iconfont.js index d32c0cbe7..774a1927b 100644 --- a/nezha-fronted/src/assets/css/font/iconfont.js +++ b/nezha-fronted/src/assets/css/font/iconfont.js @@ -1 +1 @@ -!function(a){var c,h,l,z,o,i='',v=(v=document.getElementsByTagName("script"))[v.length-1].getAttribute("data-injectcss"),t=function(a,c){c.parentNode.insertBefore(a,c)};if(v&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}function m(){o||(o=!0,l())}function p(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(p,50)}m()}c=function(){var a,c;(c=document.createElement("div")).innerHTML=i,i=null,(a=c.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",c=a,(a=document.body).firstChild?t(c,a.firstChild):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(h=function(){document.removeEventListener("DOMContentLoaded",h,!1),c()},document.addEventListener("DOMContentLoaded",h,!1)):document.attachEvent&&(l=c,z=a.document,o=!1,p(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,m())})}(window); \ No newline at end of file +!function(a){var c,h,l,z,o,i='',v=(v=document.getElementsByTagName("script"))[v.length-1].getAttribute("data-injectcss"),t=function(a,c){c.parentNode.insertBefore(a,c)};if(v&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}function m(){o||(o=!0,l())}function p(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(p,50)}m()}c=function(){var a,c;(c=document.createElement("div")).innerHTML=i,i=null,(a=c.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",c=a,(a=document.body).firstChild?t(c,a.firstChild):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(h=function(){document.removeEventListener("DOMContentLoaded",h,!1),c()},document.addEventListener("DOMContentLoaded",h,!1)):document.attachEvent&&(l=c,z=a.document,o=!1,p(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,m())})}(window); diff --git a/nezha-fronted/src/assets/css/font/iconfont.ttf b/nezha-fronted/src/assets/css/font/iconfont.ttf index ae99cce7c..b26adb7c1 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.ttf and b/nezha-fronted/src/assets/css/font/iconfont.ttf differ diff --git a/nezha-fronted/src/assets/css/font/iconfont.woff b/nezha-fronted/src/assets/css/font/iconfont.woff index 9aa0245e4..3c13ee0db 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.woff and b/nezha-fronted/src/assets/css/font/iconfont.woff differ diff --git a/nezha-fronted/src/assets/css/font/iconfont.woff2 b/nezha-fronted/src/assets/css/font/iconfont.woff2 index 83bd0de7b..2269713b5 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.woff2 and b/nezha-fronted/src/assets/css/font/iconfont.woff2 differ diff --git a/nezha-fronted/src/assets/css/nzIcon.css b/nezha-fronted/src/assets/css/nzIcon.css index 0d0cc9b09..4a8539362 100644 --- a/nezha-fronted/src/assets/css/nzIcon.css +++ b/nezha-fronted/src/assets/css/nzIcon.css @@ -1,8 +1,8 @@ @font-face { font-family: "nz-icon"; /* Project id 2030432 */ - src: url('./font/iconfont.woff2?t=1634268820326') format('woff2'), - url('./font/iconfont.woff?t=1634268820326') format('woff'), - url('./font/iconfont.ttf?t=1634268820326') format('truetype'); + src: url('./font/iconfont.woff2?t=1634874122349') format('woff2'), + url('./font/iconfont.woff?t=1634874122349') format('woff'), + url('./font/iconfont.ttf?t=1634874122349') format('truetype'); } .nz-icon { @@ -13,6 +13,46 @@ -moz-osx-font-smoothing: grayscale; } +.nz-icon-stop:before { + content: "\e74a"; +} + +.nz-icon-no-data-panel:before { + content: "\e748"; +} + +.nz-icon-no-data-project:before { + content: "\e74f"; +} + +.nz-icon-no-data-list:before { + content: "\e750"; +} + +.nz-icon-ZD:before { + content: "\e74e"; +} + +.nz-icon-failed:before { + content: "\e749"; +} + +.nz-icon-unknown-error:before { + content: "\e74c"; +} + +.nz-icon-over:before { + content: "\e74b"; +} + +.nz-icon-connecting:before { + content: "\e74d"; +} + +.nz-icon-label:before { + content: "\e747"; +} + .nz-icon-language-change:before { content: "\e746"; } @@ -393,10 +433,6 @@ content: "\e6f7"; } -.nz-icon-ZD:before { - content: "\e6f9"; -} - .nz-icon-revoke1:before { content: "\e6ee"; } diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue index 7f4e3f867..f35c8db25 100644 --- a/nezha-fronted/src/components/charts/chart-list.vue +++ b/nezha-fronted/src/components/charts/chart-list.vue @@ -5,13 +5,34 @@ position:relative; box-sizing: border-box; } - .noData{ - text-align: center + .no-data{ + height: 1189px; + width: 100%; + position: relative; + .icon { + width: 5rem; + height: 5rem; + position: absolute; + top: 50%; + left: 50%; + margin-top: -52px; + margin-left: -40px; + text-align: center; + } + .no-data-div { + position: absolute; + font-size: 16px; + color: #333333; + font-weight: 400; + margin-left: -29px; + top: 52.5%; + left: 50% + } } .list-width{ width: 100%; /*height: 100%;*/ - padding: 0 10px 5px 20px; + padding: 0 10px 5px 10px; box-sizing: border-box; overflow: hidden;/*避免鼠标第一次放到曲线时，x轴出现滚动条后消失*/ @@ -241,7 +262,13 @@ :chart-index="index"> - + +
+ +
No data
+
@@ -683,7 +710,7 @@ export default { if (response.code === 200) { setTimeout(() => { this.finshGetData = false - }, 1000) + }, 100) response.data.list.forEach((item, index) => { item.isLoaded = false }) diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 4fab239da..01301b5d1 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -157,7 +157,9 @@ const cn = { oid: 'OID格式校验错误', normal: '正常', unusual: '不正常', - AuthenticationFailed: '认证失败' + AuthenticationFailed: '认证失败', + disabled: '已禁用', + enabled: '启用' }, setup: { step0: '欢迎', @@ -718,6 +720,7 @@ const cn = { user: { userList: '用户列表', user: '用户', + state: '状态', name: '姓名', // "用户" username: '登录名', // 登录名 roles: '角色', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index d9b9738a6..7740e4071 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -162,7 +162,9 @@ const en = { oid: 'OID format check error', normal: 'Up', unusual: 'Down', - AuthenticationFailed: 'Authentication failed' + AuthenticationFailed: 'Authentication failed', + disabled: 'Disabled', + enabled: 'Enabled' }, pageSize: '/page', setup: { @@ -726,6 +728,7 @@ const en = { user: { userList: 'User list', // "用户列表" user: 'User', + state: 'State', // 列表表头 name: 'Name', // "用户" username: 'Username', // 登录名 diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index 2988ca6f4..2c6385757 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -230,11 +230,9 @@
-
No data
+
No data
diff --git a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue index f795572c8..091e40365 100644 --- a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue +++ b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue @@ -86,7 +86,7 @@ - + diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue index 1287e7b43..40a5ae659 100644 --- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue @@ -133,11 +133,11 @@ size="small" > @@ -168,11 +168,11 @@ size="small" > @@ -189,11 +189,11 @@ size="small" > @@ -258,11 +258,11 @@ @change="receiverAndNotifyValidate" > @@ -280,11 +280,11 @@ @change="receiverAndNotifyValidate" > diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue index 3b68d74d7..2fbdbc706 100644 --- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue @@ -125,6 +125,14 @@ + @@ -152,7 +160,8 @@ export default { type: Boolean, default: true }, - alertMessageTabNew: Boolean + alertMessageTabNew: Boolean, + loading: Boolean }, mixins: [table, bus], data () { diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue index 4164fc5a9..d8be11d33 100644 --- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue @@ -90,15 +90,23 @@
{{scope.row.schedStime+' - '+scope.row.schedEtime}}
- + + + + + + + + + +
+
+ {{ $t('overall.enabled') }} +
+
+
+ {{ $t('overall.disabled') }} +
{{scope.row[item.prop]}} @@ -125,6 +133,14 @@ + @@ -134,6 +150,9 @@ import chartDataFormat from '@/components/charts/chartDataFormat' export default { name: 'alertRuleTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ diff --git a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue index 99de51bf5..2e63fed91 100644 --- a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue @@ -102,6 +102,14 @@ + @@ -116,6 +124,9 @@ export default { nzAlertTag }, mixins: [table], + props: { + loading: Boolean + }, data () { return { /* 表格相关 */ diff --git a/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue b/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue index f22857331..8eaf57601 100644 --- a/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue +++ b/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue @@ -81,6 +81,14 @@ + @@ -89,6 +97,9 @@ import table from '@/components/common/mixin/table' export default { name: 'assetLabelTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue index ea377be1b..290301c7d 100644 --- a/nezha-fronted/src/components/common/table/asset/assetTable.vue +++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue @@ -130,6 +130,14 @@ + @@ -149,7 +157,8 @@ export default { type: Boolean, default: true }, - assetTab: Boolean + assetTab: Boolean, + loading: Boolean }, data () { return { diff --git a/nezha-fronted/src/components/common/table/settings/agentTable.vue b/nezha-fronted/src/components/common/table/settings/agentTable.vue index 7479e9346..ba5edfc0e 100644 --- a/nezha-fronted/src/components/common/table/settings/agentTable.vue +++ b/nezha-fronted/src/components/common/table/settings/agentTable.vue @@ -69,6 +69,14 @@ + @@ -77,6 +85,9 @@ import table from '@/components/common/mixin/table' import { agent } from '@/components/common/js/constants' export default { name: 'agentTable', + props: { + loading: Boolean + }, mixins: [table], data () { return { diff --git a/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue b/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue index bd165d717..3a7d843bc 100644 --- a/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue +++ b/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue @@ -83,6 +83,14 @@ + @@ -90,6 +98,9 @@ import table from '@/components/common/mixin/table' export default { name: 'asstTypeTable', + props: { + loading: Boolean + }, mixins: [table], data () { return { diff --git a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue index 4730c273e..d8e2312f5 100644 --- a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue +++ b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue @@ -50,6 +50,14 @@ + @@ -60,6 +68,9 @@ export default { name: 'cabinet Table', components: { Template }, mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ diff --git a/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue b/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue index f153177ed..689d58ebb 100644 --- a/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue +++ b/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue @@ -64,6 +64,14 @@ + @@ -73,6 +81,9 @@ import { chart as chartConstant } from '@/components/common/js/constants' export default { name: 'chartTmplTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { chartTypeList: chartConstant.type, diff --git a/nezha-fronted/src/components/common/table/settings/credentialsTable.vue b/nezha-fronted/src/components/common/table/settings/credentialsTable.vue index f386d4afb..be9176525 100644 --- a/nezha-fronted/src/components/common/table/settings/credentialsTable.vue +++ b/nezha-fronted/src/components/common/table/settings/credentialsTable.vue @@ -83,6 +83,14 @@ + @@ -90,6 +98,9 @@ import table from '@/components/common/mixin/table' export default { name: 'credentialsTable', + props: { + loading: Boolean + }, mixins: [table], data () { return { diff --git a/nezha-fronted/src/components/common/table/settings/dcTable.vue b/nezha-fronted/src/components/common/table/settings/dcTable.vue index d498b4ff3..1a3e2b2ca 100644 --- a/nezha-fronted/src/components/common/table/settings/dcTable.vue +++ b/nezha-fronted/src/components/common/table/settings/dcTable.vue @@ -41,14 +41,14 @@ @@ -108,6 +117,9 @@ import { showTableTooltip, hideTableTooltip } from '@/components/common/js/tools export default { name: 'dcTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { regNum: /^[0-9]+.?[0-9]*/, diff --git a/nezha-fronted/src/components/common/table/settings/endpointTable.vue b/nezha-fronted/src/components/common/table/settings/endpointTable.vue index fd9fed998..b0c8b260e 100644 --- a/nezha-fronted/src/components/common/table/settings/endpointTable.vue +++ b/nezha-fronted/src/components/common/table/settings/endpointTable.vue @@ -184,6 +184,14 @@ + @@ -201,7 +209,8 @@ export default { type: Boolean, default: true }, - endpointTab: Boolean + endpointTab: Boolean, + loading: Boolean }, data () { return { diff --git a/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue b/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue index f10aa9b0f..174334a65 100644 --- a/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue +++ b/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue @@ -56,6 +56,14 @@ + @@ -64,6 +72,9 @@ import table from '@/components/common/mixin/table' export default { name: 'exprTmplTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ diff --git a/nezha-fronted/src/components/common/table/settings/menuTable.vue b/nezha-fronted/src/components/common/table/settings/menuTable.vue index c6a85fe26..65397f738 100644 --- a/nezha-fronted/src/components/common/table/settings/menuTable.vue +++ b/nezha-fronted/src/components/common/table/settings/menuTable.vue @@ -72,6 +72,14 @@ + @@ -80,6 +88,9 @@ import table from '@/components/common/mixin/table' export default { name: 'menuTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ // 原table列 diff --git a/nezha-fronted/src/components/common/table/settings/mibTable.vue b/nezha-fronted/src/components/common/table/settings/mibTable.vue index 86a61f954..6bb037308 100644 --- a/nezha-fronted/src/components/common/table/settings/mibTable.vue +++ b/nezha-fronted/src/components/common/table/settings/mibTable.vue @@ -89,6 +89,14 @@ + @@ -98,6 +106,9 @@ import axios from 'axios' export default { name: 'mibTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ diff --git a/nezha-fronted/src/components/common/table/settings/modelTable.vue b/nezha-fronted/src/components/common/table/settings/modelTable.vue index d94edb31f..080fbbb55 100644 --- a/nezha-fronted/src/components/common/table/settings/modelTable.vue +++ b/nezha-fronted/src/components/common/table/settings/modelTable.vue @@ -76,6 +76,14 @@ + @@ -84,6 +92,9 @@ import table from '@/components/common/mixin/table' export default { name: 'modelTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ // 原始table列 diff --git a/nezha-fronted/src/components/common/table/settings/moduleTable.vue b/nezha-fronted/src/components/common/table/settings/moduleTable.vue index 9ff191a59..8f606ec76 100644 --- a/nezha-fronted/src/components/common/table/settings/moduleTable.vue +++ b/nezha-fronted/src/components/common/table/settings/moduleTable.vue @@ -81,6 +81,14 @@ + @@ -89,6 +97,9 @@ import table from '@/components/common/mixin/table' export default { name: 'moduleTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ // 原始table列 diff --git a/nezha-fronted/src/components/common/table/settings/operationLogTable.vue b/nezha-fronted/src/components/common/table/settings/operationLogTable.vue index ebf8c2df4..668288c55 100644 --- a/nezha-fronted/src/components/common/table/settings/operationLogTable.vue +++ b/nezha-fronted/src/components/common/table/settings/operationLogTable.vue @@ -45,6 +45,14 @@ - + @@ -53,6 +61,9 @@ import table from '@/components/common/mixin/table' export default { name: 'operationLog', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ diff --git a/nezha-fronted/src/components/common/table/settings/projectTable.vue b/nezha-fronted/src/components/common/table/settings/projectTable.vue index 68a0d0e33..d5d32693e 100644 --- a/nezha-fronted/src/components/common/table/settings/projectTable.vue +++ b/nezha-fronted/src/components/common/table/settings/projectTable.vue @@ -80,6 +80,14 @@ + @@ -88,6 +96,9 @@ import table from '@/components/common/mixin/table' export default { name: 'projectTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ // 原始table列 diff --git a/nezha-fronted/src/components/common/table/settings/roleTable.vue b/nezha-fronted/src/components/common/table/settings/roleTable.vue index 21a42be97..5fe97534f 100644 --- a/nezha-fronted/src/components/common/table/settings/roleTable.vue +++ b/nezha-fronted/src/components/common/table/settings/roleTable.vue @@ -64,6 +64,14 @@ + @@ -72,6 +80,9 @@ import table from '@/components/common/mixin/table' export default { name: 'roleTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ // 原table列 diff --git a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue index 7714c684b..4833d7cfc 100644 --- a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue +++ b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue @@ -103,6 +103,14 @@ + @@ -116,7 +124,8 @@ export default { props: { nowTime: {}, terminalLogTab: Boolean, - terminalLog: Boolean + terminalLog: Boolean, + loading: Boolean }, data () { return { diff --git a/nezha-fronted/src/components/common/table/settings/userTable.vue b/nezha-fronted/src/components/common/table/settings/userTable.vue index 768ddc47c..ed25b3d1d 100644 --- a/nezha-fronted/src/components/common/table/settings/userTable.vue +++ b/nezha-fronted/src/components/common/table/settings/userTable.vue @@ -54,14 +54,14 @@ {{utcTimeToTimezoneStr(scope.row[item.prop])}} {{utcTimeToTimezoneStr(scope.row[item.prop])}} @@ -93,6 +93,14 @@ + @@ -101,6 +109,9 @@ import table from '@/components/common/mixin/table' export default { name: 'userTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ // 原始table列 @@ -154,7 +165,7 @@ export default { show: true, width: 150 }, { - label: this.$t('config.user.enable'), + label: this.$t('config.user.state'), prop: 'status', show: true, width: 100 diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 82319b138..b86faf1a0 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -52,6 +52,7 @@ + @@ -106,6 +114,9 @@ import { tableCommon } from './systemCommon' import table from '@/components/common/mixin/table' export default { name: 'apiKeyTable', + props: { + loading: Boolean + }, mixins: [table, tableCommon], data () { return { diff --git a/nezha-fronted/src/components/page/config/system/linkTab.vue b/nezha-fronted/src/components/page/config/system/linkTab.vue index 8f18a0666..252d2216f 100644 --- a/nezha-fronted/src/components/page/config/system/linkTab.vue +++ b/nezha-fronted/src/components/page/config/system/linkTab.vue @@ -20,6 +20,7 @@ + @@ -86,6 +94,9 @@ import bus from '../../../../libs/bus' import table from '@/components/common/mixin/table' export default { name: 'linkTable', + props: { + loading: Boolean + }, mixins: [table, tableCommon], data () { return { diff --git a/nezha-fronted/src/components/page/config/system/notifyMethodTab.vue b/nezha-fronted/src/components/page/config/system/notifyMethodTab.vue index 0a674b815..90b99606c 100644 --- a/nezha-fronted/src/components/page/config/system/notifyMethodTab.vue +++ b/nezha-fronted/src/components/page/config/system/notifyMethodTab.vue @@ -21,6 +21,7 @@ + @@ -95,6 +103,9 @@ import table from '@/components/common/mixin/table' import { tableCommon } from './systemCommon' export default { name: 'notifyMethodTable', + props: { + loading: Boolean + }, mixins: [table, tableCommon], data () { return { diff --git a/nezha-fronted/src/components/page/config/terminalLog.vue b/nezha-fronted/src/components/page/config/terminalLog.vue index 6f05825e1..ed4395df0 100644 --- a/nezha-fronted/src/components/page/config/terminalLog.vue +++ b/nezha-fronted/src/components/page/config/terminalLog.vue @@ -12,6 +12,7 @@
-
+
@@ -892,6 +892,7 @@ export default {