@crystaldesign/web-planner-logic 26.5.0-beta.5 → 26.5.0-beta.51
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/build/cjs/{DivaBoxPlanner-d378bbb7.js → DivaBoxPlanner-a83ddf2d.js} +100 -50
- package/build/cjs/{DivaStandardPlanner-4bab9fb6.js → DivaStandardPlanner-6839d35f.js} +2 -2
- package/build/cjs/{DoorPlanner-d492a9d9.js → DoorPlanner-d9d820b2.js} +1 -1
- package/build/cjs/{Host3DSignalR-e8e59f7a.js → Host3DSignalR-7a424c6f.js} +1 -1
- package/build/cjs/{LiviqueWWSHandler-9b3939c8.js → LiviqueWWSHandler-1b4c240f.js} +1 -1
- package/build/cjs/{PfisterWWSHandler-7eb044db.js → PfisterWWSHandler-bf4b2af0.js} +1 -1
- package/build/cjs/{PlannerHandler2D-89255bdd.js → PlannerHandler2D-4ef7a85f.js} +1 -1
- package/build/cjs/{SeriousBasketHandler-bbe6859a.js → SeriousBasketHandler-e4e0835e.js} +1 -1
- package/build/cjs/{ShelfPlanner-2a0fb19d.js → ShelfPlanner-c4449795.js} +1 -1
- package/build/cjs/{StandardWWSHandler-3391c7ed.js → StandardWWSHandler-7d3feb60.js} +1 -1
- package/build/cjs/{index-a8cd3c1d.js → index-9145fe80.js} +274 -262
- package/build/cjs/index.js +1 -1
- package/build/esm/{DivaBoxPlanner-21211eeb.js → DivaBoxPlanner-34141af8.js} +100 -50
- package/build/esm/{DivaStandardPlanner-95dd670c.js → DivaStandardPlanner-9e6ffa11.js} +2 -2
- package/build/esm/{DoorPlanner-56b674bf.js → DoorPlanner-ad6344a7.js} +1 -1
- package/build/esm/{Host3DSignalR-0c56c943.js → Host3DSignalR-baf9963c.js} +1 -1
- package/build/esm/{LiviqueWWSHandler-0f7a4bcb.js → LiviqueWWSHandler-56c4d1d2.js} +1 -1
- package/build/esm/{PfisterWWSHandler-7a25803c.js → PfisterWWSHandler-d0109020.js} +1 -1
- package/build/esm/{PlannerHandler2D-2df72989.js → PlannerHandler2D-ebe62b9b.js} +1 -1
- package/build/esm/{SeriousBasketHandler-6c14c04e.js → SeriousBasketHandler-29af6f6d.js} +1 -1
- package/build/esm/{ShelfPlanner-9c7ffe88.js → ShelfPlanner-7f73ac20.js} +1 -1
- package/build/esm/{StandardWWSHandler-3a3026aa.js → StandardWWSHandler-553bf27b.js} +1 -1
- package/build/esm/{index-79dd365f.js → index-66df82ca.js} +274 -262
- package/build/esm/index.js +1 -1
- package/build/types/web-planner-logic/src/index.d.ts +1 -1
- package/build/types/web-planner-logic/src/index.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/interface/API/Checkout.d.ts +28 -1
- package/build/types/web-planner-logic/src/interface/API/Checkout.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/interface/API/ViewConfigDataType.d.ts +2 -0
- package/build/types/web-planner-logic/src/interface/API/ViewConfigDataType.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/interface/Articles/ArticleDataType.d.ts +1 -0
- package/build/types/web-planner-logic/src/interface/Articles/ArticleDataType.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/interface/CoreTypes/index.d.ts +3 -1
- package/build/types/web-planner-logic/src/interface/CoreTypes/index.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/interface/IDM/ArticleApi.d.ts +16 -0
- package/build/types/web-planner-logic/src/interface/IDM/ArticleApi.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/interface/OptionTypes/CatalogOptionDataTypes.d.ts +7 -0
- package/build/types/web-planner-logic/src/interface/OptionTypes/CatalogOptionDataTypes.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/interface/webPlannerParams/WebPlannerParamsType.d.ts +1 -1
- package/build/types/web-planner-logic/src/interface/webPlannerParams/WebPlannerParamsType.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Article/ArticleOptionState.d.ts +1 -1
- package/build/types/web-planner-logic/src/logic/Article/ArticleOptionState.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Article/DivaArticle.d.ts +1 -0
- package/build/types/web-planner-logic/src/logic/Article/DivaArticle.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Article/DivaArticleHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Article/Engine/DivaArticleEngine.d.ts +2 -0
- package/build/types/web-planner-logic/src/logic/Article/Engine/DivaArticleEngine.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Basket/DivaBasketHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/ConfigTree/DivaConfigTree.d.ts +1 -1
- package/build/types/web-planner-logic/src/logic/ConfigTree/DivaConfigTreeHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/DivaApiHandler.d.ts +9 -8
- package/build/types/web-planner-logic/src/logic/DivaApiHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/DivaWebPlanner.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Planner/BoxPlanner/BoxPlannerGrid.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Planner/BoxPlanner/ConstructionRulesHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Planner/BoxPlanner/DivaBoxPlanner.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/model/Articles/Article/DivaCatalogArticle.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/model/Articles/Article/IDMCatalogArticle.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/model/Catalog/DivaCatalogData.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/model/Catalog/IDMCatalogData.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/model/Options/ArticleOptionValueData.d.ts +1 -1
- package/build/types/web-planner-logic/src/model/Options/ArticleOptionValueData.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/model/Options/CatalogOptionValueData.d.ts +1 -1
- package/build/types/web-planner-logic/src/model/Options/CatalogOptionValueData.d.ts.map +1 -1
- package/package.json +2 -2
|
@@ -5,11 +5,11 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
|
5
5
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
6
6
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
7
7
|
var _regeneratorRuntime = require('@babel/runtime/regenerator');
|
|
8
|
-
var index = require('./index-
|
|
8
|
+
var index = require('./index-9145fe80.js');
|
|
9
9
|
var DivaUtils = require('@crystaldesign/diva-utils');
|
|
10
10
|
var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
|
|
11
11
|
var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
|
|
12
|
-
var PlannerHandler2D = require('./PlannerHandler2D-
|
|
12
|
+
var PlannerHandler2D = require('./PlannerHandler2D-4ef7a85f.js');
|
|
13
13
|
require('@babel/runtime/helpers/objectWithoutProperties');
|
|
14
14
|
require('axios');
|
|
15
15
|
require('@crystaldesign/basket-model');
|
|
@@ -2694,12 +2694,27 @@ var ConstructionRulesHandler = /*#__PURE__*/function () {
|
|
|
2694
2694
|
}, {
|
|
2695
2695
|
key: "correctFoot",
|
|
2696
2696
|
value: function correctFoot(boxPlannerGrid, optionHandler) {
|
|
2697
|
-
var
|
|
2697
|
+
var _bottomElements$map$f,
|
|
2698
|
+
_this3 = this;
|
|
2698
2699
|
var elements = boxPlannerGrid.getAllElementsInFrontGrid();
|
|
2700
|
+
var bottomElements = boxPlannerGrid.getAllElementsInRow(0, false);
|
|
2701
|
+
var selectedFootSystem = (_bottomElements$map$f = bottomElements.map(function (element) {
|
|
2702
|
+
return _this3.getOptionVal(element.ElementId, 'OPTFUSS_SYS', optionHandler);
|
|
2703
|
+
}).find(function (optionValue) {
|
|
2704
|
+
return optionValue !== '' && optionValue !== 'OPVOHNE';
|
|
2705
|
+
})) !== null && _bottomElements$map$f !== void 0 ? _bottomElements$map$f : bottomElements.map(function (element) {
|
|
2706
|
+
return _this3.getOptionVal(element.ElementId, 'OPTFUSS_SYS', optionHandler);
|
|
2707
|
+
}).find(function (optionValue) {
|
|
2708
|
+
return optionValue !== '';
|
|
2709
|
+
});
|
|
2699
2710
|
elements.forEach(function (e) {
|
|
2700
2711
|
if (boxPlannerGrid.getElementHasBottomElement(e.ElementId)) {
|
|
2701
2712
|
_this3.setOptionValue(e.ElementId, 'OPTFUSS_SYS', 'OPVOHNE', optionHandler);
|
|
2702
2713
|
_this3.setOptionValue(e.ElementId, 'OPTPOSSIBILITY_FUSS_OHNE', 'OPVTRUE', optionHandler);
|
|
2714
|
+
} else {
|
|
2715
|
+
if (selectedFootSystem) {
|
|
2716
|
+
_this3.setOptionValue(e.ElementId, 'OPTFUSS_SYS', selectedFootSystem, optionHandler);
|
|
2717
|
+
}
|
|
2703
2718
|
}
|
|
2704
2719
|
});
|
|
2705
2720
|
}
|
|
@@ -3201,7 +3216,7 @@ var ConstructionRulesHandler = /*#__PURE__*/function () {
|
|
|
3201
3216
|
value: function () {
|
|
3202
3217
|
var _updateOptionLogicBoxPlanner = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(boxPlannerGrid, changedOPTs, targetElements, forceResetCornerElements) {
|
|
3203
3218
|
var _targetElements;
|
|
3204
|
-
var startTime, resultMessage, optionHandler, allElements, i, j, _boxPlannerGrid$getPl2, elementId, _boxPlannerGrid$getPl3, _elementId, _iterator, _step, coverPlateRule, _boxPlannerGrid$getPl4, _elementId2
|
|
3219
|
+
var startTime, resultMessage, optionHandler, allElements, i, j, _boxPlannerGrid$getPl2, elementId, _boxPlannerGrid$getPl3, _elementId, doChangeRetailArticleNumbers, _iterator, _step, coverPlateRule, _boxPlannerGrid$getPl4, _elementId2;
|
|
3205
3220
|
return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
|
|
3206
3221
|
while (1) switch (_context.prev = _context.next) {
|
|
3207
3222
|
case 0:
|
|
@@ -3318,6 +3333,13 @@ var ConstructionRulesHandler = /*#__PURE__*/function () {
|
|
|
3318
3333
|
this.correctOverHangingElement((_targetElements = targetElements) === null || _targetElements === void 0 ? void 0 : _targetElements[0], boxPlannerGrid, optionHandler, changedOPTs);
|
|
3319
3334
|
this.partlistHelper.calculateKnots(boxPlannerGrid, optionHandler);
|
|
3320
3335
|
this.partlistHelper.calculateRahmen(boxPlannerGrid, optionHandler);
|
|
3336
|
+
|
|
3337
|
+
// update height after we corrected the foot since we need the correct one for the CoverPlate calc
|
|
3338
|
+
doChangeRetailArticleNumbers = this.doChangeRetailArticleNumbers(boxPlannerGrid, optionHandler);
|
|
3339
|
+
_context.next = 56;
|
|
3340
|
+
return this.updateCfgValuesByPlanner(optionHandler, undefined, this.constructionRules.partlistRules.bundleRules, doChangeRetailArticleNumbers);
|
|
3341
|
+
case 56:
|
|
3342
|
+
this.updateGridElementDimensions();
|
|
3321
3343
|
if (this.constructionRules.coverPlateRule) {
|
|
3322
3344
|
_iterator = _createForOfIteratorHelper$1(this.constructionRules.coverPlateRule);
|
|
3323
3345
|
try {
|
|
@@ -3332,44 +3354,44 @@ var ConstructionRulesHandler = /*#__PURE__*/function () {
|
|
|
3332
3354
|
}
|
|
3333
3355
|
}
|
|
3334
3356
|
i = 0;
|
|
3335
|
-
case
|
|
3357
|
+
case 59:
|
|
3336
3358
|
if (!(i < boxPlannerGrid.getColumnCount())) {
|
|
3337
|
-
_context.next =
|
|
3359
|
+
_context.next = 72;
|
|
3338
3360
|
break;
|
|
3339
3361
|
}
|
|
3340
3362
|
j = 0;
|
|
3341
|
-
case
|
|
3363
|
+
case 61:
|
|
3342
3364
|
if (!(j < boxPlannerGrid.getRowCount(i, false))) {
|
|
3343
|
-
_context.next =
|
|
3365
|
+
_context.next = 69;
|
|
3344
3366
|
break;
|
|
3345
3367
|
}
|
|
3346
3368
|
_elementId2 = (_boxPlannerGrid$getPl4 = boxPlannerGrid.getPlannerElementAtGridPos(i, j, false)) === null || _boxPlannerGrid$getPl4 === void 0 ? void 0 : _boxPlannerGrid$getPl4.getElementId();
|
|
3347
3369
|
if (_elementId2) {
|
|
3348
|
-
_context.next =
|
|
3370
|
+
_context.next = 65;
|
|
3349
3371
|
break;
|
|
3350
3372
|
}
|
|
3351
|
-
return _context.abrupt("continue",
|
|
3352
|
-
case
|
|
3373
|
+
return _context.abrupt("continue", 66);
|
|
3374
|
+
case 65:
|
|
3353
3375
|
this.correctBack(boxPlannerGrid, optionHandler, _elementId2);
|
|
3354
|
-
case
|
|
3376
|
+
case 66:
|
|
3355
3377
|
j++;
|
|
3356
|
-
_context.next =
|
|
3378
|
+
_context.next = 61;
|
|
3357
3379
|
break;
|
|
3358
|
-
case
|
|
3380
|
+
case 69:
|
|
3359
3381
|
i++;
|
|
3360
|
-
_context.next =
|
|
3382
|
+
_context.next = 59;
|
|
3361
3383
|
break;
|
|
3362
|
-
case
|
|
3384
|
+
case 72:
|
|
3363
3385
|
doChangeRetailArticleNumbers = this.doChangeRetailArticleNumbers(boxPlannerGrid, optionHandler);
|
|
3364
|
-
_context.next =
|
|
3386
|
+
_context.next = 75;
|
|
3365
3387
|
return this.updateCfgValuesByPlanner(optionHandler, undefined, this.constructionRules.partlistRules.bundleRules, doChangeRetailArticleNumbers);
|
|
3366
|
-
case
|
|
3388
|
+
case 75:
|
|
3367
3389
|
this.updateIDMSpecificFeatures();
|
|
3368
3390
|
this.updateGridElementDimensions();
|
|
3369
3391
|
LOG$2.debug('BoxPlanner updateOptionLogic - Duration after setting Option Values of all Articles: ' + (new Date().getTime() - startTime));
|
|
3370
3392
|
LOG$2.debug('BoxPlanner updateOptionLogic - Duration after setting updating configurator: ' + (new Date().getTime() - startTime));
|
|
3371
3393
|
return _context.abrupt("return", resultMessage);
|
|
3372
|
-
case
|
|
3394
|
+
case 80:
|
|
3373
3395
|
case "end":
|
|
3374
3396
|
return _context.stop();
|
|
3375
3397
|
}
|
|
@@ -3633,22 +3655,31 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
|
|
|
3633
3655
|
if (curGrid[cell.index.x].length == 0) curGrid.splice(cell.index.x, 1);
|
|
3634
3656
|
});
|
|
3635
3657
|
var refreshedGrid = [];
|
|
3658
|
+
var elementAreaById = new Map();
|
|
3636
3659
|
curGrid.forEach(function (row, x) {
|
|
3637
3660
|
refreshedGrid[x] = [];
|
|
3638
3661
|
row.forEach(function (column, y) {
|
|
3639
|
-
var
|
|
3662
|
+
var plannedElement = column.plannedElement;
|
|
3663
|
+
var elementId = plannedElement.elementId;
|
|
3664
|
+
var areaSpanX = plannedElement.area.toX - plannedElement.area.fromX;
|
|
3665
|
+
var areaSpanY = plannedElement.area.toY - plannedElement.area.fromY;
|
|
3666
|
+
var refreshedArea = elementAreaById.get(elementId);
|
|
3667
|
+
if (!refreshedArea) {
|
|
3668
|
+
refreshedArea = {
|
|
3669
|
+
fromX: x,
|
|
3670
|
+
fromY: y,
|
|
3671
|
+
toX: x + areaSpanX,
|
|
3672
|
+
toY: y + areaSpanY
|
|
3673
|
+
};
|
|
3674
|
+
elementAreaById.set(elementId, refreshedArea);
|
|
3675
|
+
}
|
|
3640
3676
|
refreshedGrid[x][y] = {
|
|
3641
3677
|
index: {
|
|
3642
3678
|
x: x,
|
|
3643
3679
|
y: y
|
|
3644
3680
|
},
|
|
3645
|
-
plannedElement: _objectSpread(_objectSpread({},
|
|
3646
|
-
area:
|
|
3647
|
-
fromX: x,
|
|
3648
|
-
fromY: y,
|
|
3649
|
-
toX: x + (area.toX - area.fromX),
|
|
3650
|
-
toY: y + (area.toY - area.fromY)
|
|
3651
|
-
}
|
|
3681
|
+
plannedElement: _objectSpread(_objectSpread({}, plannedElement), {}, {
|
|
3682
|
+
area: refreshedArea
|
|
3652
3683
|
})
|
|
3653
3684
|
};
|
|
3654
3685
|
});
|
|
@@ -4185,7 +4216,10 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
|
|
|
4185
4216
|
var endHeight = 0;
|
|
4186
4217
|
for (var y = 0; y < currentRow.length;) {
|
|
4187
4218
|
var cell = currentRow[y];
|
|
4188
|
-
if (!cell || !cell.plannedElement)
|
|
4219
|
+
if (!cell || !cell.plannedElement) {
|
|
4220
|
+
y += 1;
|
|
4221
|
+
continue;
|
|
4222
|
+
}
|
|
4189
4223
|
if (cell.index.y < res.startRowIndex) startHeight = Math.round((startHeight + cell.plannedElement.size.height) * 1000) / 1000;
|
|
4190
4224
|
if (cell.index.y < res.endRowIndex) endHeight = Math.round((endHeight + cell.plannedElement.size.height) * 1000) / 1000;
|
|
4191
4225
|
y = cell.plannedElement.area.toY;
|
|
@@ -4197,12 +4231,15 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
|
|
|
4197
4231
|
// only clean neighbours (for docking) add property if you also need clean ones
|
|
4198
4232
|
|
|
4199
4233
|
for (var x = plannedElement.area.toX; x < curGrid.length;) {
|
|
4200
|
-
var _neighbourRow$0$plann, _neighbourRow
|
|
4234
|
+
var _neighbourRow$0$plann, _neighbourRow$;
|
|
4201
4235
|
var neighbourRow = curGrid[x];
|
|
4202
4236
|
for (var _y = 0; _y < (neighbourRow === null || neighbourRow === void 0 ? void 0 : neighbourRow.length);) {
|
|
4203
4237
|
var _cell5$plannedElement, _cell5$plannedElement2;
|
|
4204
4238
|
var _cell5 = neighbourRow[_y];
|
|
4205
|
-
if (!_cell5 || neighbours.includes(_cell5))
|
|
4239
|
+
if (!_cell5 || neighbours.includes(_cell5)) {
|
|
4240
|
+
_y += 1;
|
|
4241
|
+
continue;
|
|
4242
|
+
}
|
|
4206
4243
|
|
|
4207
4244
|
// cubo has ladders that cause the first box to range all to the top, therefore the height computation won't work
|
|
4208
4245
|
if (plannedElement.area.fromY == _y && this.gridSetupParams.forceSingleCellPerElement && plannedElement.area.toX == x) neighbours.push(_cell5);else if (clean && !this.gridSetupParams.forceSingleCellPerElement && neighbourSize == startHeight) neighbours.push(_cell5);else if (!clean && neighbourSize >= startHeight && neighbourSize <= endHeight) neighbours.push(_cell5);
|
|
@@ -4210,7 +4247,7 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
|
|
|
4210
4247
|
_y = (_cell5$plannedElement = (_cell5$plannedElement2 = _cell5.plannedElement) === null || _cell5$plannedElement2 === void 0 ? void 0 : _cell5$plannedElement2.area.toY) !== null && _cell5$plannedElement !== void 0 ? _cell5$plannedElement : _y + 1;
|
|
4211
4248
|
}
|
|
4212
4249
|
neighbourSize = 0;
|
|
4213
|
-
x = (_neighbourRow$0$plann = (_neighbourRow$
|
|
4250
|
+
x = (_neighbourRow$0$plann = (_neighbourRow$ = neighbourRow[0]) === null || _neighbourRow$ === void 0 || (_neighbourRow$ = _neighbourRow$.plannedElement) === null || _neighbourRow$ === void 0 ? void 0 : _neighbourRow$.area.toX) !== null && _neighbourRow$0$plann !== void 0 ? _neighbourRow$0$plann : x + 1;
|
|
4214
4251
|
}
|
|
4215
4252
|
neighbours.forEach(function (n) {
|
|
4216
4253
|
return !result.find(function (r) {
|
|
@@ -4220,17 +4257,21 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
|
|
|
4220
4257
|
break;
|
|
4221
4258
|
case 'LEFT':
|
|
4222
4259
|
for (var _x2 = plannedElement.area.fromX - 1; _x2 >= 0;) {
|
|
4260
|
+
var _neighbourRow$2;
|
|
4223
4261
|
var _neighbourRow = curGrid[_x2];
|
|
4224
4262
|
for (var _y2 = 0; _y2 < (_neighbourRow === null || _neighbourRow === void 0 ? void 0 : _neighbourRow.length);) {
|
|
4225
4263
|
var _cell6$plannedElement, _cell6$plannedElement2;
|
|
4226
4264
|
var _cell6 = _neighbourRow[_y2];
|
|
4227
|
-
if (!_cell6 || neighbours.includes(_cell6))
|
|
4265
|
+
if (!_cell6 || neighbours.includes(_cell6)) {
|
|
4266
|
+
_y2 += 1;
|
|
4267
|
+
continue;
|
|
4268
|
+
}
|
|
4228
4269
|
if (plannedElement.area.fromY == _y2 && this.gridSetupParams.forceSingleCellPerElement && plannedElement.area.fromX - 1 == _x2) neighbours.push(_cell6);else if (clean && !this.gridSetupParams.forceSingleCellPerElement && neighbourSize == startHeight) neighbours.push(_cell6);else if (!clean && neighbourSize >= startHeight && neighbourSize <= endHeight) neighbours.push(_cell6);
|
|
4229
4270
|
neighbourSize = Math.round((neighbourSize + _cell6.plannedElement.size.height) * 1000) / 1000;
|
|
4230
4271
|
_y2 = (_cell6$plannedElement = (_cell6$plannedElement2 = _cell6.plannedElement) === null || _cell6$plannedElement2 === void 0 ? void 0 : _cell6$plannedElement2.area.toY) !== null && _cell6$plannedElement !== void 0 ? _cell6$plannedElement : _y2 + 1;
|
|
4231
4272
|
}
|
|
4232
4273
|
neighbourSize = 0;
|
|
4233
|
-
_x2 = _neighbourRow[0].plannedElement ? _neighbourRow[0].plannedElement.area.fromX - 1 : _x2 + 1;
|
|
4274
|
+
_x2 = (_neighbourRow$2 = _neighbourRow[0]) !== null && _neighbourRow$2 !== void 0 && _neighbourRow$2.plannedElement ? _neighbourRow[0].plannedElement.area.fromX - 1 : _x2 + 1;
|
|
4234
4275
|
}
|
|
4235
4276
|
neighbours.forEach(function (n) {
|
|
4236
4277
|
return !result.find(function (r) {
|
|
@@ -4435,7 +4476,7 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
|
|
|
4435
4476
|
//columns and rows are swapped don't ask me why
|
|
4436
4477
|
var element = curPos.cells[0].plannedElement;
|
|
4437
4478
|
var index = {
|
|
4438
|
-
x: dir == 'LEFT' ? curPos.startColIndex : curPos.endColIndex
|
|
4479
|
+
x: dir == 'LEFT' ? curPos.startColIndex - 1 : curPos.endColIndex,
|
|
4439
4480
|
y: curPos.startRowIndex
|
|
4440
4481
|
};
|
|
4441
4482
|
var curGrid = curPos.backside ? this.generalPlanningState.grids[1].matrix : this.generalPlanningState.grids[0].matrix;
|
|
@@ -4447,9 +4488,21 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
|
|
|
4447
4488
|
fromX: element.area.fromX + d,
|
|
4448
4489
|
toX: element.area.toX + d
|
|
4449
4490
|
});
|
|
4491
|
+
|
|
4492
|
+
// Neighbor column left/right of the copy (where support width is checked). At the grid edge that column does not exist
|
|
4493
|
+
// (LEFT: startColIndex === 0 → index.x === -1; RIGHT: endColIndex === curGrid.length → past last column).
|
|
4494
|
+
// Then scan along an in-grid column of this element so we still collect the full vertical stack to copy.
|
|
4495
|
+
var supportColX = index.x;
|
|
4496
|
+
if (!curGrid[supportColX]) {
|
|
4497
|
+
supportColX = dir === 'LEFT' ? curPos.startColIndex : curPos.endColIndex - 1;
|
|
4498
|
+
}
|
|
4450
4499
|
var _loop = function _loop(_y3) {
|
|
4451
|
-
var _curGrid$
|
|
4452
|
-
|
|
4500
|
+
var _curGrid$supportColX$, _Width, _Width2;
|
|
4501
|
+
if (!curGrid[supportColX]) {
|
|
4502
|
+
y = _y3;
|
|
4503
|
+
return 0;
|
|
4504
|
+
} // break
|
|
4505
|
+
var supportElement = (_curGrid$supportColX$ = curGrid[supportColX][_y3]) === null || _curGrid$supportColX$ === void 0 ? void 0 : _curGrid$supportColX$.plannedElement;
|
|
4453
4506
|
if (!supportElement) {
|
|
4454
4507
|
y = _y3;
|
|
4455
4508
|
return 0;
|
|
@@ -4689,27 +4742,22 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
|
|
|
4689
4742
|
var curGrid = this.generalPlanningState.grids[0].matrix;
|
|
4690
4743
|
var cells = undefined;
|
|
4691
4744
|
if (absoluteIndex.x < 0 && absoluteIndex.y == 0) {
|
|
4692
|
-
var dir = deletedCells.endColIndex >= absoluteIndex.x;
|
|
4693
4745
|
if (deletedCells.startColIndex <= absoluteIndex.x) absoluteIndex.x -= deletedCells.endColIndex - deletedCells.startColIndex;
|
|
4694
4746
|
if (absoluteIndex.x < 0) absoluteIndex.x = 0;
|
|
4695
4747
|
cells = this.createNewCells(elementData, absoluteIndex.x, absoluteIndex.y, false);
|
|
4696
4748
|
var movedGrid = [];
|
|
4697
4749
|
var element = cells[0].plannedElement;
|
|
4750
|
+
var shiftBy = element.area.toX - element.area.fromX;
|
|
4698
4751
|
curGrid.forEach(function (_, x) {
|
|
4699
4752
|
_.forEach(function (_, y) {
|
|
4700
|
-
var newX = x;
|
|
4701
|
-
var shiftX = 0;
|
|
4702
|
-
if (y == absoluteIndex.y || absoluteIndex.y == 0) {
|
|
4703
|
-
newX += dir ? element.area.toX - element.area.fromX : 0;
|
|
4704
|
-
shiftX = dir ? element.area.toX - element.area.fromX : 0;
|
|
4705
|
-
}
|
|
4753
|
+
var newX = x + shiftBy;
|
|
4706
4754
|
if (!movedGrid[newX]) movedGrid[newX] = [];
|
|
4707
4755
|
var cellElem = curGrid[x][y].plannedElement;
|
|
4708
4756
|
var newCell = {
|
|
4709
4757
|
plannedElement: _objectSpread(_objectSpread({}, cellElem), {}, {
|
|
4710
4758
|
area: {
|
|
4711
|
-
fromX:
|
|
4712
|
-
toX: cellElem.area.toX +
|
|
4759
|
+
fromX: cellElem.area.fromX + shiftBy,
|
|
4760
|
+
toX: cellElem.area.toX + shiftBy,
|
|
4713
4761
|
fromY: cellElem.area.fromY,
|
|
4714
4762
|
toY: cellElem.area.toY
|
|
4715
4763
|
}
|
|
@@ -4789,6 +4837,7 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
|
|
|
4789
4837
|
var grid = this.generalPlanningState.grids[0].matrix;
|
|
4790
4838
|
var backup = structuredClone(this.generalPlanningState);
|
|
4791
4839
|
var res = this.getCellsInGridByElementId(elementId);
|
|
4840
|
+
if (res.cells.length == 0) return true;
|
|
4792
4841
|
var cell = res.cells[0];
|
|
4793
4842
|
var scpe = this.gridSetupParams.forceSingleCellPerElement;
|
|
4794
4843
|
var origin = {
|
|
@@ -5124,10 +5173,11 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
|
|
|
5124
5173
|
height = height < colHeight ? colHeight : height;
|
|
5125
5174
|
}
|
|
5126
5175
|
}
|
|
5127
|
-
var depth = maxZ - minZ;
|
|
5128
|
-
var width = maxX - minX;
|
|
5176
|
+
var depth = Math.abs(maxZ - minZ);
|
|
5177
|
+
var width = Math.abs(maxX - minX);
|
|
5129
5178
|
if (this.hasActiveBackside) {
|
|
5130
|
-
depth
|
|
5179
|
+
// Backside mirrors the front module, so total depth is doubled front bounding depth.
|
|
5180
|
+
depth *= 2;
|
|
5131
5181
|
}
|
|
5132
5182
|
return {
|
|
5133
5183
|
width: Math.round(width * 1000) / 1000,
|
|
@@ -6088,7 +6138,7 @@ var DivaBoxPlanner = /*#__PURE__*/function () {
|
|
|
6088
6138
|
allElementsToCopy.push(elementId);
|
|
6089
6139
|
if (copyInfo) {
|
|
6090
6140
|
if (copyInfo.copyIndex.x != 0) {
|
|
6091
|
-
if (this.constructionRulesHandler.getForceWholePlanningSameHeight()) {
|
|
6141
|
+
if (this.boxPlannerGrid.getForceSingleCellPerElement() || this.constructionRulesHandler.getForceWholePlanningSameHeight()) {
|
|
6092
6142
|
var result = this.boxPlannerGrid.getAllElementsInSameCol(elementId);
|
|
6093
6143
|
allElementsToCopy = result.elements;
|
|
6094
6144
|
result.backside;
|
|
@@ -6099,7 +6149,7 @@ var DivaBoxPlanner = /*#__PURE__*/function () {
|
|
|
6099
6149
|
}
|
|
6100
6150
|
}
|
|
6101
6151
|
if (copyInfo.copyIndex.y != 0) {
|
|
6102
|
-
if (this.constructionRulesHandler.getForceWholePlanningSameHeight()) {
|
|
6152
|
+
if (this.boxPlannerGrid.getForceSingleCellPerElement() || this.constructionRulesHandler.getForceWholePlanningSameHeight()) {
|
|
6103
6153
|
var resultCopyUp = this.boxPlannerGrid.getAllElementsInSameRowByElementId(elementId);
|
|
6104
6154
|
allElementsToCopy = resultCopyUp.elementIds;
|
|
6105
6155
|
resultCopyUp.backside;
|
|
@@ -5,9 +5,9 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
|
5
5
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
6
6
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
7
7
|
var _regeneratorRuntime = require('@babel/runtime/regenerator');
|
|
8
|
-
var index = require('./index-
|
|
8
|
+
var index = require('./index-9145fe80.js');
|
|
9
9
|
var DivaUtils = require('@crystaldesign/diva-utils');
|
|
10
|
-
var PlannerHandler2D = require('./PlannerHandler2D-
|
|
10
|
+
var PlannerHandler2D = require('./PlannerHandler2D-4ef7a85f.js');
|
|
11
11
|
require('@babel/runtime/helpers/slicedToArray');
|
|
12
12
|
require('@babel/runtime/helpers/objectWithoutProperties');
|
|
13
13
|
require('@babel/runtime/helpers/toConsumableArray');
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
4
4
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
5
5
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
6
|
-
require('./index-
|
|
6
|
+
require('./index-9145fe80.js');
|
|
7
7
|
var DivaUtils = require('@crystaldesign/diva-utils');
|
|
8
8
|
require('@babel/runtime/helpers/slicedToArray');
|
|
9
9
|
require('@babel/runtime/helpers/asyncToGenerator');
|
|
@@ -5,7 +5,7 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
|
5
5
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
6
6
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
7
7
|
var _regeneratorRuntime = require('@babel/runtime/regenerator');
|
|
8
|
-
var index = require('./index-
|
|
8
|
+
var index = require('./index-9145fe80.js');
|
|
9
9
|
var DivaUtils = require('@crystaldesign/diva-utils');
|
|
10
10
|
var signalr = require('@microsoft/signalr');
|
|
11
11
|
var io = require('socket.io-client');
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
4
4
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
5
|
-
require('./index-
|
|
5
|
+
require('./index-9145fe80.js');
|
|
6
6
|
require('@babel/runtime/helpers/slicedToArray');
|
|
7
7
|
require('@babel/runtime/helpers/asyncToGenerator');
|
|
8
8
|
require('@babel/runtime/helpers/defineProperty');
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
4
4
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
5
|
-
var index = require('./index-
|
|
5
|
+
var index = require('./index-9145fe80.js');
|
|
6
6
|
var basketModel = require('@crystaldesign/basket-model');
|
|
7
7
|
var DivaUtils = require('@crystaldesign/diva-utils');
|
|
8
8
|
require('@babel/runtime/helpers/slicedToArray');
|
|
@@ -5,7 +5,7 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
|
5
5
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
6
6
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
7
7
|
var _regeneratorRuntime = require('@babel/runtime/regenerator');
|
|
8
|
-
var index = require('./index-
|
|
8
|
+
var index = require('./index-9145fe80.js');
|
|
9
9
|
var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
|
|
10
10
|
var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
|
|
11
11
|
var fabric = require('fabric');
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
4
4
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
5
5
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
6
|
-
var index = require('./index-
|
|
6
|
+
var index = require('./index-9145fe80.js');
|
|
7
7
|
var DivaUtils = require('@crystaldesign/diva-utils');
|
|
8
8
|
require('@babel/runtime/helpers/slicedToArray');
|
|
9
9
|
require('@babel/runtime/helpers/asyncToGenerator');
|
|
@@ -6,7 +6,7 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
|
6
6
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
7
7
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
8
8
|
var _regeneratorRuntime = require('@babel/runtime/regenerator');
|
|
9
|
-
var index = require('./index-
|
|
9
|
+
var index = require('./index-9145fe80.js');
|
|
10
10
|
var DivaUtils = require('@crystaldesign/diva-utils');
|
|
11
11
|
require('@babel/runtime/helpers/slicedToArray');
|
|
12
12
|
require('@babel/runtime/helpers/objectWithoutProperties');
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
4
4
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
5
|
-
require('./index-
|
|
5
|
+
require('./index-9145fe80.js');
|
|
6
6
|
require('@babel/runtime/helpers/slicedToArray');
|
|
7
7
|
require('@babel/runtime/helpers/asyncToGenerator');
|
|
8
8
|
require('@babel/runtime/helpers/defineProperty');
|