niuma-ui 1.0.1 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (190) hide show
  1. package/CHANGELOG.md +65 -1
  2. package/package.json +10 -2
  3. package/src/__tests__/RsButton.spec.ts +47 -0
  4. package/src/__tests__/RsCard.spec.ts +160 -1
  5. package/src/__tests__/RsConfirmDialog.spec.ts +127 -0
  6. package/src/__tests__/RsContextMenu.spec.ts +12 -0
  7. package/src/__tests__/RsDatePicker.spec.ts +21 -0
  8. package/src/__tests__/RsDateTimePicker.spec.ts +11 -0
  9. package/src/__tests__/RsDescriptions.spec.ts +50 -0
  10. package/src/__tests__/RsDialog.spec.ts +178 -0
  11. package/src/__tests__/RsDrawer.spec.ts +96 -3
  12. package/src/__tests__/RsDynamicTags.spec.ts +52 -0
  13. package/src/__tests__/RsForm.spec.ts +250 -6
  14. package/src/__tests__/RsFormItem.spec.ts +478 -0
  15. package/src/__tests__/RsFormList.spec.ts +109 -0
  16. package/src/__tests__/RsInput.spec.ts +108 -1
  17. package/src/__tests__/RsInputNumber.spec.ts +33 -0
  18. package/src/__tests__/RsMenu.spec.ts +406 -14
  19. package/src/__tests__/RsPagination.spec.ts +67 -2
  20. package/src/__tests__/RsSelect.spec.ts +465 -2
  21. package/src/__tests__/RsSwitch.spec.ts +74 -0
  22. package/src/__tests__/RsTable.a11y.spec.ts +83 -0
  23. package/src/__tests__/RsTable.dom-baseline.spec.ts +87 -0
  24. package/src/__tests__/RsTable.perf.spec.ts +23 -4
  25. package/src/__tests__/RsTable.spec.ts +63 -8
  26. package/src/__tests__/RsTable.ssr.spec.ts +71 -0
  27. package/src/__tests__/RsTable.summary.spec.ts +45 -0
  28. package/src/__tests__/RsTabs.spec.ts +102 -4
  29. package/src/__tests__/RsTimePicker.spec.ts +20 -0
  30. package/src/__tests__/RsTooltip.spec.ts +43 -0
  31. package/src/__tests__/RsUpload.spec.ts +62 -6
  32. package/src/__tests__/createRsDialog.spec.ts +145 -0
  33. package/src/__tests__/css-token.spec.ts +51 -0
  34. package/src/__tests__/date-picker-utils.spec.ts +49 -0
  35. package/src/__tests__/dialog-utils.spec.ts +43 -0
  36. package/src/__tests__/form-path.spec.ts +46 -0
  37. package/src/__tests__/form-rules.spec.ts +139 -0
  38. package/src/__tests__/perf-budgets.ts +32 -0
  39. package/src/__tests__/rs-table-api.spec.ts +206 -0
  40. package/src/__tests__/rs-table-compat-matrix.spec.ts +108 -0
  41. package/src/__tests__/rs-table-echarts-adapter.spec.ts +43 -0
  42. package/src/__tests__/rs-table-grid-nav.spec.ts +63 -0
  43. package/src/__tests__/rs-table-isolation.spec.ts +158 -0
  44. package/src/__tests__/split-pane-utils.spec.ts +21 -0
  45. package/src/__tests__/table-chart-utils.spec.ts +88 -0
  46. package/src/__tests__/table-summary-utils.spec.ts +62 -0
  47. package/src/__tests__/table-utils.spec.ts +124 -0
  48. package/src/__tests__/theme.spec.ts +27 -0
  49. package/src/__tests__/useRsTableColumnResize.spec.ts +25 -0
  50. package/src/__tests__/useRsTableCore.perf.spec.ts +170 -0
  51. package/src/components/RsAlert.vue +212 -0
  52. package/src/components/RsAvatar.vue +1 -1
  53. package/src/components/RsBadge.vue +1 -1
  54. package/src/components/RsBreadcrumb.vue +1 -1
  55. package/src/components/RsButton.vue +147 -23
  56. package/src/components/RsCalendarGrid.vue +3 -3
  57. package/src/components/RsCard.vue +204 -20
  58. package/src/components/RsCodeBlock.vue +4 -4
  59. package/src/components/RsCodeEditor.vue +8 -8
  60. package/src/components/RsConfirmDialog.vue +217 -30
  61. package/src/components/RsContextMenu.vue +57 -17
  62. package/src/components/RsDatePicker.vue +316 -39
  63. package/src/components/RsDateTimePicker.vue +27 -2
  64. package/src/components/RsDescriptions.vue +186 -0
  65. package/src/components/RsDescriptionsItem.vue +32 -0
  66. package/src/components/RsDialog.vue +374 -52
  67. package/src/components/RsDivider.vue +89 -0
  68. package/src/components/RsDrawer.vue +559 -34
  69. package/src/components/RsDropdown.vue +34 -3
  70. package/src/components/RsDynamicTags.vue +531 -0
  71. package/src/components/RsEmpty.vue +1 -1
  72. package/src/components/RsForm.vue +164 -8
  73. package/src/components/RsFormItem.vue +423 -0
  74. package/src/components/RsFormItemControl.vue +21 -0
  75. package/src/components/RsFormList.vue +117 -0
  76. package/src/components/RsInput.vue +491 -100
  77. package/src/components/RsInputNumber.vue +77 -27
  78. package/src/components/RsLabel.vue +20 -5
  79. package/src/components/RsLink.vue +1 -1
  80. package/src/components/RsLoadingBar.vue +151 -0
  81. package/src/components/RsMarkdown.vue +5 -5
  82. package/src/components/RsMenu.vue +74 -16
  83. package/src/components/RsMenuItems.vue +147 -9
  84. package/src/components/RsMonacoEditor.vue +9 -3
  85. package/src/components/RsPagination.vue +93 -14
  86. package/src/components/RsProseEditor.vue +3 -3
  87. package/src/components/RsRadio.vue +81 -0
  88. package/src/components/RsRadioItem.vue +156 -0
  89. package/src/components/RsSelect.vue +372 -642
  90. package/src/components/RsSidebarGroup.vue +1 -1
  91. package/src/components/RsSplitPane.vue +90 -1
  92. package/src/components/RsStatCard.vue +2 -2
  93. package/src/components/RsSteps.vue +2 -2
  94. package/src/components/RsSwitch.vue +192 -0
  95. package/src/components/RsTable.vue +653 -2555
  96. package/src/components/RsTabs.vue +422 -90
  97. package/src/components/RsTag.vue +191 -0
  98. package/src/components/RsTerminal.vue +58 -19
  99. package/src/components/RsTimePicker.vue +72 -9
  100. package/src/components/RsTimePickerColumns.vue +137 -78
  101. package/src/components/RsToaster.vue +64 -24
  102. package/src/components/RsTooltip.vue +10 -1
  103. package/src/components/RsTooltipProvider.vue +11 -1
  104. package/src/components/RsTree.vue +45 -27
  105. package/src/components/RsUpload.vue +147 -14
  106. package/src/components/RsVNodeHost.vue +20 -0
  107. package/src/components/button-utils.ts +39 -0
  108. package/src/components/context-menu-utils.ts +6 -0
  109. package/src/components/date-picker-utils.ts +195 -4
  110. package/src/components/descriptions-utils.ts +24 -0
  111. package/src/components/dialog-utils.ts +182 -0
  112. package/src/components/dialog-window.ts +74 -9
  113. package/src/components/drawer-utils.ts +73 -0
  114. package/src/components/form-item-control.ts +55 -0
  115. package/src/components/form-path.ts +92 -0
  116. package/src/components/form-rules.ts +311 -0
  117. package/src/components/form-utils.ts +145 -3
  118. package/src/components/menu-utils.ts +11 -0
  119. package/src/components/overlay-utils.ts +3 -0
  120. package/src/components/radio-utils.ts +12 -0
  121. package/src/components/reka.ts +5 -0
  122. package/src/components/select-utils.ts +285 -6
  123. package/src/components/split-pane-utils.ts +65 -12
  124. package/src/components/table/RsTableBody.vue +217 -0
  125. package/src/components/table/RsTableBodyRow.vue +90 -1
  126. package/src/components/table/RsTableColGroup.vue +41 -0
  127. package/src/components/table/RsTableHeader.vue +158 -0
  128. package/src/components/table/RsTableHeaderFilter.vue +1 -1
  129. package/src/components/table/RsTableSummaryRow.vue +52 -0
  130. package/src/components/table/rs-table-api.ts +99 -0
  131. package/src/components/table/rs-table-compat-matrix.ts +71 -0
  132. package/src/components/table/rs-table-echarts-adapter.ts +81 -0
  133. package/src/components/table/rs-table-feature-host.ts +178 -0
  134. package/src/components/table/rs-table-grid-nav.ts +122 -0
  135. package/src/components/table/rs-table-header-types.ts +47 -0
  136. package/src/components/table/rs-table-module-registry.ts +72 -0
  137. package/src/components/table/rs-table-props.ts +274 -0
  138. package/src/components/table/rs-table-view-context.ts +258 -0
  139. package/src/components/table/rs-table.css +85 -7
  140. package/src/components/table/table-chart-utils.ts +165 -0
  141. package/src/components/table/table-features.ts +284 -0
  142. package/src/components/table/table-summary-utils.ts +194 -0
  143. package/src/components/table-utils.ts +452 -2
  144. package/src/components/tabs-utils.ts +142 -2
  145. package/src/components/time-picker-utils.ts +76 -3
  146. package/src/components/upload-utils.ts +122 -0
  147. package/src/components/use-rs-select.ts +436 -0
  148. package/src/components/virtual-list-utils.ts +15 -2
  149. package/src/composables/assembleRsTableApi.ts +79 -0
  150. package/src/composables/bindRsTableViewContext.ts +269 -0
  151. package/src/composables/createRsDialog.ts +357 -0
  152. package/src/composables/createRsTableEditEmitBridge.ts +38 -0
  153. package/src/composables/useRsConfig.ts +10 -3
  154. package/src/composables/useRsI18n.ts +16 -5
  155. package/src/composables/useRsLoadingBar.ts +36 -0
  156. package/src/composables/useRsTable.ts +134 -0
  157. package/src/composables/useRsTableA11y.ts +52 -0
  158. package/src/composables/useRsTableChartBridge.ts +79 -0
  159. package/src/composables/useRsTableColumnLayout.ts +320 -0
  160. package/src/composables/useRsTableColumnResize.ts +244 -0
  161. package/src/composables/useRsTableColumnVirtual.ts +180 -0
  162. package/src/composables/useRsTableColumns.ts +200 -0
  163. package/src/composables/useRsTableContextMenu.ts +257 -0
  164. package/src/composables/useRsTableCore.ts +256 -0
  165. package/src/composables/useRsTableEditActions.ts +606 -0
  166. package/src/composables/useRsTableEditLayer.ts +251 -0
  167. package/src/composables/useRsTableEngine.ts +357 -0
  168. package/src/composables/useRsTableGridKeyboard.ts +123 -0
  169. package/src/composables/useRsTableHeadless.ts +137 -0
  170. package/src/composables/useRsTableInteraction.ts +433 -0
  171. package/src/composables/useRsTableScrollHost.ts +75 -0
  172. package/src/composables/useRsTableScrollLayout.ts +255 -0
  173. package/src/composables/useRsTableSelectionSource.ts +89 -0
  174. package/src/composables/useRsTableShell.ts +416 -0
  175. package/src/composables/useRsTableShellChrome.ts +170 -0
  176. package/src/composables/useRsTableSummary.ts +113 -0
  177. package/src/composables/useRsTableViewProvide.ts +263 -0
  178. package/src/composables/useRsTableVirtual.ts +154 -0
  179. package/src/composables/useRsTabsNav.ts +4 -0
  180. package/src/composables/useTableEdit.ts +1 -1
  181. package/src/index.ts +378 -10
  182. package/src/locale/interpolate.ts +32 -0
  183. package/src/locale/messages.ts +40 -0
  184. package/src/styles.css +365 -56
  185. package/src/theme/brand.example.css +24 -2
  186. package/src/theme/css-token.ts +107 -0
  187. package/src/theme/presets.ts +4 -0
  188. package/src/theme/types.ts +68 -0
  189. package/src/components/RsTableColgroup.vue +0 -17
  190. package/src/components/RsTableHeaderRow.vue +0 -30
@@ -1,10 +1,23 @@
1
1
  <script setup lang="ts">
2
- import { computed, ref, useId, watch } from 'vue'
2
+ import { computed, ref, useAttrs, useId, watch } from 'vue'
3
3
  import { PopoverContent, PopoverPortal, PopoverRoot, PopoverTrigger } from './reka'
4
4
  import RsCalendarGrid from './RsCalendarGrid.vue'
5
5
  import RsIcon from './RsIcon.vue'
6
6
  import RsTimePicker from './RsTimePicker.vue'
7
7
  import { useRsI18n } from '../composables/useRsI18n'
8
+ import { RS_COMPONENT_SIZE_ICON_PX, type RsComponentSize } from '../theme/types'
9
+ import { useResolvedRsComponentSize } from './resolve-size'
10
+ import {
11
+ isRsFormItemBoundControl,
12
+ useRsFormContext,
13
+ useRsFormField,
14
+ useRsFormItemContext,
15
+ } from './form-utils'
16
+ import {
17
+ buildLocalInputRules,
18
+ runFormFieldRules,
19
+ type RsFormRuleTrigger,
20
+ } from './form-rules'
8
21
  import {
9
22
  compareDates,
10
23
  EMPTY_DATE_RANGE,
@@ -17,29 +30,48 @@ import {
17
30
  formatDateTimeRangeLabel,
18
31
  getNextMonth,
19
32
  getNowDateTime,
33
+ formatTimestampValue,
34
+ fromInternalPickerValue,
20
35
  getTodayDate,
21
36
  isDateRangeEmpty,
22
37
  isDateRangeOrdered,
23
38
  isDateWithinBounds,
39
+ isTimestampRange,
40
+ normalizeShortcutValue,
24
41
  parseDateTimeValue,
25
42
  parseDateValue,
43
+ parseTimestampValue,
44
+ toInternalPickerValue,
45
+ toRangeEndpointString,
46
+ type RsDatePickerModelValue,
47
+ type RsDatePickerShortcut,
48
+ type RsDatePickerValueFormat,
26
49
  type RsDateRangeValue,
27
50
  type RsParsedDate,
28
51
  } from './date-picker-utils'
29
52
  import { formatTimeParts } from './time-picker-utils'
30
53
 
31
- export type { RsDateRangeValue } from './date-picker-utils'
54
+ export type {
55
+ RsDatePickerModelValue,
56
+ RsDatePickerShortcut,
57
+ RsDatePickerValueFormat,
58
+ RsDateRangeValue,
59
+ } from './date-picker-utils'
32
60
  export type RsDatePickerLabelPosition = 'top' | 'left'
33
61
 
34
- function isRangeModel(value: string | RsDateRangeValue): value is RsDateRangeValue {
35
- return typeof value === 'object' && value !== null && ('start' in value || 'end' in value)
62
+ function isRangeModel(value: RsDatePickerModelValue): value is RsDateRangeValue {
63
+ return typeof value === 'object' && value !== null && !Array.isArray(value) && ('start' in value || 'end' in value)
36
64
  }
37
65
 
38
- const model = defineModel<string | RsDateRangeValue>({ default: '' })
66
+ defineOptions({ inheritAttrs: false })
67
+
68
+ const model = defineModel<RsDatePickerModelValue>({ default: '' })
39
69
  const open = defineModel<boolean>('open', { default: false })
40
70
 
41
71
  const props = withDefaults(
42
72
  defineProps<{
73
+ /** 表单字段名,用于 RsForm rules 匹配与校验注册 */
74
+ name?: string
43
75
  label?: string
44
76
  hint?: string
45
77
  placeholder?: string
@@ -49,21 +81,61 @@ const props = withDefaults(
49
81
  minDate?: string
50
82
  maxDate?: string
51
83
  withTime?: boolean
84
+ /**
85
+ * 是否选择秒。未传时:withTime 为 true 则默认带秒,纯日期为 false。
86
+ */
52
87
  withSeconds?: boolean
88
+ /**
89
+ * 绑定值格式(展示仍为墙钟)。
90
+ * string:YYYY-MM-DD[/ HH:mm:ss];timestamp:毫秒;iso:本地偏移 RFC3339;
91
+ * 亦可传入 dayjs 模板(对齐 Element Plus value-format)。
92
+ */
93
+ valueFormat?: RsDatePickerValueFormat
53
94
  labelPosition?: RsDatePickerLabelPosition
95
+ /** 底部快捷选项(有值时替代「今天/现在」链接) */
96
+ shortcuts?: RsDatePickerShortcut[]
97
+ size?: RsComponentSize
98
+ id?: string
99
+ invalid?: boolean
100
+ showValidateMessage?: boolean
54
101
  }>(),
55
102
  {
56
103
  disabled: false,
57
104
  required: false,
58
105
  range: false,
59
106
  withTime: false,
60
- withSeconds: false,
107
+ valueFormat: 'string',
61
108
  labelPosition: 'top',
109
+ showValidateMessage: true,
62
110
  },
63
111
  )
64
112
 
65
113
  const fieldId = useId()
114
+ const attrs = useAttrs()
66
115
  const { t } = useRsI18n()
116
+ const resolvedSize = useResolvedRsComponentSize(() => props.size)
117
+ const triggerIconSize = computed(() => RS_COMPONENT_SIZE_ICON_PX[resolvedSize.value])
118
+ /** withTime 默认带秒;显式 withSeconds 优先(勿与 prop 同名,避免模板取到未传 prop) */
119
+ const resolvedWithSeconds = computed(() =>
120
+ props.withSeconds !== undefined ? props.withSeconds : props.withTime,
121
+ )
122
+ const formContext = useRsFormContext()
123
+ const formItem = useRsFormItemContext()
124
+ const boundToItem = computed(() =>
125
+ isRsFormItemBoundControl(formItem, { id: props.id, name: props.name }),
126
+ )
127
+ const autoMessage = ref('')
128
+ const isInvalid = computed(() =>
129
+ Boolean(
130
+ props.invalid ||
131
+ (boundToItem.value && formItem?.invalid.value) ||
132
+ (!boundToItem.value && autoMessage.value),
133
+ ),
134
+ )
135
+ const triggerId = computed(() => props.id || fieldId)
136
+ const visibleMessage = computed(() =>
137
+ boundToItem.value || props.showValidateMessage === false ? '' : autoMessage.value,
138
+ )
67
139
 
68
140
  const viewYear = ref(getTodayDate().year)
69
141
  const viewMonth = ref(getTodayDate().month)
@@ -79,23 +151,52 @@ const draftTime = ref('')
79
151
  const draftStartTime = ref('')
80
152
  const draftEndTime = ref('')
81
153
 
154
+ const convertOptions = computed(() => ({
155
+ valueFormat: props.valueFormat ?? 'string',
156
+ withTime: props.withTime,
157
+ }))
158
+
159
+ const useTimestamp = computed(() => props.valueFormat === 'timestamp')
160
+
82
161
  const rangeModel = computed<RsDateRangeValue>({
83
162
  get() {
84
163
  if (!props.range) return { ...EMPTY_DATE_RANGE }
85
- return isRangeModel(model.value) ? model.value : { ...EMPTY_DATE_RANGE }
164
+ const value = model.value
165
+ const opts = convertOptions.value
166
+ if (isTimestampRange(value)) {
167
+ return {
168
+ start: formatTimestampValue(value[0], opts.withTime),
169
+ end: formatTimestampValue(value[1], opts.withTime),
170
+ }
171
+ }
172
+ if (!isRangeModel(value)) return { ...EMPTY_DATE_RANGE }
173
+ return {
174
+ start: toInternalPickerValue(value.start, opts) || undefined,
175
+ end: toInternalPickerValue(value.end, opts) || undefined,
176
+ }
86
177
  },
87
178
  set(value) {
88
- model.value = value
179
+ const opts = convertOptions.value
180
+ if (useTimestamp.value) {
181
+ const start = parseTimestampValue(value.start)
182
+ const end = parseTimestampValue(value.end)
183
+ model.value = start != null && end != null ? [start, end] : null
184
+ return
185
+ }
186
+ model.value = {
187
+ start: toRangeEndpointString(fromInternalPickerValue(value.start || '', opts)),
188
+ end: toRangeEndpointString(fromInternalPickerValue(value.end || '', opts)),
189
+ }
89
190
  },
90
191
  })
91
192
 
92
193
  const singleModel = computed({
93
194
  get() {
94
195
  if (props.range) return ''
95
- return typeof model.value === 'string' ? model.value : ''
196
+ return toInternalPickerValue(model.value, convertOptions.value)
96
197
  },
97
198
  set(value: string) {
98
- model.value = value
199
+ model.value = fromInternalPickerValue(value, convertOptions.value)
99
200
  },
100
201
  })
101
202
 
@@ -139,7 +240,7 @@ const triggerIcon = computed(() => {
139
240
 
140
241
  function currentTimeValue(): string {
141
242
  const now = getNowDateTime()
142
- return formatTimeParts(now.hour, now.minute, props.withSeconds ? now.second : undefined)
243
+ return formatTimeParts(now.hour, now.minute, resolvedWithSeconds.value ? now.second : undefined)
143
244
  }
144
245
 
145
246
  function resetRangeTimeDrafts(): void {
@@ -149,7 +250,7 @@ function resetRangeTimeDrafts(): void {
149
250
  }
150
251
 
151
252
  function combineDraftDateTime(date: RsParsedDate, time: string): string | null {
152
- return formatDateTimeParts(date, time, props.withSeconds)
253
+ return formatDateTimeParts(date, time, resolvedWithSeconds.value)
153
254
  }
154
255
 
155
256
  function setEndViewFromStart(start: RsParsedDate): void {
@@ -163,7 +264,7 @@ function syncSingleDraft(): void {
163
264
  const parsed = parseDateTimeValue(singleModel.value)
164
265
  if (parsed) {
165
266
  draftDate.value = { year: parsed.year, month: parsed.month, day: parsed.day }
166
- draftTime.value = extractTimeFromDateTime(singleModel.value, props.withSeconds)
267
+ draftTime.value = extractTimeFromDateTime(singleModel.value, resolvedWithSeconds.value)
167
268
  viewYear.value = parsed.year
168
269
  viewMonth.value = parsed.month
169
270
  return
@@ -205,7 +306,7 @@ function syncRangeDraft(): void {
205
306
  draftEnd.value = end ? { year: end.year, month: end.month, day: end.day } : null
206
307
 
207
308
  if (start) {
208
- draftStartTime.value = extractTimeFromDateTime(value.start, props.withSeconds)
309
+ draftStartTime.value = extractTimeFromDateTime(value.start, resolvedWithSeconds.value)
209
310
  startViewYear.value = start.year
210
311
  startViewMonth.value = start.month
211
312
  } else {
@@ -215,7 +316,7 @@ function syncRangeDraft(): void {
215
316
  }
216
317
 
217
318
  if (end) {
218
- draftEndTime.value = extractTimeFromDateTime(value.end, props.withSeconds)
319
+ draftEndTime.value = extractTimeFromDateTime(value.end, resolvedWithSeconds.value)
219
320
  endViewYear.value = end.year
220
321
  endViewMonth.value = end.month
221
322
  } else if (start) {
@@ -329,9 +430,33 @@ function confirmSelection(): void {
329
430
  confirmSingleSelection()
330
431
  }
331
432
 
433
+ function applyShortcut(shortcut: RsDatePickerShortcut): void {
434
+ if (props.disabled) return
435
+ const normalized = normalizeShortcutValue(shortcut.value(), { withTime: props.withTime })
436
+ if (!normalized) return
437
+
438
+ if (props.range) {
439
+ const rangeValue: RsDateRangeValue =
440
+ typeof normalized === 'string' ? { start: normalized, end: normalized } : normalized
441
+ if (!rangeValue.start || !rangeValue.end) return
442
+ if (!isDateRangeOrdered(rangeValue)) return
443
+ rangeModel.value = rangeValue
444
+ open.value = false
445
+ return
446
+ }
447
+
448
+ if (typeof normalized !== 'string') return
449
+ singleModel.value = normalized
450
+ open.value = false
451
+ }
452
+
332
453
  function clearSelection(): void {
333
454
  if (props.range) {
334
- rangeModel.value = { ...EMPTY_DATE_RANGE }
455
+ if (useTimestamp.value) {
456
+ model.value = null
457
+ } else {
458
+ rangeModel.value = { ...EMPTY_DATE_RANGE }
459
+ }
335
460
  draftStart.value = null
336
461
  draftEnd.value = null
337
462
  if (props.withTime) resetRangeTimeDrafts()
@@ -355,7 +480,7 @@ function selectToday(): void {
355
480
  endViewYear.value = today.year
356
481
  endViewMonth.value = today.month
357
482
  if (props.withTime) {
358
- const time = formatTimeParts(now.hour, now.minute, props.withSeconds ? now.second : undefined)
483
+ const time = formatTimeParts(now.hour, now.minute, resolvedWithSeconds.value ? now.second : undefined)
359
484
  draftStartTime.value = time
360
485
  draftEndTime.value = time
361
486
  }
@@ -367,7 +492,7 @@ function selectToday(): void {
367
492
  viewYear.value = today.year
368
493
  viewMonth.value = today.month
369
494
  if (props.withTime) {
370
- draftTime.value = formatTimeParts(now.hour, now.minute, props.withSeconds ? now.second : undefined)
495
+ draftTime.value = formatTimeParts(now.hour, now.minute, resolvedWithSeconds.value ? now.second : undefined)
371
496
  }
372
497
  confirmSingleSelection()
373
498
  }
@@ -417,8 +542,62 @@ function handleEndSelect(date: RsParsedDate): void {
417
542
  endViewMonth.value = date.month
418
543
  }
419
544
 
545
+ function clearValidation(): void {
546
+ autoMessage.value = ''
547
+ }
548
+
549
+ function setFieldValue(value: unknown): void {
550
+ if (props.range) {
551
+ if (isRangeModel(value as RsDatePickerModelValue)) {
552
+ model.value = value as RsDateRangeValue
553
+ return
554
+ }
555
+ if (Array.isArray(value) && value.length >= 2) {
556
+ model.value = { start: String(value[0] ?? ''), end: String(value[1] ?? '') }
557
+ return
558
+ }
559
+ model.value = { ...EMPTY_DATE_RANGE }
560
+ return
561
+ }
562
+ model.value = value == null ? '' : (value as RsDatePickerModelValue)
563
+ }
564
+
565
+ async function runValidate(trigger: RsFormRuleTrigger = 'submit') {
566
+ const formRules = formContext?.getFieldRules(props.name) ?? []
567
+ const localRules = buildLocalInputRules({ required: props.required })
568
+ const rules = [...formRules, ...localRules]
569
+ if (!rules.length) {
570
+ autoMessage.value = ''
571
+ return { valid: true as const, name: props.name }
572
+ }
573
+ const result = await runFormFieldRules(model.value, rules, { trigger })
574
+ autoMessage.value = result.message ?? ''
575
+ return { valid: result.valid, message: result.message, name: props.name }
576
+ }
577
+
578
+ useRsFormField(() => ({
579
+ get name() {
580
+ return props.name
581
+ },
582
+ getValue: () => model.value,
583
+ setValue: setFieldValue,
584
+ validate: (trigger) => runValidate(trigger ?? 'submit'),
585
+ clearValidation,
586
+ setError: (message: string) => {
587
+ autoMessage.value = message
588
+ },
589
+ }))
590
+
591
+ defineExpose({
592
+ setValue: setFieldValue,
593
+ clearValidation,
594
+ validate: runValidate,
595
+ })
596
+
420
597
  watch(open, (isOpen) => {
421
598
  if (isOpen) syncDraftFromModel()
599
+ // 关闭面板后按 change 触发校验(对齐选择类控件)
600
+ if (!isOpen && props.name) void runValidate('change')
422
601
  })
423
602
  </script>
424
603
 
@@ -430,20 +609,25 @@ watch(open, (isOpen) => {
430
609
  <span v-if="required" class="rs-field__required" aria-hidden="true">*</span>
431
610
  </span>
432
611
 
433
- <div class="rs-date-picker">
612
+ <div class="rs-date-picker" :class="`rs-date-picker--${resolvedSize}`">
434
613
  <PopoverRoot v-model:open="open">
435
614
  <PopoverTrigger
436
- :id="fieldId"
615
+ v-bind="attrs"
616
+ :id="triggerId"
437
617
  type="button"
438
618
  class="rs-date-picker__trigger"
439
- :class="{ 'rs-date-picker__trigger--placeholder': isEmpty }"
619
+ :class="{
620
+ 'rs-date-picker__trigger--placeholder': isEmpty,
621
+ 'rs-date-picker__trigger--invalid': isInvalid,
622
+ }"
440
623
  :disabled="disabled"
624
+ :aria-invalid="isInvalid || undefined"
441
625
  >
442
626
  <span class="rs-date-picker__leading">
443
- <RsIcon :name="triggerIcon" :size="16" class="rs-date-picker__icon" />
627
+ <RsIcon :name="triggerIcon" :size="triggerIconSize" class="rs-date-picker__icon" />
444
628
  <span class="rs-date-picker__value">{{ displayValue }}</span>
445
629
  </span>
446
- <RsIcon name="chevron-down" :size="16" class="rs-date-picker__chevron" />
630
+ <RsIcon name="chevron-down" :size="triggerIconSize" class="rs-date-picker__chevron" />
447
631
  </PopoverTrigger>
448
632
 
449
633
  <PopoverPortal>
@@ -476,7 +660,8 @@ watch(open, (isOpen) => {
476
660
  v-model="draftStartTime"
477
661
  class="rs-date-picker__time-picker"
478
662
  embedded
479
- :with-seconds="withSeconds"
663
+ :size="resolvedSize"
664
+ :with-seconds="resolvedWithSeconds"
480
665
  :disabled="!draftStart || disabled"
481
666
  />
482
667
  </div>
@@ -502,7 +687,8 @@ watch(open, (isOpen) => {
502
687
  v-model="draftEndTime"
503
688
  class="rs-date-picker__time-picker"
504
689
  embedded
505
- :with-seconds="withSeconds"
690
+ :size="resolvedSize"
691
+ :with-seconds="resolvedWithSeconds"
506
692
  :disabled="!draftEnd || disabled"
507
693
  />
508
694
  </div>
@@ -525,24 +711,39 @@ watch(open, (isOpen) => {
525
711
  v-model="draftTime"
526
712
  class="rs-date-picker__time-picker"
527
713
  embedded
528
- :with-seconds="withSeconds"
714
+ :size="resolvedSize"
715
+ :with-seconds="resolvedWithSeconds"
529
716
  :disabled="!draftDate || disabled"
530
717
  />
531
718
  </div>
532
719
  </template>
533
720
 
534
721
  <footer class="rs-date-picker__footer">
535
- <button type="button" class="rs-date-picker__link" @click="selectToday">
536
- {{
537
- range
538
- ? withTime
539
- ? t('dateTimePicker.now')
540
- : t('datePicker.rangeToday')
541
- : withTime
542
- ? t('dateTimePicker.now')
543
- : t('datePicker.today')
544
- }}
545
- </button>
722
+ <div class="rs-date-picker__footer-start">
723
+ <div v-if="shortcuts?.length" class="rs-date-picker__shortcuts">
724
+ <button
725
+ v-for="item in shortcuts"
726
+ :key="item.label"
727
+ type="button"
728
+ class="rs-date-picker__shortcut"
729
+ :disabled="disabled"
730
+ @click="applyShortcut(item)"
731
+ >
732
+ {{ item.label }}
733
+ </button>
734
+ </div>
735
+ <button v-else type="button" class="rs-date-picker__link" @click="selectToday">
736
+ {{
737
+ range
738
+ ? withTime
739
+ ? t('dateTimePicker.now')
740
+ : t('datePicker.rangeToday')
741
+ : withTime
742
+ ? t('dateTimePicker.now')
743
+ : t('datePicker.today')
744
+ }}
745
+ </button>
746
+ </div>
546
747
  <div class="rs-date-picker__actions">
547
748
  <button type="button" class="rs-date-picker__ghost" @click="clearSelection">
548
749
  {{ withTime ? t('dateTimePicker.clear') : t('datePicker.clear') }}
@@ -563,6 +764,9 @@ watch(open, (isOpen) => {
563
764
  </PopoverRoot>
564
765
  </div>
565
766
 
767
+ <p v-if="visibleMessage" class="rs-date-picker-field__error" role="alert">
768
+ {{ visibleMessage }}
769
+ </p>
566
770
  <span v-if="hint" class="rs-field__hint">{{ hint }}</span>
567
771
  </div>
568
772
  </template>
@@ -576,7 +780,9 @@ watch(open, (isOpen) => {
576
780
  align-items: center;
577
781
  justify-content: space-between;
578
782
  gap: var(--rs-space-sm);
783
+ box-sizing: border-box;
579
784
  width: 100%;
785
+ height: var(--rs-control-height-md);
580
786
  min-height: var(--rs-control-height-md);
581
787
  padding: 0 var(--rs-space-md);
582
788
  border: 1px solid var(--rs-input-border, var(--rs-border));
@@ -585,14 +791,34 @@ watch(open, (isOpen) => {
585
791
  color: var(--rs-text);
586
792
  font: inherit;
587
793
  font-size: var(--rs-font-size-sm);
794
+ line-height: var(--rs-line-height-tight);
588
795
  text-align: left;
589
796
  cursor: pointer;
797
+ outline: none;
590
798
  box-shadow: var(--rs-input-shadow, none);
591
799
  transition:
592
800
  border-color var(--rs-transition-fast),
593
801
  box-shadow var(--rs-transition-fast),
594
802
  background var(--rs-transition-fast);
595
803
  }
804
+ .rs-date-picker--ssm .rs-date-picker__trigger {
805
+ height: var(--rs-control-height-ssm);
806
+ min-height: var(--rs-control-height-ssm);
807
+ padding: 0 var(--rs-space-xs);
808
+ font-size: var(--rs-font-size-xs);
809
+ }
810
+ .rs-date-picker--sm .rs-date-picker__trigger {
811
+ height: var(--rs-control-height-sm);
812
+ min-height: var(--rs-control-height-sm);
813
+ padding: 0 var(--rs-space-sm);
814
+ font-size: var(--rs-font-size-xs);
815
+ }
816
+ .rs-date-picker--lg .rs-date-picker__trigger {
817
+ height: var(--rs-control-height-lg);
818
+ min-height: var(--rs-control-height-lg);
819
+ padding: 0 var(--rs-space-lg);
820
+ font-size: var(--rs-font-size-base);
821
+ }
596
822
  .rs-date-picker__trigger:hover:not(:disabled) {
597
823
  border-color: var(--rs-input-border-hover, var(--rs-border));
598
824
  }
@@ -611,6 +837,22 @@ watch(open, (isOpen) => {
611
837
  .rs-date-picker__trigger--placeholder .rs-date-picker__value {
612
838
  color: var(--rs-placeholder);
613
839
  }
840
+ .rs-date-picker__trigger--invalid {
841
+ border-color: var(--rs-danger, var(--rs-color-danger, #dc2626));
842
+ }
843
+ .rs-date-picker__trigger--invalid:focus-visible {
844
+ border-color: var(--rs-danger, var(--rs-color-danger, #dc2626));
845
+ box-shadow:
846
+ var(--rs-input-shadow, none),
847
+ 0 0 0 var(--rs-focus-ring-width, 2px)
848
+ color-mix(in srgb, var(--rs-danger, #dc2626) 14%, transparent);
849
+ }
850
+ .rs-date-picker-field__error {
851
+ margin: var(--rs-space-xs) 0 0;
852
+ color: var(--rs-danger, var(--rs-color-danger, #dc2626));
853
+ font-size: var(--rs-font-size-xs);
854
+ line-height: var(--rs-line-height-tight);
855
+ }
614
856
  .rs-date-picker__leading {
615
857
  display: inline-flex;
616
858
  min-width: 0;
@@ -676,7 +918,7 @@ watch(open, (isOpen) => {
676
918
  }
677
919
  .rs-date-picker__pane-title {
678
920
  font-size: var(--rs-font-size-xs);
679
- font-weight: 600;
921
+ font-weight: var(--rs-font-weight-semibold);
680
922
  color: var(--rs-muted);
681
923
  }
682
924
  .rs-date-picker__footer {
@@ -691,6 +933,41 @@ watch(open, (isOpen) => {
691
933
  border-top: 1px solid var(--rs-border-subtle);
692
934
  background: var(--rs-surface-elevated);
693
935
  }
936
+ .rs-date-picker__footer-start {
937
+ display: flex;
938
+ flex: 1;
939
+ align-items: center;
940
+ min-width: 0;
941
+ }
942
+ .rs-date-picker__shortcuts {
943
+ display: flex;
944
+ flex-wrap: wrap;
945
+ gap: 0.375rem;
946
+ align-items: center;
947
+ }
948
+ .rs-date-picker__shortcut {
949
+ padding: 0.125rem 0.5rem;
950
+ border: 1px solid var(--rs-border);
951
+ border-radius: var(--rs-radius-xs);
952
+ background: transparent;
953
+ color: var(--rs-text);
954
+ font-size: var(--rs-font-size-xs);
955
+ line-height: 1.5;
956
+ cursor: pointer;
957
+ transition:
958
+ border-color var(--rs-transition-fast),
959
+ color var(--rs-transition-fast),
960
+ background var(--rs-transition-fast);
961
+ }
962
+ .rs-date-picker__shortcut:hover:not(:disabled) {
963
+ border-color: var(--rs-primary);
964
+ color: var(--rs-primary);
965
+ background: color-mix(in srgb, var(--rs-primary) 8%, transparent);
966
+ }
967
+ .rs-date-picker__shortcut:disabled {
968
+ opacity: 0.38;
969
+ cursor: not-allowed;
970
+ }
694
971
  .rs-date-picker__link {
695
972
  border: 0;
696
973
  background: transparent;
@@ -746,7 +1023,7 @@ watch(open, (isOpen) => {
746
1023
  .rs-date-picker__time-label {
747
1024
  flex-shrink: 0;
748
1025
  font-size: var(--rs-font-size-xs);
749
- font-weight: 500;
1026
+ font-weight: var(--rs-font-weight-medium);
750
1027
  color: var(--rs-muted);
751
1028
  }
752
1029
  .rs-date-picker__time-picker {
@@ -1,11 +1,22 @@
1
1
  <script setup lang="ts">
2
2
  import RsDatePicker from './RsDatePicker.vue'
3
- import type { RsDateRangeValue } from './date-picker-utils'
3
+ import type { RsComponentSize } from '../theme/types'
4
+ import type {
5
+ RsDatePickerModelValue,
6
+ RsDatePickerShortcut,
7
+ RsDatePickerValueFormat,
8
+ RsDateRangeValue,
9
+ } from './date-picker-utils'
4
10
 
5
11
  export type RsDateTimeRangeValue = RsDateRangeValue
6
12
  export type RsDateTimePickerLabelPosition = 'top' | 'left'
13
+ export type {
14
+ RsDatePickerModelValue,
15
+ RsDatePickerShortcut,
16
+ RsDatePickerValueFormat,
17
+ }
7
18
 
8
- const model = defineModel<string | RsDateTimeRangeValue>({ default: '' })
19
+ const model = defineModel<RsDatePickerModelValue>({ default: '' })
9
20
  const open = defineModel<boolean>('open', { default: false })
10
21
 
11
22
  withDefaults(
@@ -19,14 +30,27 @@ withDefaults(
19
30
  withSeconds?: boolean
20
31
  minDate?: string
21
32
  maxDate?: string
33
+ /**
34
+ * 绑定值格式(展示仍为墙钟)。
35
+ * string:YYYY-MM-DD HH:mm:ss;timestamp:毫秒;iso:本地偏移 RFC3339;
36
+ * 亦可传入 dayjs 模板。
37
+ */
38
+ valueFormat?: RsDatePickerValueFormat
22
39
  labelPosition?: RsDateTimePickerLabelPosition
40
+ shortcuts?: RsDatePickerShortcut[]
41
+ size?: RsComponentSize
42
+ id?: string
43
+ invalid?: boolean
44
+ showValidateMessage?: boolean
23
45
  }>(),
24
46
  {
25
47
  disabled: false,
26
48
  required: false,
27
49
  range: false,
28
50
  withSeconds: false,
51
+ valueFormat: 'string',
29
52
  labelPosition: 'top',
53
+ showValidateMessage: true,
30
54
  },
31
55
  )
32
56
  </script>
@@ -38,5 +62,6 @@ withDefaults(
38
62
  v-model:open="open"
39
63
  with-time
40
64
  :with-seconds="withSeconds"
65
+ :value-format="valueFormat"
41
66
  />
42
67
  </template>