Skip to content

Commit c85a7e2

Browse files
committed
feat(dialog-select): [dialog-select] add attribute lock-scroll
1 parent 1e33249 commit c85a7e2

File tree

7 files changed

+26
-3
lines changed

7 files changed

+26
-3
lines changed

examples/sites/demos/apis/dialog-select.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,20 @@ export default {
3131
mode: ['pc'],
3232
pcDemo: 'nest-grid-multi'
3333
},
34+
{
35+
name: 'lock-scroll',
36+
type: 'boolean',
37+
defaultValue: 'true',
38+
desc: {
39+
'zh-CN': '设置弹出面板的锁定滚动',
40+
'en-US': 'Set the lock scroll of the pop-up panel.'
41+
},
42+
meta: {
43+
stable: '3.24.0'
44+
},
45+
mode: ['pc'],
46+
pcDemo: 'nest-grid-multi'
47+
},
3448
{
3549
name: 'grid-op',
3650
typeAnchorName: 'IGridOption',

examples/sites/demos/pc/app/dialog-select/nest-grid-multi-composition-api.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
value-field="id"
2525
text-field="name"
2626
:main-height="240"
27+
:lock-scroll="false"
2728
>
2829
<template #search>
2930
<div class="tiny-demo-search">

examples/sites/demos/pc/app/dialog-select/nest-grid-multi.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ test('dialogSelect 表格多选', async ({ page }) => {
66
const demo = page.locator('#nest-grid-multi')
77

88
await demo.getByRole('button', { name: '打开窗口' }).click()
9+
await expect(page.locator('body')).not.toHaveClass(/dialog-box__scroll-lock/)
910
await page
1011
.locator('div')
1112
.filter({ hasText: /^GFD WSX $/ })

examples/sites/demos/pc/app/dialog-select/nest-grid-multi.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
value-field="id"
2525
text-field="name"
2626
:main-height="240"
27+
:lock-scroll="false"
2728
>
2829
<template #search>
2930
<div class="tiny-demo-search">

examples/sites/demos/pc/app/dialog-select/webdoc/dialog-select.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ export default {
1212
},
1313
desc: {
1414
'zh-CN':
15-
'<p>通过 <code>auto-lookup</code>、<code>lookup-method</code> 属性 和 <code>change</code> 事件设置初始化时数据的反查回显功能。</p> \n<p>表格多选场景需要设置 <code>popselector</code> 为 <code>grid</code>,<code>multi</code> 为 <code>true</code>,<code>checkRowKeys</code> 设置默认选中数据。</p >\n',
15+
'<p>通过 <code>auto-lookup</code>、<code>lookup-method</code> 属性 和 <code>change</code> 事件设置初始化时数据的反查回显功能。</p> \n<p>表格多选场景需要设置 <code>popselector</code> 为 <code>grid</code>,<code>multi</code> 为 <code>true</code>,<code>checkRowKeys</code> 设置默认选中数据。<code>lock-scroll</code> 配置弹出窗口时是否禁用滚动条。</p >\n',
1616
'en-US':
17-
'<p>Use the <code>auto-lookup</code>,<code>lookup-method</code> attributes, and <code>change</code> event settings to perform data backtracking during initialization. <code>autoLookup</code>The default value is <code>true</code>. </p>\n<p> Multiple selection scenarios in the table require setting<code>popcollector</code>as grid,<code>multi</code>as true, and<code>checkRowKeys</code>as default selected data. </p >\n'
17+
'<p>Use the <code>auto-lookup</code>,<code>lookup-method</code> attributes, and <code>change</code> event settings to perform data backtracking during initialization. <code>autoLookup</code>The default value is <code>true</code>. </p>\n<p> Multiple selection scenarios in the table require setting<code>popcollector</code>as grid,<code>multi</code>as true, and<code>checkRowKeys</code>as default selected data. <code>lock-scroll</code>Configure whether to disable the scrollbar when a pop-up window appears.</p >\n'
1818
},
1919
codeFiles: ['nest-grid-multi.vue']
2020
},

packages/vue/src/dialog-select/src/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ export default defineComponent({
8282
mainHeight: {
8383
type: Number,
8484
default: 290
85+
},
86+
lockScroll: {
87+
type: Boolean,
88+
default: true
8589
}
8690
},
8791
setup(props, context) {

packages/vue/src/dialog-select/src/pc.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
modal-append-to-body
1515
:close-on-press-escape="false"
1616
:close-on-click-modal="false"
17+
:lock-scroll="lockScroll"
1718
v-bind="dialogOp"
1819
@open="$emit('open', $event)"
1920
@close="$emit('close', $event)"
@@ -216,7 +217,8 @@ export default defineComponent({
216217
'beforeClose',
217218
'autoLookup',
218219
'lookupMethod',
219-
'mainHeight'
220+
'mainHeight',
221+
'lockScroll'
220222
],
221223
components: {
222224
TinyDialogBox: DialogBox,

0 commit comments

Comments
 (0)