component-shipinlv 2.2.6 → 2.2.7

package/dist/ActiveAccountMode/task/index.js

@@ -772,10 +772,11 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
               console.log('newFilePath:', newFilePath);
               return _context12.abrupt("return", new Promise( /*#__PURE__*/function () {
                 var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(resolve, reject) {
+                  var _window$getBridge2;
                   return _regeneratorRuntime().wrap(function _callee11$(_context11) {
                     while (1) switch (_context11.prev = _context11.next) {
                       case 0:
-                        window.getBridge().fs.rename(videoPath, newFilePath, function (err) {
+                        (_window$getBridge2 = window.getBridge()) === null || _window$getBridge2 === void 0 || _window$getBridge2.fs.rename(videoPath, newFilePath, function (err) {
                           if (err) {
                             console.log('videoRename err:', err);
                             reject(err);

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

@@ -195,6 +195,9 @@ var VideoPublishAccountManageHomePage = function VideoPublishAccountManageHomePa
             }), /*#__PURE__*/_jsx("div", {
               className: "userId",
               children: accountDetail.uniqueId
+            }), /*#__PURE__*/_jsx("div", {
+              className: "nicknameRemark",
+              children: accountDetail.nicknameRemark
             })]
           })]
         }), /*#__PURE__*/_jsx(Descriptions, {

package/dist/VideoPublish/account-manage/list.d.ts

@@ -5,6 +5,7 @@ interface Props {
     env?: Global.Env;
     currentAccountDetail: VideoPublishVideoAccount.List;
     onMenu: (key: string) => void;
+    disabledDel?: boolean;
     onListData: (list: VideoPublishVideoAccount.List[]) => void;
     onCurrent: (detail: VideoPublishVideoAccount.List) => void;
 }

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

@@ -35,6 +35,7 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
     _ref$onListData = _ref.onListData,
     onListData = _ref$onListData === void 0 ? function () {} : _ref$onListData,
     currentAccountDetail = _ref.currentAccountDetail,
+    disabledDel = _ref.disabledDel,
     _ref$onCurrent = _ref.onCurrent,
     onCurrent = _ref$onCurrent === void 0 ? function () {} : _ref$onCurrent;
   var _useState = useState(getLocalUserInfo()),
@@ -450,6 +451,7 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
               className: currentId == item.id ? "active" : '',
               index: index,
               accountInfo: _objectSpread({}, item),
+              disabledDel: disabledDel,
               onDel: function onDel(id) {
                 return _onDel(id);
               },

package/dist/VideoPublish/task-list/plan/list.js

@@ -46,6 +46,8 @@ var VideoPublishTaskPlanList = function VideoPublishTaskPlanList(_ref) {
     pagination = _useState4[0],
     setPagination = _useState4[1];
   var _useState5 = useState({
+      isBan: '',
+      status: '',
       startTime: startTime,
       // Date.now(),
       endTime: endTime //Date.now(),

package/dist/VideoPublish/task-list/plan/operate.js

@@ -29,10 +29,11 @@ var VideoPublishTaskPlanOperate = function VideoPublishTaskPlanOperate(_ref) {
             newFilePath = videoPathInfo.slice(0, -1).join('/') + "/".concat(newName);
             return _context2.abrupt("return", new Promise( /*#__PURE__*/function () {
               var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(resolve, reject) {
+                var _window$getBridge;
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
-                      window.getBridge().fs.rename(videoPath, newFilePath, function (err) {
+                      (_window$getBridge = window.getBridge()) === null || _window$getBridge === void 0 || _window$getBridge.fs.rename(videoPath, newFilePath, function (err) {
                         if (err) {
                           console.log('video Rename err:', err);
                           reject(err);

package/dist/VideoPublish/task-list/plan/query.js

@@ -1,8 +1,10 @@
 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, Space } from "antd";
+import { Button, Form, Input, Select, Space, Tag } from "antd";
 import "./query.less";
+import { UnorderedListOutlined } from "@ant-design/icons";
+import VideoPublishTaskPlanStatus, { VideoPublishTaskPlanStatusList } from "./status";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var VideoPublishTaskPlanListQuery = function VideoPublishTaskPlanListQuery(_ref) {
@@ -27,7 +29,45 @@ var VideoPublishTaskPlanListQuery = function VideoPublishTaskPlanListQuery(_ref)
       initialValues: _objectSpread({}, query),
       onFinish: onFinish,
       children: /*#__PURE__*/_jsxs(Space, {
+        wrap: true,
         children: [/*#__PURE__*/_jsx(Form.Item, {
+          name: "isBan",
+          className: "isBan",
+          children: /*#__PURE__*/_jsxs(Select, {
+            children: [/*#__PURE__*/_jsxs(Select, {
+              value: "",
+              children: [/*#__PURE__*/_jsx(UnorderedListOutlined, {}), " \u5C01\u7981\u72B6\u6001"]
+            }), /*#__PURE__*/_jsx(Select, {
+              value: "0",
+              children: /*#__PURE__*/_jsx(Tag, {
+                color: "green",
+                children: "\u6B63\u5E38"
+              })
+            }), /*#__PURE__*/_jsx(Select, {
+              value: "1",
+              children: /*#__PURE__*/_jsx(Tag, {
+                color: "red",
+                children: "\u88AB\u7981"
+              })
+            })]
+          })
+        }), /*#__PURE__*/_jsx(Form.Item, {
+          name: "status",
+          className: "status",
+          children: /*#__PURE__*/_jsxs(Select, {
+            children: [/*#__PURE__*/_jsxs(Select.Option, {
+              value: "",
+              children: [/*#__PURE__*/_jsx(UnorderedListOutlined, {}), " \u6240\u6709\u53D1\u5E03\u72B6\u6001"]
+            }), VideoPublishTaskPlanStatusList.map(function (items) {
+              return /*#__PURE__*/_jsx(Select.Option, {
+                value: items.status,
+                children: /*#__PURE__*/_jsx(VideoPublishTaskPlanStatus, {
+                  status: items.status
+                })
+              }, items.status);
+            })]
+          })
+        }), /*#__PURE__*/_jsx(Form.Item, {
           name: "keyword",
           children: /*#__PURE__*/_jsx(Input
           // value={ query.keyword }

package/dist/VideoPublish/task-list/plan/query.less

@@ -1,3 +1,9 @@
 .videoPublishTaskPlanListQuery{
+  .isBan{
+    width: 150px;
+  }
 
+  .status{
+    width: 200px;
+  }
 }

package/dist/VideoPublish/task-list/plan/status.js

@@ -29,7 +29,7 @@ export var VideoPublishTaskPlanStatusList = [{
   status: 'repeal',
   icon: /*#__PURE__*/_jsx(StopOutlined, {}),
   title: '已废除',
-  color: '#F60'
+  color: '#555'
 }];
 var VideoPublishTaskPlanStatusDict = function () {
   var dict = {};

package/dist/VideoPublish/video-account/base-info.d.ts

@@ -5,6 +5,7 @@ interface Props {
     className?: string;
     index?: number;
     accountInfo?: VideoPublishVideoAccount.BaseInfo;
+    disabledDel?: boolean;
     onDel?: (id: number) => void;
     onClick?: () => void;
 }

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

@@ -3,6 +3,7 @@ import "./base-info.less";
 import { Avatar, Popconfirm, Tooltip } from "antd";
 import VideoPlatformLogo from "../../component/video-platform/logo";
 import { CloseOutlined } from "@ant-design/icons";
+import AccountBan from "../../component/AccountBan";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -12,6 +13,7 @@ var VideoPublishVideoAccountBaseInfo = function VideoPublishVideoAccountBaseInfo
     className = _ref$className === void 0 ? '' : _ref$className,
     index = _ref.index,
     accountInfo = _ref.accountInfo,
+    disabledDel = _ref.disabledDel,
     _ref$onClick = _ref.onClick,
     _onClick = _ref$onClick === void 0 ? function () {} : _ref$onClick,
     _ref$onDel = _ref.onDel,
@@ -30,7 +32,7 @@ var VideoPublishVideoAccountBaseInfo = function VideoPublishVideoAccountBaseInfo
       children: [typeof index === 'number' && /*#__PURE__*/_jsx("i", {
         className: "index",
         children: index + 1
-      }), typeof id === 'number' && /*#__PURE__*/_jsx(Popconfirm, {
+      }), typeof id === 'number' && !disabledDel && /*#__PURE__*/_jsx(Popconfirm, {
         title: "\u5220\u9664\u8D26\u6237",
         description: "\u786E\u5B9A\u5220\u9664\u8D26\u6237\uFF1F\u5220\u9664\u4E4B\u540E\u4E0D\u80FD\u53D1\u5E03\u89C6\u9891\u4E86",
         onConfirm: function onConfirm() {
@@ -54,7 +56,9 @@ var VideoPublishVideoAccountBaseInfo = function VideoPublishVideoAccountBaseInfo
         })]
       }), /*#__PURE__*/_jsxs("div", {
         className: "shopName",
-        children: [/*#__PURE__*/_jsx(VideoPlatformLogo, {
+        children: [(accountInfo === null || accountInfo === void 0 ? void 0 : accountInfo.isBan) && /*#__PURE__*/_jsx(AccountBan, {
+          isBan: accountInfo.isBan
+        }), /*#__PURE__*/_jsx(VideoPlatformLogo, {
           platform: (accountInfo === null || accountInfo === void 0 ? void 0 : accountInfo.platform) || '',
           size: 12
         }), accountInfo === null || accountInfo === void 0 ? void 0 : accountInfo.nickname, /*#__PURE__*/_jsx("div", {

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

@@ -146,8 +146,8 @@ var VideoAccountCreate = function VideoAccountCreate(_ref) {
         name: "nicknameRemark",
         label: "\u8D26\u53F7\u5907\u6CE8",
         rules: [{
-          max: 6,
-          message: '最多6个字符'
+          max: 20,
+          message: '最多20个字符'
         }],
         children: /*#__PURE__*/_jsx(Input, {
           placeholder: "\u8F93\u5165\u8D26\u53F7\u5907\u6CE8"

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

@@ -7,7 +7,7 @@ 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 { Avatar, Button, Divider, Space, Table, Tag, Tooltip } from "antd";
 import VideoPublishVideoAccountListQuery from "./query";
 import VideoPlatform from "../../component/video-platform/logo";
 import Money from "../../UI/Money";
@@ -20,8 +20,8 @@ import SavePath from "../../lib/save-path";
 import dayjs from "dayjs";
 import VideoAccountBan from "./ban";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 var VideoPublishVideoAccount = function VideoPublishVideoAccount(_ref) {
   var disabled = _ref.disabled,
     env = _ref.env;
@@ -42,7 +42,8 @@ var VideoPublishVideoAccount = function VideoPublishVideoAccount(_ref) {
   var _useState5 = useState({
       isLoginValid: '',
       keyword: '',
-      platform: ''
+      platform: '',
+      isBan: ''
     }),
     _useState6 = _slicedToArray(_useState5, 2),
     query = _useState6[0],
@@ -99,12 +100,14 @@ var VideoPublishVideoAccount = function VideoPublishVideoAccount(_ref) {
           children: [/*#__PURE__*/_jsx("strong", {
             className: "nickname",
             children: (record === null || record === void 0 ? void 0 : record.nickname) || '-'
-          }), (record === null || record === void 0 ? void 0 : record.nicknameRemark) && /*#__PURE__*/_jsxs(_Fragment, {
-            children: [/*#__PURE__*/_jsx(Divider, {
-              type: "vertical"
-            }), /*#__PURE__*/_jsx(Tag, {
-              children: record === null || record === void 0 ? void 0 : record.nicknameRemark
-            })]
+          }), (record === null || record === void 0 ? void 0 : record.nicknameRemark) && /*#__PURE__*/_jsx("div", {
+            children: /*#__PURE__*/_jsx(Tooltip, {
+              title: "\u5907\u6CE8\uFF1A".concat(record === null || record === void 0 ? void 0 : record.nicknameRemark),
+              children: /*#__PURE__*/_jsx("div", {
+                className: "nicknameRemark",
+                children: record === null || record === void 0 ? void 0 : record.nicknameRemark
+              })
+            })
           }), /*#__PURE__*/_jsx("div", {
             className: "userId",
             children: record === null || record === void 0 ? void 0 : record.accountId
@@ -183,6 +186,7 @@ var VideoPublishVideoAccount = function VideoPublishVideoAccount(_ref) {
       return /*#__PURE__*/_jsx("div", {
         className: "videoFromFolder",
         children: /*#__PURE__*/_jsx(SavePath, {
+          size: "small",
           path: videoFromFolder,
           placeholder: "\u8BF7\u9009\u62E9\u672C\u5730\u89C6\u9891\u6587\u4EF6\u5939",
           hiddenOpenDir: false

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

@@ -13,6 +13,16 @@
         box-shadow: 0 0 3px #AAA;
       }
     }
+    .nicknameRemark{
+      max-width: 110px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      word-break: keep-all;
+      //line-height: 1em;
+      vertical-align: middle;
+      font-size: 12px;
+    }
     .info{
       margin: 0 0 0 10px;
       .nickname{

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

@@ -50,6 +50,27 @@ var VideoPublishVideoAccountListQuery = function VideoPublishVideoAccountListQue
               }, item.platform);
             })]
           })
+        }), /*#__PURE__*/_jsx(Form.Item, {
+          name: "isBan",
+          className: "isBan",
+          children: /*#__PURE__*/_jsxs(Select, {
+            children: [/*#__PURE__*/_jsxs(Select, {
+              value: "",
+              children: [/*#__PURE__*/_jsx(UnorderedListOutlined, {}), " \u5C01\u7981\u72B6\u6001"]
+            }), /*#__PURE__*/_jsx(Select, {
+              value: "0",
+              children: /*#__PURE__*/_jsx(Tag, {
+                color: "green",
+                children: "\u6B63\u5E38"
+              })
+            }), /*#__PURE__*/_jsx(Select, {
+              value: "1",
+              children: /*#__PURE__*/_jsx(Tag, {
+                color: "red",
+                children: "\u88AB\u7981"
+              })
+            })]
+          })
         }), /*#__PURE__*/_jsx(Form.Item, {
           name: "isLoginValid",
           className: "isLoginValid",

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

@@ -11,5 +11,8 @@
     width: 150px;
   }
 
+  .isBan{
+    width: 150px;
+  }
 
 }

package/dist/component/AccountBan/index.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+import './index.less';
+interface Props {
+    isBan?: boolean;
+}
+declare const AccountBan: React.FC<Props>;
+export default AccountBan;

package/dist/component/AccountBan/index.js

@@ -0,0 +1,10 @@
+import "./index.less";
+import { jsx as _jsx } from "react/jsx-runtime";
+var AccountBan = function AccountBan(_ref) {
+  var isBan = _ref.isBan;
+  return isBan ? /*#__PURE__*/_jsx("span", {
+    className: "account-ban",
+    children: "\u88AB\u7981"
+  }) : null;
+};
+export default AccountBan;

package/dist/component/AccountBan/index.less

@@ -0,0 +1,12 @@
+.account-ban{
+  position: relative;
+  display: inline-block;
+  background-color: #C00;
+  color: #fff;
+  padding: 2px 4px;
+  line-height: 1em;
+  border-radius: 2px;
+  font-size: 12px;
+  margin: 0 5px 0 0;
+  vertical-align: middle;
+}

package/dist/lib/Tool.d.ts

@@ -162,7 +162,7 @@ declare const Tool: {
     getTitleByPath(path: string): string;
     getDirByPath(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" | "error" | "warning" | "info", 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/lib/accountManageSettingConfig.js

@@ -2,12 +2,12 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import store from "./store";
 var AccountManageSettingConfigKey = 'account-manage-setting';
 var AccountManageSettingConfig = function AccountManageSettingConfig(data) {
-  var _window$getBridge, _window, _window$getBridge$cal, _window$getBridge$cal2;
+  var _window$getBridge, _window, _window$getBridge$get;
   if (data) {
     store.set(AccountManageSettingConfigKey, _objectSpread({}, data));
     return data;
   }
-  var chromePath = ((_window$getBridge = (_window = window).getBridge) === null || _window$getBridge === void 0 || (_window$getBridge$cal = (_window$getBridge$cal2 = _window$getBridge.call(_window)).getChromiumPath) === null || _window$getBridge$cal === void 0 ? void 0 : _window$getBridge$cal.call(_window$getBridge$cal2)) || '';
+  var chromePath = ((_window$getBridge = (_window = window).getBridge) === null || _window$getBridge === void 0 || (_window$getBridge = _window$getBridge.call(_window)) === null || _window$getBridge === void 0 || (_window$getBridge$get = _window$getBridge.getChromiumPath) === null || _window$getBridge$get === void 0 ? void 0 : _window$getBridge$get.call(_window$getBridge)) || '';
 
   // console.log('AccountManageSettingConfig get:', chromePath );
 

package/dist/lib/fs.js

@@ -4,7 +4,8 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import { VideoMineType } from "./allow-mine-type";
 import getFileExt from "./getFileExt";
 export var fs = function fs() {
-  return window.getBridge().fs;
+  var _window$getBridge;
+  return (_window$getBridge = window.getBridge()) === null || _window$getBridge === void 0 ? void 0 : _window$getBridge.fs;
 };
 var path = function path() {
   return window.getBridge().path;

package/dist/lib/save-path.js

@@ -2,7 +2,7 @@ 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, useRef, useState } from 'react';
-import { Input, Button, Space } from 'antd';
+import { Input, Button, Space, Tooltip } from 'antd';
 import "./save-path.less";
 import { FolderOpenOutlined, FolderOutlined } from '@ant-design/icons';
 import Tool from "./Tool";
@@ -149,20 +149,24 @@ var SavePath = function SavePath(_ref) {
         }), /*#__PURE__*/_jsx("div", {
           className: "option",
           children: /*#__PURE__*/_jsxs(Space, {
-            children: [/*#__PURE__*/_jsx(Button, {
-              size: size,
-              onClick: onSelectDir,
-              loading: loadingSelectDir,
-              icon: /*#__PURE__*/_jsx(FolderOutlined, {}),
-              disabled: disabled,
-              children: path ? '更改' : '选择'
-            }), !hiddenOpenDir && /*#__PURE__*/_jsx(Button, {
-              size: size,
-              onClick: onOpenDir,
-              loading: loadingOpenDir,
-              disabled: !path || disabled,
-              icon: /*#__PURE__*/_jsx(FolderOpenOutlined, {}),
-              children: "\u6253\u5F00"
+            children: [/*#__PURE__*/_jsx(Tooltip, {
+              title: path ? '更改' : '选择',
+              children: /*#__PURE__*/_jsx(Button, {
+                size: size,
+                onClick: onSelectDir,
+                loading: loadingSelectDir,
+                disabled: disabled,
+                children: /*#__PURE__*/_jsx(FolderOutlined, {})
+              })
+            }), !hiddenOpenDir && /*#__PURE__*/_jsx(Tooltip, {
+              title: "\u6253\u5F00",
+              children: /*#__PURE__*/_jsx(Button, {
+                size: size,
+                onClick: onOpenDir,
+                loading: loadingOpenDir,
+                disabled: !path || disabled,
+                children: /*#__PURE__*/_jsx(FolderOpenOutlined, {})
+              })
             })]
           })
         })]

package/dist/types/VideoPublish.d.ts

@@ -87,6 +87,7 @@ declare namespace VideoPublish {
     }
     interface VideoAccountListQuery {
         isLoginValid: '' | '1' | '0';
+        isBan: '' | '1' | '0';
         keyword: string;
         platform: string;
     }

package/dist/types/VideoPublishTaskPlan.d.ts

@@ -20,6 +20,8 @@ declare namespace VideoPublishTaskPlan {
         accountInfo: VideoPublishVideoAccount.BaseInfo;
     }
     interface ListQuery {
+        isBan: '' | '1' | '0';
+        status: '' | '1' | '0';
         startTime: number;
         endTime: number;
     }

package/dist/types/VideoPublishVideoAccount.d.ts

@@ -19,6 +19,7 @@ declare namespace VideoPublishVideoAccount {
         "avatar": string;
         "nickname": string;
         "nicknameRemark": string;
+        isBan?: boolean;
     }
     interface BanQuery {
         id: number;

package/package.json

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