Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
erp5
Commits
96189cc3
Commit
96189cc3
authored
Apr 25, 2019
by
Boris Kocherov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_only_office] speedup updating cache by grouping
parent
7573a676
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
10 deletions
+12
-10
bt5/erp5_only_office/SkinTemplateItem/portal_skins/erp5_only_office/onlyoffice/sdkjs/cell/model/FormulaObjects/parserFormula.js.js
...ffice/sdkjs/cell/model/FormulaObjects/parserFormula.js.js
+2
-4
bt5/erp5_only_office/SkinTemplateItem/portal_skins/erp5_only_office/onlyoffice/sdkjs/cell/model/Workbook.js.js
...p5_only_office/onlyoffice/sdkjs/cell/model/Workbook.js.js
+10
-6
No files found.
bt5/erp5_only_office/SkinTemplateItem/portal_skins/erp5_only_office/onlyoffice/sdkjs/cell/model/FormulaObjects/parserFormula.js.js
View file @
96189cc3
...
@@ -5506,6 +5506,8 @@ parserFormula.prototype.setFormula = function(formula) {
...
@@ -5506,6 +5506,8 @@ parserFormula.prototype.setFormula = function(formula) {
if
(
typeof
value
===
"
function
"
)
{
if
(
typeof
value
===
"
function
"
)
{
this
.
value
=
new
cError
(
cErrorType
.
getting_data
);
this
.
value
=
new
cError
(
cErrorType
.
getting_data
);
this
.
queue
=
true
;
this
.
queue
=
true
;
formula
.
ws
.
workbook
.
dependencyFormulas
.
addToCleanCellCache
(
formula
.
ws
.
getId
(),
opt_bbox
.
r1
,
opt_bbox
.
c1
);
this
.
lazy_value
=
function
()
{
this
.
lazy_value
=
function
()
{
formula
.
lazy_value
=
null
;
formula
.
lazy_value
=
null
;
formula
.
queue
=
value
()
formula
.
queue
=
value
()
...
@@ -5513,10 +5515,6 @@ parserFormula.prototype.setFormula = function(formula) {
...
@@ -5513,10 +5515,6 @@ parserFormula.prototype.setFormula = function(formula) {
formula
.
value
=
ret
;
formula
.
value
=
ret
;
formula
.
value
.
numFormat
=
numFormat
;
formula
.
value
.
numFormat
=
numFormat
;
formula
.
_endCalculate
();
formula
.
_endCalculate
();
// updateOnScreen cell
formula
.
ws
.
workbook
.
handlers
.
trigger
(
"
cleanCellCache
"
,
formula
.
ws
.
getId
(),
{
0
:
opt_bbox
},
AscCommonExcel
.
c_oAscCanChangeColWidth
.
none
);
formula
.
queue
=
false
;
formula
.
queue
=
false
;
// formula.lazy_value = null;
// formula.lazy_value = null;
return
formula
.
value
;
return
formula
.
value
;
...
...
bt5/erp5_only_office/SkinTemplateItem/portal_skins/erp5_only_office/onlyoffice/sdkjs/cell/model/Workbook.js.js
View file @
96189cc3
...
@@ -967,10 +967,7 @@
...
@@ -967,10 +967,7 @@
tasks
.
push
(
lazy_value
());
tasks
.
push
(
lazy_value
());
}
}
}
}
function
end
()
{
function
end
(
tmpCellCache
)
{
//copy cleanCellCache to prevent recursion in trigger("cleanCellCache")
var
tmpCellCache
=
dependency_graph
.
cleanCellCache
;
dependency_graph
.
cleanCellCache
=
{};
for
(
var
i
in
tmpCellCache
)
{
for
(
var
i
in
tmpCellCache
)
{
dependency_graph
.
wb
.
handlers
.
trigger
(
"
cleanCellCache
"
,
i
,
{
0
:
tmpCellCache
[
i
]},
dependency_graph
.
wb
.
handlers
.
trigger
(
"
cleanCellCache
"
,
i
,
{
0
:
tmpCellCache
[
i
]},
AscCommonExcel
.
c_oAscCanChangeColWidth
.
none
);
AscCommonExcel
.
c_oAscCanChangeColWidth
.
none
);
...
@@ -980,12 +977,19 @@
...
@@ -980,12 +977,19 @@
}
}
if
(
tasks
.
length
>
0
)
{
if
(
tasks
.
length
>
0
)
{
new
RSVP
.
Queue
()
new
RSVP
.
Queue
()
.
push
(
function
()
{
end
(
dependency_graph
.
cleanCellCache
);
})
.
push
(
function
()
{
.
push
(
function
()
{
return
RSVP
.
all
(
tasks
);
return
RSVP
.
all
(
tasks
);
})
})
.
push
(
end
);
.
push
(
function
()
{
end
(
dependency_graph
.
cleanCellCache
);
dependency_graph
.
cleanCellCache
=
{};
});
}
else
{
}
else
{
end
();
end
(
dependency_graph
.
cleanCellCache
);
dependency_graph
.
cleanCellCache
=
{};
}
}
},
},
initOpen
:
function
()
{
initOpen
:
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