From 86f115c3d0ff1069f00097862df3016995687323 Mon Sep 17 00:00:00 2001 From: FairyEver <1711467488@qq.com> Date: Thu, 13 Jan 2022 16:25:35 +0800 Subject: [PATCH] chore: some changes --- .../layout/dashboard/container/index.vue | 9 ++--- d2/components/d2/scroll/index.jsx | 39 +++++++++++-------- d2/utils/framework/menu.js | 6 +-- .../demo/component/d2-break-point/base.vue | 2 +- .../demo/component/d2-break-point/data.vue | 2 +- .../dashboard/demo/component/d2-icon/base.md | 2 +- .../demo/component/d2-scroll/base.vue | 13 ++----- .../dashboard/demo/component/d2-svg/base.md | 2 +- .../dashboard/demo/component/d2-svg/size.md | 2 +- .../demo/component/s-table/index.vue | 2 +- d2/views/dashboard/document/page1.vue | 2 +- d2/views/dashboard/document/page2.md | 2 +- src/views/dashboard.vue | 8 ---- src/views/dashboard/hello-world.vue | 2 +- src/views/dashboard/index.vue | 8 ---- src/views/index.vue | 8 ---- src/views/login.vue | 8 ---- 17 files changed, 41 insertions(+), 76 deletions(-) diff --git a/d2/components/d2/admin/layout/dashboard/container/index.vue b/d2/components/d2/admin/layout/dashboard/container/index.vue index dc0f50ac..8223f914 100644 --- a/d2/components/d2/admin/layout/dashboard/container/index.vue +++ b/d2/components/d2/admin/layout/dashboard/container/index.vue @@ -64,10 +64,6 @@ export default { 'body__footer--border': props.footerBorder })) - function getScrollbarVertical () { - return scrollbarRef.value.$el.getElementsByClassName('os-scrollbar-vertical')[0] - } - function refreshSlotStatus () { headerActive.value = !!slots.header footerActive.value = !!slots.footer @@ -80,16 +76,17 @@ export default { } refreshSlotStatus() + onUpdated(() => { refreshSlotStatus() }) onMounted(() => { watchPostEffect(() => { - getScrollbarVertical().style.top = px(scrollbarVerticalTop) + scrollbarRef.value.scrollbarVertical.style.top = px(scrollbarVerticalTop) }) watchPostEffect(() => { - getScrollbarVertical().style.bottom = px(bodyFooterHeight) + scrollbarRef.value.scrollbarVertical.style.bottom = px(bodyFooterHeight) }) }) diff --git a/d2/components/d2/scroll/index.jsx b/d2/components/d2/scroll/index.jsx index cc14dd87..34efa7f8 100644 --- a/d2/components/d2/scroll/index.jsx +++ b/d2/components/d2/scroll/index.jsx @@ -5,7 +5,7 @@ import { makeName, makeClassName } from 'd2/utils/framework/component.js' import os from 'overlayscrollbars' import 'overlayscrollbars/css/OverlayScrollbars.css' -export const callbacks = [ +export const osCallbacks = [ 'onInitialized', 'onInitializationWithdrawn', 'onDestroyed', @@ -20,7 +20,9 @@ export const callbacks = [ 'onUpdated' ] -export const emits = callbacks.map(name => kebabCase(name.replace(/^on/, ''))) +const osCallbackToEmitName = name => kebabCase(name.replace(/^on/, '')) + +export const emits = osCallbacks.map(osCallbackToEmitName) const name = 'scroll' @@ -46,7 +48,10 @@ export default defineComponent({ 'scroll-bottom' ], setup (props, { emit, attrs }) { - const target = ref(null) + const scrollbarTarget = ref(null) + + const scrollbarVertical = ref(null) + const scrollbarHorizontal = ref(null) const instance = ref(null) @@ -58,18 +63,18 @@ export default defineComponent({ autoHide: 'leave', autoHideDelay: 300 }, - callbacks: fromPairs(callbacks.map(name => { - const emitName = kebabCase(name.replace(/^on/, '')) + callbacks: fromPairs(osCallbacks.map(name => { + const emitName = osCallbackToEmitName(name) let callback = () => {} switch (name) { case 'onScroll': callback = event => { - const information = unref(instance).scroll() - const ratioY = information.ratio.y + const info = unref(instance).scroll() + const ratioY = info.ratio.y emit(emitName, event) - const cordonY = information.max.y - information.position.y - const cordonX = information.max.x - information.position.x - if (cordonY <= -props.cordonY) emit('in-cordon-y', event) + const cordonY = info.max.y - info.position.y + const cordonX = info.max.x - info.position.x + if (cordonY <= props.cordonY) emit('in-cordon-y', event) if (cordonX <= props.cordonX) emit('in-cordon-x', event) if (ratioY === 0) emit('scroll-top', event) if (ratioY === 1) emit('scroll-bottom', event) @@ -96,7 +101,7 @@ export default defineComponent({ } } }) - }`` + } } const merge = options => mergeWith({}, unref(optionsDefault), options, customizer) @@ -111,7 +116,7 @@ export default defineComponent({ function init () { instance.value = os( - unref(target), + unref(scrollbarTarget), unref(options), props.extensions ) @@ -131,7 +136,9 @@ export default defineComponent({ const classnames = computed(() => makeClassnames(classname, attrs.class)) return { - target, + scrollbarTarget, + scrollbarVertical, + scrollbarHorizontal, classnames, instance } @@ -141,7 +148,7 @@ export default defineComponent({ classnames } = this return ( -
+
@@ -150,12 +157,12 @@ export default defineComponent({
-
+
-
+
diff --git a/d2/utils/framework/menu.js b/d2/utils/framework/menu.js index d9e817f5..ceec4121 100644 --- a/d2/utils/framework/menu.js +++ b/d2/utils/framework/menu.js @@ -96,11 +96,11 @@ const routesFlat = flattenObjectArray( (item, _) => pick(item, ['name', 'path', 'meta']) ) -function filterRoutes (rule) { - return routesFlat.filter(route => rule.test(route.name)) +export function filterRoutes (routeNameExp) { + return routesFlat.filter(route => routeNameExp.test(route.name)) } -function createRouteMenu (route, baseUrl) { +export function createRouteMenu (route, baseUrl) { const url = baseUrl + route.path const title = get(route.meta, 'd2admin.menu.title', route.path) const menu = new Menu(title) diff --git a/d2/views/dashboard/demo/component/d2-break-point/base.vue b/d2/views/dashboard/demo/component/d2-break-point/base.vue index fac50df5..84de33a5 100644 --- a/d2/views/dashboard/demo/component/d2-break-point/base.vue +++ b/d2/views/dashboard/demo/component/d2-break-point/base.vue @@ -1,7 +1,7 @@ { "meta": { - "d2admin.menu.title": "-" + "d2admin.menu.title": "基础" } } diff --git a/d2/views/dashboard/demo/component/d2-break-point/data.vue b/d2/views/dashboard/demo/component/d2-break-point/data.vue index add28d85..ad86f5c4 100644 --- a/d2/views/dashboard/demo/component/d2-break-point/data.vue +++ b/d2/views/dashboard/demo/component/d2-break-point/data.vue @@ -1,7 +1,7 @@ { "meta": { - "d2admin.menu.title": "-" + "d2admin.menu.title": "绑定数据" } } diff --git a/d2/views/dashboard/demo/component/d2-icon/base.md b/d2/views/dashboard/demo/component/d2-icon/base.md index 49092215..e17ccf63 100644 --- a/d2/views/dashboard/demo/component/d2-icon/base.md +++ b/d2/views/dashboard/demo/component/d2-icon/base.md @@ -1,7 +1,7 @@ { "meta": { - "d2admin.menu.title": "-" + "d2admin.menu.title": "基础" } } diff --git a/d2/views/dashboard/demo/component/d2-scroll/base.vue b/d2/views/dashboard/demo/component/d2-scroll/base.vue index bef3bf1e..72992678 100644 --- a/d2/views/dashboard/demo/component/d2-scroll/base.vue +++ b/d2/views/dashboard/demo/component/d2-scroll/base.vue @@ -1,15 +1,8 @@ @@ -17,7 +10,7 @@ { "meta": { - "d2admin.menu.title": "-" + "d2admin.menu.title": "基础" } } diff --git a/d2/views/dashboard/demo/component/d2-svg/base.md b/d2/views/dashboard/demo/component/d2-svg/base.md index 59a60ebf..3deb8a53 100644 --- a/d2/views/dashboard/demo/component/d2-svg/base.md +++ b/d2/views/dashboard/demo/component/d2-svg/base.md @@ -1,7 +1,7 @@ { "meta": { - "d2admin.menu.title": "-" + "d2admin.menu.title": "基础" } } diff --git a/d2/views/dashboard/demo/component/d2-svg/size.md b/d2/views/dashboard/demo/component/d2-svg/size.md index ccff03b1..c16d48b2 100644 --- a/d2/views/dashboard/demo/component/d2-svg/size.md +++ b/d2/views/dashboard/demo/component/d2-svg/size.md @@ -1,7 +1,7 @@ { "meta": { - "d2admin.menu.title": "-" + "d2admin.menu.title": "尺寸" } } diff --git a/d2/views/dashboard/demo/component/s-table/index.vue b/d2/views/dashboard/demo/component/s-table/index.vue index 2c267daa..0c268029 100644 --- a/d2/views/dashboard/demo/component/s-table/index.vue +++ b/d2/views/dashboard/demo/component/s-table/index.vue @@ -1,7 +1,7 @@ { "meta": { - "d2admin.menu.title": "-" + "d2admin.menu.title": "基础" } } diff --git a/d2/views/dashboard/document/page1.vue b/d2/views/dashboard/document/page1.vue index eac9b7c9..ea848422 100644 --- a/d2/views/dashboard/document/page1.vue +++ b/d2/views/dashboard/document/page1.vue @@ -1,7 +1,7 @@ { "meta": { - "d2admin.menu.title": "-" + "d2admin.menu.title": "文档页面 1" } } diff --git a/d2/views/dashboard/document/page2.md b/d2/views/dashboard/document/page2.md index d86e6be8..eea0f5a2 100644 --- a/d2/views/dashboard/document/page2.md +++ b/d2/views/dashboard/document/page2.md @@ -1,7 +1,7 @@ { "meta": { - "d2admin.menu.title": "-" + "d2admin.menu.title": "文档页面 2" } } diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue index f5aaa283..05e6c850 100644 --- a/src/views/dashboard.vue +++ b/src/views/dashboard.vue @@ -1,11 +1,3 @@ - -{ - "meta": { - "d2admin.menu.title": "-" - } -} - -