vf/vf_react
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature_bugfix/251201_py_h5_ui' of https://git.valuefrontier.cn/vf/vf_react into feature_bugfix/251201_py_h5_ui

Browse Source
This commit is contained in:
zzlgreat
2025-12-05 19:05:55 +08:00
parent 1f874e9b6d a804e80bb9
commit 75d3cf135a
6 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@@ -31,6 +31,7 @@
"apexcharts": "^3.27.3", "apexcharts": "^3.27.3",
"axios": "^1.10.0", "axios": "^1.10.0",
"classnames": "^2.5.1", "classnames": "^2.5.1",
"craco-less": "^3.0.1",
"d3": "^7.9.0", "d3": "^7.9.0",
"date-fns": "^2.23.0", "date-fns": "^2.23.0",
"dayjs": "^1.11.19", "dayjs": "^1.11.19",
@@ -134,6 +135,8 @@
"imagemin-mozjpeg": "^10.0.0", "imagemin-mozjpeg": "^10.0.0",
"imagemin-pngquant": "^10.0.0", "imagemin-pngquant": "^10.0.0",
"kill-port": "^2.0.1", "kill-port": "^2.0.1",
"less": "^4.4.2",
"less-loader": "^12.3.0",
"msw": "^2.11.5", "msw": "^2.11.5",
"prettier": "2.2.1", "prettier": "2.2.1",
"react-error-overlay": "6.0.9", "react-error-overlay": "6.0.9",

36
src/assets/scss/soft-design-system-pro/plugins/pro/_fullcalendar.scss
View File

@@ -205,42 +205,42 @@ When it's NOT activated, the fc-button classes won't even be in the DOM.
.fc .fc-button-primary { .fc .fc-button-primary {
color: #fff; color: #fff;
color: var(--fc-button-text-color, #fff); color: var(--fc-button-text-color, #fff);
background-color: #2C3E50; background-color: #805AD5;
background-color: var(--fc-button-bg-color, #2C3E50); background-color: var(--fc-button-bg-color, #805AD5);
border-color: #2C3E50; border-color: #805AD5;
border-color: var(--fc-button-border-color, #2C3E50); border-color: var(--fc-button-border-color, #805AD5);
} }
.fc .fc-button-primary:hover { .fc .fc-button-primary:hover {
color: #fff; color: #fff;
color: var(--fc-button-text-color, #fff); color: var(--fc-button-text-color, #fff);
background-color: #1e2b37; background-color: #6B46C1;
background-color: var(--fc-button-hover-bg-color, #1e2b37); background-color: var(--fc-button-hover-bg-color, #6B46C1);
border-color: #1a252f; border-color: #6B46C1;
border-color: var(--fc-button-hover-border-color, #1a252f); border-color: var(--fc-button-hover-border-color, #6B46C1);
} }
.fc .fc-button-primary:disabled { /* not DRY */ .fc .fc-button-primary:disabled { /* not DRY */
color: #fff; color: #fff;
color: var(--fc-button-text-color, #fff); color: var(--fc-button-text-color, #fff);
background-color: #2C3E50; background-color: #805AD5;
background-color: var(--fc-button-bg-color, #2C3E50); background-color: var(--fc-button-bg-color, #805AD5);
border-color: #2C3E50; border-color: #805AD5;
border-color: var(--fc-button-border-color, #2C3E50); /* overrides :hover */ border-color: var(--fc-button-border-color, #805AD5); /* overrides :hover */
} }
.fc .fc-button-primary:focus { .fc .fc-button-primary:focus {
box-shadow: 0 0 0 0.2rem rgba(76, 91, 106, 0.5); box-shadow: 0 0 0 0.2rem rgba(128, 90, 213, 0.5);
} }
.fc .fc-button-primary:not(:disabled):active, .fc .fc-button-primary:not(:disabled):active,
.fc .fc-button-primary:not(:disabled).fc-button-active { .fc .fc-button-primary:not(:disabled).fc-button-active {
color: #fff; color: #fff;
color: var(--fc-button-text-color, #fff); color: var(--fc-button-text-color, #fff);
background-color: #1a252f; background-color: #6B46C1;
background-color: var(--fc-button-active-bg-color, #1a252f); background-color: var(--fc-button-active-bg-color, #6B46C1);
border-color: #151e27; border-color: #6B46C1;
border-color: var(--fc-button-active-border-color, #151e27); border-color: var(--fc-button-active-border-color, #6B46C1);
} }
.fc .fc-button-primary:not(:disabled):active:focus, .fc .fc-button-primary:not(:disabled):active:focus,
.fc .fc-button-primary:not(:disabled).fc-button-active:focus { .fc .fc-button-primary:not(:disabled).fc-button-active:focus {
box-shadow: 0 0 0 0.2rem rgba(76, 91, 106, 0.5); box-shadow: 0 0 0 0.2rem rgba(128, 90, 213, 0.5);
} }
.fc { .fc {

2
src/components/StockChart/StockChartAntdModal.js
View File

@@ -510,7 +510,7 @@ const StockChartAntdModal = ({
centered centered
zIndex={2500} zIndex={2500}
mask={true} mask={true}
destroyOnClose={true} destroyOnHidden={true}
bodyStyle={{ maxHeight: 'calc(90vh - 120px)', overflowY: 'auto', padding: '16px' }} bodyStyle={{ maxHeight: 'calc(90vh - 120px)', overflowY: 'auto', padding: '16px' }}
> >
<div style={{ width: '100%' }}> <div style={{ width: '100%' }}>

2
src/components/StockChart/StockChartKLineModal.tsx
View File

@@ -176,7 +176,7 @@ const StockChartKLineModal: React.FC<StockChartKLineModalProps> = ({
width={1200} width={1200}
footer={null} footer={null}
centered centered
destroyOnClose // 关闭时销毁组件（释放图表资源） destroyOnHidden // 关闭时销毁组件（释放图表资源）
> >
{/* 工具栏 */} {/* 工具栏 */}
<Box mb={4}> <Box mb={4}>

2
src/views/Community/components/CompactSearchBox.js
View File

@@ -348,7 +348,7 @@ const CompactSearchBox = ({
} }
const params = buildFilterParams({ const params = buildFilterParams({
industry_code: value?.join(',') || '' industry_code: value?.[value.length - 1] || ''
}); });
triggerSearch(params); triggerSearch(params);
}; };

2
src/views/Dashboard/components/EventFormModal.tsx
View File

@@ -468,7 +468,7 @@ export const EventFormModal: React.FC<EventFormModalProps> = ({
open={isOpen} open={isOpen}
onCancel={onClose} onCancel={onClose}
width={600} width={600}
destroyOnClose destroyOnHidden
maskClosable={true} maskClosable={true}
keyboard keyboard
className="event-form-modal" className="event-form-modal"