Browse Source

fix: local sync crashed when connecting failed

master
smallstonesk 5 years ago
parent
commit
e1b1be402e
  1. 2
      packages/core/src/mods/header/connectStatus/editModal.tsx
  2. 2
      packages/core/src/mods/header/connectStatus/index.module.less
  3. 20
      packages/core/src/mods/header/connectStatus/index.tsx

2
packages/core/src/mods/header/connectStatus/editModal.tsx

@ -32,8 +32,8 @@ const EditModal: React.FC<IEditorModalProps> = props => {
// events // events
const onClickOk = (): void => { const onClickOk = (): void => {
formRef.current && formRef.current.validateFields().then((formValues) => { formRef.current && formRef.current.validateFields().then((formValues) => {
onOk();
updateLocalConfig(formValues as ILocalConfig); updateLocalConfig(formValues as ILocalConfig);
onOk();
}).catch(err => { }).catch(err => {
console.log(err.message); console.log(err.message);
}); });

2
packages/core/src/mods/header/connectStatus/index.module.less

@ -5,7 +5,7 @@
align-items: center; align-items: center;
margin-right: 20px; margin-right: 20px;
.error { .tag {
cursor: pointer; cursor: pointer;
} }
} }

20
packages/core/src/mods/header/connectStatus/index.tsx

@ -49,7 +49,7 @@ const ConnectStatus: React.FC<IProps> = (props) => {
}; };
const confirmToSync = () => { const confirmToSync = () => {
syncLocal().then(data => { syncLocal().then(data => {
const {dsl} = data; const {dsl} = data || {};
dsl && Modal.confirm({ dsl && Modal.confirm({
title: '本地连接成功,是否将数据同步至当前项目?', title: '本地连接成功,是否将数据同步至当前项目?',
onOk() { onOk() {
@ -75,18 +75,16 @@ const ConnectStatus: React.FC<IProps> = (props) => {
confirmToSync(); confirmToSync();
}; };
let tagText = '本地连接失败 点击修改配置';
if(status === Status.connected) {
tagText = [projectName, '本地连接成功'].join(' ');
}
return ( return (
<div className={styles.container}> <div className={styles.container}>
{status === Status.connected && ( <Tag className={styles.tag} color={status} onClick={onOpenEditModal}>
<Tag color={'success'}> {tagText}
{[projectName, '本地连接成功'].join(' ')} </Tag>
</Tag>
)}
{status === Status.disconnected && (
<Tag className={styles.error} color={'error'} onClick={onOpenEditModal}>
</Tag>
)}
<EditModal <EditModal
visible={visible} visible={visible}
onOk={onOk} onOk={onOk}

Loading…
Cancel
Save