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

fix:web VLayout、HLayout margin

Browse Source
This commit is contained in:
wangxiangyuan 2023-09-11 11:40:02 +08:00 committed by osborn
parent b087730090
commit b430dbbbda
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7109,8 +7109,8 @@ var doric_web = (function (exports, axios, sandbox) {
e.view.style.flex = `${(_b = e.layoutConfig) === null || _b === void 0 ? void 0 : _b.weight}`; e.view.style.flex = `${(_b = e.layoutConfig) === null || _b === void 0 ? void 0 : _b.weight}`;
} }
e.view.style.marginTop = toPixelString(((_d = (_c = e.layoutConfig) === null || _c === void 0 ? void 0 : _c.margin) === null || _d === void 0 ? void 0 : _d.top) || 0); e.view.style.marginTop = toPixelString(((_d = (_c = e.layoutConfig) === null || _c === void 0 ? void 0 : _c.margin) === null || _d === void 0 ? void 0 : _d.top) || 0);
e.view.style.marginBottom = toPixelString((idx === this.childNodes.length - 1) ? 0 : this.space const bottomMargin = ((_f = (_e = e.layoutConfig) === null || _e === void 0 ? void 0 : _e.margin) === null || _f === void 0 ? void 0 : _f.bottom) || 0;
+ (((_f = (_e = e.layoutConfig) === null || _e === void 0 ? void 0 : _e.margin) === null || _f === void 0 ? void 0 : _f.bottom) || 0)); e.view.style.marginBottom = toPixelString((idx === this.childNodes.length - 1) ? bottomMargin : this.space + bottomMargin);
e.view.style.marginLeft = toPixelString(((_h = (_g = e.layoutConfig) === null || _g === void 0 ? void 0 : _g.margin) === null || _h === void 0 ? void 0 : _h.left) || 0); e.view.style.marginLeft = toPixelString(((_h = (_g = e.layoutConfig) === null || _g === void 0 ? void 0 : _g.margin) === null || _h === void 0 ? void 0 : _h.left) || 0);
e.view.style.marginRight = toPixelString(((_k = (_j = e.layoutConfig) === null || _j === void 0 ? void 0 : _j.margin) === null || _k === void 0 ? void 0 : _k.right) || 0); e.view.style.marginRight = toPixelString(((_k = (_j = e.layoutConfig) === null || _j === void 0 ? void 0 : _j.margin) === null || _k === void 0 ? void 0 : _k.right) || 0);
if ((e.layoutConfig.alignment & LEFT) === LEFT) { if ((e.layoutConfig.alignment & LEFT) === LEFT) {
@ -7178,8 +7178,8 @@ var doric_web = (function (exports, axios, sandbox) {
e.view.style.flex = `${(_b = e.layoutConfig) === null || _b === void 0 ? void 0 : _b.weight}`; e.view.style.flex = `${(_b = e.layoutConfig) === null || _b === void 0 ? void 0 : _b.weight}`;
} }
e.view.style.marginLeft = toPixelString(((_d = (_c = e.layoutConfig) === null || _c === void 0 ? void 0 : _c.margin) === null || _d === void 0 ? void 0 : _d.left) || 0); e.view.style.marginLeft = toPixelString(((_d = (_c = e.layoutConfig) === null || _c === void 0 ? void 0 : _c.margin) === null || _d === void 0 ? void 0 : _d.left) || 0);
e.view.style.marginRight = toPixelString((idx === this.childNodes.length - 1) ? 0 : this.space const rightMargin = ((_f = (_e = e.layoutConfig) === null || _e === void 0 ? void 0 : _e.margin) === null || _f === void 0 ? void 0 : _f.right) || 0;
+ (((_f = (_e = e.layoutConfig) === null || _e === void 0 ? void 0 : _e.margin) === null || _f === void 0 ? void 0 : _f.right) || 0)); e.view.style.marginRight = toPixelString((idx === this.childNodes.length - 1) ? rightMargin : this.space + rightMargin);
e.view.style.marginTop = toPixelString(((_h = (_g = e.layoutConfig) === null || _g === void 0 ? void 0 : _g.margin) === null || _h === void 0 ? void 0 : _h.top) || 0); e.view.style.marginTop = toPixelString(((_h = (_g = e.layoutConfig) === null || _g === void 0 ? void 0 : _g.margin) === null || _h === void 0 ? void 0 : _h.top) || 0);
e.view.style.marginBottom = toPixelString(((_k = (_j = e.layoutConfig) === null || _j === void 0 ? void 0 : _j.margin) === null || _k === void 0 ? void 0 : _k.bottom) || 0); e.view.style.marginBottom = toPixelString(((_k = (_j = e.layoutConfig) === null || _j === void 0 ? void 0 : _j.margin) === null || _k === void 0 ? void 0 : _k.bottom) || 0);
if ((e.layoutConfig.alignment & TOP) === TOP) { if ((e.layoutConfig.alignment & TOP) === TOP) {

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

File diff suppressed because one or more lines are too long

4
doric-web/src/shader/DoricHLayoutNode.ts
View File

@ -43,9 +43,9 @@ export class DoricHLayoutNode extends DoricGroupViewNode {
e.view.style.flex = `${e.layoutConfig?.weight}` e.view.style.flex = `${e.layoutConfig?.weight}`
} }
e.view.style.marginLeft = toPixelString(e.layoutConfig?.margin?.left || 0) e.view.style.marginLeft = toPixelString(e.layoutConfig?.margin?.left || 0)
const rightMargin = e.layoutConfig?.margin?.right || 0
e.view.style.marginRight = toPixelString( e.view.style.marginRight = toPixelString(
(idx === this.childNodes.length - 1) ? 0 : this.space (idx === this.childNodes.length - 1) ? rightMargin : this.space + rightMargin)
+ (e.layoutConfig?.margin?.right || 0))
e.view.style.marginTop = toPixelString(e.layoutConfig?.margin?.top || 0) e.view.style.marginTop = toPixelString(e.layoutConfig?.margin?.top || 0)
e.view.style.marginBottom = toPixelString(e.layoutConfig?.margin?.bottom || 0) e.view.style.marginBottom = toPixelString(e.layoutConfig?.margin?.bottom || 0)
if ((e.layoutConfig.alignment & TOP) === TOP) { if ((e.layoutConfig.alignment & TOP) === TOP) {

4
doric-web/src/shader/DoricVLayoutNode.ts
View File

@ -43,9 +43,9 @@ export class DoricVLayoutNode extends DoricGroupViewNode {
e.view.style.flex = `${e.layoutConfig?.weight}` e.view.style.flex = `${e.layoutConfig?.weight}`
} }
e.view.style.marginTop = toPixelString(e.layoutConfig?.margin?.top || 0) e.view.style.marginTop = toPixelString(e.layoutConfig?.margin?.top || 0)
const bottomMargin = e.layoutConfig?.margin?.bottom || 0
e.view.style.marginBottom = toPixelString( e.view.style.marginBottom = toPixelString(
(idx === this.childNodes.length - 1) ? 0 : this.space (idx === this.childNodes.length - 1) ? bottomMargin: this.space + bottomMargin)
+ (e.layoutConfig?.margin?.bottom || 0))
e.view.style.marginLeft = toPixelString(e.layoutConfig?.margin?.left || 0) e.view.style.marginLeft = toPixelString(e.layoutConfig?.margin?.left || 0)
e.view.style.marginRight = toPixelString(e.layoutConfig?.margin?.right || 0) e.view.style.marginRight = toPixelString(e.layoutConfig?.margin?.right || 0)
if ((e.layoutConfig.alignment & LEFT) === LEFT) { if ((e.layoutConfig.alignment & LEFT) === LEFT) {