From a99929ba6973a7b244afae0820f819234d9926b0 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Wed, 3 Sep 2025 09:22:37 +0800 Subject: [PATCH 1/8] 2.2.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4920642..e4ed46f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "global-highlights-hub", "private": true, - "version": "2.2.2", + "version": "2.2.3", "type": "module", "scripts": { "dev": "vite", From c68de1e6d9e75cd35aa96d04693404b98f3619c2 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Wed, 3 Sep 2025 10:48:10 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?:=20=E8=AF=AD=E7=A7=8D=E4=BF=A1=E6=81=AF=E8=B5=8B=E5=80=BC?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/products/Detail/ProductInfoForm.jsx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/views/products/Detail/ProductInfoForm.jsx b/src/views/products/Detail/ProductInfoForm.jsx index 1b73208..bb93c6f 100644 --- a/src/views/products/Detail/ProductInfoForm.jsx +++ b/src/views/products/Detail/ProductInfoForm.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react'; import { App, Form, Input, Row, Col, Select, Button, InputNumber, Checkbox } from 'antd'; -import { objectMapper, isEmpty, isNotEmpty } from '@/utils/commons'; +import { objectMapper, isEmpty, isNotEmpty, pick } from '@/utils/commons'; import { useTranslation } from 'react-i18next'; import { useWeekdays } from '@/hooks/useDatePresets'; import DeptSelector from '@/components/DeptSelector'; @@ -36,8 +36,13 @@ const InfoForm = ({ onSubmit, onReset, onValuesChange, editablePerm, infoEditabl const [showSave, setShowSave] = useState(true); useEffect(() => { form.resetFields(); - - form.setFieldsValue(serverData2Form(editingProduct)); + const _formValue = serverData2Form(editingProduct); + const readyFormVal = pick(_formValue, ['quotation', 'lgc_details_mapped','city', 'dept', 'display_to_c']) + // form.setFieldsValue(serverData2Form(editingProduct)); + // ! setFieldsValue 导致赋值错误 + for (const _key in readyFormVal) { + form.setFieldValue(_key, readyFormVal[_key]) + } setPickEditedInfo({ ...pickEditedInfo, product_title: editingProduct?.info?.product_title }); setFormEditable(infoEditable || priceEditable); From 40f4fedd0815bc587b03539046daa6286e2a9179 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Wed, 3 Sep 2025 10:56:10 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?:=20city=5Flist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/products/Detail/ProductsTree.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/products/Detail/ProductsTree.jsx b/src/views/products/Detail/ProductsTree.jsx index f44d662..a14fc6c 100644 --- a/src/views/products/Detail/ProductsTree.jsx +++ b/src/views/products/Detail/ProductsTree.jsx @@ -118,7 +118,7 @@ const ProductsTree = ({ onNodeSelect, ...props }) => { if (isEmpty(editingProduct)) { return () => {}; } - const allKeysWithCity = [...editingProduct.info.city_list, { id: editingProduct.info.city_id, name: editingProduct.info.city_name }].map( + const allKeysWithCity = [...(editingProduct.info?.city_list || []), { id: editingProduct.info.city_id, name: editingProduct.info.city_name }].map( (city) => `${editingProduct.info.id}-${city.id}` ); setSelectedKeys(allKeysWithCity); From 4bc97ea1a3e560bd44c869c746f2f602ffca2272 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Wed, 3 Sep 2025 10:59:30 +0800 Subject: [PATCH 4/8] 2.2.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e4ed46f..07c961d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "global-highlights-hub", "private": true, - "version": "2.2.3", + "version": "2.2.4", "type": "module", "scripts": { "dev": "vite", From 131e3ca70b0a0abd4133c564e115fc14c5f3c8e5 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Thu, 4 Sep 2025 11:43:14 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=F0=9F=92=84style=EF=BC=9A=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=86=85=E5=AE=B9=E6=94=AF=E6=8C=81=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/notice/Detail.jsx | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/views/notice/Detail.jsx b/src/views/notice/Detail.jsx index 8fc5aab..6edb2fe 100644 --- a/src/views/notice/Detail.jsx +++ b/src/views/notice/Detail.jsx @@ -1,36 +1,34 @@ -import { NavLink, useParams } from 'react-router-dom'; -import { useEffect, useState } from 'react'; -import { Row, Col, Space, Typography, Divider } from 'antd'; -import * as comm from '@/utils/commons'; -import { useTranslation } from 'react-i18next'; -import { fetchNoticeDetail } from '@/stores/Notice'; -import BackBtn from '@/components/BackBtn'; -import { usingStorage } from '@/hooks/usingStorage'; +import { useParams } from "react-router-dom"; +import { useEffect, useState } from "react"; +import { Row, Col, Space, Typography, Divider } from "antd"; +import { fetchNoticeDetail } from "@/stores/Notice"; +import BackBtn from "@/components/BackBtn"; +import { usingStorage } from "@/hooks/usingStorage"; const { Title, Paragraph } = Typography; function Detail() { - const { t } = useTranslation(); const { CCP_BLID } = useParams(); - const {userId} = usingStorage(); + const { userId } = usingStorage(); const [noticeInfo, setNoticeInfo] = useState({}); useEffect(() => { - // console.info("notice detail .useEffect " + CCP_BLID); fetchNoticeDetail(userId, CCP_BLID).then((res) => { setNoticeInfo(res); }); }, []); return ( - + {noticeInfo.CCP_BLTitle} - {noticeInfo.CCP_LastEditTime} + {noticeInfo.CCP_LastEditTime} -
+
+ {noticeInfo.CCP_BLContent} +
From 91e58fa3d0e796f5a1fc85fe46c2ad5c218b1b2a Mon Sep 17 00:00:00 2001 From: Lei OT Date: Thu, 4 Sep 2025 14:30:43 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?:=20city=5Flist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/products/Detail/ProductInfoForm.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/products/Detail/ProductInfoForm.jsx b/src/views/products/Detail/ProductInfoForm.jsx index bb93c6f..d738b26 100644 --- a/src/views/products/Detail/ProductInfoForm.jsx +++ b/src/views/products/Detail/ProductInfoForm.jsx @@ -37,7 +37,7 @@ const InfoForm = ({ onSubmit, onReset, onValuesChange, editablePerm, infoEditabl useEffect(() => { form.resetFields(); const _formValue = serverData2Form(editingProduct); - const readyFormVal = pick(_formValue, ['quotation', 'lgc_details_mapped','city', 'dept', 'display_to_c']) + const readyFormVal = pick(_formValue, ['quotation', 'lgc_details_mapped','city', 'city_list', 'dept', 'display_to_c', 'sub_type_D']) // form.setFieldsValue(serverData2Form(editingProduct)); // ! setFieldsValue 导致赋值错误 for (const _key in readyFormVal) { From b31a181b3ce516ab96f1def6a71aa021552d49c6 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Thu, 4 Sep 2025 14:32:17 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E2=9A=A1perf=EF=BC=9A=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=94=A8=E6=88=B7=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/account/Management.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/account/Management.jsx b/src/views/account/Management.jsx index e6030c4..e972632 100644 --- a/src/views/account/Management.jsx +++ b/src/views/account/Management.jsx @@ -60,6 +60,7 @@ function Management() { showDisableConfirm(account, checked) }} /> + ) } From d636bad6bbfccb90b9719a2b2de722523c29ec79 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Fri, 5 Sep 2025 09:08:38 +0800 Subject: [PATCH 8/8] 2.2.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 07c961d..533a866 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "global-highlights-hub", "private": true, - "version": "2.2.4", + "version": "2.2.5", "type": "module", "scripts": { "dev": "vite",