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
06d4ffdd
Commit
06d4ffdd
authored
Feb 01, 2021
by
Maofei94
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
perf: 修改web配置
parent
7f719899
Pipeline
#23260
passed with stages
in 20 minutes 19 seconds
Changes
5
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
40 additions
and
7 deletions
+40
-7
context.js
src/components/Upload/context.js
+0
-1
index.less
src/components/Upload/index.less
+3
-2
index.tsx
src/components/Upload/index.tsx
+0
-2
webMenu.jsx
src/pages/webConfig/menuconfig/webMenu.jsx
+34
-2
api.js
src/services/webConfig/api.js
+3
-0
No files found.
src/components/Upload/context.js
View file @
06d4ffdd
...
@@ -23,7 +23,6 @@ const PictureWallProvider = props => {
...
@@ -23,7 +23,6 @@ const PictureWallProvider = props => {
if
(
item
.
baseUrl
&&
item
.
moduleName
!==
'CityTemp'
)
{
if
(
item
.
baseUrl
&&
item
.
moduleName
!==
'CityTemp'
)
{
if
(
!
localStorage
.
getItem
(
'pd2-baseUrl'
))
{
if
(
!
localStorage
.
getItem
(
'pd2-baseUrl'
))
{
localStorage
.
setItem
(
'pd2-baseUrl'
,
item
.
baseUrl
);
localStorage
.
setItem
(
'pd2-baseUrl'
,
item
.
baseUrl
);
console
.
log
(
1
,
item
.
moduleName
);
}
}
}
}
});
});
...
...
src/components/Upload/index.less
View file @
06d4ffdd
...
@@ -56,7 +56,7 @@
...
@@ -56,7 +56,7 @@
.imgBox {
.imgBox {
display: flex;
display: flex;
flex-wrap: wrap;
flex-wrap: wrap;
max-height: calc(100% -
4
0px);
max-height: calc(100% -
1
0px);
overflow: auto;
overflow: auto;
.ant-collapse-content-box{
.ant-collapse-content-box{
display: flex;
display: flex;
...
@@ -99,7 +99,8 @@
...
@@ -99,7 +99,8 @@
max-height: 100%;
max-height: 100%;
}
}
.svgGray{
.svgGray{
background-color: rgba(238,238,238,1);
// background-color: rgba(238,238,238,1);
background-color:#2881a1;
}
}
&:hover,
&:hover,
&>.seleted {
&>.seleted {
...
...
src/components/Upload/index.tsx
View file @
06d4ffdd
...
@@ -410,8 +410,6 @@ class PicturesWall extends React.Component<PicturesWallType> {
...
@@ -410,8 +410,6 @@ class PicturesWall extends React.Component<PicturesWallType> {
<Tabs defaultActiveKey={imgBed[0]?.moduleName} tabPosition="left" style={{ height: 520 }}>
<Tabs defaultActiveKey={imgBed[0]?.moduleName} tabPosition="left" style={{ height: 520 }}>
{imgBed.map((item, i) => {
{imgBed.map((item, i) => {
if(item.moduleName==picType || item.moduleName=='
CityTemp
'){
if(item.moduleName==picType || item.moduleName=='
CityTemp
'){
const child = [...item.child] || [];
const child = [...item.child] || [];
if(item.fileUrls.length > 0){
if(item.fileUrls.length > 0){
child.push({
child.push({
...
...
src/pages/webConfig/menuconfig/webMenu.jsx
View file @
06d4ffdd
...
@@ -21,6 +21,7 @@ import {
...
@@ -21,6 +21,7 @@ import {
dragMenu
,
// 菜单拖拽
dragMenu
,
// 菜单拖拽
getProductList
,
getProductList
,
getWebModuleTree
,
getWebModuleTree
,
pEditWebMenu
,
}
from
'@/services/webConfig/api'
;
}
from
'@/services/webConfig/api'
;
const
MiniMenu
=
props
=>
{
const
MiniMenu
=
props
=>
{
...
@@ -304,11 +305,41 @@ const MiniMenu = props => {
...
@@ -304,11 +305,41 @@ const MiniMenu = props => {
let
obj
=
{
...
prop
,
baseUrl
};
let
obj
=
{
...
prop
,
baseUrl
};
if
(
nodeType
===
1
)
{
if
(
nodeType
===
1
)
{
obj
.
relatedRoleList
=
String
(
roleList
)
||
''
;
obj
.
relatedRoleList
=
String
(
roleList
)
||
''
;
}
editWebMenu
({
editWebMenu
({
_dc
:
Date
.
now
(),
_dc
:
Date
.
now
(),
menuID
,
menuID
,
subSystemValue
,
// subSystemValue,
...
obj
,
})
.
then
(
res
=>
{
setLoading
(
false
);
if
(
res
.
success
)
{
setFlag
(
flag
+
1
);
// updateMenuTree('edit');
notification
.
success
({
message
:
'提示'
,
duration
:
3
,
description
:
'编辑成功'
,
});
}
else
{
notification
.
error
({
message
:
'提示'
,
duration
:
3
,
description
:
res
.
message
||
'编辑失败'
,
});
}
})
.
catch
(
err
=>
{
// eslint-disable-next-line no-console
console
.
error
(
err
);
setLoading
(
false
);
});
}
else
{
pEditWebMenu
({
_dc
:
Date
.
now
(),
menuID
,
// subSystemValue,
...
obj
,
...
obj
,
})
})
.
then
(
res
=>
{
.
then
(
res
=>
{
...
@@ -335,6 +366,7 @@ const MiniMenu = props => {
...
@@ -335,6 +366,7 @@ const MiniMenu = props => {
console
.
error
(
err
);
console
.
error
(
err
);
setLoading
(
false
);
setLoading
(
false
);
});
});
}
};
};
const
valueCallback
=
val
=>
{
const
valueCallback
=
val
=>
{
let
arr
=
[...
val
];
let
arr
=
[...
val
];
...
...
src/services/webConfig/api.js
View file @
06d4ffdd
...
@@ -86,6 +86,9 @@ export const addWebMenu = param => {
...
@@ -86,6 +86,9 @@ export const addWebMenu = param => {
export
const
editWebMenu
=
param
=>
export
const
editWebMenu
=
param
=>
get
(
`
${
CITY_SERVICE
}
/OMS.svc/W4_EditMenu?_version=9999`
,
param
);
get
(
`
${
CITY_SERVICE
}
/OMS.svc/W4_EditMenu?_version=9999`
,
param
);
export
const
pEditWebMenu
=
param
=>
get
(
`
${
CITY_SERVICE
}
/OMS.svc/P_EditMenu?_version=9999`
,
param
);
export
const
deleteWebMenu
=
param
=>
export
const
deleteWebMenu
=
param
=>
get
(
`
${
CITY_SERVICE
}
/OMS.svc/W4_DeleteMenu?_version=9999`
,
param
);
get
(
`
${
CITY_SERVICE
}
/OMS.svc/W4_DeleteMenu?_version=9999`
,
param
);
...
...
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