Commit ccc95cf5 authored by 田翔's avatar 田翔

fix: 代码修复

parent 9305538f
...@@ -396,8 +396,6 @@ const PeopleSelector = props => { ...@@ -396,8 +396,6 @@ const PeopleSelector = props => {
selected.delete(val.roleID); selected.delete(val.roleID);
} }
}); });
console.log(list);
debugger;
let arr = []; let arr = [];
selected.forEach((val, key) => { selected.forEach((val, key) => {
arr.push({ label: val.roleName, value: val.roleId }); arr.push({ label: val.roleName, value: val.roleId });
......
...@@ -87,8 +87,6 @@ const SelectUser = props => { ...@@ -87,8 +87,6 @@ const SelectUser = props => {
// } // }
// console.log(checkValueList); // console.log(checkValueList);
let listCheck = []; let listCheck = [];
console.log(checkValueList);
debugger;
checkValueList && checkValueList &&
checkValueList.map(item => { checkValueList.map(item => {
let data = item.userId || item.value; let data = item.userId || item.value;
......
...@@ -168,7 +168,6 @@ const FlowChart = props => { ...@@ -168,7 +168,6 @@ const FlowChart = props => {
currentNode.current = nodeData; currentNode.current = nodeData;
setNodeKey(nodeData.key); setNodeKey(nodeData.key);
setEditMsg(nodeData); setEditMsg(nodeData);
debugger;
setModalType('edit'); setModalType('edit');
setVisible(true); setVisible(true);
}); });
...@@ -327,7 +326,7 @@ const FlowChart = props => { ...@@ -327,7 +326,7 @@ const FlowChart = props => {
onOk() { onOk() {
delNode(val); delNode(val);
}, },
onCancel() {}, onCancel() { },
}); });
}; };
// 删除节点 // 删除节点
...@@ -725,8 +724,7 @@ const FlowChart = props => { ...@@ -725,8 +724,7 @@ const FlowChart = props => {
{ margin: 4 }, { margin: 4 },
new go.Binding('text', 'nodeDetail', v => { new go.Binding('text', 'nodeDetail', v => {
const obj = JSON.parse(v); const obj = JSON.parse(v);
return `节点名称:${obj.NodeName}\n${ return `节点名称:${obj.NodeName}\n${obj.roleList.length > 0 ? '承办:' : ''
obj.roleList.length > 0 ? '承办:' : ''
}${obj.roleList.map(item => item.roleName).join(',')}`; }${obj.roleList.map(item => item.roleName).join(',')}`;
}), }),
), ),
...@@ -1109,8 +1107,6 @@ const FlowChart = props => { ...@@ -1109,8 +1107,6 @@ const FlowChart = props => {
}; };
// 节点数据改边 // 节点数据改边
const nodeChage = (key, value) => { const nodeChage = (key, value) => {
console.log(key, value);
debugger;
let obj = JSON.parse(JSON.stringify(currentNode.current)); let obj = JSON.parse(JSON.stringify(currentNode.current));
obj[key] = value; obj[key] = value;
const nodeDetail = JSON.stringify(obj); const nodeDetail = JSON.stringify(obj);
......
...@@ -180,7 +180,6 @@ const AddModal = props => { ...@@ -180,7 +180,6 @@ const AddModal = props => {
} else { } else {
obj = { ...validate, key: msg.ID || msg.key, ...arr }; obj = { ...validate, key: msg.ID || msg.key, ...arr };
} }
debugger
onSubumit(obj, modalType, tableType, tableName, tableShape); onSubumit(obj, modalType, tableType, tableName, tableShape);
} }
}); });
......
...@@ -81,8 +81,6 @@ const ConfigGIS = (props, ref) => { ...@@ -81,8 +81,6 @@ const ConfigGIS = (props, ref) => {
let obj = {}; let obj = {};
if (item.Config) { if (item.Config) {
let newConfig = JSON.parse(item.Config); let newConfig = JSON.parse(item.Config);
console.log(newConfig);
debugger
if (newConfig.mapping) { if (newConfig.mapping) {
let users = []; let users = [];
newConfig.mapping[0].toData.map((x, y) => { newConfig.mapping[0].toData.map((x, y) => {
...@@ -193,8 +191,6 @@ const ConfigGIS = (props, ref) => { ...@@ -193,8 +191,6 @@ const ConfigGIS = (props, ref) => {
list[edtiIndex] = { ...val, key: newKey, tableType, TableName, tableShape }; list[edtiIndex] = { ...val, key: newKey, tableType, TableName, tableShape };
} }
tableData.current = list; tableData.current = list;
console.log(list);
debugger
nodeChage('FlowNodeBackfillConfigs', tableData.current); nodeChage('FlowNodeBackfillConfigs', tableData.current);
setViewModal(false); setViewModal(false);
}; };
......
...@@ -54,8 +54,6 @@ const VectorPreviewModal = props => { ...@@ -54,8 +54,6 @@ const VectorPreviewModal = props => {
getCondition(str1, id, val); getCondition(str1, id, val);
} else { } else {
let list = `${str1},${val}`; let list = `${str1},${val}`;
console.log(list);
debugger;
handle(`${str1},${val}`); handle(`${str1},${val}`);
} }
} }
...@@ -128,7 +126,7 @@ const VectorPreviewModal = props => { ...@@ -128,7 +126,7 @@ const VectorPreviewModal = props => {
console.log(viewObject); console.log(viewObject);
}; };
const onSubmit = () => {}; const onSubmit = () => { };
return ( return (
<SiteModal <SiteModal
{...props} {...props}
......
...@@ -263,7 +263,7 @@ const HomeConfigModal = props => { ...@@ -263,7 +263,7 @@ const HomeConfigModal = props => {
</Form.Item> */} </Form.Item> */}
<Form.Item label="主页Url" name="homePage"> <Form.Item label="主页Url" name="homePage">
{/* <Input placeholder="请输入主页路径" autoComplete="off" /> */} {/* <Input placeholder="请输入主页路径" autoComplete="off" /> */}
<TreeSelect menuChange={val => {}} userMode={userMode} curWeb={curWeb} /> <TreeSelect menuChange={val => { }} userMode={userMode} curWeb={curWeb} />
</Form.Item> </Form.Item>
</Form> </Form>
<div className={styles.roleCheck}>{checkRender(checkList)}</div> <div className={styles.roleCheck}>{checkRender(checkList)}</div>
......
...@@ -28,7 +28,7 @@ import { ...@@ -28,7 +28,7 @@ import {
import RMSComponents from '@/components/RolePmSite/index'; import RMSComponents from '@/components/RolePmSite/index';
import PersonnelSelector from '@/components/PersonnelSelector/index'; import PersonnelSelector from '@/components/PersonnelSelector/index';
import { PlusOutlined, InfoCircleOutlined } from '@ant-design/icons'; import { PlusOutlined, InfoCircleOutlined } from '@ant-design/icons';
import TreeSelect from '../menuconfig/TreeSelect'; import TreeSelect from '../menuconfig/NewTreeSelect';
import WebConfigForm from './webConfigForm'; import WebConfigForm from './webConfigForm';
import ColorLinear from './ColorLinear'; import ColorLinear from './ColorLinear';
import Upload from '@/components/Upload'; import Upload from '@/components/Upload';
...@@ -164,8 +164,6 @@ export default props => { ...@@ -164,8 +164,6 @@ export default props => {
config.menuState == false; config.menuState == false;
setVisibleChecked5(false); setVisibleChecked5(false);
} }
console.log(config);
debugger;
setVisibleChecked(config.navTheme == 'light'); setVisibleChecked(config.navTheme == 'light');
setVisibleChecked2(config.hideMap); setVisibleChecked2(config.hideMap);
setVisibleChecked4(config.messageVoice); setVisibleChecked4(config.messageVoice);
...@@ -422,8 +420,6 @@ export default props => { ...@@ -422,8 +420,6 @@ export default props => {
}; };
const rolCallBack = useCallback(list => { const rolCallBack = useCallback(list => {
console.log(list);
debugger;
setCheckValueList(list.checkList); setCheckValueList(list.checkList);
setAddVisible(false); setAddVisible(false);
setAftercare(list.text === '' ? '请勾选不显示售后服务的用户' : list.text); setAftercare(list.text === '' ? '请勾选不显示售后服务的用户' : list.text);
...@@ -554,18 +550,8 @@ export default props => { ...@@ -554,18 +550,8 @@ export default props => {
<Divider orientation="left" style={{ borderTopColor: '#99bbe8' }}> <Divider orientation="left" style={{ borderTopColor: '#99bbe8' }}>
主页配置 主页配置
</Divider> </Divider>
{/* <Form.Item label="产品类型(默认)" name="productType">
<Select placeholder="请选择主页产品类型">
{productList.map(item => (
<Option value={item.PackageName} key={item.PackageName}>
{`${item.ProductName}(${item.PackageName})`}
</Option>
))}
</Select>
</Form.Item> */}
<Form.Item label="主页地址(默认)" name="homePage"> <Form.Item label="主页地址(默认)" name="homePage">
{/* <Input placeholder="请输入主页路径" autoComplete="off" /> */} <TreeSelect menuChange={val => { }} userMode={userMode} curWeb={curWeb} />
<TreeSelect menuChange={val => {}} />
</Form.Item> </Form.Item>
<HomePageConfigs <HomePageConfigs
ref={homepageConfigRef} ref={homepageConfigRef}
......
...@@ -171,7 +171,6 @@ const ParmarsModal = props => { ...@@ -171,7 +171,6 @@ const ParmarsModal = props => {
}); });
setCount(finalArray.length); setCount(finalArray.length);
setDataSource(newList); setDataSource(newList);
debugger;
setSelectedRowKeys(select); setSelectedRowKeys(select);
} else { } else {
setDataSource([]); setDataSource([]);
......
...@@ -5,6 +5,7 @@ import lodash from 'lodash'; ...@@ -5,6 +5,7 @@ import lodash from 'lodash';
import { FolderFilled, FileOutlined, InfoCircleOutlined, HomeOutlined } from '@ant-design/icons'; import { FolderFilled, FileOutlined, InfoCircleOutlined, HomeOutlined } from '@ant-design/icons';
import styles from './TreeSelect.less'; import styles from './TreeSelect.less';
const TreeSelect = (props, ref) => { const TreeSelect = (props, ref) => {
console.log('treeSelect', props)
const { value, onChange, menuChange, code, initCurrentMenu, keepParams } = props; const { value, onChange, menuChange, code, initCurrentMenu, keepParams } = props;
const [menuWebList, setMenuWebList] = useState({}); const [menuWebList, setMenuWebList] = useState({});
const [treeList, setTreeList] = useState({}); const [treeList, setTreeList] = useState({});
...@@ -12,7 +13,6 @@ const TreeSelect = (props, ref) => { ...@@ -12,7 +13,6 @@ const TreeSelect = (props, ref) => {
const [expandedKeys, setExpandedKeys] = useState([]); const [expandedKeys, setExpandedKeys] = useState([]);
const [curretnMenuParmar, setCurrentMenuParmar] = useState(); const [curretnMenuParmar, setCurrentMenuParmar] = useState();
useEffect(() => { useEffect(() => {
console.log(333333);
getMenu(); getMenu();
}, []); }, []);
useImperativeHandle(ref, () => ({ getParmar })); useImperativeHandle(ref, () => ({ getParmar }));
...@@ -135,8 +135,6 @@ const TreeSelect = (props, ref) => { ...@@ -135,8 +135,6 @@ const TreeSelect = (props, ref) => {
setVisible(true); setVisible(true);
}; };
const onSelect = (selectedKeysValue, info) => { const onSelect = (selectedKeysValue, info) => {
console.log(info);
debugger;
menuChange(info.selectedNodes[0].param); menuChange(info.selectedNodes[0].param);
let str = info.selectedNodes[0].param.path.split('|')[0]; let str = info.selectedNodes[0].param.path.split('|')[0];
let newStr = `${str}|${keepParams}`; let newStr = `${str}|${keepParams}`;
......
...@@ -44,7 +44,7 @@ const EditForm = props => { ...@@ -44,7 +44,7 @@ const EditForm = props => {
infoAll, infoAll,
checkList, checkList,
configFiles, configFiles,
valueCallback = () => {}, valueCallback = () => { },
productList, productList,
allProductList, allProductList,
} = props; } = props;
...@@ -194,7 +194,7 @@ const EditForm = props => { ...@@ -194,7 +194,7 @@ const EditForm = props => {
} }
setShowParmarModal(true); setShowParmarModal(true);
}; };
const radioChange = e => {}; const radioChange = e => { };
// 一级复选框改变事件 // 一级复选框改变事件
const selectChange = (e, index, value) => { const selectChange = (e, index, value) => {
let list = []; let list = [];
...@@ -335,8 +335,6 @@ const EditForm = props => { ...@@ -335,8 +335,6 @@ const EditForm = props => {
}; };
const menuChange = val => { const menuChange = val => {
console.log(keepParams);
debugger;
if (!val) { if (!val) {
return; return;
} }
...@@ -358,7 +356,6 @@ const EditForm = props => { ...@@ -358,7 +356,6 @@ const EditForm = props => {
setConfigContent(val.configContent); setConfigContent(val.configContent);
setCurrentMenu(val); setCurrentMenu(val);
setMenuParmar(val?.param); setMenuParmar(val?.param);
debugger;
}; };
// 编辑完配置文件后回调 // 编辑完配置文件后回调
const wrapperFinish = val => { const wrapperFinish = val => {
...@@ -384,7 +381,6 @@ const EditForm = props => { ...@@ -384,7 +381,6 @@ const EditForm = props => {
if (keys.includes('pageUrl')) { if (keys.includes('pageUrl')) {
let str = values.pageUrl.split('|')[1]; let str = values.pageUrl.split('|')[1];
setKeepParams(str); setKeepParams(str);
debugger;
} }
}; };
......
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