From 58f01d86f76d6b3c9bd820eeb0debb51dce4cb17 Mon Sep 17 00:00:00 2001
From: Xc <chinawraith@163.com>
Date: Thu, 13 Feb 2025 11:56:47 +0800
Subject: [PATCH] =?UTF-8?q?payDetail=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E4=B8=80=E4=B8=AAdisableClose=E7=9A=84=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 es/components/pay/detail/index.d.ts           |   1 +
 es/components/pay/detail/index.js             |   5 +-
 .../pay/detail/web.mobile.module.less         |   1 +
 es/components/pay/detail/web.pc.js            |   2 +-
 es/components/pay/detail/web.pc.module.less   |   4 +
 src/components/pay/detail/index.ts            |   5 +-
 .../pay/detail/web.mobile.module.less         |   1 +
 src/components/pay/detail/web.pc.module.less  |   4 +
 src/components/pay/detail/web.pc.tsx          | 104 +++++++++---------
 9 files changed, 72 insertions(+), 55 deletions(-)

diff --git a/es/components/pay/detail/index.d.ts b/es/components/pay/detail/index.d.ts
index 1c7c7971..1a602cd0 100644
--- a/es/components/pay/detail/index.d.ts
+++ b/es/components/pay/detail/index.d.ts
@@ -11,5 +11,6 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps<
     closeWhenFailure: boolean;
     mode: "frontend" | "backend";
     autoSuccessAt: boolean;
+    disableClose: boolean;
 }>) => React.ReactElement;
 export default _default;
diff --git a/es/components/pay/detail/index.js b/es/components/pay/detail/index.js
index 2564d593..6cbf380e 100644
--- a/es/components/pay/detail/index.js
+++ b/es/components/pay/detail/index.js
@@ -119,6 +119,7 @@ export default OakComponent({
         closeWhenFailure: false,
         mode: 'frontend',
         autoSuccessAt: true,
+        disableClose: false,
     },
     data: {
         showCloseConfirmMp: false,
@@ -126,7 +127,7 @@ export default OakComponent({
         unsub: undefined,
         unsubShip: undefined,
     },
-    formData({ data }) {
+    formData({ data, props }) {
         const application = this.features.application.getApplication();
         const iState = data?.iState;
         let iStateStr = this.t(`pay:v.iState.${iState}`);
@@ -163,7 +164,7 @@ export default OakComponent({
             pay: data,
             application,
             iStateColor,
-            closable: !!(data?.["#oakLegalActions"]?.includes('close')),
+            closable: !props.disableClose && !!(data?.["#oakLegalActions"]?.includes('close')),
             startPayable,
             succeedable,
             offline,
diff --git a/es/components/pay/detail/web.mobile.module.less b/es/components/pay/detail/web.mobile.module.less
index 1fba21db..608397a3 100644
--- a/es/components/pay/detail/web.mobile.module.less
+++ b/es/components/pay/detail/web.mobile.module.less
@@ -3,6 +3,7 @@
     align-items: stretch;
     flex-direction: column;
     height: 100%;
+    min-width: 100%;
 }
 
 .meta {
diff --git a/es/components/pay/detail/web.pc.js b/es/components/pay/detail/web.pc.js
index f02d7577..268967c9 100644
--- a/es/components/pay/detail/web.pc.js
+++ b/es/components/pay/detail/web.pc.js
@@ -195,7 +195,7 @@ export default function Render(props) {
             }
         }
         return (<>
-                <Card title={t('title')} extra={<Space>
+                <Card className={Styles.card} title={t('title')} extra={<Space>
                             {succeedable ? <Button type="primary" onClick={() => {
                         if (autoSuccessAt) {
                             succeed(Date.now());
diff --git a/es/components/pay/detail/web.pc.module.less b/es/components/pay/detail/web.pc.module.less
index bfc35357..06c856fe 100644
--- a/es/components/pay/detail/web.pc.module.less
+++ b/es/components/pay/detail/web.pc.module.less
@@ -1,3 +1,7 @@
+.card {
+    min-width: 100%;
+}
+
 .container {
     display: flex;
     align-items: center;
diff --git a/src/components/pay/detail/index.ts b/src/components/pay/detail/index.ts
index 0e9d4aa7..9ef52fcd 100644
--- a/src/components/pay/detail/index.ts
+++ b/src/components/pay/detail/index.ts
@@ -140,6 +140,7 @@ export default OakComponent({
         closeWhenFailure: false,
         mode: 'frontend' as 'frontend' | 'backend',
         autoSuccessAt: true,
+        disableClose: false,
     },
     data: {
         showCloseConfirmMp: false,
@@ -147,7 +148,7 @@ export default OakComponent({
         unsub: undefined as undefined | (() => void),
         unsubShip: undefined as undefined | (() => void),
     },
-    formData({ data }) {
+    formData({ data, props }) {
         const application = this.features.application.getApplication();
         const iState = data?.iState;
         let iStateStr = this.t(`pay:v.iState.${iState}`);
@@ -193,7 +194,7 @@ export default OakComponent({
             pay: data,
             application,
             iStateColor,
-            closable: !!(data?.["#oakLegalActions"]?.includes('close')),
+            closable: !props.disableClose && !!(data?.["#oakLegalActions"]?.includes('close')),
             startPayable,
             succeedable,
             offline,
diff --git a/src/components/pay/detail/web.mobile.module.less b/src/components/pay/detail/web.mobile.module.less
index 1fba21db..608397a3 100644
--- a/src/components/pay/detail/web.mobile.module.less
+++ b/src/components/pay/detail/web.mobile.module.less
@@ -3,6 +3,7 @@
     align-items: stretch;
     flex-direction: column;
     height: 100%;
+    min-width: 100%;
 }
 
 .meta {
diff --git a/src/components/pay/detail/web.pc.module.less b/src/components/pay/detail/web.pc.module.less
index bfc35357..06c856fe 100644
--- a/src/components/pay/detail/web.pc.module.less
+++ b/src/components/pay/detail/web.pc.module.less
@@ -1,3 +1,7 @@
+.card {
+    min-width: 100%;
+}
+
 .container {
     display: flex;
     align-items: center;
diff --git a/src/components/pay/detail/web.pc.tsx b/src/components/pay/detail/web.pc.tsx
index 08176a48..ed62f848 100644
--- a/src/components/pay/detail/web.pc.tsx
+++ b/src/components/pay/detail/web.pc.tsx
@@ -319,7 +319,25 @@ export default function Render(props: WebComponentProps<EntityDict, 'pay', false
         const { iState, price, entity } = pay;
 
         const BtnPart2: React.ReactElement[] = [];
-        if (startPayable) {
+
+        if (succeedable) {
+            BtnPart2.push(
+                <Button
+                    type="primary"
+                    onClick={() => {
+                        if (autoSuccessAt) {
+                            succeed(Date.now());
+                        }
+                        else {
+                            setShowSa(true);
+                        }
+                    }}
+                >
+                    {t('pay:action.succeedPaying')}
+                </Button>
+            );
+        }
+        else if (startPayable) {
             BtnPart2.push(
                 <Button
                     style={{ backgroundColor: '#04BE02' }}
@@ -345,63 +363,49 @@ export default function Render(props: WebComponentProps<EntityDict, 'pay', false
                 </Button>
             );
         }
-        else {
-            if (closable) {
-                BtnPart2.push(
-                    <Button
-                        danger
-                        onClick={() => {
-                            Modal.confirm({
-                                title: t('cc.title'),
-                                content: t('cc.content'),
-                                onOk: async () => {
-                                    await execute('close');
-                                    onClose();
-                                },
-                                okText: t('common::confirm'),
-                                cancelText: t('common::action.cancel'),
-                            });
-                        }}
-                    >
-                        {t('pay:action.close')}
-                    </Button>
-                );
-            }
-            if (goBackable) {
-                BtnPart2.push(
-                    <Button
-                        type="link"
-                        onClick={goBack}
-                    >
-                        {t('common::back')}
-                    </Button>
-                );
-            }
+
+        if (closable) {
+            BtnPart2.push(
+                <Button
+                    danger
+                    onClick={() => {
+                        Modal.confirm({
+                            title: t('cc.title'),
+                            content: t('cc.content'),
+                            onOk: async () => {
+                                await execute('close');
+                                onClose();
+                            },
+                            okText: t('common::confirm'),
+                            cancelText: t('common::action.cancel'),
+                        });
+                    }}
+                >
+                    {t('pay:action.close')}
+                </Button>
+            );
+        }
+        if (goBackable) {
+            BtnPart2.push(
+                <Button
+                    type="link"
+                    onClick={goBack}
+                >
+                    {t('common::back')}
+                </Button>
+            );
         }
 
         return (
             <>
                 <Card
+                    className={Styles.card}
                     title={t('title')}
                     extra={
                         <Space>
-                            {
-                                succeedable ? <Button
-                                    type="primary"
-                                    onClick={() => {
-                                        if (autoSuccessAt) {
-                                            succeed(Date.now());
-                                        }
-                                        else {
-                                            setShowSa(true);
-                                        }
-                                    }}
-                                >
-                                    {t('pay:action.succeedPaying')}
-                                </Button> : <Tag color={iStateColor}>
-                                    {t(`pay:v.iState.${iState}`)}
-                                </Tag>
-                            }
+                            <Tag color={iStateColor}>
+                                {t(`pay:v.iState.${iState}`)}
+                            </Tag>
                         </Space>
                     }
                 >