mirror of
https://bitbucket.org/wisemapping/wisemapping-frontend.git
synced 2024-11-10 17:33:24 +01:00
merge develop remote
This commit is contained in:
commit
6b8f61a67f
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@wisemapping/mindplot",
|
||||
"version": "5.0.9",
|
||||
"version": "5.0.10",
|
||||
"description": "WiseMapping - Mindplot Canvas Library",
|
||||
"homepage": "http://www.wisemapping.org/",
|
||||
"directories": {
|
||||
@ -26,7 +26,7 @@
|
||||
"lint": "eslint src --ext js,ts",
|
||||
"playground": "webpack serve --config webpack.playground.js",
|
||||
"cy:run": "cypress run",
|
||||
"test:unit": "jest ./test/unit/export/*.ts ./test/unit/import/*.ts ./test/unit/layout/*.js --verbose --detectOpenHandles",
|
||||
"test:unit": "jest ./test/unit/export/*.ts ./test/unit/import/*.ts ./test/unit/layout/*.js --verbose --silent --detectOpenHandles",
|
||||
"test:integration": "start-server-and-test playground http-get://localhost:8083 cy:run",
|
||||
"test": "yarn test:unit && yarn test:integration"
|
||||
},
|
||||
|
@ -146,6 +146,7 @@ export default class FreemindImporter extends Importer {
|
||||
|
||||
private convertNodeProperties(freeNode: FreemindNode, wiseTopic: NodeModel, centralTopic: boolean): void {
|
||||
const text: string = freeNode.getText();
|
||||
<<<<<<< HEAD
|
||||
if (text) {
|
||||
if (!centralTopic && text.length > 100) {
|
||||
wiseTopic.setText(text.replace(/([^\n]{1,100})\s/g, '$1\n'));
|
||||
@ -153,6 +154,9 @@ export default class FreemindImporter extends Importer {
|
||||
wiseTopic.setText(text);
|
||||
}
|
||||
}
|
||||
=======
|
||||
if (text) wiseTopic.setText(text);
|
||||
>>>>>>> 5901b660deddff72765594a2aadd5045e7061043
|
||||
|
||||
const bgColor: string = freeNode.getBackgorundColor();
|
||||
if (bgColor) wiseTopic.setBackgroundColor(bgColor);
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@wisemapping/webapp",
|
||||
"version": "5.0.9",
|
||||
"version": "5.0.11",
|
||||
"main": "app.jsx",
|
||||
"scripts": {
|
||||
"start": "webpack serve --config webpack.dev.js ",
|
||||
|
@ -9,6 +9,7 @@ import PublicOutlinedIcon from '@mui/icons-material/PublicOutlined';
|
||||
import PrintOutlinedIcon from '@mui/icons-material/PrintOutlined';
|
||||
import ShareOutlinedIcon from '@mui/icons-material/ShareOutlined';
|
||||
import LabelOutlined from '@mui/icons-material/LabelOutlined';
|
||||
import HistoryOutlined from '@mui/icons-material/HistoryOutlined';
|
||||
|
||||
import { FormattedMessage } from 'react-intl';
|
||||
import { fetchMapById } from '../../../redux/clientSlice';
|
||||
@ -143,7 +144,7 @@ const ActionChooser = (props: ActionProps): React.ReactElement => {
|
||||
{role != 'viewer' && (
|
||||
<MenuItem onClick={handleOnClose('history')}>
|
||||
<ListItemIcon>
|
||||
<DeleteOutlinedIcon />
|
||||
<HistoryOutlined/>
|
||||
</ListItemIcon>
|
||||
<FormattedMessage id="action.history" defaultMessage="History" />
|
||||
</MenuItem>
|
||||
|
Loading…
Reference in New Issue
Block a user