Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
barry cho
O2OA
Commits
aeb022fd
Commit
aeb022fd
authored
3 years ago
by
huqi
Browse files
Options
Download
Email Patches
Plain Diff
修复data的check方法保证data数据的getter和setter可用
parent
5a2156ac
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
o2web/source/o2_core/o2/xScript/CMSEnvironment.js
+5
-0
o2web/source/o2_core/o2/xScript/CMSEnvironment.js
o2web/source/o2_core/o2/xScript/Environment.js
+5
-0
o2web/source/o2_core/o2/xScript/Environment.js
o2web/source/o2_core/o2/xScript/PageEnvironment.js
+5
-0
o2web/source/o2_core/o2/xScript/PageEnvironment.js
with
15 additions
and
0 deletions
+15
-0
o2web/source/o2_core/o2/xScript/CMSEnvironment.js
+
5
-
0
View file @
aeb022fd
...
...
@@ -2092,6 +2092,11 @@ MWF.xScript.CMSJSONData = function(data, callback, key, parent, _form){
}
if
(
!
noreset
)
this
[
newKey
]
=
newValue
;
}
else
{
if
(
!
Object
.
getOwnPropertyDescriptor
(
this
,
newKey
).
get
){
var
o
=
{};
o
[
newKey
]
=
{
"
configurable
"
:
true
,
"
enumerable
"
:
true
,
"
get
"
:
getter
.
apply
(
this
,
[
data
,
callback
,
newKey
,
this
]),
"
set
"
:
setter
.
apply
(
this
,
[
data
,
callback
,
newKey
,
this
])};
MWF
.
defineProperties
(
this
,
o
);
}
if
(
overwrite
){
data
[
newKey
]
=
newValue
;
if
(
!
noreset
)
this
[
newKey
]
=
newValue
;
...
...
This diff is collapsed.
Click to expand it.
o2web/source/o2_core/o2/xScript/Environment.js
+
5
-
0
View file @
aeb022fd
...
...
@@ -3499,6 +3499,11 @@ MWF.xScript.JSONData = function(data, callback, key, parent, _form){
}
if
(
!
noreset
)
this
[
newKey
]
=
newValue
;
}
else
{
if
(
!
Object
.
getOwnPropertyDescriptor
(
this
,
newKey
).
get
){
var
o
=
{};
o
[
newKey
]
=
{
"
configurable
"
:
true
,
"
enumerable
"
:
true
,
"
get
"
:
getter
.
apply
(
this
,
[
data
,
callback
,
newKey
,
this
]),
"
set
"
:
setter
.
apply
(
this
,
[
data
,
callback
,
newKey
,
this
])};
MWF
.
defineProperties
(
this
,
o
);
}
if
(
overwrite
){
data
[
newKey
]
=
newValue
;
if
(
!
noreset
)
this
[
newKey
]
=
newValue
;
...
...
This diff is collapsed.
Click to expand it.
o2web/source/o2_core/o2/xScript/PageEnvironment.js
+
5
-
0
View file @
aeb022fd
...
...
@@ -2363,6 +2363,11 @@ if (!MWF.xScript.JSONData) {
}
if
(
!
noreset
)
this
[
newKey
]
=
newValue
;
}
else
{
if
(
!
Object
.
getOwnPropertyDescriptor
(
this
,
newKey
).
get
){
var
o
=
{};
o
[
newKey
]
=
{
"
configurable
"
:
true
,
"
enumerable
"
:
true
,
"
get
"
:
getter
.
apply
(
this
,
[
data
,
callback
,
newKey
,
this
]),
"
set
"
:
setter
.
apply
(
this
,
[
data
,
callback
,
newKey
,
this
])};
MWF
.
defineProperties
(
this
,
o
);
}
if
(
overwrite
)
{
data
[
newKey
]
=
newValue
;
if
(
!
noreset
)
this
[
newKey
]
=
newValue
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help