From 10bd5d8d5cc178fba5368c998ea8fb18c9918724 Mon Sep 17 00:00:00 2001 From: tikkhun Date: Fri, 19 Dec 2025 17:18:56 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整 typings.d.ts 中的枚举值缩进 - 修复 package.json 文件末尾换行符 - 统一 Order/List 组件中的代码缩进和格式 --- package.json | 2 +- src/pages/Order/List/index.tsx | 472 ++++++++++++++++----------------- src/servers/api/typings.d.ts | 138 +++++----- 3 files changed, 306 insertions(+), 306 deletions(-) diff --git a/package.json b/package.json index 7ceb5ad..58e91ac 100644 --- a/package.json +++ b/package.json @@ -47,4 +47,4 @@ "prettier-plugin-packagejson": "^2.4.3", "typescript": "^5.7.3" } -} +} \ No newline at end of file diff --git a/src/pages/Order/List/index.tsx b/src/pages/Order/List/index.tsx index 05e8426..6c3b0f9 100644 --- a/src/pages/Order/List/index.tsx +++ b/src/pages/Order/List/index.tsx @@ -437,8 +437,8 @@ const ListPage: React.FC = () => { }, }, ]; - const [selectedRowKeys, setSelectedRowKeys] = useState([]); - + const [selectedRowKeys, setSelectedRowKeys] = useState([]); + return ( @@ -449,11 +449,11 @@ const ListPage: React.FC = () => { actionRef={actionRef} rowKey="id" columns={columns} - rowSelection={{ + rowSelection={{ selectedRowKeys, onChange: (keys) => setSelectedRowKeys(keys), }} - + rowClassName={(record) => { return record.id === activeLine ? styles['selected-line-order-protable'] @@ -482,41 +482,41 @@ const ListPage: React.FC = () => { }} tableRef={actionRef} />, - // , - { + // , + { - try { - const { success, message: errMsg } = - await ordercontrollerExportorder({ - ids: selectedRowKeys, - }); - if (!success) { - throw new Error(errMsg); - } - message.success('导出成功'); - actionRef.current?.reload(); - setSelectedRowKeys([]); - } catch (error: any) { - message.error(error?.message || '导出失败'); - } + try { + const { success, message: errMsg } = + await ordercontrollerExportorder({ + ids: selectedRowKeys, + }); + if (!success) { + throw new Error(errMsg); + } + message.success('导出成功'); + actionRef.current?.reload(); + setSelectedRowKeys([]); + } catch (error: any) { + message.error(error?.message || '导出失败'); + } - - }} - > - - + + }} + > + + ]} request={async ({ date, ...param }: any) => { if (param.status === 'all') { @@ -605,33 +605,33 @@ const Detail: React.FC<{ ) ? [] : [ - , - , - ]), + const { success, message: errMsg } = + await ordercontrollerSyncorderbyid({ + siteId: record.siteId, + orderId: record.externalOrderId, + }); + if (!success) { + throw new Error(errMsg); + } + message.success('同步成功'); + tableRef.current?.reload(); + } catch (error: any) { + message.error(error?.message || '同步失败'); + } + }} + > + 同步订单 + , + ]), // ...(['processing', 'pending_reshipment'].includes(record.orderStatus) // ? [ // , @@ -650,152 +650,152 @@ const Detail: React.FC<{ 'pending_refund', ].includes(record.orderStatus) ? [ - , - { - try { - if (!record.id) { - message.error('订单ID不存在'); - return; - } - const { success, message: errMsg } = - await ordercontrollerChangestatus( - { - id: record.id, - }, - { - status: 'after_sale_pending', - }, - ); - if (!success) { - throw new Error(errMsg); - } - tableRef.current?.reload(); - } catch (error: any) { - message.error(error.message); + , + { + try { + if (!record.id) { + message.error('订单ID不存在'); + return; } - }} - > - - , - ] + const { success, message: errMsg } = + await ordercontrollerChangestatus( + { + id: record.id, + }, + { + status: 'after_sale_pending', + }, + ); + if (!success) { + throw new Error(errMsg); + } + tableRef.current?.reload(); + } catch (error: any) { + message.error(error.message); + } + }} + > + + , + ] : []), ...(record.orderStatus === 'after_sale_pending' ? [ - , - { - try { - if (!record.id) { - message.error('订单ID不存在'); - return; - } - const { success, message: errMsg } = - await ordercontrollerCancelorder({ + , + { + try { + if (!record.id) { + message.error('订单ID不存在'); + return; + } + const { success, message: errMsg } = + await ordercontrollerCancelorder({ + id: record.id, + }); + if (!success) { + throw new Error(errMsg); + } + tableRef.current?.reload(); + } catch (error: any) { + message.error(error.message); + } + }} + > + + , + , + { + try { + if (!record.id) { + message.error('订单ID不存在'); + return; + } + const { success, message: errMsg } = + await ordercontrollerRefundorder({ + id: record.id, + }); + if (!success) { + throw new Error(errMsg); + } + tableRef.current?.reload(); + } catch (error: any) { + message.error(error.message); + } + }} + > + + , + , + { + try { + if (!record.id) { + message.error('订单ID不存在'); + return; + } + const { success, message: errMsg } = + await ordercontrollerCompletedorder({ + id: record.id, + }); + if (!success) { + throw new Error(errMsg); + } + tableRef.current?.reload(); + } catch (error: any) { + message.error(error.message); + } + }} + > + + , + , + { + try { + const { success, message: errMsg } = + await ordercontrollerChangestatus( + { id: record.id, - }); - if (!success) { - throw new Error(errMsg); - } - tableRef.current?.reload(); - } catch (error: any) { - message.error(error.message); + }, + { + status: 'pending_reshipment', + }, + ); + if (!success) { + throw new Error(errMsg); } - }} - > - - , - , - { - try { - if (!record.id) { - message.error('订单ID不存在'); - return; - } - const { success, message: errMsg } = - await ordercontrollerRefundorder({ - id: record.id, - }); - if (!success) { - throw new Error(errMsg); - } - tableRef.current?.reload(); - } catch (error: any) { - message.error(error.message); - } - }} - > - - , - , - { - try { - if (!record.id) { - message.error('订单ID不存在'); - return; - } - const { success, message: errMsg } = - await ordercontrollerCompletedorder({ - id: record.id, - }); - if (!success) { - throw new Error(errMsg); - } - tableRef.current?.reload(); - } catch (error: any) { - message.error(error.message); - } - }} - > - - , - , - { - try { - const { success, message: errMsg } = - await ordercontrollerChangestatus( - { - id: record.id, - }, - { - status: 'pending_reshipment', - }, - ); - if (!success) { - throw new Error(errMsg); - } - tableRef.current?.reload(); - } catch (error: any) { - message.error(error.message); - } - }} - > - - , - ] + tableRef.current?.reload(); + } catch (error: any) { + message.error(error.message); + } + }} + > + + , + ] : []), ]} > @@ -1057,31 +1057,31 @@ const Detail: React.FC<{ } actions={ v.state === 'waiting-for-scheduling' || - v.state === 'waiting-for-transit' + v.state === 'waiting-for-transit' ? [ - { - try { - const { success, message: errMsg } = - await logisticscontrollerDelshipment({ - id: v.id, - }); - if (!success) { - throw new Error(errMsg); - } - tableRef.current?.reload(); - initRequest(); - } catch (error: any) { - message.error(error.message); + { + try { + const { success, message: errMsg } = + await logisticscontrollerDelshipment({ + id: v.id, + }); + if (!success) { + throw new Error(errMsg); } - }} - > - - 取消运单 - , - ] + tableRef.current?.reload(); + initRequest(); + } catch (error: any) { + message.error(error.message); + } + }} + > + + 取消运单 + , + ] : [] } > @@ -1469,16 +1469,16 @@ const Shipping: React.FC<{ - // value && value.length > 0 - // ? Promise.resolve() - // : Promise.reject('至少需要一个商品'), - // }, - // ]} + // rules={[ + // { + // required: true, + // message: '至少需要一个商品', + // validator: (_, value) => + // value && value.length > 0 + // ? Promise.resolve() + // : Promise.reject('至少需要一个商品'), + // }, + // ]} > diff --git a/src/servers/api/typings.d.ts b/src/servers/api/typings.d.ts index 76d434d..c142502 100644 --- a/src/servers/api/typings.d.ts +++ b/src/servers/api/typings.d.ts @@ -85,14 +85,14 @@ declare namespace API { tags?: string[]; /** 状态 */ status?: - | 'publish' - | 'draft' - | 'pending' - | 'private' - | 'trash' - | 'auto-draft' - | 'future' - | 'inherit'; + | 'publish' + | 'draft' + | 'pending' + | 'private' + | 'trash' + | 'auto-draft' + | 'future' + | 'inherit'; }; type BatchUpdateTagsDTO = { @@ -488,7 +488,7 @@ declare namespace API { orderId: number; }; - type ordercontrollerExportorderParams = { + type ordercontrollerExportorderParams = { ids: number[]; }; @@ -544,18 +544,18 @@ declare namespace API { startDate?: string; endDate?: string; status?: - | 'pending' - | 'processing' - | 'completed' - | 'cancelled' - | 'refunded' - | 'failed' - | 'after_sale_pending' - | 'pending_reshipment' - | 'pending_refund' - | 'return-requested' - | 'return-approved' - | 'return-cancelled'; + | 'pending' + | 'processing' + | 'completed' + | 'cancelled' + | 'refunded' + | 'failed' + | 'after_sale_pending' + | 'pending_reshipment' + | 'pending_refund' + | 'return-requested' + | 'return-approved' + | 'return-cancelled'; payment_method?: string; /** 仅订阅订单(父订阅订单或包含订阅商品) */ isSubscriptionOnly?: boolean; @@ -1160,18 +1160,18 @@ declare namespace API { startDate?: string; endDate?: string; status?: - | 'pending' - | 'processing' - | 'completed' - | 'cancelled' - | 'refunded' - | 'failed' - | 'after_sale_pending' - | 'pending_reshipment' - | 'pending_refund' - | 'return-requested' - | 'return-approved' - | 'return-cancelled'; + | 'pending' + | 'processing' + | 'completed' + | 'cancelled' + | 'refunded' + | 'failed' + | 'after_sale_pending' + | 'pending_reshipment' + | 'pending_refund' + | 'return-requested' + | 'return-approved' + | 'return-cancelled'; payment_method?: string; /** 仅订阅订单(父订阅订单或包含订阅商品) */ isSubscriptionOnly?: boolean; @@ -1282,12 +1282,12 @@ declare namespace API { siteId?: string; /** 订阅状态 */ status?: - | 'active' - | 'pending' - | 'on-hold' - | 'cancelled' - | 'expired' - | 'pending-cancel'; + | 'active' + | 'pending' + | 'on-hold' + | 'cancelled' + | 'expired' + | 'pending-cancel'; /** 客户邮箱 */ customer_email?: string; /** 关键字(订阅ID,邮箱等) */ @@ -1305,14 +1305,14 @@ declare namespace API { siteId?: string; /** 产品状态 */ status?: - | 'publish' - | 'draft' - | 'pending' - | 'private' - | 'trash' - | 'auto-draft' - | 'future' - | 'inherit'; + | 'publish' + | 'draft' + | 'pending' + | 'private' + | 'trash' + | 'auto-draft' + | 'future' + | 'inherit'; /** SKU列表 */ skus?: any[]; }; @@ -2183,12 +2183,12 @@ declare namespace API { siteId?: string; /** 订阅状态 */ status?: - | 'active' - | 'pending' - | 'on-hold' - | 'cancelled' - | 'expired' - | 'pending-cancel'; + | 'active' + | 'pending' + | 'on-hold' + | 'cancelled' + | 'expired' + | 'pending-cancel'; /** 客户邮箱 */ customer_email?: string; /** 关键字(订阅ID,邮箱等) */ @@ -2848,14 +2848,14 @@ declare namespace API { siteId?: string; /** 产品状态 */ status?: - | 'publish' - | 'draft' - | 'pending' - | 'private' - | 'trash' - | 'auto-draft' - | 'future' - | 'inherit'; + | 'publish' + | 'draft' + | 'pending' + | 'private' + | 'trash' + | 'auto-draft' + | 'future' + | 'inherit'; /** SKU列表 */ skus?: any[]; }; @@ -2906,14 +2906,14 @@ declare namespace API { name: string; /** 产品状态 */ status?: - | 'publish' - | 'draft' - | 'pending' - | 'private' - | 'trash' - | 'auto-draft' - | 'future' - | 'inherit'; + | 'publish' + | 'draft' + | 'pending' + | 'private' + | 'trash' + | 'auto-draft' + | 'future' + | 'inherit'; /** 是否为特色产品 */ featured?: boolean; /** 目录可见性 */