Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
b90efd53
Commit
b90efd53
authored
Dec 06, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 33608
🐛
parent
c5828af2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
16 deletions
+25
-16
cell/utils/utils.js
cell/utils/utils.js
+3
-0
cell/view/WorkbookView.js
cell/view/WorkbookView.js
+16
-14
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+6
-2
No files found.
cell/utils/utils.js
View file @
b90efd53
...
@@ -1881,6 +1881,7 @@
...
@@ -1881,6 +1881,7 @@
this
.
countFindAll
=
0
;
this
.
countFindAll
=
0
;
this
.
countReplaceAll
=
0
;
this
.
countReplaceAll
=
0
;
this
.
sheetIndex
=
-
1
;
this
.
sheetIndex
=
-
1
;
this
.
error
=
false
;
}
}
asc_CFindOptions
.
prototype
.
clone
=
function
()
{
asc_CFindOptions
.
prototype
.
clone
=
function
()
{
var
result
=
new
asc_CFindOptions
();
var
result
=
new
asc_CFindOptions
();
...
@@ -1902,6 +1903,7 @@
...
@@ -1902,6 +1903,7 @@
result
.
countFindAll
=
this
.
countFindAll
;
result
.
countFindAll
=
this
.
countFindAll
;
result
.
countReplaceAll
=
this
.
countReplaceAll
;
result
.
countReplaceAll
=
this
.
countReplaceAll
;
result
.
sheetIndex
=
this
.
sheetIndex
;
result
.
sheetIndex
=
this
.
sheetIndex
;
result
.
error
=
this
.
error
;
return
result
;
return
result
;
};
};
asc_CFindOptions
.
prototype
.
isEqual
=
function
(
obj
)
{
asc_CFindOptions
.
prototype
.
isEqual
=
function
(
obj
)
{
...
@@ -1913,6 +1915,7 @@
...
@@ -1913,6 +1915,7 @@
asc_CFindOptions
.
prototype
.
clearFindAll
=
function
()
{
asc_CFindOptions
.
prototype
.
clearFindAll
=
function
()
{
this
.
countFindAll
=
0
;
this
.
countFindAll
=
0
;
this
.
countReplaceAll
=
0
;
this
.
countReplaceAll
=
0
;
this
.
error
=
false
;
};
};
asc_CFindOptions
.
prototype
.
updateFindAll
=
function
()
{
asc_CFindOptions
.
prototype
.
updateFindAll
=
function
()
{
this
.
countFindAll
+=
this
.
countFind
;
this
.
countFindAll
+=
this
.
countFind
;
...
...
cell/view/WorkbookView.js
View file @
b90efd53
...
@@ -2246,6 +2246,7 @@
...
@@ -2246,6 +2246,7 @@
ws
.
replaceCellText
(
options
,
false
,
this
.
fReplaceCallback
);
ws
.
replaceCellText
(
options
,
false
,
this
.
fReplaceCallback
);
};
};
WorkbookView
.
prototype
.
_replaceCellTextCallback
=
function
(
options
)
{
WorkbookView
.
prototype
.
_replaceCellTextCallback
=
function
(
options
)
{
if
(
!
options
.
error
)
{
options
.
updateFindAll
();
options
.
updateFindAll
();
if
(
!
options
.
scanOnOnlySheet
&&
options
.
isReplaceAll
)
{
if
(
!
options
.
scanOnOnlySheet
&&
options
.
isReplaceAll
)
{
// Замена на всей книге
// Замена на всей книге
...
@@ -2262,6 +2263,7 @@
...
@@ -2262,6 +2263,7 @@
}
}
this
.
handlers
.
trigger
(
"
asc_onRenameCellTextEnd
"
,
options
.
countFindAll
,
options
.
countReplaceAll
);
this
.
handlers
.
trigger
(
"
asc_onRenameCellTextEnd
"
,
options
.
countFindAll
,
options
.
countReplaceAll
);
}
History
.
EndTransaction
();
History
.
EndTransaction
();
if
(
options
.
isReplaceAll
)
{
if
(
options
.
isReplaceAll
)
{
...
...
cell/view/WorksheetView.js
View file @
b90efd53
...
@@ -10599,8 +10599,12 @@
...
@@ -10599,8 +10599,12 @@
newValue
=
[];
newValue
=
[];
newValue
[
0
]
=
new
AscCommonExcel
.
Fragment
({
text
:
cellValue
,
format
:
v
[
0
].
format
.
clone
()});
newValue
[
0
]
=
new
AscCommonExcel
.
Fragment
({
text
:
cellValue
,
format
:
v
[
0
].
format
.
clone
()});
t
.
_saveCellValueAfterEdit
(
oCellEdit
,
c
,
newValue
,
/*flags*/
undefined
,
/*skipNLCheck*/
false
,
if
(
!
t
.
_saveCellValueAfterEdit
(
oCellEdit
,
c
,
newValue
,
/*flags*/
undefined
,
/*skipNLCheck*/
false
,
/*isNotHistory*/
true
,
/*lockDraw*/
true
);
/*isNotHistory*/
true
,
/*lockDraw*/
true
))
{
options
.
error
=
true
;
t
.
draw
(
lockDraw
);
return
callback
(
options
);
}
}
}
window
.
setTimeout
(
function
()
{
window
.
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