bruce-models 0.1.0 → 0.1.2

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.
@@ -781,7 +781,7 @@ var Entity;
781
781
  Entity.Get = Get;
782
782
  function GetListByIds(api, entityIds) {
783
783
  return __awaiter(this, void 0, void 0, function () {
784
- var reqs, reqIds, i, entityId, key, cacheData, reqData, req, _loop_1, i;
784
+ var reqs, reqIds, i, entityId, key, cacheData, reqData, req_1, _loop_1, i;
785
785
  var _this = this;
786
786
  return __generator(this, function (_a) {
787
787
  switch (_a.label) {
@@ -810,36 +810,38 @@ var Entity;
810
810
  },
811
811
  PageSize: reqIds.length
812
812
  };
813
- req = api.POST("entities", reqData, Api.PrepReqParams());
814
- _loop_1 = function (i) {
815
- var entityId = reqIds[i];
816
- var key = GetCacheKey(entityId);
817
- var prom = new Promise(function (res) { return __awaiter(_this, void 0, void 0, function () {
818
- var data, item, e_1;
819
- return __generator(this, function (_a) {
820
- switch (_a.label) {
821
- case 0:
822
- _a.trys.push([0, 2, , 3]);
823
- return [4 /*yield*/, req];
824
- case 1:
825
- data = _a.sent();
826
- item = data.Items.find(function (x) { return x.Bruce.ID == entityId; });
827
- res(item);
828
- return [3 /*break*/, 3];
829
- case 2:
830
- e_1 = _a.sent();
831
- return [3 /*break*/, 3];
832
- case 3:
833
- res(null);
834
- return [2 /*return*/];
835
- }
836
- });
837
- }); });
838
- api.Cache.Set(key, prom, Api.DEFAULT_CACHE_DURATION);
839
- reqs.push(prom);
840
- };
841
- for (i = 0; i < reqIds.length; i++) {
842
- _loop_1(i);
813
+ if (reqIds.length > 0) {
814
+ req_1 = api.POST("entities", reqData, Api.PrepReqParams());
815
+ _loop_1 = function (i) {
816
+ var entityId = reqIds[i];
817
+ var key = GetCacheKey(entityId);
818
+ var prom = new Promise(function (res) { return __awaiter(_this, void 0, void 0, function () {
819
+ var data, item, e_1;
820
+ return __generator(this, function (_a) {
821
+ switch (_a.label) {
822
+ case 0:
823
+ _a.trys.push([0, 2, , 3]);
824
+ return [4 /*yield*/, req_1];
825
+ case 1:
826
+ data = _a.sent();
827
+ item = data.Items.find(function (x) { return x.Bruce.ID == entityId; });
828
+ res(item);
829
+ return [3 /*break*/, 3];
830
+ case 2:
831
+ e_1 = _a.sent();
832
+ return [3 /*break*/, 3];
833
+ case 3:
834
+ res(null);
835
+ return [2 /*return*/];
836
+ }
837
+ });
838
+ }); });
839
+ api.Cache.Set(key, prom, Api.DEFAULT_CACHE_DURATION);
840
+ reqs.push(prom);
841
+ };
842
+ for (i = 0; i < reqIds.length; i++) {
843
+ _loop_1(i);
844
+ }
843
845
  }
844
846
  return [4 /*yield*/, Promise.all(reqs)];
845
847
  case 1: return [2 /*return*/, (_a.sent()).filter(function (x) { return !!x; })];
@@ -1121,6 +1123,9 @@ var Calculator;
1121
1123
  switch (field.type) {
1122
1124
  case EValueType.Color:
1123
1125
  value = field.value;
1126
+ if (value) {
1127
+ value = Color.ColorFromStr(value);
1128
+ }
1124
1129
  break;
1125
1130
  case EValueType.Gradient:
1126
1131
  value = GetGradientValue(field.value, entity);