guoshujing/dooring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: lock component

Browse Source
This commit is contained in:
hufeixiong
2021-07-27 16:35:09 +08:00
parent 0619bdfc81
commit b2a02f0ebb
9 changed files with 103 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/dooringx-lib/package.json
View File

@@ -1,5 +1,5 @@
{
"version": "0.7.0",
"version": "0.7.2",
"license": "MIT",
"main": "dist/index.js",
"module": "dist/dooringx-lib.esm.js",

14
packages/dooringx-lib/src/core/innerDrag/index.ts
View File

@@ -1,5 +1,5 @@
import { RefObject } from 'react';
import { blockFocus, containerFocusRemove } from '../focusHandler';
import { blockFocus } from '../focusHandler';
import { marklineConfig } from '../markline/marklineConfig';
import { resizerMouseMove, resizerMouseUp } from '../resizeHandler';
import { selectRangeMouseMove, selectData, selectRangeMouseUp } from '../selectRange';
@@ -22,14 +22,16 @@ export const innerDrag = function (
onMouseDown: (e: React.MouseEvent) => {
//e.preventDefault();
e.stopPropagation();
if (!item.canDrag) {
containerFocusRemove(config).onMouseDown(e);
return;
}
blockFocus(e, item, config);
if (item.id && innerDragState.lastClick && item.id !== innerDragState.lastClick.id) {
contextMenuState.unmountContextMenu();
}
//candrag给选中，不给拖
blockFocus(e, item, config);
if (!item.canDrag) {
//containerFocusRemove(config).onMouseDown(e);
return;
}
innerDragState.lastClick = item;
if (item.position === 'static') {

2
packages/dooringx-lib/src/core/resizeHandler/index.tsx
View File

@@ -185,7 +185,7 @@ export function BlockResizer(props: BlockResizerProps) {
const rotate = props.data.rotate.value;
const cursorMap = getCursor(rotate);
const render = useMemo(() => {
if (props.data.focus && props.data.resize) {
if (props.data.focus && props.data.resize && props.data.canDrag) {
return (
<>
{directionArr.map((v) => {

4
packages/dooringx-lib/src/core/rotateHandler/index.tsx
View File

@@ -2,7 +2,7 @@
* @Author: yehuozhili
* @Date: 2021-07-21 20:51:58
* @LastEditors: yehuozhili
* @LastEditTime: 2021-07-27 14:53:15
* @LastEditTime: 2021-07-27 16:32:30
* @FilePath: \dooringx\packages\dooringx-lib\src\core\rotateHandler\index.tsx
*/
import React from 'react';
@@ -90,7 +90,7 @@ interface RotateResizerProps {
}
export function RotateResizer(props: RotateResizerProps) {
const render = useMemo(() => {
if (props.data.focus && props.data.rotate.canRotate) {
if (props.data.focus && props.data.rotate.canRotate && props.data.canDrag) {
return (
<div
onMouseDown={(e) => {