style: flex end

DTStack · Dec 8, 2023 · 7111c84 · 7111c84
1 parent b26c427
commit 7111c84
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 17 deletions.
diff --git a/src/modules/devops/services/devops.service.ts b/src/modules/devops/services/devops.service.ts
@@ -59,7 +59,11 @@ export class DevopsService {
 
         let loginUrl = '';
         // v4.x、v5.x 版本的数栈
-        if (portalfront.includes('base4') || portalfront.includes('base5')) {
+        if (
+            portalfront.includes('base4') ||
+            portalfront.includes('base5') ||
+            portalfront.includes('beta5')
+        ) {
             loginUrl = str.split('uicfront:')?.[1]?.replace(/\n/g, '');
         } else {
             // v6.x 及以上版本的数栈

diff --git a/src/utils/dingtalkRobot.ts b/src/utils/dingtalkRobot.ts
@@ -34,13 +34,13 @@ class DingtalkRobot {
                 isAtAll: false,
             };
             await robot.markdown(
-                `${process.env.NODE_ENV === 'staging' ? '【测试】' : ''}${title}`,
+                `${process.env.NODE_ENV === 'staging' ? '【测试服】' : ''}${title}`,
                 text,
                 at
             );
             console.log(
                 `${
-                    process.env.NODE_ENV === 'staging' ? '【测试】' : ''
+                    process.env.NODE_ENV === 'staging' ? '【测试服】' : ''
                 }taskId: ${taskId}, ${title}已发送`
             );
         } catch (error) {

diff --git a/website/src/views/home/components/versionModal/index.tsx b/website/src/views/home/components/versionModal/index.tsx
@@ -147,17 +147,15 @@ export default function VersionModal(props: IProps) {
     const footerRender = () => {
         return (
             <div className="footer-btn">
-                <div className="btn-box">
-                    {isEdit && yiceRole === YICE_ROLE.ADMIN ? (
-                        <Button danger onClick={handleDelete}>
-                            删除
-                        </Button>
-                    ) : null}
-                    <Button onClick={onCancel}>取消</Button>
-                    <Button type="primary" loading={saving || formLoading} onClick={handleOk}>
-                        确定
+                {isEdit && yiceRole === YICE_ROLE.ADMIN ? (
+                    <Button danger onClick={handleDelete}>
+                        删除
                     </Button>
-                </div>
+                ) : null}
+                <Button onClick={onCancel}>取消</Button>
+                <Button type="primary" loading={saving || formLoading} onClick={handleOk}>
+                    确定
+                </Button>
             </div>
         );
     };

diff --git a/website/src/views/home/components/versionModal/style.less b/website/src/views/home/components/versionModal/style.less
@@ -1,6 +1,4 @@
 .footer-btn {
     display: flex;
-    .btn-box {
-        flex: 1;
-    }
+    justify-content: flex-end;
 }
diff --git a/website/src/views/home/components/versions/style.less b/website/src/views/home/components/versions/style.less
@@ -26,6 +26,8 @@
         }
         .btn-box {
             min-width: 208px;
+            display: flex;
+            justify-content: flex-end;
             .ant-btn {
                 margin-left: 12px;
                 &:first-child {

diff --git a/website/src/views/home/index.tsx b/website/src/views/home/index.tsx
@@ -132,7 +132,7 @@ function Home() {
                 <div className="logo-box">
                     <img src={getImgUrl('', '/logo.png')} alt="" onClick={handleClick} />
                     <div>
-                        {process.env.NODE_ENV === 'staging' ? '【测试】' : ''}易测性能检测平台
+                        {process.env.NODE_ENV === 'staging' ? '【测试服】' : ''}易测性能检测平台
                     </div>
                 </div>
                 <Search