component-shipinlv 1.0.29 → 1.0.31

package/dist/AuthClient/login.js

@@ -10,6 +10,7 @@ import { useRequest } from '@umijs/hooks';
 
 // import styles from "./reg.scss" ;
 import * as AuthController from "../service/api/AuthController";
+import AuthUserOffline from "./user-offline";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var formItemLayout = {
@@ -56,11 +57,13 @@ var AuthReg = function AuthReg(_ref) {
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var _useRequest = useRequest(function (data) {
+      var unbind = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       return AuthController.login(_objectSpread(_objectSpread({
         productType: productType,
         clientUniqueKey: clientUniqueKey,
         from: "web"
       }, data), {}, {
+        unbind: unbind,
         inviteUserId: Tool.getInviteUserId()
       }), {
         env: env
@@ -69,6 +72,24 @@ var AuthReg = function AuthReg(_ref) {
       manual: true,
       onSuccess: function onSuccess(result) {
         loginSuccess(result);
+      },
+      onError: function onError(err) {
+        if (err.name === 'user-offline') {
+          var dialog = Tool.pageDialog({
+            title: '此账号已经在其他电脑登录',
+            content: /*#__PURE__*/_jsx(AuthUserOffline, {
+              message: err.message,
+              onConfirm: function onConfirm() {
+                run(form.getFieldsValue(), true);
+                dialog.destroy();
+              },
+              onCancel: function onCancel() {
+                dialog.destroy();
+              }
+            }),
+            width: 520
+          });
+        }
       }
     }),
     loading = _useRequest.loading,

package/dist/AuthClient/user-offline.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+interface Props {
+    message: string;
+    onConfirm: () => void;
+    onCancel: () => void;
+}
+declare const AuthUserOffline: React.FC<Props>;
+export default AuthUserOffline;

package/dist/AuthClient/user-offline.js

@@ -0,0 +1,41 @@
+import React from 'react';
+import { Button, Form, Space, Divider } from 'antd';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var AuthUserOffline = function AuthUserOffline(_ref) {
+  var message = _ref.message,
+    _ref$onConfirm = _ref.onConfirm,
+    onConfirm = _ref$onConfirm === void 0 ? function () {} : _ref$onConfirm,
+    _ref$onCancel = _ref.onCancel,
+    onCancel = _ref$onCancel === void 0 ? function () {} : _ref$onCancel;
+  return /*#__PURE__*/_jsx("section", {
+    className: "authClientLogin",
+    children: /*#__PURE__*/_jsxs(Form, {
+      children: [/*#__PURE__*/_jsx(Form.Item, {
+        children: message
+      }), /*#__PURE__*/_jsx(Divider, {}), /*#__PURE__*/_jsx("div", {
+        style: {
+          textAlign: "right"
+        },
+        children: /*#__PURE__*/_jsxs(Space, {
+          children: [/*#__PURE__*/_jsx(Button, {
+            type: "link",
+            danger: true,
+            ghost: true,
+            onClick: function onClick() {
+              return onCancel();
+            },
+            children: "\u53D6\u6D88"
+          }), /*#__PURE__*/_jsx(Button, {
+            type: "primary",
+            onClick: function onClick() {
+              return onConfirm();
+            },
+            children: "\u7EE7\u7EED\u767B\u5F55"
+          })]
+        })
+      })]
+    })
+  });
+};
+export default AuthUserOffline;

package/dist/VideoPublish/creat-task/index.css.js

@@ -2,7 +2,7 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/esm/taggedTemplateLit
 var _templateObject, _templateObject2, _templateObject3;
 import styled from 'styled-components';
 export default {
-  videoPublishCreateTask: styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    padding: 0 12px 0 0;\n    display: flex;\n    flex-direction: column;\n    height: 100%;\n    .groupIcon{\n      color: blue;\n    }\n    .rateSelect{\n      width: 120px;\n    }\n    .normalVideo{\n      color: blue;\n    }\n    .shoppingCart{\n      color: #F60;\n    }\n    .selectFile{\n      padding: 12px 0 0;\n    }\n    .submits{\n      text-align: right;\n      padding: 0 0 36px 0;\n    }\n  "]))),
+  videoPublishCreateTask: styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    padding: 0 12px 0 0;\n    display: flex;\n    flex-direction: column;\n    height: 100%;\n    .groupIcon{\n      color: blue;\n    }\n    .rateSelect{\n      width: 120px;\n    }\n    .normalVideo{\n      color: blue;\n    }\n    .shoppingCart{\n      color: #F60;\n    }\n    .selectFile{\n      padding: 12px 0 0;\n    }\n    .submits{\n      text-align: right;\n      padding: 0 0 36px 0;\n    }\n    .accountListWarp{\n      display: flex;\n      flex-direction: row;\n      .accountList{\n        flex: 2;\n        margin-left: 5px;\n      }\n      .renew{\n        font-size: 20px;\n        padding: 0 12px;\n      }\n    }\n  "]))),
   followerCount: styled.small(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n    background-color: #F2F2F2;\n    border-radius: 3px;\n    font-size: smaller;\n    line-height: 1em;\n    margin-left: 3px;\n    padding: 2px 3px;\n\n  "]))),
   notLoginValid: styled.span(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    margin-left: 5px;\n\n  "])))
 };

package/dist/VideoPublish/creat-task/index.js

@@ -4,8 +4,8 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState } from "react";
 import styles from "./index.css";
-import { Alert, Button, ConfigProvider, DatePicker, Divider, Form, InputNumber, Radio, Select, Switch, Tag } from "antd";
-import { PlusOutlined, ShoppingOutlined, UsergroupAddOutlined, VideoCameraOutlined } from "@ant-design/icons";
+import { Alert, Button, ConfigProvider, DatePicker, Divider, Form, InputNumber, Radio, Select, Switch, Tag, Tooltip } from "antd";
+import { PlusOutlined, RedoOutlined, ShoppingOutlined, UsergroupAddOutlined, VideoCameraOutlined } from "@ant-design/icons";
 import PageContentWarp from "../../UI/PageContentWarp";
 import { TreeSelect } from 'antd';
 import isInClient from "../../lib/isInClient";
@@ -123,9 +123,9 @@ var VideoPublishCreateTask = function VideoPublishCreateTask(_ref) {
         setTreeVideoAccountData(treeData);
       }
     }),
-    run = _useRequest.run,
-    loading = _useRequest.loading,
-    error = _useRequest.error;
+    runAccountList = _useRequest.run,
+    loadingAccountList = _useRequest.loading,
+    errorAccountList = _useRequest.error;
   var _useRequest2 = useRequest(function (data) {
       return VideoPublishController.taskCreate(data, {
         env: env
@@ -248,12 +248,38 @@ var VideoPublishCreateTask = function VideoPublishCreateTask(_ref) {
     console.log('values:', data);
     runTask(data);
   };
+  var onAccountList = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!loadingAccountList) {
+              _context2.next = 2;
+              break;
+            }
+            return _context2.abrupt("return");
+          case 2:
+            _context2.next = 4;
+            return runAccountList().catch(function (err) {});
+          case 4:
+            Tool.toast('账户列表已刷新');
+          case 5:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function onAccountList() {
+      return _ref3.apply(this, arguments);
+    };
+  }();
   var formLabelSpan = 3;
   return /*#__PURE__*/_jsx(styles.videoPublishCreateTask, {
-    children: /*#__PURE__*/_jsxs(PageContentWarp, {
-      loading: loading,
-      error: error,
-      onReload: run,
+    children: /*#__PURE__*/_jsxs(PageContentWarp
+    // loading={loading}
+    , {
+      error: errorAccountList,
+      onReload: runAccountList,
       children: [disabled && /*#__PURE__*/_jsx(Alert, {
         message: "\u529F\u80FD\u5347\u7EA7\u4E2D\uFF0C\u5373\u5C06\u5F00\u653E\uFF0C\u656C\u8BF7\u671F\u5F85",
         type: "warning",
@@ -344,25 +370,39 @@ var VideoPublishCreateTask = function VideoPublishCreateTask(_ref) {
         }), /*#__PURE__*/_jsx(Divider, {
           orientation: "left",
           children: "\u9009\u62E9\u8D26\u6237"
-        }), /*#__PURE__*/_jsx(Form.Item, {
-          label: "\u8D26\u53F7",
-          extra: "\u6BCF\u4E2A\u89C6\u9891\u53EA\u53D1\u4E00\u4E2A\u8D26\u6237",
-          name: "accountList",
-          rules: [{
-            required: true,
-            message: '请选择账户'
-          }],
-          children: /*#__PURE__*/_jsx(TreeSelect, {
-            treeData: treeVideoAccountData
-            // value={ [] }
-            ,
-            onChange: function onChange(idList) {
-              console.log('TreeSelect:', idList);
+        }), /*#__PURE__*/_jsxs("div", {
+          className: "accountListWarp",
+          children: [/*#__PURE__*/_jsx(Form.Item, {
+            label: "\u8D26\u53F7",
+            extra: "\u6BCF\u4E2A\u89C6\u9891\u53EA\u53D1\u4E00\u4E2A\u8D26\u6237",
+            name: "accountList",
+            className: "accountList",
+            rules: [{
+              required: true,
+              message: '请选择账户'
+            }],
+            children: /*#__PURE__*/_jsx(TreeSelect, {
+              disabled: loadingAccountList,
+              treeData: treeVideoAccountData
+              // value={ [] }
+              ,
+              onChange: function onChange(idList) {
+                console.log('TreeSelect:', idList);
+              },
+              treeCheckable: !loadingAccountList,
+              showCheckedStrategy: TreeSelect.SHOW_PARENT,
+              placeholder: "\u8BF7\u9009\u62E9 \u8D26\u6237/\u7EC4"
+            })
+          }), /*#__PURE__*/_jsx("a", {
+            className: "renew ".concat(loadingAccountList ? 'disabled' : ''),
+            onClick: function onClick() {
+              return onAccountList();
             },
-            treeCheckable: true,
-            showCheckedStrategy: TreeSelect.SHOW_PARENT,
-            placeholder: "\u8BF7\u9009\u62E9 \u8D26\u6237/\u7EC4"
-          })
+            children: /*#__PURE__*/_jsx(Tooltip, {
+              title: "\u5237\u65B0\u8D26\u6237\u5217\u8868",
+              children: /*#__PURE__*/_jsx(RedoOutlined, {})
+            })
+          })]
         }), /*#__PURE__*/_jsxs(Divider, {
           orientation: "left",
           children: [/*#__PURE__*/_jsx(VideoCameraOutlined, {

package/dist/VideoPublish/creat-task/select-list.js

@@ -53,7 +53,7 @@ var VideoPublishSelectList = function VideoPublishSelectList(_ref) {
           className: "title",
           children: /*#__PURE__*/_jsx(TextInput, {
             className: "remarkInput",
-            maxLength: 20,
+            maxLength: 30,
             label: title || '',
             value: title || '',
             onFinish: function onFinish(title) {

package/dist/global.less

@@ -5,4 +5,13 @@
 
 #root{
   min-height: 100vh;
+
+
+}
+
+a{
+  &.disabled{
+    color: #CCC;
+    cursor: not-allowed;
+  }
 }

package/package.json

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