poi-plugin-item-improvement2 1.0.0 → 1.0.1

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.
Files changed (3) hide show
  1. package/.idea/workspace.xml +7 -1
  2. package/package.json +1 -1
  3. package/views/selectors.js +6 -7
package/.idea/workspace.xml CHANGED
@@ -14,6 +14,12 @@
14
14
  <change beforePath="$PROJECT_DIR$/views/item-info-area.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/item-info-area.es" afterDir="false" />
15
15
  <change beforePath="$PROJECT_DIR$/views/mat-row.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/mat-row.es" afterDir="false" />
16
16
  <change beforePath="$PROJECT_DIR$/views/selectors.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/selectors.es" afterDir="false" />
17
+ <change beforePath="$PROJECT_DIR$/views/starcraft/add-new-equip-view.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/add-new-equip-view.es" afterDir="false" />
18
+ <change beforePath="$PROJECT_DIR$/views/starcraft/control-panel.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/control-panel.es" afterDir="false" />
19
+ <change beforePath="$PROJECT_DIR$/views/starcraft/equip-view.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/equip-view.es" afterDir="false" />
20
+ <change beforePath="$PROJECT_DIR$/views/starcraft/plan-modify-control.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/plan-modify-control.es" afterDir="false" />
21
+ <change beforePath="$PROJECT_DIR$/views/starcraft/plan-view.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/plan-view.es" afterDir="false" />
22
+ <change beforePath="$PROJECT_DIR$/views/starcraft/utils.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/utils.es" afterDir="false" />
17
23
  </list>
18
24
  <option name="SHOW_DIALOG" value="false" />
19
25
  <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -127,7 +133,7 @@
127
133
  <workItem from="1768548645399" duration="890000" />
128
134
  <workItem from="1768577343916" duration="24825000" />
129
135
  <workItem from="1777260186359" duration="1000" />
130
- <workItem from="1780066941937" duration="76070000" />
136
+ <workItem from="1780066941937" duration="79288000" />
131
137
  </task>
132
138
  <servers />
133
139
  </component>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "poi-plugin-item-improvement2",
3
- "version": "1.0.0",
3
+ "version": "1.0.1",
4
4
  "description": "use new data source",
5
5
  "main": "index.es",
6
6
  "scripts": {
package/views/selectors.js CHANGED
@@ -122,14 +122,13 @@ const baseImprovementDataSelector = (0, _reselect.createSelector)([_selectors.co
122
122
  const item = LOCAL_ITEMS[itemId] || {};
123
123
  const assistants = (0, _lodash.default)(_lodash.default.range(7).concat(-1)).map(day => {
124
124
  const list = (0, _lodash.default)(item.improvementList || []).flatMap(improvement => {
125
- const ships = improvement.shipList || [];
125
+ const shipWeek = improvement.shipWeekList || [];
126
+ return shipWeek.filter(s => {
127
+ var _s$week;
126
128
 
127
- if (day === -1 || (improvement.weekdays || []).includes(day)) {
128
- return ships.map(s => s.text);
129
- }
130
-
131
- return [];
132
- }).value();
129
+ return day === -1 || ((_s$week = s.week) === null || _s$week === void 0 ? void 0 : _s$week[day]);
130
+ }).map(s => s.text);
131
+ }).uniq().value();
133
132
  return [day, list.join('/')];
134
133
  }).fromPairs().value();
135
134
  return _extends({}, _lodash.default.get($const, ['$equips', item.id], {}), item, {