From 487ef6fd52fbe615f17a5af96ec295af5fcadcde Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 19 Jun 2018 13:51:09 +0800 Subject: [PATCH] no message Former-commit-id: 4c38f2bd200ccd90eb4dc0f3367d67d7cb47d1b1 [formerly 4c38f2bd200ccd90eb4dc0f3367d67d7cb47d1b1 [formerly 4c38f2bd200ccd90eb4dc0f3367d67d7cb47d1b1 [formerly 4c38f2bd200ccd90eb4dc0f3367d67d7cb47d1b1 [formerly d8e1aaf4c26758680dc4cd5b51db886ffd86739e [formerly d0781c0d13d71384cd307e564a6176e64e49e7a0]]]]] Former-commit-id: 26b2872a282b3ccb01e328b200411719aaf176fd Former-commit-id: 143fdba770bf4ca1e72fb274470539ac7b6137dd Former-commit-id: 63cee2802670283c503adb7e81084dc675523d55 [formerly f77bebb96c5377ade8f8adbd0bb0c7c30cf5b7c0] Former-commit-id: 48161dd47c512e4036d37d658a2b166c2934e493 Former-commit-id: dd9be6e4aa02bd20895f2afdaf1a4b7e33af2539 Former-commit-id: 5be876509b54638f6e4e7ec60beddcbda54d8d1f Former-commit-id: 9a6fd0bf985b7090c23f1a3364137a1b2155af32 Former-commit-id: 70ca09c855926f74e60451e5b60581a29a708abd --- docs/zh/components/container.md | 6 ++++++ .../d2-container/components/d2-container-full.vue | 3 +++ src/components/core/d2-container/index.vue | 2 +- src/pages/demo/plugins/better-scroll/to.vue | 14 ++++++++++++-- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/docs/zh/components/container.md b/docs/zh/components/container.md index e5dabe9a..953acd30 100644 --- a/docs/zh/components/container.md +++ b/docs/zh/components/container.md @@ -9,6 +9,12 @@ | type | 容器类型 | 非 | String | card ghost full | card | | responsive | 响应式宽度 | 非 | Boolean | | false | +## 事件 + +| 事件名 | 介绍 | 回调参数 | +| --- | --- | --- | +| resized | type 为 full 时页面完成尺寸计算会触发此事件 | | + ::: tip `responsive` 参数设置只在 `type` 等于 `card` 或 `ghost` 时生效 ::: diff --git a/src/components/core/d2-container/components/d2-container-full.vue b/src/components/core/d2-container/components/d2-container-full.vue index 7432efcc..7cb9cc16 100644 --- a/src/components/core/d2-container/components/d2-container-full.vue +++ b/src/components/core/d2-container/components/d2-container-full.vue @@ -47,6 +47,9 @@ export default { mounted () { this.headerHeight = this.$slots.header ? this.$refs.header.offsetHeight : 0 this.footerHeight = this.$slots.footer ? this.$refs.footer.offsetHeight : 0 + this.$nextTick(() => { + this.$emit('resized') + }) }, computed: { cardStyle () { diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue index e521387a..5119d139 100644 --- a/src/components/core/d2-container/index.vue +++ b/src/components/core/d2-container/index.vue @@ -11,7 +11,7 @@ - + diff --git a/src/pages/demo/plugins/better-scroll/to.vue b/src/pages/demo/plugins/better-scroll/to.vue index de8eb9cf..1e2db7ca 100644 --- a/src/pages/demo/plugins/better-scroll/to.vue +++ b/src/pages/demo/plugins/better-scroll/to.vue @@ -1,9 +1,9 @@ @@ -54,8 +57,15 @@ export default { fade: true } }) + const a = 'abc' + const b = 'abc' + console.log(a == b) + console.log(a === b) }, methods: { + handleResize () { + this.BS.refresh() + }, handleScrollTo (y) { this.BS.scrollTo(0, -y, this.time) },