component-shipinlv 1.1.7 → 1.1.9

package/dist/VideoPublish/video-account/base-info.less

@@ -0,0 +1,92 @@
+.videoAccountBaseInfo{
+  position: relative;
+  display: flex;
+  flex-direction: row;
+  cursor: pointer;
+  .index{
+    position: absolute;
+    top: 10px;
+    right: 4px;
+    font-size: 12px;
+    font-style: normal;
+    opacity: 0.3;
+  }
+  .del{
+    position: absolute;
+    bottom: 7px;
+    right: 4px;
+    padding: 3px;
+    font-size: 12px;
+    color: #FFF;
+    border-radius: 3px;
+    background-color: #C00;
+    line-height: 1em;
+    display: none;
+  }
+  &.valid{
+    .isLoginValid{
+      background-color: #00bc00;
+    }
+    .shopName{
+      color: #005a00;
+    }
+  }
+  &.invalid{
+    background-color: #e1e1e1;
+    .isLoginValid{
+      background-color: red;
+    }
+    .shopName{
+      color: #999;
+      font-weight: 300;
+    }
+    .avatarUrl{
+      opacity: 0.5;
+      filter: grayscale(100%);
+    }
+  }
+  .avatar{
+    position: relative;
+    width: 40px;
+    //box-shadow: 0 0 5px #EEE;
+    .avatarUrl{
+      border-radius: 100px;
+      box-shadow: 0 0 5px #EEE;
+    }
+    .isLoginValid{
+      position: absolute;
+      left: 35px;
+      top: 35px;
+      width: 8px;
+      height: 8px;
+      border-radius: 100px;
+    }
+  }
+  .shopName{
+    max-width: 150px;
+    color: #666;
+    display: inline-block;
+    text-overflow: ellipsis;
+    //line-height: 30px;
+    font-size: 12px;
+    padding: 1px 0 0 12px;
+    line-height: 1.1em;
+    word-break: keep-all;
+    white-space: nowrap;
+    overflow: hidden;
+  }
+  .nicknameRemark{
+    max-width: 150px;
+    color: #666;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    //background-color: #F6F6F6;
+    padding: 2px 0 1px;
+    font-weight: 300;
+  }
+  .uniqueId{
+    padding: 1px 0 0;
+    font-size: 12px;
+    opacity: 0.6;
+  }
+}

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/lib/request.js

@@ -1,91 +1,119 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 // 二次封装 hooks request ;
 // 参数详见：https://github.com/umijs/umi-request/blob/master/README_zh-CN.md
 import request from 'umi-request';
 import getApiUrl, { getApiEnv, getMainPort } from "./getApiUrl";
 import goAuth from "./goAuth";
 import Tool from "./Tool";
-var requestApi = function requestApi() {
-  var _window$getBridge, _window, _window$getBridge$cal, _window$getBridge$cal2;
-  var api = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  // 要请求的 url
-  var url = getApiUrl(api, options === null || options === void 0 ? void 0 : options.env);
-  console.log('makeAjax int 20 111 url:', url, options);
+var requestApi = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _window$getClientIden, _window;
+    var api,
+      options,
+      url,
+      userInfo,
+      token,
+      postUrl,
+      clientIdentity,
+      env,
+      pageUrl,
+      _args = arguments;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          api = _args.length > 0 && _args[0] !== undefined ? _args[0] : '';
+          options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
+          // 要请求的 url
+          url = getApiUrl(api, options === null || options === void 0 ? void 0 : options.env);
+          console.log('makeAjax int 20 111 url:', url, options);
 
-  // const params = options.method === 'GET' ? options.data : {};
+          // const params = options.method === 'GET' ? options.data : {};
+          userInfo = Tool.getLocalUserInfo();
+          token = userInfo.sid;
+          postUrl = url + (url.indexOf('?') === -1 ? '?' : '&') + '_token_=' + token; // clientId
+          _context.next = 9;
+          return (_window$getClientIden = (_window = window).getClientIdentity) === null || _window$getClientIden === void 0 ? void 0 : _window$getClientIden.call(_window).catch(function (err) {
+            return '';
+          });
+        case 9:
+          clientIdentity = _context.sent;
+          postUrl += "&clientIdentity=".concat(clientIdentity);
 
-  var userInfo = Tool.getLocalUserInfo();
-  var token = userInfo.sid;
-  var postUrl = url + (url.indexOf('?') === -1 ? '?' : '&') + '_token_=' + token;
-
-  // clientId
-  postUrl += "&clientUniqueKey=".concat(((_window$getBridge = (_window = window).getBridge) === null || _window$getBridge === void 0 || (_window$getBridge$cal = (_window$getBridge$cal2 = _window$getBridge.call(_window)).getClientUniqueKey) === null || _window$getBridge$cal === void 0 ? void 0 : _window$getBridge$cal.call(_window$getBridge$cal2)) || '');
-
-  // 追加环境参数
-  var env = getApiEnv(options === null || options === void 0 ? void 0 : options.env);
-  if (env !== 'prod') {
-    postUrl += "&_env=".concat(env);
-  }
-  var pageUrl = document.location.href;
-  return new Promise(function (resolve, reject) {
-    var requestData = request(postUrl, _objectSpread(_objectSpread({}, options), {}, {
-      timeout: options.timeout || 15e3
-      // requestType: options.payload === false ? 'form' : 'json',
-      // onSuccess( data: ApiResult ){
-      //   console.log('ajax 1:', data );
-      //   if( ! data?.success ){
-      //     const error = new Error( data.message || '发生了一些问题' );
-      //     error.name = 'api-not-success';
-      //     throw error;
-      //   }
-      //   options.onSuccess( data );
-      // },
-    }));
-
-    requestData.then(function () {
-      var result = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      console.log('ajax requestData then:', result);
-      if (result.success) {
-        resolve(result.data || true);
-      } else {
-        var error = new Error((result === null || result === void 0 ? void 0 : result.message) || '发生了一些问题，请稍后重试');
-        error.name = result.code;
-        error.stack = result.data;
-        if (['staff-not-login', 'not-login'].includes((result === null || result === void 0 ? void 0 : result.code) || '')) {
-          // 未登录，跳走；
-          goAuth(result.authType);
-          reject(error);
-        } else {
-          onError(pageUrl, url, error.message, JSON.stringify(error), options === null || options === void 0 ? void 0 : options.silent);
-          reject(error);
-          if (!(options !== null && options !== void 0 && options.silent)) {
-            Tool.toastError(result.message);
+          // 追加环境参数
+          env = getApiEnv(options === null || options === void 0 ? void 0 : options.env);
+          if (env !== 'prod') {
+            postUrl += "&_env=".concat(env);
           }
-        }
-      }
-    }).catch(function (err) {
-      var _err, _err2;
-      console.log('ajax error:', err.name, err.message, err);
-      if (!err) {
-        err = new Error();
-      }
-      console.log('request component shipinlv:', JSON.stringify(err), url);
-      if (!((_err = err) !== null && _err !== void 0 && _err.response) && url.indexOf("http://127.0.0.1:".concat(getMainPort())) === 0) {
-        err.name = "shipinlv-client-not-run";
-        err.message = "\u8FDE\u63A5\u672C\u5730\u670D\u52A1\u5931\u8D25\uFF0C\u8BF7\u5C1D\u8BD5\u91CD\u542F\u8F6F\u4EF6";
-        reject(err);
-        return;
-      }
-      if (['Failed to fetch', 'http error'].includes((_err2 = err) === null || _err2 === void 0 ? void 0 : _err2.message)) {
-        err.message = '发生了一些问题，请稍后重试';
+          pageUrl = document.location.href;
+          return _context.abrupt("return", new Promise(function (resolve, reject) {
+            var requestData = request(postUrl, _objectSpread(_objectSpread({}, options), {}, {
+              timeout: options.timeout || 15e3
+              // requestType: options.payload === false ? 'form' : 'json',
+              // onSuccess( data: ApiResult ){
+              //   console.log('ajax 1:', data );
+              //   if( ! data?.success ){
+              //     const error = new Error( data.message || '发生了一些问题' );
+              //     error.name = 'api-not-success';
+              //     throw error;
+              //   }
+              //   options.onSuccess( data );
+              // },
+            }));
+
+            requestData.then(function () {
+              var result = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+              console.log('ajax requestData then:', result);
+              if (result.success) {
+                resolve(result.data || true);
+              } else {
+                var error = new Error((result === null || result === void 0 ? void 0 : result.message) || '发生了一些问题，请稍后重试');
+                error.name = result.code;
+                error.stack = result.data;
+                if (['staff-not-login', 'not-login'].includes((result === null || result === void 0 ? void 0 : result.code) || '')) {
+                  // 未登录，跳走；
+                  goAuth(result.authType);
+                  reject(error);
+                } else {
+                  onError(pageUrl, url, error.message, JSON.stringify(error), options === null || options === void 0 ? void 0 : options.silent);
+                  reject(error);
+                  if (!(options !== null && options !== void 0 && options.silent)) {
+                    Tool.toastError(result.message);
+                  }
+                }
+              }
+            }).catch(function (err) {
+              var _err, _err2;
+              console.log('ajax error:', err.name, err.message, err);
+              if (!err) {
+                err = new Error();
+              }
+              console.log('request component shipinlv:', JSON.stringify(err), url);
+              if (!((_err = err) !== null && _err !== void 0 && _err.response) && url.indexOf("http://127.0.0.1:".concat(getMainPort())) === 0) {
+                err.name = "shipinlv-client-not-run";
+                err.message = "\u8FDE\u63A5\u672C\u5730\u670D\u52A1\u5931\u8D25\uFF0C\u8BF7\u5C1D\u8BD5\u91CD\u542F\u8F6F\u4EF6";
+                reject(err);
+                return;
+              }
+              if (['Failed to fetch', 'http error'].includes((_err2 = err) === null || _err2 === void 0 ? void 0 : _err2.message)) {
+                err.message = '发生了一些问题，请稍后重试';
+              }
+              Tool.toastError(err.message);
+              onError(pageUrl, url, err.message, JSON.stringify(err), options === null || options === void 0 ? void 0 : options.silent);
+              reject(err);
+            });
+          }));
+        case 15:
+        case "end":
+          return _context.stop();
       }
-      Tool.toastError(err.message);
-      onError(pageUrl, url, err.message, JSON.stringify(err), options === null || options === void 0 ? void 0 : options.silent);
-      reject(err);
-    });
-  });
-};
+    }, _callee);
+  }));
+  return function requestApi() {
+    return _ref.apply(this, arguments);
+  };
+}();
 var onError = function onError(pageUrl) {
   var _window2;
   var apiUrl = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';

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>;