tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: web stack alignment margin

Browse Source
This commit is contained in:
wangxiangyuan 2023-09-01 14:27:56 +08:00 committed by osborn
parent d70cc9c28e
commit e1c7d57cbb
4 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
doric-web/dist/index.js vendored
View File

@ -6996,19 +6996,27 @@ var doric_web = (function (exports, axios, sandbox) {
left = toPixelString(0); left = toPixelString(0);
} }
else if ((gravity & RIGHT) === RIGHT) { else if ((gravity & RIGHT) === RIGHT) {
left = toPixelString(this.view.offsetWidth - e.view.offsetWidth); //ignore marginLeft
const childMarginRight = pixelString2Number(window.getComputedStyle(e.view).marginRight);
left = toPixelString(this.view.offsetWidth - e.view.offsetWidth - childMarginRight);
} }
else if ((gravity & CENTER_X) === CENTER_X) { else if ((gravity & CENTER_X) === CENTER_X) {
left = toPixelString(this.view.offsetWidth / 2 - e.view.offsetWidth / 2); const childMarginLeft = pixelString2Number(window.getComputedStyle(e.view).marginLeft);
const childMarginRight = pixelString2Number(window.getComputedStyle(e.view).marginRight);
left = toPixelString(this.view.offsetWidth / 2 - e.view.offsetWidth / 2 + childMarginLeft - childMarginRight);
} }
if ((gravity & TOP) === TOP) { if ((gravity & TOP) === TOP) {
top = toPixelString(0); top = toPixelString(0);
} }
else if ((gravity & BOTTOM) === BOTTOM) { else if ((gravity & BOTTOM) === BOTTOM) {
top = toPixelString(this.view.offsetHeight - e.view.offsetHeight); //ignore marginTop
const childMarginTop = pixelString2Number(window.getComputedStyle(e.view).marginBottom);
top = toPixelString(this.view.offsetHeight - e.view.offsetHeight - childMarginTop);
} }
else if ((gravity & CENTER_Y) === CENTER_Y) { else if ((gravity & CENTER_Y) === CENTER_Y) {
top = toPixelString(this.view.offsetHeight / 2 - e.view.offsetHeight / 2); const childMarginTop = pixelString2Number(window.getComputedStyle(e.view).marginTop);
const childMarginBottom = pixelString2Number(window.getComputedStyle(e.view).marginBottom);
top = toPixelString(this.view.offsetHeight / 2 - e.view.offsetHeight / 2 + childMarginTop - childMarginBottom);
} }
e.applyCSSStyle({ e.applyCSSStyle({
position, position,
@ -7164,6 +7172,7 @@ var doric_web = (function (exports, axios, sandbox) {
build() { build() {
const div = document.createElement('div'); const div = document.createElement('div');
div.style.display = "flex"; div.style.display = "flex";
div.style.overflow = "hidden";
this.textElement = document.createElement('span'); this.textElement = document.createElement('span');
div.appendChild(this.textElement); div.appendChild(this.textElement);
div.style.justifyContent = "center"; div.style.justifyContent = "center";
@ -7686,6 +7695,9 @@ var doric_web = (function (exports, axios, sandbox) {
case "onLoadMore": case "onLoadMore":
this.onLoadMoreFuncId = prop; this.onLoadMoreFuncId = prop;
break; break;
case "onScroll":
this.onScrollFuncId = prop;
break;
case "loadMoreView": case "loadMoreView":
this.loadMoreViewId = prop; this.loadMoreViewId = prop;
break; break;
@ -7774,7 +7786,10 @@ var doric_web = (function (exports, axios, sandbox) {
build() { build() {
const ret = document.createElement('div'); const ret = document.createElement('div');
ret.style.overflow = "scroll"; ret.style.overflow = "scroll";
ret.addEventListener("scroll", () => { ret.addEventListener("scroll", event => {
if (this.onScrollFuncId) {
this.callJSResponse(this.onScrollFuncId, { x: event.target.scrollLeft || 0, y: event.target.scrollTop });
}
if (this.loadMore) { if (this.loadMore) {
if (ret.scrollTop + ret.offsetHeight === ret.scrollHeight) { if (ret.scrollTop + ret.offsetHeight === ret.scrollHeight) {
this.onScrollToEnd(); this.onScrollToEnd();

2
doric-web/dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

16
doric-web/src/shader/DoricStackNode.ts
View File

@ -46,16 +46,24 @@ export class DoricStackNode extends DoricGroupViewNode {
if ((gravity & LEFT) === LEFT) { if ((gravity & LEFT) === LEFT) {
left = toPixelString(0) left = toPixelString(0)
} else if ((gravity & RIGHT) === RIGHT) { } else if ((gravity & RIGHT) === RIGHT) {
left = toPixelString(this.view.offsetWidth - e.view.offsetWidth) //ignore marginLeft
const childMarginRight = pixelString2Number(window.getComputedStyle(e.view).marginRight)
left = toPixelString(this.view.offsetWidth - e.view.offsetWidth - childMarginRight)
} else if ((gravity & CENTER_X) === CENTER_X) { } else if ((gravity & CENTER_X) === CENTER_X) {
left = toPixelString(this.view.offsetWidth / 2 - e.view.offsetWidth / 2) const childMarginLeft = pixelString2Number(window.getComputedStyle(e.view).marginLeft)
const childMarginRight = pixelString2Number(window.getComputedStyle(e.view).marginRight)
left = toPixelString(this.view.offsetWidth / 2 - e.view.offsetWidth / 2 + childMarginLeft - childMarginRight)
} }
if ((gravity & TOP) === TOP) { if ((gravity & TOP) === TOP) {
top = toPixelString(0) top = toPixelString(0)
} else if ((gravity & BOTTOM) === BOTTOM) { } else if ((gravity & BOTTOM) === BOTTOM) {
top = toPixelString(this.view.offsetHeight - e.view.offsetHeight) //ignore marginTop
const childMarginTop = pixelString2Number(window.getComputedStyle(e.view).marginBottom)
top = toPixelString(this.view.offsetHeight - e.view.offsetHeight - childMarginTop)
} else if ((gravity & CENTER_Y) === CENTER_Y) { } else if ((gravity & CENTER_Y) === CENTER_Y) {
top = toPixelString(this.view.offsetHeight / 2 - e.view.offsetHeight / 2) const childMarginTop = pixelString2Number(window.getComputedStyle(e.view).marginTop)
const childMarginBottom = pixelString2Number(window.getComputedStyle(e.view).marginBottom)
top = toPixelString(this.view.offsetHeight / 2 - e.view.offsetHeight / 2 + childMarginTop - childMarginBottom)
} }
e.applyCSSStyle({ e.applyCSSStyle({
position, position,

1
doric-web/src/shader/DoricTextNode.ts
View File

@ -7,6 +7,7 @@ export class DoricTextNode extends DoricViewNode {
build(): HTMLElement { build(): HTMLElement {
const div = document.createElement('div') const div = document.createElement('div')
div.style.display = "flex" div.style.display = "flex"
div.style.overflow = "hidden"
this.textElement = document.createElement('span') this.textElement = document.createElement('span')
div.appendChild(this.textElement) div.appendChild(this.textElement)
div.style.justifyContent = "center" div.style.justifyContent = "center"