Skip to content

Commit b3d7579

Browse files
xiaoluobodingxiaoluoboding
authored
Merge pull request #23 from xiaoluoboding/dev
Dev
2 parents a6d2f62 + a3137c2 commit b3d7579

8 files changed

+33
-27
lines changed

Diff for: ‎CHANGELOG.md

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
## 0.4.6 (2019-08-08)
1+
# 0.5.0 (2019-11-26)
22

33

44
### Features
55

6-
* use svg sprite instead svg assets ([0db4294](https://github.com/xiaoluoboding/vue-smart-widget/commit/0db4294))
6+
* add loading.svg ([5b926e3](https://github.com/xiaoluoboding/vue-smart-widget/commit/5b926e31ed3f575b62383cf9606523340acb0f6b))
7+
* add new props for smart-widget-grid ([390b751](https://github.com/xiaoluoboding/vue-smart-widget/commit/390b75175d77d1f41f9a07359e23ee6ce9acd059))
8+
* add static property on smart-widget-grid ([6e12f5d](https://github.com/xiaoluoboding/vue-smart-widget/commit/6e12f5d3e99091925b84c206c3a878c793b3c5ef))
9+
* improve the fullscreen action ([9c0e023](https://github.com/xiaoluoboding/vue-smart-widget/commit/9c0e023ac8176d9402a9b956c58bbdb33a0fb671))
10+
* rewrite grid-layout events ([24edb1c](https://github.com/xiaoluoboding/vue-smart-widget/commit/24edb1c855fa9c36e98a3a60867e8da14148337e))
11+
* use codesandbox instead jsfiddle ([914c0d6](https://github.com/xiaoluoboding/vue-smart-widget/commit/914c0d695d1df34f0d2d279df474dca5772fbeb4))
12+
* use svg sprite instead svg assets ([0db4294](https://github.com/xiaoluoboding/vue-smart-widget/commit/0db4294d62fbd945baf68e893f5136514b22e13c))
713

814

915

Diff for: ‎docs/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>vue-smart-widget</title><link href=js/chunk-vendors.216a4a1e.js rel=preload as=script><link href=js/index.59167b0c.js rel=preload as=script></head><body><noscript><strong>We're sorry but vue-smart-widget doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.216a4a1e.js></script><script src=js/index.59167b0c.js></script></body></html>
1+
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>vue-smart-widget</title><link href=js/chunk-vendors.216a4a1e.js rel=preload as=script><link href=js/index.d905fc24.js rel=preload as=script></head><body><noscript><strong>We're sorry but vue-smart-widget doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.216a4a1e.js></script><script src=js/index.d905fc24.js></script></body></html>

Diff for: ‎docs/js/index.59167b0c.js renamed to ‎docs/js/index.d905fc24.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎lib/vue-smart-widget.common.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -19358,7 +19358,7 @@ if (typeof window !== 'undefined') {
1935819358
// EXTERNAL MODULE: ./src/plugins/svg-icon.js
1935919359
var svg_icon = __webpack_require__("a675");
1936019360

19361-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"13f26c5c-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/SmartWidgetGrid.vue?vue&type=template&id=6b61dfa9&
19361+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"4159c998-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/SmartWidgetGrid.vue?vue&type=template&id=6b61dfa9&
1936219362
var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('grid-layout',_vm._g(_vm._b({attrs:{"layout":_vm.layout},on:{"update:layout":function($event){_vm.layout=$event}}},'grid-layout',_vm.layoutAttrs,false),_vm.gridLayoutEvents),_vm._l((_vm.layout),function(item){return _c('grid-item',_vm._b({key:item.i,attrs:{"drag-ignore-from":".widget-body","static":_vm.isStatic},on:{"move":_vm.moveEvent,"resize":_vm.resizeEvent,"moved":_vm.movedEvent,"resized":_vm.resizedEvent,"container-resized":_vm.containerResizedEvent}},'grid-item',item,false),[_vm._t(item.i)],2)}),1)}
1936319363
var staticRenderFns = []
1936419364

@@ -19616,17 +19616,17 @@ var component = normalizeComponent(
1961619616
)
1961719617

1961819618
/* harmony default export */ var SmartWidgetGrid = (component.exports);
19619-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"13f26c5c-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/SmartWidget.vue?vue&type=template&id=eb7d06da&
19620-
var SmartWidgetvue_type_template_id_eb7d06da_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"smartwidget",class:_vm.smartWidgetClass,style:([_vm.smartWidgetStyle, _vm.dynamicStyle]),on:{"mouseover":_vm.handleMouseover,"mouseout":_vm.handleMouseout}},[(!_vm.simple)?_c('div',{staticClass:"widget-header",style:(_vm.widgetHeaderHeight)},[(_vm.$slots.title)?_vm._t("title"):_c('div',{staticClass:"widget-header__title ellis",style:(_vm.widgetTitleStyle)},[_c('span',{domProps:{"textContent":_vm._s(_vm.title)}}),(_vm.subTitle!=='')?_c('span',{staticClass:"widget-header__subtitle",domProps:{"textContent":_vm._s(_vm.subTitle)}}):_vm._e()]),_c('div',{staticClass:"widget-header__toolbar"},[(!_vm.isHasGroup && _vm.collapse && !_vm.isFullScreen)?_c('a',{attrs:{"href":"javascript:;"},on:{"click":function($event){_vm.isCollapsed=!_vm.isCollapsed}}},[_c('svg-icon',{attrs:{"icon-name":_vm.isCollapsed ? 'expand' : 'collapse'}})],1):_vm._e(),(_vm.fullscreen)?_c('a',{attrs:{"href":"javascript:;"},on:{"click":_vm.handlefullScreen}},[_c('svg-icon',{attrs:{"icon-name":_vm.isFullScreen ? 'unfullscreen' : 'fullscreen'}})],1):_vm._e(),(_vm.refresh && !_vm.isFullScreen)?_c('a',{attrs:{"href":"javascript:;"}},[(_vm.loading)?_c('svg-icon',{staticClass:"sw-loading",attrs:{"icon-name":"loading"}}):_c('svg-icon',{attrs:{"icon-name":"refresh"},on:{"click":function($event){return _vm.$emit('on-refresh')}}})],1):_vm._e(),(_vm.$slots.toolbar)?_vm._t("toolbar"):_vm._e()],2)],2):_vm._e(),_c('collapse-transition',[_c('div',{directives:[{name:"show",rawName:"v-show",value:(!_vm.isCollapsed),expression:"!isCollapsed"}],ref:"widgetBody",class:[
19619+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"4159c998-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/SmartWidget.vue?vue&type=template&id=468914a6&
19620+
var SmartWidgetvue_type_template_id_468914a6_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"smartwidget",class:_vm.smartWidgetClass,style:([_vm.smartWidgetStyle, _vm.dynamicStyle]),on:{"mouseover":_vm.handleMouseover,"mouseout":_vm.handleMouseout}},[(!_vm.simple)?_c('div',{staticClass:"widget-header",style:(_vm.widgetHeaderHeight)},[(_vm.$slots.title)?_vm._t("title"):_c('div',{staticClass:"widget-header__title ellis",style:(_vm.widgetTitleStyle)},[_c('span',{domProps:{"textContent":_vm._s(_vm.title)}}),(_vm.subTitle!=='')?_c('span',{staticClass:"widget-header__subtitle",domProps:{"textContent":_vm._s(_vm.subTitle)}}):_vm._e()]),_c('div',{staticClass:"widget-header__toolbar"},[(!_vm.isHasGroup && _vm.collapse && !_vm.isFullScreen)?_c('a',{attrs:{"href":"javascript:;"},on:{"click":function($event){_vm.isCollapsed=!_vm.isCollapsed}}},[_c('svg-icon',{attrs:{"icon-name":_vm.isCollapsed ? 'expand' : 'collapse'}})],1):_vm._e(),(_vm.fullscreen)?_c('a',{attrs:{"href":"javascript:;"},on:{"click":_vm.handlefullScreen}},[_c('svg-icon',{attrs:{"icon-name":_vm.isFullScreen ? 'unfullscreen' : 'fullscreen'}})],1):_vm._e(),(_vm.refresh && !_vm.isFullScreen)?_c('a',{attrs:{"href":"javascript:;"}},[(_vm.loading)?_c('svg-icon',{staticClass:"sw-loading",attrs:{"icon-name":"loading"}}):_c('svg-icon',{attrs:{"icon-name":"refresh"},on:{"click":function($event){return _vm.$emit('on-refresh')}}})],1):_vm._e(),(_vm.$slots.toolbar)?_vm._t("toolbar"):_vm._e()],2)],2):_vm._e(),_c('collapse-transition',[_c('div',{directives:[{name:"show",rawName:"v-show",value:(!_vm.isCollapsed),expression:"!isCollapsed"}],ref:"widgetBody",class:[
1962119621
_vm.simple ? 'widget-body-simple': 'widget-body',
1962219622
{ 'is-collapse': _vm.isCollapsed }
1962319623
],style:(!_vm.simple ? _vm.widgetBodyStyle : {})},[_c('div',{ref:"widgetBodyEditbox",staticClass:"widget-body__editbox"},[_vm._t("editbox")],2),_c('div',{ref:"widgetBodyContent",staticClass:"widget-body__content",class:{'fixed-height': _vm.fixedHeight},style:(_vm.widgetBodyContentStyle)},[_vm._t("default",null,{"contentH":_vm.contentH})],2),_c('div',{ref:"widgetBodyFooter",staticClass:"widget-body__footer",class:{'has-group': _vm.isHasGroup}},[(_vm.$slots.footer)?_vm._t("footer"):_vm._e()],2),(_vm.loading)?_c('loading-mask'):_vm._e()],1)])],1)}
19624-
var SmartWidgetvue_type_template_id_eb7d06da_staticRenderFns = []
19624+
var SmartWidgetvue_type_template_id_468914a6_staticRenderFns = []
1962519625

1962619626

19627-
// CONCATENATED MODULE: ./src/packages/SmartWidget.vue?vue&type=template&id=eb7d06da&
19627+
// CONCATENATED MODULE: ./src/packages/SmartWidget.vue?vue&type=template&id=468914a6&
1962819628

19629-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"13f26c5c-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/LoadingMask.vue?vue&type=template&id=64df4e6c&
19629+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"4159c998-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/LoadingMask.vue?vue&type=template&id=64df4e6c&
1963019630
var LoadingMaskvue_type_template_id_64df4e6c_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"smart-widget__loading-mask"},[_c('div',{staticClass:"loading-spinner"},[_c('svg',{staticClass:"circular",attrs:{"viewBox":"25 25 50 50"}},[_c('circle',{staticClass:"path",attrs:{"cx":"50","cy":"50","r":"20","fill":"none"}})])])])}
1963119631
var LoadingMaskvue_type_template_id_64df4e6c_staticRenderFns = []
1963219632

@@ -19660,7 +19660,7 @@ var LoadingMask_component = normalizeComponent(
1966019660
var collapse_transition = __webpack_require__("9a90");
1966119661
var collapse_transition_default = /*#__PURE__*/__webpack_require__.n(collapse_transition);
1966219662

19663-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"13f26c5c-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/SvgIcon.vue?vue&type=template&id=24093ca3&scoped=true&
19663+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"4159c998-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/SvgIcon.vue?vue&type=template&id=24093ca3&scoped=true&
1966419664
var SvgIconvue_type_template_id_24093ca3_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('svg',_vm._g({class:_vm.svgClass,attrs:{"aria-hidden":"true"}},_vm.$listeners),[_c('use',{attrs:{"xlink:href":_vm.iconClass}})])}
1966519665
var SvgIconvue_type_template_id_24093ca3_scoped_true_staticRenderFns = []
1966619666

@@ -19972,7 +19972,7 @@ var SvgIcon_component = normalizeComponent(
1997219972
return widgetBodyH
1997319973
},
1997419974
getContentH () {
19975-
const widgetBodyH = this.widgetBodyOffsetHeight
19975+
const widgetBodyH = this.getWidgetBodyH()
1997619976
const paddingH = this.getPaddingH()
1997719977
const widgetBodyEditBoxH = this.widgetBodyEditBoxH
1997819978
const widgetBodyFooterH = this.widgetBodyFooterH
@@ -20012,8 +20012,8 @@ var SmartWidgetvue_type_style_index_0_lang_less_ = __webpack_require__("31cf");
2001220012

2001320013
var SmartWidget_component = normalizeComponent(
2001420014
packages_SmartWidgetvue_type_script_lang_js_,
20015-
SmartWidgetvue_type_template_id_eb7d06da_render,
20016-
SmartWidgetvue_type_template_id_eb7d06da_staticRenderFns,
20015+
SmartWidgetvue_type_template_id_468914a6_render,
20016+
SmartWidgetvue_type_template_id_468914a6_staticRenderFns,
2001720017
false,
2001820018
null,
2001920019
null,

0 commit comments

Comments
 (0)