Commit 181860a8 by Яков

add glossary

parent 07a7f9fd
{
"name": "react-ag-qeditor",
"version": "1.0.51",
"version": "1.0.52",
"description": "WYSIWYG html editor",
"author": "atma",
"license": "MIT",
......@@ -77,6 +77,7 @@
"@tiptap/extension-underline": "^2.0.0-beta.23",
"@tiptap/react": "^2.0.0-beta.109",
"@tiptap/starter-kit": "^2.0.0-beta.185",
"antd": "^5.24.7",
"axios": "^0.27.2",
"katex": "^0.15.3",
"prosemirror-state": "1.4.0",
......
......@@ -13,7 +13,7 @@ import TableCell from '@tiptap/extension-table-cell'
import TableRow from '@tiptap/extension-table-row'
import TableHeader from '@tiptap/extension-table-header'
import Focus from '@tiptap/extension-focus'
// import { Input, Modal, Form, Button, message } from "antd";
import { Input, Modal, Form, Button, message } from "antd";
// import Link from '@tiptap/extension-link'
// import Image from '@tiptap/extension-image'
import TextAlign from '@tiptap/extension-text-align'
......@@ -1283,68 +1283,68 @@ const QEditor = ({
{getInnerModal()}
{buildActionsModal(buttons)}
</EditorModal>
{/*<Modal*/}
{/* width={1100}*/}
{/* open={modalGlossaryIsOpen}*/}
{/* title={'Добавить слово'}*/}
{/* onCancel={()=>{*/}
{/* setModalGlossaryIsOpen(false);*/}
{/* }}*/}
{/* footer={[*/}
{/* <Button key={1}*/}
{/* size={'middle'}*/}
{/* type={'text'}*/}
{/* onClick={()=>{*/}
{/* setModalGlossaryIsOpen(false);*/}
{/* }}>Отменить</Button>,*/}
{/* <Button key={2}*/}
{/* size={'middle'}*/}
{/* type={'primary'}*/}
{/* htmlType={'submit'}*/}
{/* form={'form-glossary'}*/}
{/* >Сохранить</Button>*/}
{/* ]}*/}
{/*>*/}
{/* <Form*/}
{/* name={'form-glossary'}*/}
{/* initialValues={{word : wordGlossary}}*/}
{/* labelCol={{span: 8}}*/}
{/* wrapperCol={{span: 32}}*/}
{/* layout="vertical"*/}
{/* size="middle"*/}
{/* style={{margin: '30px'}}*/}
{/* onFinish={(values) => {*/}
{/* editWord(values);*/}
{/* }}*/}
{/* >*/}
{/* <Form.Item name="id" style={{'display': 'none'}}>*/}
{/* <input type="hidden"/>*/}
{/* </Form.Item>*/}
{/* <Form.Item*/}
{/* label={'Термин'}*/}
{/* name="word"*/}
{/* rules={[*/}
{/* {*/}
{/* required: true,*/}
{/* message: 'Обязательное поле',*/}
{/* type:"string"*/}
{/* },*/}
{/* { min: 2, message: 'Минимум 2 символа' },*/}
{/* { max: 254, message: 'Максимум 254 символов' },*/}
{/* ]}*/}
{/* >*/}
{/* <Input placeholder={'Термин'}/>*/}
{/* </Form.Item>*/}
<Modal
width={1100}
open={modalGlossaryIsOpen}
title={'Добавить слово'}
onCancel={()=>{
setModalGlossaryIsOpen(false);
}}
footer={[
<Button key={1}
size={'middle'}
type={'text'}
onClick={()=>{
setModalGlossaryIsOpen(false);
}}>Отменить</Button>,
<Button key={2}
size={'middle'}
type={'primary'}
htmlType={'submit'}
form={'form-glossary'}
>Сохранить</Button>
]}
>
<Form
name={'form-glossary'}
initialValues={{word : wordGlossary}}
labelCol={{span: 8}}
wrapperCol={{span: 32}}
layout="vertical"
size="middle"
style={{margin: '30px'}}
onFinish={(values) => {
editWord(values);
}}
>
<Form.Item name="id" style={{'display': 'none'}}>
<input type="hidden"/>
</Form.Item>
<Form.Item
label={'Термин'}
name="word"
rules={[
{
required: true,
message: 'Обязательное поле',
type:"string"
},
{ min: 2, message: 'Минимум 2 символа' },
{ max: 254, message: 'Максимум 254 символов' },
]}
>
<Input placeholder={'Термин'}/>
</Form.Item>
{/* <Form.Item*/}
{/* name="description"*/}
{/* label={'Краткое описание'}*/}
{/* rules={[{required: true, type: 'string', message: 'Обязательное поле' }]}*/}
{/* >*/}
{/* <TextArea showCount={true} maxLength={1000} placeholder={'Краткое описание'}/>*/}
{/* </Form.Item>*/}
{/* </Form>*/}
{/*</Modal>*/}
<Form.Item
name="description"
label={'Краткое описание'}
rules={[{required: true, type: 'string', message: 'Обязательное поле' }]}
>
<TextArea showCount={true} maxLength={1000} placeholder={'Краткое описание'}/>
</Form.Item>
</Form>
</Modal>
</div>
)
}
......
......@@ -51,7 +51,7 @@
resolved "https://registry.yarnpkg.com/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz#ed2be7fb4d82ac7e1d45a54a5b06d6cecf8be6f6"
integrity sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==
"@ant-design/icons@5.6.1", "@ant-design/icons@^5.6.1":
"@ant-design/icons@^5.6.1":
version "5.6.1"
resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-5.6.1.tgz#7290fcdc3d96ff3fca793ed399053cd29ad5dbd3"
integrity sha512-0/xS39c91WjPAZOWsvi1//zjx6kAp4kxWwctR6kuU6p133w8RU0D2dSCvZC19uQyharg/sAvYxGYWl01BbZZfg==
......@@ -2198,7 +2198,7 @@
resolved "https://registry.yarnpkg.com/@tiptap/extension-table-row/-/extension-table-row-2.11.7.tgz#01ca80eca98043858e422f9e50a481d07ab2f75c"
integrity sha512-K254RiXWGXGjz5Cm835hqfQiwnYXm8aw6oOa3isDh4A1B+1Ev4DB2vEDKMrgaOor3nbTsSYmAx2iEMrZSbpaRg==
"@tiptap/extension-table@^2.0.0-beta.49":
"@tiptap/extension-table@2.11.7", "@tiptap/extension-table@^2.0.0-beta.49":
version "2.11.7"
resolved "https://registry.yarnpkg.com/@tiptap/extension-table/-/extension-table-2.11.7.tgz#4a8e477be809c06b43092de7db96fac6c3739ae8"
integrity sha512-rfwWkNXz/EZuhc8lylsCWPbx0Xr5FlIhreWFyeoXYrDEO3x4ytYcVOpNmbabJYP2semfM0PvPR5o84zfFkLZyg==
......@@ -2223,7 +2223,7 @@
resolved "https://registry.yarnpkg.com/@tiptap/extension-underline/-/extension-underline-2.11.7.tgz#8354a700d8f2be6ffe862b818f621bf25d1a17a3"
integrity sha512-NtoQw6PGijOAtXC6G+0Aq0/Z5wwEjPhNHs8nsjXogfWIgaj/aI4/zfBnA06eI3WT+emMYQTl0fTc4CUPnLVU8g==
"@tiptap/pm@^2.11.7":
"@tiptap/pm@2.11.7", "@tiptap/pm@^2.11.7":
version "2.11.7"
resolved "https://registry.yarnpkg.com/@tiptap/pm/-/pm-2.11.7.tgz#34e1dbe1f27ea978bc740c9144ae8195948609e3"
integrity sha512-7gEEfz2Q6bYKXM07vzLUD0vqXFhC5geWRA6LCozTiLdVFDdHWiBrvb2rtkL5T7mfLq03zc1QhH7rI3F6VntOEA==
......@@ -2810,7 +2810,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
dependencies:
color-convert "^2.0.1"
antd@5.x:
antd@^5.24.7:
version "5.24.7"
resolved "https://registry.yarnpkg.com/antd/-/antd-5.24.7.tgz#ce8d1a1fde3f26cfcfc6119dffd2bdc09ebf5093"
integrity sha512-xROWsw0yYFGiNFpVSUZ9/Gs43q0qIM9BkfjugeqgePlZBpLZzLjtOpf4UGM+5aijelHqMi8864KZCX5BbcZYfA==
......@@ -10772,7 +10772,7 @@ prosemirror-inputrules@^1.4.0:
prosemirror-state "^1.0.0"
prosemirror-transform "^1.0.0"
prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.2.2:
prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.2.2.tgz#14a54763a29c7b2704f561088ccf3384d14eb77e"
integrity sha512-EAlXoksqC6Vbocqc0GtzCruZEzYgrn+iiGnNjsJsH4mrnIGex4qbLdWWNza3AW5W36ZRrlBID0eM6bdKH4OStQ==
......@@ -10799,7 +10799,7 @@ prosemirror-menu@^1.2.4:
prosemirror-history "^1.0.0"
prosemirror-state "^1.0.0"
prosemirror-model@^1.0.0, prosemirror-model@^1.20.0, prosemirror-model@^1.21.0, prosemirror-model@^1.23.0, prosemirror-model@^1.25.0:
prosemirror-model@^1.0.0, prosemirror-model@^1.20.0, prosemirror-model@^1.21.0, prosemirror-model@^1.23.0, prosemirror-model@^1.25.0, prosemirror-model@^1.8.1:
version "1.25.0"
resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.25.0.tgz#c147113edc0718a14f03881e4c20367d0221f7af"
integrity sha512-/8XUmxWf0pkj2BmtqZHYJipTBMHIdVjuvFzMvEoxrtyGNmfvdhBiRwYt/eFwy2wA9DtBW3RLqvZnjurEkHaFCw==
......@@ -10830,7 +10830,7 @@ prosemirror-state@1.4.0:
prosemirror-model "^1.0.0"
prosemirror-transform "^1.0.0"
prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.4.3:
prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1, prosemirror-state@^1.4.3:
version "1.4.3"
resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.4.3.tgz#94aecf3ffd54ec37e87aa7179d13508da181a080"
integrity sha512-goFKORVbvPuAQaXhpbemJFRKJ2aixr+AZMGiquiqKxaucC6hlpHNZHWgz5R7dS4roHiwq9vDctE//CZ++o0W1Q==
......@@ -10839,16 +10839,16 @@ prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.4.3:
prosemirror-transform "^1.0.0"
prosemirror-view "^1.27.0"
prosemirror-tables@^1.6.4:
version "1.7.0"
resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.7.0.tgz#2af4fb1b414bd2d1e363c6f39498b15605782fca"
integrity sha512-dc9+u4aqT+biw3J/v7p5LyH8uqqXSAjdszfLtrCnDbpMr1F+Gsjtkdiij/1p8qM1gBOCfQeiahhk2pOO9Aa8xA==
prosemirror-tables@1.4.0, prosemirror-tables@^1.6.4:
version "1.4.0"
resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.4.0.tgz#59c3dc241e03fc4ba8c093995b130d2980f0ffdc"
integrity sha512-fxryZZkQG12fSCNuZDrYx6Xvo2rLYZTbKLRd8rglOPgNJGMKIS8uvTt6gGC38m7UCu/ENnXIP9pEz5uDaPc+cA==
dependencies:
prosemirror-keymap "^1.2.2"
prosemirror-model "^1.25.0"
prosemirror-state "^1.4.3"
prosemirror-transform "^1.10.3"
prosemirror-view "^1.39.1"
prosemirror-keymap "^1.1.2"
prosemirror-model "^1.8.1"
prosemirror-state "^1.3.1"
prosemirror-transform "^1.2.1"
prosemirror-view "^1.13.3"
prosemirror-trailing-node@^3.0.0:
version "3.0.0"
......@@ -10858,14 +10858,14 @@ prosemirror-trailing-node@^3.0.0:
"@remirror/core-constants" "3.0.0"
escape-string-regexp "^4.0.0"
prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.10.2, prosemirror-transform@^1.10.3, prosemirror-transform@^1.7.3:
prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.10.2, prosemirror-transform@^1.2.1, prosemirror-transform@^1.7.3:
version "1.10.3"
resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.10.3.tgz#fae660bd7ffef3159aff44bc21e9e044aa31b67d"
integrity sha512-Nhh/+1kZGRINbEHmVu39oynhcap4hWTs/BlU7NnxWj3+l0qi8I1mu67v6mMdEe/ltD8hHvU4FV6PHiCw2VSpMw==
dependencies:
prosemirror-model "^1.21.0"
prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.27.0, prosemirror-view@^1.31.0, prosemirror-view@^1.37.0, prosemirror-view@^1.39.1:
prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, prosemirror-view@^1.27.0, prosemirror-view@^1.31.0, prosemirror-view@^1.37.0:
version "1.39.1"
resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.39.1.tgz#9e24cc82649d37ed5d75bf59419694b0566927bb"
integrity sha512-GhLxH1xwnqa5VjhJ29LfcQITNDp+f1jzmMPXQfGW9oNrF0lfjPzKvV5y/bjIQkyKpwCX3Fp+GA4dBpMMk8g+ZQ==
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment