component-shipinlv 1.1.21 → 1.1.23

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

@@ -135,7 +135,8 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
         favoritedCount: 0,
         videoCount: 0,
         created: 0,
-        updated: 0
+        updated: 0,
+        proxyInfo: {}
       });
       return;
     }
@@ -201,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/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/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: "info" | "error" | "success" | "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/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;
@@ -47,6 +48,7 @@ declare namespace VideoPublishVideoAccount {
         videoCount: number;
         created: number;
         updated: number;
+        proxyInfo: Global.ProxyInfo;
     }
     interface Detail {
         id: number;

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.21",
+  "version": "1.1.23",
   "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"
   },