Skip to content

Commit 099214e

Browse files
committed
update new version and fix crop resize bug
1 parent 73fc023 commit 099214e

28 files changed

+65
-137
lines changed

index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "vue-core-image-upload",
3-
"version": "2.1.7",
3+
"version": "2.1.10",
44
"description": "a vue plgin for image upload and crop",
5-
"main": "src/index.js",
5+
"main": "dist/index.js",
66
"dependencies": {
77
"vue": "^2.0.5"
88
},
@@ -15,6 +15,7 @@
1515
"babel-preset-es2015": "^6.14.0",
1616
"babel-preset-stage-2": "^6.13.0",
1717
"babel-runtime": "^6.11.6",
18+
"copy-webpack-plugin": "^4.0.1",
1819
"css-loader": "^0.25.0",
1920
"eslint": "^3.14.0",
2021
"eslint-config-airbnb": "^14.0.0",

site/build/config.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
'use strict'
2-
const pkg = require('../package')
32

43
module.exports = {
54
port: 4000,
6-
title: 'site',
5+
title: 'vue-core-image-upload a vue plugin for image to crop and upload. (一款轻量级vue.js图片上传裁剪插件)',
76
// when you use electron please set to relative path like ./
87
// otherwise only set to absolute path when you're using history mode
9-
publicPath: '/',
10-
// disable babelrc by default
11-
babel: {
12-
babelrc: false,
13-
presets: ['vue-app','es2015','stage-2'],
14-
}
8+
publicPath: '/'
159
}

site/build/webpack.base.js

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,18 @@ module.exports = {
3232
]
3333
},
3434
module: {
35-
loaders: [
35+
rules: [
3636
{
3737
test: /\.vue$/,
38-
loaders: ['vue-loader']
38+
use: 'vue-loader',
3939
},
4040
{
4141
test: /\.js$/,
42-
loaders: ['babel-loader'],
43-
exclude: /node_modules/
42+
use: {
43+
loader: 'babel-loader'
44+
},
45+
exclude: /node_modules/
4446
},
45-
{
46-
test: /\.(ico|jpg|png|gif|eot|otf|webp|ttf|woff|woff2)(\?.*)?$/,
47-
loader: 'file-loader',
48-
query: {
49-
name: 'static/media/[name].[hash:8].[ext]'
50-
}
51-
},
52-
{
53-
test: /\.svg$/,
54-
loader: 'raw-loader'
55-
}
5647
]
5748
},
5849
plugins: [

site/build/webpack.dev.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,11 @@ _.cssProcessors.forEach(processor => {
2424
} else {
2525
loaders = ['postcss-loader', processor.loader]
2626
}
27-
base.module.loaders.push(
27+
base.module.rules.push(
2828
{
2929
test: processor.test,
3030
loaders: ['style-loader', _.cssLoader].concat(loaders)
3131
}
3232
)
3333
})
34-
3534
module.exports = base

site/build/webpack.prod.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ _.cssProcessors.forEach(processor => {
6868
} else {
6969
loaders = ['postcss-loader', processor.loader]
7070
}
71-
base.module.loaders.push({
71+
base.module.rules.push({
7272
test: processor.test,
7373
loader: ExtractTextPlugin.extract({
7474
use: [_.cssLoader].concat(loaders),
@@ -88,5 +88,5 @@ base.stats = {
8888
chunkOrigins: false,
8989
modules: false
9090
}
91-
91+
console.log(base.module.rules[4]);
9292
module.exports = base

site/client/components/doc/cn/CompressImage.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="center">
66
<p><img width="300" :src="src" /></p>
77
<vue-core-image-upload
8-
:class="['btn', 'btn-primary']"
8+
class="btn btn-primary"
99
@imageuploaded="imageUploded"
1010
:max-file-size="5242880"
1111
compress="50"

site/client/components/doc/cn/CropImage.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</div>
1414
<vue-core-image-upload
1515
crop-ratio="1:1"
16-
:class="['btn', 'btn-primary']"
16+
class="btn btn-primary"
1717
crop="local"
1818
url="http://101.198.151.190/api/upload.php"
1919
extensions="png,jpeg,jpg"
@@ -43,7 +43,7 @@
4343
</div>
4444
<vue-core-image-upload
4545
crop-ratio="1:1"
46-
:class="['btn', 'btn-primary']"
46+
class="btn btn-primary"
4747
crop="server"
4848
url="http://101.198.151.190/api/crop.php"
4949
extensions="png,gif,jpeg,jpg"

site/client/components/doc/cn/Events.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</div>
1717
<div class="center">
1818
<vue-core-image-upload
19-
:class="['btn', 'btn-primary']"
19+
class="btn btn-primary"
2020
:crop="false"
2121
@imagechanged="imagechanged"
2222
@imageuploading="imageuploading"

site/client/components/doc/cn/GetStarted.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<pre v-highlightjs><code class="javascript">&lt;template&gt;
88
&lt;div class="center"&gt;
99
&lt;vue-core-image-upload
10-
:class="['btn', 'btn-primary']"
10+
class="btn btn-primary"
1111
:crop="false"
1212
@imageuploaded="imageuploaded"
1313
:data="data"
@@ -45,7 +45,7 @@ export default {
4545
</p>
4646
<div class="center">
4747
<vue-core-image-upload
48-
:class="['btn', 'btn-primary']"
48+
class="btn btn-primary"
4949
:crop="false"
5050
@imageuploaded="imageuploaded"
5151
:data="data"

0 commit comments

Comments
 (0)