diff --git a/CHANGELOG.md b/CHANGELOG.md index 04336a1..ce75bf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ ## changelog + +## 0.7.3 + +修复弹窗位置与选中问题。 + + ## 0.7.2 修复锁定组件影响,锁定中无法拖拽,缩放,旋转。 diff --git a/packages/dooringx-doc/src/changelog/1.1.md b/packages/dooringx-doc/src/changelog/1.1.md index 3218b42..7723daa 100644 --- a/packages/dooringx-doc/src/changelog/1.1.md +++ b/packages/dooringx-doc/src/changelog/1.1.md @@ -6,6 +6,12 @@ order: 1 ## changelog + +## 0.7.3 + +修复弹窗位置与选中问题。 + + ## 0.7.2 修复锁定组件影响,锁定中无法拖拽,缩放,旋转。 diff --git a/packages/dooringx-lib/package.json b/packages/dooringx-lib/package.json index 5026673..2881b43 100644 --- a/packages/dooringx-lib/package.json +++ b/packages/dooringx-lib/package.json @@ -1,5 +1,5 @@ { - "version": "0.7.2", + "version": "0.7.3", "license": "MIT", "main": "dist/index.js", "module": "dist/dooringx-lib.esm.js", diff --git a/packages/dooringx-lib/src/core/innerDrag/index.ts b/packages/dooringx-lib/src/core/innerDrag/index.ts index d7f6922..dabf13b 100644 --- a/packages/dooringx-lib/src/core/innerDrag/index.ts +++ b/packages/dooringx-lib/src/core/innerDrag/index.ts @@ -1,5 +1,5 @@ import { RefObject } from 'react'; -import { blockFocus } from '../focusHandler'; +import { blockFocus, containerFocusRemove } from '../focusHandler'; import { marklineConfig } from '../markline/marklineConfig'; import { resizerMouseMove, resizerMouseUp } from '../resizeHandler'; import { selectRangeMouseMove, selectData, selectRangeMouseUp } from '../selectRange'; @@ -11,6 +11,7 @@ import { contextMenuState } from '../contextMenu'; import { innerDragState } from './state'; import UserConfig from '../../config'; import { rotateMouseMove, rotateMouseUp } from '../rotateHandler'; +import { specialCoList } from '../utils/special'; export const innerDrag = function ( item: IBlockType, @@ -22,6 +23,11 @@ export const innerDrag = function ( onMouseDown: (e: React.MouseEvent) => { //e.preventDefault(); e.stopPropagation(); + //特殊元素不可操作 + if (specialCoList.includes(item.name)) { + containerFocusRemove(config).onMouseDown(e); + return; + } if (item.id && innerDragState.lastClick && item.id !== innerDragState.lastClick.id) { contextMenuState.unmountContextMenu(); diff --git a/packages/dooringx-lib/src/core/storeChanger/index.ts b/packages/dooringx-lib/src/core/storeChanger/index.ts index 8d1b810..83f9787 100644 --- a/packages/dooringx-lib/src/core/storeChanger/index.ts +++ b/packages/dooringx-lib/src/core/storeChanger/index.ts @@ -2,7 +2,7 @@ * @Author: yehuozhili * @Date: 2021-04-05 14:55:31 * @LastEditors: yehuozhili - * @LastEditTime: 2021-07-21 20:55:03 + * @LastEditTime: 2021-07-27 16:50:09 * @FilePath: \dooringx\packages\dooringx-lib\src\core\storeChanger\index.ts */ @@ -34,14 +34,14 @@ function createDefaultModalBlock(): IStoreData['block'] { props: {}, resize: true, focus: false, - position: 'fixed', + position: 'absolute', display: 'block', syncList: [], canDrag: false, eventMap: {}, functionList: [], animate: {}, - fixed: false, + fixed: true, rotate: { value: 0, canRotate: false,