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
cdc9f043
Commit
cdc9f043
authored
Feb 25, 2022
by
邓超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 图片库回复搜索、修改web配置、移动应用配置、工作流编辑器首次进入展示
parent
880d6544
Pipeline
#44595
passed with stages
in 7 minutes 17 seconds
Changes
5
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
81 additions
and
7 deletions
+81
-7
index.less
src/components/Upload/index.less
+2
-1
index.tsx
src/components/Upload/index.tsx
+2
-2
Workflow.jsx
src/pages/bsmanager/workOrder/workflowEdit/Workflow.jsx
+25
-0
miniMenu.jsx
src/pages/productCenter/mobileConfig/menuconfig/miniMenu.jsx
+29
-1
webMenu.jsx
src/pages/productCenter/webConfig/menuconfig/webMenu.jsx
+23
-3
No files found.
src/components/Upload/index.less
View file @
cdc9f043
...
...
@@ -19,7 +19,7 @@
}
.modal {
.ant-tabs-content{
height: 100%;
//
height: 100%;
.ant-tabs-tabpane{
padding-left: 0 !important;
}
...
...
@@ -43,6 +43,7 @@
}
.search{
width: 50%;
margin: 10px 20px;
}
.hide{
display: none !important;
...
...
src/components/Upload/index.tsx
View file @
cdc9f043
...
...
@@ -460,13 +460,13 @@ class PicturesWall extends React.Component<PicturesWallType> {
}
return (
<TabPane tab={tabNames[item.moduleName] || item.moduleName} key={item.moduleName}>
{/*
<Input
<Input
placeholder="搜索图库"
className={styles.search}
size="middle"
value={this.state.search}
onChange={e => this.setState({search: e.target.value})}
allowClear/>
*/}
allowClear/>
<div className={styles.imgBox}>
<Collapse
bordered
...
...
src/pages/bsmanager/workOrder/workflowEdit/Workflow.jsx
View file @
cdc9f043
...
...
@@ -34,6 +34,8 @@ const Workflow = () => {
const
[
treeVisible
,
setTreeVisible
]
=
useState
(
true
);
const
[
chartLoading
,
setChartLoading
]
=
useState
(
false
);
// 流程图的loading
const
[
canSelect
,
setCanSelect
]
=
useState
(
true
);
// 是否可以切换树
const
[
expandedKey
,
setExpandedKey
]
=
useState
(
''
);
// 默认展开项
const
[
flag
,
setFlag
]
=
useState
(
1
);
const
[
visible
,
setVisible
]
=
useState
({
FlowModal
:
false
,
FlowGroupModal
:
false
,
...
...
@@ -41,6 +43,27 @@ const Workflow = () => {
useEffect
(()
=>
{
getFlowList
();
},
[]);
useEffect
(()
=>
{
if
(
flag
===
2
)
{
console
.
log
(
treeData
);
setExpandedKey
(
treeData
[
0
].
name
+
0
);
setCurrentSelectId
(
treeData
[
0
].
children
[
0
].
FlowID
);
setTreeId
(
treeData
[
0
].
children
[
0
].
FlowID
);
GetFlowNode
({
flowID
:
treeData
[
0
].
children
[
0
].
FlowID
}).
then
(
res
=>
{
setChartLoading
(
false
);
if
(
res
.
code
===
0
)
{
setFlowData
(
res
.
data
);
}
else
{
setFlowData
({
Nodes
:
[],
Lines
:
[]
});
notification
.
error
({
title
:
'提示'
,
duration
:
3
,
description
:
res
.
msg
,
});
}
});
}
},
[
treeData
]);
// 弹窗显示控制
const
showModal
=
(
key
,
value
)
=>
{
setVisible
({
...
visible
,
[
key
]:
value
});
...
...
@@ -51,6 +74,7 @@ const Workflow = () => {
WFGetAllFlow
().
then
(
res
=>
{
setTreeLoading
(
false
);
if
(
res
.
code
===
0
)
{
setFlag
(
flag
+
1
);
let
data
=
res
.
data
.
map
(
item
=>
{
item
.
isOld
=
true
;
return
item
;
...
...
@@ -269,6 +293,7 @@ const Workflow = () => {
onSelect=
{
onSelect
}
selectedKeys=
{
[
currentSelectId
]
}
treeData=
{
treeData
.
map
((
item
,
index
)
=>
mapTree
(
item
,
index
))
}
expandedKeys=
{
expandedKey
}
/>
</
div
>
</
div
>
...
...
src/pages/productCenter/mobileConfig/menuconfig/miniMenu.jsx
View file @
cdc9f043
...
...
@@ -46,6 +46,7 @@ const MiniMenu = props => {
const
[
submitLoading
,
setSubmitLoading
]
=
useState
(
false
);
const
[
addList
,
setAddList
]
=
useState
([]);
const
[
newTreeList
,
setNewTreeList
]
=
useState
([]);
const
[
expendKey
,
setExpendKey
]
=
useState
(
''
);
// 保存默认展开项
// 获取菜单树
useEffect
(()
=>
{
...
...
@@ -66,6 +67,9 @@ const MiniMenu = props => {
},
[
flag
,
clientName
]);
// 获取菜单信息
useEffect
(()
=>
{
if
(
flag
===
1
)
{
setExpendKey
(
menuID
);
}
getInfo
();
},
[
menuID
]);
...
...
@@ -86,6 +90,30 @@ const MiniMenu = props => {
const
result
=
obj
.
children
[
1
].
children
;
console
.
log
(
result
,
'result'
);
setTreeData
(
result
);
if
(
result
.
length
>
0
)
{
setMenuID
(
result
[
0
].
menuID
);
setFlag
(
flag
+
1
);
switch
(
result
[
0
].
menuType
)
{
case
'MiniAppMenuGroup'
:
setNodeType
(
1
);
setAddType
(
2
);
break
;
case
'MiniAppMenuGroupTwo'
:
setNodeType
(
2
);
setAddType
(
4
);
break
;
case
'MiniAppMenu'
:
setNodeType
(
3
);
setAddType
(
3
);
break
;
case
'MiniAppMenuThree'
:
setNodeType
(
4
);
setAddType
(
4
);
break
;
default
:
break
;
}
}
setLoading
(
false
);
// 第一次加载,默认选择第一个组织
// if (treeFlag) {
...
...
@@ -573,7 +601,7 @@ const MiniMenu = props => {
onDrop=
{
handleDrop
}
// onDragEnter=
{
handleDragEnter
}
selectedKeys=
{
[
menuID
]
}
// expandedKeys=
{[
menuID
]
}
expandedKeys=
{
expendKey
}
/>
</
div
>
)
:
(
...
...
src/pages/productCenter/webConfig/menuconfig/webMenu.jsx
View file @
cdc9f043
...
...
@@ -49,7 +49,7 @@ const MiniMenu = props => {
const
[
newTreeList
,
setNewTreeList
]
=
useState
([]);
const
[
checkList
,
setCheckList
]
=
useState
([]);
const
[
flagg
,
setFlagg
]
=
useState
(
0
);
const
[
expendKey
,
setExpendKey
]
=
useState
(
''
);
// 保存默认展开项
const
[
menuList
,
setMenuList
]
=
useState
([]);
// 菜单树
const
[
keepId
,
setKeepId
]
=
useState
(
''
);
...
...
@@ -58,6 +58,10 @@ const MiniMenu = props => {
// 获取菜单信息
useEffect
(()
=>
{
console
.
log
(
menuID
,
flag
);
if
(
flag
===
1
)
{
setExpendKey
(
menuID
);
}
getInfo
();
},
[
menuID
,
webid
]);
useEffect
(()
=>
{
...
...
@@ -112,7 +116,6 @@ const MiniMenu = props => {
};
// 树的点击事件
const
handleSelect
=
(
prop
,
treeNode
)
=>
{
console
.
log
(
prop
);
if
(
treeNode
)
{
const
{
node
:
{
menuType
},
...
...
@@ -422,6 +425,23 @@ const MiniMenu = props => {
console
.
log
(
arr2
[
0
]);
setKeepId
(
arr2
[
0
]);
setMenuList
(
arr2
||
[]);
// 进页面后默认展示第一条数据
if
(
arr2
.
length
>
0
)
{
setMenuID
(
arr2
[
0
].
menuID
);
setFlag
(
flag
+
1
);
setCurMenuType
(
arr2
[
0
].
menuType
);
switch
(
arr2
[
0
].
menuType
)
{
case
'Web4MenuGroup'
:
setNodeType
(
2
);
setAddType
(
2
);
break
;
default
:
setNodeType
(
1
);
setAddType
(
1
);
break
;
}
}
}
})
.
catch
(
err
=>
{
...
...
@@ -567,7 +587,7 @@ const MiniMenu = props => {
autoExpandParent
selectedKeys=
{
[
menuID
]
}
onDrop=
{
handleDrop
}
// expandedKeys=
{[
menuID
]
}
expandedKeys=
{
expendKey
}
/>
</
div
>
)
}
...
...
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