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

update 0.11.2

Browse Source
This commit is contained in:
yehuozhili
2021-12-31 00:30:09 +08:00
parent 9fbc7ab582
commit e95eadcc5e
11 changed files with 161 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@ import { innerDragState } from './state';
import UserConfig from '../../config';
import { rotateMouseMove, rotateMouseUp } from '../rotateHandler';
import { specialCoList } from '../utils/special';
import { marklineState } from '../markline/state';
export const innerDrag = function (
item: IBlockType,
@@ -133,6 +134,11 @@ export const innerContainerDragUp = function (config: UserConfig) {
const store = config.getStore();
const onMouseUp = (e: React.MouseEvent) => {
// e.preventDefault(); 这个会导致无法取消选中
marklineState.cache = null;
marklineState.sortLeft = null;
marklineState.sortTop = null;
marklineState.sortRight = null;
marklineState.sortBottom = null;
iframeWrapperMove(config);
wrapperMoveMouseUp(config);
selectRangeMouseUp(e, config);

107
packages/dooringx-lib/src/core/markline/calcRender.ts
View File

@@ -2,14 +2,15 @@
* @Author: yehuozhili
* @Date: 2021-03-14 04:29:09
* @LastEditors: yehuozhili
* @LastEditTime: 2021-07-27 15:33:35
* @LastEditTime: 2021-12-31 00:25:43
* @FilePath: \dooringx\packages\dooringx-lib\src\core\markline\calcRender.ts
*/
import { innerDragState } from '../innerDrag/state';
import { newMarklineDisplay } from './normalMode';
import { marklineConfig } from './marklineConfig';
import UserConfig from '../../config';
import { angleToRadian, getContainer } from '../utils';
import { angleToRadian, binarySearchRemain, getContainer } from '../utils';
import { marklineState, RealStyleType } from './state';
export interface LinesTypes {
x: number[];
y: number[];
@@ -101,23 +102,91 @@ export function marklineCalRender(config: UserConfig, iframe: boolean): LinesTyp
}
const unfocus = marklineConfig.marklineUnfocus;
const len = unfocus.length;
for (let i = 0; i < len; i++) {
const v = unfocus[i];
const l = v?.left;
const t = v?.top;
const w = v?.width;
const h = v?.height;
if (
typeof l === 'number' &&
typeof t === 'number' &&
typeof w === 'number' &&
typeof h === 'number'
) {
const ro = v.rotate.value;
const rstyle = getComponentRotatedStyle(ro, w, h, l, t);
newMarklineDisplay(realStyle, rstyle, lines, focus);
if (lines.x.length !== 0 || lines.y.length !== 0) {
break;
// 只要cache里有东西，说明有缓存
if (marklineState.cache) {
if (!marklineState.sortLeft) {
marklineState.sortLeft = Object.values(marklineState.cache).sort((a, b) => {
return a.left - b.left;
});
}
if (!marklineState.sortTop) {
marklineState.sortTop = Object.values(marklineState.cache).sort((a, b) => {
return a.top - b.top;
});
}
if (!marklineState.sortBottom) {
marklineState.sortBottom = Object.values(marklineState.cache).sort((a, b) => {
return a.bottom - b.bottom;
});
}
if (!marklineState.sortRight) {
marklineState.sortRight = Object.values(marklineState.cache).sort((a, b) => {
return a.right - b.right;
});
}
const indexLeft = binarySearchRemain<RealStyleType>(
realStyle.left,
marklineState.sortLeft,
'left',
marklineConfig.indent
);
if (indexLeft) {
newMarklineDisplay(realStyle, indexLeft, lines, focus);
}
const indexTop = binarySearchRemain<RealStyleType>(
realStyle.top,
marklineState.sortTop,
'top',
marklineConfig.indent
);
if (indexTop) {
newMarklineDisplay(realStyle, indexTop, lines, focus);
}
const indexRight = binarySearchRemain<RealStyleType>(
realStyle.right,
marklineState.sortRight,
'right',
marklineConfig.indent
);
if (indexRight) {
newMarklineDisplay(realStyle, indexRight, lines, focus);
}
const indexBottom = binarySearchRemain<RealStyleType>(
realStyle.bottom,
marklineState.sortBottom,
'bottom',
marklineConfig.indent
);
if (indexBottom) {
newMarklineDisplay(realStyle, indexBottom, lines, focus);
}
} else {
for (let i = 0; i < len; i++) {
const v = unfocus[i];
const l = v?.left;
const t = v?.top;
const w = v?.width;
const h = v?.height;
if (
typeof l === 'number' &&
typeof t === 'number' &&
typeof w === 'number' &&
typeof h === 'number'
) {
const ro = v.rotate.value;
const rstyle = getComponentRotatedStyle(ro, w, h, l, t);
if (!marklineState.cache) {
marklineState.cache = {
[v.id]: rstyle,
};
} else {
marklineState.cache[v.id] = rstyle;
}
newMarklineDisplay(realStyle, rstyle, lines, focus);
// if (lines.x.length !== 0 || lines.y.length !== 0) {
// break; 这里不能break要算完所有值
// }
}
}
}

31
packages/dooringx-lib/src/core/markline/state.ts Normal file
View File

@@ -0,0 +1,31 @@
/*
* @Author: yehuozhili
* @Date: 2021-12-30 23:02:30
* @LastEditors: yehuozhili
* @LastEditTime: 2021-12-31 00:13:09
* @FilePath: \dooringx\packages\dooringx-lib\src\core\markline\state.ts
*/
export interface RealStyleType {
[x: string]: number;
left: number;
width: number;
height: number;
right: number;
top: number;
bottom: number;
}
interface MarklineStateType {
cache: null | Record<string, RealStyleType>;
sortLeft: null | Array<RealStyleType>;
sortTop: null | Array<RealStyleType>;
sortRight: null | Array<RealStyleType>;
sortBottom: null | Array<RealStyleType>;
}
export const marklineState: MarklineStateType = {
cache: null,
sortLeft: null,
sortTop: null,
sortRight: null,
sortBottom: null,
};

22
packages/dooringx-lib/src/core/utils/index.ts
View File

@@ -310,3 +310,25 @@ export function getContainer() {
}
return container;
}
export function binarySearchRemain<T extends Record<string, number>>(
target: number,
arr: Array<T>,
attribute: keyof T,
indent: number
) {
let start = 0;
let end = arr.length - 1;
while (start <= end) {
var mid = parseInt(start + (end - start) / 2 + '');
if (target === arr[mid][attribute] || Math.abs(target - arr[mid][attribute]) < indent) {
return arr[mid];
} else if (target > arr[mid][attribute]) {
start = mid + 1;
} else {
end = mid - 1;
}
}
return null;
}