Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: 修复了一些已有的问题 #865

Merged
merged 6 commits into from
Feb 25, 2022
Merged

fix: 修复了一些已有的问题 #865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c9f683
fix: 开放RichTextWidget调色盘
Feb 24, 2022
6eef220
fix: 修复仪表盘富文本组件新增之后进行编辑就会报错的问题
Feb 24, 2022
a22f7e8
fix: 修复明细表在无数据的时候也有tooltip提示的问题
Feb 24, 2022
a3d5818
fix: 修复因新增ChartDataSet模型 getCustomBodyRowStyle函数匹配时未做大写转换的问题
Feb 24, 2022
b34b8bd
merge: 解决冲突
Feb 25, 2022
ca1d227
clear: 清除打印日志语句
Feb 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 44 additions & 87 deletions frontend/src/app/components/ChartGraph/BasicRichText/ChartRichTextAdapter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
* limitations under the License.
*/

import { Button, Menu, Modal, Row } from 'antd';
import ChromeColorPicker from 'app/components/ColorPicker/ChromeColorPicker';
import { SelectOutlined } from '@ant-design/icons';
import { Button, Dropdown, Menu, Modal, Row } from 'antd';
import { FONT_FAMILIES, FONT_SIZES } from 'globalConstants';
import debounce from 'lodash/debounce';
import { DeltaStatic } from 'quill';
Expand All @@ -38,12 +38,12 @@ import 'react-quill/dist/quill.bubble.css';
import 'react-quill/dist/quill.core.css';
import styled from 'styled-components/macro';
import './RichTextPluginLoader';
import { CustomColor, QuillPalette } from './RichTextPluginLoader/CustomColor';
import {
Formats,
MarkdownOptions,
} from './RichTextPluginLoader/RichTextConfig';
import TagBlot from './RichTextPluginLoader/TagBlot';
import { useQuillBar } from './useQuillBar';

Quill.register('modules/imageDrop', ImageDrop);
Quill.register('formats/tag', TagBlot);
Expand All @@ -57,12 +57,6 @@ Quill.register(font, true);

const MenuItem = Menu.Item;

const CUSTOM_COLOR = 'custom-color';
const CUSTOM_COLOR_INIT = {
background: 'transparent',
color: '#000',
};

const ChartRichTextAdapter: FC<{
dataList: any[];
id: string;
Expand Down Expand Up @@ -96,7 +90,7 @@ const ChartRichTextAdapter: FC<{
const [customColor, setCustomColor] = useState<{
background: string;
color: string;
}>({ ...CUSTOM_COLOR_INIT });
}>({ ...QuillPalette.RICH_TEXT_CUSTOM_COLOR_INIT });
const [customColorType, setCustomColorType] = useState<
'color' | 'background'
>('color');
Expand All @@ -115,14 +109,14 @@ const ChartRichTextAdapter: FC<{
container: isEditing ? `#${newId}` : null,
handlers: {
color: function (value) {
if (value === CUSTOM_COLOR) {
if (value === QuillPalette.RICH_TEXT_CUSTOM_COLOR) {
setCustomColorType('color');
setCustomColorVisible(true);
}
quillEditRef.current!.getEditor().format('color', value);
},
background: function (value) {
if (value === CUSTOM_COLOR) {
if (value === QuillPalette.RICH_TEXT_CUSTOM_COLOR) {
setCustomColorType('background');
setCustomColorVisible(true);
}
Expand Down Expand Up @@ -177,45 +171,22 @@ const ChartRichTextAdapter: FC<{
}
}, [quillValue, dataList, setTranslate]);

useLayoutEffect(() => {
if (quillEditRef.current) {
quillEditRef.current
.getEditor()
.on('selection-change', (r: { index: number; length: number }) => {
if (!r?.index) return;
try {
const index = r.length === 0 ? r.index - 1 : r.index;
const length = r.length === 0 ? 1 : r.length;
const delta = quillEditRef
.current!.getEditor()
.getContents(index, length);
useEffect(() => {
let palette: QuillPalette | null = null;
if (quillEditRef.current && containerId) {
palette = new QuillPalette(quillEditRef.current, {
toolbarId: containerId,
onChange: setCustomColor,
});
}

if (delta.ops?.length === 1 && delta.ops[0]?.attributes) {
const { background, color } = delta.ops[0].attributes;
setCustomColor({
background: background || CUSTOM_COLOR_INIT.background,
color: color || CUSTOM_COLOR_INIT.color,
});
return () => {
palette?.destroy();
};
}, [containerId]);

const colorNode = document.querySelector(
'.ql-color .ql-color-label',
);
const backgroundNode = document.querySelector(
'.ql-background .ql-color-label',
);
if (color && !colorNode?.getAttribute('style')) {
colorNode!.setAttribute('style', `stroke: ${color}`);
}
if (background && !backgroundNode?.getAttribute('style')) {
backgroundNode!.setAttribute('style', `fill: ${background}`);
}
} else {
setCustomColor({ ...CUSTOM_COLOR_INIT });
}
} catch (error) {
console.error('selection-change callback | error', error);
}
});
useLayoutEffect(() => {
if (quillEditRef.current) {
if (openQuillMarkdown) {
quillMarkdownConfigRef.current = new QuillMarkdown(
quillEditRef.current.getEditor(),
Expand Down Expand Up @@ -295,7 +266,26 @@ const ChartRichTextAdapter: FC<{
);
}, [dataList, selectField]);

const toolbar = useQuillBar(containerId, t, CUSTOM_COLOR, fieldItems);
const toolbar = useMemo(
() =>
QuillPalette.getToolbar({
id: containerId as string,
extendNodes: {
4: (
<Dropdown
overlay={fieldItems}
trigger={['click']}
key="ql-selectLink"
>
<a className="selectLink" title="引用字段">
<SelectOutlined />
</a>
</Dropdown>
),
},
}),
[containerId, fieldItems],
);

const reactQuillEdit = useMemo(
() =>
Expand Down Expand Up @@ -350,21 +340,12 @@ const ChartRichTextAdapter: FC<{
>
{isEditing && reactQuillView}
</Modal>
<Modal
width={273}
mask={false}
<CustomColor
visible={customColorVisible}
footer={null}
closable={false}
onCancel={() => setCustomColorVisible(false)}
>
<ChromeColorPicker
// @TM 该组件无法更新color 暂时用key解决
key={customColor?.[customColorType]}
color={customColor?.[customColorType]}
onChange={customColorChange}
/>
</Modal>
color={customColor?.[customColorType]}
colorChange={customColorChange}
/>
</TextWrap>
);
},
Expand All @@ -388,30 +369,6 @@ const QuillBox = styled.div`
flex: 1;
overflow-y: auto;
}
// @TM 自定义色块
.ql-picker-options [data-value=${CUSTOM_COLOR}] {
position: relative;
width: calc(100% - 4px);
background-color: transparent !important;
color: #343a40;
font-weight: 400;
font-size: 12px;
// todo (tianlei) Need to nationalize
&::after {
content: '更多';
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
&:hover {
border: none;
}
}
.ql-snow .ql-color .ql-picker-options,
.ql-snow .ql-background .ql-picker-options {
width: 232px;
}
`;
const TextWrap = styled.div`
width: 100%;
Expand Down
Loading