Merge remote-tracking branch 'upstream/master'

zalify · Apr 18, 2024 · 924f694 · 924f694
2 parents 85a8602 + 97e88e4
commit 924f694
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 15 deletions.
diff --git a/lerna.json b/lerna.json
@@ -17,4 +17,4 @@
     }
   },
   "version": "4.15.0"
-}
+}
diff --git a/packages/easy-email-core/package.json b/packages/easy-email-core/package.json
@@ -82,4 +82,4 @@
     "react-dom": "^18.2.0"
   },
   "gitHead": "f6cf54160ffdba0d4d6b23483293dd9190d2d2c2"
-}
+}
diff --git a/packages/easy-email-editor/package.json b/packages/easy-email-editor/package.json
@@ -75,4 +75,4 @@
     "react-final-form": "^6.5.7"
   },
   "gitHead": "2a08e8af15766344de708d891c1c8ea31bb77646"
-}
+}
diff --git a/packages/easy-email-extensions/package.json b/packages/easy-email-extensions/package.json
@@ -101,4 +101,4 @@
     "react-final-form": "^6.5.7"
   },
   "gitHead": "bb5757eb3146f55c31d4354f1480939c3af8efe1"
-}
+}
diff --git a/packages/easy-email-extensions/src/AttributePanel/components/attributes/Link.tsx b/packages/easy-email-extensions/src/AttributePanel/components/attributes/Link.tsx
@@ -1,23 +1,49 @@
 import React, { useMemo } from 'react';
-import { useFocusIdx } from 'easy-email-editor';
+import { useFocusIdx, IconFont } from 'easy-email-editor';
 import { IconLink } from '@arco-design/web-react/icon';
 import { SelectField, TextField } from '../../../components/Form';
-import { Grid } from '@arco-design/web-react';
+import { Grid, Popover, Space, Button as ArcoButton } from '@arco-design/web-react';
+import { MergeTags } from './MergeTags';
+import { useField } from 'react-final-form';
 
 export function Link() {
   const { focusIdx } = useFocusIdx();
+  const { input } = useField(`${focusIdx}.attributes.href`, {
+    parse: v => v,
+  });
 
   return useMemo(() => {
     return (
       <Grid.Row>
         <Grid.Col span={11}>
           <TextField
             prefix={<IconLink />}
-            label={<span>{t('Href')}&nbsp;&nbsp;&nbsp;</span>}
+            label={
+              <Space>
+                <span>{t('Href')}&nbsp;&nbsp;&nbsp;</span>
+                <Popover
+                  trigger='click'
+                  content={
+                    <MergeTags
+                      value={input.value}
+                      onChange={input.onChange}
+                    />
+                  }
+                >
+                  <ArcoButton
+                    type='text'
+                    icon={<IconFont iconName='icon-merge-tags' />}
+                  />
+                </Popover>
+              </Space>
+            }
             name={`${focusIdx}.attributes.href`}
           />
         </Grid.Col>
-        <Grid.Col offset={1} span={11}>
+        <Grid.Col
+          offset={1}
+          span={11}
+        >
           <SelectField
             label={t('Target')}
             name={`${focusIdx}.attributes.target`}

diff --git a/readme.md b/readme.md
@@ -26,9 +26,7 @@
 
 ## Pro Version Announcement
 
-We are delighted to announce that we now have a more powerful and customizable commercial version available. <a href="https://github.com/Easy-Email-Pro/easy-email-pro" target="_blank">Check it out here </a>.
-
-If you are interested, feel free to contact us at ch.mao@qq.com.
+We are delighted to announce that we now have a more powerful and customizable commercial version available. <a href="https://www.easyemail.pro/?utm_source=github" target="_blank">Check it out here </a>.
 
 ---
 
@@ -53,7 +51,6 @@ Check out the live demo here: <a href="https://email.maocanhua.cn/?utm_source=gi
 
 Pro version live demo here: <a href="https://demo.easyemail.pro/full?utm_source=github-live" target="_blank">demo.easyemail.pro</a>.
 
-
 ## Getting started
 
 ```sh
@@ -171,9 +168,9 @@ $ git clone git@github.com:zalify/easy-email.git
 $ cd easy-email
 
 
-$ yarn
-$ yarn install-all
-$ yarn dev
+$ pnpm install
+$ pnpm run install-all
+$ pnpm run dev
 
 ```