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

update 0.11.5

Browse Source
This commit is contained in:
hufeixiong
2022-01-06 12:25:30 +08:00
parent 733883c721
commit 12ab2e813b
9 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,7 +176,6 @@ export function marklineCalRender(config: UserConfig, iframe: boolean): LinesTyp
'r-l'
);
}
const indexTopBottom = binarySearchRemain<RealStyleType>(
realStyle.top,
marklineState.sortBottom,

53
packages/dooringx-lib/src/core/markline/normalMode.ts
View File

@@ -32,97 +32,96 @@ export function marklineDisplay(
direction: 'left' | 'top' | 'bottom' | 'right' | 't-b' | 'b-t' | 'l-r' | 'r-l'
) {
const { top, height, left, width } = focusStyle;
let { dirtyX, dirtyY } = dirty;
const { top: t, height: h, left: l, width: w } = unFocusStyle;
let diffY = 0;
let diffX = 0;
switch (direction) {
case 'left':
if (dirtyY) {
if (diff === 0) {
if (dirty.dirtyY) {
if (diff <= 1) {
lines.y.push(l);
}
} else {
lines.y.push(l);
diffX = l - left;
dirtyY = true;
dirty.dirtyY = true;
}
break;
case 'right':
if (dirtyY) {
if (diff === 0) {
if (dirty.dirtyY) {
if (diff <= 1) {
lines.y.push(l + w);
}
} else {
lines.y.push(l + w);
diffX = l + w - left - width;
dirtyY = true;
dirty.dirtyY = true;
}
break;
case 'l-r':
if (dirtyY) {
if (diff === 0) {
if (dirty.dirtyY) {
if (diff <= 1) {
lines.y.push(l + w);
}
} else {
lines.y.push(l + w);
diffX = l + w - left;
dirtyY = true;
dirty.dirtyY = true;
}
break;
case 'r-l':
if (dirtyY) {
if (diff === 0) {
if (dirty.dirtyY) {
if (diff <= 1) {
lines.y.push(l);
}
} else {
lines.y.push(l);
diffX = l - (left + width);
dirtyY = true;
dirty.dirtyY = true;
}
break;
case 'top':
if (dirtyX) {
if (diff === 0) {
if (dirty.dirtyX) {
if (diff <= 1) {
lines.x.push(t);
}
} else {
lines.x.push(t);
diffY = t - top;
dirtyX = true;
dirty.dirtyX = true;
}
break;
case 'bottom':
if (dirtyX) {
if (diff === 0) {
if (dirty.dirtyX) {
if (diff <= 1) {
lines.x.push(t + h);
}
} else {
lines.x.push(t + h);
diffY = (t + h - top - height) / 2;
dirtyX = true;
diffY = t + h - top - height;
dirty.dirtyX = true;
}
break;
case 't-b':
if (dirtyX) {
if (diff === 0) {
if (dirty.dirtyX) {
if (diff <= 1) {
lines.x.push(t + h);
}
} else {
lines.x.push(t + h);
diffY = (t + h - top) / 2;
dirtyX = true;
diffY = t + h - top;
dirty.dirtyX = true;
}
break;
case 'b-t':
if (dirtyX) {
if (diff === 0) {
if (dirty.dirtyX) {
if (diff <= 1) {
lines.x.push(t);
}
} else {
lines.x.push(t);
diffY = t - (top + height);
dirtyX = true;
dirty.dirtyX = true;
}
break;
}

4
packages/dooringx-lib/src/index.less
View File

@@ -206,8 +206,8 @@
}
.rotatereset {
position: absolute;
top: -35px;
left: calc(100% - 15px);
top: -20px;
left: calc(100% + 15px);
cursor: pointer;
font-size: 20px;
color: gray;