diff --git a/components.d.ts b/components.d.ts index ad16d299..ed0d8a1d 100644 --- a/components.d.ts +++ b/components.d.ts @@ -29,23 +29,18 @@ declare module 'vue' { AInputSearch: typeof import('@arco-design/web-vue')['InputSearch']; ALayout: typeof import('@arco-design/web-vue')['Layout']; ALayoutContent: typeof import('@arco-design/web-vue')['LayoutContent']; - ALayoutFooter: typeof import('@arco-design/web-vue')['LayoutFooter']; ALayoutSider: typeof import('@arco-design/web-vue')['LayoutSider']; ALink: typeof import('@arco-design/web-vue')['Link']; - AList: typeof import('@arco-design/web-vue')['List']; - AListItemMeta: typeof import('@arco-design/web-vue')['ListItemMeta']; AMenu: typeof import('@arco-design/web-vue')['Menu']; AMenuItem: typeof import('@arco-design/web-vue')['MenuItem']; AModal: typeof import('@arco-design/web-vue')['Modal']; AOption: typeof import('@arco-design/web-vue')['Option']; APagination: typeof import('@arco-design/web-vue')['Pagination']; AProgress: typeof import('@arco-design/web-vue')['Progress']; - ARangePicker: typeof import('@arco-design/web-vue')['RangePicker']; AResult: typeof import('@arco-design/web-vue')['Result']; ASelect: typeof import('@arco-design/web-vue')['Select']; ASpace: typeof import('@arco-design/web-vue')['Space']; ASpin: typeof import('@arco-design/web-vue')['Spin']; - AStatistic: typeof import('@arco-design/web-vue')['Statistic']; ASubMenu: typeof import('@arco-design/web-vue')['SubMenu']; ASwitch: typeof import('@arco-design/web-vue')['Switch']; ATable: typeof import('@arco-design/web-vue')['Table']; diff --git a/src/locale/en-US/common.ts b/src/locale/en-US/common.ts index b0395bed..9dbabba8 100644 --- a/src/locale/en-US/common.ts +++ b/src/locale/en-US/common.ts @@ -151,8 +151,8 @@ export default { 'common.social.discord': 'Join Our Discord', 'common.table.mark': 'Comment', 'common.table.rollback.mark': 'Rollback Comment', - 'common.button.saveDeploy': 'Save and Deploy', - 'common.button.savePreview': 'Save and Preview', + 'common.button.saveDeploy': 'Save & Deploy', + 'common.button.savePreview': 'Save & Preview', 'common.button.rollbackPreview': 'Rollback Preview', 'common.button.deployPreview': 'Deployment Preview', 'common.button.draft': 'Save Draft', diff --git a/src/views/application-management/services/components/runs/detail-modal/run-logs.vue b/src/views/application-management/services/components/runs/detail-modal/run-logs.vue index dfc54f00..7f1ff459 100644 --- a/src/views/application-management/services/components/runs/detail-modal/run-logs.vue +++ b/src/views/application-management/services/components/runs/detail-modal/run-logs.vue @@ -36,21 +36,10 @@ } return props.fullscreen ? 'calc(100vh - 320px)' : '310px'; }); - watch( - () => props.runData, - (newVal) => { - if (newVal) { - console.log( - 'props.rundata.status=======', - props.runData?.status?.summaryStatus - ); - } - }, - { - immediate: true, - deep: true - } - ); + + const runStatus = computed(() => { + return props.runData?.status?.summaryStatus; + }); const renderStaticLogs = () => { if (props.runData?.record) { @@ -85,7 +74,7 @@ fullscreen={props.fullscreen} runData={props.runData} key={ - props.runData?.status?.summaryStatus === RevisionStatus.Running + runStatus.value === RevisionStatus.Running ? 'running' : 'planning' } @@ -96,7 +85,7 @@ return () => (