diff --git a/demo/components/advanceTableDemo.vue b/demo/components/advanceTableDemo.vue
index b6095b15d..738b074d7 100644
--- a/demo/components/advanceTableDemo.vue
+++ b/demo/components/advanceTableDemo.vue
@@ -571,7 +571,14 @@ export default {
:on-change="onChange"
:search="search"
:pagination="{ total: data.length, limit: 10 }"
- />
+ >
+
+ custom
+
+
+ right custom
+
+
+
+
diff --git a/demo/debugComponents/scrollbarDebug2/index.vue b/demo/debugComponents/scrollbarDebug2/index.vue
new file mode 100644
index 000000000..aea1cabc1
--- /dev/null
+++ b/demo/debugComponents/scrollbarDebug2/index.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
diff --git a/demo/demo.vue b/demo/demo.vue
index ea5d59403..0301eb35b 100644
--- a/demo/demo.vue
+++ b/demo/demo.vue
@@ -195,6 +195,10 @@ export default {
{
name: 'ScrollbarDebug',
path: '/n-scrollbar-debug'
+ },
+ {
+ name: 'ScrollbarDebug2',
+ path: '/n-scrollbar-debug2'
}
]
}
diff --git a/demo/index.js b/demo/index.js
index 5f3ee6a59..594134e5b 100644
--- a/demo/index.js
+++ b/demo/index.js
@@ -34,6 +34,7 @@ import timePickerDemo from './components/timePickerDemo'
import confirmDemo from './components/confirmDemo'
import scrollbarDebug from './debugComponents/scrollbarDebug'
+import scrollbarDebug2 from './debugComponents/scrollbarDebug2'
import badgeDemo from './components/badgeDemo'
import stepsDemo from './components/stepsDemo'
import notificationDemo from './components/notificationDemo'
@@ -107,7 +108,9 @@ const routes = [
{ path: '/n-collapse', component: collapseDemo },
{ path: '/n-progress', component: progressDemo },
{ path: '/n-tag', component: tagDemo },
- { path: '/n-timeline', component: timelineDemo }
+ { path: '/n-timeline', component: timelineDemo },
+ { path: '/n-scrollbar-debug2', component: scrollbarDebug2 }
+
]
},
{
diff --git a/package.json b/package.json
index f31953719..b1a09640c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "naive-ui",
- "version": "0.2.81",
+ "version": "0.2.82",
"description": "",
"main": "index.js",
"scripts": {
diff --git a/packages/common/AdvanceTable/filterDropDown/index.vue b/packages/common/AdvanceTable/filterDropDown/index.vue
index a7a920577..021eddcf9 100644
--- a/packages/common/AdvanceTable/filterDropDown/index.vue
+++ b/packages/common/AdvanceTable/filterDropDown/index.vue
@@ -1,6 +1,9 @@
-
@@ -27,6 +31,10 @@ export default {
filterIcon
},
props: {
+ maxHeight: {
+ type: [String, Number],
+ default: 27 * 3
+ },
filterItems: {
type: Array,
default: () => []
@@ -56,6 +64,14 @@ export default {
}
},
computed: {
+ dropDownContent () {
+ let stl = {}
+ if (this.maxHeight !== 'unset') {
+ let maxHeight = typeof this.maxHeight === 'string' ? this.maxHeight : this.maxHeight + 'px'
+ stl.maxHeight = maxHeight
+ }
+ return stl
+ },
filterStatus () {
return !!this.emitData
},
@@ -144,12 +160,38 @@ export default {
}
}
+