From 093089dc26aff5947fcb7d99f2efd04a1179e251 Mon Sep 17 00:00:00 2001 From: rainbond Date: Fri, 3 Apr 2026 18:55:00 +0800 Subject: [PATCH] fix: Remove redundant processes --- src/components/SlidePanel/components/app.js | 2 +- src/pages/AppVersion/index.js | 89 +++++++++++---------- 2 files changed, 49 insertions(+), 42 deletions(-) diff --git a/src/components/SlidePanel/components/app.js b/src/components/SlidePanel/components/app.js index f2594f6ed..00f1a13bb 100644 --- a/src/components/SlidePanel/components/app.js +++ b/src/components/SlidePanel/components/app.js @@ -864,7 +864,7 @@ export default class app extends Component { handleJump = target => { const { dispatch } = this.props; const path = target === 'upgrade' - ? `/team/${globalUtil.getCurrTeamName()}/region/${globalUtil.getCurrRegionName()}/apps/${globalUtil.getAppID()}/version?panel=source-upgrade` + ? `/team/${globalUtil.getCurrTeamName()}/region/${globalUtil.getCurrRegionName()}/apps/${globalUtil.getAppID()}/version` : `/team/${globalUtil.getCurrTeamName()}/region/${globalUtil.getCurrRegionName()}/apps/${globalUtil.getAppID()}/${target}`; dispatch( routerRedux.push(path) diff --git a/src/pages/AppVersion/index.js b/src/pages/AppVersion/index.js index 5a22a4eed..457d4f130 100644 --- a/src/pages/AppVersion/index.js +++ b/src/pages/AppVersion/index.js @@ -1723,7 +1723,7 @@ export default class AppVersion extends PureComponent { ) : null} {(!component.field_changes || component.field_changes.length === 0) && - (!component.other_changes || component.other_changes.length === 0) ? ( + (!component.other_changes || component.other_changes.length === 0) ? (
当前没有可展开的配置变化。
) : null} @@ -2114,9 +2114,9 @@ export default class AppVersion extends PureComponent { versions_info: versions.length > 0 ? versions.map(version => ({ - ...(record && record.app_version_info ? record.app_version_info : {}), - version - })) + ...(record && record.app_version_info ? record.app_version_info : {}), + version + })) : [], app_id: record && record.app_model_id }; @@ -2351,20 +2351,20 @@ export default class AppVersion extends PureComponent { const latestNode = hasUpgradeVersion ? { - id: `${template.id}-latest`, - title: `${template.templateName} ${template.latestVersion}`, - subTitle: template.marketName - ? `${template.marketName} / 待升级版本` - : '待升级版本', - createTime: this.state.appDetail.update_time || this.state.appDetail.create_time, - description: `上游检测到新版本 ${template.latestVersion},可以从当前安装版本继续升级。`, - detail: { - ...template, - currentVersion: template.latestVersion - }, - timelineState: 'upgrade', - isCurrent: false - } + id: `${template.id}-latest`, + title: `${template.templateName} ${template.latestVersion}`, + subTitle: template.marketName + ? `${template.marketName} / 待升级版本` + : '待升级版本', + createTime: this.state.appDetail.update_time || this.state.appDetail.create_time, + description: `上游检测到新版本 ${template.latestVersion},可以从当前安装版本继续升级。`, + detail: { + ...template, + currentVersion: template.latestVersion + }, + timelineState: 'upgrade', + isCurrent: false + } : null; const currentNode = { @@ -2569,10 +2569,10 @@ export default class AppVersion extends PureComponent { item.timelineState === 'runtime' ? styles.timelineDotRuntime : item.timelineState === 'upgrade' - ? styles.timelineDotUpgrade - : item.timelineState === 'current' - ? styles.timelineDotCurrent - : styles.timelineDotHistory + ? styles.timelineDotUpgrade + : item.timelineState === 'current' + ? styles.timelineDotCurrent + : styles.timelineDotHistory } /> } @@ -2580,29 +2580,27 @@ export default class AppVersion extends PureComponent { >
{item.timelineState === 'runtime' ? '当前状态' @@ -2610,7 +2608,7 @@ export default class AppVersion extends PureComponent { ? '当前版本' : item.timelineState === 'upgrade' ? '升级版本' - : '历史版本'} + : '历史版本'}
@@ -3071,10 +3069,9 @@ export default class AppVersion extends PureComponent { pagination={false} className={styles.templateTable} rowClassName={record => - `${styles.rollbackRecordRow} ${ - `${selectedRollbackRecordId}` === `${record.ID || record.id}` - ? styles.rollbackRecordActive - : '' + `${styles.rollbackRecordRow} ${`${selectedRollbackRecordId}` === `${record.ID || record.id}` + ? styles.rollbackRecordActive + : '' }` } onRow={record => ({ @@ -3200,6 +3197,16 @@ export default class AppVersion extends PureComponent { { appName: this.getAppName() } )} titleSvg={pageheaderSvg.getPageHeaderSvg('upgrade', 18)} + extraContent={ + + } >
{this.state.loading ? (