@sd-angular/core 0.0.967 → 0.0.969

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.
@@ -1481,7 +1481,8 @@
1481
1481
  multipleHeader: false
1482
1482
  };
1483
1483
  var _c = gridOption || {}, selection = _c.selection, commands = _c.commands, editor = _c.editor;
1484
- if ((editor === null || editor === void 0 ? void 0 : editor.addable) || ((editor === null || editor === void 0 ? void 0 : editor.type) === 'inline' && (editor === null || editor === void 0 ? void 0 : editor.removable)) || ((editor === null || editor === void 0 ? void 0 : editor.type) === 'focus' && (editor === null || editor === void 0 ? void 0 : editor.disabled))) {
1484
+ if ((editor === null || editor === void 0 ? void 0 : editor.addable) || ((editor === null || editor === void 0 ? void 0 : editor.type) === 'inline' && (editor === null || editor === void 0 ? void 0 : editor.removable))
1485
+ || ((editor === null || editor === void 0 ? void 0 : editor.type) === 'focus' && (typeof (editor === null || editor === void 0 ? void 0 : editor.disabled) === 'function' || !(editor === null || editor === void 0 ? void 0 : editor.disabled)))) {
1485
1486
  result.firstHeaders.push(__classPrivateFieldGet(_this, _COLUMNS).EDITORVALIDATION);
1486
1487
  result.displayedColumns.push(__classPrivateFieldGet(_this, _COLUMNS).EDITORVALIDATION);
1487
1488
  }
@@ -1489,7 +1490,9 @@
1489
1490
  result.firstHeaders.push(__classPrivateFieldGet(_this, _COLUMNS).SELECTION);
1490
1491
  result.displayedColumns.push(__classPrivateFieldGet(_this, _COLUMNS).SELECTION);
1491
1492
  }
1492
- if ((editor === null || editor === void 0 ? void 0 : editor.addable) || ((editor === null || editor === void 0 ? void 0 : editor.type) === 'inline' && (editor === null || editor === void 0 ? void 0 : editor.removable)) || ((editor === null || editor === void 0 ? void 0 : editor.type) === 'focus' && (editor === null || editor === void 0 ? void 0 : editor.disabled)) || ((editor === null || editor === void 0 ? void 0 : editor.type) === 'popup' && (editor === null || editor === void 0 ? void 0 : editor.disabled))) {
1493
+ if ((editor === null || editor === void 0 ? void 0 : editor.addable) || ((editor === null || editor === void 0 ? void 0 : editor.type) === 'inline' && (editor === null || editor === void 0 ? void 0 : editor.removable))
1494
+ || ((editor === null || editor === void 0 ? void 0 : editor.type) === 'focus' && (typeof (editor === null || editor === void 0 ? void 0 : editor.disabled) === 'function' || !(editor === null || editor === void 0 ? void 0 : editor.disabled)))
1495
+ || ((editor === null || editor === void 0 ? void 0 : editor.type) === 'popup' && (typeof (editor === null || editor === void 0 ? void 0 : editor.disabled) === 'function' || !(editor === null || editor === void 0 ? void 0 : editor.disabled)))) {
1493
1496
  result.firstHeaders.push(__classPrivateFieldGet(_this, _COLUMNS).EDITOR);
1494
1497
  result.displayedColumns.push(__classPrivateFieldGet(_this, _COLUMNS).EDITOR);
1495
1498
  }
@@ -3840,13 +3843,13 @@
3840
3843
  if (isDisabled) {
3841
3844
  return null;
3842
3845
  }
3843
- item.editorHandlerRow = Object.assign(Object.assign({}, item.editorHandlerRow), { visible: !!status, editable: true, removable: false, savable: !!status, cancelable: !!status });
3846
+ item.editorHandlerRow = Object.assign(Object.assign({}, item.editorHandlerRow), { visible: !!status, editable: !status, removable: false, savable: !!status, cancelable: !!status });
3844
3847
  }
3845
3848
  else if (editor.type === 'popup') {
3846
3849
  if (isDisabled) {
3847
3850
  return null;
3848
3851
  }
3849
- item.editorHandlerRow = Object.assign(Object.assign({}, item.editorHandlerRow), { visible: false, editable: true, removable: false, savable: false, cancelable: false });
3852
+ item.editorHandlerRow = Object.assign(Object.assign({}, item.editorHandlerRow), { visible: false, editable: !status, removable: false, savable: false, cancelable: false });
3850
3853
  }
3851
3854
  var sdId = item.sdId, remain = __rest(item, ["sdId"]);
3852
3855
  item.sdId = hash__default['default'](remain);
@@ -3929,6 +3932,14 @@
3929
3932
  item.editorErrorMessage = null;
3930
3933
  return [2 /*return*/];
3931
3934
  }
3935
+ if (editor.type === 'popup') {
3936
+ item.editorErrorMessage = null;
3937
+ return [2 /*return*/];
3938
+ }
3939
+ if (editor.type === 'focus' && !item.editorStatus) {
3940
+ item.editorErrorMessage = null;
3941
+ return [2 /*return*/];
3942
+ }
3932
3943
  __classPrivateFieldSet(this, _previous, new Date());
3933
3944
  return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, __classPrivateFieldGet(_this, _delay)); })];
3934
3945
  case 1: