diff --git a/lerna.json b/lerna.json index 0a1af9771..0bfec0454 100644 --- a/lerna.json +++ b/lerna.json @@ -17,4 +17,4 @@ } }, "version": "4.15.0" -} +} \ No newline at end of file diff --git a/packages/easy-email-core/package.json b/packages/easy-email-core/package.json index 940e20799..1c33bf06c 100644 --- 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" -} +} \ No newline at end of file diff --git a/packages/easy-email-editor/package.json b/packages/easy-email-editor/package.json index 86504d3f5..05b1cbb62 100644 --- 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" -} +} \ No newline at end of file diff --git a/packages/easy-email-extensions/package.json b/packages/easy-email-extensions/package.json index c3fc07f12..c8f5ccfef 100644 --- 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" -} +} \ No newline at end of file diff --git a/packages/easy-email-extensions/src/AttributePanel/components/attributes/Link.tsx b/packages/easy-email-extensions/src/AttributePanel/components/attributes/Link.tsx index 715410393..4fa08910b 100644 --- a/packages/easy-email-extensions/src/AttributePanel/components/attributes/Link.tsx +++ b/packages/easy-email-extensions/src/AttributePanel/components/attributes/Link.tsx @@ -1,11 +1,16 @@ 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 ( @@ -13,11 +18,32 @@ export function Link() { } - label={{t('Href')}   } + label={ + + {t('Href')}    + + } + > + } + /> + + + } name={`${focusIdx}.attributes.href`} /> - + Check it out here . - -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. Check it out here . --- @@ -53,7 +51,6 @@ Check out the live demo here: demo.easyemail.pro. - ## 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 ```