Merge pull request #1 from MatthewAden/front-change-for-issue#12217

Frontend changes for #12217.
alibaba · Nov 13, 2024 · d3b6040 · d3b6040
2 parents b10c024 + e91db0c
commit d3b6040
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 22 deletions.
diff --git a/console-ui/src/locales/en-US.js b/console-ui/src/locales/en-US.js
@@ -261,6 +261,9 @@ const I18N_CONF = {
     historyCompareTitle: 'History Compare',
     historyCompareLastVersion: 'Lasted Release Version',
     historyCompareSelectedVersion: 'Selected Version',
+    publishType: 'Publish Type',
+    formal: 'Formal Version',
+    gray: 'Gray Version',
   },
   HistoryDetail: {
     historyDetails: 'History Details',

diff --git a/console-ui/src/locales/zh-CN.js b/console-ui/src/locales/zh-CN.js
@@ -259,6 +259,9 @@ const I18N_CONF = {
     historyCompareTitle: '历史版本比较',
     historyCompareLastVersion: '最新版本',
     historyCompareSelectedVersion: '当前选中版本',
+    publishType: '发布类型',
+    formal: '正式版本',
+    gray: '灰度版本',
   },
   HistoryDetail: {
     historyDetails: '历史详情',

diff --git a/console-ui/src/pages/ConfigurationManagement/ConfigRollback/ConfigRollback.js b/console-ui/src/pages/ConfigurationManagement/ConfigRollback/ConfigRollback.js
@@ -69,6 +69,7 @@ class ConfigRollback extends React.Component {
   toggleMore() {
     this.setState({
       showmore: !this.state.showmore,
+      extraInfo: data.extraInfo ? JSON.parse(data.extraInfo) : {},
     });
   }
 

diff --git a/console-ui/src/pages/ConfigurationManagement/HistoryDetail/HistoryDetail.js b/console-ui/src/pages/ConfigurationManagement/HistoryDetail/HistoryDetail.js
@@ -68,6 +68,9 @@ class HistoryDetail extends React.Component {
       success(result) {
         if (result != null) {
           const data = result;
+          const extInfo = data.extInfo ? JSON.parse(data.extInfo) : {};
+          const grayRule = extInfo.gray_rule ? JSON.parse(extInfo.gray_rule) : {};
+
           self.field.setValue('dataId', data.dataId);
           self.field.setValue('content', data.content);
           self.field.setValue('appName', self.inApp ? self.edasAppName : data.appName);
@@ -80,8 +83,8 @@ class HistoryDetail extends React.Component {
           self.setState({
             currentPublishType: data.publishType,
             ...(data.publishType === 'gray' && {
-              grayVersion: JSON.parse(data.extraInfo || '{}').version || '',
-              grayRule: JSON.parse(data.extraInfo || '{}').expr || '',
+              grayVersion: grayRule.version || '',
+              grayRule: grayRule.expr || '',
             }),
           });
         }

diff --git a/console/src/main/resources/static/console-ui/public/js/main.js b/console/src/main/resources/static/console-ui/public/js/main.js
diff --git a/console/src/main/resources/static/index.html b/console/src/main/resources/static/index.html
@@ -35,7 +35,7 @@
 	<link rel="stylesheet" type="text/css" href="console-ui/public/css/icon.css">
 	<link rel="stylesheet" type="text/css" href="console-ui/public/css/font-awesome.css">
 	<!-- 第三方css结束 -->
-<link href="./css/main.css?e0e49a29a07457c6b302" rel="stylesheet"></head>
+<link href="./css/main.css?21f06ce60fe9f44ca3ca" rel="stylesheet"></head>
 
 <body>
 	<div id="root" style="overflow:hidden"></div>
@@ -56,6 +56,6 @@
 	<script src="console-ui/public/js/merge.js"></script>
 	<script src="console-ui/public/js/loader.js"></script>
 	<!-- 第三方js结束 -->
-<script type="text/javascript" src="./js/main.js?e0e49a29a07457c6b302"></script></body>
+<script type="text/javascript" src="./js/main.js?21f06ce60fe9f44ca3ca"></script></body>
 
 </html>
diff --git a/console/src/main/resources/static/js/main.js b/console/src/main/resources/static/js/main.js