Merge pull request #531 from ielgnaw/staging

feat: bump to 2.5.9-beta.22

example/components/changelog/readme.md

@@ -8,6 +8,99 @@
 
 <div class="changelog-wrapper">
 
+### 2.5.9-beta.22 {page=#/changelog}
+
+* **[fix]**:
+    - [Table 表格](#/table) 修复表格使用fixed固定时，操作行行高错位问题
+    - [Big Tree 大树](#/big-tree) bigTree组件没有横向滚动条
+
+
+### 2.5.9-beta.21 {page=#/changelog}
+
+* **[fix]**:
+    - [Sideslider 侧栏](#/sideslider) 设置pointer-events
+
+
+### 2.5.9-beta.20 {page=#/changelog}
+
+* **[fix]**:
+    - [Cascade 级联选框](#/cascade) 修复事件触发参数错误问题
+
+
+### 2.5.9-beta.19 {page=#/changelog}
+
+* **[fix]**:
+    - [Cascade 级联选框](#/cascade) 修复 hover trigger 下，选中没有 children 的item，子集面板不更新的问题
+
+
+### 2.5.9-beta.18 {page=#/changelog}
+
+* **[fix]**:
+    - [Sideslider 侧栏](#/sideslider) 解决侧栏无法收起的问题
+
+
+### 2.5.9-beta.17 {page=#/changelog}
+
+* **[fix]**:
+    - [Cascade 级联选框](#/cascade) allowDisabledExpand 打开时，禁用项可选
+
+---
+
+### 2.5.9-beta.16 {page=#/changelog}
+
+* **[fix]**:
+    - [Sideslider 侧栏](#/sideslider) sideslider的quickClose失效
+
+---
+
+### 2.5.9-beta.15 {page=#/changelog}
+
+* **[add]**:
+    - [Input 输入框](#/input) 支持配置上下调整数值时的默认起始值
+    - [Cascade 级联选框](#/cascade) 禁用允许展开下一级 #516
+* **[fix]**:
+    - [Cascade 级联选框](#/cascade) 修复 cascader 在 allowDisabledExpand 下的逻辑缺陷
+* **[update]**:
+    - [ResizeLayout 可拉伸布局](#/resize-layout) 可折叠的样式规范
+
+---
+
+### 2.5.9-beta.14 {page=#/changelog}
+
+* **[add]**:
+    - [Cascade 级联选框](#/cascade) 禁用允许展开下一级
+
+---
+
+### 2.5.9-beta.13 {page=#/changelog}
+
+* **[add]**:
+    - [Select 下拉选框](#/select) tag溢出数字展示tooltips
+
+---
+
+### 2.5.9-beta.12 {page=#/changelog}
+
+* **[add]**:
+    - [Input 输入框](#/input) 支持show-overflow-tooltips
+
+---
+
+### 2.5.9-beta.11 {page=#/changelog}
+
+* **[fix]**:
+    - [Select 下拉选框](#/select) 修复虚拟滚动下”全选“逻辑失效的问题 & 双滚动条修复
+    - [Sideslider 侧栏](#/sideslider) 标题溢出hover使用title展示
+
+---
+
+### 2.5.9-beta.10 {page=#/changelog}
+
+* **[add]**:
+    - [Cascade 级联选框](#/cascade) 支持自定义 Trigger
+
+---
+
 ### 2.5.9-beta.9 {page=#/changelog}
 
 * **[fix]**:

example/components/resize-layout/readme.md

@@ -89,7 +89,7 @@
 
 ### 可折叠 {page=#/resize-layout}
 
-:::demo 设置`collapsible`属性为`true`, 开启折叠功能
+:::demo 设置`collapsible`属性为`true`, 开启折叠功能d
 
 ```html
 <template>
@@ -107,12 +107,12 @@
 
 ```html
 <template>
-    <bk-resize-layout :collapsible="true" style="height: 500px;">
-        <bk-resize-layout slot="aside" placement="top" :border="false" style="height: 100%">
+    <bk-resize-layout :collapsible="true" style="height: 500px;" :auto-minimize="true">
+        <bk-resize-layout slot="aside" placement="top" :border="false" style="height: 100%" :collapsible="true" :auto-minimize="true">
             <div slot="aside">aside-top</div>
             <div slot="main">main-1</div>
         </bk-resize-layout>
-        <bk-resize-layout slot="main" placement="bottom" :border="false" style="height: 100%">
+        <bk-resize-layout slot="main" placement="bottom" :border="false" style="height: 100%" :collapsible="true" :auto-minimize="true">
             <div slot="aside">aside-bottom</div>
             <div slot="main">main-2</div>
         </bk-resize-layout>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bk-magic-vue",
-  "version": "2.5.9-beta.9",
+  "version": "2.5.9-beta.22",
   "description": "基于蓝鲸 Magicbox 和 Vue 的前端组件库",
   "main": "dist/bk-magic-vue.min.js",
   "files": [

src/components/resize-layout/resize-layout.vue

@@ -59,8 +59,8 @@
 </template>
 
 <script>
-import { addResizeListener, removeResizeListener } from '@/utils/resize-events'
 import { throttle } from 'throttle-debounce'
+import { addResizeListener, removeResizeListener } from '@/utils/resize-events'
 export default {
   name: 'bk-resize-layout',
   props: {
@@ -115,7 +115,6 @@ export default {
       asideContentVisible: true,
       minimized: false,
       limitMax: null,
-      asideStyleValue: null,
       state: {}
     }
   },
@@ -127,9 +126,12 @@ export default {
       return this.vertical ? 'width' : 'height'
     },
     computedAsideStyle () {
-      const asideStyleValue = typeof this.asideStyleValue === 'number' ? `${this.asideStyleValue}px` : this.asideStyleValue
+      let divide = this.initialDivide
+      if (typeof divide === 'number') {
+        divide = `${divide}px`
+      }
       return {
-        [this.computedStyleKey]: asideStyleValue
+        [this.computedStyleKey]: divide
       }
     },
     computedTriggerStyle () {
@@ -146,9 +148,6 @@ export default {
       return 0
     }
   },
-  created () {
-    this.asideStyleValue = this.initialDivide
-  },
   mounted () {
     this.setupLimit()
     addResizeListener(this.$el, this.setupLimit)
@@ -260,6 +259,7 @@ export default {
           return false
         }
         aside.style[this.computedStyleKey] = resizeProxy.style[placement]
+        console.error('mouseup', aside.style[this.computedStyleKey])
       }
       document.addEventListener('mousemove', handleMouseMove)
       document.addEventListener('mouseup', handleMouseUp)
@@ -288,14 +288,14 @@ export default {
     },
     setupAsideAnimation () {
       const aside = this.$refs.aside
-      const previewStyleValue = aside.style[this.computedStyleKey]
+      const asideRect = aside.getBoundingClientRect()
       this.setupAsideListener(!this.collapsed)
       if (this.collapsed) {
-        aside.setAttribute(`data-${this.computedStyleKey}`, previewStyleValue)
-        this.asideStyleValue = this.collapsible ? '0' : '5px'
+        aside.setAttribute(`data-${this.computedStyleKey}`, asideRect[this.computedStyleKey] + 'px')
+        aside.style[this.computedStyleKey] = this.collapsible ? '0' : '5px'
       } else {
         this.asideContentVisible = true
-        this.asideStyleValue = aside.getAttribute(`data-${this.computedStyleKey}`)
+        aside.style[this.computedStyleKey] = aside.getAttribute(`data-${this.computedStyleKey}`)
       }
     },
     setupAsideListener (asideContentVisible) {