From 927476dc07fcaae6c4177322bb4de0e513977c40 Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Tue, 2 Jul 2019 21:10:10 +0800 Subject: [PATCH] feat(h5): add nvue flex-direction --- src/core/service/plugins/app/router-guard.js | 3 +++ src/core/service/plugins/index.js | 2 ++ src/core/view/index.css | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/src/core/service/plugins/app/router-guard.js b/src/core/service/plugins/app/router-guard.js index 131d6b826..de1b5633a 100644 --- a/src/core/service/plugins/app/router-guard.js +++ b/src/core/service/plugins/app/router-guard.js @@ -145,10 +145,13 @@ function beforeEach (to, from, next, routes) { if (__PLATFORM__ === 'h5') { if (to.meta && to.meta.name) { document.body.className = 'uni-body ' + to.meta.name + const nvueDirKey = 'nvue-dir-' + __uniConfig.nvue['flex-direction'] if (to.meta.isNVue) { document.body.setAttribute('nvue', '') + document.body.setAttribute(nvueDirKey, '') } else { document.body.removeAttribute('nvue') + document.body.removeAttribute(nvueDirKey) } } } diff --git a/src/core/service/plugins/index.js b/src/core/service/plugins/index.js index 81b23b1c2..aa828085f 100644 --- a/src/core/service/plugins/index.js +++ b/src/core/service/plugins/index.js @@ -108,7 +108,9 @@ export default { if (entryRoute.meta && entryRoute.meta.name) { document.body.className = 'uni-body ' + entryRoute.meta.name if (entryRoute.meta.isNVue) { + const nvueDirKey = 'nvue-dir-' + __uniConfig.nvue['flex-direction'] document.body.setAttribute('nvue', '') + document.body.setAttribute(nvueDirKey, '') } } } diff --git a/src/core/view/index.css b/src/core/view/index.css index 8dde30399..cd4dd7af6 100644 --- a/src/core/view/index.css +++ b/src/core/view/index.css @@ -130,9 +130,28 @@ uni-page { [nvue] uni-view, [nvue] uni-swiper-item { display: flex; +} + +[nvue-dir-row] uni-view, +[nvue-dir-row] uni-swiper-item { + flex-direction: row; +} + +[nvue-dir-column] uni-view, +[nvue-dir-column] uni-swiper-item { flex-direction: column; } +[nvue-dir-row-reverse] uni-view, +[nvue-dir-row-reverse] uni-swiper-item { + flex-direction: row-reverse; +} + +[nvue-dir-column-reverse] uni-view, +[nvue-dir-column-reverse] uni-swiper-item { + flex-direction: column-reverse; +} + [nvue] uni-view, [nvue] uni-image, [nvue] uni-input, -- GitLab