niuma-ui 1.1.8 → 1.1.9

package/CHANGELOG.md

@@ -6,6 +6,18 @@
 
 ## [Unreleased]
 
+## [1.1.9] - 2026-08-28
+
+### 修复
+
+- `RsTable`：子表 / 表头默认 `T = any`，避免 inject 子组件把插槽 `row` 收成 `object`。宿主 `#col="{ row }"` 即可用行字段，不必断言。公开类型仍导出 `RsTableSlots` / `RsTableColumnSlotProps`。
+- `RsSelect`：增加泛型 `Value` / `Multiple` / `LabelInValue`，默认单选 `string`。`@update:model-value` 不再是 `string | number | 数组 | labeled` 大联合。数字 value 写 `RsSelect<number>`；`labelInValue` 仍可用。
+- `RsSplitPane`：导出 `RsSplitPaneExpose` / `RsSplitPaneInstance`，模板 ref 用该类型，避免 `InstanceType<typeof RsSplitPane>` 把 vue-tsc 打爆。
+- `RsMonacoEditor`：导出 `RsMonacoEditorExpose`，模板 ref 用该类型，避免 `InstanceType<typeof RsMonacoEditor>` 把 vue-tsc 打爆。
+- `RsInput`：导出 `RsInputExpose` / `RsInputInstance`，模板 ref 用该类型，避免 `InstanceType<typeof RsInput>` 把 vue-tsc 打爆。
+
+运行时兼容 1.1.8；以上为 TypeScript 合约收口。
+
 ## [1.1.8] - 2026-08-28
 
 ### 新增
@@ -183,7 +195,8 @@
 
 - 1.0 之前的私有 tag（如 `v0.1.0`）仅作历史记录；新接入请依赖 `v1.0.0` 及之后版本。
 
-[Unreleased]: https://github.com/Blair-Shang/niuma-ui/compare/v1.1.8...HEAD
+[Unreleased]: https://github.com/Blair-Shang/niuma-ui/compare/v1.1.9...HEAD
+[1.1.9]: https://github.com/Blair-Shang/niuma-ui/releases/tag/v1.1.9
 [1.1.8]: https://github.com/Blair-Shang/niuma-ui/releases/tag/v1.1.8
 [1.1.7]: https://github.com/Blair-Shang/niuma-ui/releases/tag/v1.1.7
 [1.1.6]: https://github.com/Blair-Shang/niuma-ui/releases/tag/v1.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "niuma-ui",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "license": "Apache-2.0",
   "type": "module",
   "description": "Vue 3 设计系统与 Rs* 组件库（--rs-* token）",

package/src/__tests__/rs-select-model.types.spec.ts

@@ -0,0 +1,28 @@
+import { describe, expectTypeOf, it } from 'vitest'
+import type { RsSelectLabeledValue, RsSelectResolvedModel } from '../components/select-utils'
+
+describe('RsSelect resolved model', () => {
+  it('defaults to a string (single select)', () => {
+    expectTypeOf<RsSelectResolvedModel>().toEqualTypeOf<string>()
+  })
+
+  it('multiple literal true is a string array', () => {
+    expectTypeOf<RsSelectResolvedModel<string, true>>().toEqualTypeOf<string[]>()
+  })
+
+  it('number value stays number | empty', () => {
+    expectTypeOf<RsSelectResolvedModel<number>>().toEqualTypeOf<number | ''>()
+  })
+
+  it('labelInValue literal true is labeled or empty', () => {
+    expectTypeOf<RsSelectResolvedModel<string, false, true>>().toEqualTypeOf<
+      RsSelectLabeledValue | ''
+    >()
+  })
+
+  it('boolean multiple keeps the union so runtime flags still type-check', () => {
+    expectTypeOf<RsSelectResolvedModel<string, boolean>>().toEqualTypeOf<
+      string | string[]
+    >()
+  })
+})

package/src/__tests__/rs-table-slots.types.spec.ts

@@ -0,0 +1,20 @@
+import { describe, expectTypeOf, it } from 'vitest'
+import type {
+  RsTableColumnSlotProps,
+  RsTableSlots,
+} from '../components/table/rs-table-props'
+
+describe('RsTable slot types', () => {
+  it('column slot row is the table generic', () => {
+    type Row = { id: string; name: string }
+    expectTypeOf<RsTableColumnSlotProps<Row>['row']>().toEqualTypeOf<Row>()
+    expectTypeOf<RsTableColumnSlotProps<Row>['index']>().toEqualTypeOf<number>()
+  })
+
+  it('named column slots stay callable with the row generic', () => {
+    type Row = { id: string; name: string }
+    type NameSlot = NonNullable<RsTableSlots<Row>['name']>
+    expectTypeOf<NameSlot>().toBeFunction()
+    expectTypeOf<NameSlot>().parameter(0).toMatchTypeOf<{ row: Row; index: number }>()
+  })
+})

package/src/components/RsInput.vue

@@ -31,7 +31,19 @@ import RsVNodeHost from './RsVNodeHost.vue'
 
 import RsIcon from './RsIcon.vue'
 
+/**
+ * RsInput 模板 ref 请用此类型。
+ * 不要写 `InstanceType<typeof RsInput>`：组件实例类型过深，vue-tsc 会报 Excessive stack depth。
+ */
+export interface RsInputExpose {
+  validate: (trigger?: RsFormRuleTrigger) => Promise<boolean>
+  clearValidation: () => void
+  setValue: (value: unknown) => void
+  setError: (message: string) => void
+}
 
+/** 模板 ref 实例：expose + 根节点 */
+export type RsInputInstance = RsInputExpose & { $el: HTMLElement }
 
 const { t } = useRsI18n()
 
@@ -537,7 +549,7 @@ useRsFormField(() => ({
   setError,
 }))
 
-defineExpose({
+defineExpose<RsInputExpose>({
   validate: runValidate,
   clearValidation,
   setValue,

package/src/components/RsMonacoEditor.vue

@@ -31,6 +31,16 @@ export interface MonacoCompletionSnippet {
   preselect?: boolean
 }
 
+/**
+ * RsMonacoEditor 模板 ref 请用此类型。
+ * 不要写 `InstanceType<typeof RsMonacoEditor>`：组件实例类型过深，vue-tsc 会报 Excessive stack depth。
+ */
+export interface RsMonacoEditorExpose {
+  format: () => void
+  getEditor: () => import('monaco-editor').editor.IStandaloneCodeEditor | null
+  revealLine: (line: number) => void
+}
+
 /** MonacoCompletionContext 描述一次补全请求的编辑器上下文。 */
 export interface MonacoCompletionContext {
   text: string
@@ -498,7 +508,7 @@ watch(() => props.completionTriggerCharacters, () => applySnippets(), { deep: tr
 watch(() => props.completionPrefixResolver, () => applySnippets())
 
 // ── Expose ────────────────────────────────────────────────────────────
-defineExpose({
+defineExpose<RsMonacoEditorExpose>({
   /** 格式化文档（等价于 Shift+Alt+F） */
   format(): void {
     editor?.getAction('editor.action.formatDocument')?.run().catch(() => undefined)

package/src/components/RsSelect.vue

@@ -1,5 +1,5 @@
-<script setup lang="ts">
-import { computed, ref, useAttrs } from 'vue'
+<script setup lang="ts" generic="Value extends string | number = string, Multiple extends boolean = false, LabelInValue extends boolean = false">
+import { computed, ref, useAttrs, type ModelRef } from 'vue'
 
 import { useRsI18n } from '../composables/useRsI18n'
 import type { RsComponentSize, RsRadius } from '../theme/types'
@@ -31,6 +31,7 @@ import {
   type RsSelectOptionFilterProp,
   type RsSelectOptionsInput,
   type RsSelectPlacement,
+  type RsSelectResolvedModel,
   type RsSelectStatus,
   type RsSelectValue,
 } from './select-utils'
@@ -53,7 +54,9 @@ import {
 
 defineOptions({ inheritAttrs: false })
 
-const model = defineModel<RsSelectModelValue>({ default: '' })
+const model = defineModel<RsSelectResolvedModel<Value, Multiple, LabelInValue>>({
+  default: '' as never,
+})
 const open = defineModel<boolean>('open', { default: false })
 const searchQuery = defineModel<string>('searchValue', { default: '' })
 
@@ -69,7 +72,7 @@ const props = withDefaults(
      * 开启后若未显式关 searchable，将自动启用搜索框。
      */
     creatable?: boolean
-    multiple?: boolean
+    multiple?: Multiple
     required?: boolean
     name?: string
     clearable?: boolean
@@ -98,7 +101,7 @@ const props = withDefaults(
     maxTagCount?: number
     maxTagPlaceholder?: string | ((omitted: number) => string)
     multipleLimit?: number
-    labelInValue?: boolean
+    labelInValue?: LabelInValue
     filterSort?: RsSelectFilterSort
     maxTagTextLength?: number
     maxTagTooltip?: boolean
@@ -125,7 +128,6 @@ const props = withDefaults(
     disabled: false,
     searchable: false,
     creatable: false,
-    multiple: false,
     required: false,
     clearable: false,
     virtual: false,
@@ -137,7 +139,6 @@ const props = withDefaults(
     filterOption: true,
     optionFilterProp: 'label',
     optionLabelProp: 'label',
-    labelInValue: false,
     maxTagTooltip: true,
     autoClearSearchValue: true,
     fillSearchWithValue: false,
@@ -198,7 +199,7 @@ const {
   removeTag,
   setValue,
   resetSearch,
-} = useRsSelect(props, model, open, searchQuery, emit, t)
+} = useRsSelect(props, model as ModelRef<RsSelectModelValue>, open, searchQuery, emit, t)
 
 const resolvedDisabled = computed(() => props.disabled || formContext?.disabled.value || false)
 const resolvedSize = useResolvedRsComponentSize(() => props.size)

package/src/components/RsSplitPane.vue

@@ -13,6 +13,7 @@ import {
   roundSize,
   splitSizesEqual,
   type RsSplitOrientation,
+  type RsSplitPaneExpose,
   type RsSplitPaneItem,
 } from './split-pane-utils'
 
@@ -440,7 +441,12 @@ function reset(): void {
   emit('resize-end', sizes.value.slice())
 }
 
-defineExpose({ collapse, expand, reset, getSizes: () => sizes.value.slice() })
+defineExpose<RsSplitPaneExpose>({
+  collapse,
+  expand,
+  reset,
+  getSizes: () => sizes.value.slice(),
+})
 </script>
 
 <template>

package/src/components/RsTable.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts" generic="T extends import('./table-utils').RsTableRowData">
+<script setup lang="ts" generic="T extends import('./table-utils').RsTableRowData = any">
 import { computed, ref, useSlots } from 'vue'
 import RsContextMenu from './RsContextMenu.vue'
 import { assembleRsTableApi } from '../composables/assembleRsTableApi'

package/src/components/select-utils.ts

@@ -57,6 +57,27 @@ export type RsSelectModelValue =
   | RsSelectLabeledValue[]
   | ''
 
+/**
+ * 按泛型收窄后的 v-model。
+ * 默认单选、值为 string：宿主 `@update:model-value="(v: string) => void"` 可直接赋值。
+ * `multiple` / `labelInValue` 为字面量 true 时收成数组或 labeled；为 `boolean` 时保留联合。
+ */
+export type RsSelectResolvedModel<
+  Value extends RsSelectValue = string,
+  Multiple extends boolean = false,
+  LabelInValue extends boolean = false,
+> = LabelInValue extends true
+  ? Multiple extends true
+    ? RsSelectLabeledValue[]
+    : Multiple extends false
+      ? RsSelectLabeledValue | ''
+      : RsSelectLabeledValue | RsSelectLabeledValue[] | ''
+  : Multiple extends true
+    ? Value[]
+    : Multiple extends false
+      ? Value | ''
+      : Value | Value[] | ''
+
 /**
  * Reka ComboboxItem 禁止 value 为空串（空串表示未选中 / placeholder）。
  * 选项若传入 value: ''，对内映射为此哨兵，避免崩溃；对外读写仍为 ''。

package/src/components/split-pane-utils.ts

@@ -27,6 +27,20 @@ export interface RsSplitPaneItem {
   resizerHandle?: boolean
 }
 
+/**
+ * RsSplitPane 模板 ref 请用此类型。
+ * 不要写 `InstanceType<typeof RsSplitPane>`：组件实例类型过深，vue-tsc 会报 Excessive stack depth。
+ */
+export interface RsSplitPaneExpose {
+  collapse: (key: string) => void
+  expand: (key: string, toSize?: number) => void
+  reset: () => void
+  getSizes: () => number[]
+}
+
+/** 模板 ref 实例：expose + 根节点 */
+export type RsSplitPaneInstance = RsSplitPaneExpose & { $el: HTMLElement }
+
 /** 由 RsSplitPaneItem 解析出的规范化约束 */
 export interface RsSplitConstraint {
   min: number

package/src/components/table/RsTableBody.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts" generic="T extends import('../table-utils').RsTableRowData">
+<script setup lang="ts" generic="T extends import('../table-utils').RsTableRowData = any">
 /**
  * RsTable 表体视图：通过 ViewContext inject 取状态（多表互不串扰）。
  * 行级 v-memo 保留，避免抽离后丢失细粒度跳过渲染。

package/src/components/table/RsTableBodyRow.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts" generic="T extends import('../table-utils').RsTableRowData">
+<script setup lang="ts" generic="T extends import('../table-utils').RsTableRowData = any">
 import type { RsTableColumn, RsTableRowDropPosition, RsTableSelectionType } from '../table-utils'
 import type { RsTableCellEditTrigger } from './table-edit-utils'
 import RsTableCell from './RsTableCell.vue'

package/src/components/table/RsTableCell.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts" generic="T extends import('../table-utils').RsTableRowData">
+<script setup lang="ts" generic="T extends import('../table-utils').RsTableRowData = any">
 import { computed, ref, watch } from 'vue'
 import type { RsTableColumn } from '../table-utils'
 import RsCheckbox from '../RsCheckbox.vue'

package/src/components/table/RsTableCellEditor.vue

@@ -6,7 +6,7 @@ import RsDatePicker from '../RsDatePicker.vue'
 import RsInput from '../RsInput.vue'
 import RsInputNumber from '../RsInputNumber.vue'
 import RsSelect from '../RsSelect.vue'
-import type { RsSelectModelValue, RsSelectOptions } from '../select-utils'
+import type { RsSelectOptions } from '../select-utils'
 import type { RsTableColumnEditorOptionsResolved, RsTableCellValueType } from '../table-utils'
 import {
   applyFocusMode,
@@ -223,15 +223,8 @@ function onKeydown(event: KeyboardEvent): void {
   }
 }
 
-function onSelectUpdate(value: RsSelectModelValue): void {
-  const toToken = (item: RsSelectModelValue): string => {
-    if (item == null || item === '') return ''
-    if (typeof item === 'object' && !Array.isArray(item) && 'value' in item) {
-      return String(item.value)
-    }
-    return String(item)
-  }
-  const tokens = Array.isArray(value) ? value.map(toToken) : toToken(value)
+function onSelectUpdate(value: string | string[]): void {
+  const tokens = Array.isArray(value) ? value.map(String) : String(value)
   const empty =
     tokens === '' || (Array.isArray(tokens) && tokens.length === 0)
   // 表格内下拉默认不可清除：仅选择；显式 clearable 时才允许清空

package/src/components/table/RsTableHeader.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts" generic="T extends import('../table-utils').RsTableRowData">
+<script setup lang="ts" generic="T extends import('../table-utils').RsTableRowData = any">
 import RsIcon from '../RsIcon.vue'
 import RsTableHeaderFilter from './RsTableHeaderFilter.vue'
 import { useRsTableView } from './rs-table-view-context'

package/src/components/table/rs-table-props.ts

@@ -211,6 +211,72 @@ export type RsTableEmits<T extends RsTableRowData = RsTableRowData> = {
   rowEditRollback: [row: T, index: number]
 }
 
+/**
+ * 插槽回调按双变处理：宿主把 row 写成业务行类型时，不被逆变拒绝。
+ * 列插槽名是动态的，vue-tsc 不能从子组件 inject 推断 T，必须由 RsTable 自身 declare。
+ */
+type RsTableSlotFn<P> = {
+  bivarianceHack(props: P): unknown
+}['bivarianceHack']
+
+/** 列单元格插槽参数（`#columnKey`） */
+export interface RsTableColumnSlotProps<T extends RsTableRowData = RsTableRowData> {
+  row: T
+  column: RsTableColumn<T>
+  index: number
+}
+
+/** 自定义编辑器插槽参数（`#edit-columnKey`） */
+export interface RsTableEditSlotProps<T extends RsTableRowData = RsTableRowData>
+  extends RsTableColumnSlotProps<T> {
+  draft: string
+  error: string | null
+  update: (value: string) => void
+  commit: () => void
+  cancel: () => void
+}
+
+/** 列头插槽参数（`#header-columnKey`） */
+export interface RsTableHeaderSlotProps<T extends RsTableRowData = RsTableRowData> {
+  column: RsTableColumn<T>
+}
+
+/** 展开行插槽参数（`#expand`） */
+export interface RsTableExpandSlotProps<T extends RsTableRowData = RsTableRowData> {
+  row: T
+  index: number
+}
+
+/** 分组行插槽参数（`#group`） */
+export interface RsTableGroupSlotProps {
+  key: string
+  label: string
+}
+
+/**
+ * 按插槽名解析参数。列名是动态 key；`edit-*` / `header-*` 用模板字面量区分。
+ */
+export type RsTableSlotPropsOf<T extends RsTableRowData, K extends string> = K extends
+  | 'empty'
+  | 'summary'
+  ? Record<string, never>
+  : K extends 'group'
+    ? RsTableGroupSlotProps
+    : K extends 'expand'
+      ? RsTableExpandSlotProps<T>
+      : K extends `header-${string}`
+        ? RsTableHeaderSlotProps<T>
+        : K extends `edit-${string}`
+          ? RsTableEditSlotProps<T>
+          : RsTableColumnSlotProps<T>
+
+/**
+ * RsTable 公开插槽。用映射类型而不是 string 索引，避免 empty/group 与列插槽冲突。
+ */
+export type RsTableSlots<T extends RsTableRowData = RsTableRowData> = {
+  [K in string]?: RsTableSlotFn<RsTableSlotPropsOf<T, K>>
+}
+
 /** withDefaults 第二参（工厂默认用函数） */
 export const RS_TABLE_PROP_DEFAULTS = {
   loading: false,

package/src/index.ts

@@ -37,6 +37,7 @@ export type { RsLoadingBarApi } from './composables/useRsLoadingBar'
 export { default as RsDropdown } from './components/RsDropdown.vue'
 export { default as RsIcon } from './components/RsIcon.vue'
 export { default as RsInput } from './components/RsInput.vue'
+export type { RsInputExpose, RsInputInstance } from './components/RsInput.vue'
 export { default as RsInputNumber } from './components/RsInputNumber.vue'
 export type { RsInputNumberValue } from './components/input-number-utils'
 export {
@@ -141,6 +142,7 @@ export type {
   MonacoCompletionPrefixResolver,
   MonacoCompletionRequest,
   MonacoCompletionSnippet,
+  RsMonacoEditorExpose,
 } from './components/RsMonacoEditor.vue'
 export type {
   MonacoBuiltinLanguage,
@@ -224,6 +226,7 @@ export type {
   RsSelectGetPopupContainer,
   RsSelectLabeledValue,
   RsSelectModelValue,
+  RsSelectResolvedModel,
   RsSelectOption,
   RsSelectOptionFilterProp,
   RsSelectOptionGroup,
@@ -330,6 +333,8 @@ export { isStepSeparatorCompleted, resolveStepStatus } from './components/steps-
 export type {
   RsSplitConstraint,
   RsSplitOrientation,
+  RsSplitPaneExpose,
+  RsSplitPaneInstance,
   RsSplitPaneItem,
   RsSplitPaneSize,
 } from './components/split-pane-utils'
@@ -479,6 +484,13 @@ export {
 export type {
   RsTableProps,
   RsTableEmits,
+  RsTableColumnSlotProps,
+  RsTableEditSlotProps,
+  RsTableHeaderSlotProps,
+  RsTableExpandSlotProps,
+  RsTableGroupSlotProps,
+  RsTableSlots,
+  RsTableSlotPropsOf,
 } from './components/table/rs-table-props'
 export { RS_TABLE_PROP_DEFAULTS } from './components/table/rs-table-props'
 export { useRsTableGridKeyboard } from './composables/useRsTableGridKeyboard'