Merge branch 'dev'

This commit is contained in:
sakuya 2021-05-29 20:05:40 +08:00
commit d308eea54b
4 changed files with 20 additions and 11 deletions

View File

@ -4,7 +4,7 @@
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"build": "vue-cli-service build --report",
"lint": "vue-cli-service lint"
},
"dependencies": {

View File

@ -53,9 +53,10 @@
data() {
return {
init: {
language_url: '/tinymce/langs/zh_CN.js',
language_url: 'tinymce/langs/zh_CN.js',
language: 'zh_CN',
skin_url: '/tinymce/skins/ui/oxide',
skin_url: 'tinymce/skins/ui/oxide',
content_css: "tinymce/skins/content/default/content.css",
menubar: false,
statusbar: true,
plugins: this.plugins,
@ -107,5 +108,4 @@
</script>
<style>
.sceditor .tox .tox-editor-header {box-shadow: 2px 2px 1px rgba(0, 0, 0, .05);}
</style>

View File

@ -88,13 +88,14 @@
//
getViews(){
const filesUrl = []
let files = require.context('@/views', true, /\.vue$/)
files.keys().forEach(file => {
// index? .replace(/\/index$/, "")
filesUrl.push({
value: file.replace(/^\.\/(.*)\.\w+$/, '$1')
})
})
// require.context Webpack使
// let files = require.context('@/views', true, /\.vue$/)
// files.keys().forEach(file => {
// // index? .replace(/\/index$/, "")
// filesUrl.push({
// value: file.replace(/^\.\/(.*)\.\w+$/, '$1')
// })
// })
return filesUrl;
},
querySearch(queryString, cb){

View File

@ -34,6 +34,14 @@ module.exports = {
name: "modules",
test: /[\\/]node_modules[\\/]/,
priority: -10
},
tinymce: {
name: "tinymce",
test: /[\\/]node_modules[\\/]tinymce[\\/]/
},
echarts: {
name: "echarts",
test: /[\\/]node_modules[\\/]echarts[\\/]/
}
}
}