@magic-xpa/engine 4.1000.0-dev4100.104 → 4.1000.0-dev4100.106
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/esm2020/src/ConstInterface.mjs +2 -1
- package/esm2020/src/CurrentClientVersion.mjs +2 -2
- package/esm2020/src/env/Environment.mjs +8 -1
- package/esm2020/src/event/EventHandler.mjs +8 -3
- package/fesm2015/magic-xpa-engine.mjs +15 -3
- package/fesm2015/magic-xpa-engine.mjs.map +1 -1
- package/fesm2020/magic-xpa-engine.mjs +15 -3
- package/fesm2020/magic-xpa-engine.mjs.map +1 -1
- package/package.json +4 -4
- package/src/ConstInterface.d.ts +1 -0
- package/src/env/Environment.d.ts +2 -0
|
@@ -271,6 +271,7 @@ ConstInterface.MG_ATTR_LOCAL_AS400SET = "local_as400set";
|
|
|
271
271
|
ConstInterface.MG_ATTR_LOCAL_EXTRA_GENGO = "local_extraGengo";
|
|
272
272
|
ConstInterface.MG_ATTR_LOCAL_FLAGS = "local_flags";
|
|
273
273
|
ConstInterface.MG_ATTR_SPEACIAL_ANSI_EXP = "SpecialAnsiExpression";
|
|
274
|
+
ConstInterface.MG_ATTR_SPECIAL_IMMEDIATE_HANDLER_END = "SpecialImmediateHandlerEnd";
|
|
274
275
|
ConstInterface.MG_ATTR_SPECIAL_SHOW_STATUSBAR_PANES = "SpecialShowStatusBarPanes";
|
|
275
276
|
ConstInterface.MG_ATTR_SPECIAL_ROUTE_TO_ROOT_PROG_ON_CONTEXT_RECREATION = "SpecialRouteToRootProgramOnContextRecreation";
|
|
276
277
|
ConstInterface.MG_ATTR_SPECIAL_SPECIAL_EDIT_LEFT_ALIGN = "SpecialEditLeftAlign";
|
|
@@ -8326,6 +8327,7 @@ class Environment {
|
|
|
8326
8327
|
this._debugMode = 0;
|
|
8327
8328
|
this._significantNumSize = 0;
|
|
8328
8329
|
this._specialAnsiExpression = false;
|
|
8330
|
+
this._specialImmediatehandlerEnd = false;
|
|
8329
8331
|
this._specialShowStatusBarPanes = false;
|
|
8330
8332
|
this._specialRouteToRootProgOnContextRecreation = false;
|
|
8331
8333
|
this._specialCancelOnCreate = false;
|
|
@@ -8479,6 +8481,9 @@ class Environment {
|
|
|
8479
8481
|
case ConstInterface.MG_ATTR_LOCAL_FLAGS:
|
|
8480
8482
|
this._localFlags = valueStr;
|
|
8481
8483
|
break;
|
|
8484
|
+
case ConstInterface.MG_ATTR_SPECIAL_IMMEDIATE_HANDLER_END:
|
|
8485
|
+
this._specialImmediatehandlerEnd = XmlParser.getBoolean(valueStr);
|
|
8486
|
+
break;
|
|
8482
8487
|
case ConstInterface.MG_ATTR_SPEACIAL_ANSI_EXP:
|
|
8483
8488
|
this._specialAnsiExpression = XmlParser.getBoolean(valueStr);
|
|
8484
8489
|
break;
|
|
@@ -8683,6 +8688,9 @@ class Environment {
|
|
|
8683
8688
|
GetLocalFlag(f) {
|
|
8684
8689
|
return this._localFlags !== null && this._localFlags.indexOf(f) >= 0;
|
|
8685
8690
|
}
|
|
8691
|
+
getSpecialImmediateHandlerEnd() {
|
|
8692
|
+
return this._specialImmediatehandlerEnd;
|
|
8693
|
+
}
|
|
8686
8694
|
getSpecialAnsiExpression() {
|
|
8687
8695
|
return this._specialAnsiExpression;
|
|
8688
8696
|
}
|
|
@@ -21360,8 +21368,12 @@ class EventHandler {
|
|
|
21360
21368
|
continue;
|
|
21361
21369
|
else if (this._operationTab.getOperation(oper.getBlockEnd()).getServerId() < nextOperIdx)
|
|
21362
21370
|
continue;
|
|
21363
|
-
if (!taskEnd)
|
|
21364
|
-
await this._task.evalEndCond(ConstInterface.END_COND_EVAL_IMMIDIATE)
|
|
21371
|
+
if (!taskEnd) {
|
|
21372
|
+
if (await this._task.evalEndCond(ConstInterface.END_COND_EVAL_IMMIDIATE) && Environment.Instance.getSpecialImmediateHandlerEnd()) {
|
|
21373
|
+
AccessHelper.eventsManager.setStopExecution(true);
|
|
21374
|
+
break;
|
|
21375
|
+
}
|
|
21376
|
+
}
|
|
21365
21377
|
if (this._taskMgdID !== mgdID)
|
|
21366
21378
|
isChangedCurrWndRef.value = true;
|
|
21367
21379
|
if (!this._task.isMainProg() && this._task.isOpenWin())
|
|
@@ -29416,7 +29428,7 @@ class CommandsTable {
|
|
|
29416
29428
|
}
|
|
29417
29429
|
}
|
|
29418
29430
|
|
|
29419
|
-
let CurrentClientVersion = '4.1000.0-dev4100.
|
|
29431
|
+
let CurrentClientVersion = '4.1000.0-dev4100.106';
|
|
29420
29432
|
|
|
29421
29433
|
class ClientManager {
|
|
29422
29434
|
constructor() {
|