Merge branch 'feature_bugfix/251201_vf_h5_ui' into feature_bugfix/251201_py_h5_ui
* feature_bugfix/251201_vf_h5_ui: feat: 恢复行业字段修改 feat: bug修复
This commit is contained in:
@@ -31,6 +31,7 @@
|
||||
"apexcharts": "^3.27.3",
|
||||
"axios": "^1.10.0",
|
||||
"classnames": "^2.5.1",
|
||||
"craco-less": "^3.0.1",
|
||||
"d3": "^7.9.0",
|
||||
"date-fns": "^2.23.0",
|
||||
"dayjs": "^1.11.19",
|
||||
@@ -134,6 +135,8 @@
|
||||
"imagemin-mozjpeg": "^10.0.0",
|
||||
"imagemin-pngquant": "^10.0.0",
|
||||
"kill-port": "^2.0.1",
|
||||
"less": "^4.4.2",
|
||||
"less-loader": "^12.3.0",
|
||||
"msw": "^2.11.5",
|
||||
"prettier": "2.2.1",
|
||||
"react-error-overlay": "6.0.9",
|
||||
|
||||
@@ -205,42 +205,42 @@ When it's NOT activated, the fc-button classes won't even be in the DOM.
|
||||
.fc .fc-button-primary {
|
||||
color: #fff;
|
||||
color: var(--fc-button-text-color, #fff);
|
||||
background-color: #2C3E50;
|
||||
background-color: var(--fc-button-bg-color, #2C3E50);
|
||||
border-color: #2C3E50;
|
||||
border-color: var(--fc-button-border-color, #2C3E50);
|
||||
background-color: #805AD5;
|
||||
background-color: var(--fc-button-bg-color, #805AD5);
|
||||
border-color: #805AD5;
|
||||
border-color: var(--fc-button-border-color, #805AD5);
|
||||
}
|
||||
.fc .fc-button-primary:hover {
|
||||
color: #fff;
|
||||
color: var(--fc-button-text-color, #fff);
|
||||
background-color: #1e2b37;
|
||||
background-color: var(--fc-button-hover-bg-color, #1e2b37);
|
||||
border-color: #1a252f;
|
||||
border-color: var(--fc-button-hover-border-color, #1a252f);
|
||||
background-color: #6B46C1;
|
||||
background-color: var(--fc-button-hover-bg-color, #6B46C1);
|
||||
border-color: #6B46C1;
|
||||
border-color: var(--fc-button-hover-border-color, #6B46C1);
|
||||
}
|
||||
.fc .fc-button-primary:disabled { /* not DRY */
|
||||
color: #fff;
|
||||
color: var(--fc-button-text-color, #fff);
|
||||
background-color: #2C3E50;
|
||||
background-color: var(--fc-button-bg-color, #2C3E50);
|
||||
border-color: #2C3E50;
|
||||
border-color: var(--fc-button-border-color, #2C3E50); /* overrides :hover */
|
||||
background-color: #805AD5;
|
||||
background-color: var(--fc-button-bg-color, #805AD5);
|
||||
border-color: #805AD5;
|
||||
border-color: var(--fc-button-border-color, #805AD5); /* overrides :hover */
|
||||
}
|
||||
.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).fc-button-active {
|
||||
color: #fff;
|
||||
color: var(--fc-button-text-color, #fff);
|
||||
background-color: #1a252f;
|
||||
background-color: var(--fc-button-active-bg-color, #1a252f);
|
||||
border-color: #151e27;
|
||||
border-color: var(--fc-button-active-border-color, #151e27);
|
||||
background-color: #6B46C1;
|
||||
background-color: var(--fc-button-active-bg-color, #6B46C1);
|
||||
border-color: #6B46C1;
|
||||
border-color: var(--fc-button-active-border-color, #6B46C1);
|
||||
}
|
||||
.fc .fc-button-primary:not(:disabled):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 {
|
||||
|
||||
|
||||
@@ -510,7 +510,7 @@ const StockChartAntdModal = ({
|
||||
centered
|
||||
zIndex={2500}
|
||||
mask={true}
|
||||
destroyOnClose={true}
|
||||
destroyOnHidden={true}
|
||||
bodyStyle={{ maxHeight: 'calc(90vh - 120px)', overflowY: 'auto', padding: '16px' }}
|
||||
>
|
||||
<div style={{ width: '100%' }}>
|
||||
|
||||
@@ -176,7 +176,7 @@ const StockChartKLineModal: React.FC<StockChartKLineModalProps> = ({
|
||||
width={1200}
|
||||
footer={null}
|
||||
centered
|
||||
destroyOnClose // 关闭时销毁组件(释放图表资源)
|
||||
destroyOnHidden // 关闭时销毁组件(释放图表资源)
|
||||
>
|
||||
{/* 工具栏 */}
|
||||
<Box mb={4}>
|
||||
|
||||
@@ -348,7 +348,7 @@ const CompactSearchBox = ({
|
||||
}
|
||||
|
||||
const params = buildFilterParams({
|
||||
industry_code: value?.join(',') || ''
|
||||
industry_code: value?.[value.length - 1] || ''
|
||||
});
|
||||
triggerSearch(params);
|
||||
};
|
||||
|
||||
@@ -468,7 +468,7 @@ export const EventFormModal: React.FC<EventFormModalProps> = ({
|
||||
open={isOpen}
|
||||
onCancel={onClose}
|
||||
width={600}
|
||||
destroyOnClose
|
||||
destroyOnHidden
|
||||
maskClosable={true}
|
||||
keyboard
|
||||
className="event-form-modal"
|
||||
|
||||
Reference in New Issue
Block a user