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
68c68375
Commit
68c68375
authored
Jun 07, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 32621
parent
a843a6df
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
59 additions
and
62 deletions
+59
-62
cell/model/Workbook.js
cell/model/Workbook.js
+1
-2
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+58
-60
No files found.
cell/model/Workbook.js
View file @
68c68375
...
...
@@ -3134,8 +3134,7 @@ Workbook.prototype.sortDependency = function(setCellFormat) {
}
}
for
(
i
in
oCleanCellCacheArea
)
this
.
handlers
.
trigger
(
"
cleanCellCache
"
,
i
,
oCleanCellCacheArea
[
i
],
AscCommonExcel
.
c_oAscCanChangeColWidth
.
numbers
);
this
.
handlers
.
trigger
(
"
cleanCellCache
"
,
i
,
oCleanCellCacheArea
[
i
],
AscCommonExcel
.
c_oAscCanChangeColWidth
.
none
);
AscCommonExcel
.
g_oVLOOKUPCache
.
clean
();
AscCommonExcel
.
g_oHLOOKUPCache
.
clean
();
...
...
cell/view/WorksheetView.js
View file @
68c68375
...
...
@@ -11298,60 +11298,58 @@
return
mergedRange
?
mergedRange
:
new
asc_Range
(
col
,
row
,
col
,
row
);
};
WorksheetView
.
prototype
.
_saveCellValueAfterEdit
=
function
(
oCellEdit
,
c
,
val
,
flags
,
skipNLCheck
,
isNotHistory
,
lockDraw
)
{
WorksheetView
.
prototype
.
_saveCellValueAfterEdit
=
function
(
oCellEdit
,
c
,
val
,
flags
,
skipNLCheck
,
isNotHistory
,
lockDraw
)
{
var
t
=
this
;
var
oldMode
=
t
.
isFormulaEditMode
;
t
.
isFormulaEditMode
=
false
;
if
(
!
isNotHistory
)
{
if
(
!
isNotHistory
)
{
History
.
Create_NewPoint
();
History
.
StartTransaction
();
}
var
isFormula
=
t
.
_isFormula
(
val
);
var
isFormula
=
t
.
_isFormula
(
val
);
if
(
isFormula
)
{
var
ftext
=
val
.
reduce
(
function
(
pv
,
cv
)
{
if
(
isFormula
)
{
var
ftext
=
val
.
reduce
(
function
(
pv
,
cv
)
{
return
pv
+
cv
.
text
;
},
""
);
},
""
);
var
ret
=
true
;
// ToDo - при вводе формулы в заголовок автофильтра надо писать "0"
c
.
setValue
(
ftext
,
function
(
r
)
{
c
.
setValue
(
ftext
,
function
(
r
)
{
ret
=
r
;
}
);
if
(
!
ret
)
{
}
);
if
(
!
ret
)
{
t
.
isFormulaEditMode
=
oldMode
;
History
.
EndTransaction
();
return
false
;
}
isFormula
=
c
.
isFormula
();
}
else
{
c
.
setValue2
(
val
);
}
else
{
c
.
setValue2
(
val
);
// Вызываем функцию пересчета для заголовков форматированной таблицы
t
.
model
.
autoFilters
.
renameTableColumn
(
oCellEdit
);
t
.
model
.
autoFilters
.
renameTableColumn
(
oCellEdit
);
}
if
(
!
isFormula
)
{
if
(
!
isFormula
)
{
// Нужно ли выставлять WrapText (ищем символ новой строки в тексте)
var
bIsSetWrap
=
false
;
if
(
!
skipNLCheck
)
{
for
(
var
i
=
0
;
i
<
val
.
length
;
++
i
)
{
if
(
val
[
i
].
text
.
indexOf
(
kNewLine
)
>=
0
)
{
if
(
!
skipNLCheck
)
{
for
(
var
i
=
0
;
i
<
val
.
length
;
++
i
)
{
if
(
val
[
i
].
text
.
indexOf
(
kNewLine
)
>=
0
)
{
bIsSetWrap
=
true
;
break
;
}
}
}
if
(
bIsSetWrap
)
{
c
.
setWrap
(
true
);
if
(
bIsSetWrap
)
{
c
.
setWrap
(
true
);
}
// Для формулы обновление будет в коде рассчета формулы
t
.
_updateCellsRange
(
oCellEdit
,
/*canChangeColWidth*/
c_oAscCanChangeColWidth
.
numbers
,
lockDraw
);
}
if
(
!
isNotHistory
)
{
t
.
_updateCellsRange
(
oCellEdit
,
isNotHistory
?
c_oAscCanChangeColWidth
.
none
:
c_oAscCanChangeColWidth
.
numbers
,
lockDraw
);
if
(
!
isNotHistory
)
{
History
.
EndTransaction
();
}
...
...
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