Просмотр исходного кода

Merge pull request #3906 from weseek/fix/6360-linkeditmodal-state

GW-6360 一度Linkを入力すると、空にしてもPreviewが表示されてしまうBugを修正
Yuki Takei 4 лет назад
Родитель
Сommit
ca4aeb70df
1 измененных файлов с 6 добавлено и 2 удалено
  1. 6 2
      src/client/js/components/PageEditor/LinkEditModal.jsx

+ 6 - 2
src/client/js/components/PageEditor/LinkEditModal.jsx

@@ -152,6 +152,7 @@ class LinkEditModal extends React.PureComponent {
     const { t } = this.props;
     const path = this.state.linkInputValue;
     let markdown = '';
+    let permalink = '';
     let previewError = '';
 
     if (path.startsWith('/')) {
@@ -162,6 +163,7 @@ class LinkEditModal extends React.PureComponent {
       try {
         const { page } = await this.props.appContainer.apiGet('/pages.get', { path: pathWithoutFragment, page_id: pageId });
         markdown = page.revision.body;
+        permalink = page.id;
       }
       catch (err) {
         previewError = err.message;
@@ -170,7 +172,7 @@ class LinkEditModal extends React.PureComponent {
     else {
       previewError = t('link_edit.page_not_found_in_preview', { path });
     }
-    this.setState({ markdown, previewError });
+    this.setState({ markdown, previewError, permalink });
   }
 
   getLinkForPreview() {
@@ -228,7 +230,9 @@ class LinkEditModal extends React.PureComponent {
     if (!this.state.linkInputValue.startsWith('/') || this.state.linkerType === Linker.types.growiLink) {
       isUseRelativePath = false;
     }
-    this.setState({ linkInputValue: link, isUseRelativePath, isUsePermanentLink: false });
+    this.setState({
+      linkInputValue: link, isUseRelativePath, isUsePermanentLink: false, permalink: '',
+    });
   }
 
   handleSelecteLinkerType(linkerType) {