diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..1fa96d0 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,31 @@ +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true + +# Matches multiple files with brace expansion notation +# Set default charset +[*.{js,py}] +charset = utf-8 + +# 4 space indentation +[*.js,*.vue ] +indent_style = space +indent_size = 4 + +# Tab indentation (no size specified) +[Makefile] +indent_style = tab + +# Indentation override for all JS under lib directory +[lib/**.js] +indent_style = space +indent_size = 4 + +# Matches the exact files either package.json or .travis.yml +[{package.json,.travis.yml}] +indent_style = space +indent_size = 2 \ No newline at end of file diff --git a/package.json b/package.json index 0a60bde..ff0c028 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "axios": "^0.18.1", "laravel-vue-pagination": "^2.3.0", "lodash.debounce": "^4.0.8", + "lodash.defaultsdeep": "^4.6.1", "vue": "^2.6.10" }, "devDependencies": { @@ -74,7 +75,8 @@ "vuex-persistedstate": "^2.5.4" }, "files": [ - "dist/*" + "dist/*", + "src/*" ], "eslintConfig": { "root": true, diff --git a/src/components/DataTable.vue b/src/components/DataTable.vue index 436b7da..4b45ef1 100644 --- a/src/components/DataTable.vue +++ b/src/components/DataTable.vue @@ -20,11 +20,11 @@ :columns="columns" :dir="tableProps.dir" :sortOrders="sortOrders" - :table-classes="classes.table" - :table-head-classes="classes['th']" - :table-header-classes="classes['t-head']" - :table-row-classes="classes['t-head-tr']" - :table-container-classes="classes['table-container']"> + :table-classes="computedClasses.table" + :table-head-classes="computedClasses['th']" + :table-header-classes="computedClasses['t-head']" + :table-row-classes="computedClasses['t-head-tr']" + :table-container-classes="computedClasses['table-container']">