component-shipinlv 1.1.7 → 1.1.8

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

@@ -5,7 +5,7 @@ import "./index.less";
 import PageContentWarp from "../../UI/PageContentWarp";
 import { useRequest } from "@umijs/hooks";
 import * as VideoPublishController from "../../service/api/VideoPublishController";
-import { Avatar, Button, Divider, Table, Tag } from "antd";
+import { Avatar, Button, Divider, Space, Table, Tag } from "antd";
 import VideoPublishVideoAccountListQuery from "./query";
 import VideoPlatform from "../../component/video-platform/logo";
 import Money from "../../UI/Money";
@@ -106,6 +106,27 @@ var VideoPublishVideoAccount = function VideoPublishVideoAccount(_ref) {
         })]
       });
     }
+  }, {
+    title: '网络代理',
+    dataIndex: 'proxyInfo',
+    key: 'proxyInfo',
+    render: function render(proxyInfo, record) {
+      return /*#__PURE__*/_jsxs("div", {
+        className: "proxyInfo",
+        children: [/*#__PURE__*/_jsx("div", {
+          children: proxyInfo.title
+        }), /*#__PURE__*/_jsxs("div", {
+          children: [proxyInfo.ip, proxyInfo.area && /*#__PURE__*/_jsxs(_Fragment, {
+            children: [/*#__PURE__*/_jsx(Divider, {
+              type: "vertical"
+            }), /*#__PURE__*/_jsx("span", {
+              className: "area",
+              children: proxyInfo.area
+            })]
+          })]
+        })]
+      });
+    }
   }, {
     title: /*#__PURE__*/_jsx(_Fragment, {
       children: "\u662F\u5426\u767B\u5F55"
@@ -144,13 +165,23 @@ var VideoPublishVideoAccount = function VideoPublishVideoAccount(_ref) {
     dataIndex: 'id',
     key: 'id',
     render: function render(id, record) {
-      return /*#__PURE__*/_jsx(Button, {
-        type: "link",
-        size: "small",
-        onClick: function onClick() {
-          return onCreate(id);
-        },
-        children: "\u7F16\u8F91"
+      return /*#__PURE__*/_jsxs(Space, {
+        children: [/*#__PURE__*/_jsx(Button, {
+          type: "link",
+          size: "small",
+          onClick: function onClick() {
+            return onCreate(id);
+          },
+          children: "\u7F16\u8F91"
+        }), /*#__PURE__*/_jsx(Button, {
+          type: "link",
+          size: "small",
+          disabled: true,
+          onClick: function onClick() {
+            return onProxyEdit(id);
+          },
+          children: "\u4EE3\u7406"
+        })]
       });
     }
   }];
@@ -176,6 +207,7 @@ var VideoPublishVideoAccount = function VideoPublishVideoAccount(_ref) {
     setQuery(_objectSpread({}, query));
     runVideoAccount(query);
   };
+  var onProxyEdit = function onProxyEdit(id) {};
   var onCreateGroup = function onCreateGroup() {
     var groupId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
     var dialog = Tool.drawer({

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

@@ -41,4 +41,14 @@
     }
   }
 
+  .proxyInfo{
+    font-size: 12px;
+    .area{
+      padding: 2px 3px;
+      background-color: #F2F2F2;
+      border-radius: 3px;
+      font-weight: 300;
+    }
+  }
+
 }

package/dist/component/{media-show.d.ts → media-show/index.d.ts}

@@ -1,5 +1,5 @@
 import React from "react";
-import './media-show.less';
+import './index.less';
 interface Prop {
     title?: string;
     className?: string;
@@ -8,6 +8,6 @@ interface Prop {
     height: number;
 }
 type TypeKind = 'video' | "image" | "font" | 'audio';
-export declare const onMediaShowView: (title: string, url: string, typeKind: '' | TypeKind) => void;
-declare const MediaShow: React.FC<Prop>;
-export default MediaShow;
+export declare const onMediaShowView: (title: string, url: string, typeKind: TypeKind | '') => void;
+declare const Index: React.FC<Prop>;
+export default Index;

package/dist/component/{media-show.js → media-show/index.js}

@@ -1,49 +1,24 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState } from "react";
-import "./media-show.less";
-import Tool from "../lib/Tool";
+import "./index.less";
+import Tool from "../../lib/Tool";
 import { PlayCircleOutlined, SoundOutlined } from "@ant-design/icons";
-import { GetMineTypeByUrl } from "./media-kind";
-import getVideoUrl from "../lib/component/getVideoUrl";
+import { GetMineTypeByUrl } from "../media-kind";
+import MediaShowRender from "./render";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export var onMediaShowView = function onMediaShowView(title, url, typeKind) {
-  var mediaUrl = getVideoUrl(url);
   Tool.drawer({
     title: title,
-    content: /*#__PURE__*/_jsxs("div", {
-      className: "mediaShow",
-      children: [["image", "font"].includes(typeKind) && /*#__PURE__*/_jsx("div", {
-        className: "image",
-        style: {
-          backgroundImage: "url(\"".concat(mediaUrl, "\")")
-        }
-      }), typeKind === "audio" && /*#__PURE__*/_jsx("div", {
-        className: "audio",
-        children: /*#__PURE__*/_jsx("audio", {
-          controls: true,
-          autoPlay: true,
-          children: /*#__PURE__*/_jsx("source", {
-            src: mediaUrl
-          })
-        })
-      }), typeKind === "video" && /*#__PURE__*/_jsx("div", {
-        className: "video",
-        children: /*#__PURE__*/_jsx("video", {
-          width: "100%",
-          height: "100%",
-          controls: true,
-          autoPlay: true,
-          children: /*#__PURE__*/_jsx("source", {
-            src: mediaUrl
-          })
-        })
-      })]
+    content: /*#__PURE__*/_jsx(MediaShowRender, {
+      title: title,
+      url: url,
+      typeKind: typeKind
     }),
     width: 580
   });
 };
-var MediaShow = function MediaShow(_ref) {
+var Index = function Index(_ref) {
   var _ref$title = _ref.title,
     title = _ref$title === void 0 ? '' : _ref$title,
     className = _ref.className,
@@ -81,4 +56,4 @@ var MediaShow = function MediaShow(_ref) {
     })]
   });
 };
-export default MediaShow;
+export default Index;

package/dist/component/media-show/render.d.ts

@@ -0,0 +1,10 @@
+import React from "react";
+import './render.less';
+type TypeKind = 'video' | "image" | "font" | 'audio';
+interface Props {
+    title: string;
+    url: string;
+    typeKind: '' | TypeKind;
+}
+export declare const MediaShowRender: React.FC<Props>;
+export default MediaShowRender;

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

@@ -0,0 +1,111 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useEffect, useState } from "react";
+import "./render.less";
+import Tool from "../../lib/Tool";
+import getVideoUrl from "../../lib/component/getVideoUrl";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+export var MediaShowRender = function MediaShowRender(_ref) {
+  var title = _ref.title,
+    url = _ref.url,
+    typeKind = _ref.typeKind;
+  var _useState = useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    pathLink = _useState2[0],
+    setPathLink = _useState2[1];
+  var fetchVideoAsBlob = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var response, blob, _pathLink;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!/^https?:/i.test(url)) {
+              _context.next = 3;
+              break;
+            }
+            setPathLink(url);
+            return _context.abrupt("return");
+          case 3:
+            _context.prev = 3;
+            _context.next = 6;
+            return fetch(getVideoUrl(url)).catch(function (err) {
+              Tool.toastError('获取视频失败');
+            });
+          case 6:
+            response = _context.sent;
+            if (response) {
+              _context.next = 9;
+              break;
+            }
+            return _context.abrupt("return");
+          case 9:
+            _context.next = 11;
+            return response.blob().catch(function (err) {
+              Tool.toastError('获取视频失败 2:' + (err === null || err === void 0 ? void 0 : err.message));
+            });
+          case 11:
+            blob = _context.sent;
+            if (blob) {
+              _context.next = 14;
+              break;
+            }
+            return _context.abrupt("return");
+          case 14:
+            _pathLink = URL.createObjectURL(blob);
+            setPathLink(_pathLink);
+            // const mediaUrl = getVideoUrl( url );
+            _context.next = 21;
+            break;
+          case 18:
+            _context.prev = 18;
+            _context.t0 = _context["catch"](3);
+            console.error('There has been a problem with your fetch operation:', _context.t0);
+          case 21:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[3, 18]]);
+    }));
+    return function fetchVideoAsBlob() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  useEffect(function () {
+    fetchVideoAsBlob();
+  }, []);
+  return /*#__PURE__*/_jsx("div", {
+    className: "mediaShow",
+    children: pathLink ? /*#__PURE__*/_jsxs(_Fragment, {
+      children: [["image", "font"].includes(typeKind) && /*#__PURE__*/_jsx("div", {
+        className: "image",
+        style: {
+          backgroundImage: "url(\"".concat(pathLink, "\")")
+        }
+      }), typeKind === "audio" && /*#__PURE__*/_jsx("div", {
+        className: "audio",
+        children: /*#__PURE__*/_jsx("audio", {
+          controls: true,
+          autoPlay: true,
+          children: /*#__PURE__*/_jsx("source", {
+            src: pathLink
+          })
+        })
+      }), typeKind === "video" && /*#__PURE__*/_jsx("div", {
+        className: "video",
+        children: /*#__PURE__*/_jsx("video", {
+          width: "100%",
+          height: "100%",
+          controls: true,
+          autoPlay: true,
+          children: /*#__PURE__*/_jsx("source", {
+            src: pathLink
+          })
+        })
+      })]
+    }) : '...'
+  });
+};
+export default MediaShowRender;

package/dist/component/{media-show.less → media-show/render.less}

@@ -38,7 +38,8 @@
     position: relative;
     display: flex;
     flex-direction: column;
-    height: 100%;
+    height: 90vh;
+    overflow: hidden;
     justify-content: center;
     text-align: center;
     background-color: #000;

package/dist/lib/Tool.js

@@ -13,7 +13,7 @@ if (!window.__events) {
 
 // import { history } from 'umi';
 
-import ReactDOM from 'react-dom';
+import ReactDOM from 'react-dom/client';
 import { useRequest } from '@umijs/hooks';
 import moment from 'moment';
 import DialogDrawer from "../UI/DialogDrawer";
@@ -947,7 +947,9 @@ var Tool = _objectSpread(_objectSpread({
     drawer.id = id;
     query.id = id;
     document.body.appendChild(drawer);
-    ReactDOM.render( /*#__PURE__*/_jsx(DialogDrawer, _objectSpread({}, query)), document.getElementById(id));
+    // ReactDOM.render(<DialogDrawer {...query} />, document.getElementById(id));
+
+    ReactDOM.createRoot(drawer).render( /*#__PURE__*/_jsx(DialogDrawer, _objectSpread({}, query)));
     var outData = {
       // onClose(){
       //

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

@@ -0,0 +1,11 @@
+export declare function detail(body?: {
+    id: number;
+}, options?: ServicesApi.RequestOptions): Promise<VideoPublishVideoAccountProxy.List>;
+export declare function list(body?: {
+    current: number;
+    pageSize: number;
+}, options?: ServicesApi.RequestOptions): Promise<VideoPublishVideoAccountProxy.ListResult>;
+export declare function create(body: VideoPublishVideoAccountProxy.CreateQuery, options?: ServicesApi.RequestOptions): Promise<boolean>;
+export declare function del(body: {
+    id: number;
+}, options?: ServicesApi.RequestOptions): Promise<boolean>;

package/dist/service/api/VideoPublishVideoAccountProxyController.js

@@ -0,0 +1,105 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import request from "../../lib/request";
+import { PublishDomainApi } from "./VideoPublishController";
+export function detail(_x, _x2) {
+  return _detail.apply(this, arguments);
+}
+function _detail() {
+  _detail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(body, options) {
+    var url;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          url = PublishDomainApi("user/videoAccountProxy/detail", options === null || options === void 0 ? void 0 : options.env);
+          return _context.abrupt("return", request(url, _objectSpread({
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            data: _objectSpread({}, body)
+          }, options || {})));
+        case 2:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _detail.apply(this, arguments);
+}
+export function list(_x3, _x4) {
+  return _list.apply(this, arguments);
+}
+function _list() {
+  _list = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(body, options) {
+    var url;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          url = PublishDomainApi("user/videoAccountProxy/list", options === null || options === void 0 ? void 0 : options.env);
+          return _context2.abrupt("return", request(url, _objectSpread({
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            data: _objectSpread({}, body)
+          }, options || {})));
+        case 2:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _list.apply(this, arguments);
+}
+export function create(_x5, _x6) {
+  return _create.apply(this, arguments);
+}
+function _create() {
+  _create = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(body, options) {
+    var url;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          url = PublishDomainApi("user/videoAccountProxy/create", options === null || options === void 0 ? void 0 : options.env);
+          return _context3.abrupt("return", request(url, _objectSpread({
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            data: _objectSpread({}, body)
+          }, options || {})));
+        case 2:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return _create.apply(this, arguments);
+}
+export function del(_x7, _x8) {
+  return _del.apply(this, arguments);
+}
+function _del() {
+  _del = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(body, options) {
+    var url;
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          url = PublishDomainApi("user/videoAccountProxy/del", options === null || options === void 0 ? void 0 : options.env);
+          return _context4.abrupt("return", request(url, _objectSpread({
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            data: _objectSpread({}, body)
+          }, options || {})));
+        case 2:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  }));
+  return _del.apply(this, arguments);
+}

package/dist/types/VideoPublishTaskPlan.d.ts

@@ -16,6 +16,7 @@ declare namespace VideoPublishTaskPlan {
         kindTagValue: string;
         videoUrl: string;
         publishTime: number;
+        accountInfo: VideoPublishVideoAccount.BaseInfo;
     }
     interface ListQuery {
     }

package/dist/types/VideoPublishVideoAccount.d.ts

@@ -11,4 +11,15 @@ declare namespace VideoPublishVideoAccount {
         groupId: number;
         nicknameRemark: string;
     }
+    interface BaseInfo {
+        "platform": Global.VideoPlatformKind;
+        isLoginValid: boolean;
+        "groupId": number;
+        "groupName": string;
+        "uniqueId": string;
+        "accountId": string;
+        "avatar": string;
+        "nickname": string;
+        "nicknameRemark": string;
+    }
 }

package/dist/types/VideoPublishVideoAccountProxy.d.ts

@@ -0,0 +1,32 @@
+declare namespace VideoPublishVideoAccountProxy {
+    interface List {
+        id: number;
+        ip: string;
+        port: number;
+        title: string;
+        area: string;
+        enabled: boolean;
+        username: string;
+        password: string;
+        created: number;
+        updated: number;
+    }
+    interface ListResult {
+        list: List[];
+        pagination: Global.Pagination;
+    }
+    interface ListQuery {
+        enabled: '1' | '0' | '';
+        keyword: string;
+    }
+    interface CreateQuery {
+        id: number;
+        ip: string;
+        title: string;
+        area: string;
+        port: number;
+        enabled: boolean;
+        username: string;
+        password: string;
+    }
+}

package/dist/typings/VideoPublishVideoAccount.d.ts

@@ -32,11 +32,13 @@ declare namespace VideoPublishVideoAccount {
         userId: number;
         platform: Global.VideoPlatformKind;
         groupId: number;
-        uniqueId: number;
+        groupName: string;
+        uniqueId: string;
         accountId: string;
         avatar: string;
         bindPhone: string;
         nickname: string;
+        nicknameRemark: string;
         signature: string;
         isLoginValid: boolean;
         followerCount: number;

package/package.json

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