Skip to content

Commit

Permalink
[dump]: 0.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
GopherJ committed Jun 30, 2019
1 parent 2703036 commit 9df7f8f
Show file tree
Hide file tree
Showing 6 changed files with 158 additions and 99 deletions.
210 changes: 120 additions & 90 deletions dist/LayoutGrid.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/LayoutGrid.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/LayoutGrid.min.js.map

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-layout-grid",
"version": "0.2.9",
"version": "0.3.0",
"description": "layout gridster with vue",
"main": "dist/LayoutGrid.min.js",
"scripts": {
Expand All @@ -22,11 +22,12 @@
],
"dependencies": {
"buefy": "^0.7.4",
"element-resize-detector": "^1.1.10",
"interactjs": "^1.3.3",
"lodash": "^4.17.5",
"vue": "^2.5.13",
"vuex": "^3.0.1",
"element-resize-detector": "^1.1.10",
"interactjs": "^1.3.3"
"vue-loading-overlay": "git+ssh://[email protected]:10022/VueLibs/vue-loading-overlay.git#v1.0.1",
"vuex": "^3.0.1"
},
"devDependencies": {
"autoprefixer": "^8.2.0",
Expand Down
31 changes: 29 additions & 2 deletions src/components/GridItem.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div ref="item"
class="vue-grid-item"
class="vue-grid-item vld-parent"
:class="{ 'vue-resizable' : resizable, 'resizing' : isResizing, 'vue-draggable-dragging' : isDragging, 'cssTransforms' : useCssTransforms, 'render-rtl' : renderRtl, 'disable-userselect': isDragging }"
:style="style">
<slot></slot>
Expand Down Expand Up @@ -74,7 +74,7 @@
cursor: sw-resize;
right: auto;
}
.vue-grid-item.disable-userselect {
user-select: none;
}
Expand All @@ -83,6 +83,11 @@
import {setTopLeft, setTopRight, setTransformRtl, setTransform, createMarkup, getLayoutItem} from '../utils/utils';
import {getControlPosition, offsetXYFromParentOf, createCoreData} from '../utils/draggableUtils';
import {getDocumentDir} from '../utils/DOM';
import Vue from 'vue';
import Loading from 'vue-loading-overlay';
import 'vue-loading-overlay/dist/vue-loading.css';
Vue.use(Loading);
let interact = require("interactjs");
Expand Down Expand Up @@ -153,6 +158,11 @@
required: false,
default: 'a, button'
},
isLoading: {
type: Boolean,
required: false,
default: false
}
},
inject: ["eventBus"],
data: function () {
Expand Down Expand Up @@ -274,6 +284,23 @@
this.createStyle();
},
watch: {
isLoading: function(n, o) {
if (n) {
this.$vldLoader = this.$overlay.show({
container: this.$refs.item,
width: 84,
height: 84,
loader: 'bars',
canCancel: false,
color: '#CDE201',
backgroundColor: '#000000',
opacity: 0.5,
zIndex: 1002,
});
} else {
this.$vldLoader.hide();
}
},
isDraggable: function () {
this.draggable = this.isDraggable;
},
Expand Down
1 change: 1 addition & 0 deletions src/components/LayoutGrid/LayoutGrid.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
:h="l.h"
:i="l.i"
:min-w="minW"
:is-loading="l.isLoading"
@resize="(i, h, w) => onResize(i, h, w)"
@move="(i, x, y) => onMove(i, x, y)"
@moved="(i, x, y) => onMoved(i, x, y)"
Expand Down

0 comments on commit 9df7f8f

Please sign in to comment.