fix: Add IE polyfills, add vue-perfect-scrollbar to DefaultContainer, change packages

This commit is contained in:
woothu
2019-02-27 11:08:49 +01:00
parent 41db896228
commit 6ed6c9054f
5 changed files with 48 additions and 23 deletions
+2 -7
View File
@@ -1,12 +1,7 @@
module.exports = { module.exports = {
presets: [ presets: [
['@vue/app', { [ "@vue/app", {
polyfills: [ "useBuiltIns": 'entry'
'es6.promise', // already default included now
'es6.array.iterator', // already default included now
'es6.symbol',
'es6.object.assign'
]
}] }]
] ]
} }
+8 -4
View File
@@ -1,6 +1,6 @@
{ {
"name": "@coreui/coreui-free-vue-admin-template", "name": "@coreui/coreui-free-vue-admin-template",
"version": "2.0.1", "version": "v3-alpha.1",
"description": "Open Source Bootstrap Admin Template", "description": "Open Source Bootstrap Admin Template",
"author": "Łukasz Holeczek", "author": "Łukasz Holeczek",
"homepage": "http://coreui.io", "homepage": "http://coreui.io",
@@ -8,7 +8,7 @@
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
"build": "vue-cli-service build", "build": "vue-cli-service build --modern",
"lint": "vue-cli-service lint", "lint": "vue-cli-service lint",
"test:unit": "vue-cli-service test:unit", "test:unit": "vue-cli-service test:unit",
"test:e2e": "vue-cli-service test:e2e" "test:e2e": "vue-cli-service test:e2e"
@@ -18,11 +18,12 @@
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0", "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
"@coreui/icons": "0.3.0", "@coreui/icons": "0.3.0",
"@coreui/vue": "../coreui-vue", "@coreui/vue": "../coreui-vue",
"babel-polyfill": "^6.26.0",
"bootstrap": "^4.1.3", "bootstrap": "^4.1.3",
"bootstrap-vue": "^2.0.0-rc.11",
"chart.js": "^2.7.3", "chart.js": "^2.7.3",
"core-js": "^2.5.7", "core-js": "^2.5.7",
"css-vars-ponyfill": "^1.11.1", "css-vars-ponyfill": "^1.11.1",
"current-script-polyfill": "^1.0.0",
"element-resize-detector": "^1.2.0", "element-resize-detector": "^1.2.0",
"flag-icon-css": "^3.2.0", "flag-icon-css": "^3.2.0",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
@@ -41,7 +42,10 @@
"@vue/cli-plugin-unit-jest": "^3.0.5", "@vue/cli-plugin-unit-jest": "^3.0.5",
"@vue/cli-service": "^3.0.5", "@vue/cli-service": "^3.0.5",
"@vue/test-utils": "^1.0.0-beta.25", "@vue/test-utils": "^1.0.0-beta.25",
"babel-core": "^7.0.0-bridge.0", "babel-core": "^6.26.3",
"babel-plugin-dynamic-import-node": "^2.2.0",
"babel-plugin-module-resolver": "^3.1.2",
"babel-preset-vue-app": "^2.0.0",
"babel-jest": "^23.6.0", "babel-jest": "^23.6.0",
"growl": "^1.10.5", "growl": "^1.10.5",
"https-proxy-agent": "^2.2.1", "https-proxy-agent": "^2.2.1",
+33 -1
View File
@@ -32,7 +32,13 @@
<CSidebar fixed> <CSidebar fixed>
<CSidebarHeader/> <CSidebarHeader/>
<CSidebarForm/> <CSidebarForm/>
<CSidebarNav :navItems="computedNav"></CSidebarNav> <!-- <CSidebarNav :navItems="computedNav"/> -->
<nav class="sidebar-nav">
<VuePerfectScrollbar class="scroll-area" :settings="psSettings"
@ps-scroll-y="scrollHandle">
<CSidebarNavItems :items="computedNav"/>
</VuePerfectScrollbar>
</nav>
<CSidebarFooter/> <CSidebarFooter/>
<CSidebarMinimizer/> <CSidebarMinimizer/>
</CSidebar> </CSidebar>
@@ -65,12 +71,14 @@
import nav from '@/_nav' import nav from '@/_nav'
import DefaultAside from './DefaultAside' import DefaultAside from './DefaultAside'
import DefaultHeaderDropdownAccnt from './DefaultHeaderDropdownAccnt' import DefaultHeaderDropdownAccnt from './DefaultHeaderDropdownAccnt'
import VuePerfectScrollbar from 'vue-perfect-scrollbar'
export default { export default {
name: 'full', name: 'full',
components: { components: {
DefaultAside, DefaultAside,
DefaultHeaderDropdownAccnt, DefaultHeaderDropdownAccnt,
VuePerfectScrollbar
}, },
data () { data () {
return { return {
@@ -80,7 +88,31 @@ export default {
computed: { computed: {
computedNav () { computedNav () {
return this.nav.filter((item) => item.name !== 'Dashboard') return this.nav.filter((item) => item.name !== 'Dashboard')
},
psSettings: () => {
// ToDo: find better rtl fix
return {
maxScrollbarLength: 200,
minScrollbarLength: 40,
suppressScrollX: getComputedStyle(document.querySelector('html')).direction !== 'rtl',
wheelPropagation: false,
interceptRailY: styles => ({ ...styles, height: 0 })
}
}
},
methods: {
/*eslint no-unused-vars: ["error", { "argsIgnorePattern": "evt" }]*/
scrollHandle (evt) {
// console.log(evt)
} }
} }
} }
</script> </script>
<style scoped lang="css">
.scroll-area {
position: absolute;
height: 100%;
margin: auto;
}
</style>
+4 -10
View File
@@ -1,27 +1,21 @@
// The Vue build version to load with the `import` command // The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias. // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
import 'core-js/es6/promise' import 'core-js/es6/promise'
import 'core-js/es6/string' import 'core-js/es6/string'
import 'core-js/es7/array' import 'core-js/es7/array'
import '@babel/polyfill'
// import cssVars from 'css-vars-ponyfill' // import cssVars from 'css-vars-ponyfill'
import Vue from 'vue' import Vue from 'vue'
import BootstrapVue from 'bootstrap-vue'
import App from './App' import App from './App'
import router from './router' import router from './router'
import CoreuiVue from '@coreui/vue'
//only for development with link
import CoreuiVueLink from '@coreui/vue/src'
// import CoreuiVue from '@coreui/vue'
Vue.config.performance = true Vue.config.performance = true
// todo // todo
// cssVars() // cssVars()
Vue.use(BootstrapVue) Vue.use(CoreuiVue)
Vue.use(CoreuiVueLink)
/* eslint-disable no-new */ /* eslint-disable no-new */
+1 -1
View File
@@ -1,6 +1,6 @@
<template> <template>
<CRow> <CRow>
<CCol cols="12" xl="6"> <CCol cols="12" xl="8">
<transition name="slide"> <transition name="slide">
<CCard header="users"> <CCard header="users">
<CTable hover <CTable hover