component-shipinlv 1.3.11 → 2.0.0

package/dist/VideoPublish/account-manage/list.js

@@ -446,7 +446,7 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
             return /*#__PURE__*/_jsx(VideoPublishVideoAccountBaseInfo, {
               id: item.id,
               className: currentId == item.id ? "active" : '',
-              index: index + 1,
+              index: index,
               accountInfo: _objectSpread({}, item),
               onDel: function onDel(id) {
                 return _onDel(id);

package/dist/VideoPublish/create-task/base/index.js

@@ -5,7 +5,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState } from "react";
 import "./index.less";
 import { Divider, Tag, Form, Tooltip, InputNumber, Select, Radio, DatePicker, ConfigProvider, Switch } from "antd";
-import { RedoOutlined, ShoppingOutlined, UsergroupAddOutlined, VideoCameraOutlined } from "@ant-design/icons";
+import { QuestionCircleOutlined, RedoOutlined, ShoppingOutlined, UsergroupAddOutlined, VideoCameraOutlined } from "@ant-design/icons";
 import PageContentWarp from "../../../UI/PageContentWarp";
 import { TreeSelect } from 'antd';
 import Tool from "../../../lib/Tool";
@@ -148,7 +148,8 @@ var VideoPublishCreateTaskBase = function VideoPublishCreateTaskBase(_ref) {
         children: /*#__PURE__*/_jsx(TreeSelect, {
           treeDefaultExpandAll: true,
           disabled: loadingAccountList || treeVideoAccountData.length === 0,
-          treeData: treeVideoAccountData
+          treeData: treeVideoAccountData,
+          listHeight: 320
           // value={ [] }
           ,
           onChange: function onChange(idList) {
@@ -168,6 +169,29 @@ var VideoPublishCreateTaskBase = function VideoPublishCreateTaskBase(_ref) {
           children: /*#__PURE__*/_jsx(RedoOutlined, {})
         })
       })]
+    }), /*#__PURE__*/_jsx(Form.Item, {
+      label: "\u53D1\u5E03\u987A\u5E8F",
+      name: "publishOrder",
+      children: /*#__PURE__*/_jsxs(Radio.Group, {
+        disabled: true,
+        children: [/*#__PURE__*/_jsxs(Radio, {
+          value: "",
+          children: ["\u6309\u4EFB\u52A1\u63D0\u4EA4\u987A\u5E8F", /*#__PURE__*/_jsxs(Tooltip, {
+            title: "\u6839\u636E\u63D0\u4EA4\u53D1\u5E03\u4EFB\u52A1\u7684\u987A\u5E8F\u53D1\uFF08\u65E2\uFF1A\u5148\u63D0\u4EA4\u7684\u5148\u53D1\u5E03\uFF0C \u540E\u63D0\u4EA4\u7684\u540E\u53D1\u5E03\uFF09",
+            children: [" ", /*#__PURE__*/_jsxs("a", {
+              children: [" ", /*#__PURE__*/_jsx(QuestionCircleOutlined, {})]
+            })]
+          })]
+        }), /*#__PURE__*/_jsxs(Radio, {
+          value: "loop-account",
+          children: ["\u6309\u8D26\u6237\u5FAA\u73AF", /*#__PURE__*/_jsxs(Tooltip, {
+            title: "\u7B2C\u4E00\u4E2A\u8D26\u6237\u53D1\u4E00\u4E2A\u89C6\u9891\uFF0C\u63A5\u7740\u7B2C\u4E8C\u4E2A\u8D26\u6237\u53D1\u4E00\u4E2A\uFF0C\u4E00\u76F4\u5FAA\u73AF\uFF08\u65E2\uFF1A\u6BCF\u4E2A\u8D26\u6237\u8F6E\u6D41\u5148\u53D1\u4E00\u4E2A\uFF0C\u6700\u5927\u9650\u5236\u4FDD\u8BC1\u6BCF\u4E2A\u8D26\u6237\u81F3\u5C11\u90FD\u6709\u89C6\u9891\uFF09",
+            children: [" ", /*#__PURE__*/_jsxs("a", {
+              children: [" ", /*#__PURE__*/_jsx(QuestionCircleOutlined, {})]
+            })]
+          })]
+        })]
+      })
     }), /*#__PURE__*/_jsxs(Divider, {
       orientation: "left",
       children: [/*#__PURE__*/_jsx(VideoCameraOutlined, {

package/dist/VideoPublish/create-task/index.js

@@ -33,8 +33,9 @@ var VideoPublishCreateTask = function VideoPublishCreateTask(_ref) {
       normalDayMaxCount: 1,
       normalVideoKindRateType: '',
       whoCanView: '0',
-      noTopicIsUserRecommendTopic: false,
+      noTopicIsUserRecommendTopic: true,
       startTime: null,
+      publishOrder: '',
       salesVideoRate: 2,
       salesVideoRateType: 'hour',
       salesDayMaxCount: 2,

package/dist/VideoPublish/index.js

@@ -104,7 +104,8 @@ var VideoPublish = function VideoPublish(_ref) {
     // disabled: ! canPublish,
     children: /*#__PURE__*/_jsx(VideoPublishTaskPlanList, {
       env: env,
-      publishTaskId: 0
+      publishTaskId: 0,
+      timeFromKind: "updated"
     })
   }, {
     key: 'statistic',

package/dist/VideoPublish/index.less

@@ -33,7 +33,7 @@
 
   .pageContents {
     flex: 1;
-    padding: 16px 16px 0 16px ;
+    padding: 16px 16px 40px 16px ;
     overflow-y: auto;
 
     .my-tabs {

package/dist/VideoPublish/log/index.js

@@ -42,7 +42,8 @@ var VideoPublishLog = function VideoPublishLog(_ref) {
     wait: '<ClockCircleOutlined class="icon icon-wait" />',
     warn: '<WarningFilled class="icon icon-warn" />',
     fail: '<CloseSquareFilled class="icon icon-fail" />',
-    success: '<CheckCircleFilled class="icon icon-success" />'
+    success: '<CheckCircleFilled class="icon icon-success" />',
+    finish: '<CheckCircleFilled class="icon icon-success" />'
   };
   var onLogDo = function onLogDo(data) {
     console.log('log data:', data);

package/dist/VideoPublish/publish-task-plan/tool.js

@@ -186,7 +186,7 @@ var PublishTaskPlanClass = /*#__PURE__*/function () {
               coverExist = _context2.sent;
               if (!coverExist || !coverExist.isExist) {
                 item.publishVideo.publishCoverUrl = '';
-                errExistLog.message = '封面文件 本身已经不存在（可能被清理删除），将采用系统推荐封面';
+                errExistLog.message = '预判定：封面文件 本身已经不存在（可能被清理删除），将采用系统推荐封面<Divider />';
                 this.onLog(errExistLog);
               }
             case 22:

package/dist/VideoPublish/task-list/index.js

@@ -37,7 +37,9 @@ var VideoPublishTaskList = function VideoPublishTaskList(_ref) {
   var _useState5 = useState({
       startTime: 0,
       // Date.now(),
-      endTime: 0 //Date.now(),
+      endTime: 0,
+      //Date.now(),
+      timeFromKind: 'publishTime'
       // taskStatus: '',
       // keyword: '',
     }),
@@ -170,7 +172,8 @@ var VideoPublishTaskList = function VideoPublishTaskList(_ref) {
       title: '发布任务计划',
       content: /*#__PURE__*/_jsx(VideoPublishTaskPlanList, {
         env: env,
-        publishTaskId: publishTaskId
+        publishTaskId: publishTaskId,
+        timeFromKind: query.timeFromKind
       }),
       width: 1200
     });

package/dist/VideoPublish/task-list/plan/list.d.ts

@@ -6,6 +6,7 @@ interface Props {
     accountId?: number;
     startTime?: number;
     endTime?: number;
+    timeFromKind: VideoPublishStatisticPublish.TimeFromKind;
 }
 declare const VideoPublishTaskPlanList: React.FC<Props>;
 export default VideoPublishTaskPlanList;

package/dist/VideoPublish/task-list/plan/list.js

@@ -27,7 +27,8 @@ var VideoPublishTaskPlanList = function VideoPublishTaskPlanList(_ref) {
     _ref$startTime = _ref.startTime,
     startTime = _ref$startTime === void 0 ? 0 : _ref$startTime,
     _ref$endTime = _ref.endTime,
-    endTime = _ref$endTime === void 0 ? 0 : _ref$endTime;
+    endTime = _ref$endTime === void 0 ? 0 : _ref$endTime,
+    timeFromKind = _ref.timeFromKind;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     listData = _useState2[0],
@@ -179,7 +180,7 @@ var VideoPublishTaskPlanList = function VideoPublishTaskPlanList(_ref) {
     }
   }, {
     title: /*#__PURE__*/_jsx(_Fragment, {
-      children: "\u5BF9\u5916\u5C55\u793A"
+      children: "\u5B9A\u65F6"
     }),
     dataIndex: 'publishTime',
     key: 'publishTime',
@@ -230,6 +231,7 @@ var VideoPublishTaskPlanList = function VideoPublishTaskPlanList(_ref) {
       }, postQuery), {}, {
         startTime: postQuery.startTime > 10000 ? Math.floor(dayjs(postQuery.startTime).startOf('date').valueOf() * 0.001) || 0 : 0,
         endTime: postQuery.endTime > 10000 ? Math.floor(dayjs(postQuery.endTime).endOf('date').valueOf() * 0.001) || 0 : 0,
+        timeFromKind: timeFromKind,
         current: current,
         pageSize: pagination.pageSize
       }), {
@@ -248,7 +250,7 @@ var VideoPublishTaskPlanList = function VideoPublishTaskPlanList(_ref) {
     loading: loadingTaskList,
     error: errorTaskList,
     onReload: runTaskList,
-    title: "\u4EFB\u52A1\u8BA1\u5212",
+    title: "\u4EFB\u52A1\u8BA1\u5212" + timeFromKind,
     className: "videoPublishTaskPlanList",
     extInfo: /*#__PURE__*/_jsx(VideoPublishTaskPlanListQuery, {
       defaultQuery: query,

package/dist/VideoPublish/task-list/query.js

@@ -1,8 +1,9 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState } from 'react';
-import { Button, DatePicker, Form, Space } from "antd";
+import { Button, DatePicker, Form, Select, Space } from "antd";
 import "./query.less";
+import { ClockCircleOutlined, ExclamationCircleOutlined, SendOutlined } from "@ant-design/icons";
 import dayjs from "dayjs";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -35,6 +36,24 @@ var VideoPublishTaskListQuery = function VideoPublishTaskListQuery(_ref) {
       onFinish: onFinish,
       children: /*#__PURE__*/_jsxs(Space, {
         children: [/*#__PURE__*/_jsx(Form.Item, {
+          name: "timeFromKind",
+          children: /*#__PURE__*/_jsxs(Select, {
+            style: {
+              width: 160
+            },
+            value: form,
+            children: [/*#__PURE__*/_jsxs(Select.Option, {
+              value: "created",
+              children: [/*#__PURE__*/_jsx(ExclamationCircleOutlined, {}), " \u6309\u521B\u5EFA\u65F6\u95F4"]
+            }), /*#__PURE__*/_jsxs(Select.Option, {
+              value: "updated",
+              children: [/*#__PURE__*/_jsx(SendOutlined, {}), " \u6309\u53D1\u5E03\u65F6\u95F4"]
+            }), /*#__PURE__*/_jsxs(Select.Option, {
+              value: "publishTime",
+              children: [/*#__PURE__*/_jsx(ClockCircleOutlined, {}), " \u6309\u5B9A\u65F6\u65F6\u95F4"]
+            })]
+          })
+        }), /*#__PURE__*/_jsx(Form.Item, {
           children: /*#__PURE__*/_jsx(DatePicker.RangePicker, {
             defaultValue: query.startTime > 0 ? [query.startTime <= 0 ? null : dayjs(query.startTime), query.endTime <= 0 ? null : dayjs(query.endTime)] : undefined,
             disabledDate: function disabledDate(currentDate) {

package/dist/VideoPublish/video-publish-statistic/index.js

@@ -13,7 +13,8 @@ var VideoPublishStatisticPublish = function VideoPublishStatisticPublish(_ref) {
       key: 'publish-video',
       label: '发布任务',
       children: /*#__PURE__*/_jsx(VideoPublishStatisticPublishList, {
-        env: getApiEnv()
+        env: getApiEnv(),
+        timeFromKind: "updated"
       })
     }, {
       key: 'operation',

package/dist/VideoPublish/video-publish-statistic/publish-plan/list.d.ts

@@ -2,6 +2,7 @@ import React from "react";
 import "./list.less";
 interface Props {
     env?: Global.Env;
+    timeFromKind: VideoPublishStatisticPublish.TimeFromKind;
 }
 declare const VideoPublishStatisticPublishList: React.FC<Props>;
 export default VideoPublishStatisticPublishList;

package/dist/VideoPublish/video-publish-statistic/publish-plan/list.js

@@ -16,7 +16,9 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 var VideoPublishStatisticPublishList = function VideoPublishStatisticPublishList(_ref) {
-  var env = _ref.env;
+  var env = _ref.env,
+    _ref$timeFromKind = _ref.timeFromKind,
+    timeFromKind = _ref$timeFromKind === void 0 ? 'updated' : _ref$timeFromKind;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     listData = _useState2[0],
@@ -33,6 +35,7 @@ var VideoPublishStatisticPublishList = function VideoPublishStatisticPublishList
     pagination = _useState4[0],
     setPagination = _useState4[1];
   var _useState5 = useState({
+      timeFromKind: timeFromKind,
       startTime: Date.now(),
       endTime: Date.now()
       // taskStatus: '',
@@ -173,8 +176,8 @@ var VideoPublishStatisticPublishList = function VideoPublishStatisticPublishList
       var postQuery = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : query;
       var current = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : pagination.current;
       return VideoPublishPublishStatisticController.list(_objectSpread(_objectSpread({}, postQuery), {}, {
-        startTime: postQuery.startTime > 100000 ? Math.floor(dayjs(postQuery.startTime).startOf('date').valueOf() * 0.001) || 0 : 0,
-        endTime: postQuery.endTime > 100000 ? Math.floor(dayjs(postQuery.endTime).endOf('date').valueOf() * 0.001) || 0 : 0,
+        startTime: postQuery.startTime > 10000 ? Math.floor(dayjs(postQuery.startTime).startOf('date').valueOf() * 0.001) || 0 : 0,
+        endTime: postQuery.endTime > 10000 ? Math.floor(dayjs(postQuery.endTime).endOf('date').valueOf() * 0.001) || 0 : 0,
         current: current,
         pageSize: pagination.pageSize
       }), {
@@ -216,7 +219,8 @@ var VideoPublishStatisticPublishList = function VideoPublishStatisticPublishList
         publishTaskId: 0,
         accountId: accountId,
         startTime: query.startTime,
-        endTime: query.endTime
+        endTime: query.endTime,
+        timeFromKind: query.timeFromKind
       }),
       width: 1200
     });
@@ -225,7 +229,7 @@ var VideoPublishStatisticPublishList = function VideoPublishStatisticPublishList
     loading: loadingTaskList,
     error: errorTaskList,
     onReload: runTaskList,
-    title: "\u53D1\u5E03\u7EDF\u8BA1",
+    title: "\u53D1\u5E03\u7EDF\u8BA1" + query.timeFromKind,
     className: "video-publish-statistic-list",
     extInfo: /*#__PURE__*/_jsx(VideoPublishStatisticPublishListQuery, {
       defaultQuery: query,

package/dist/VideoPublish/video-publish-statistic/publish-plan/query.js

@@ -1,9 +1,10 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState } from 'react';
-import { Button, DatePicker, Form, Space } from "antd";
+import { Button, DatePicker, Form, Select, Space } from "antd";
 import "./query.less";
 import dayjs from "dayjs";
+import { ClockCircleOutlined, ExclamationCircleOutlined, SendOutlined } from "@ant-design/icons";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var VideoPublishStatisticPublishListQuery = function VideoPublishStatisticPublishListQuery(_ref) {
@@ -35,6 +36,24 @@ var VideoPublishStatisticPublishListQuery = function VideoPublishStatisticPublis
       onFinish: onFinish,
       children: /*#__PURE__*/_jsxs(Space, {
         children: [/*#__PURE__*/_jsx(Form.Item, {
+          name: "timeFromKind",
+          children: /*#__PURE__*/_jsxs(Select, {
+            style: {
+              width: 160
+            },
+            value: form,
+            children: [/*#__PURE__*/_jsxs(Select.Option, {
+              value: "created",
+              children: [/*#__PURE__*/_jsx(ExclamationCircleOutlined, {}), " \u6309\u521B\u5EFA\u65F6\u95F4"]
+            }), /*#__PURE__*/_jsxs(Select.Option, {
+              value: "updated",
+              children: [/*#__PURE__*/_jsx(SendOutlined, {}), " \u6309\u53D1\u5E03\u65F6\u95F4"]
+            }), /*#__PURE__*/_jsxs(Select.Option, {
+              value: "publishTime",
+              children: [/*#__PURE__*/_jsx(ClockCircleOutlined, {}), " \u6309\u5B9A\u65F6\u65F6\u95F4"]
+            })]
+          })
+        }), /*#__PURE__*/_jsx(Form.Item, {
           children: /*#__PURE__*/_jsx(DatePicker.RangePicker, {
             defaultValue: query.startTime > 10000 ? [query.startTime <= 0 ? null : dayjs(query.startTime), query.endTime <= 0 ? null : dayjs(query.endTime)] : [dayjs(), dayjs()],
             disabledDate: function disabledDate(currentDate) {

package/dist/component/media-show/render.js

@@ -5,6 +5,7 @@ import React, { useEffect, useState } from "react";
 import "./render.less";
 import Tool from "../../lib/Tool";
 import getVideoUrl from "../../lib/component/getVideoUrl";
+import { LoadingOutlined } from "@ant-design/icons";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -105,7 +106,7 @@ export var MediaShowRender = function MediaShowRender(_ref) {
           })
         })
       })]
-    }) : '...'
+    }) : /*#__PURE__*/_jsx(LoadingOutlined, {})
   });
 };
 export default MediaShowRender;

package/dist/component/video-platform/logo.js

@@ -86,9 +86,9 @@ var VideoPlatform = function VideoPlatform(_ref) {
   var itemData = VideoPlatformDict[platform] || {
     name: platform
   };
-  return /*#__PURE__*/_jsxs("span", {
+  return /*#__PURE__*/_jsxs("i", {
     className: "videoPlatformLogo ".concat(disabled ? 'disabled' : '', " ").concat(className),
-    children: [/*#__PURE__*/_jsx("span", {
+    children: [/*#__PURE__*/_jsx("i", {
       className: "logo ".concat(platform || '', " "),
       style: {
         width: size,

package/dist/component/video-platform/logo.less

@@ -44,5 +44,6 @@
   .name{
     //vertical-align: middle;
     display: inline-block;
+    font-style: normal;
   }
 }

package/dist/lib/Tool.d.ts

@@ -161,7 +161,7 @@ declare const Tool: {
     OsPathSeparator(): string;
     getTitleByPath(path: string): string;
     h5Pay(query: Pay.H5PayQuery): void;
-    notification(type: "error" | "success" | "info" | "warning", message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
+    notification(type: "success" | "info" | "warning" | "error", message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
     notificationSuccess(message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
     notificationError(message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
     notificationWarning(message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;

package/dist/lib/openChrome.js

@@ -164,7 +164,9 @@ var getOpenQuery = /*#__PURE__*/function () {
             _action: query.action || '',
             _platformAccountId: query.platformAccountId,
             _nickname: query.nickname || '',
-            _chromeProfileName: query.chromeProfileName || ''
+            _chromeProfileName: query.chromeProfileName || '',
+            _shipinlvMainPort: window.__ShipinlvMainPort || 0,
+            _shipinlvLocalServerPort: window.__ShipinlvLocalServerPort || 0
           });
           chromeProfileDir = settingConfig.chromeUserDataDir + '/' + query.chromeProfileName;
           _context4.t0 = Tool.getOsName();

package/dist/lib/request.js

@@ -99,7 +99,9 @@ var requestApi = /*#__PURE__*/function () {
               if (['Failed to fetch', 'http error'].includes((_err2 = err) === null || _err2 === void 0 ? void 0 : _err2.message)) {
                 err.message = '发生了一些问题，请稍后重试';
               }
-              Tool.toastError(err.message);
+              if (!(options !== null && options !== void 0 && options.silent)) {
+                Tool.toastError(err.message);
+              }
               onError(pageUrl, url, err.message, JSON.stringify(err), options === null || options === void 0 ? void 0 : options.silent);
               reject(err);
             });

package/dist/service/api/VideoPublishStatisticPublishController.d.ts

@@ -1,4 +1,7 @@
 export declare function list(body: {
+    timeFromKind: VideoPublishStatisticPublish.TimeFromKind;
+    startTime: number;
+    endTime: number;
     current: number;
     pageSize: number;
 }, options?: Global.RequestOptions): Promise<VideoPublishStatisticPublish.ListResult>;

package/dist/service/api/VideoPublishTaskPlanController.d.ts

@@ -1,6 +1,7 @@
 export declare function list(body: {
     publishTaskId: number;
     accountId: number;
+    timeFromKind: VideoPublishStatisticPublish.TimeFromKind;
     current: number;
     pageSize: number;
 }, options?: Global.RequestOptions): Promise<VideoPublishTaskPlan.ListResult>;

package/dist/types/VideoPublish.d.ts

@@ -6,6 +6,7 @@ declare namespace VideoPublish {
     type VideoFrom = 'local' | 'task';
     type VideoRateType = 'hour' | 'day';
     type WhoCanView = '0' | '1' | '2';
+    type PublishOrder = '' | 'loop-account';
     interface CreateTaskList {
         id: number;
         title: string;
@@ -127,10 +128,12 @@ declare namespace VideoPublish {
         whoCanView: WhoCanView;
         noTopicIsUserRecommendTopic: boolean;
         startTime: number | null;
+        publishOrder: PublishOrder;
         hourEnabled: number[];
     }
     interface TaskListQuery {
         startTime: number;
         endTime: number;
+        timeFromKind: VideoPublishStatisticPublish.TimeFromKind;
     }
 }

package/dist/types/VideoPublishStatistic.d.ts

@@ -1,4 +1,5 @@
 declare namespace VideoPublishStatisticPublish {
+    type TimeFromKind = 'created' | 'updated' | 'publishTime';
     interface List {
         finishAmount: number;
         progressAmount: number;
@@ -10,6 +11,7 @@ declare namespace VideoPublishStatisticPublish {
         pagination: Global.Pagination;
     }
     interface ListQuery {
+        timeFromKind: TimeFromKind;
         startTime: number;
         endTime: number;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "component-shipinlv",
-  "version": "1.3.11",
+  "version": "2.0.0",
   "description": "",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",