From 22ccb83a460daddc616879271e94cb26fb6bf0d4 Mon Sep 17 00:00:00 2001 From: wkj <278599135@.com> Date: Wed, 7 Jan 2026 14:19:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E7=BC=96=E8=AF=91=E5=99=A8?= =?UTF-8?q?=E6=94=AF=E6=8C=81i18n=E6=A3=80=E6=9F=A5=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=83=A8=E5=88=86i18n=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/checkers/pay.js | 2 +- es/components/apAccount/config/web.pc.js | 1 + es/components/apAccount/upsert/web.pc.js | 1 + es/components/apProduct/config/web.pc.js | 5 ++++- es/components/apProduct/upsert/web.pc.js | 1 + es/components/offlineAccount/config/web.pc.js | 6 +++++- es/components/offlineAccount/upsert/web.pc.js | 9 +++++++-- es/components/order/pay/web.js | 4 +++- es/components/order/pay/web.pc.js | 4 +++- es/components/pay/detail/web.js | 1 + es/components/pay/detail/web.pc.js | 4 +++- es/components/pay/list/web.pc.js | 1 + es/components/payConfig/system/web.pc.js | 1 + es/components/refund/list/web.pc.js | 1 + es/components/sysAccount/survey/web.pc.js | 7 ++++++- es/components/wpAccount/config/web.pc.js | 5 ++++- es/components/wpProduct/config/web.pc.js | 5 ++++- es/components/wpProduct/upsert/web.pc.js | 4 +++- src/components/apAccount/config/web.pc.tsx | 1 + src/components/apAccount/upsert/web.pc.tsx | 1 + src/components/apProduct/config/web.pc.tsx | 2 ++ src/components/apProduct/upsert/web.pc.tsx | 1 + src/components/offlineAccount/config/web.pc.tsx | 4 +++- src/components/offlineAccount/upsert/web.pc.tsx | 3 +++ src/components/order/pay/web.pc.tsx | 1 + src/components/order/pay/web.tsx | 1 + src/components/pay/detail/web.pc.tsx | 1 + src/components/pay/detail/web.tsx | 2 +- src/components/pay/list/web.pc.tsx | 1 + src/components/payConfig/system/web.pc.tsx | 1 + src/components/refund/list/web.pc.tsx | 1 + src/components/sysAccount/survey/web.pc.tsx | 6 +++++- src/components/wpAccount/config/web.pc.tsx | 2 ++ src/components/wpProduct/config/web.pc.tsx | 2 ++ src/components/wpProduct/upsert/web.pc.tsx | 1 + 35 files changed, 78 insertions(+), 15 deletions(-) diff --git a/es/checkers/pay.js b/es/checkers/pay.js index 29ddf22b..b9cf7065 100644 --- a/es/checkers/pay.js +++ b/es/checkers/pay.js @@ -46,7 +46,7 @@ const checkers = [ const { orderId, price } = data; data.refundable = false; if (orderId) { - // 所有已经支付和正在支付的pay之和不能超过订单总和 + // @oak-ignore 所有已经支付和正在支付的pay之和不能超过订单总和 const order = context.select('order', { data: { id: 1, diff --git a/es/components/apAccount/config/web.pc.js b/es/components/apAccount/config/web.pc.js index c4927e70..8e27a748 100644 --- a/es/components/apAccount/config/web.pc.js +++ b/es/components/apAccount/config/web.pc.js @@ -51,6 +51,7 @@ export default function render(props) { const { accounts, oakFullpath, oakExecutable, canCreate, systemId } = props.data; const { t, addItem, execute, clean } = props.methods; const getNotNullMessage = (entity, attr) => { + // @oak-ignore return t('notnull', { value: t(`${entity}:attr.${attr}`) }); }; const errMsg = oakExecutable instanceof OakException && (oakExecutable instanceof OakAttrNotNullException ? getNotNullMessage(oakExecutable.getEntity(), oakExecutable.getAttributes()[0]) : t(oakExecutable.message)); diff --git a/es/components/apAccount/upsert/web.pc.js b/es/components/apAccount/upsert/web.pc.js index 4e1178a7..da5c4ab1 100644 --- a/es/components/apAccount/upsert/web.pc.js +++ b/es/components/apAccount/upsert/web.pc.js @@ -6,6 +6,7 @@ export default function render(props) { const { apAccount, aliPay, oakFullpath, systemId } = props.data; const { t, update } = props.methods; if (apAccount) { + // @oak-ignore return (
{(!aliPay || aliPay.$$createAt$$ === 1) && } {(apAccount.aliPayId && apAccount?.$$createAt$$ !== 1) && } diff --git a/es/components/apProduct/config/web.pc.js b/es/components/apProduct/config/web.pc.js index 5b9aca1d..fbc60b9f 100644 --- a/es/components/apProduct/config/web.pc.js +++ b/es/components/apProduct/config/web.pc.js @@ -9,9 +9,12 @@ export default function render(props) { const { apAccountId, apProducts, oakFullpath, oakExecutable, canCreate, systemId } = props.data; const { t, addItem, execute, clean } = props.methods; const getNotNullMessage = (entity, attr) => { + // @oak-ignore return t('notnull', { value: t(`${entity}:attr.${attr}`) }); }; - const errMsg = oakExecutable instanceof OakException && (oakExecutable instanceof OakAttrNotNullException ? getNotNullMessage(oakExecutable.getEntity(), oakExecutable.getAttributes()[0]) : t(oakExecutable.message)); + const errMsg = oakExecutable instanceof OakException && ( + // @oak-ignore + oakExecutable instanceof OakAttrNotNullException ? getNotNullMessage(oakExecutable.getEntity(), oakExecutable.getAttributes()[0]) : t(oakExecutable.message)); const [upsertId, setUpsertId] = useState(''); const U = ( { clean(); diff --git a/es/components/apProduct/upsert/web.pc.js b/es/components/apProduct/upsert/web.pc.js index f51a933f..6d4ff35c 100644 --- a/es/components/apProduct/upsert/web.pc.js +++ b/es/components/apProduct/upsert/web.pc.js @@ -7,6 +7,7 @@ export default function render(props) { return ( ({ + // @oak-ignore label: t(`offlineAccount:v.type.${ele}`), value: ele, }))} onSelect={(value) => update({ type: value })}/> - {['bank', 'others'].includes(offlineAccount.type) && + {['bank', 'others'].includes(offlineAccount.type) && { const { value } = currentTarget; update({ channel: value, }); - }} placeholder={t(`placeholder.channel.${offlineAccount.type}`)}/> + }} + // @oak-ignore + placeholder={t(`placeholder.channel.${offlineAccount.type}`)}/> } {!!offlineAccount.type && { diff --git a/es/components/order/pay/web.js b/es/components/order/pay/web.js index 7ae60e74..122ae1e8 100644 --- a/es/components/order/pay/web.js +++ b/es/components/order/pay/web.js @@ -46,7 +46,9 @@ export default function Render(props) { return (); } if (!legal) { - return (); + return (); } return (
diff --git a/es/components/order/pay/web.pc.js b/es/components/order/pay/web.pc.js index a4237770..20910d97 100644 --- a/es/components/order/pay/web.pc.js +++ b/es/components/order/pay/web.pc.js @@ -45,7 +45,9 @@ export default function Render(props) { return (); } if (!legal) { - return (); + return (); } return (
diff --git a/es/components/pay/detail/web.js b/es/components/pay/detail/web.js index adff07af..2967f261 100644 --- a/es/components/pay/detail/web.js +++ b/es/components/pay/detail/web.js @@ -201,6 +201,7 @@ export default function Render(props) { {t('common::back')} ); } + // @oak-ignore return (
{t(`pay:v.iState.${iState}`)}}>
diff --git a/es/components/pay/detail/web.pc.js b/es/components/pay/detail/web.pc.js index de5077fe..79f49d37 100644 --- a/es/components/pay/detail/web.pc.js +++ b/es/components/pay/detail/web.pc.js @@ -211,7 +211,9 @@ export default function Render(props) { }>
- {t(`payChannel::${row.entity}`)} {entity === 'offlineAccount' && (
diff --git a/es/components/payConfig/system/web.pc.js b/es/components/payConfig/system/web.pc.js index e11422ae..4cc1759c 100644 --- a/es/components/payConfig/system/web.pc.js +++ b/es/components/payConfig/system/web.pc.js @@ -154,6 +154,7 @@ export default function render(props) { ...Object.keys(PayChannelConfigDict).map((ele) => { const C = PayChannelConfigDict[ele]; return { + // @oak-ignore label: (
{t(`${ele}:name`)}
), diff --git a/es/components/refund/list/web.pc.js b/es/components/refund/list/web.pc.js index be5d1b18..de419b69 100644 --- a/es/components/refund/list/web.pc.js +++ b/es/components/refund/list/web.pc.js @@ -71,6 +71,7 @@ export default function Render(props) { 'offlineAccount': 'red', 'wpProduct': 'green', }; + // @oak-ignore return (
{t(`payChannel::${entity}`)}
{row.payChannel}
diff --git a/es/components/sysAccount/survey/web.pc.js b/es/components/sysAccount/survey/web.pc.js index 76a44696..a9de7b3d 100644 --- a/es/components/sysAccount/survey/web.pc.js +++ b/es/components/sysAccount/survey/web.pc.js @@ -130,6 +130,7 @@ export default function render(props) { if (DetailRender) { Modal.info({ width: 560, + // @oak-ignore title: `${t(`${entity}:name`)}${t('common::action.detail')}`, content: (), onOk() { }, @@ -151,8 +152,12 @@ export default function render(props) { setShowHistoryList(false); }} width={800} title={showHistoryAcc.entity === 'offlineAccount' ? (showHistoryAcc.data.type === 'bank' ? + // @oak-ignore `${t(`${showHistoryAcc.entity}:v.type.${showHistoryAcc.data.type}`)}-${showHistoryAcc.data.channel}-${t('history')}` - : `${t(`${showHistoryAcc.entity}:v.type.${showHistoryAcc.data.type}`)}-${showHistoryAcc.data.name}-${t('history')}`) : `${t(`${showHistoryAcc.entity}:name`)}-${t('history')}`} footer={null}> + // @oak-ignore + : `${t(`${showHistoryAcc.entity}:v.type.${showHistoryAcc.data.type}`)}-${showHistoryAcc.data.name}-${t('history')}` + // @oak-ignore + ) : `${t(`${showHistoryAcc.entity}:name`)}-${t('history')}`} footer={null}>
diff --git a/es/components/wpAccount/config/web.pc.js b/es/components/wpAccount/config/web.pc.js index f42193b2..6b13f0a8 100644 --- a/es/components/wpAccount/config/web.pc.js +++ b/es/components/wpAccount/config/web.pc.js @@ -50,9 +50,12 @@ export default function render(props) { const { accounts, oakFullpath, oakExecutable, canCreate, systemId } = props.data; const { t, addItem, execute, clean } = props.methods; const getNotNullMessage = (entity, attr) => { + // @oak-ignore return t('notnull', { value: t(`${entity}:attr.${attr}`) }); }; - const errMsg = oakExecutable instanceof OakException && (oakExecutable instanceof OakAttrNotNullException ? getNotNullMessage(oakExecutable.getEntity(), oakExecutable.getAttributes()[0]) : t(oakExecutable.message)); + const errMsg = oakExecutable instanceof OakException && ( + // @oak-ignore + oakExecutable instanceof OakAttrNotNullException ? getNotNullMessage(oakExecutable.getEntity(), oakExecutable.getAttributes()[0]) : t(oakExecutable.message)); const [upsertId, setUpsertId] = useState(''); const U = ( { clean(); diff --git a/es/components/wpProduct/config/web.pc.js b/es/components/wpProduct/config/web.pc.js index c787d8cc..cba12bf8 100644 --- a/es/components/wpProduct/config/web.pc.js +++ b/es/components/wpProduct/config/web.pc.js @@ -9,9 +9,12 @@ export default function render(props) { const { wpAccountId, wpProducts, oakFullpath, oakExecutable, canCreate, systemId } = props.data; const { t, addItem, execute, clean } = props.methods; const getNotNullMessage = (entity, attr) => { + // @oak-ignore return t('notnull', { value: t(`${entity}:attr.${attr}`) }); }; - const errMsg = oakExecutable instanceof OakException && (oakExecutable instanceof OakAttrNotNullException ? getNotNullMessage(oakExecutable.getEntity(), oakExecutable.getAttributes()[0]) : t(oakExecutable.message)); + const errMsg = oakExecutable instanceof OakException && ( + // @oak-ignore + oakExecutable instanceof OakAttrNotNullException ? getNotNullMessage(oakExecutable.getEntity(), oakExecutable.getAttributes()[0]) : t(oakExecutable.message)); const [upsertId, setUpsertId] = useState(''); const U = ( { clean(); diff --git a/es/components/wpProduct/upsert/web.pc.js b/es/components/wpProduct/upsert/web.pc.js index 64452347..4e72fc61 100644 --- a/es/components/wpProduct/upsert/web.pc.js +++ b/es/components/wpProduct/upsert/web.pc.js @@ -6,7 +6,9 @@ export default function render(props) { if (wpProduct) { return ( - ({ label: t(`wpProduct:v.type.${ele}`), value: ele, }))} onSelect={(type) => { diff --git a/src/components/apAccount/config/web.pc.tsx b/src/components/apAccount/config/web.pc.tsx index 1ad61b0f..707f18db 100644 --- a/src/components/apAccount/config/web.pc.tsx +++ b/src/components/apAccount/config/web.pc.tsx @@ -104,6 +104,7 @@ export default function render(props: WebComponentProps { + // @oak-ignore return t('notnull', { value: t(`${entity}:attr.${attr}`) }); }; const errMsg = oakExecutable instanceof OakException && ( diff --git a/src/components/apAccount/upsert/web.pc.tsx b/src/components/apAccount/upsert/web.pc.tsx index 60ddf466..6fdcf427 100644 --- a/src/components/apAccount/upsert/web.pc.tsx +++ b/src/components/apAccount/upsert/web.pc.tsx @@ -15,6 +15,7 @@ export default function render(props: WebComponentProps { + // @oak-ignore return t('notnull', { value: t(`${entity}:attr.${attr}`) }); }; const errMsg = oakExecutable instanceof OakException && ( + // @oak-ignore oakExecutable instanceof OakAttrNotNullException ? getNotNullMessage(oakExecutable.getEntity() as string, oakExecutable.getAttributes()[0] as keyof EntityDict[keyof EntityDict]['OpSchema']) : t(oakExecutable.message) ); const [upsertId, setUpsertId] = useState(''); diff --git a/src/components/apProduct/upsert/web.pc.tsx b/src/components/apProduct/upsert/web.pc.tsx index fed2016c..37b89cc7 100644 --- a/src/components/apProduct/upsert/web.pc.tsx +++ b/src/components/apProduct/upsert/web.pc.tsx @@ -26,6 +26,7 @@ export default function render(props: WebComponentProps ({ + // @oak-ignore label: t(`apProduct:v.type.${ele}`), value: ele, }) diff --git a/src/components/offlineAccount/config/web.pc.tsx b/src/components/offlineAccount/config/web.pc.tsx index 06a0d5f8..6de74b84 100644 --- a/src/components/offlineAccount/config/web.pc.tsx +++ b/src/components/offlineAccount/config/web.pc.tsx @@ -80,12 +80,14 @@ export default function render(props: WebComponentProps { if (['channel', 'name', 'qrCode'].includes(attr)) { const upsertRow = accounts?.find(ele => ele.id === upsertId)!; - + // @oak-ignore return t('notnull', { value: t(`offlineAccount::label.${attr}.${upsertRow!.type}`) }); } + // @oak-ignore return t('notnull', { value: t(`offlineAccount:attr.${attr}`) }); }; const errMsg = oakExecutable instanceof OakException && ( + // @oak-ignore oakExecutable instanceof OakAttrNotNullException ? getNotNullMessage(oakExecutable.getAttributes()[0] as keyof EntityDict['offlineAccount']['OpSchema']) : t(oakExecutable.message) ); const U = ( diff --git a/src/components/offlineAccount/upsert/web.pc.tsx b/src/components/offlineAccount/upsert/web.pc.tsx index 9988d119..16d88630 100644 --- a/src/components/offlineAccount/upsert/web.pc.tsx +++ b/src/components/offlineAccount/upsert/web.pc.tsx @@ -25,6 +25,7 @@ export default function render(props: WebComponentProps ({ + // @oak-ignore label: t(`offlineAccount:v.type.${ele}`), value: ele, }) @@ -33,6 +34,7 @@ export default function render(props: WebComponentProps {['bank', 'others'].includes(offlineAccount.type!) && @@ -44,6 +46,7 @@ export default function render(props: WebComponentProps } diff --git a/src/components/order/pay/web.pc.tsx b/src/components/order/pay/web.pc.tsx index 95d6a4cc..3e932979 100644 --- a/src/components/order/pay/web.pc.tsx +++ b/src/components/order/pay/web.pc.tsx @@ -117,6 +117,7 @@ export default function Render(props: WebComponentProps ); diff --git a/src/components/order/pay/web.tsx b/src/components/order/pay/web.tsx index 2336a6d1..4bbbaff5 100644 --- a/src/components/order/pay/web.tsx +++ b/src/components/order/pay/web.tsx @@ -118,6 +118,7 @@ export default function Render(props: WebComponentProps ); diff --git a/src/components/pay/detail/web.pc.tsx b/src/components/pay/detail/web.pc.tsx index 5bac2545..a767c9c4 100644 --- a/src/components/pay/detail/web.pc.tsx +++ b/src/components/pay/detail/web.pc.tsx @@ -411,6 +411,7 @@ export default function Render(props: WebComponentProps ); } - + // @oak-ignore return (
{t(`payChannel::${row.entity}`)} diff --git a/src/components/payConfig/system/web.pc.tsx b/src/components/payConfig/system/web.pc.tsx index 14ce77e6..a6a0bfb7 100644 --- a/src/components/payConfig/system/web.pc.tsx +++ b/src/components/payConfig/system/web.pc.tsx @@ -308,6 +308,7 @@ export default function render(props: WebComponentProps { const C = PayChannelConfigDict[ele]; return { + // @oak-ignore label: (
{t(`${ele}:name`)} diff --git a/src/components/refund/list/web.pc.tsx b/src/components/refund/list/web.pc.tsx index ef412e4d..c0c4fd1e 100644 --- a/src/components/refund/list/web.pc.tsx +++ b/src/components/refund/list/web.pc.tsx @@ -96,6 +96,7 @@ export default function Render(props: WebComponentProps {t(`payChannel::${entity}`)} diff --git a/src/components/sysAccount/survey/web.pc.tsx b/src/components/sysAccount/survey/web.pc.tsx index cf719af6..4f2029f2 100644 --- a/src/components/sysAccount/survey/web.pc.tsx +++ b/src/components/sysAccount/survey/web.pc.tsx @@ -289,6 +289,7 @@ export default function render(props: WebComponentProps diff --git a/src/components/wpAccount/config/web.pc.tsx b/src/components/wpAccount/config/web.pc.tsx index c3d28b34..3993ac63 100644 --- a/src/components/wpAccount/config/web.pc.tsx +++ b/src/components/wpAccount/config/web.pc.tsx @@ -104,9 +104,11 @@ export default function render(props: WebComponentProps { + // @oak-ignore return t('notnull', { value: t(`${entity}:attr.${attr}`) }); }; const errMsg = oakExecutable instanceof OakException && ( + // @oak-ignore oakExecutable instanceof OakAttrNotNullException ? getNotNullMessage(oakExecutable.getEntity() as string, oakExecutable.getAttributes()[0] as keyof EntityDict[keyof EntityDict]['OpSchema']) : t(oakExecutable.message) ); const [upsertId, setUpsertId] = useState(''); diff --git a/src/components/wpProduct/config/web.pc.tsx b/src/components/wpProduct/config/web.pc.tsx index 41c2fe99..ec466cf1 100644 --- a/src/components/wpProduct/config/web.pc.tsx +++ b/src/components/wpProduct/config/web.pc.tsx @@ -20,9 +20,11 @@ export default function render(props: WebComponentProps { + // @oak-ignore return t('notnull', { value: t(`${entity}:attr.${attr}`) }); }; const errMsg = oakExecutable instanceof OakException && ( + // @oak-ignore oakExecutable instanceof OakAttrNotNullException ? getNotNullMessage(oakExecutable.getEntity() as string, oakExecutable.getAttributes()[0] as keyof EntityDict[keyof EntityDict]['OpSchema']) : t(oakExecutable.message) ); const [upsertId, setUpsertId] = useState(''); diff --git a/src/components/wpProduct/upsert/web.pc.tsx b/src/components/wpProduct/upsert/web.pc.tsx index 52f217d3..ac84c7b9 100644 --- a/src/components/wpProduct/upsert/web.pc.tsx +++ b/src/components/wpProduct/upsert/web.pc.tsx @@ -26,6 +26,7 @@ export default function render(props: WebComponentProps ({ label: t(`wpProduct:v.type.${ele}`), value: ele,