Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
Root
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
为了安全,强烈建议开启2FA双因子认证:User Settings -> Account -> Enable two-factor authentication!!!
Show more breadcrumbs
cxwx
Root
Commits
6fd16f65
Commit
6fd16f65
authored
6 years ago
by
Sergey Linev
Browse files
Options
Downloads
Patches
Plain Diff
eve7: adjust client code to work with new locations of files
parent
e0ae0483
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
gui/webdisplay/src/RWebWindowWSHandler.hxx
+3
-0
3 additions, 0 deletions
gui/webdisplay/src/RWebWindowWSHandler.hxx
ui5/eve7/controller/Main.controller.js
+1
-9
1 addition, 9 deletions
ui5/eve7/controller/Main.controller.js
ui5/eve7/index.html
+4
-1
4 additions, 1 deletion
ui5/eve7/index.html
with
8 additions
and
10 deletions
gui/webdisplay/src/RWebWindowWSHandler.hxx
+
3
−
0
View file @
6fd16f65
...
...
@@ -48,6 +48,9 @@ public:
/// THttpWSHandler interface
TString
GetDefaultPageContent
()
override
{
return
IsDisabled
()
?
""
:
fWindow
.
fDefaultPage
.
c_str
();
}
/// returns true when window allowed to serve files relative to default page
Bool_t
CanServeFiles
()
const
override
{
return
!
IsDisabled
();
}
/// Process websocket request - called from THttpServer thread
/// THttpWSHandler interface
Bool_t
ProcessWS
(
THttpCallArg
*
arg
)
override
{
return
arg
&&
!
IsDisabled
()
?
fWindow
.
ProcessWS
(
*
arg
)
:
kFALSE
;
}
...
...
This diff is collapsed.
Click to expand it.
ui5/eve7/controller/Main.controller.js
+
1
−
9
View file @
6fd16f65
...
...
@@ -51,8 +51,7 @@ sap.ui.define(['sap/ui/core/mvc/Controller',
var
need_geom
=
false
,
staged
=
[];
for
(
var
n
=
0
;
n
<
viewers
.
length
;
++
n
)
{
var
elem
=
viewers
[
n
];
if
(
elem
.
$view_created
||
elem
.
$view_staged
)
continue
;
if
(
elem
.
fRnrSelf
)
{
if
(
!
elem
.
$view_created
&&
elem
.
fRnrSelf
)
{
staged
.
push
(
elem
);
if
(
viewers
[
n
].
fName
!=
"
Table
"
)
need_geom
=
true
;
}
...
...
@@ -67,22 +66,15 @@ sap.ui.define(['sap/ui/core/mvc/Controller',
console
.
log
(
"
FOUND viewers
"
,
viewers
.
length
,
"
not yet exists
"
,
staged
.
length
);
for
(
var
n
=
0
;
n
<
staged
.
length
;
++
n
)
staged
[
n
].
$view_staged
=
true
;
// mark view which will be created in this loop, do we need this??
var
main
=
this
,
vv
=
null
,
count
=
0
,
sv
=
this
.
getView
().
byId
(
"
MainAreaSplitter
"
);
for
(
var
n
=
0
;
n
<
staged
.
length
;
++
n
)
{
var
elem
=
staged
[
n
];
console
.
log
(
"
ELEMENT
"
,
elem
.
fName
);
var
viewid
=
"
EveViewer
"
+
elem
.
fElementId
;
// create missing view
elem
.
$view_created
=
true
;
delete
elem
.
$view_staged
;
console
.
log
(
"
Creating view
"
,
viewid
);
count
++
;
var
oLd
=
undefined
;
...
...
This diff is collapsed.
Click to expand it.
ui5/eve7/index.html
+
4
−
1
View file @
6fd16f65
...
...
@@ -49,9 +49,12 @@
if
(
JSROOT
.
GetUrlOption
(
'
nogl
'
)
!==
null
)
JSROOT
.
gStyle
.
NoWebGL
=
true
;
if
(
JSROOT
.
GetUrlOption
(
'
libs
'
)
!==
null
)
JSROOT
.
use_full_libs
=
true
;
var
jsroot_prereq
=
"
openui5
"
;
if
(
JSROOT
.
GetUrlOption
(
'
view
'
))
jsroot_prereq
+=
"
;geom
"
;
JSROOT
.
ConnectWebWindow
({
prereq
:
"
openui5
"
,
prereq
:
jsroot_prereq
,
// openui5src: "jsroot", // use JSROOT provided package, experimental
openui5src
:
"
https://openui5.hana.ondemand.com/
"
,
openui5libs
:
"
sap.m, sap.ui.layout, sap.ui.table, sap.ui.commons
"
,
// customize openui5 libs
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment