mirror of
https://gitee.com/vant-contrib/vant.git
synced 2025-04-06 03:57:59 +08:00
feat(Cell): allow to disable clickable when using is-link (#7922)
This commit is contained in:
parent
087ac07a14
commit
d005d71eea
@ -142,7 +142,7 @@ Vue.use(CellGroup);
|
|||||||
| url | Link URL | _string_ | - |
|
| url | Link URL | _string_ | - |
|
||||||
| to | Target route of the link, same as to of vue-router | _string \| object_ | - |
|
| to | Target route of the link, same as to of vue-router | _string \| object_ | - |
|
||||||
| replace | If true, the navigation will not leave a history record | _boolean_ | `false` |
|
| replace | If true, the navigation will not leave a history record | _boolean_ | `false` |
|
||||||
| clickable | Whether to show click feedback when clicked | _boolean_ | `false` |
|
| clickable | Whether to show click feedback when clicked | _boolean_ | `null` |
|
||||||
| is-link | Whether to show link icon | _boolean_ | `false` |
|
| is-link | Whether to show link icon | _boolean_ | `false` |
|
||||||
| required | Whether to show required mark | _boolean_ | `false` |
|
| required | Whether to show required mark | _boolean_ | `false` |
|
||||||
| arrow-direction | Can be set to `left` `up` `down` | _string_ | `right` |
|
| arrow-direction | Can be set to `left` `up` `down` | _string_ | `right` |
|
||||||
|
@ -148,7 +148,7 @@ Vue.use(CellGroup);
|
|||||||
| to | 点击后跳转的目标路由对象,同 vue-router 的 [to 属性](https://router.vuejs.org/zh/api/#to) | _string \| object_ | - |
|
| to | 点击后跳转的目标路由对象,同 vue-router 的 [to 属性](https://router.vuejs.org/zh/api/#to) | _string \| object_ | - |
|
||||||
| border | 是否显示内边框 | _boolean_ | `true` |
|
| border | 是否显示内边框 | _boolean_ | `true` |
|
||||||
| replace | 是否在跳转时替换当前页面历史 | _boolean_ | `false` |
|
| replace | 是否在跳转时替换当前页面历史 | _boolean_ | `false` |
|
||||||
| clickable | 是否开启点击反馈 | _boolean_ | `false` |
|
| clickable | 是否开启点击反馈 | _boolean_ | `null` |
|
||||||
| is-link | 是否展示右侧箭头并开启点击反馈 | _boolean_ | `false` |
|
| is-link | 是否展示右侧箭头并开启点击反馈 | _boolean_ | `false` |
|
||||||
| required | 是否显示表单必填星号 | _boolean_ | `false` |
|
| required | 是否显示表单必填星号 | _boolean_ | `false` |
|
||||||
| center | 是否使内容垂直居中 | _boolean_ | `false` |
|
| center | 是否使内容垂直居中 | _boolean_ | `false` |
|
||||||
|
@ -112,7 +112,7 @@ function Cell(
|
|||||||
functionalRoute(ctx);
|
functionalRoute(ctx);
|
||||||
}
|
}
|
||||||
|
|
||||||
const clickable = isLink || props.clickable;
|
const clickable = props.clickable ?? isLink;
|
||||||
|
|
||||||
const classes: Mods = {
|
const classes: Mods = {
|
||||||
clickable,
|
clickable,
|
||||||
|
@ -23,7 +23,6 @@ export const cellProps = {
|
|||||||
center: Boolean,
|
center: Boolean,
|
||||||
isLink: Boolean,
|
isLink: Boolean,
|
||||||
required: Boolean,
|
required: Boolean,
|
||||||
clickable: Boolean,
|
|
||||||
iconPrefix: String,
|
iconPrefix: String,
|
||||||
titleStyle: null as any,
|
titleStyle: null as any,
|
||||||
titleClass: null as any,
|
titleClass: null as any,
|
||||||
@ -37,4 +36,8 @@ export const cellProps = {
|
|||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: true,
|
default: true,
|
||||||
},
|
},
|
||||||
|
clickable: {
|
||||||
|
type: Boolean,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
@ -78,3 +78,16 @@ test('icon-prefix prop', () => {
|
|||||||
|
|
||||||
expect(wrapper).toMatchSnapshot();
|
expect(wrapper).toMatchSnapshot();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('should allow to disable clickable when using is-link prop', () => {
|
||||||
|
const wrapper = mount(Cell, {
|
||||||
|
propsData: {
|
||||||
|
isLink: true,
|
||||||
|
clickable: false,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(
|
||||||
|
wrapper.element.classList.contains('.van-cell--clickable')
|
||||||
|
).toBeFalsy();
|
||||||
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user