drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3343 from iview/pr/3342

Browse source 
Pr/3342
This commit is contained in:
Aresn 2018-04-10 16:03:23 +08:00 • committed by GitHub
commit 694378a57c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
examples/routers/poptip.vue
View file

@ -2,10 +2,19 @@
<div style="margin: 200px"> <div style="margin: 200px">
<Tabs value="name1"> <Tabs value="name1">
<TabPane label="标签一" name="name1"> <TabPane label="标签一" name="name1">
<div style="overflow: auto;width: 200px;height:300px"> <div style="width: 200px;height:300px">
<Poptip title="提示标题" content="标签一的内容" placement="right" transfer :options="options"> <Poptip title="提示标题" content="标签一的内容" placement="left" transfer >
<Button id="aaa">左边</Button>
</Poptip>
<Poptip title="提示标题" content="标签一的内容" placement="right" transfer>
<Button id="aaa">右边</Button> <Button id="aaa">右边</Button>
</Poptip> </Poptip>
<Poptip title="提示标题" content="标签一的内容" placement="top" transfer>
<Button id="aaa">上边</Button>
</Poptip>
<Poptip title="提示标题" content="标签一的内容" placement="bottom" transfer>
<Button id="aaa">下边</Button>
</Poptip>
</div> </div>
</TabPane> </TabPane>
<TabPane label="标签二" name="name2">标签二的内容</TabPane> <TabPane label="标签二" name="name2">标签二的内容</TabPane>
@ -17,11 +26,7 @@
data () { data () {
return { return {
options: { options: {
modifiers: {
preventOverflow: {
boundariesElement: 'body',
}
}
} }
} }
} }

8
src/components/base/popper.js
View file

@ -32,6 +32,9 @@ export default {
modifiers: { modifiers: {
computeStyle:{ computeStyle:{
gpuAcceleration: false, gpuAcceleration: false,
},
preventOverflow :{
boundariesElement: 'body'
} }
} }
}; };
@ -84,10 +87,7 @@ export default {
options.placement = this.placement; options.placement = this.placement;
if (options.modifiers) { if (!options.modifiers.offset) {
options.modifiers = {};
}
if (options.modifiers.offset) {
options.modifiers.offset = {}; options.modifiers.offset = {};
} }
options.modifiers.offset = this.offset; options.modifiers.offset = this.offset;