Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
founder_vue
Overview
Overview
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
常超
founder_vue
Commits
5a2faa21
Commit
5a2faa21
authored
Nov 06, 2021
by
maxiaohan
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev_zwpt' into dev_zwpt
parents
4e1a6e5c
f20ca0c9
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
19 deletions
+11
-19
src/components/ImageEd.vue
+11
-19
No files found.
src/components/ImageEd.vue
View file @
5a2faa21
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-11-0
5 11:14:14
* @LastEditTime: 2021-11-0
6 16:08:26
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
...
...
@@ -929,13 +929,16 @@ export default {
console
.
log
(
objectProps
,
22222222
);
if
(
objectProps
.
type
==
'line'
)
{
self
.
lines
.
push
(
objectProps
)
self
.
historys
.
push
(
'直线'
)
}
else
if
(
objectProps
.
type
==
'path'
){
self
.
path
.
push
(
objectProps
)
self
.
historys
.
push
(
'曲线'
)
}
// self.historys.push(objectProps.type)
console
.
log
(
111
);
},
undoStackChanged
:
function
(
length
)
{
console
.
log
(
length
,
'undoStackChanged'
)
if
(
length
)
{
$btnUndo
.
removeClass
(
'disabled'
);
}
else
{
...
...
@@ -944,6 +947,7 @@ export default {
resizeEditor
();
},
redoStackChanged
:
function
(
length
)
{
console
.
log
(
length
,
'redoStackChanged'
)
if
(
length
)
{
$btnRedo
.
removeClass
(
'disabled'
);
}
else
{
...
...
@@ -1006,8 +1010,10 @@ export default {
console
.
log
(
'imageEditor2======'
,
objectProps
)
if
(
objectProps
.
type
==
'line'
)
{
self
.
lines2
.
push
(
objectProps
)
self
.
historys2
.
push
(
'直线'
)
}
else
if
(
objectProps
.
type
==
'path'
){
self
.
path2
.
push
(
objectProps
)
self
.
historys2
.
push
(
'曲线'
)
}
},
undoStackChanged
:
function
(
length
)
{
...
...
@@ -1073,34 +1079,24 @@ export default {
// 撤回
$btnUndo
.
on
(
'click'
,
function
()
{
self
.
initStatus
()
console
.
log
(
'撤销'
);
if
(
self
.
type
==
'source'
)
{
if
(
!
$
(
this
).
hasClass
(
'disabled'
))
{
if
(
self
.
type
==
'source'
&&
!
imageEditor
.
isEmptyUndoStack
())
{
imageEditor
.
discardSelection
();
imageEditor
.
undo
();
}
}
else
{
if
(
!
$
(
this
).
hasClass
(
'disabled2'
))
{
}
else
if
(
!
imageEditor2
.
isEmptyUndoStack
()){
imageEditor2
.
discardSelection
();
imageEditor2
.
undo
();
}
}
});
// 恢复
$btnRedo
.
on
(
'click'
,
function
()
{
console
.
log
(
'恢复'
);
if
(
self
.
type
==
'source'
)
{
if
(
!
$
(
this
).
hasClass
(
'disabled'
))
{
if
(
self
.
type
==
'source'
&&
!
imageEditor
.
isEmptyRedoStack
())
{
imageEditor
.
discardSelection
();
imageEditor
.
redo
();
}
}
else
{
if
(
!
$
(
this
).
hasClass
(
'disabled2'
))
{
}
else
if
(
!
imageEditor2
.
isEmptyRedoStack
()){
imageEditor2
.
discardSelection
();
imageEditor2
.
redo
();
}
}
});
// 鼠标点击图片事件 - 放大
...
...
@@ -1629,10 +1625,8 @@ export default {
imageEditor
.
stopDrawingMode
();
if
(
mode
===
'freeDrawing'
)
{
imageEditor
.
startDrawingMode
(
'FREE_DRAWING'
,
settings
);
self
.
historys
.
push
(
'辅助线'
)
}
else
{
imageEditor
.
startDrawingMode
(
'LINE_DRAWING'
,
settings
);
self
.
historys
.
push
(
'辅助线'
)
}
if
(
!
self
.
isLineOptions
)
{
imageEditor
.
stopDrawingMode
();
...
...
@@ -1641,10 +1635,8 @@ export default {
imageEditor2
.
stopDrawingMode
();
if
(
mode
===
'freeDrawing'
)
{
imageEditor2
.
startDrawingMode
(
'FREE_DRAWING'
,
settings
);
self
.
historys2
.
push
(
'辅助线'
)
}
else
{
imageEditor2
.
startDrawingMode
(
'LINE_DRAWING'
,
settings
);
self
.
historys2
.
push
(
'辅助线'
)
}
if
(
!
self
.
isLineOptions
)
{
imageEditor2
.
stopDrawingMode
();
...
...
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