component-shipinlv 1.1.20 → 1.1.22

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

@@ -34,7 +34,8 @@ var VideoPublishAccountManageHomePage = function VideoPublishAccountManageHomePa
       favoritedCount: 0,
       videoCount: 0,
       created: 0,
-      updated: 0
+      updated: 0,
+      proxyInfo: {}
     }),
     _useState2 = _slicedToArray(_useState, 2),
     accountDetail = _useState2[0],
@@ -89,7 +90,7 @@ var VideoPublishAccountManageHomePage = function VideoPublishAccountManageHomePa
     setOpenMenuItems = _useState4[1];
   var onOpen = function onOpen(url) {
     var _window$getBridge;
-    (_window$getBridge = window.getBridge()) === null || _window$getBridge === void 0 || _window$getBridge.openVideoAccountBrowser(accountDetail.platform, '', accountDetail.accountId, url);
+    (_window$getBridge = window.getBridge()) === null || _window$getBridge === void 0 || _window$getBridge.openVideoAccountBrowser(accountDetail.platform, '', accountDetail.accountId, url, accountDetail.proxyInfo);
     Tool.toast('正在打开浏览器， 请稍等...', 8);
   };
   var onOpenMenuItems = function onOpenMenuItems(platform) {

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

@@ -6,7 +6,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useEffect, useState, useRef } from 'react';
 import { Button, Divider, Dropdown, Empty, Input, Space, Tooltip } from 'antd';
 import "./list.less";
-import { PlusCircleOutlined, SearchOutlined } from '@ant-design/icons';
+import { PlusCircleOutlined, SearchOutlined, GlobalOutlined } from '@ant-design/icons';
 import { useRequest } from "@umijs/hooks";
 import * as VideoPublishVideoAccountController from "../../service/api/VideoPublishVideoAccountController";
 import PageContentWarp from "../../UI/PageContentWarp";
@@ -22,6 +22,7 @@ import VideoPlatform from "../../component/video-platform/logo";
 import isInstalledChrome from "../../component/is-installed-chrome";
 import Tool from "../../lib/Tool";
 import VideoPublishVideoAccountBaseInfo from "../video-account/base-info";
+import VideoPublishVideoAccountProxySelect from "../proxy/select";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -63,6 +64,16 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
     _useState14 = _slicedToArray(_useState13, 2),
     listData = _useState14[0],
     setListData = _useState14[1];
+  var _useState15 = useState({
+      id: 0,
+      ip: '',
+      port: 0,
+      username: '',
+      password: ''
+    }),
+    _useState16 = _slicedToArray(_useState15, 2),
+    proxyInfo = _useState16[0],
+    setProxyInfo = _useState16[1];
   var _useRequest = useRequest(function () {
       return VideoPublishVideoAccountController.list({
         current: 1,
@@ -124,7 +135,8 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
         favoritedCount: 0,
         videoCount: 0,
         created: 0,
-        updated: 0
+        updated: 0,
+        proxyInfo: {}
       });
       return;
     }
@@ -177,7 +189,7 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
             // window.bridge.ipcRenderer.sendMessage( eventName ); // 添加抖音账号
             settingConfig = AccountManageSettingConfig();
             _context.next = 9;
-            return (_window$getBridge = (_window = window).getBridge) === null || _window$getBridge === void 0 || (_window$getBridge = _window$getBridge.call(_window)) === null || _window$getBridge === void 0 ? void 0 : _window$getBridge.ipcRenderer.invoke('shipinlv-video-account-add', platform, settingConfig.isChromeOpen).catch(function (err) {
+            return (_window$getBridge = (_window = window).getBridge) === null || _window$getBridge === void 0 || (_window$getBridge = _window$getBridge.call(_window)) === null || _window$getBridge === void 0 ? void 0 : _window$getBridge.ipcRenderer.invoke('shipinlv-video-account-add', platform, proxyInfo, settingConfig.isChromeOpen).catch(function (err) {
               Notification.notificationError('获取账号信息错误' + ((err === null || err === void 0 ? void 0 : err.message) || JSON.stringify(err)));
             });
           case 9:
@@ -203,6 +215,21 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
+  var onProxy = function onProxy() {
+    var dialog = Tool.drawer({
+      title: '编辑代理',
+      content: /*#__PURE__*/_jsx(VideoPublishVideoAccountProxySelect, {
+        env: env,
+        nickname: "[\u5F85\u6DFB\u52A0]",
+        videoAccountProxyId: proxyInfo.id || 0,
+        onSuccess: function onSuccess(newVideoAccountProxyId, info) {
+          setProxyInfo(_objectSpread({}, info));
+          dialog.destroy();
+        }
+      }),
+      width: 680
+    });
+  };
   useEffect(function () {
     var platformMenuItems = [];
     VideoPlatformList.forEach(function (item) {
@@ -224,19 +251,31 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
   var addButton = function addButton() {
     return /*#__PURE__*/_jsx("div", {
       className: "addButton",
-      children: /*#__PURE__*/_jsx(Dropdown, {
-        placement: "top",
-        menu: {
-          items: platformMenuItems,
-          onClick: function onClick(e) {
-            return onAdd(e.key);
-          }
-        },
-        children: /*#__PURE__*/_jsx(Button, {
-          icon: /*#__PURE__*/_jsx(PlusCircleOutlined, {}),
-          type: "primary",
-          children: "\u6DFB\u52A0\u89C6\u9891\u8D26\u53F7"
-        })
+      children: /*#__PURE__*/_jsxs(Space, {
+        children: [/*#__PURE__*/_jsx(Tooltip, {
+          title: "\u8BBE\u7F6E\u4EE3\u7406",
+          children: /*#__PURE__*/_jsx(Button, {
+            type: "primary",
+            ghost: !proxyInfo.ip,
+            onClick: function onClick() {
+              return onProxy();
+            },
+            children: /*#__PURE__*/_jsx(GlobalOutlined, {})
+          })
+        }), /*#__PURE__*/_jsx(Dropdown, {
+          placement: "top",
+          menu: {
+            items: platformMenuItems,
+            onClick: function onClick(e) {
+              return onAdd(e.key);
+            }
+          },
+          children: /*#__PURE__*/_jsx(Button, {
+            icon: /*#__PURE__*/_jsx(PlusCircleOutlined, {}),
+            type: "primary",
+            children: "\u8D26\u53F7"
+          })
+        })]
       })
     });
   };

package/dist/VideoPublish/proxy/select.d.ts

@@ -4,7 +4,7 @@ interface Props {
     env?: Global.Env;
     nickname: string;
     videoAccountProxyId: number;
-    onSuccess: (id: number) => void;
+    onSuccess: (id: number, proxyInfo: VideoPublishVideoAccountProxy.List) => void;
 }
 declare const VideoPublishVideoAccountProxySelect: React.FC<Props>;
 export default VideoPublishVideoAccountProxySelect;

package/dist/VideoPublish/proxy/select.js

@@ -39,7 +39,15 @@ var VideoPublishVideoAccountProxySelect = function VideoPublishVideoAccountProxy
     loading = _useRequest.loading,
     run = _useRequest.run;
   var onFinish = function onFinish(values) {
-    onSuccess(values.id);
+    var _listData$filter;
+    var item = ((_listData$filter = listData.filter(function (item) {
+      return item.id === values.id;
+    })) === null || _listData$filter === void 0 ? void 0 : _listData$filter[0]) || {
+      id: 0,
+      domain: '',
+      port: 0
+    };
+    onSuccess(values.id, item);
   };
   return /*#__PURE__*/_jsx(PageContentWarp, {
     loading: loading,

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/typings/VideoPublishVideoAccount.d.ts

@@ -47,6 +47,7 @@ declare namespace VideoPublishVideoAccount {
         videoCount: number;
         created: number;
         updated: number;
+        proxyInfo: Global.ProxyInfo;
     }
     interface Detail {
         id: number;

package/dist/typings.d.ts

@@ -72,6 +72,7 @@ declare namespace Global {
   }
 
   interface ProxyInfo {
+    id?: number;
     ip?: string;
     port?: number;
     username?: string;

package/dist/window.d.ts

@@ -19,7 +19,7 @@ declare interface Window{
     getChromiumPath: () => string;
     getClientUniqueKey: () => string;
 
-    openVideoAccountBrowser: ( platform: string, subPlatform: string, accountId: string, url: string ) => void;
+    openVideoAccountBrowser: ( platform: string, subPlatform: string, accountId: string, url: string , proxyInfo?: Global.ProxyInfo ) => void;
   };
 
   getClientIdentity: () => Promise<string>;

package/package.json

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