Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivManage
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ReactWeb5
CivManage
Commits
cfea14c6
Commit
cfea14c6
authored
Jan 12, 2021
by
Maofei94
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 网关配置
parent
ad6df872
Pipeline
#22276
passed with stages
in 19 minutes 7 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
30 deletions
+13
-30
index.js
src/pages/user/login/index.js
+4
-1
index.js
src/pages/webConfig/index.js
+2
-1
AddForm.jsx
src/pages/webConfig/menuconfig/AddForm.jsx
+1
-10
MenuConfig.jsx
src/pages/webConfig/menuconfig/MenuConfig.jsx
+3
-7
editForm.jsx
src/pages/webConfig/menuconfig/editForm.jsx
+2
-10
index.js
src/utils/request/index.js
+1
-1
No files found.
src/pages/user/login/index.js
View file @
cfea14c6
...
...
@@ -87,11 +87,14 @@ const Login = props => {
const
updateDicName
=
()
=>
{
gateWayConfig
()
.
then
(
res
=>
{
if
(
res
.
code
===
0
&&
res
.
data
)
{
if
(
res
.
code
===
0
&&
res
.
data
===
'true'
)
{
localStorage
.
setItem
(
'panda-publish'
,
'getway'
);
}
else
{
localStorage
.
setItem
(
'panda-publish'
,
''
);
}
})
.
catch
(
err
=>
{
localStorage
.
setItem
(
'panda-publish'
,
''
);
console
.
error
(
err
);
});
};
...
...
src/pages/webConfig/index.js
View file @
cfea14c6
...
...
@@ -269,7 +269,8 @@ const WebConfigPage = props => {
<
TabPane
key
=
{
99
}
tab
=
"产品配置"
closable
=
{
false
}
>
<
ProductConfig
/>
<
/TabPane
>
{
webs
.
map
(
renderTabPane
)}
{
/* {webs.map(renderTabPane)} */
}
{
webs
.
map
(
item
=>
renderTabPane
(
item
))}
<
/Tabs
>
<
SiteConfig
isEdit
=
{
isEdit
}
...
...
src/pages/webConfig/menuconfig/AddForm.jsx
View file @
cfea14c6
...
...
@@ -61,16 +61,7 @@ const AddForm = props => {
<
Item
label=
"菜单别名"
name=
"shortName"
>
<
Input
placeholder=
"请输入菜单别名"
/>
</
Item
>
<
Item
label=
"产品类型:"
name=
"product"
rules=
{
[
{
required
:
true
,
message
:
'请选择产品类型'
,
},
]
}
>
<
Item
label=
"产品类型:"
name=
"product"
>
<
Select
placeholder=
"请选择产品类型"
>
{
productList
&&
productList
.
map
(
item
=>
(
...
...
src/pages/webConfig/menuconfig/MenuConfig.jsx
View file @
cfea14c6
...
...
@@ -7,13 +7,9 @@ const MenuConfig = props => {
const
{
menu
}
=
props
;
return
(
<>
{
menu
?
(
<
div
split=
"vertical"
>
<
WebMenu
{
...
props
}
/>
</
div
>
)
:
(
<
Empty
image=
{
Empty
.
PRESENTED_IMAGE_SIMPLE
}
/>
)
}
<
div
split=
"vertical"
>
<
WebMenu
{
...
props
}
/>
</
div
>
</>
);
};
...
...
src/pages/webConfig/menuconfig/editForm.jsx
View file @
cfea14c6
...
...
@@ -6,6 +6,7 @@ import EditeConfigWrapper from './editConfigFileWrapper';
import
CheckList
from
'./checkBox'
;
const
{
Item
}
=
Form
;
const
{
Option
}
=
Select
;
const
EditForm
=
props
=>
{
const
{
submitCallback
,
...
...
@@ -71,16 +72,7 @@ const EditForm = props => {
<
Item
label=
"菜单别名"
name=
"shortName"
>
<
Input
placeholder=
"请输入菜单别名"
/>
</
Item
>
<
Item
label=
"产品类型:"
name=
"product"
rules=
{
[
{
required
:
true
,
message
:
'请选择产品类型'
,
},
]
}
>
<
Item
label=
"产品类型:"
name=
"product"
>
<
Select
placeholder=
"请选择产品类型"
>
{
productList
&&
productList
.
map
(
item
=>
(
...
...
src/utils/request/index.js
View file @
cfea14c6
...
...
@@ -35,7 +35,7 @@ axios.interceptors.request.use( function (request){
request
.
headers
.
Authorization
=
'Bearer '
+
token
}
if
(
pandaPublish
){
if
(
request
.
url
!=
'/Publish/OMS/OMSLogin'
&&
request
.
url
!=
'/Publish/OMS/FileCenter/SaveMobileApk'
)
if
(
request
.
url
!=
'/Publish/OMS/OMSLogin'
&&
request
.
url
!=
'/Publish/OMS/FileCenter/SaveMobileApk'
&&
request
.
url
!=
'/Publish/OMS/GateWayConfig'
)
request
.
url
=
getWay
+
request
.
url
}
console
.
log
(
request
,
pandaPublish
)
...
...
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