ryohek 5 лет назад
Родитель
Сommit
45e73f150d

+ 4 - 7
src/client/js/components/Page/CopyDropdown.jsx

@@ -54,10 +54,7 @@ class CopyDropdown extends React.Component {
   }
 
   generatePagePathWithParams() {
-    const { pagePath, pageId, isShareLinkMode } = this.props;
-    if (isShareLinkMode) {
-      return decodeURI(`/share/${pageId}`);
-    }
+    const { pagePath } = this.props;
     return decodeURI(`${pagePath}${this.uriParams}`);
   }
 
@@ -67,13 +64,13 @@ class CopyDropdown extends React.Component {
   }
 
   generatePermalink() {
-    const { pageId, isShareLinkMode } = this.props;
+    const { pageId, pagePath, isShareLinkMode } = this.props;
 
     if (pageId == null) {
       return null;
     }
     if (isShareLinkMode) {
-      return decodeURI(`${this.generatePagePathUrl()}`);
+      return decodeURI(`${origin}${pagePath}`);
     }
 
     return decodeURI(`${origin}/${pageId}${this.uriParams}`);
@@ -82,7 +79,7 @@ class CopyDropdown extends React.Component {
   generateMarkdownLink() {
     const { pagePath } = this.props;
 
-    const label = pagePath != null ? decodeURI(`${pagePath}${this.uriParams}`) : decodeURI(this.generatePagePathWithParams());
+    const label = decodeURI(`${pagePath}${this.uriParams}`);
     const permalink = this.generatePermalink();
 
     return `[${label}](${permalink})`;

+ 1 - 1
src/client/js/components/ShareLinkList.jsx

@@ -25,7 +25,7 @@ const ShareLinkList = (props) => {
           <tr key={shareLink._id}>
             <td className="d-flex justify-content-between align-items-center">
               <span>{shareLink._id}</span>
-              <CopyDropdown isShareLinkMode="true" pageId={shareLink._id} />
+              <CopyDropdown isShareLinkMode="true" pageId={shareLink._id} pagePath={`/share/${shareLink._id}`} />
             </td>
             <td>{shareLink.expiredAt}</td>
             <td>{shareLink.description}</td>