component-shipinlv 1.1.22 → 1.1.25

package/dist/UI/Time.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 interface Props {
     time?: string | number;
+    className?: string;
     serverTime?: number;
     titlePre?: string;
 }

package/dist/UI/Time.js

@@ -5,6 +5,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 var Time = function Time(_ref) {
   var _ref$time = _ref.time,
     time = _ref$time === void 0 ? '' : _ref$time,
+    className = _ref.className,
     _ref$serverTime = _ref.serverTime,
     serverTime = _ref$serverTime === void 0 ? Date.now() : _ref$serverTime,
     _ref$titlePre = _ref.titlePre,
@@ -12,6 +13,7 @@ var Time = function Time(_ref) {
   return /*#__PURE__*/_jsx(Tooltip, {
     title: "".concat(titlePre).concat(Tool.formatTime(time, 'YYYY-MM-DD HH:mm')),
     children: /*#__PURE__*/_jsx("span", {
+      className: className,
       children: Tool.getFriendlyTime(time, serverTime)
     })
   });

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

@@ -202,7 +202,8 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
           case 12:
             console.log('addAccountResult：', addAccountResult, env);
             postData = {
-              detail: addAccountResult
+              detail: addAccountResult,
+              proxyId: proxyInfo.id || 0
             };
             runCreate(postData);
           case 15:

package/dist/VideoPublish/proxy/create.js

@@ -1,12 +1,13 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState } from 'react';
-import { Button, Form, Input, InputNumber, Switch } from 'antd';
+import { Button, DatePicker, Form, Input, InputNumber, Switch } from 'antd';
 import { useRequest } from "@umijs/hooks";
 import PageContentWarp from "../../UI/PageContentWarp";
 import DialogDrawerFooter from "../../UI/DialogDrawerFooter";
 import * as VideoPublishVideoAccountProxyController from "../../service/api/VideoPublishVideoAccountProxyController";
 import toast from "../../lib/toast";
+import dayjs from "dayjs";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var VideoPublishVideoAccountProxyCreate = function VideoPublishVideoAccountProxyCreate(_ref) {
@@ -25,6 +26,7 @@ var VideoPublishVideoAccountProxyCreate = function VideoPublishVideoAccountProxy
       enabled: true,
       username: '',
       password: '',
+      expired: 0,
       created: 0,
       updated: 0
     }),
@@ -41,7 +43,9 @@ var VideoPublishVideoAccountProxyCreate = function VideoPublishVideoAccountProxy
       manual: id <= 0,
       onSuccess: function onSuccess(result) {
         setDetailData(result);
-        form.setFieldsValue(_objectSpread({}, result));
+        form.setFieldsValue(_objectSpread(_objectSpread({}, result), {}, {
+          expired: result.expired <= 0 ? null : dayjs(result.expired * 1000)
+        }));
       }
     }),
     loadingDetail = _useRequest.loading,
@@ -61,7 +65,8 @@ var VideoPublishVideoAccountProxyCreate = function VideoPublishVideoAccountProxy
     run = _useRequest2.run;
   var onFinish = function onFinish(values) {
     run(_objectSpread(_objectSpread({}, values), {}, {
-      id: id
+      id: id,
+      expired: values.expired ? Math.floor(values.expired.valueOf() * 0.001) : 0
     }));
   };
   return /*#__PURE__*/_jsx(PageContentWarp, {
@@ -140,6 +145,16 @@ var VideoPublishVideoAccountProxyCreate = function VideoPublishVideoAccountProxy
         children: /*#__PURE__*/_jsx(Input, {
           placeholder: "\u8F93\u5165IP\u5730\u5740 \u5F52\u5C5E\u5730\uFF0C\u53EA\u662F\u65B9\u4FBF\u7BA1\u7406"
         })
+      }), /*#__PURE__*/_jsx(Form.Item, {
+        name: "expired",
+        label: "\u8FC7\u671F\u65F6\u95F4",
+        children: /*#__PURE__*/_jsx(DatePicker, {
+          minDate: dayjs(Date.now() - 86400e3 * 60),
+          maxDate: dayjs(Date.now() + 86400e3 * 365 * 2),
+          disabledDate: function disabledDate(e) {
+            return e.valueOf() < Date.now() - 86400e3 * 2;
+          }
+        })
       }), /*#__PURE__*/_jsx(Form.Item, {
         name: "enabled",
         label: "\u662F\u5426\u542F\u7528",

package/dist/VideoPublish/proxy/list.js

@@ -12,6 +12,8 @@ import LayoutContent from "../../UI/LayoutContent";
 import VideoPublishVideoAccountProxyQuery from "./query";
 import VideoPublishVideoAccountProxyCreate from "./create";
 import { PlusCircleOutlined } from "@ant-design/icons";
+import Money from "../../UI/Money";
+import Time from "../../UI/Time";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -93,6 +95,28 @@ var VideoPublishVideoAccountProxy = function VideoPublishVideoAccountProxy(_ref)
         children: [auth, record === null || record === void 0 ? void 0 : record.ip, port]
       });
     }
+  }, {
+    title: '过期时间',
+    dataIndex: 'expired',
+    key: 'expired',
+    render: function render(expired) {
+      return /*#__PURE__*/_jsx(Time, {
+        className: expired > 0 && expired - Date.now() * 0.001 < 86400 * 7 ? 'timeWarn' : '',
+        time: expired
+      });
+    }
+  }, {
+    title: '关联账号数',
+    dataIndex: 'bindAccountCount',
+    key: 'bindAccountCount',
+    render: function render(bindAccountCount) {
+      return /*#__PURE__*/_jsx(Money, {
+        precision: 0,
+        pre: "",
+        end: "\u4E2A",
+        value: bindAccountCount
+      });
+    }
   }, {
     title: /*#__PURE__*/_jsx(_Fragment, {
       children: "\u662F\u5426\u542F\u7528"
@@ -172,11 +196,6 @@ var VideoPublishVideoAccountProxy = function VideoPublishVideoAccountProxy(_ref)
     }),
     loadingDel = _useRequest2.loading,
     runDel = _useRequest2.run;
-  var onSearch = function onSearch(keyword) {
-    var _keyword$replace;
-    var list = (keyword === null || keyword === void 0 || (_keyword$replace = keyword.replace(/\s+/g, '')) === null || _keyword$replace === void 0 ? void 0 : _keyword$replace.split('')) || [];
-    run();
-  };
   var onCreate = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(id) {
       var dialog;
@@ -184,7 +203,7 @@ var VideoPublishVideoAccountProxy = function VideoPublishVideoAccountProxy(_ref)
         while (1) switch (_context.prev = _context.next) {
           case 0:
             dialog = Tool.drawer({
-              title: '编辑',
+              title: '编辑网络代理',
               content: /*#__PURE__*/_jsx(VideoPublishVideoAccountProxyCreate, {
                 id: id,
                 env: env,

package/dist/VideoPublish/proxy/list.less

@@ -1,3 +1,10 @@
 .videoPublishVideoAccountProxy{
+  .timeWarn{
+    color: #FFF;
+    background-color: #C00;
+    padding: 2px 6px;
+    line-height: 1em;
+    border-radius: 3px;
+  }
 
 }

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

@@ -84,8 +84,11 @@ var VideoPublishTaskList = function VideoPublishTaskList(_ref) {
     title: /*#__PURE__*/_jsx(_Fragment, {
       children: "\u72B6\u6001"
     }),
-    dataIndex: 'taskStatus',
-    key: 'taskStatus'
+    dataIndex: 'planStatus',
+    key: 'planStatus',
+    render: function render(planStatus) {
+      return ''; // <VideoPublishTaskPlanStatus status={ planStatus } />
+    }
   }, {
     title: /*#__PURE__*/_jsx(_Fragment, {
       children: "\u5F00\u59CB\u65F6\u95F4"
@@ -152,7 +155,7 @@ var VideoPublishTaskList = function VideoPublishTaskList(_ref) {
         env: env,
         publishTaskId: publishTaskId
       }),
-      width: 1020
+      width: 1200
     });
   };
   return /*#__PURE__*/_jsx(PageContentWarp, {

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

@@ -5,15 +5,17 @@ import "./list.less";
 import PageContentWarp from "../../../UI/PageContentWarp";
 import { useRequest } from "@umijs/hooks";
 import * as VideoPublishTaskPlanController from "../../../service/api/VideoPublishTaskPlanController";
-import { Button, Popover, Space, Table } from "antd";
+import { Popover, Table, Tooltip } from "antd";
 import Time from "../../../UI/Time";
 import VideoPublishTaskPlanStatus from "./status";
-import { FileTextOutlined, VideoCameraOutlined } from "@ant-design/icons";
+import { FileTextOutlined, QuestionCircleOutlined, VideoCameraOutlined } from "@ant-design/icons";
 import VideoKindTag from "../../../component/videoKindTag";
 import { onMediaShowView } from "../../../component/media-show";
 import VideoPublishVideoAccountBaseInfo from "../../video-account/base-info";
+import VideoPublishTaskPlanOperate from "./operate";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var VideoPublishTaskPlanList = function VideoPublishTaskPlanList(_ref) {
   var env = _ref.env,
     _ref$publishTaskId = _ref.publishTaskId,
@@ -64,15 +66,27 @@ var VideoPublishTaskPlanList = function VideoPublishTaskPlanList(_ref) {
         accountInfo: record === null || record === void 0 ? void 0 : record.accountInfo
       });
     }
+  }, {
+    title: '来源任务',
+    dataIndex: 'productTaskId',
+    key: 'productTaskId'
   }, {
     title: /*#__PURE__*/_jsx(_Fragment, {
       children: "\u72B6\u6001"
     }),
     dataIndex: 'status',
     key: 'status',
-    render: function render(status) {
-      return /*#__PURE__*/_jsx(VideoPublishTaskPlanStatus, {
-        status: status
+    render: function render(status, record) {
+      return /*#__PURE__*/_jsxs("div", {
+        children: [/*#__PURE__*/_jsx(VideoPublishTaskPlanStatus, {
+          status: status
+        }), (record === null || record === void 0 ? void 0 : record.taskMessage) && /*#__PURE__*/_jsx(Tooltip, {
+          title: record === null || record === void 0 ? void 0 : record.taskMessage,
+          children: /*#__PURE__*/_jsx("a", {
+            className: "high",
+            children: /*#__PURE__*/_jsx(QuestionCircleOutlined, {})
+          })
+        })]
       });
     }
   }, {
@@ -114,7 +128,7 @@ var VideoPublishTaskPlanList = function VideoPublishTaskPlanList(_ref) {
       });
     }
   }, {
-    title: '带货/小程序',
+    title: '标签',
     dataIndex: 'kindTagValue',
     key: 'kindTagValue',
     render: function render(kindTagValue, record) {
@@ -128,7 +142,7 @@ var VideoPublishTaskPlanList = function VideoPublishTaskPlanList(_ref) {
       });
     }
   }, {
-    title: '商品标题',
+    title: '品标',
     dataIndex: 'goodsTitle',
     key: 'goodsTitle',
     render: function render(goodsTitle, record) {
@@ -157,7 +171,7 @@ var VideoPublishTaskPlanList = function VideoPublishTaskPlanList(_ref) {
     }
   }, {
     title: /*#__PURE__*/_jsx(_Fragment, {
-      children: "\u53D1\u5E03\u65F6\u95F4"
+      children: "\u5BF9\u5916\u5C55\u793A"
     }),
     dataIndex: 'publishTime',
     key: 'publishTime',
@@ -171,16 +185,16 @@ var VideoPublishTaskPlanList = function VideoPublishTaskPlanList(_ref) {
     dataIndex: '——',
     key: '——',
     render: function render(_, record) {
-      return /*#__PURE__*/_jsx(Space, {
-        children: /*#__PURE__*/_jsx(Button, {
-          type: "link",
-          size: "small",
-          disabled: true,
-          onChange: function onChange() {
-            return onPause((record === null || record === void 0 ? void 0 : record.id) || 0);
-          },
-          children: "\u5E9F\u9664"
-        })
+      // const status = record?.status || '';
+      if (!record) {
+        return record;
+      }
+      return /*#__PURE__*/_jsx(VideoPublishTaskPlanOperate, {
+        itemData: record,
+        env: env,
+        onStatusChange: function onStatusChange() {
+          runTaskList();
+        }
       });
     }
   }];
@@ -188,7 +202,6 @@ var VideoPublishTaskPlanList = function VideoPublishTaskPlanList(_ref) {
     setQuery(_objectSpread({}, query));
     runTaskList(query, 1);
   };
-  var onPause = function onPause(planId) {};
   var _useRequest = useRequest(function () {
       var postQuery = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : query;
       var current = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : pagination.current;
@@ -229,6 +242,9 @@ var VideoPublishTaskPlanList = function VideoPublishTaskPlanList(_ref) {
       rowKey: function rowKey(record) {
         return "".concat(record.id);
       },
+      rowClassName: function rowClassName(record) {
+        return "row-".concat(record.status);
+      },
       loading: false,
       columns: columns,
       dataSource: listData,

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

@@ -78,4 +78,10 @@
       opacity: 0.6;
     }
   }
+
+  .row-repeal{
+    //opacity: 0.5;
+    -webkit-filter: grayscale(100%);
+    filter: grayscale(100%);
+  }
 }

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

@@ -0,0 +1,8 @@
+import React from "react";
+interface Props {
+    env?: Global.Env;
+    itemData: VideoPublishTaskPlan.List;
+    onStatusChange: () => void;
+}
+declare const VideoPublishTaskPlanOperate: React.FC<Props>;
+export default VideoPublishTaskPlanOperate;

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

@@ -0,0 +1,73 @@
+import { Button, Popconfirm, Space } from "antd";
+import React from "react";
+import { useRequest } from "@umijs/hooks";
+import * as VideoPublishTaskPlanController from "../../../service/api/VideoPublishTaskPlanController";
+import { RedoOutlined, StopOutlined } from "@ant-design/icons";
+import Tool from "../../../lib/Tool";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var VideoPublishTaskPlanOperate = function VideoPublishTaskPlanOperate(_ref) {
+  var env = _ref.env,
+    itemData = _ref.itemData,
+    _ref$onStatusChange = _ref.onStatusChange,
+    onStatusChange = _ref$onStatusChange === void 0 ? function () {} : _ref$onStatusChange;
+  var _useRequest = useRequest(function () {
+      return VideoPublishTaskPlanController.repeal({
+        planId: itemData.id
+      }, {
+        env: env
+      });
+    }, {
+      manual: true,
+      onSuccess: function onSuccess() {
+        Tool.toast('已经改为【废除】状态');
+        onStatusChange();
+      }
+    }),
+    runRepeal = _useRequest.run,
+    loadingRepeal = _useRequest.loading;
+  var _useRequest2 = useRequest(function () {
+      return VideoPublishTaskPlanController.retry({
+        planId: itemData.id
+      }, {
+        env: env
+      });
+    }, {
+      manual: true,
+      onSuccess: function onSuccess() {
+        Tool.toast('已经改为【等待】状态');
+        onStatusChange();
+      }
+    }),
+    runRetry = _useRequest2.run,
+    loadingRetry = _useRequest2.loading;
+  return /*#__PURE__*/_jsxs(Space, {
+    children: [/*#__PURE__*/_jsx(Popconfirm, {
+      title: "\u5E9F\u9664",
+      description: "\u5E9F\u9664\u540E\uFF0C\u4E0D\u53EF\u6062\u590D\uFF01",
+      onConfirm: function onConfirm() {
+        return runRepeal();
+      },
+      children: ['wait', 'fail'].includes(itemData.status) && /*#__PURE__*/_jsx(Button, {
+        type: "primary",
+        size: "small",
+        ghost: true,
+        danger: true,
+        icon: /*#__PURE__*/_jsx(StopOutlined, {}),
+        loading: loadingRepeal,
+        children: "\u5E9F\u9664"
+      })
+    }), ['fail', 'progress'].includes(itemData.status) && /*#__PURE__*/_jsx(Button, {
+      type: "primary",
+      size: "small",
+      ghost: true,
+      icon: /*#__PURE__*/_jsx(RedoOutlined, {}),
+      loading: loadingRetry,
+      onClick: function onClick() {
+        return runRetry();
+      },
+      children: "\u91CD\u8BD5"
+    })]
+  });
+};
+export default VideoPublishTaskPlanOperate;

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Tag } from 'antd';
-import { CheckCircleOutlined, ClockCircleOutlined, LoadingOutlined, WarningOutlined } from "@ant-design/icons";
+import { CheckCircleOutlined, ClockCircleOutlined, LoadingOutlined, StopOutlined, WarningOutlined } from "@ant-design/icons";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 // ENUM('wait', 'progress', 'finish', 'fail')
@@ -25,6 +25,11 @@ export var VideoPublishTaskPlanStatusList = [{
   icon: /*#__PURE__*/_jsx(WarningOutlined, {}),
   title: '失败',
   color: 'red'
+}, {
+  status: 'repeal',
+  icon: /*#__PURE__*/_jsx(StopOutlined, {}),
+  title: '已废除',
+  color: ''
 }];
 var VideoPublishTaskPlanStatusDict = function () {
   var dict = {};

package/dist/component/is-installed-chrome.js

@@ -1,5 +1,6 @@
+import AccountManageSettingConfig from "../lib/accountManageSettingConfig";
 var isInstalledChrome = function isInstalledChrome() {
-  var _window$getBridge, _window;
-  return !!((_window$getBridge = (_window = window).getBridge) !== null && _window$getBridge !== void 0 && _window$getBridge.call(_window).getChromiumPath());
+  var settingConfig = AccountManageSettingConfig();
+  return !!settingConfig.chromePath;
 };
 export default isInstalledChrome;

package/dist/global.less

@@ -10,6 +10,9 @@
 }
 
 a{
+  &.high{
+    color: #C00;
+  }
   &.disabled{
     color: #CCC;
     cursor: not-allowed;

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: "success" | "info" | "warning" | "error", message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
+    notification(type: "error" | "success" | "info" | "warning", 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/service/api/VideoPublishTaskPlanController.d.ts

@@ -3,3 +3,9 @@ export declare function list(body: {
     current: number;
     pageSize: number;
 }, options?: Global.RequestOptions): Promise<VideoPublishTaskPlan.ListResult>;
+export declare function repeal(body: {
+    planId: number;
+}, options?: Global.RequestOptions): Promise<boolean>;
+export declare function retry(body: {
+    planId: number;
+}, options?: Global.RequestOptions): Promise<boolean>;

package/dist/service/api/VideoPublishTaskPlanController.js

@@ -25,4 +25,50 @@ function _list() {
     }, _callee);
   }));
   return _list.apply(this, arguments);
+}
+export function repeal(_x3, _x4) {
+  return _repeal.apply(this, arguments);
+}
+function _repeal() {
+  _repeal = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(body, options) {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          return _context2.abrupt("return", request(PublishDomainApi("user/publishTaskPlan/repeal", options === null || options === void 0 ? void 0 : options.env), _objectSpread({
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            data: _objectSpread({}, body)
+          }, options || {})));
+        case 1:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _repeal.apply(this, arguments);
+}
+export function retry(_x5, _x6) {
+  return _retry.apply(this, arguments);
+}
+function _retry() {
+  _retry = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(body, options) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          return _context3.abrupt("return", request(PublishDomainApi("user/publishTaskPlan/retry", options === null || options === void 0 ? void 0 : options.env), _objectSpread({
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            data: _objectSpread({}, body)
+          }, options || {})));
+        case 1:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return _retry.apply(this, arguments);
 }

package/dist/types/VideoPublishTaskPlan.d.ts

@@ -1,5 +1,5 @@
 declare namespace VideoPublishTaskPlan {
-    type PlanStatus = 'wait' | 'progress' | 'finish' | 'fail';
+    type PlanStatus = 'wait' | 'progress' | 'finish' | 'fail' | 'repeal';
     interface ListResult {
         list: List[];
         pagination: Global.Pagination;
@@ -16,6 +16,7 @@ declare namespace VideoPublishTaskPlan {
         kindTagValue: string;
         videoUrl: string;
         publishTime: number;
+        taskMessage: string;
         accountInfo: VideoPublishVideoAccount.BaseInfo;
     }
     interface ListQuery {

package/dist/types/VideoPublishVideoAccountProxy.d.ts

@@ -8,6 +8,7 @@ declare namespace VideoPublishVideoAccountProxy {
         enabled: boolean;
         username: string;
         password: string;
+        expired: number;
         created: number;
         updated: number;
     }
@@ -27,6 +28,7 @@ declare namespace VideoPublishVideoAccountProxy {
         port: number;
         enabled: boolean;
         username: string;
+        expired: number;
         password: string;
     }
     interface CreateProxyQuery {

package/dist/typings/VideoPublishVideoAccount.d.ts

@@ -1,6 +1,7 @@
 declare namespace VideoPublishVideoAccount {
     interface CreateQuery {
         detail: CreateQueryDetail;
+        proxyId: number;
     }
     interface CreateQueryDetail {
         avatar: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "component-shipinlv",
-  "version": "1.1.22",
+  "version": "1.1.25",
   "description": "",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -40,7 +40,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "antd": "^5.x",
+    "antd": "^5.20",
     "react": ">=18.x",
     "react-dom": ">=18.x"
   },