rust/dx-admin-template
1
0
Fork 0
mirror of https://github.com/mztlive/dx-admin-template.git synced 2025-12-22 21:59:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
tommy
2025-11-07 14:31:54 +08:00
parent 9157983772
commit f5629c8a2b
2 changed files with 65 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
assets/styling/shadcn.css
View File

@@ -1468,10 +1468,25 @@
} }
.ui-date-range-preview { .ui-date-range-preview {
display: flex;
flex-direction: column;
gap: 0.25rem;
min-width: 0;
flex: 1 1 auto;
font-size: 0.85rem; font-size: 0.85rem;
color: hsl(var(--muted-foreground)); color: hsl(var(--muted-foreground));
} }
.ui-date-range-footer {
display: flex;
align-items: center;
flex-wrap: wrap;
justify-content: space-between;
gap: 1rem;
width: 100%;
margin-top: 0.5rem;
}
.ui-date-range-shortcuts { .ui-date-range-shortcuts {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
@@ -1483,8 +1498,8 @@
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
gap: 0.5rem; gap: 0.5rem;
width: 100%; flex-shrink: 0;
margin-top: 0.5rem; margin-left: auto;
} }
.ui-date-range-shortcut, .ui-date-range-shortcut,

93
src/components/ui/date_range_picker.rs
View File

@@ -282,13 +282,6 @@ pub fn DateRangePicker(
"本月" "本月"
} }
} }
div {
class: "ui-date-range-preview",
span { class: "ui-date-range-preview-primary", "{preview_primary_text}" }
for text in preview_secondary_text.iter() {
span { class: "ui-date-range-preview-secondary", "{text}" }
}
}
div { div {
class: "ui-date-range-calendars", class: "ui-date-range-calendars",
for offset in 0..2 { for offset in 0..2 {
@@ -372,47 +365,57 @@ pub fn DateRangePicker(
} }
} }
div { div {
class: "ui-date-range-controls", class: "ui-date-range-footer",
Button { div {
class: "ui-date-range-clear", class: "ui-date-range-preview",
variant: ButtonVariant::Ghost, span { class: "ui-date-range-preview-primary", "{preview_primary_text}" }
size: ButtonSize::Sm, for text in preview_secondary_text.iter() {
on_click: { span { class: "ui-date-range-preview-secondary", "{text}" }
let mut draft_signal = draft_range.clone(); }
let mut hover_signal = hover_date.clone();
move |_| {
draft_signal.set(None);
hover_signal.set(None);
}
},
"清除"
} }
Button { div {
class: "ui-date-range-confirm", class: "ui-date-range-controls",
size: ButtonSize::Sm, Button {
disabled: confirm_disabled, class: "ui-date-range-clear",
on_click: { variant: ButtonVariant::Ghost,
let mut value_signal = value.clone(); size: ButtonSize::Sm,
let mut hover_signal = hover_date.clone(); on_click: {
let draft_signal = draft_range.clone(); let mut draft_signal = draft_range.clone();
let on_change = on_change_handler.clone(); let mut hover_signal = hover_date.clone();
let popover_handle = popover_handle.clone(); move |_| {
move |_| { draft_signal.set(None);
let selection = draft_signal(); hover_signal.set(None);
if selection.is_none() && value_signal().is_none() {
return;
} }
value_signal.set(selection); },
if let Some(handler) = on_change.clone() { "清除"
handler.call(selection); }
Button {
class: "ui-date-range-confirm",
size: ButtonSize::Sm,
disabled: confirm_disabled,
on_click: {
let mut value_signal = value.clone();
let mut hover_signal = hover_date.clone();
let draft_signal = draft_range.clone();
let on_change = on_change_handler.clone();
let popover_handle = popover_handle.clone();
move |_| {
let selection = draft_signal();
if selection.is_none() && value_signal().is_none() {
return;
}
value_signal.set(selection);
if let Some(handler) = on_change.clone() {
handler.call(selection);
}
if let Some(mut handle) = popover_handle {
handle.state.set(false);
}
hover_signal.set(None);
} }
if let Some(mut handle) = popover_handle { },
handle.state.set(false); "确定"
} }
hover_signal.set(None);
}
},
"确定"
} }
} }
} }