component-shipinlv 1.1.19 → 1.1.21

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

@@ -83,24 +83,30 @@ var VideoPublishAccountManageHomePage = function VideoPublishAccountManageHomePa
     label: '个性签名',
     children: accountDetail.signature
   }];
-  var _useState3 = useState([{
-      label: '创作者中心(发视频)',
-      key: 'creator'
-    }]),
-    _useState4 = _slicedToArray(_useState3, 1),
-    openMenuItems = _useState4[0];
-  var onOpen = function onOpen(key) {
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    openMenuItems = _useState4[0],
+    setOpenMenuItems = _useState4[1];
+  var onOpen = function onOpen(url) {
     var _window$getBridge;
-    switch (key) {
-      case 'creator':
-        var url = '';
-        if (accountDetail.platform === 'douyin') {
-          url = 'https://creator.douyin.com/creator-micro/home';
-        }
-        (_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);
+    Tool.toast('正在打开浏览器， 请稍等...', 8);
+  };
+  var onOpenMenuItems = function onOpenMenuItems(platform) {
+    switch (platform) {
+      case 'douyin':
+        setOpenMenuItems([{
+          label: '创作者中心(发视频)',
+          key: 'https://creator.douyin.com/creator-micro/home'
+        }]);
+        break;
+      case 'tiktok':
+        setOpenMenuItems([{
+          label: 'Tiktok',
+          key: 'https://www.tiktok.com/'
+        }]);
         break;
     }
-    Tool.toast('正在打开浏览器， 请稍等...', 8);
   };
   return /*#__PURE__*/_jsxs("div", {
     className: "videoPublishAccountManageHome",
@@ -112,8 +118,9 @@ var VideoPublishAccountManageHomePage = function VideoPublishAccountManageHomePa
         // setAccountListData( list )
       },
       onMenu: onMenu,
-      onCurrent: function onCurrent(userInfo) {
-        return setAccountDetail(userInfo);
+      onCurrent: function onCurrent(detail) {
+        setAccountDetail(detail);
+        onOpenMenuItems(detail.platform);
       }
     }), /*#__PURE__*/_jsx("div", {
       className: "contents",

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,
@@ -177,7 +188,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 +214,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 +250,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/create.js

@@ -1,7 +1,7 @@
 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 } from 'antd';
+import { Button, Form, Input, InputNumber, Switch } from 'antd';
 import { useRequest } from "@umijs/hooks";
 import PageContentWarp from "../../UI/PageContentWarp";
 import DialogDrawerFooter from "../../UI/DialogDrawerFooter";
@@ -140,6 +140,13 @@ 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: "enabled",
+        label: "\u662F\u5426\u542F\u7528",
+        children: /*#__PURE__*/_jsx(Switch, {
+          unCheckedChildren: "\u5DF2\u7981\u7528",
+          checkedChildren: "\u5DF2\u542F\u7528"
+        })
       }), /*#__PURE__*/_jsx(DialogDrawerFooter, {
         children: /*#__PURE__*/_jsx(Button, {
           type: "primary",

package/dist/VideoPublish/proxy/list.js

@@ -11,6 +11,7 @@ import { Button, Popconfirm, Popover, Space, Table, Tag } from "antd";
 import LayoutContent from "../../UI/LayoutContent";
 import VideoPublishVideoAccountProxyQuery from "./query";
 import VideoPublishVideoAccountProxyCreate from "./create";
+import { PlusCircleOutlined } 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";
@@ -215,6 +216,16 @@ var VideoPublishVideoAccountProxy = function VideoPublishVideoAccountProxy(_ref)
   };
   return /*#__PURE__*/_jsx(LayoutContent, {
     title: "\u7F51\u7EDC\u4EE3\u7406",
+    subtitle: /*#__PURE__*/_jsx(Button, {
+      size: "small",
+      type: "link",
+      ghost: true,
+      icon: /*#__PURE__*/_jsx(PlusCircleOutlined, {}),
+      onClick: function onClick() {
+        return onCreate(0);
+      },
+      children: "\u6DFB\u52A0\u4EE3\u7406"
+    }),
     extInfo: /*#__PURE__*/_jsx(VideoPublishVideoAccountProxyQuery, {
       loading: loading,
       defaultQuery: query,

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

@@ -0,0 +1,10 @@
+import React from 'react';
+import './select.less';
+interface Props {
+    env?: Global.Env;
+    nickname: string;
+    videoAccountProxyId: number;
+    onSuccess: (id: number, proxyInfo: VideoPublishVideoAccountProxy.List) => void;
+}
+declare const VideoPublishVideoAccountProxySelect: React.FC<Props>;
+export default VideoPublishVideoAccountProxySelect;

package/dist/VideoPublish/proxy/select.js

@@ -0,0 +1,109 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useState } from 'react';
+import { Button, Form, Select, Tag } from 'antd';
+import { useRequest } from "@umijs/hooks";
+import PageContentWarp from "../../UI/PageContentWarp";
+import { AlignLeftOutlined } from "@ant-design/icons";
+import DialogDrawerFooter from "../../UI/DialogDrawerFooter";
+import "./select.less";
+import * as VideoPublishVideoAccountProxyController from "../../service/api/VideoPublishVideoAccountProxyController";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var VideoPublishVideoAccountProxySelect = function VideoPublishVideoAccountProxySelect(_ref) {
+  var env = _ref.env,
+    nickname = _ref.nickname,
+    videoAccountProxyId = _ref.videoAccountProxyId,
+    onSuccess = _ref.onSuccess;
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    listData = _useState2[0],
+    setListData = _useState2[1];
+  var _useRequest = useRequest(function () {
+      return VideoPublishVideoAccountProxyController.list({
+        current: 1,
+        pageSize: 100
+      }, {
+        env: env
+      });
+    }, {
+      onSuccess: function onSuccess(result) {
+        setListData(result.list);
+        form.setFieldsValue({
+          id: videoAccountProxyId
+        });
+      }
+    }),
+    loading = _useRequest.loading,
+    run = _useRequest.run;
+  var onFinish = function onFinish(values) {
+    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,
+    className: "videoAccountGroupSelect",
+    children: /*#__PURE__*/_jsxs(Form, {
+      labelCol: {
+        span: 4
+      },
+      form: form,
+      disabled: loading,
+      onFinish: onFinish,
+      children: [/*#__PURE__*/_jsx(Form.Item, {
+        label: "\u8D26\u6237\u540D\u79F0",
+        children: /*#__PURE__*/_jsx("strong", {
+          children: nickname
+        })
+      }), /*#__PURE__*/_jsx(Form.Item, {
+        name: "id",
+        label: "\u4EE3\u7406\u5217\u8868",
+        children: /*#__PURE__*/_jsxs(Select, {
+          className: "videoAccountGroupSelectIp",
+          popupClassName: "videoAccountGroupSelectIp",
+          children: [/*#__PURE__*/_jsxs(Select.Option, {
+            value: 0,
+            children: [/*#__PURE__*/_jsx(AlignLeftOutlined, {}), " \u8BF7\u9009\u62E9\u7F51\u7EDC\u4EE3\u7406"]
+          }), listData.map(function (items) {
+            return /*#__PURE__*/_jsx(Select.Option, {
+              value: items.id,
+              disabled: !items.enabled,
+              children: /*#__PURE__*/_jsxs("div", {
+                className: "selectOption",
+                children: [/*#__PURE__*/_jsx("div", {
+                  className: "ip",
+                  children: items.ip
+                }), /*#__PURE__*/_jsx("div", {
+                  className: "title",
+                  children: items.title
+                }), /*#__PURE__*/_jsx("div", {
+                  className: "area",
+                  children: /*#__PURE__*/_jsx(Tag, {
+                    children: items.area
+                  })
+                })]
+              })
+            }, items.id);
+          })]
+        })
+      }), /*#__PURE__*/_jsx(DialogDrawerFooter, {
+        children: /*#__PURE__*/_jsx(Button, {
+          type: "primary",
+          htmlType: "submit",
+          loading: loading,
+          children: "\u4FDD\u5B58"
+        })
+      })]
+    })
+  });
+};
+export default VideoPublishVideoAccountProxySelect;

package/dist/VideoPublish/proxy/select.less

@@ -0,0 +1,17 @@
+.videoAccountGroupSelect{
+
+}
+
+.videoAccountGroupSelectIp{
+  .selectOption{
+    display: flex;
+    flex-direction: row;
+    .ip{
+      min-width: 100px;
+    }
+    .title{
+      margin: 0 10px;
+    }
+  }
+
+}

package/dist/VideoPublish/video-account/index.js

@@ -5,6 +5,7 @@ import "./index.less";
 import PageContentWarp from "../../UI/PageContentWarp";
 import { useRequest } from "@umijs/hooks";
 import * as VideoPublishController from "../../service/api/VideoPublishController";
+import * as VideoPublishVideoAccountController from "../../service/api/VideoPublishVideoAccountController";
 import { Avatar, Button, Divider, Space, Table, Tag } from "antd";
 import VideoPublishVideoAccountListQuery from "./query";
 import VideoPlatform from "../../component/video-platform/logo";
@@ -13,6 +14,7 @@ import { PlusCircleOutlined } from "@ant-design/icons";
 import Tool from "../../lib/Tool";
 import VideoAccountGroup from "./group";
 import VideoAccountCreate from "./create";
+import VideoPublishVideoAccountProxySelect from "../proxy/select";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -176,9 +178,8 @@ var VideoPublishVideoAccount = function VideoPublishVideoAccount(_ref) {
         }), /*#__PURE__*/_jsx(Button, {
           type: "link",
           size: "small",
-          disabled: true,
           onClick: function onClick() {
-            return onProxyEdit(id);
+            return onProxyEdit((record === null || record === void 0 ? void 0 : record.nickname) || '', id, record === null || record === void 0 ? void 0 : record.videoAccountProxyId);
           },
           children: "\u4EE3\u7406"
         })]
@@ -203,11 +204,42 @@ var VideoPublishVideoAccount = function VideoPublishVideoAccount(_ref) {
     runVideoAccount = _useRequest.run,
     loadingVideoAccount = _useRequest.loading,
     errorVideoAccount = _useRequest.error;
+  var _useRequest2 = useRequest(function (data) {
+      return VideoPublishVideoAccountController.createProxy(data, {
+        env: env
+      });
+    }, {
+      manual: true,
+      onSuccess: function onSuccess(result) {
+        Tool.toast('代理保存成功');
+        runVideoAccount();
+      }
+    }),
+    loadingProxyCreate = _useRequest2.loading,
+    runProxyCreate = _useRequest2.run;
   var _onQuery = function onQuery(query) {
     setQuery(_objectSpread({}, query));
     runVideoAccount(query);
   };
-  var onProxyEdit = function onProxyEdit(id) {};
+  var onProxyEdit = function onProxyEdit(nickname, videoAccountId) {
+    var videoAccountProxyId = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+    var dialog = Tool.drawer({
+      title: '编辑代理',
+      content: /*#__PURE__*/_jsx(VideoPublishVideoAccountProxySelect, {
+        env: env,
+        nickname: nickname,
+        videoAccountProxyId: videoAccountProxyId,
+        onSuccess: function onSuccess(newVideoAccountProxyId) {
+          runProxyCreate({
+            videoAccountId: videoAccountId,
+            videoAccountProxyId: newVideoAccountProxyId
+          });
+          dialog.destroy();
+        }
+      }),
+      width: 680
+    });
+  };
   var onCreateGroup = function onCreateGroup() {
     var groupId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
     var dialog = Tool.drawer({
@@ -249,6 +281,7 @@ var VideoPublishVideoAccount = function VideoPublishVideoAccount(_ref) {
       size: "small",
       type: "primary",
       ghost: true,
+      loading: loadingProxyCreate,
       onClick: function onClick() {
         return onCreateGroup(0);
       },

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

@@ -11,22 +11,25 @@ export var VideoPlatformList = [{
   // auth login
   allowMainDomainList: ['douyin.com', 'iesdouyin.com']
 }, {
-  platform: 'buyin',
-  name: '巨量百应',
-  videoWebSiteUrl: 'https://buyin.jinritemai.com/dashboard/merch-picking-library',
+  platform: 'tiktok',
+  name: 'Tiktok',
+  videoWebSiteUrl: 'https://www.tiktok.com/',
   // auth login
-  allowMainDomainList: ['buyin.jinritemai.com']
-}, {
+  allowMainDomainList: ['tiktok.com']
+},
+// {
+//   platform: 'buyin',
+//   name: '巨量百应',
+//   videoWebSiteUrl: 'https://buyin.jinritemai.com/dashboard/merch-picking-library', // auth login
+//   allowMainDomainList: [
+//     'buyin.jinritemai.com',
+//   ],
+// },
+{
   platform: 'kuaishou',
   name: '快手',
   videoWebSiteUrl: 'https://www.kuaishou.com/',
   allowMainDomainList: ['kuaishou.com']
-}, {
-  platform: 'tiktok',
-  name: 'Tiktok',
-  disabled: true,
-  videoWebSiteUrl: 'https://www.tiktok.com/',
-  allowMainDomainList: ['tiktok.com']
 }
 // {
 //   platform: 'bilibili',

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

@@ -21,6 +21,9 @@
     &.buyin{
       background-image: url("../../asset/image/platform/buyin.png");
     }
+    &.tiktok{
+      background-image: url("../../asset/image/platform/tiktok.png");
+    }
     &.kuaishou{
       background-image: url("../../asset/image/platform/kuaishou.png");
     }

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

@@ -13,3 +13,4 @@ export declare function del(body: {
 }>;
 export declare function detail(body: VideoPublishVideoAccount.DetailQuery, options?: Global.RequestOptions): Promise<VideoPublishVideoAccount.Detail>;
 export declare function saveLoginStatus(body: VideoPublishVideoAccount.SaveLoginStatus, options?: Global.RequestOptions): Promise<boolean>;
+export declare function createProxy(body: VideoPublishVideoAccountProxy.CreateProxyQuery, options?: Global.RequestOptions): Promise<boolean>;

package/dist/service/api/VideoPublishVideoAccountController.js

@@ -188,4 +188,27 @@ function _saveLoginStatus() {
     }, _callee8);
   }));
   return _saveLoginStatus.apply(this, arguments);
+}
+export function createProxy(_x17, _x18) {
+  return _createProxy.apply(this, arguments);
+}
+function _createProxy() {
+  _createProxy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(body, options) {
+    return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+      while (1) switch (_context9.prev = _context9.next) {
+        case 0:
+          return _context9.abrupt("return", request(PublishDomainApi("user/videoAccount/createProxy", 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 _context9.stop();
+      }
+    }, _callee9);
+  }));
+  return _createProxy.apply(this, arguments);
 }

package/dist/types/VideoPublish.d.ts

@@ -74,6 +74,7 @@ declare namespace VideoPublish {
         followerCount: number;
         followingCount: number;
         favoritedCount: number;
+        videoAccountProxyId: number;
         videoCount: number;
         created: number;
         updated: number;

package/dist/types/VideoPublishVideoAccountProxy.d.ts

@@ -29,4 +29,8 @@ declare namespace VideoPublishVideoAccountProxy {
         username: string;
         password: string;
     }
+    interface CreateProxyQuery {
+        videoAccountId: number;
+        videoAccountProxyId: number;
+    }
 }

package/dist/typings.d.ts

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

package/package.json

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