Commit bd345940 authored by 皮倩雯's avatar 皮倩雯

fix: '消息中心推送方案配置,web功能路径选择判断拼接字符串'

parent 32fe9bba
Pipeline #64274 passed with stages
......@@ -59,7 +59,7 @@
top: 0;
right: 0px;
// background-color: #fff;
width: 100%;
// width: 20%;
height: 40px;
padding: 0 20px;
display: flex;
......
......@@ -205,6 +205,7 @@ const EditModal = props => {
a.children = aa;
a.menuID = `praent${j}`;
a.key = `praent${j}`;
a.item = 'father';
list.push(a);
});
console.log(list);
......@@ -493,9 +494,18 @@ const EditModal = props => {
})
.then(res => {
if (res.code === 0) {
let symbol = res.data.pageUrl.indexOf('|');
let widget = res.data.pageUrl.indexOf('widget');
if (symbol == -1) {
form.setFieldsValue({ web_path: `${res.data.pageUrl}|widget=${e}`.replace(/\s/g, '') });
setTreeSelectValue(`${res.data.pageUrl}|widget=${e}`.replace(/\s/g, ''));
} else if (widget == -1) {
form.setFieldsValue({ web_path: `${res.data.pageUrl}&widget=${e}`.replace(/\s/g, '') });
setTreeSelectValue(`${res.data.pageUrl}&widget=${e}`.replace(/\s/g, ''));
} else {
form.setFieldsValue({ web_path: res.data.pageUrl });
console.log(res.data.pageUrl);
setTreeSelectValue(res.data.pageUrl);
}
} else {
notification.error({
message: '提示',
......@@ -517,8 +527,7 @@ const EditModal = props => {
.then(res => {
if (res.code === 0) {
form.setFieldsValue({ app_path: res.data.pageUrl });
console.log(res.data.pageUrl);
setTreeSelectValue(res.data.pageUrl);
setTreeSelectValueMoblie(res.data.pageUrl);
} else {
notification.error({
message: '提示',
......@@ -534,6 +543,22 @@ const EditModal = props => {
const mapTree = org => {
const haveChildren = Array.isArray(org.children) && org.children.length > 0;
// console.log(org);
if (org.key) {
if (haveChildren) {
return (
<TreeNode
value={org.menuID}
title={org.text}
icon={org.key ? <DesktopOutlined /> : <FolderFilled />}
disabled
>
{org.children.map(item => mapTree(item))}
</TreeNode>
);
}
return <TreeNode value={org.menuID} title={org.text} icon={<DesktopOutlined />} disabled />;
}
return haveChildren ? (
<TreeNode
value={org.menuID}
......@@ -547,13 +572,35 @@ const EditModal = props => {
<TreeNode
value={org.menuID}
title={org.text}
icon={<FileOutlined style={{ color: '#1890ff' }} />}
icon={
org.menuType == 'Web4MenuGroup' ? (
<FolderFilled />
) : (
<FileOutlined style={{ color: '#1890ff' }} />
)
}
disabled={org.menuType == 'Web4MenuGroup'}
/>
);
};
const mapTreeMoblie = org => {
const haveChildren = Array.isArray(org.children) && org.children.length > 0;
if (org.key) {
if (haveChildren) {
return (
<TreeNode
value={org.menuID}
title={org.text}
icon={org.key ? <MobileOutlined /> : <FolderFilled />}
disabled
>
{org.children.map(item => mapTreeMoblie(item))}
</TreeNode>
);
}
return <TreeNode value={org.menuID} title={org.text} icon={<MobileOutlined />} disabled />;
}
return haveChildren ? (
<TreeNode
value={org.menuID}
......@@ -561,13 +608,20 @@ const EditModal = props => {
icon={org.key ? <MobileOutlined /> : <FolderFilled />}
disabled
>
{org.children.map(item => mapTree(item))}
{org.children.map(item => mapTreeMoblie(item))}
</TreeNode>
) : (
<TreeNode
value={org.menuID}
title={org.text}
icon={<FileOutlined style={{ color: '#1890ff' }} />}
icon={
org.menuType == 'MiniAppMenuGroup' || org.menuType == 'MiniAppMenuGroupTwo' ? (
<FolderFilled />
) : (
<FileOutlined style={{ color: '#1890ff' }} />
)
}
disabled={org.menuType == 'MiniAppMenuGroup' || org.menuType == 'MiniAppMenuGroupTwo'}
/>
);
};
......
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