component-shipinlv 2.1.0 → 2.1.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.
@@ -11,6 +11,7 @@ import * as ActiveAccountModeSettingController from "../service/api/ActiveAccoun
11
11
  import VideoPublishCreateTaskHourSelect from "./hour-enabled";
12
12
  import ActiveAccountModeTask from "./task";
13
13
  import toast from "../lib/toast";
14
+ import { SwapRightOutlined } from "@ant-design/icons";
14
15
 
15
16
  // 1、每个账户 要发的视频,和文件夹绑定关系;,从本地文件夹 随机 读取视频发布;
16
17
  // 2、每天 发 6个;
@@ -23,6 +24,7 @@ import toast from "../lib/toast";
23
24
  // 9 循环一遍,只生成一天,保证每一个账号 均衡
24
25
  // 10、 视频被发布之后,最大任务天数 + 2, 还没清理,强行删除
25
26
  import { jsx as _jsx } from "react/jsx-runtime";
27
+ import { Fragment as _Fragment } from "react/jsx-runtime";
26
28
  import { jsxs as _jsxs } from "react/jsx-runtime";
27
29
  var ActiveAccountModeSetting = function ActiveAccountModeSetting(_ref) {
28
30
  var disabled = _ref.disabled,
@@ -48,6 +50,10 @@ var ActiveAccountModeSetting = function ActiveAccountModeSetting(_ref) {
48
50
  _useState4 = _slicedToArray(_useState3, 2),
49
51
  enabled = _useState4[0],
50
52
  setEnabled = _useState4[1];
53
+ var _useState5 = useState(false),
54
+ _useState6 = _slicedToArray(_useState5, 2),
55
+ canPost = _useState6[0],
56
+ setCanPost = _useState6[1];
51
57
  var _useRequest = useRequest(function () {
52
58
  return ActiveAccountModeSettingController.detail({}, {
53
59
  env: env
@@ -70,6 +76,7 @@ var ActiveAccountModeSetting = function ActiveAccountModeSetting(_ref) {
70
76
  manual: true,
71
77
  onSuccess: function onSuccess(result) {
72
78
  toast('已保存');
79
+ setCanPost(false);
73
80
  }
74
81
  }),
75
82
  runSettingCreate = _useRequest2.run,
@@ -114,6 +121,9 @@ var ActiveAccountModeSetting = function ActiveAccountModeSetting(_ref) {
114
121
  labelCol: {
115
122
  span: 4
116
123
  },
124
+ onChange: function onChange(e) {
125
+ return setCanPost(true);
126
+ },
117
127
  disabled: loadingSettingCreate,
118
128
  autoComplete: "off",
119
129
  initialValues: _objectSpread({}, formData),
@@ -125,7 +135,8 @@ var ActiveAccountModeSetting = function ActiveAccountModeSetting(_ref) {
125
135
  checkedChildren: "\u5F00\u542F\u517B\u53F7\u6A21\u5F0F",
126
136
  unCheckedChildren: "\u7981\u7528\u517B\u53F7\u6A21\u5F0F",
127
137
  onChange: function onChange(e) {
128
- return setEnabled(e);
138
+ setCanPost(true);
139
+ setEnabled(e);
129
140
  }
130
141
  })
131
142
  }), /*#__PURE__*/_jsx(Form.Item, {
@@ -137,6 +148,7 @@ var ActiveAccountModeSetting = function ActiveAccountModeSetting(_ref) {
137
148
  onDayTimeHourList: function onDayTimeHourList(dayTimeHourList) {
138
149
  formData.dayTimeHourList = dayTimeHourList;
139
150
  setFormData(_objectSpread({}, formData));
151
+ setCanPost(true);
140
152
  }
141
153
  })
142
154
  }), /*#__PURE__*/_jsx(Form.Item, {
@@ -146,9 +158,16 @@ var ActiveAccountModeSetting = function ActiveAccountModeSetting(_ref) {
146
158
  precision: 0,
147
159
  min: 1,
148
160
  max: 30,
149
- addonBefore: "+/-",
161
+ addonBefore: /*#__PURE__*/_jsxs(_Fragment, {
162
+ children: ["0", /*#__PURE__*/_jsx("small", {
163
+ children: "%"
164
+ }), " ", /*#__PURE__*/_jsx(SwapRightOutlined, {})]
165
+ }),
150
166
  addonAfter: "%",
151
- disabled: !enabled
167
+ disabled: !enabled,
168
+ onChange: function onChange(e) {
169
+ setCanPost(true);
170
+ }
152
171
  })
153
172
  }), /*#__PURE__*/_jsx(Form.Item, {
154
173
  label: "\u89C6\u9891\u9650\u989D",
@@ -159,7 +178,10 @@ var ActiveAccountModeSetting = function ActiveAccountModeSetting(_ref) {
159
178
  max: 100,
160
179
  disabled: !enabled,
161
180
  addonBefore: "\u6BCF\u5929\u6700\u591A",
162
- addonAfter: "\u4E2A"
181
+ addonAfter: "\u4E2A",
182
+ onChange: function onChange(e) {
183
+ setCanPost(true);
184
+ }
163
185
  })
164
186
  }), /*#__PURE__*/_jsx(Form.Item, {
165
187
  label: "\u53D1\u5E03\u9650\u5236",
@@ -170,7 +192,10 @@ var ActiveAccountModeSetting = function ActiveAccountModeSetting(_ref) {
170
192
  max: 14,
171
193
  addonBefore: "\u6700\u591A\u751F\u6210",
172
194
  addonAfter: "\u5929\u7684\u4EFB\u52A1",
173
- disabled: !enabled
195
+ disabled: !enabled,
196
+ onChange: function onChange(e) {
197
+ setCanPost(true);
198
+ }
174
199
  })
175
200
  }), /*#__PURE__*/_jsx(Form.Item, {
176
201
  label: "\u53D1\u5E03\u5B8C\u6210\u540E",
@@ -187,7 +212,10 @@ var ActiveAccountModeSetting = function ActiveAccountModeSetting(_ref) {
187
212
  // unCheckedChildren="保留视频并改名"
188
213
  ,
189
214
  unCheckedChildren: "\u5220\u9664\u89C6\u9891\u4E0D\u4FDD\u7559",
190
- checkedChildren: "\u5220\u9664\u89C6\u9891\u4E0D\u4FDD\u7559"
215
+ checkedChildren: "\u5220\u9664\u89C6\u9891\u4E0D\u4FDD\u7559",
216
+ onChange: function onChange(e) {
217
+ setCanPost(true);
218
+ }
191
219
  })
192
220
  })
193
221
  }), /*#__PURE__*/_jsx(Divider, {}), /*#__PURE__*/_jsx(Form.Item, {
@@ -197,6 +225,7 @@ var ActiveAccountModeSetting = function ActiveAccountModeSetting(_ref) {
197
225
  children: /*#__PURE__*/_jsx(Button, {
198
226
  type: "primary",
199
227
  htmlType: "submit",
228
+ disabled: !canPost,
200
229
  children: "\u4FDD\u5B58"
201
230
  })
202
231
  })]
@@ -19,12 +19,12 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
19
19
  var _this = this;
20
20
  _classCallCheck(this, ActiveAccountModeTask);
21
21
  _defineProperty(this, "timer", void 0);
22
- _defineProperty(this, "loopSecond", 20);
22
+ _defineProperty(this, "loopSecond", 3 * 60);
23
23
  _defineProperty(this, "modeSetting", {
24
24
  dayTimeHourList: [],
25
- dayPublishMaxAmount: 5,
26
- timeAreaRandOffsetPercent: 10,
27
- publishMaxDay: 3,
25
+ dayPublishMaxAmount: 6,
26
+ timeAreaRandOffsetPercent: 15,
27
+ publishMaxDay: 2,
28
28
  enabled: true,
29
29
  isPublishFinishDelVideo: true
30
30
  });
@@ -89,28 +89,31 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
89
89
  dayIndex = 0;
90
90
  case 18:
91
91
  if (!(dayIndex < setting.publishMaxDay)) {
92
- _context.next = 63;
92
+ _context.next = 65;
93
93
  break;
94
94
  }
95
95
  console.log('publishMaxDay:', dayIndex);
96
96
  day = dayjs().add(dayIndex, 'day');
97
97
  startTime = Math.floor(day.startOf('day').valueOf() * 0.001);
98
- endTime = Math.floor(day.endOf('day').valueOf() * 0.001); // 获取用户列表;
99
- _context.next = 25;
98
+ endTime = Math.floor(day.endOf('day').valueOf() * 0.001);
99
+ console.log("startTime:", dayIndex, new Date(startTime * 1000), new Date(endTime * 1000));
100
+
101
+ // 获取用户列表;
102
+ _context.next = 26;
100
103
  return this.getTaskPlanStatisticList(startTime, endTime).catch(function (err) {
101
104
  toastError('获取账户列表失败:' + (err === null || err === void 0 ? void 0 : err.message));
102
105
  });
103
- case 25:
106
+ case 26:
104
107
  list = _context.sent;
105
108
  if (list) {
106
- _context.next = 30;
109
+ _context.next = 31;
107
110
  break;
108
111
  }
109
- _context.next = 29;
112
+ _context.next = 30;
110
113
  return sleep(20e3);
111
- case 29:
112
- return _context.abrupt("continue", 60);
113
114
  case 30:
115
+ return _context.abrupt("continue", 62);
116
+ case 31:
114
117
  // 把发布过的,做一个字段
115
118
  this.planDict = {};
116
119
  _iterator = _createForOfIteratorHelper(list);
@@ -130,63 +133,64 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
130
133
  _iterator.f();
131
134
  }
132
135
  _iterator2 = _createForOfIteratorHelper(this.accountList);
133
- _context.prev = 34;
136
+ _context.prev = 35;
134
137
  _iterator2.s();
135
- case 36:
138
+ case 37:
136
139
  if ((_step2 = _iterator2.n()).done) {
137
- _context.next = 52;
140
+ _context.next = 54;
138
141
  break;
139
142
  }
140
143
  accountItem = _step2.value;
141
144
  count = ((_this$planDict$accoun = this.planDict[accountItem.id]) === null || _this$planDict$accoun === void 0 ? void 0 : _this$planDict$accoun.length) || 0; // 需要指定路径
142
145
  if (accountItem.videoFromFolder) {
143
- _context.next = 42;
146
+ _context.next = 43;
144
147
  break;
145
148
  }
146
149
  console.log('no videoFromFolder :', accountItem.nickname);
147
- return _context.abrupt("continue", 50);
148
- case 42:
150
+ return _context.abrupt("continue", 52);
151
+ case 43:
149
152
  // 删除 此账户下面,所有已经发布的视频
150
153
  this.checkDelFile(accountItem.id, accountItem.videoFromFolder);
151
- if (!(count >= setting.publishMaxDay)) {
152
- _context.next = 45;
154
+ if (!(count >= setting.dayPublishMaxAmount)) {
155
+ _context.next = 47;
153
156
  break;
154
157
  }
155
- return _context.abrupt("continue", 50);
156
- case 45:
157
- console.log('makePublishTask in:', accountItem.id, setting.publishMaxDay - count, dayIndex);
158
+ console.log('count 2:', count, setting.dayPublishMaxAmount);
159
+ return _context.abrupt("continue", 52);
160
+ case 47:
161
+ console.log('makePublishTask in:', accountItem.id, setting.dayPublishMaxAmount - count, dayIndex);
158
162
 
159
163
  // 生成任务
160
- _context.next = 48;
161
- return this.makePublishTask(accountItem.id, setting.publishMaxDay - count, dayIndex).catch(function (err) {
164
+ _context.next = 50;
165
+ return this.makePublishTask(accountItem.id, setting.dayPublishMaxAmount - count, dayIndex).catch(function (err) {
162
166
  console.log('makePublishTask err:', err);
163
167
  });
164
- case 48:
165
- _context.next = 50;
166
- return sleep(1e3);
167
168
  case 50:
168
- _context.next = 36;
169
- break;
169
+ _context.next = 52;
170
+ return sleep(3e3);
170
171
  case 52:
171
- _context.next = 57;
172
+ _context.next = 37;
172
173
  break;
173
174
  case 54:
174
- _context.prev = 54;
175
- _context.t0 = _context["catch"](34);
175
+ _context.next = 59;
176
+ break;
177
+ case 56:
178
+ _context.prev = 56;
179
+ _context.t0 = _context["catch"](35);
176
180
  _iterator2.e(_context.t0);
177
- case 57:
178
- _context.prev = 57;
181
+ case 59:
182
+ _context.prev = 59;
179
183
  _iterator2.f();
180
- return _context.finish(57);
181
- case 60:
184
+ return _context.finish(59);
185
+ case 62:
182
186
  dayIndex++;
183
187
  _context.next = 18;
184
188
  break;
185
- case 63:
189
+ case 65:
186
190
  case "end":
187
191
  return _context.stop();
188
192
  }
189
- }, _callee, this, [[34, 54, 57, 60]]);
193
+ }, _callee, this, [[35, 56, 59, 62]]);
190
194
  }));
191
195
  function loop() {
192
196
  return _loop.apply(this, arguments);
@@ -242,7 +246,7 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
242
246
  value: function () {
243
247
  var _postTask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(videoAccountId, videoList, topicList, dayIndex) {
244
248
  var _this2 = this;
245
- var dayStartTime, _this$modeSetting, dayPublishMaxAmount, dayTimeHourList, timeAreaRandOffsetPercent, oneVideoByMinute, publishTimeList, i, hourIndex, dayHour, hourMinute, stepTime, stepMin, stepMax;
249
+ var dayStartTime, _this$modeSetting, dayPublishMaxAmount, dayTimeHourList, timeAreaRandOffsetPercent, oneVideoByMinute, publishTimeList, i, hourIndex, dayHour, hourMinute, stepTime, stepOffsetMinute;
246
250
  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
247
251
  while (1) switch (_context4.prev = _context4.next) {
248
252
  case 0:
@@ -267,47 +271,51 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
267
271
  case 7:
268
272
  _this$modeSetting = this.modeSetting, dayPublishMaxAmount = _this$modeSetting.dayPublishMaxAmount, dayTimeHourList = _this$modeSetting.dayTimeHourList, timeAreaRandOffsetPercent = _this$modeSetting.timeAreaRandOffsetPercent;
269
273
  oneVideoByMinute = dayTimeHourList.length * 60 / dayPublishMaxAmount;
274
+ console.log('oneVideoByMinute:', oneVideoByMinute, dayPublishMaxAmount, videoList);
270
275
  publishTimeList = [];
271
276
  i = 0;
272
- case 11:
277
+ case 12:
273
278
  if (!(i < dayPublishMaxAmount)) {
274
- _context4.next = 28;
279
+ _context4.next = 30;
275
280
  break;
276
281
  }
277
282
  if (!(i < dayPublishMaxAmount - videoList.length)) {
278
- _context4.next = 15;
283
+ _context4.next = 16;
279
284
  break;
280
285
  }
281
286
  console.log('for dayPublishMaxAmount :', i, dayPublishMaxAmount, videoList);
282
- return _context4.abrupt("continue", 25);
283
- case 15:
287
+ return _context4.abrupt("continue", 27);
288
+ case 16:
284
289
  // 到多少分钟了
285
290
  hourIndex = Math.floor(i * oneVideoByMinute / 60);
286
291
  dayHour = parseInt(dayTimeHourList[hourIndex]);
292
+ console.log('dayPublishMaxAmount 2:', i, hourIndex, dayHour);
287
293
  if (dayHour) {
288
- _context4.next = 20;
294
+ _context4.next = 22;
289
295
  break;
290
296
  }
291
297
  console.log('postTask not dayHour:', i, hourIndex, oneVideoByMinute);
292
- return _context4.abrupt("continue", 25);
293
- case 20:
298
+ return _context4.abrupt("continue", 27);
299
+ case 22:
294
300
  hourMinute = i * oneVideoByMinute % 60;
295
- stepTime = dayStartTime + dayHour * 3600e3 + hourMinute * 60e3;
296
- stepMin = stepTime - 3600e3 * 0.01 * timeAreaRandOffsetPercent;
297
- stepMax = stepTime + 3600e3 * 0.01 * timeAreaRandOffsetPercent;
298
- publishTimeList.push(Tool.math.randInt(stepMin, stepMax));
299
- case 25:
301
+ stepTime = dayStartTime + dayHour * 3600e3 + hourMinute * 60e3; // const stepMin = stepTime - 3600e3 * 0.01 * timeAreaRandOffsetPercent;
302
+ stepOffsetMinute = oneVideoByMinute * 0.01 * Tool.math.randInt(0, timeAreaRandOffsetPercent); // 偏移量, 不能超过 30分钟
303
+ if (stepOffsetMinute > 30) {
304
+ stepOffsetMinute = 30;
305
+ }
306
+ publishTimeList.push(stepTime + stepOffsetMinute * 60e3);
307
+ case 27:
300
308
  i++;
301
- _context4.next = 11;
309
+ _context4.next = 12;
302
310
  break;
303
- case 28:
311
+ case 30:
304
312
  if (!(publishTimeList.length == 0)) {
305
- _context4.next = 31;
313
+ _context4.next = 33;
306
314
  break;
307
315
  }
308
316
  console.log('publishTimeList empty!');
309
317
  return _context4.abrupt("return");
310
- case 31:
318
+ case 33:
311
319
  return _context4.abrupt("return", new Promise( /*#__PURE__*/function () {
312
320
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
313
321
  var videoIndex, _iterator3, _step3, videoPath, introduction, startTime, newVideoPath, publishResult;
@@ -364,16 +372,16 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
364
372
  "taskFromProductType": "",
365
373
  "accountList": ["account-".concat(videoAccountId)],
366
374
  "normalVideoRate": 1,
367
- "normalVideoRateType": "hour",
368
- "normalDayMaxCount": 1,
375
+ "normalVideoRateType": "day",
376
+ "normalDayMaxCount": _this2.modeSetting.dayPublishMaxAmount,
369
377
  "normalVideoKindRateType": "",
370
378
  "whoCanView": "0",
371
379
  "noTopicIsUserRecommendTopic": true,
372
380
  startTime: Math.floor(startTime * 0.001),
373
381
  "publishOrder": "",
374
- "salesVideoRate": 2,
375
- "salesVideoRateType": "hour",
376
- "salesDayMaxCount": 2,
382
+ "salesVideoRate": 1,
383
+ "salesVideoRateType": "day",
384
+ "salesDayMaxCount": _this2.modeSetting.dayPublishMaxAmount,
377
385
  "salesVideoKindRateType": "",
378
386
  "hourEnabled": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23],
379
387
  "videoList": [{
@@ -394,7 +402,7 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
394
402
  case 23:
395
403
  publishResult = _context3.sent;
396
404
  _context3.next = 26;
397
- return sleep(2e3);
405
+ return sleep(3e3);
398
406
  case 26:
399
407
  _context3.next = 4;
400
408
  break;
@@ -421,7 +429,7 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
421
429
  return _ref.apply(this, arguments);
422
430
  };
423
431
  }()));
424
- case 32:
432
+ case 34:
425
433
  case "end":
426
434
  return _context4.stop();
427
435
  }
@@ -552,7 +560,7 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
552
560
  if ((list === null || list === void 0 ? void 0 : list.length) < count) {
553
561
  return list;
554
562
  }
555
- return this.removeFiveUniqueItems(list, count).slice(0, count);
563
+ return this.removeFiveUniqueItems(list, count).slice(0, count + 1);
556
564
  }
557
565
  }, {
558
566
  key: "removeFiveUniqueItems",
@@ -566,7 +574,7 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
566
574
  var copyArr = _toConsumableArray(arr);
567
575
  var removedItems = [];
568
576
  var uniqueSet = new Set();
569
- while (uniqueSet.size < 5 && copyArr.length > 0) {
577
+ while (uniqueSet.size < count && copyArr.length > 0) {
570
578
  // 获取随机索引
571
579
  var randomIndex = Math.floor(Math.random() * copyArr.length);
572
580
  // 移除并获取该项
@@ -598,7 +606,7 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
598
606
  topicList: []
599
607
  });
600
608
  case 4:
601
- console.log('fileList:', fileList);
609
+ console.log('fileList:', fileList.length, needTaskCount, videoFromFolder);
602
610
  videoList = []; // 获取视频
603
611
  _iterator4 = _createForOfIteratorHelper(fileList);
604
612
  _context9.prev = 7;
@@ -87,8 +87,8 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
87
87
  manual: !userInfo.isLogin,
88
88
  onSuccess: function onSuccess(result) {
89
89
  listDataRef.current = result.list;
90
- setListData(result.list);
91
- onListData(result.list);
90
+ setListData(_toConsumableArray(result.list));
91
+ onListData(_toConsumableArray(result.list));
92
92
  }
93
93
  }),
94
94
  loading = _useRequest.loading,
@@ -1,5 +1,6 @@
1
1
  import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
2
2
  import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
3
+ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
3
4
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
5
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
5
6
  import React, { useState } from 'react';
@@ -176,7 +177,7 @@ var VideoPublishVideoAccountProxy = function VideoPublishVideoAccountProxy(_ref)
176
177
  });
177
178
  }, {
178
179
  onSuccess: function onSuccess(result) {
179
- setListData(result.list);
180
+ setListData(_toConsumableArray(result.list));
180
181
  }
181
182
  }),
182
183
  loading = _useRequest.loading,
@@ -1,3 +1,4 @@
1
+ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
1
2
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
2
3
  import React, { useState } from 'react';
3
4
  import { Button, Form, Select, Tag } from 'antd';
@@ -30,7 +31,7 @@ var VideoPublishVideoAccountProxySelect = function VideoPublishVideoAccountProxy
30
31
  });
31
32
  }, {
32
33
  onSuccess: function onSuccess(result) {
33
- setListData(result.list);
34
+ setListData(_toConsumableArray(result.list));
34
35
  form.setFieldsValue({
35
36
  id: videoAccountProxyId
36
37
  });
@@ -1,3 +1,4 @@
1
+ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
1
2
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
3
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
3
4
  import React, { useState } from "react";
@@ -160,8 +161,8 @@ var VideoPublishTaskList = function VideoPublishTaskList(_ref) {
160
161
  });
161
162
  }, {
162
163
  onSuccess: function onSuccess(result) {
163
- setListData(result.list);
164
- setPagination(result.pagination);
164
+ setListData(_toConsumableArray(result.list));
165
+ setPagination(_objectSpread(_objectSpread({}, pagination), result.pagination));
165
166
  }
166
167
  }),
167
168
  runTaskList = _useRequest.run,
@@ -1,3 +1,4 @@
1
+ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
1
2
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
3
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
3
4
  import React, { useState } from "react";
@@ -239,8 +240,8 @@ var VideoPublishTaskPlanList = function VideoPublishTaskPlanList(_ref) {
239
240
  });
240
241
  }, {
241
242
  onSuccess: function onSuccess(result) {
242
- setListData(result.list);
243
- setPagination(result.pagination);
243
+ setListData(_toConsumableArray(result.list));
244
+ setPagination(_objectSpread(_objectSpread({}, pagination), result.pagination));
244
245
  }
245
246
  }),
246
247
  runTaskList = _useRequest.run,
@@ -1,10 +1,10 @@
1
1
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
2
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
3
3
  import React, { useState } from 'react';
4
- import { Button, Form, Space } from "antd";
4
+ import { Button, Form, Input, Space } from "antd";
5
5
  import "./query.less";
6
- import dayjs from "dayjs";
7
6
  import { jsx as _jsx } from "react/jsx-runtime";
7
+ import { jsxs as _jsxs } from "react/jsx-runtime";
8
8
  var VideoPublishTaskPlanListQuery = function VideoPublishTaskPlanListQuery(_ref) {
9
9
  var defaultQuery = _ref.defaultQuery,
10
10
  _ref$onQuery = _ref.onQuery,
@@ -16,12 +16,6 @@ var VideoPublishTaskPlanListQuery = function VideoPublishTaskPlanListQuery(_ref)
16
16
  _useState2 = _slicedToArray(_useState, 2),
17
17
  query = _useState2[0],
18
18
  setQuery = _useState2[1];
19
- var todayEnd = dayjs(dayjs(Date.now()).format('YYYY-MM-DD 23:59:59')).valueOf();
20
- var onTime = function onTime(startTime, endTime) {
21
- query.startTime = startTime;
22
- query.endTime = endTime;
23
- setQuery(_objectSpread({}, query));
24
- };
25
19
  var onFinish = function onFinish() {
26
20
  var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
27
21
  onQuery(_objectSpread(_objectSpread({}, query), values));
@@ -32,12 +26,22 @@ var VideoPublishTaskPlanListQuery = function VideoPublishTaskPlanListQuery(_ref)
32
26
  form: form,
33
27
  initialValues: _objectSpread({}, query),
34
28
  onFinish: onFinish,
35
- children: /*#__PURE__*/_jsx(Space, {
36
- children: /*#__PURE__*/_jsx(Button, {
29
+ children: /*#__PURE__*/_jsxs(Space, {
30
+ children: [/*#__PURE__*/_jsx(Form.Item, {
31
+ name: "keyword",
32
+ children: /*#__PURE__*/_jsx(Input
33
+ // value={ query.keyword }
34
+ , {
35
+ placeholder: "\u641C\u7D22\u8D26\u6237\u540D",
36
+ allowClear: true
37
+ // onChange={ e => onKeyWord( e.target.value ) }
38
+ // onPressEnter={ ( e ) => onSearch( e.target ) }
39
+ })
40
+ }), /*#__PURE__*/_jsx(Button, {
37
41
  type: "primary",
38
42
  htmlType: "submit",
39
43
  children: "\u641C\u7D22"
40
- })
44
+ })]
41
45
  })
42
46
  })
43
47
  });
@@ -221,8 +221,8 @@ var VideoPublishVideoAccount = function VideoPublishVideoAccount(_ref) {
221
221
  });
222
222
  }, {
223
223
  onSuccess: function onSuccess(result) {
224
- setListData(result.list);
225
- setPagination(result.pagination);
224
+ setListData(_toConsumableArray(result.list));
225
+ setPagination(_objectSpread(_objectSpread({}, pagination), result.pagination));
226
226
  }
227
227
  }),
228
228
  runVideoAccount = _useRequest.run,
@@ -1,3 +1,4 @@
1
+ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
1
2
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
3
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
3
4
  import React, { useState } from "react";
@@ -166,7 +167,7 @@ var VideoPublishStatisticOperationList = function VideoPublishStatisticOperation
166
167
  });
167
168
  }, {
168
169
  onSuccess: function onSuccess(result) {
169
- setListData(result.list);
170
+ setListData(_toConsumableArray(result.list));
170
171
  // setPagination( result.pagination );
171
172
  }
172
173
  }),
@@ -1,3 +1,4 @@
1
+ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
1
2
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
3
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
3
4
  import React, { useState } from "react";
@@ -185,8 +186,8 @@ var VideoPublishStatisticPublishList = function VideoPublishStatisticPublishList
185
186
  });
186
187
  }, {
187
188
  onSuccess: function onSuccess(result) {
188
- setListData(result.list);
189
- setPagination(result.pagination);
189
+ setListData(_toConsumableArray(result.list));
190
+ setPagination(_objectSpread(_objectSpread({}, pagination), result.pagination));
190
191
  amountInfo.finish = 0;
191
192
  amountInfo.fail = 0;
192
193
  amountInfo.progress = 0;
@@ -232,6 +233,7 @@ var VideoPublishStatisticPublishList = function VideoPublishStatisticPublishList
232
233
  title: "\u53D1\u5E03\u7EDF\u8BA1",
233
234
  className: "video-publish-statistic-list",
234
235
  extInfo: /*#__PURE__*/_jsx(VideoPublishStatisticPublishListQuery, {
236
+ loading: loadingTaskList,
235
237
  defaultQuery: query,
236
238
  onQuery: function onQuery(query) {
237
239
  return _onQuery(query);
@@ -1,6 +1,7 @@
1
1
  import React from 'react';
2
2
  import './query.less';
3
3
  interface Props {
4
+ loading: boolean;
4
5
  defaultQuery: VideoPublishStatisticPublish.ListQuery;
5
6
  onQuery: (query: VideoPublishStatisticPublish.ListQuery) => void;
6
7
  }
@@ -8,7 +8,8 @@ import { ClockCircleOutlined, ExclamationCircleOutlined, SendOutlined } from "@a
8
8
  import { jsx as _jsx } from "react/jsx-runtime";
9
9
  import { jsxs as _jsxs } from "react/jsx-runtime";
10
10
  var VideoPublishStatisticPublishListQuery = function VideoPublishStatisticPublishListQuery(_ref) {
11
- var defaultQuery = _ref.defaultQuery,
11
+ var loading = _ref.loading,
12
+ defaultQuery = _ref.defaultQuery,
12
13
  _ref$onQuery = _ref.onQuery,
13
14
  onQuery = _ref$onQuery === void 0 ? function () {} : _ref$onQuery;
14
15
  var _Form$useForm = Form.useForm(),
@@ -33,6 +34,7 @@ var VideoPublishStatisticPublishListQuery = function VideoPublishStatisticPublis
33
34
  children: /*#__PURE__*/_jsx(Form, {
34
35
  form: form,
35
36
  initialValues: _objectSpread({}, query),
37
+ disabled: loading,
36
38
  onFinish: onFinish,
37
39
  children: /*#__PURE__*/_jsxs(Space, {
38
40
  children: [/*#__PURE__*/_jsx(Form.Item, {
@@ -67,6 +69,7 @@ var VideoPublishStatisticPublishListQuery = function VideoPublishStatisticPublis
67
69
  }), /*#__PURE__*/_jsx(Button, {
68
70
  type: "primary",
69
71
  htmlType: "submit",
72
+ loading: loading,
70
73
  children: "\u641C\u7D22"
71
74
  })]
72
75
  })
@@ -1,7 +1,7 @@
1
- import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
2
1
  import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
3
2
  import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
4
3
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
+ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
5
5
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
6
6
  import React, { useState } from "react";
7
7
  import "./index.less";
@@ -37,7 +37,7 @@ var VideoPublishTaskVideoTopic = function VideoPublishTaskVideoTopic(_ref) {
37
37
  });
38
38
  }, {
39
39
  onSuccess: function onSuccess(result) {
40
- setListData(result);
40
+ setListData(_toConsumableArray(result));
41
41
  }
42
42
  }),
43
43
  run = _useRequest.run,
@@ -1,6 +1,6 @@
1
- import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
2
1
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
3
2
  import _objectDestructuringEmpty from "@babel/runtime/helpers/esm/objectDestructuringEmpty";
3
+ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
4
4
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
5
5
  import React, { useEffect, useState } from 'react';
6
6
  import { Table, Popover, Tag } from 'antd';
@@ -168,7 +168,7 @@ var VipCompare = function VipCompare(_ref) {
168
168
  manual: !isInClient(),
169
169
  onSuccess: function onSuccess(result) {
170
170
  // @ts-ignore
171
- setListData(result.list || result);
171
+ setListData(_toConsumableArray(result.list || result));
172
172
  }
173
173
  }),
174
174
  loading = _useRequest2.loading,
@@ -1,3 +1,4 @@
1
+ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
1
2
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
2
3
  import React, { useState } from "react";
3
4
  import "./index.less";
@@ -27,7 +28,7 @@ var VideoStudyPage = function VideoStudyPage(_ref) {
27
28
  });
28
29
  }, {
29
30
  onSuccess: function onSuccess(result) {
30
- setListData(result);
31
+ setListData(_toConsumableArray(result));
31
32
  }
32
33
  }),
33
34
  run = _useRequest.run,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "component-shipinlv",
3
- "version": "2.1.0",
3
+ "version": "2.1.1",
4
4
  "description": "",
5
5
  "module": "dist/index.js",
6
6
  "types": "dist/index.d.ts",