Skip to content

Commit 26b8484

Browse files
yugasunPanJiaChen
yugasun
authored and
PanJiaChen
committed
fix: change tab char to 2 spaces (PanJiaChen#522)
1 parent 3cc3e13 commit 26b8484

File tree

17 files changed

+799
-799
lines changed

17 files changed

+799
-799
lines changed

‎README.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
</p>
44

55
<p align="center">
6-
<a href="https://github.com/vuejs/vue">
7-
<img src="https://img.shields.io/badge/vue-2.5.10-brightgreen.svg" alt="vue">
8-
</a>
9-
<a href="https://github.com/ElemeFE/element">
10-
<img src="https://img.shields.io/badge/element--ui-2.0.8-brightgreen.svg" alt="element-ui">
11-
</a>
12-
<a href="https://travis-ci.org/PanJiaChen/vue-element-admin" rel="nofollow">
13-
<img src="https://travis-ci.org/PanJiaChen/vue-element-admin.svg?branch=master" alt="Build Status">
14-
</a>
15-
<a href="https://github.com/PanJiaChen/vue-element-admin/blob/master/LICENSE">
16-
<img src="https://img.shields.io/github/license/mashape/apistatus.svg" alt="license">
17-
</a>
18-
<a href="https://github.com/PanJiaChen/vue-element-admin/releases">
19-
<img src="https://img.shields.io/github/release/PanJiaChen/vue-element-admin.svg" alt="GitHub release">
20-
</a>
6+
<a href="https://github.com/vuejs/vue">
7+
<img src="https://img.shields.io/badge/vue-2.5.10-brightgreen.svg" alt="vue">
8+
</a>
9+
<a href="https://github.com/ElemeFE/element">
10+
<img src="https://img.shields.io/badge/element--ui-2.0.8-brightgreen.svg" alt="element-ui">
11+
</a>
12+
<a href="https://travis-ci.org/PanJiaChen/vue-element-admin" rel="nofollow">
13+
<img src="https://travis-ci.org/PanJiaChen/vue-element-admin.svg?branch=master" alt="Build Status">
14+
</a>
15+
<a href="https://github.com/PanJiaChen/vue-element-admin/blob/master/LICENSE">
16+
<img src="https://img.shields.io/github/license/mashape/apistatus.svg" alt="license">
17+
</a>
18+
<a href="https://github.com/PanJiaChen/vue-element-admin/releases">
19+
<img src="https://img.shields.io/github/release/PanJiaChen/vue-element-admin.svg" alt="GitHub release">
20+
</a>
2121
</p>
2222

2323
English | [简体中文](./README.zh-CN.md)

‎README.zh-CN.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
</p>
44

55
<p align="center">
6-
<a href="https://github.com/vuejs/vue">
7-
<img src="https://img.shields.io/badge/vue-2.5.10-brightgreen.svg" alt="vue">
8-
</a>
9-
<a href="https://github.com/ElemeFE/element">
10-
<img src="https://img.shields.io/badge/element--ui-2.0.8-brightgreen.svg" alt="element-ui">
11-
</a>
12-
<a href="https://travis-ci.org/PanJiaChen/vue-element-admin" rel="nofollow">
13-
<img src="https://travis-ci.org/PanJiaChen/vue-element-admin.svg?branch=master" alt="Build Status">
14-
</a>
15-
<a href="https://github.com/PanJiaChen/vue-element-admin/blob/master/LICENSE">
16-
<img src="https://img.shields.io/github/license/mashape/apistatus.svg" alt="license">
17-
</a>
18-
<a href="https://github.com/PanJiaChen/vue-element-admin/releases">
19-
<img src="https://img.shields.io/github/release/PanJiaChen/vue-element-admin.svg" alt="GitHub release">
20-
</a>
6+
<a href="https://github.com/vuejs/vue">
7+
<img src="https://img.shields.io/badge/vue-2.5.10-brightgreen.svg" alt="vue">
8+
</a>
9+
<a href="https://github.com/ElemeFE/element">
10+
<img src="https://img.shields.io/badge/element--ui-2.0.8-brightgreen.svg" alt="element-ui">
11+
</a>
12+
<a href="https://travis-ci.org/PanJiaChen/vue-element-admin" rel="nofollow">
13+
<img src="https://travis-ci.org/PanJiaChen/vue-element-admin.svg?branch=master" alt="Build Status">
14+
</a>
15+
<a href="https://github.com/PanJiaChen/vue-element-admin/blob/master/LICENSE">
16+
<img src="https://img.shields.io/github/license/mashape/apistatus.svg" alt="license">
17+
</a>
18+
<a href="https://github.com/PanJiaChen/vue-element-admin/releases">
19+
<img src="https://img.shields.io/github/release/PanJiaChen/vue-element-admin.svg" alt="GitHub release">
20+
</a>
2121
</p>
2222

2323
简体中文 | [English](./README.md)

‎config/dev.env.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module.exports = {
2-
NODE_ENV: '"development"',
3-
ENV_CONFIG: '"dev"',
4-
BASE_API: '"https://api-dev"'
2+
NODE_ENV: '"development"',
3+
ENV_CONFIG: '"dev"',
4+
BASE_API: '"https://api-dev"'
55
}

‎config/prod.env.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module.exports = {
2-
NODE_ENV: '"production"',
3-
ENV_CONFIG: '"prod"',
4-
BASE_API: '"https://api-prod"'
2+
NODE_ENV: '"production"',
3+
ENV_CONFIG: '"prod"',
4+
BASE_API: '"https://api-prod"'
55
}

‎config/sit.env.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module.exports = {
2-
NODE_ENV: '"production"',
3-
ENV_CONFIG: '"sit"',
4-
BASE_API: '"https://api-sit"'
2+
NODE_ENV: '"production"',
3+
ENV_CONFIG: '"sit"',
4+
BASE_API: '"https://api-sit"'
55
}

‎index.html

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<!DOCTYPE html>
22
<html>
3-
<head>
4-
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6-
<meta name="renderer" content="webkit">
7-
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
8-
<title>vue-element-admin</title>
9-
</head>
10-
<body>
11-
<script src=<%= htmlWebpackPlugin.options.path %>/tinymce4.7.5/tinymce.min.js></script>
12-
<div id="app"></div>
13-
<!-- built files will be auto injected -->
14-
</body>
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6+
<meta name="renderer" content="webkit">
7+
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
8+
<title>vue-element-admin</title>
9+
</head>
10+
<body>
11+
<script src=<%= htmlWebpackPlugin.options.path %>/tinymce4.7.5/tinymce.min.js></script>
12+
<div id="app"></div>
13+
<!-- built files will be auto injected -->
14+
</body>
1515
</html>

‎src/App.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
2-
<div id="app">
3-
<router-view></router-view>
4-
</div>
2+
<div id="app">
3+
<router-view></router-view>
4+
</div>
55
</template>
66

77
<script>

‎src/components/Hamburger/index.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ export default {
3030

3131
<style scoped>
3232
.hamburger {
33-
display: inline-block;
34-
cursor: pointer;
35-
width: 20px;
36-
height: 20px;
37-
transform: rotate(90deg);
38-
transition: .38s;
39-
transform-origin: 50% 50%;
33+
display: inline-block;
34+
cursor: pointer;
35+
width: 20px;
36+
height: 20px;
37+
transform: rotate(90deg);
38+
transition: .38s;
39+
transform-origin: 50% 50%;
4040
}
4141
4242
.hamburger.is-active {
43-
transform: rotate(0deg);
43+
transform: rotate(0deg);
4444
}
4545
</style>

‎src/components/ImageCropper/index.vue

Lines changed: 96 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,104 @@
11
<template>
22
<div class="vue-image-crop-upload" v-show="value">
3-
<div class="vicp-wrap">
4-
<div class="vicp-close" @click="off">
5-
<i class="vicp-icon4"></i>
6-
</div>
3+
<div class="vicp-wrap">
4+
<div class="vicp-close" @click="off">
5+
<i class="vicp-icon4"></i>
6+
</div>
77

8-
<div class="vicp-step1" v-show="step == 1">
9-
<div class="vicp-drop-area" @dragleave="preventDefault" @dragover="preventDefault" @dragenter="preventDefault" @click="handleClick" @drop="handleChange">
10-
<i class="vicp-icon1" v-show="loading != 1">
11-
<i class="vicp-icon1-arrow"></i>
12-
<i class="vicp-icon1-body"></i>
13-
<i class="vicp-icon1-bottom"></i>
14-
</i>
15-
<span class="vicp-hint" v-show="loading !== 1">{{ lang.hint }}</span>
16-
<span class="vicp-no-supported-hint" v-show="!isSupported">{{ lang.noSupported }}</span>
17-
<input type="file" v-show="false" v-if="step == 1" @change="handleChange" ref="fileinput">
18-
</div>
19-
<div class="vicp-error" v-show="hasError">
20-
<i class="vicp-icon2"></i> {{ errorMsg }}
21-
</div>
22-
<div class="vicp-operate">
23-
<a @click="off" @mousedown="ripple">{{ lang.btn.off }}</a>
24-
</div>
25-
</div>
8+
<div class="vicp-step1" v-show="step == 1">
9+
<div class="vicp-drop-area" @dragleave="preventDefault" @dragover="preventDefault" @dragenter="preventDefault" @click="handleClick" @drop="handleChange">
10+
<i class="vicp-icon1" v-show="loading != 1">
11+
<i class="vicp-icon1-arrow"></i>
12+
<i class="vicp-icon1-body"></i>
13+
<i class="vicp-icon1-bottom"></i>
14+
</i>
15+
<span class="vicp-hint" v-show="loading !== 1">{{ lang.hint }}</span>
16+
<span class="vicp-no-supported-hint" v-show="!isSupported">{{ lang.noSupported }}</span>
17+
<input type="file" v-show="false" v-if="step == 1" @change="handleChange" ref="fileinput">
18+
</div>
19+
<div class="vicp-error" v-show="hasError">
20+
<i class="vicp-icon2"></i> {{ errorMsg }}
21+
</div>
22+
<div class="vicp-operate">
23+
<a @click="off" @mousedown="ripple">{{ lang.btn.off }}</a>
24+
</div>
25+
</div>
2626

27-
<div class="vicp-step2" v-if="step == 2">
28-
<div class="vicp-crop">
29-
<div class="vicp-crop-left" v-show="true">
30-
<div class="vicp-img-container">
31-
<img :src="sourceImgUrl" :style="sourceImgStyle" class="vicp-img" draggable="false"
32-
@drag="preventDefault"
33-
@dragstart="preventDefault"
34-
@dragend="preventDefault"
35-
@dragleave="preventDefault"
36-
@dragover="preventDefault"
37-
@dragenter="preventDefault"
38-
@drop="preventDefault"
39-
@touchstart="imgStartMove"
40-
@touchmove="imgMove"
41-
@touchend="createImg"
42-
@touchcancel="createImg"
43-
@mousedown="imgStartMove"
44-
@mousemove="imgMove"
45-
@mouseup="createImg"
46-
@mouseout="createImg"
47-
ref="img">
48-
<div class="vicp-img-shade vicp-img-shade-1" :style="sourceImgShadeStyle"></div>
49-
<div class="vicp-img-shade vicp-img-shade-2" :style="sourceImgShadeStyle"></div>
50-
</div>
27+
<div class="vicp-step2" v-if="step == 2">
28+
<div class="vicp-crop">
29+
<div class="vicp-crop-left" v-show="true">
30+
<div class="vicp-img-container">
31+
<img :src="sourceImgUrl" :style="sourceImgStyle" class="vicp-img" draggable="false"
32+
@drag="preventDefault"
33+
@dragstart="preventDefault"
34+
@dragend="preventDefault"
35+
@dragleave="preventDefault"
36+
@dragover="preventDefault"
37+
@dragenter="preventDefault"
38+
@drop="preventDefault"
39+
@touchstart="imgStartMove"
40+
@touchmove="imgMove"
41+
@touchend="createImg"
42+
@touchcancel="createImg"
43+
@mousedown="imgStartMove"
44+
@mousemove="imgMove"
45+
@mouseup="createImg"
46+
@mouseout="createImg"
47+
ref="img">
48+
<div class="vicp-img-shade vicp-img-shade-1" :style="sourceImgShadeStyle"></div>
49+
<div class="vicp-img-shade vicp-img-shade-2" :style="sourceImgShadeStyle"></div>
50+
</div>
5151

52-
<div class="vicp-range">
53-
<input type="range" :value="scale.range" step="1" min="0" max="100" @input="zoomChange">
54-
<i @mousedown="startZoomSub" @mouseout="endZoomSub" @mouseup="endZoomSub" class="vicp-icon5"></i>
55-
<i @mousedown="startZoomAdd" @mouseout="endZoomAdd" @mouseup="endZoomAdd" class="vicp-icon6"></i>
56-
</div>
52+
<div class="vicp-range">
53+
<input type="range" :value="scale.range" step="1" min="0" max="100" @input="zoomChange">
54+
<i @mousedown="startZoomSub" @mouseout="endZoomSub" @mouseup="endZoomSub" class="vicp-icon5"></i>
55+
<i @mousedown="startZoomAdd" @mouseout="endZoomAdd" @mouseup="endZoomAdd" class="vicp-icon6"></i>
56+
</div>
5757

58-
<div class="vicp-rotate" v-if="!noRotate">
58+
<div class="vicp-rotate" v-if="!noRotate">
5959
<i @mousedown="startRotateLeft" @mouseout="endRotate" @mouseup="endRotate">↺</i>
6060
<i @mousedown="startRotateRight" @mouseout="endRotate" @mouseup="endRotate">↻</i>
6161
</div>
62-
</div>
63-
<div class="vicp-crop-right" v-show="true">
64-
<div class="vicp-preview">
65-
<div class="vicp-preview-item" v-if="!noSquare">
66-
<img :src="createImgUrl" :style="previewStyle">
67-
<span>{{ lang.preview }}</span>
68-
</div>
69-
<div class="vicp-preview-item vicp-preview-item-circle" v-if="!noCircle">
70-
<img :src="createImgUrl" :style="previewStyle">
71-
<span>{{ lang.preview }}</span>
72-
</div>
73-
</div>
74-
</div>
75-
</div>
76-
<div class="vicp-operate">
77-
<a @click="setStep(1)" @mousedown="ripple">{{ lang.btn.back }}</a>
78-
<a class="vicp-operate-btn" @click="prepareUpload" @mousedown="ripple">{{ lang.btn.save }}</a>
79-
</div>
80-
</div>
62+
</div>
63+
<div class="vicp-crop-right" v-show="true">
64+
<div class="vicp-preview">
65+
<div class="vicp-preview-item" v-if="!noSquare">
66+
<img :src="createImgUrl" :style="previewStyle">
67+
<span>{{ lang.preview }}</span>
68+
</div>
69+
<div class="vicp-preview-item vicp-preview-item-circle" v-if="!noCircle">
70+
<img :src="createImgUrl" :style="previewStyle">
71+
<span>{{ lang.preview }}</span>
72+
</div>
73+
</div>
74+
</div>
75+
</div>
76+
<div class="vicp-operate">
77+
<a @click="setStep(1)" @mousedown="ripple">{{ lang.btn.back }}</a>
78+
<a class="vicp-operate-btn" @click="prepareUpload" @mousedown="ripple">{{ lang.btn.save }}</a>
79+
</div>
80+
</div>
8181

82-
<div class="vicp-step3" v-if="step == 3">
83-
<div class="vicp-upload">
84-
<span class="vicp-loading" v-show="loading === 1">{{ lang.loading }}</span>
85-
<div class="vicp-progress-wrap">
86-
<span class="vicp-progress" v-show="loading === 1" :style="progressStyle"></span>
87-
</div>
88-
<div class="vicp-error" v-show="hasError">
89-
<i class="vicp-icon2"></i> {{ errorMsg }}
90-
</div>
91-
<div class="vicp-success" v-show="loading === 2">
92-
<i class="vicp-icon3"></i> {{ lang.success }}
93-
</div>
94-
</div>
95-
<div class="vicp-operate">
96-
<a @click="setStep(2)" @mousedown="ripple">{{ lang.btn.back }}</a>
97-
<a @click="off" @mousedown="ripple">{{ lang.btn.close }}</a>
98-
</div>
99-
</div>
100-
<canvas v-show="false" :width="width" :height="height" ref="canvas"></canvas>
101-
</div>
82+
<div class="vicp-step3" v-if="step == 3">
83+
<div class="vicp-upload">
84+
<span class="vicp-loading" v-show="loading === 1">{{ lang.loading }}</span>
85+
<div class="vicp-progress-wrap">
86+
<span class="vicp-progress" v-show="loading === 1" :style="progressStyle"></span>
87+
</div>
88+
<div class="vicp-error" v-show="hasError">
89+
<i class="vicp-icon2"></i> {{ errorMsg }}
90+
</div>
91+
<div class="vicp-success" v-show="loading === 2">
92+
<i class="vicp-icon3"></i> {{ lang.success }}
93+
</div>
94+
</div>
95+
<div class="vicp-operate">
96+
<a @click="setStep(2)" @mousedown="ripple">{{ lang.btn.back }}</a>
97+
<a @click="off" @mousedown="ripple">{{ lang.btn.close }}</a>
98+
</div>
99+
</div>
100+
<canvas v-show="false" :width="width" :height="height" ref="canvas"></canvas>
101+
</div>
102102
</div>
103103
</template>
104104

@@ -409,7 +409,7 @@ export default {
409409
}, 200)
410410
},
411411
/* 图片选择区域函数绑定
412-
---------------------------------------------------------------*/
412+
---------------------------------------------------------------*/
413413
preventDefault(e) {
414414
e.preventDefault()
415415
return false
@@ -589,7 +589,7 @@ export default {
589589
scale.x = rX
590590
scale.y = rY
591591
},
592-
// 按钮按下开始向右旋转
592+
// 按钮按下开始向右旋转
593593
startRotateRight(e) {
594594
let that = this,
595595
{
@@ -737,7 +737,7 @@ export default {
737737
}
738738
}, 300)
739739
},
740-
// 生成需求图片
740+
// 生成需求图片
741741
createImg(e) {
742742
let that = this,
743743
{
@@ -1132,9 +1132,9 @@ export default {
11321132
appearance: none;
11331133
cursor: pointer;
11341134
/* 滑块
1135-
---------------------------------------------------------------*/
1135+
---------------------------------------------------------------*/
11361136
/* 轨道
1137-
---------------------------------------------------------------*/ }
1137+
---------------------------------------------------------------*/ }
11381138
.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range input[type=range]:focus {
11391139
outline: none; }
11401140
.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range input[type=range]::-webkit-slider-thumb {

0 commit comments

Comments
 (0)