Skip to content

Commit 8fdeb67

Browse files
committed
fix: modify theme and demo
1 parent 4960a6a commit 8fdeb67

40 files changed

+98
-85
lines changed

examples/sites/demos/pc/app/dialog-box/basic-usage-composition-api.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<tiny-dialog-box v-model:visible="boxVisibility" title="消息" width="30%">
55
<span>dialog-box 内容</span>
66
<template #footer>
7-
<tiny-button type="primary" @click="boxVisibility = false"> 确定 </tiny-button>
8-
<tiny-button @click="boxVisibility = false"> 取消 </tiny-button>
7+
<tiny-button @click="boxVisibility = false" round>取 消</tiny-button>
8+
<tiny-button type="primary" @click="boxVisibility = false" round>确 定</tiny-button>
99
</template>
1010
</tiny-dialog-box>
1111
</div>

examples/sites/demos/pc/app/dialog-box/basic-usage.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ test('dialogBox 基础用法', async ({ page }) => {
55
await page.goto('dialog-box#basic-usage')
66

77
await page.getByRole('button', { name: /Dialog/ }).click()
8-
await page.getByRole('button', { name: '确定' }).click()
8+
await page.getByRole('button', { name: '确 定' }).click()
99

1010
await page.getByRole('button', { name: /Dialog/ }).click()
11-
await page.getByRole('button', { name: '取消' }).click()
11+
await page.getByRole('button', { name: '取 消' }).click()
1212

1313
// 点击 x 图标
1414
await page.getByRole('button', { name: /Dialog/ }).click()

examples/sites/demos/pc/app/dialog-box/basic-usage.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<tiny-dialog-box v-model:visible="boxVisibility" title="消息" width="30%">
55
<span>dialog-box 内容</span>
66
<template #footer>
7-
<tiny-button type="primary" @click="boxVisibility = false"> 确定 </tiny-button>
8-
<tiny-button @click="boxVisibility = false"> 取消 </tiny-button>
7+
<tiny-button @click="boxVisibility = false">取 消</tiny-button>
8+
<tiny-button type="primary" @click="boxVisibility = false">确 定</tiny-button>
99
</template>
1010
</tiny-dialog-box>
1111
</div>

examples/sites/demos/pc/app/dialog-box/close-on-click-modal.spec.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ import { test, expect } from '@playwright/test'
33
test('dialogBox 点击遮罩时不关闭弹窗', async ({ page }) => {
44
page.on('pageerror', (exception) => expect(exception).toBeNull())
55
await page.goto('dialog-box#close-on-click-modal')
6-
const dialogBox = page.locator('.tiny-dialog-box')
7-
const mask = page.locator('.tiny-dialog-box__wrapper')
8-
await page.getByRole('button', { name: /Dialog/ }).click()
6+
const demo = page.locator('#close-on-click-modal')
7+
const dialogBox = demo.locator('.tiny-dialog-box')
8+
const mask = demo.locator('.tiny-dialog-box__wrapper')
9+
await demo.getByRole('button', { name: /Dialog/ }).click()
910
await expect(dialogBox).toBeVisible()
1011
await mask.click()
1112
await expect(dialogBox).toBeVisible()

examples/sites/demos/pc/app/dialog-box/close-on-press-escape.spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ import { test, expect } from '@playwright/test'
33
test('dialogBox 禁用 ESC 关闭', async ({ page }) => {
44
page.on('pageerror', (exception) => expect(exception).toBeNull())
55
await page.goto('dialog-box#close-on-press-escape')
6-
const button = page.getByRole('button', { name: /Dialog/ })
7-
const dialogBox = page.locator('.tiny-dialog-box')
6+
const demo = page.locator('#close-on-press-escape')
7+
const button = demo.getByRole('button', { name: /Dialog/ })
8+
const dialogBox = demo.locator('.tiny-dialog-box')
89
// dialogBox 弹出后,禁用 ESC 关闭
910
await button.click()
1011
await expect(dialogBox).toBeVisible()

examples/sites/demos/pc/app/dialog-box/custom-dialog-content-composition-api.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div>
33
<tiny-button @click="boxVisibility = true" title="弹出 Dialog">弹出 Dialog</tiny-button>
44
<tiny-dialog-box v-model:visible="boxVisibility" title="消息" width="30%">
5-
<tiny-alert description="内容是 Alert 组件"></tiny-alert>
5+
<b>自定义内容</b>
66
<template #footer>
77
<tiny-button type="primary" @click="boxVisibility = false">确 定</tiny-button>
88
</template>
@@ -12,7 +12,7 @@
1212

1313
<script setup lang="jsx">
1414
import { ref } from 'vue'
15-
import { TinyButton, TinyDialogBox, TinyAlert } from '@opentiny/vue'
15+
import { TinyButton, TinyDialogBox } from '@opentiny/vue'
1616
1717
const boxVisibility = ref(false)
1818
</script>

examples/sites/demos/pc/app/dialog-box/custom-dialog-content.spec.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ import { test, expect } from '@playwright/test'
33
test('dialogBox 自定义内容', async ({ page }) => {
44
page.on('pageerror', (exception) => expect(exception).toBeNull())
55
await page.goto('dialog-box#custom-dialog-content')
6-
const button = page.getByRole('button', { name: /Dialog/ })
7-
const dialogBox = page.locator('.tiny-dialog-box')
6+
const demo = page.locator('#custom-dialog-content')
7+
const button = demo.getByRole('button', { name: /Dialog/ })
8+
const dialogBox = demo.locator('.tiny-dialog-box')
89
await button.click()
10+
expect(demo.locator('b')).toHaveText(//)
911
await expect(dialogBox).toBeVisible()
10-
await page.locator('.tiny-alert > .tiny-alert__close').click()
1112
await page.waitForTimeout(300)
12-
await page.getByRole('button', { name: / / }).click()
13+
await demo.getByRole('button', { name: / / }).click()
1314
await expect(dialogBox).toBeHidden()
1415
})

examples/sites/demos/pc/app/dialog-box/custom-dialog-content.vue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div>
33
<tiny-button @click="boxVisibility = true" title="弹出 Dialog">弹出 Dialog</tiny-button>
44
<tiny-dialog-box v-model:visible="boxVisibility" title="消息" width="30%">
5-
<tiny-alert description="内容是 Alert 组件"></tiny-alert>
5+
<b>自定义内容</b>
66
<template #footer>
77
<tiny-button type="primary" @click="boxVisibility = false">确 定</tiny-button>
88
</template>
@@ -11,13 +11,12 @@
1111
</template>
1212

1313
<script lang="jsx">
14-
import { TinyButton, TinyDialogBox, TinyAlert } from '@opentiny/vue'
14+
import { TinyButton, TinyDialogBox } from '@opentiny/vue'
1515
1616
export default {
1717
components: {
1818
TinyButton,
19-
TinyDialogBox,
20-
TinyAlert
19+
TinyDialogBox
2120
},
2221
data() {
2322
return {

examples/sites/demos/pc/app/dialog-box/custom-dialog-footer-composition-api.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<tiny-dialog-box v-model:visible="boxVisibility" title="消息" width="30%">
55
<span>dialog-box 内容</span>
66
<template #footer>
7-
<div style="width: 100%; height: 100%; background: #dddddd">自定义 footer 区域</div>
7+
<div style="width: 100%; height: 100%">自定义 footer 区域</div>
88
</template>
99
</tiny-dialog-box>
1010
</div>

examples/sites/demos/pc/app/dialog-box/custom-dialog-footer.spec.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import { test, expect } from '@playwright/test'
33
test('dialogBox 自定义底部', async ({ page }) => {
44
page.on('pageerror', (exception) => expect(exception).toBeNull())
55
await page.goto('dialog-box#custom-dialog-footer')
6-
await page.getByRole('button', { name: /Dialog/ }).click()
7-
await expect(page.locator('.tiny-dialog-box__footer > div')).toHaveText(//)
8-
await page.getByLabel('Close').click()
6+
const demo = page.locator('#custom-dialog-footer')
7+
await demo.getByRole('button', { name: /Dialog/ }).click()
8+
await expect(demo.locator('.tiny-dialog-box__footer > div')).toHaveText(//)
9+
await demo.getByLabel('Close').click()
910
})

0 commit comments

Comments
 (0)