Skip to content

Commit d1dab21

Browse files
committed
fix(tooltip): fix
1 parent 8a425a0 commit d1dab21

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

examples/sites/demos/pc/app/grid/slot/default-slot.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { test, expect } from '@playwright/test'
33
test('表格默认插槽', async ({ page }) => {
44
page.on('pageerror', (exception) => expect(exception).toBeNull())
55
await page.goto('grid-slot#slot-default-slot')
6-
const cell = await page.getByRole('cell', { name: 'GFD 科技 YX 公司' }).getByText('GFD 科技 YX 公司')
6+
const cell = page.getByRole('cell', { name: 'GFD 科技 YX 公司' }).getByText('GFD 科技 YX 公司')
77

8-
await expect(cell).toHaveCSS('color', 'rgb(255, 192, 203)')
8+
await expect(cell.nth(0)).toHaveCSS('color', 'rgb(255, 192, 203)')
99
})

examples/sites/demos/pc/app/input/show-tooltip.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ test('只读态悬浮提示', async ({ page }) => {
66

77
const demo = page.locator('#show-tooltip')
88
await demo.locator('.tiny-input .tiny-input-display-only__content').hover()
9-
await expect(page.locator('.tiny-tooltip.tiny-tooltip__popper')).not.toBeVisible()
9+
await expect(page.locator('.tiny-tooltip.tiny-tooltip__popper:not(.docs-tooltip)')).not.toBeVisible()
1010
})

packages/renderless/src/input/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ export const handleEnterDisplayOnlyContent =
435435
if (type === 'textarea' && props.popupMore) return
436436

437437
const target = type === 'textarea' ? $event.target.querySelector('.text-box') : $event.target
438-
state.displayOnlyTooltip = ''
438+
state.displayOnlyTooltip = props.displayOnlyContent || state.nativeInputValue
439439

440440
if (!target) {
441441
return

packages/renderless/src/tooltip/new-vue.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ export const api = [
1111
'updatePopper',
1212
'setExpectedState',
1313
'debounceClose',
14-
'handleClosePopper'
14+
'handleClosePopper',
15+
'handleShowPopper',
16+
'doDestroy'
1517
]
1618

1719
export const renderless = (
@@ -21,7 +23,7 @@ export const renderless = (
2123
) => {
2224
const api = {} as any
2325
const popperVmRef = {}
24-
const { showPopper, updatePopper, popperElm, referenceElm, currentPlacement } = userPopper({
26+
const { showPopper, updatePopper, popperElm, referenceElm, currentPlacement, doDestroy } = userPopper({
2527
emit,
2628
props,
2729
nextTick,
@@ -67,9 +69,13 @@ export const renderless = (
6769
show: delayShow,
6870
hide: delayHide,
6971
updatePopper,
70-
setExpectedState: () => {},
72+
setExpectedState: (value) => {
73+
state.showPopper = value
74+
},
7175
debounceClose: delayHide,
72-
handleClosePopper: delayHide
76+
handleClosePopper: () => (state.showPopper = false),
77+
handleShowPopper: () => (state.showPopper = true),
78+
doDestroy: () => {}
7379
})
7480
watch(
7581
() => props.modelValue,
@@ -79,6 +85,7 @@ export const renderless = (
7985
}
8086
}
8187
)
88+
8289
onMounted(() => {
8390
state.popperElm = vm.$refs.popperRef
8491
state.referenceElm = vm.$refs.referenceRef

0 commit comments

Comments
 (0)