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
@@ -9,25 +9,26 @@ import { useResolvedRsComponentSize } from './resolve-size'
9
9
  import { rsRadiusCss, useResolvedRsRadius } from './resolve-radius'
10
10
 
11
11
  import {
12
-
13
- runInputValidation,
14
-
15
12
  type RsInputRule,
16
-
17
13
  type RsInputValidateTrigger,
18
-
19
14
  } from './input-rules'
20
15
 
21
16
  import {
22
-
17
+ isRsFormItemBoundControl,
23
18
  useRsFormContext,
24
-
25
19
  useRsFormField,
26
-
20
+ useRsFormItemContext,
27
21
  type RsFormLabelPosition,
28
-
29
22
  } from './form-utils'
30
23
 
24
+ import {
25
+ buildLocalInputRules,
26
+ runFormFieldRules,
27
+ type RsFormRuleTrigger,
28
+ } from './form-rules'
29
+
30
+ import RsVNodeHost from './RsVNodeHost.vue'
31
+
31
32
  import RsIcon from './RsIcon.vue'
32
33
 
33
34
 
@@ -94,14 +95,38 @@ const props = withDefaults(
94
95
 
95
96
  validateTrigger?: RsInputValidateTrigger
96
97
 
98
+ /** 字段名:匹配 RsForm.rules[name],并对齐大厂 Form.Item name */
99
+ name?: string
100
+
97
101
  /** 文本前缀(也可用 prefix 插槽) */
98
102
 
99
103
  prefix?: string
100
104
 
101
- /** 文本后缀(也可用 suffix 插槽) */
105
+ /** 文本后缀(也可用 suffix 插槽);框内,排在清除 / 显隐之后 */
102
106
 
103
107
  suffix?: string
104
108
 
109
+ /**
110
+ * 框外前置 addon(对齐 Ant addonBefore)。
111
+ * 与 prefix 不同:连体在输入框外侧,用于单位、协议等。
112
+ */
113
+ addonBefore?: string
114
+
115
+ /**
116
+ * 框外后置 addon(对齐 Ant addonAfter)。
117
+ * 文本单位、协议等;也可配合 addonAfterIcon 做选择器按钮。
118
+ */
119
+ addonAfter?: string
120
+
121
+ /**
122
+ * 框外后置图标按钮(Lucide 名,如 ellipsis)。
123
+ * 由组件自绘,走连体 addonAfter;无 #addonAfter / addonAfter 文本时生效。
124
+ */
125
+ addonAfterIcon?: string
126
+
127
+ /** addonAfterIcon 的无障碍文案 / title */
128
+ addonAfterIconLabel?: string
129
+
105
130
  /** 有值时展示清除按钮(对齐 Ant allowClear / Element clearable) */
106
131
 
107
132
  clearable?: boolean
@@ -132,6 +157,13 @@ const props = withDefaults(
132
157
 
133
158
  labelPosition?: RsFormLabelPosition
134
159
 
160
+ /**
161
+ * 浏览器自动填充。
162
+ * 默认:普通输入 off;password 用 new-password(off 常被浏览器忽略)。
163
+ * 需要记住时可显式传 on / username / current-password 等。
164
+ */
165
+ autocomplete?: string
166
+
135
167
  }>(),
136
168
 
137
169
  {
@@ -156,8 +188,6 @@ const props = withDefaults(
156
188
 
157
189
  showValidateMessage: true,
158
190
 
159
- labelPosition: 'top',
160
-
161
191
  },
162
192
 
163
193
  )
@@ -176,6 +206,9 @@ const emit = defineEmits<{
176
206
 
177
207
  clear: []
178
208
 
209
+ /** 点击 addonAfterIcon 时触发 */
210
+ addonAfterClick: [event: MouseEvent]
211
+
179
212
  }>()
180
213
 
181
214
 
@@ -185,6 +218,10 @@ const attrs = useAttrs()
185
218
  const slots = useSlots()
186
219
 
187
220
  const formContext = useRsFormContext()
221
+ const formItem = useRsFormItemContext()
222
+ const boundToItem = computed(() =>
223
+ isRsFormItemBoundControl(formItem, { id: props.id, name: props.name }),
224
+ )
188
225
 
189
226
  const fieldId = useId()
190
227
 
@@ -198,14 +235,36 @@ const autoMessage = ref('')
198
235
 
199
236
  const passwordVisible = ref(false)
200
237
 
201
-
238
+ /** 中文等 IME 合成中:仍写入 model,但不触发校验 / pressEnter */
239
+ const composing = ref(false)
202
240
 
203
241
  const hasPrefix = computed(() => Boolean(props.prefix || slots.prefix))
204
242
 
243
+ const hasCustomSuffix = computed(() => Boolean(props.suffix || slots.suffix))
244
+
245
+ const hasAddonBefore = computed(() => Boolean(props.addonBefore || slots.addonBefore))
246
+
247
+ /** 插槽或文本 addonAfter 内容(优先于图标按钮) */
248
+ const hasAddonAfterContent = computed(
249
+ () => Boolean(slots.addonAfter) || (props.addonAfter != null && props.addonAfter !== ''),
250
+ )
251
+
252
+ const hasAddonAfter = computed(
253
+ () => hasAddonAfterContent.value || Boolean(props.addonAfterIcon),
254
+ )
255
+
256
+ const hasAddon = computed(() => hasAddonBefore.value || hasAddonAfter.value)
257
+
205
258
 
206
259
 
207
260
  const resolvedId = computed(() => props.id ?? fieldId)
208
261
 
262
+ /** 未显式传 autocomplete 时关闭快捷填充;密码框用 new-password 更稳 */
263
+ const resolvedAutocomplete = computed(() => {
264
+ if (props.autocomplete != null && props.autocomplete !== '') return props.autocomplete
265
+ return props.type === 'password' ? 'new-password' : 'off'
266
+ })
267
+
209
268
  const resolvedLabelPosition = computed(
210
269
 
211
270
  () => props.labelPosition ?? formContext?.labelPosition.value ?? 'top',
@@ -219,18 +278,33 @@ const errorId = computed(() => `${resolvedId.value}-error`)
219
278
 
220
279
 
221
280
  const displayMessage = computed(() => {
222
-
281
+ if (boundToItem.value) return ''
223
282
  if (props.errorMessage) return props.errorMessage
224
-
225
283
  if (props.showValidateMessage && autoInvalid.value) return autoMessage.value
226
-
227
284
  return ''
228
-
229
285
  })
230
286
 
287
+ const errorSlotProps = computed(() => ({
288
+ name: props.name,
289
+ message: displayMessage.value,
290
+ value: model.value,
291
+ }))
292
+
293
+ /** Form 级 #error / errorRender;字段无 #error 时使用 */
294
+ const formErrorContent = computed(() => {
295
+ if (!displayMessage.value || !formContext?.renderError) return null
296
+ return formContext.renderError(errorSlotProps.value)
297
+ })
231
298
 
299
+ const isInvalid = computed(() => {
300
+ if (boundToItem.value) return Boolean(formItem?.invalid.value || props.invalid)
301
+ return props.invalid || autoInvalid.value
302
+ })
232
303
 
233
- const isInvalid = computed(() => props.invalid || autoInvalid.value)
304
+ const describedBy = computed(() => {
305
+ if (boundToItem.value) return formItem?.describedBy.value
306
+ return displayMessage.value ? errorId.value : undefined
307
+ })
234
308
 
235
309
  const resolvedDisabled = computed(() => props.disabled || formContext?.disabled.value || false)
236
310
 
@@ -278,7 +352,10 @@ const showCountDisplay = computed(() => props.showCount && props.maxlength != nu
278
352
 
279
353
  const countText = computed(() => `${model.value.length} / ${props.maxlength}`)
280
354
 
281
-
355
+ /** 无 addonAfter 内容时用组件自绘的后置图标按钮 */
356
+ const showAddonAfterIcon = computed(
357
+ () => Boolean(props.addonAfterIcon) && !hasAddonAfterContent.value,
358
+ )
282
359
 
283
360
  const hasSuffix = computed(
284
361
 
@@ -286,9 +363,7 @@ const hasSuffix = computed(
286
363
 
287
364
  Boolean(
288
365
 
289
- props.suffix ||
290
-
291
- slots.suffix ||
366
+ hasCustomSuffix.value ||
292
367
 
293
368
  showClearButton.value ||
294
369
 
@@ -300,6 +375,14 @@ const hasSuffix = computed(
300
375
 
301
376
  )
302
377
 
378
+ /**
379
+ * 点击框外后置图标按钮
380
+ */
381
+ function onAddonAfterIconClick(event: MouseEvent): void {
382
+ if (resolvedDisabled.value || resolvedReadonly.value) return
383
+ emit('addonAfterClick', event)
384
+ }
385
+
303
386
 
304
387
 
305
388
  const fieldStyle = computed(() => {
@@ -316,68 +399,45 @@ const fieldStyle = computed(() => {
316
399
 
317
400
 
318
401
 
319
- function runValidate() {
320
-
321
- if (!props.rule && !props.validator && !props.required) {
402
+ async function runValidate(trigger: RsFormRuleTrigger = 'submit') {
403
+ const formRules = formContext?.getFieldRules(props.name) ?? []
404
+ const localRules = buildLocalInputRules({
405
+ required: props.required,
406
+ rule: props.rule,
407
+ validator: props.validator,
408
+ })
409
+ const rules = [...formRules, ...localRules]
322
410
 
411
+ if (!rules.length) {
323
412
  autoInvalid.value = false
324
-
325
413
  autoMessage.value = ''
326
-
327
414
  emit('validate', { valid: true })
328
-
329
415
  return true
330
-
331
416
  }
332
417
 
333
-
334
-
335
- const result = runInputValidation(
336
-
337
- model.value,
338
-
339
- {
340
-
341
- rule: props.rule,
342
-
343
- required: props.required,
344
-
345
- validator: props.validator,
346
-
347
- },
348
-
349
- t,
350
-
351
- )
352
-
353
-
418
+ const result = await runFormFieldRules(model.value, rules, { trigger, t })
354
419
 
355
420
  autoInvalid.value = !result.valid
356
-
357
421
  autoMessage.value = result.message ?? ''
358
-
359
422
  emit('validate', result)
360
-
361
423
  return result.valid
424
+ }
362
425
 
426
+ function setError(message: string): void {
427
+ autoInvalid.value = true
428
+ autoMessage.value = message
363
429
  }
364
430
 
365
431
 
366
432
 
367
433
  function onInput() {
368
-
434
+ if (composing.value) return
369
435
  if (
370
-
371
436
  touched.value &&
372
-
373
437
  (props.validateTrigger === 'input' || props.validateTrigger === 'both')
374
-
375
438
  ) {
376
-
377
- runValidate()
378
-
439
+ void runValidate('change')
379
440
  }
380
-
381
441
  }
382
442
 
383
443
  /** 受控写入:始终取 DOM string value,不依赖 v-model 对 type=number 的隐式行为。 */
@@ -387,20 +447,23 @@ function onNativeInput(event: Event) {
387
447
  onInput()
388
448
  }
389
449
 
450
+ function onCompositionStart() {
451
+ composing.value = true
452
+ }
390
453
 
454
+ function onCompositionEnd(event: CompositionEvent) {
455
+ composing.value = false
456
+ onNativeInput(event)
457
+ }
391
458
 
392
- function onBlur(event: FocusEvent) {
393
459
 
394
- touched.value = true
395
460
 
461
+ function onBlur(event: FocusEvent) {
462
+ touched.value = true
396
463
  if (props.validateTrigger === 'blur' || props.validateTrigger === 'both') {
397
-
398
- runValidate()
399
-
464
+ void runValidate('blur')
400
465
  }
401
-
402
466
  emit('blur', event)
403
-
404
467
  }
405
468
 
406
469
 
@@ -414,13 +477,9 @@ function onFocus(event: FocusEvent) {
414
477
 
415
478
 
416
479
  function onKeydown(event: KeyboardEvent) {
417
-
418
- if (event.key === 'Enter') {
419
-
420
- emit('pressEnter', event)
421
-
422
- }
423
-
480
+ if (event.key !== 'Enter') return
481
+ if (composing.value || event.isComposing) return
482
+ emit('pressEnter', event)
424
483
  }
425
484
 
426
485
 
@@ -431,8 +490,7 @@ function onClear() {
431
490
 
432
491
  emit('clear')
433
492
 
434
- if (touched.value) runValidate()
435
-
493
+ if (touched.value) void runValidate('change')
436
494
  }
437
495
 
438
496
 
@@ -466,27 +524,24 @@ function clearValidation(): void {
466
524
 
467
525
 
468
526
  useRsFormField(() => ({
469
-
527
+ get name() {
528
+ return props.name
529
+ },
470
530
  getValue: () => model.value,
471
-
472
531
  setValue,
473
-
474
- validate: () => ({ valid: runValidate() }),
475
-
532
+ validate: async (trigger) => {
533
+ const valid = await runValidate(trigger ?? 'submit')
534
+ return { valid, message: autoMessage.value || undefined, name: props.name }
535
+ },
476
536
  clearValidation,
477
-
537
+ setError,
478
538
  }))
479
539
 
480
-
481
-
482
540
  defineExpose({
483
-
484
541
  validate: runValidate,
485
-
486
542
  clearValidation,
487
-
488
543
  setValue,
489
-
544
+ setError,
490
545
  })
491
546
 
492
547
  </script>
@@ -529,6 +584,40 @@ defineExpose({
529
584
 
530
585
  <div class="rs-input-field">
531
586
 
587
+ <div
588
+
589
+ class="rs-input-shell"
590
+
591
+ :class="[
592
+
593
+ `rs-input-shell--${resolvedSize}`,
594
+
595
+ {
596
+
597
+ 'rs-input-shell--combined': hasAddon,
598
+
599
+ 'rs-input-shell--invalid': isInvalid,
600
+
601
+ 'rs-input-shell--disabled': resolvedDisabled,
602
+
603
+ },
604
+
605
+ ]"
606
+
607
+ >
608
+
609
+ <span
610
+
611
+ v-if="hasAddonBefore"
612
+
613
+ class="rs-input-addon rs-input-addon--before"
614
+
615
+ >
616
+
617
+ <slot name="addonBefore">{{ addonBefore }}</slot>
618
+
619
+ </span>
620
+
532
621
  <div
533
622
 
534
623
  class="rs-input-group"
@@ -547,6 +636,10 @@ defineExpose({
547
636
 
548
637
  'rs-input-group--has-suffix': hasSuffix,
549
638
 
639
+ 'rs-input-group--combined-before': hasAddonBefore,
640
+
641
+ 'rs-input-group--combined-after': hasAddonAfter,
642
+
550
643
  }"
551
644
 
552
645
  >
@@ -585,12 +678,18 @@ defineExpose({
585
678
 
586
679
  :maxlength="maxlength"
587
680
 
681
+ :autocomplete="resolvedAutocomplete"
682
+
588
683
  :aria-invalid="isInvalid || undefined"
589
684
 
590
- :aria-describedby="displayMessage ? errorId : undefined"
685
+ :aria-describedby="describedBy"
591
686
 
592
687
  @input="onNativeInput"
593
688
 
689
+ @compositionstart="onCompositionStart"
690
+
691
+ @compositionend="onCompositionEnd"
692
+
594
693
  @blur="onBlur"
595
694
 
596
695
  @focus="onFocus"
@@ -607,8 +706,6 @@ defineExpose({
607
706
 
608
707
  >
609
708
 
610
- <slot name="suffix">{{ suffix }}</slot>
611
-
612
709
  <span
613
710
 
614
711
  v-if="showCountDisplay"
@@ -665,28 +762,75 @@ defineExpose({
665
762
 
666
763
  </button>
667
764
 
765
+ <span v-if="hasCustomSuffix" class="rs-input-group__custom-suffix">
766
+
767
+ <slot name="suffix">{{ suffix }}</slot>
768
+
769
+ </span>
770
+
668
771
  </span>
669
772
 
670
773
  </div>
671
774
 
672
- </div>
775
+ <span
673
776
 
777
+ v-if="hasAddonAfter"
674
778
 
779
+ class="rs-input-addon rs-input-addon--after"
675
780
 
676
- <p
781
+ :class="{ 'rs-input-addon--icon': showAddonAfterIcon }"
677
782
 
678
- v-if="displayMessage"
783
+ >
679
784
 
680
- :id="errorId"
785
+ <template v-if="hasAddonAfterContent">
681
786
 
682
- class="rs-input-field__error"
787
+ <slot name="addonAfter">{{ addonAfter }}</slot>
683
788
 
684
- role="alert"
789
+ </template>
685
790
 
686
- >
791
+ <button
792
+
793
+ v-else-if="showAddonAfterIcon"
794
+
795
+ type="button"
796
+
797
+ class="rs-input-addon__button"
798
+
799
+ :aria-label="addonAfterIconLabel || undefined"
800
+
801
+ :title="addonAfterIconLabel || undefined"
802
+
803
+ :disabled="resolvedDisabled || resolvedReadonly"
804
+
805
+ @click="onAddonAfterIconClick"
806
+
807
+ >
808
+
809
+ <RsIcon :name="addonAfterIcon!" :size="14" />
687
810
 
688
- {{ displayMessage }}
811
+ </button>
812
+
813
+ </span>
689
814
 
815
+ </div>
816
+
817
+ </div>
818
+
819
+
820
+
821
+ <p
822
+ v-if="displayMessage"
823
+ :id="errorId"
824
+ class="rs-input-field__error"
825
+ role="alert"
826
+ >
827
+ <slot name="error" v-bind="errorSlotProps">
828
+ <RsVNodeHost
829
+ v-if="formErrorContent !== null && formErrorContent !== undefined"
830
+ :content="formErrorContent"
831
+ />
832
+ <template v-else>{{ displayMessage }}</template>
833
+ </slot>
690
834
  </p>
691
835
 
692
836
 
@@ -707,6 +851,243 @@ defineExpose({
707
851
 
708
852
  }
709
853
 
854
+ .rs-input-shell {
855
+
856
+ width: 100%;
857
+
858
+ }
859
+
860
+ /* 连体外壳统一外边框,避免 input/addon 各自圆角造成拼缝 */
861
+ .rs-input-shell--combined {
862
+
863
+ display: flex;
864
+
865
+ align-items: stretch;
866
+
867
+ box-sizing: border-box;
868
+
869
+ width: 100%;
870
+
871
+ border: 1px solid var(--rs-input-border, var(--rs-border));
872
+
873
+ border-radius: var(--rs-input-radius, var(--rs-radius-sm));
874
+
875
+ background: var(--rs-input-bg);
876
+
877
+ box-shadow: var(--rs-input-shadow, none);
878
+
879
+ overflow: hidden;
880
+
881
+ transition:
882
+
883
+ border-color var(--rs-transition-fast),
884
+
885
+ box-shadow var(--rs-transition-fast),
886
+
887
+ background var(--rs-transition-fast);
888
+
889
+ }
890
+
891
+ .rs-input-shell--combined:hover:not(:focus-within):not(:has(.rs-input-group--disabled)):not(
892
+ :has(.rs-input-group--readonly)
893
+ ) {
894
+
895
+ border-color: var(--rs-input-border-hover, var(--rs-border));
896
+
897
+ }
898
+
899
+ .rs-input-shell--combined:focus-within {
900
+
901
+ border-color: var(--rs-focus-border, var(--rs-primary));
902
+
903
+ box-shadow:
904
+
905
+ var(--rs-input-shadow, none),
906
+
907
+ 0 0 0 var(--rs-focus-ring-width, 2px) var(--rs-focus-ring);
908
+
909
+ }
910
+
911
+ .rs-input-shell--combined:has(.rs-input-group--invalid) {
912
+
913
+ border-color: var(--rs-danger);
914
+
915
+ }
916
+
917
+ .rs-input-shell--combined:has(.rs-input-group--invalid):focus-within {
918
+
919
+ border-color: var(--rs-danger);
920
+
921
+ box-shadow:
922
+
923
+ var(--rs-input-shadow, none),
924
+
925
+ 0 0 0 var(--rs-focus-ring-width, 2px)
926
+
927
+ color-mix(in srgb, var(--rs-danger) 14%, transparent);
928
+
929
+ }
930
+
931
+ .rs-input-shell--combined .rs-input-group {
932
+
933
+ flex: 1;
934
+
935
+ min-width: 0;
936
+
937
+ width: auto;
938
+
939
+ border: none;
940
+
941
+ border-radius: 0;
942
+
943
+ box-shadow: none;
944
+
945
+ background: transparent;
946
+
947
+ }
948
+
949
+ .rs-input-shell--combined .rs-input-group:hover:not(.rs-input-group--disabled):not(
950
+ .rs-input-group--readonly
951
+ ):not(:focus-within),
952
+ .rs-input-shell--combined .rs-input-group:focus-within,
953
+ .rs-input-shell--combined .rs-input-group--invalid,
954
+ .rs-input-shell--combined .rs-input-group--invalid:focus-within {
955
+
956
+ border-color: transparent;
957
+
958
+ box-shadow: none;
959
+
960
+ }
961
+
962
+ .rs-input-addon {
963
+
964
+ display: inline-flex;
965
+
966
+ align-items: center;
967
+
968
+ justify-content: center;
969
+
970
+ box-sizing: border-box;
971
+
972
+ flex-shrink: 0;
973
+
974
+ min-width: var(--rs-control-height-md);
975
+
976
+ padding: 0 var(--rs-space-sm);
977
+
978
+ border: none;
979
+
980
+ border-left: 1px solid var(--rs-input-border, var(--rs-border));
981
+
982
+ border-radius: 0;
983
+
984
+ background: var(--rs-surface-hover);
985
+
986
+ color: var(--rs-muted);
987
+
988
+ font-size: var(--rs-font-size-sm);
989
+
990
+ white-space: nowrap;
991
+
992
+ }
993
+
994
+ .rs-input-addon--before {
995
+
996
+ border-left: none;
997
+
998
+ border-right: 1px solid var(--rs-input-border, var(--rs-border));
999
+
1000
+ }
1001
+
1002
+ .rs-input-shell--ssm .rs-input-addon {
1003
+
1004
+ min-width: var(--rs-control-height-ssm);
1005
+
1006
+ padding: 0 var(--rs-space-xs);
1007
+
1008
+ }
1009
+
1010
+ .rs-input-shell--sm .rs-input-addon {
1011
+
1012
+ min-width: var(--rs-control-height-sm);
1013
+
1014
+ padding: 0 var(--rs-space-xs);
1015
+
1016
+ }
1017
+
1018
+ .rs-input-shell--lg .rs-input-addon {
1019
+
1020
+ min-width: var(--rs-control-height-lg);
1021
+
1022
+ padding: 0 var(--rs-space-md);
1023
+
1024
+ }
1025
+
1026
+ .rs-input-addon--icon {
1027
+ padding: 0;
1028
+ /* 图标选择器与输入区同底,整块一致,避免灰底 + 按钮再叠一层 hover */
1029
+ background: transparent;
1030
+ color: var(--rs-muted);
1031
+ transition: color var(--rs-transition-fast), background var(--rs-transition-fast);
1032
+ }
1033
+
1034
+ .rs-input-addon--icon:hover {
1035
+ color: var(--rs-primary);
1036
+ background: color-mix(in srgb, var(--rs-primary) 8%, transparent);
1037
+ }
1038
+
1039
+ .rs-input-addon__button {
1040
+ display: inline-flex;
1041
+ align-items: center;
1042
+ justify-content: center;
1043
+ box-sizing: border-box;
1044
+ width: 100%;
1045
+ height: 100%;
1046
+ min-width: inherit;
1047
+ margin: 0;
1048
+ padding: 0;
1049
+ border: none;
1050
+ background: transparent;
1051
+ color: inherit;
1052
+ cursor: pointer;
1053
+ }
1054
+
1055
+ .rs-input-addon__button:hover:not(:disabled) {
1056
+ /* 悬浮样式交给整块 .rs-input-addon--icon,按钮不再单独变色/铺底 */
1057
+ color: inherit;
1058
+ background: transparent;
1059
+ }
1060
+
1061
+ .rs-input-addon__button:focus-visible {
1062
+ outline: none;
1063
+ color: var(--rs-primary);
1064
+ box-shadow: inset 0 0 0 var(--rs-focus-ring-width, 2px) var(--rs-focus-ring);
1065
+ }
1066
+
1067
+ .rs-input-addon__button:disabled {
1068
+ cursor: not-allowed;
1069
+ opacity: 0.38;
1070
+ }
1071
+
1072
+ .rs-input-shell--disabled .rs-input-addon,
1073
+ .rs-input-shell--combined:has(.rs-input-group--disabled) .rs-input-addon {
1074
+
1075
+ opacity: 0.38;
1076
+
1077
+ cursor: not-allowed;
1078
+
1079
+ }
1080
+
1081
+ .rs-input-group__custom-suffix {
1082
+
1083
+ display: inline-flex;
1084
+
1085
+ align-items: center;
1086
+
1087
+ gap: var(--rs-space-xs);
1088
+
1089
+ }
1090
+
710
1091
  .rs-field--label-left .rs-input-field {
711
1092
 
712
1093
  grid-column: 2;
@@ -755,8 +1136,12 @@ defineExpose({
755
1136
 
756
1137
  align-items: center;
757
1138
 
1139
+ box-sizing: border-box;
1140
+
758
1141
  width: 100%;
759
1142
 
1143
+ height: var(--rs-control-height-md);
1144
+
760
1145
  min-height: var(--rs-control-height-md);
761
1146
 
762
1147
  border-radius: var(--rs-input-radius, var(--rs-radius-sm));
@@ -783,18 +1168,24 @@ defineExpose({
783
1168
 
784
1169
  .rs-input-group--ssm {
785
1170
 
1171
+ height: var(--rs-control-height-ssm);
1172
+
786
1173
  min-height: var(--rs-control-height-ssm);
787
1174
 
788
1175
  }
789
1176
 
790
1177
  .rs-input-group--sm {
791
1178
 
1179
+ height: var(--rs-control-height-sm);
1180
+
792
1181
  min-height: var(--rs-control-height-sm);
793
1182
 
794
1183
  }
795
1184
 
796
1185
  .rs-input-group--lg {
797
1186
 
1187
+ height: var(--rs-control-height-lg);
1188
+
798
1189
  min-height: var(--rs-control-height-lg);
799
1190
 
800
1191
  }