Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
techbook
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
front-end-dev
techbook
Commits
982b77e8
Commit
982b77e8
authored
May 21, 2020
by
zhangyanni
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
40e831c0
971ab0d9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
6 deletions
+12
-6
en.js
src/common/lang/en.js
+2
-1
zh.js
src/common/lang/zh.js
+2
-1
mobileCropper.vue
src/components/mobile/mobileCropper.vue
+8
-4
No files found.
src/common/lang/en.js
View file @
982b77e8
...
...
@@ -1798,7 +1798,8 @@ module.exports = {
interseted
:{
title
:
"Area of interest"
,
check
:
" (multiple choices)"
,
add
:
"Add Area of Interest"
add
:
"Add Area of Interest"
,
revolve
:
'revolve'
},
articleInfo
:{
...
...
src/common/lang/zh.js
View file @
982b77e8
...
...
@@ -1896,7 +1896,8 @@ module.exports = {
interseted
:{
title
:
"请选择您感兴趣的领域"
,
check
:
"(可多选)"
,
add
:
"添加兴趣领域"
add
:
"添加兴趣领域"
,
revolve
:
'旋转'
},
...
...
src/components/mobile/mobileCropper.vue
View file @
982b77e8
...
...
@@ -51,6 +51,7 @@
</div>
</div>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"rotateRight"
>
{{
$t
(
"interseted.revolve"
)
}}
</el-button>
<el-button
@
click=
"handleCancel"
>
{{
$t
(
"commonTips.cancel"
)
}}
</el-button>
<el-button
type=
"primary"
@
click=
"finish"
:loading=
"loading"
>
{{
$t
(
"commonTips.confirm"
)
}}
</el-button>
</div>
...
...
@@ -92,11 +93,11 @@
autoCrop
:
true
,
// 是否默认生成截图框
autoCropWidth
:
128
,
// 默认生成截图框宽度
autoCropHeight
:
128
,
// 默认生成截图框高度
fixedBox
:
tru
e
,
// 固定截图框大小 不允许改变
fixedBox
:
fals
e
,
// 固定截图框大小 不允许改变
fixed
:
true
,
// 是否开启截图框宽高固定比例
// fixedNumber: [7, 5
], // 截图框的宽高比例
fixedNumber
:
[
1
,
1
],
// 截图框的宽高比例
// fixedNumber: [4, 3], // 截图框的宽高比例
full
:
tru
e
,
// 是否输出原图比例的截图
full
:
fals
e
,
// 是否输出原图比例的截图
canMoveBox
:
false
,
// 截图框能否拖动
original
:
false
,
// 上传图片按照原始比例渲染
centerBox
:
false
,
// 截图框是否被限制在图片里面
...
...
@@ -120,7 +121,10 @@
this
.
$emit
(
"postErrorText"
,
0
,
1
);
this
.
disabledFlag
=
0
;
},
//右旋转
rotateRight
()
{
this
.
$refs
.
cropper
.
rotateRight
();
},
timeoutFunc
(){
var
that
=
this
;
setTimeout
(
function
(){
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment