Skip to content

Commit b2b80b3

Browse files
committed
2.4.0 release
1 parent d1a4c4e commit b2b80b3

15 files changed

+10013
-280
lines changed

README-zh_CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
vue-grid-layout是一个类似于[Gridster](http://dsmorse.github.io/gridster.js/)的栅格布局系统, 适用于Vue.js。 **灵感源自于 [React-Grid-Layout](https://github.com/STRML/react-grid-layout)**
88

9-
### **当前版本:** 2.3.11 (支持 Vue 2.2+)
9+
### **当前版本:** 2.4.0 (支持 Vue 2.2+)
1010

1111
### **Vue 2.1.10 及以下请使用 [2.1.3](https://github.com/jbaysolutions/vue-grid-layout/tree/2.1.3)**
1212
### **Vue 1 请使用 [1.0.3](https://github.com/jbaysolutions/vue-grid-layout/tree/1.0.3)**

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ vue-grid-layout is a grid layout system, like [Gridster](http://dsmorse.github.i
3333
* Automatic RTL support (resizing not working with RTL on 2.2.0)
3434
* Responsive
3535

36-
## **Current version:** 2.3.12 (Supports Vue 2.2+)
36+
## **Current version:** 2.4.0 (Supports Vue 2.2+)
3737

3838
#### **For legacy browsers**, like IE11, use version [2.3.12-legacy](https://github.com/jbaysolutions/vue-grid-layout/tree/legacy)
3939
#### **For Vue 2.1.10 and below use version [2.1.3](https://github.com/jbaysolutions/vue-grid-layout/tree/2.1.3)**

dist/vue-grid-layout.common.js

Lines changed: 633 additions & 135 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vue-grid-layout.common.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vue-grid-layout.umd.js

Lines changed: 633 additions & 135 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vue-grid-layout.umd.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vue-grid-layout.umd.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vue-grid-layout.umd.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-grid-layout",
3-
"version": "2.3.12",
3+
"version": "2.4.0",
44
"description": "A draggable and resizable grid layout, as a Vue component.",
55
"keywords": [
66
"grid",

src/App.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
{"x":0,"y":0,"w":2,"h":2,"i":"0", resizable: true, draggable: true, static: false, minY: 0, maxY: 2},
131131
{"x":2,"y":0,"w":2,"h":4,"i":"1", resizable: null, draggable: null, static: true},
132132
{"x":4,"y":0,"w":2,"h":5,"i":"2", resizable: false, draggable: false, static: false, minX: 4, maxX: 4, minW: 2, maxW: 2, preserveAspectRatio: true},
133-
{"x":6,"y":0,"w":2,"h":3,"i":"3", resizable: false, draggable: false, static: false},
133+
{"x":6,"y":0,"w":2,"h":3,"i":"3", resizable: false, draggable: false, static: false, preserveAspectRatio: true},
134134
{"x":8,"y":0,"w":2,"h":3,"i":"4", resizable: false, draggable: false, static: false},
135135
{"x":10,"y":0,"w":2,"h":3,"i":"5", resizable: false, draggable: false, static: false},
136136
{"x":0,"y":5,"w":2,"h":5,"i":"6", resizable: false, draggable: false, static: false},

website/docs/changelog/README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@ sidebar: auto
33
---
44
# Changelog
55

6+
## 2.4.0 (Aug 3, 2022)
7+
8+
* GridLayout transformScale prop, to allow proper dragging and resizing when scaled (#430) (thanks [adt-hgkim](https://github.com/adt-hgkim)
9+
* GridLayout and GridItem isBounded prop, to prevent draging outside of the parent element (#523) (thanks [rin4ik](https://github.com/rin4ik)
10+
* Added GridItem passthrough options for interact resizable and draggable (#181) (thanks [llezenelrahc](https://github.com/llezenelrahc)
11+
* Change function call order for responsive features (thanks [william8012](https://github.com/william8012)
12+
* Added GridLayout restoreOnDrag prop, to generate less gaps on drag when verticalCompact is false (thanks [jledentu](https://github.com/jledentu)
13+
* added unit tests (thanks [ygj6](https://github.com/ygj6)
14+
* layout key extra validations (thanks [ygj6](https://github.com/ygj6)
15+
* Fix grid items overlapping when using autoSize() (thanks [ygj6](https://github.com/ygj6) and [savandriy](https://github.com/savandriy))
16+
617
## 2.3.12 (Jan 15, 2020)
718

819
* Bumped interact.js to 1.10.2

website/docs/guide/properties.md

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,14 @@ Says if the grids items are resizable.
8484

8585
Says if the RTL/LTR should be reversed.
8686

87+
### isBounded
88+
89+
* type: `Boolean`
90+
* required: `false`
91+
* default: `false`
92+
93+
Says if the grid items are bounded to the container when dragging
94+
8795
### autoSize
8896

8997
* type: `Boolean`
@@ -161,6 +169,15 @@ Defines number of columns for each breakpoint
161169

162170
Says if set the `styleCursor` option to true. When dragging freezes, setting this value to `false` may alleviate problems.
163171
**This property is not reactive**
172+
173+
174+
### transformScale
175+
176+
* type: `Number`
177+
* required: `false`
178+
* default: 1
179+
180+
Sets a scaling factor to the size of the grid items, 1 is 100%
164181

165182
## GridItem
166183

@@ -267,6 +284,16 @@ Says if item is resizable.
267284

268285
If default value is `null` then it's inherited from parent.
269286

287+
### isBounded
288+
289+
* type: `Boolean`
290+
* required: `false`
291+
* default: `null`
292+
293+
Says if the item is bounded to the container when dragging.
294+
295+
If default value is `null` then it's inherited from parent.
296+
270297
### static
271298

272299
* type: `Boolean`
@@ -322,3 +349,21 @@ For more info please refer to `ignoreFrom` in [interact.js docs](http://interact
322349
* default: `false`
323350

324351
If 'true', forces the GridItem to preserve its aspect ratio when resizing.
352+
353+
354+
### dragOption
355+
356+
* type: `Object`
357+
* required: `false`
358+
* default: `{}`
359+
360+
Passthrough object for the grid item [interact.js draggable configuration](https://interactjs.io/docs/draggable/)
361+
362+
### resizeOption
363+
364+
* type: `Object`
365+
* required: `false`
366+
* default: `{}`
367+
368+
Passthrough object for the grid item [interact.js resizable configuration](https://interactjs.io/docs/resizable/)
369+

website/docs/zh/changelog/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ sidebar: auto
33
---
44
# 更新日志
55

6+
## 2.4.0(2022年08月03日)
7+
8+
* TODO
9+
610
## 2.3.12(2021年01月15日)
711

812
* 将interact.js升级到1.10.2

website/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"devDependencies": {
1616
"@vuepress/plugin-back-to-top": "^1.6.0",
1717
"@vuepress/plugin-google-analytics": "^1.6.0",
18-
"vue-grid-layout": "^2.3.11",
18+
"vue-grid-layout": "^2.4.0",
1919
"vuepress-plugin-seo": "^0.1.4",
2020
"vuepress-plugin-sitemap": "^2.3.1",
2121
"vuepress": "^1.7.1",

0 commit comments

Comments
 (0)