Browse Source

webpack5

master
陈裕财 4 years ago
parent
commit
f16f60d00c
  1. 7
      build/webpack.base.conf.js
  2. 7
      build/webpack.prod.conf.js
  3. 2
      src/components/Image/UploadImage.vue
  4. 4
      src/components/Tinymce/index.vue

7
build/webpack.base.conf.js

@ -55,7 +55,7 @@ var threadLoaderConfig={
name: "my-pool" name: "my-pool"
} }
} }
const publicCssLoaders=process.env.NODE_ENV === 'production'?[{loader:MiniCssExtractPlugin.loader,options:{publicPath:'../'}},'css-loader']:[ 'style-loader','css-loader']
const publicCssLoaders=process.env.NODE_ENV === 'production'?[{loader:MiniCssExtractPlugin.loader,options:{publicPath:'../'}},'css-loader','postcss-loader']:[ 'style-loader','css-loader','postcss-loader']
function resolve(dir) { function resolve(dir) {
return path.join(__dirname, '..', dir) return path.join(__dirname, '..', dir)
@ -100,7 +100,6 @@ module.exports = {
//...(config.dev.useEslint ? [createLintingRule()] : []), //...(config.dev.useEslint ? [createLintingRule()] : []),
{ {
test: /\.vue$/, test: /\.vue$/,
//include: resolve('src'),
use:[ use:[
threadLoaderConfig, threadLoaderConfig,
{ {
@ -203,20 +202,16 @@ module.exports = {
optimization: { optimization: {
splitChunks: { splitChunks: {
chunks: 'all', chunks: 'all',
minSize: 200000,
enforceSizeThreshold: 400000,
cacheGroups: { cacheGroups: {
defaultVendors: { defaultVendors: {
test: /[\\/]node_modules[\\/]/, test: /[\\/]node_modules[\\/]/,
priority: -10, priority: -10,
reuseExistingChunk: true, reuseExistingChunk: true,
enforceSizeThreshold: 400000,
}, },
default: { default: {
minChunks: 2, minChunks: 2,
priority: -20, priority: -20,
reuseExistingChunk: true, reuseExistingChunk: true,
enforceSizeThreshold: 400000,
}, },
}, },
}, },

7
build/webpack.prod.conf.js

@ -68,7 +68,6 @@ const webpackConfig = merge(baseWebpackConfig, {
}), }),
], ],
optimization: { optimization: {
moduleIds:'hashed',
minimize: true, minimize: true,
minimizer:[ minimizer:[
new CssMinimizerPlugin({ new CssMinimizerPlugin({
@ -83,11 +82,7 @@ const webpackConfig = merge(baseWebpackConfig, {
}) })
], ],
splitChunks: { splitChunks: {
chunks: 'all',
minSize: {
javascript: 80000,
webassembly: 80000,
},
chunks: 'all'
}, },
}, },
}) })

2
src/components/Image/UploadImage.vue

@ -251,6 +251,7 @@
pageNum: this.pageInfo.pageNum, pageNum: this.pageInfo.pageNum,
total: this.pageInfo.total total: this.pageInfo.total
}; };
if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){ if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
let orderBys=[]; let orderBys=[];
for(var i=0;i<this.pageInfo.orderFields.length;i++){ for(var i=0;i<this.pageInfo.orderFields.length;i++){
@ -273,6 +274,7 @@
return; return;
} }
params.branchId = this.branchId; params.branchId = this.branchId;
this.selectImages=[];
this.listLoading = true; this.listLoading = true;
listImage(params).then((res) => { listImage(params).then((res) => {
var tips=res.data.tips; var tips=res.data.tips;

4
src/components/Tinymce/index.vue

@ -6,7 +6,10 @@
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import config from '@/common/config';//import import config from '@/common/config';//import
import UploadImage from '@/components/Image/UploadImage'; import UploadImage from '@/components/Image/UploadImage';
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
@ -111,6 +114,7 @@ export default {
imagetools_cors_hosts: ['www.qingqinkj.com', 'codepen.io'], imagetools_cors_hosts: ['www.qingqinkj.com', 'codepen.io'],
default_link_target: '_blank', default_link_target: '_blank',
link_title: false, link_title: false,
convert_urls:false,
fontsize_formats: "8pt 10pt 12pt 14pt 18pt 20pt 24pt 28pt 30pt 36pt 38pt 40pt 42pt 46pt 48pt", fontsize_formats: "8pt 10pt 12pt 14pt 18pt 20pt 24pt 28pt 30pt 36pt 38pt 40pt 42pt 46pt 48pt",
font_formats: "微软雅黑='微软雅黑';宋体='宋体';黑体='黑体';仿宋='仿宋';楷体='楷体';隶书='隶书';幼圆='幼圆';Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings", font_formats: "微软雅黑='微软雅黑';宋体='宋体';黑体='黑体';仿宋='仿宋';楷体='楷体';隶书='隶书';幼圆='幼圆';Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings",
nonbreaking_force_tab: true, // inserting nonbreaking space &nbsp; need Nonbreaking Space Plugin nonbreaking_force_tab: true, // inserting nonbreaking space &nbsp; need Nonbreaking Space Plugin

Loading…
Cancel
Save