@pisell/pisellos 0.0.177 → 0.0.178
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.
|
@@ -154,7 +154,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
154
154
|
return n.date === item.date;
|
|
155
155
|
});
|
|
156
156
|
if (currentItemIndex !== -1) {
|
|
157
|
-
var _item$resource;
|
|
157
|
+
var _item$resource, _currentItem$resource3;
|
|
158
158
|
var currentItem = currentDateList[currentItemIndex];
|
|
159
159
|
// 看那一天的数据有没有相同的，把不同的资源合并进去即可
|
|
160
160
|
var newResource = (_item$resource = item.resource) === null || _item$resource === void 0 ? void 0 : _item$resource.filter(function (n) {
|
|
@@ -163,6 +163,16 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
163
163
|
return m.id === n.id;
|
|
164
164
|
}));
|
|
165
165
|
});
|
|
166
|
+
// 如果有相同的资源，则使用 item 中的新的resource.times，而不是 currentItem 中的
|
|
167
|
+
(_currentItem$resource3 = currentItem.resource) === null || _currentItem$resource3 === void 0 || _currentItem$resource3.forEach(function (n) {
|
|
168
|
+
var _item$resource2;
|
|
169
|
+
var newResource = (_item$resource2 = item.resource) === null || _item$resource2 === void 0 ? void 0 : _item$resource2.find(function (m) {
|
|
170
|
+
return m.id === n.id;
|
|
171
|
+
});
|
|
172
|
+
if (newResource) {
|
|
173
|
+
n.times = newResource.times;
|
|
174
|
+
}
|
|
175
|
+
});
|
|
166
176
|
currentItem.resource = [].concat(_toConsumableArray(currentItem.resource || []), _toConsumableArray(newResource || []));
|
|
167
177
|
currentDateList[currentItemIndex] = currentItem;
|
|
168
178
|
} else {
|
|
@@ -95,7 +95,7 @@ var DateModule = class extends import_BaseModule.BaseModule {
|
|
|
95
95
|
setDateList(dateList) {
|
|
96
96
|
const currentDateList = (0, import_cloneDeep.default)(this.store.dateList) || [];
|
|
97
97
|
dateList.forEach((item) => {
|
|
98
|
-
var _a;
|
|
98
|
+
var _a, _b;
|
|
99
99
|
const currentItemIndex = currentDateList.findIndex(
|
|
100
100
|
(n) => n.date === item.date
|
|
101
101
|
);
|
|
@@ -107,6 +107,13 @@ var DateModule = class extends import_BaseModule.BaseModule {
|
|
|
107
107
|
return !((_a2 = currentItem.resource) == null ? void 0 : _a2.some((m) => m.id === n.id));
|
|
108
108
|
}
|
|
109
109
|
);
|
|
110
|
+
(_b = currentItem.resource) == null ? void 0 : _b.forEach((n) => {
|
|
111
|
+
var _a2;
|
|
112
|
+
const newResource2 = (_a2 = item.resource) == null ? void 0 : _a2.find((m) => m.id === n.id);
|
|
113
|
+
if (newResource2) {
|
|
114
|
+
n.times = newResource2.times;
|
|
115
|
+
}
|
|
116
|
+
});
|
|
110
117
|
currentItem.resource = [
|
|
111
118
|
...currentItem.resource || [],
|
|
112
119
|
...newResource || []
|