@flashist/appframework 0.0.328 → 0.0.330
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/display/views/layout/AlignWithMaxSizeLayout.js +1 -1
- package/display/views/layout/AlignWithMaxSizeLayout.js.map +1 -1
- package/display/views/layout/BaseLayout.d.ts +1 -0
- package/display/views/layout/BaseLayout.js +7 -1
- package/display/views/layout/BaseLayout.js.map +1 -1
- package/display/views/layout/ColumnLayout.js +2 -2
- package/display/views/layout/ColumnLayout.js.map +1 -1
- package/display/views/layout/LayoutConfig.d.ts +1 -0
- package/display/views/layout/LayoutConfig.js +1 -0
- package/display/views/layout/LayoutConfig.js.map +1 -1
- package/display/views/layout/MultiColumnLayout.js +1 -1
- package/display/views/layout/MultiColumnLayout.js.map +1 -1
- package/display/views/layout/RowLayout.js +2 -2
- package/display/views/layout/RowLayout.js.map +1 -1
- package/package.json +1 -1
|
@@ -15,7 +15,7 @@ export class AlignWithMaxSizeLayout extends BaseLayout {
|
|
|
15
15
|
//
|
|
16
16
|
let childrenCount = container.layoutGetChildrenNum();
|
|
17
17
|
for (let childIndex = 0; childIndex < childrenCount; childIndex++) {
|
|
18
|
-
tempChild =
|
|
18
|
+
tempChild = this.getChildAt(container, childIndex);
|
|
19
19
|
tempChildSize = GetSizeTools.getObjectSize(tempChild);
|
|
20
20
|
this.arrangeChild(tempChild, prevChild, this.settings.align, this.settings.valign, childMaxSize, 0, 0);
|
|
21
21
|
prevChild = tempChild;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AlignWithMaxSizeLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/AlignWithMaxSizeLayout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGxD,MAAM,OAAO,sBAAuB,SAAQ,UAAU;IAE3C,OAAO,CAAC,SAA+B;QAE1C,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,kCAAkC,EAAE,gCAAgC,CAAC,CAAC;YACjF,OAAO;QACX,CAAC;QAED,IAAI,SAA2B,CAAC;QAChC,IAAI,aAAoB,CAAC;QAEzB,IAAI,YAAY,GAAU,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1D,IAAI,SAA2B,CAAC;QAChC,EAAE;QACF,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,KAAK,IAAI,UAAU,GAAW,CAAC,EAAE,UAAU,GAAG,aAAa,EAAE,UAAU,EAAE,EAAE,CAAC;YACxE,SAAS,GAAG,
|
|
1
|
+
{"version":3,"file":"AlignWithMaxSizeLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/AlignWithMaxSizeLayout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGxD,MAAM,OAAO,sBAAuB,SAAQ,UAAU;IAE3C,OAAO,CAAC,SAA+B;QAE1C,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,kCAAkC,EAAE,gCAAgC,CAAC,CAAC;YACjF,OAAO;QACX,CAAC;QAED,IAAI,SAA2B,CAAC;QAChC,IAAI,aAAoB,CAAC;QAEzB,IAAI,YAAY,GAAU,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1D,IAAI,SAA2B,CAAC;QAChC,EAAE;QACF,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,KAAK,IAAI,UAAU,GAAW,CAAC,EAAE,UAAU,GAAG,aAAa,EAAE,UAAU,EAAE,EAAE,CAAC;YACxE,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAEnD,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAEtD,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAEvG,SAAS,GAAG,SAAS,CAAC;QAC1B,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAES,6BAA6B,CAAC,SAA+B,EAAE,YAAoB,EAAE,SAAiB;QAC5G,IAAI,YAAY,GAAU,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAC1D,IAAI,MAAM,GAAU,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;QAE9D,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,2BAA2B,CAAC,SAA+B;QAC9D,IAAI,MAAM,GAAU,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACpC,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}
|
|
@@ -12,6 +12,7 @@ export declare abstract class BaseLayout {
|
|
|
12
12
|
constructor(settings?: Partial<LayoutConfig>);
|
|
13
13
|
abstract arrange(container: ILayoutableContainer): void;
|
|
14
14
|
getMaxChildSize(container: ILayoutableContainer): Point;
|
|
15
|
+
protected getChildAt(container: ILayoutableContainer, childIndex: number): ILayoutableChild;
|
|
15
16
|
protected arrangeChild(child: ILayoutableChild, prevChild: ILayoutableChild, align: String, valign: String, childMaxSize: Point, columnIndex?: number, rowIndex?: number, cellShift?: Point): void;
|
|
16
17
|
protected applyChildPosition(child: ILayoutableChild, x: number, y: number): void;
|
|
17
18
|
abstract findRealRowsAndColumnsCount(container: ILayoutableContainer): Point;
|
|
@@ -19,7 +19,7 @@ export class BaseLayout {
|
|
|
19
19
|
var tempChild;
|
|
20
20
|
var tempChildSize;
|
|
21
21
|
for (var childIndex = 0; childIndex < childrenCount; childIndex++) {
|
|
22
|
-
tempChild =
|
|
22
|
+
tempChild = this.getChildAt(container, childIndex);
|
|
23
23
|
tempChildSize = GetSizeTools.getObjectSize(tempChild);
|
|
24
24
|
if (tempChildSize.x > result.x) {
|
|
25
25
|
result.x = tempChildSize.x;
|
|
@@ -30,6 +30,12 @@ export class BaseLayout {
|
|
|
30
30
|
}
|
|
31
31
|
return result;
|
|
32
32
|
}
|
|
33
|
+
getChildAt(container, childIndex) {
|
|
34
|
+
if (this.settings.reverseOrder) {
|
|
35
|
+
childIndex = container.layoutGetChildrenNum() - childIndex - 1;
|
|
36
|
+
}
|
|
37
|
+
return container.layoutGetChildAt(childIndex);
|
|
38
|
+
}
|
|
33
39
|
arrangeChild(child, prevChild, align, valign, childMaxSize, columnIndex = 0, rowIndex = 0, cellShift = null) {
|
|
34
40
|
var tempChildSize = GetSizeTools.getObjectSize(child);
|
|
35
41
|
var newChildPos = new Point();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/BaseLayout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/BaseLayout.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ export class ColumnLayout extends BaseLayout {
|
|
|
27
27
|
//
|
|
28
28
|
var childrenCount = container.layoutGetChildrenNum();
|
|
29
29
|
for (var childIndex = 0; childIndex < childrenCount; childIndex++) {
|
|
30
|
-
tempChild =
|
|
30
|
+
tempChild = this.getChildAt(container, childIndex);
|
|
31
31
|
tempChildSize = GetSizeTools.getObjectSize(tempChild);
|
|
32
32
|
this.arrangeChild(tempChild, prevChild, this.settings.align, this.settings.valign, childMaxSize, 0, childIndex);
|
|
33
33
|
// Запоминаем данные о текущем элементе
|
|
@@ -68,7 +68,7 @@ export class ColumnLayout extends BaseLayout {
|
|
|
68
68
|
// не на основе максимального размера, а на положения и размера последнего элемента
|
|
69
69
|
var childrenCount = container.layoutGetChildrenNum();
|
|
70
70
|
if (childrenCount > 0) {
|
|
71
|
-
var lastChild =
|
|
71
|
+
var lastChild = this.getChildAt(container, childrenCount - 1);
|
|
72
72
|
if (lastChild) {
|
|
73
73
|
var lastChildSize = GetSizeTools.getObjectSize(lastChild);
|
|
74
74
|
this._totalSize.y = lastChild.y + lastChildSize.y + this.settings.paddingY;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ColumnLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/ColumnLayout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGxD;;;GAGG;AACH,MAAM,OAAO,YAAa,SAAQ,UAAU;IAExC;;;;OAIG;IACI,OAAO,CAAC,SAA+B;QAE1C,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,gCAAgC,CAAC,CAAC;YACvE,OAAO;QACX,CAAC;QAED,IAAI,SAA2B,CAAC;QAChC,sCAAsC;QACtC,IAAI,aAAoB,CAAC;QAGzB,IAAI,YAAY,GAAU,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1D,EAAE;QACF,IAAI,SAA2B,CAAC;QAChC,IAAI,aAAoB,CAAC;QACzB,EAAE;QACF,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,KAAK,IAAI,UAAU,GAAW,CAAC,EAAE,UAAU,GAAG,aAAa,EAAE,UAAU,EAAE,EAAE,CAAC;YACxE,SAAS,GAAG,
|
|
1
|
+
{"version":3,"file":"ColumnLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/ColumnLayout.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LayoutConfig.js","sourceRoot":"","sources":["../../../../src/display/views/layout/LayoutConfig.ts"],"names":[],"mappings":"AACA,MAAM,OAAO,YAAY;IAAzB;QAEI,aAAQ,GAAW,CAAC,CAAC;QACrB,aAAQ,GAAW,CAAC,CAAC;QAErB,aAAQ,GAAW,CAAC,CAAC;QACrB,aAAQ,GAAW,CAAC,CAAC;QAErB,UAAK,GAAW,EAAE,CAAC;QACnB,WAAM,GAAW,EAAE,CAAC;QAEpB,2BAAsB,GAAY,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"LayoutConfig.js","sourceRoot":"","sources":["../../../../src/display/views/layout/LayoutConfig.ts"],"names":[],"mappings":"AACA,MAAM,OAAO,YAAY;IAAzB;QAEI,aAAQ,GAAW,CAAC,CAAC;QACrB,aAAQ,GAAW,CAAC,CAAC;QAErB,aAAQ,GAAW,CAAC,CAAC;QACrB,aAAQ,GAAW,CAAC,CAAC;QAErB,UAAK,GAAW,EAAE,CAAC;QACnB,WAAM,GAAW,EAAE,CAAC;QAEpB,2BAAsB,GAAY,IAAI,CAAC;QAEvC,iBAAY,GAAY,KAAK,CAAC;IAElC,CAAC;CAAA"}
|
|
@@ -19,7 +19,7 @@ export class MultiColumnLayout extends BaseLayout {
|
|
|
19
19
|
var prevChild;
|
|
20
20
|
var childrenCount = container.layoutGetChildrenNum();
|
|
21
21
|
for (var childIndex = 0; childIndex < childrenCount; childIndex++) {
|
|
22
|
-
tempChild =
|
|
22
|
+
tempChild = this.getChildAt(container, childIndex);
|
|
23
23
|
let colIndex = childIndex % this.settings.columnsCount;
|
|
24
24
|
let rowIndex = Math.floor(childIndex / this.settings.columnsCount);
|
|
25
25
|
this.arrangeChild(tempChild, prevChild, this.settings.align, this.settings.valign, childMaxSize, colIndex, rowIndex);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiColumnLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/MultiColumnLayout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C;;;GAGG;AACH,MAAM,OAAO,iBAAkB,SAAQ,UAAU;IAI7C,YAAY,QAA0C;QAClD,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpB,CAAC;IAEM,OAAO,CAAC,SAA+B;QAE1C,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,gCAAgC,CAAC,CAAC;YACvE,OAAO;QACX,CAAC;QAED,IAAI,SAA2B,CAAC;QAChC,IAAI,YAAY,GAAU,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1D,IAAI,SAA2B,CAAC;QAChC,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,KAAK,IAAI,UAAU,GAAW,CAAC,EAAE,UAAU,GAAG,aAAa,EAAE,UAAU,EAAE,EAAE,CAAC;YACxE,SAAS,GAAG,
|
|
1
|
+
{"version":3,"file":"MultiColumnLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/MultiColumnLayout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C;;;GAGG;AACH,MAAM,OAAO,iBAAkB,SAAQ,UAAU;IAI7C,YAAY,QAA0C;QAClD,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpB,CAAC;IAEM,OAAO,CAAC,SAA+B;QAE1C,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,gCAAgC,CAAC,CAAC;YACvE,OAAO;QACX,CAAC;QAED,IAAI,SAA2B,CAAC;QAChC,IAAI,YAAY,GAAU,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1D,IAAI,SAA2B,CAAC;QAChC,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,KAAK,IAAI,UAAU,GAAW,CAAC,EAAE,UAAU,GAAG,aAAa,EAAE,UAAU,EAAE,EAAE,CAAC;YACxE,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAEnD,IAAI,QAAQ,GAAW,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC/D,IAAI,QAAQ,GAAW,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAE3E,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAErH,SAAS,GAAG,SAAS,CAAC;QAC1B,CAAC;QAGD,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAEM,2BAA2B,CAAC,SAA+B;QAC9D,IAAI,MAAM,GAAU,IAAI,KAAK,EAAE,CAAC;QAEhC,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;QACtC,MAAM,CAAC,CAAC,GAAG,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;QAEtD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}
|
|
@@ -23,7 +23,7 @@ export class RowLayout extends BaseLayout {
|
|
|
23
23
|
//
|
|
24
24
|
var childrenCount = container.layoutGetChildrenNum();
|
|
25
25
|
for (var childIndex = 0; childIndex < childrenCount; childIndex++) {
|
|
26
|
-
tempChild =
|
|
26
|
+
tempChild = this.getChildAt(container, childIndex);
|
|
27
27
|
tempChildSize = GetSizeTools.getObjectSize(tempChild);
|
|
28
28
|
this.arrangeChild(tempChild, prevChild, this.settings.align, this.settings.valign, childMaxSize, childIndex);
|
|
29
29
|
// Запоминаем данные о текущем элементе
|
|
@@ -64,7 +64,7 @@ export class RowLayout extends BaseLayout {
|
|
|
64
64
|
// не на основе максимального размера, а на положения и размера последнего элемента
|
|
65
65
|
var childrenCount = container.layoutGetChildrenNum();
|
|
66
66
|
if (childrenCount > 0) {
|
|
67
|
-
var lastChild =
|
|
67
|
+
var lastChild = this.getChildAt(container, childrenCount - 1);
|
|
68
68
|
if (lastChild) {
|
|
69
69
|
var lastChildSize = GetSizeTools.getObjectSize(lastChild);
|
|
70
70
|
this._totalSize.x = lastChild.x + lastChildSize.x + this.settings.paddingX;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RowLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/RowLayout.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"RowLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/RowLayout.ts"],"names":[],"mappings":"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"}
|