Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(tree-menu): [tree-menu] updata tree-menu xdesign #2123

Open
wants to merge 10 commits into
base: dev
Choose a base branch
from
Open
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<tiny-tree-menu placeholder="请输入内容进行筛选"></tiny-tree-menu>
<tiny-tree-menu placeholder="输入关键字搜索"></tiny-tree-menu>
</template>

<script setup>
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/tree-menu/basic-usage.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<tiny-tree-menu placeholder="请输入内容进行筛选"></tiny-tree-menu>
<tiny-tree-menu placeholder="输入关键字搜索"></tiny-tree-menu>
</template>

<script>
Expand Down
8 changes: 4 additions & 4 deletions examples/sites/demos/pc/app/tree-menu/clearable.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ test('搜索框可清除', async ({ page }) => {

await page.goto('tree-menu#clearable')

await page.locator('#clearable').getByRole('textbox', { name: '请输入内容进行筛选' }).click()
await page.locator('#clearable').getByRole('textbox', { name: '请输入内容进行筛选' }).click()
await page.locator('#clearable').getByRole('textbox', { name: '请输入内容进行筛选' }).fill('123')
await page.locator('#clearable').getByRole('textbox', { name: '输入关键字搜索' }).click()
await page.locator('#clearable').getByRole('textbox', { name: '输入关键字搜索' }).click()
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the duplicate click action.

This line is a duplicate of the previous click action on the search box at line 11. Please remove this line to avoid redundant actions in the test.

await page.locator('#clearable').getByRole('textbox', { name: '输入关键字搜索' }).fill('123')
await expect(page.getByText('暂无数据')).toBeVisible()
const icon = getIcon(page)
await icon.click()
const val = await page.locator('#clearable').getByRole('textbox', { name: '请输入内容进行筛选' }).inputValue()
const val = await page.locator('#clearable').getByRole('textbox', { name: '输入关键字搜索' }).inputValue()
expect(val).toBe('')
await expect(page.getByText('暂无数据')).not.toBeVisible()
})
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template>
<tiny-tree-menu
class="demo-tree-menu"
node-key="id"
:data="treeData"
:default-checked-keys="expandeArr"
Expand Down Expand Up @@ -170,8 +171,8 @@ const treeData = ref([
</script>

<style lang="less" scoped>
.tiny-tree-menu {
height: 300px;
.demo-tree-menu ::v-deep .tiny-tree {
height: 320px;
overflow: auto;
}
</style>
5 changes: 3 additions & 2 deletions examples/sites/demos/pc/app/tree-menu/default-expand-all.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template>
<tiny-tree-menu
class="demo-tree-menu"
node-key="id"
:data="treeData"
:default-checked-keys="expandeArr"
Expand Down Expand Up @@ -178,8 +179,8 @@ export default {
</script>

<style lang="less" scoped>
.tiny-tree-menu {
height: 300px;
.demo-tree-menu ::v-deep .tiny-tree {
height: 320px;
overflow: auto;
}
</style>
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<template>
<tiny-tree-menu :data="treeData" node-key="id" :default-expanded-keys="expandeArr"></tiny-tree-menu>
<tiny-tree-menu
class="demo-tree-menu"
:data="treeData"
node-key="id"
:default-expanded-keys="expandeArr"
></tiny-tree-menu>
</template>

<script setup>
Expand Down Expand Up @@ -112,8 +117,8 @@ const treeData = ref([
</script>

<style lang="less" scoped>
.tiny-tree-menu {
height: 300px;
.demo-tree-menu ::v-deep .tiny-tree {
height: 320px;
overflow: auto;
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<div>
<tiny-button @click="changeHighlight" type="primary">设置展开并高亮</tiny-button>
<tiny-tree-menu
class="demo-tree-menu"
node-key="id"
:data="treeData"
:default-expanded-keys="expandeArr"
Expand Down Expand Up @@ -128,8 +129,8 @@ const changeHighlight = () => {
</script>

<style lang="less" scoped>
.tiny-tree-menu {
height: 300px;
.demo-tree-menu ::v-deep .tiny-tree {
height: 320px;
overflow: auto;
}
.tiny-button {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<div>
<tiny-button @click="changeHighlight" type="primary">设置展开并高亮</tiny-button>
<tiny-tree-menu
class="demo-tree-menu"
node-key="id"
:data="treeData"
:default-expanded-keys="expandeArr"
Expand Down Expand Up @@ -142,8 +143,8 @@ export default {
</script>

<style lang="less" scoped>
.tiny-tree-menu {
height: 300px;
.demo-tree-menu ::v-deep .tiny-tree {
height: 320px;
overflow: auto;
}
.tiny-button {
Expand Down
12 changes: 6 additions & 6 deletions examples/sites/demos/pc/app/tree-menu/default-expanded-keys.vue
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<template>
<tiny-tree-menu :data="treeData" node-key="id" :default-expanded-keys="expandeArr"> </tiny-tree-menu>
<tiny-tree-menu class="demo-tree-menu" :data="treeData" node-key="id" :default-expanded-keys="expandeArr">
</tiny-tree-menu>
</template>

<script>
import { TreeMenu, Button } from '@opentiny/vue'
import { TreeMenu } from '@opentiny/vue'

export default {
components: {
TinyTreeMenu: TreeMenu,
TinyButton: Button
TinyTreeMenu: TreeMenu
},
data() {
return {
Expand Down Expand Up @@ -121,8 +121,8 @@ export default {
</script>

<style lang="less" scoped>
.tiny-tree-menu {
height: 300px;
.demo-tree-menu ::v-deep .tiny-tree {
height: 320px;
overflow: auto;
}
</style>
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<template>
<div>
<p>场景1:默认点击文字展开菜单</p>
<tiny-tree-menu :data="treeData"></tiny-tree-menu>
<tiny-tree-menu class="demo-tree-menu" :data="treeData"></tiny-tree-menu>
<br /><br />
<p>场景2:点击展开按钮才可展开菜单</p>
<tiny-tree-menu :data="treeData" :expand-on-click-node="false"></tiny-tree-menu>
<tiny-tree-menu class="demo-tree-menu" :data="treeData" :expand-on-click-node="false"></tiny-tree-menu>
</div>
</template>

Expand Down Expand Up @@ -169,8 +169,8 @@ const treeData = ref([
</script>

<style lang="less" scoped>
.tiny-tree-menu {
height: 300px;
.demo-tree-menu ::v-deep .tiny-tree {
height: 320px;
overflow: auto;
}
p {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<template>
<div>
<p>场景1:默认点击文字展开菜单</p>
<tiny-tree-menu :data="treeData"></tiny-tree-menu>
<tiny-tree-menu class="demo-tree-menu" :data="treeData"></tiny-tree-menu>
<br /><br />
<p>场景2:点击展开按钮才可展开菜单</p>
<tiny-tree-menu :data="treeData" :expand-on-click-node="false"></tiny-tree-menu>
<tiny-tree-menu class="demo-tree-menu" :data="treeData" :expand-on-click-node="false"></tiny-tree-menu>
</div>
</template>

Expand Down Expand Up @@ -181,8 +181,8 @@ export default {
</script>

<style lang="less" scoped>
.tiny-tree-menu {
height: 300px;
.demo-tree-menu ::v-deep .tiny-tree {
height: 320px;
overflow: auto;
}
p {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<tiny-tree-menu :data="treeData" :props="mapField"></tiny-tree-menu>
<tiny-tree-menu class="demo-tree-menu" :data="treeData" :props="mapField"></tiny-tree-menu>
</template>

<script setup>
Expand Down Expand Up @@ -122,8 +122,8 @@ const treeData = reactive([
</script>

<style lang="less" scoped>
.tiny-tree-menu {
height: 300px;
.demo-tree-menu ::v-deep .tiny-tree {
height: 320px;
overflow: auto;
}
</style>
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
<template>
<div>
<p>场景1:节点可勾选 + 默认选中</p>
<tiny-tree-menu node-key="id" show-checkbox :data="treeData" :default-checked-keys="expandeArr"></tiny-tree-menu>
<tiny-tree-menu
class="demo-tree-menu"
node-key="id"
show-checkbox
:data="treeData"
:default-checked-keys="expandeArr"
></tiny-tree-menu>
<br /><br />
<p>场景2:节点可勾选 + 父子级不相关联</p>
<tiny-tree-menu :data="treeData" show-checkbox check-strictly></tiny-tree-menu>
<tiny-tree-menu class="demo-tree-menu" :data="treeData" show-checkbox check-strictly></tiny-tree-menu>
</div>
</template>

Expand Down Expand Up @@ -170,8 +176,8 @@ const treeData = ref([
</script>

<style lang="less" scoped>
.tiny-tree-menu {
height: 300px;
.demo-tree-menu ::v-deep .tiny-tree {
height: 320px;
overflow: auto;
}
p {
Expand Down
14 changes: 10 additions & 4 deletions examples/sites/demos/pc/app/tree-menu/show-checkbox.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
<template>
<div>
<p>场景1:节点可勾选 + 默认选中</p>
<tiny-tree-menu node-key="id" show-checkbox :data="treeData" :default-checked-keys="expandeArr"></tiny-tree-menu>
<tiny-tree-menu
class="demo-tree-menu"
node-key="id"
show-checkbox
:data="treeData"
:default-checked-keys="expandeArr"
></tiny-tree-menu>
<br /><br />
<p>场景2:节点可勾选 + 父子级不相关联</p>
<tiny-tree-menu :data="treeData" show-checkbox check-strictly></tiny-tree-menu>
<tiny-tree-menu class="demo-tree-menu" :data="treeData" show-checkbox check-strictly></tiny-tree-menu>
</div>
</template>

Expand Down Expand Up @@ -179,8 +185,8 @@ export default {
</script>

<style lang="less" scoped>
.tiny-tree-menu {
height: 300px;
.demo-tree-menu ::v-deep .tiny-tree {
height: 320px;
overflow: auto;
}
p {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@
<tiny-radio label="hide"> 默认不变 </tiny-radio>
</tiny-radio-group>
</div>
<tiny-tree-menu :highlight-query="highlightQuery === 'show'" :data="treeData"></tiny-tree-menu>
<tiny-tree-menu
class="demo-tree-menu"
:highlight-query="highlightQuery === 'show'"
:data="treeData"
></tiny-tree-menu>
<br /><br />
<p>场景2:不可过滤 + 不设置原生 title 属性</p>
<tiny-tree-menu :data="treeData" :show-filter="false" :show-title="false"></tiny-tree-menu>
<tiny-tree-menu class="demo-tree-menu" :data="treeData" :show-filter="false" :show-title="false"></tiny-tree-menu>
</div>
</template>

Expand Down Expand Up @@ -178,8 +182,8 @@ const treeData = ref([
</script>

<style lang="less" scoped>
.tiny-tree-menu {
height: 300px;
.demo-tree-menu ::v-deep .tiny-tree {
height: 320px;
overflow: auto;
}
p {
Expand Down
12 changes: 8 additions & 4 deletions examples/sites/demos/pc/app/tree-menu/show-filter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@
<tiny-radio label="hide"> 默认不变 </tiny-radio>
</tiny-radio-group>
</div>
<tiny-tree-menu :highlight-query="highlightQuery === 'show'" :data="treeData"></tiny-tree-menu>
<tiny-tree-menu
class="demo-tree-menu"
:highlight-query="highlightQuery === 'show'"
:data="treeData"
></tiny-tree-menu>
<br /><br />
<p>场景2:不可过滤 + 不设置原生 title 属性</p>
<tiny-tree-menu :data="treeData" :show-filter="false" :show-title="false"></tiny-tree-menu>
<tiny-tree-menu class="demo-tree-menu" :data="treeData" :show-filter="false" :show-title="false"></tiny-tree-menu>
</div>
</template>

Expand Down Expand Up @@ -187,8 +191,8 @@ export default {
</script>

<style lang="less" scoped>
.tiny-tree-menu {
height: 300px;
.demo-tree-menu ::v-deep .tiny-tree {
height: 320px;
overflow: auto;
}
p {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template>
<tiny-tree-menu
class="demo-tree-menu"
:data="treeData"
default-expand-all
show-number
Expand Down Expand Up @@ -124,8 +125,8 @@ const treeData = reactive([
</script>

<style lang="less" scoped>
.tiny-tree-menu {
height: 300px;
.demo-tree-menu ::v-deep .tiny-tree {
height: 320px;
overflow: auto;
}
p {
Expand Down
5 changes: 3 additions & 2 deletions examples/sites/demos/pc/app/tree-menu/show-number.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template>
<tiny-tree-menu
class="demo-tree-menu"
:data="treeData"
default-expand-all
show-number
Expand Down Expand Up @@ -132,8 +133,8 @@ export default {
</script>

<style lang="less" scoped>
.tiny-tree-menu {
height: 300px;
.demo-tree-menu ::v-deep .tiny-tree {
height: 320px;
overflow: auto;
}
p {
Expand Down
Loading
Loading