From 65064937f07d29d60ac795bab1664e33c63144cf Mon Sep 17 00:00:00 2001 From: Lei OT Date: Wed, 26 Jun 2024 10:39:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=8D=E5=88=B6=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E4=BA=A7=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/locales/en/products.json | 4 +- public/locales/zh/products.json | 2 +- src/components/SearchForm.jsx | 7 ++-- src/stores/Products/Index.js | 15 ++++++- src/views/products/Audit.jsx | 6 +-- src/views/products/Detail/Extras.jsx | 4 +- src/views/products/Manage.jsx | 63 ++++++++++++++++++++-------- 7 files changed, 70 insertions(+), 31 deletions(-) diff --git a/public/locales/en/products.json b/public/locales/en/products.json index 56eab4b..4997e31 100644 --- a/public/locales/en/products.json +++ b/public/locales/en/products.json @@ -3,14 +3,14 @@ "Experience": "Experience", "Car": "Transport Services", "Guide": "Guide Services", - "Package": "Package", + "Package": "Package Tour", "Attractions": "Attractions", "Meals": "Meals", "Extras": "Extras", "Overtravel": "超公里", "Special": "Special" }, - "Components": { + "EditComponents": { "info": "Product Information", "Quotation": "Quotation", "Extras": "Add-on" diff --git a/public/locales/zh/products.json b/public/locales/zh/products.json index 08f4872..55005ce 100644 --- a/public/locales/zh/products.json +++ b/public/locales/zh/products.json @@ -10,7 +10,7 @@ "Overtravel": "超公里", "Special": "特殊项目" }, - "Components": { + "EditComponents": { "info": "产品信息", "Quotation": "报价", "Extras": "附加项目" diff --git a/src/components/SearchForm.jsx b/src/components/SearchForm.jsx index 979a6fc..f6bad2c 100644 --- a/src/components/SearchForm.jsx +++ b/src/components/SearchForm.jsx @@ -21,7 +21,7 @@ export const fetchVendorList = async (q) => { const { RangePicker } = DatePicker; -const SearchForm = ({ initialValue, onSubmit, onReset, ...props }) => { +const SearchForm = ({ initialValue, onSubmit, onReset, confirmText, formName, loading, ...props }) => { const { t } = useTranslation(); const presets = useDatePresets(); const [formValues, setFormValues] = useFormStore((state) => [state.formValues, state.setFormValues]); @@ -36,7 +36,6 @@ const SearchForm = ({ initialValue, onSubmit, onReset, ...props }) => { shows: [], ...props.fieldsConfig, }; - const { confirmText } = props; const readValues = { ...initialValue, ...formValues }; const formValuesMapper = (values) => { @@ -109,14 +108,14 @@ const SearchForm = ({ initialValue, onSubmit, onReset, ...props }) => { }; return ( <> -
+ {/* */} {getFields({ sort, initialValue: readValues, hides, shows, fieldProps, fieldComProps, form, presets, t })} {/* 'textAlign': 'right' */} - {/*