Merge pull request #51 from carrollbradford/master

Fixes issues for #21
Seungwoo321 · Mar 8, 2022 · dc02bc7 · dc02bc7
2 parents 9d684b4 + bdce789
commit dc02bc7
Show file tree

Hide file tree

Showing 6 changed files with 223 additions and 226 deletions.
diff --git a/src/DraggableAttribute.js b/src/DraggableAttribute.js
@@ -78,9 +78,7 @@ export default {
       const valueFilter = values.reduce((r, v) => {
         r[v] = true
         return r
-      }, {
-        ...this.valueFilter
-      })
+      }, Object.assign({},this.valueFilter))
       this.$emit('update:filter', { attribute, valueFilter })
     },
     removeValuesFromFilter (attribute, values) {
@@ -89,9 +87,7 @@ export default {
           delete r[v]
         }
         return r
-      }, {
-        ...this.valueFilter
-      })
+      }, Object.assign({},this.valueFilter))
       this.$emit('update:filter', { attribute, valueFilter })
     },
     moveFilterBoxToTop (attribute) {
@@ -183,8 +179,7 @@ export default {
         showMenu && h('div', {
           staticClass: ['pvtCheckContainer']
         },
-        [
-          ...shown.map(x => {
+        shown.map(x => {
             const checked = !(x in this.valueFilter)
             return h('p', {
               class: {
@@ -218,8 +213,8 @@ export default {
               })
             ])
           })
-        ])
-      ])
+        )
+      ]);
     },
     toggleFilterBox (event) {
       event.stopPropagation()

diff --git a/src/Pivottable.js b/src/Pivottable.js
@@ -1,24 +1,24 @@
-import TableRenderer from './TableRenderer'
-import defaultProps from './helper/common'
+import TableRenderer from './TableRenderer';
+import defaultProps from './helper/common';
 export default {
   name: 'vue-pivottable',
   mixins: [
     defaultProps
   ],
   computed: {
     rendererItems () {
-      return this.renderers || Object.assign({}, TableRenderer)
+      return this.renderers || Object.assign({}, TableRenderer);
     }
   },
   methods: {
     createPivottable (h) {
-      const props = this.$props
+      const props = this.$props;
       return h(this.rendererItems[this.rendererName], {
-        props: {
-          ...props,
-          localeStrings: props.locales[props.locale].localeStrings
-        }
-      })
+        props: Object.assign(
+            props,
+            {localeStrings: props.locales[props.locale].localeStrings}
+          )
+      });
     },
     createWrapperContainer (h) {
       return h('div', {
@@ -30,13 +30,13 @@ export default {
         }
       }, [
         this.createPivottable(h)
-      ])
+      ]);
     }
   },
   render (h) {
-    return this.createWrapperContainer(h)
+    return this.createWrapperContainer(h);
   },
   renderError (h, error) {
-    return this.renderError(h)
+    return this.renderError(h);
   }
-}
+};