Commit cdc9f043 authored by 邓超's avatar 邓超

fix: 图片库回复搜索、修改web配置、移动应用配置、工作流编辑器首次进入展示

parent 880d6544
Pipeline #44595 passed with stages
in 7 minutes 17 seconds
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
} }
.modal { .modal {
.ant-tabs-content{ .ant-tabs-content{
height: 100%; // height: 100%;
.ant-tabs-tabpane{ .ant-tabs-tabpane{
padding-left: 0 !important; padding-left: 0 !important;
} }
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
} }
.search{ .search{
width: 50%; width: 50%;
margin: 10px 20px;
} }
.hide{ .hide{
display: none !important; display: none !important;
......
...@@ -460,13 +460,13 @@ class PicturesWall extends React.Component<PicturesWallType> { ...@@ -460,13 +460,13 @@ class PicturesWall extends React.Component<PicturesWallType> {
} }
return ( return (
<TabPane tab={tabNames[item.moduleName] || item.moduleName} key={item.moduleName}> <TabPane tab={tabNames[item.moduleName] || item.moduleName} key={item.moduleName}>
{/* <Input <Input
placeholder="搜索图库" placeholder="搜索图库"
className={styles.search} className={styles.search}
size="middle" size="middle"
value={this.state.search} value={this.state.search}
onChange={e => this.setState({search: e.target.value})} onChange={e => this.setState({search: e.target.value})}
allowClear/> */} allowClear/>
<div className={styles.imgBox}> <div className={styles.imgBox}>
<Collapse <Collapse
bordered bordered
......
...@@ -34,6 +34,8 @@ const Workflow = () => { ...@@ -34,6 +34,8 @@ const Workflow = () => {
const [treeVisible, setTreeVisible] = useState(true); const [treeVisible, setTreeVisible] = useState(true);
const [chartLoading, setChartLoading] = useState(false); // 流程图的loading const [chartLoading, setChartLoading] = useState(false); // 流程图的loading
const [canSelect, setCanSelect] = useState(true); // 是否可以切换树 const [canSelect, setCanSelect] = useState(true); // 是否可以切换树
const [expandedKey, setExpandedKey] = useState(''); // 默认展开项
const [flag, setFlag] = useState(1);
const [visible, setVisible] = useState({ const [visible, setVisible] = useState({
FlowModal: false, FlowModal: false,
FlowGroupModal: false, FlowGroupModal: false,
...@@ -41,6 +43,27 @@ const Workflow = () => { ...@@ -41,6 +43,27 @@ const Workflow = () => {
useEffect(() => { useEffect(() => {
getFlowList(); 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) => { const showModal = (key, value) => {
setVisible({ ...visible, [key]: value }); setVisible({ ...visible, [key]: value });
...@@ -51,6 +74,7 @@ const Workflow = () => { ...@@ -51,6 +74,7 @@ const Workflow = () => {
WFGetAllFlow().then(res => { WFGetAllFlow().then(res => {
setTreeLoading(false); setTreeLoading(false);
if (res.code === 0) { if (res.code === 0) {
setFlag(flag + 1);
let data = res.data.map(item => { let data = res.data.map(item => {
item.isOld = true; item.isOld = true;
return item; return item;
...@@ -269,6 +293,7 @@ const Workflow = () => { ...@@ -269,6 +293,7 @@ const Workflow = () => {
onSelect={onSelect} onSelect={onSelect}
selectedKeys={[currentSelectId]} selectedKeys={[currentSelectId]}
treeData={treeData.map((item, index) => mapTree(item, index))} treeData={treeData.map((item, index) => mapTree(item, index))}
expandedKeys={expandedKey}
/> />
</div> </div>
</div> </div>
......
...@@ -46,6 +46,7 @@ const MiniMenu = props => { ...@@ -46,6 +46,7 @@ const MiniMenu = props => {
const [submitLoading, setSubmitLoading] = useState(false); const [submitLoading, setSubmitLoading] = useState(false);
const [addList, setAddList] = useState([]); const [addList, setAddList] = useState([]);
const [newTreeList, setNewTreeList] = useState([]); const [newTreeList, setNewTreeList] = useState([]);
const [expendKey, setExpendKey] = useState(''); // 保存默认展开项
// 获取菜单树 // 获取菜单树
useEffect(() => { useEffect(() => {
...@@ -66,6 +67,9 @@ const MiniMenu = props => { ...@@ -66,6 +67,9 @@ const MiniMenu = props => {
}, [flag, clientName]); }, [flag, clientName]);
// 获取菜单信息 // 获取菜单信息
useEffect(() => { useEffect(() => {
if (flag === 1) {
setExpendKey(menuID);
}
getInfo(); getInfo();
}, [menuID]); }, [menuID]);
...@@ -86,6 +90,30 @@ const MiniMenu = props => { ...@@ -86,6 +90,30 @@ const MiniMenu = props => {
const result = obj.children[1].children; const result = obj.children[1].children;
console.log(result, 'result'); console.log(result, 'result');
setTreeData(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); setLoading(false);
// 第一次加载,默认选择第一个组织 // 第一次加载,默认选择第一个组织
// if (treeFlag) { // if (treeFlag) {
...@@ -573,7 +601,7 @@ const MiniMenu = props => { ...@@ -573,7 +601,7 @@ const MiniMenu = props => {
onDrop={handleDrop} onDrop={handleDrop}
// onDragEnter={handleDragEnter} // onDragEnter={handleDragEnter}
selectedKeys={[menuID]} selectedKeys={[menuID]}
// expandedKeys={[menuID]} expandedKeys={expendKey}
/> />
</div> </div>
) : ( ) : (
......
...@@ -49,7 +49,7 @@ const MiniMenu = props => { ...@@ -49,7 +49,7 @@ const MiniMenu = props => {
const [newTreeList, setNewTreeList] = useState([]); const [newTreeList, setNewTreeList] = useState([]);
const [checkList, setCheckList] = useState([]); const [checkList, setCheckList] = useState([]);
const [flagg, setFlagg] = useState(0); const [flagg, setFlagg] = useState(0);
const [expendKey, setExpendKey] = useState(''); // 保存默认展开项
const [menuList, setMenuList] = useState([]); // 菜单树 const [menuList, setMenuList] = useState([]); // 菜单树
const [keepId, setKeepId] = useState(''); const [keepId, setKeepId] = useState('');
...@@ -58,6 +58,10 @@ const MiniMenu = props => { ...@@ -58,6 +58,10 @@ const MiniMenu = props => {
// 获取菜单信息 // 获取菜单信息
useEffect(() => { useEffect(() => {
console.log(menuID, flag);
if (flag === 1) {
setExpendKey(menuID);
}
getInfo(); getInfo();
}, [menuID, webid]); }, [menuID, webid]);
useEffect(() => { useEffect(() => {
...@@ -112,7 +116,6 @@ const MiniMenu = props => { ...@@ -112,7 +116,6 @@ const MiniMenu = props => {
}; };
// 树的点击事件 // 树的点击事件
const handleSelect = (prop, treeNode) => { const handleSelect = (prop, treeNode) => {
console.log(prop);
if (treeNode) { if (treeNode) {
const { const {
node: { menuType }, node: { menuType },
...@@ -422,6 +425,23 @@ const MiniMenu = props => { ...@@ -422,6 +425,23 @@ const MiniMenu = props => {
console.log(arr2[0]); console.log(arr2[0]);
setKeepId(arr2[0]); setKeepId(arr2[0]);
setMenuList(arr2 || []); 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 => { .catch(err => {
...@@ -567,7 +587,7 @@ const MiniMenu = props => { ...@@ -567,7 +587,7 @@ const MiniMenu = props => {
autoExpandParent autoExpandParent
selectedKeys={[menuID]} selectedKeys={[menuID]}
onDrop={handleDrop} onDrop={handleDrop}
// expandedKeys={[menuID]} expandedKeys={expendKey}
/> />
</div> </div>
)} )}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment