component-shipinlv 2.2.16 → 2.2.18

package/dist/Ad/index.d.ts

@@ -4,6 +4,7 @@ interface Props {
     productType: string;
     from: Ad.From;
     dealerId: number;
+    position: string;
     env?: Global.Env;
 }
 declare const Ad: React.FC<Props>;

package/dist/Ad/index.js

@@ -13,6 +13,7 @@ var Ad = function Ad(_ref) {
   var productType = _ref.productType,
     from = _ref.from,
     dealerId = _ref.dealerId,
+    position = _ref.position,
     env = _ref.env;
   var listDataRef = useRef([]);
   var currentIndexRef = useRef(0);
@@ -43,7 +44,8 @@ var Ad = function Ad(_ref) {
       return AdController.list({
         productType: productType,
         from: from,
-        dealerId: dealerId
+        dealerId: dealerId,
+        position: position
       }, {
         env: env
       });

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

@@ -3,7 +3,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, { useState } from 'react';
-import { Button, Form, Input, Select, Tag } from 'antd';
+import { Button, Form, Input, Select, Switch, Tag } from 'antd';
 import { useRequest } from "@umijs/hooks";
 import * as VideoAccountController from "../../service/api/VideoPublishVideoAccountController";
 import PageContentWarp from "../../UI/PageContentWarp";
@@ -63,7 +63,8 @@ var VideoAccountCreate = function VideoAccountCreate(_ref) {
               case 0:
                 form.setFieldsValue({
                   nicknameRemark: result.nicknameRemark,
-                  groupId: result.groupId || 0
+                  groupId: result.groupId || 0,
+                  enabledActiveAccountMode: typeof result.enabledActiveAccountMode === 'boolean' ? result.enabledActiveAccountMode : true
                 });
               case 1:
               case "end":
@@ -152,6 +153,13 @@ var VideoAccountCreate = function VideoAccountCreate(_ref) {
         children: /*#__PURE__*/_jsx(Input, {
           placeholder: "\u8F93\u5165\u8D26\u53F7\u5907\u6CE8"
         })
+      }), /*#__PURE__*/_jsx(Form.Item, {
+        name: "enabledActiveAccountMode",
+        label: "\u662F\u5426\u542F\u7528\u517B\u53F7",
+        children: /*#__PURE__*/_jsx(Switch, {
+          checkedChildren: "\u542F\u7528\u517B\u53F7\u53D1\u5E03",
+          unCheckedChildren: "\u7981\u7528\u517B\u53F7\u53D1\u5E03"
+        })
       }), /*#__PURE__*/_jsx(DialogDrawerFooter, {
         children: /*#__PURE__*/_jsx(Button, {
           type: "primary",

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

@@ -11,7 +11,7 @@ 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";
-import { PlusCircleOutlined } from "@ant-design/icons";
+import { PlusCircleOutlined, StopOutlined } from "@ant-design/icons";
 import Tool from "../../lib/Tool";
 import VideoAccountGroup from "./group";
 import VideoAccountCreate from "./create";
@@ -112,13 +112,19 @@ var VideoPublishVideoAccount = function VideoPublishVideoAccount(_ref) {
             className: "userId",
             children: record === null || record === void 0 ? void 0 : record.accountId
           })]
-        }), record && (record === null || record === void 0 ? void 0 : record.isBan) && /*#__PURE__*/_jsx("div", {
+        }), /*#__PURE__*/_jsx("div", {
           className: "isBan",
           children: /*#__PURE__*/_jsx("a", {
             onClick: function onClick() {
               return onBanEdit(record);
             },
-            children: record !== null && record !== void 0 && record.notBanTime && record.notBanTime > Date.now() * 0.001 ? dayjs(record.notBanTime * 1e3).format('MM-DD') + ' 解封' : '已封'
+            children: record && record !== null && record !== void 0 && record.isBan ? record !== null && record !== void 0 && record.notBanTime && record.notBanTime > Date.now() * 0.001 ? dayjs(record.notBanTime * 1e3).format('MM-DD') + ' 解封' : /*#__PURE__*/_jsx("span", {
+              className: "ban",
+              children: "\u5DF2\u5C01"
+            }) : /*#__PURE__*/_jsx("span", {
+              className: "normal",
+              children: "-"
+            })
           })
         })]
       });
@@ -185,18 +191,20 @@ var VideoPublishVideoAccount = function VideoPublishVideoAccount(_ref) {
       var i = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : -1;
       return /*#__PURE__*/_jsx("div", {
         className: "videoFromFolder",
-        children: /*#__PURE__*/_jsx(SavePath, {
+        children: record !== null && record !== void 0 && record.enabledActiveAccountMode ? /*#__PURE__*/_jsx(SavePath, {
           size: "small",
           path: videoFromFolder,
           placeholder: "\u8BF7\u9009\u62E9\u672C\u5730\u89C6\u9891\u6587\u4EF6\u5939",
-          hiddenOpenDir: false
-          // disabled={ ! enabled }
-          ,
+          hiddenOpenDir: false,
+          disabled: !(record !== null && record !== void 0 && record.enabledActiveAccountMode),
           onChange: function onChange(videoFromFolder) {
             console.log('formData:', videoFromFolder);
             // onVideoFromFolderCreate( id, e );
             onVideoFromFolder(i, videoFromFolder);
           }
+        }) : /*#__PURE__*/_jsxs("div", {
+          className: "disabledActiveAccountMode",
+          children: [/*#__PURE__*/_jsx(StopOutlined, {}), " \u5DF2\u7981\u7528\u517B\u53F7\u53D1\u5E03"]
         })
       });
     }
@@ -283,9 +291,9 @@ var VideoPublishVideoAccount = function VideoPublishVideoAccount(_ref) {
       title: '编辑账号被封',
       content: /*#__PURE__*/_jsx(VideoAccountBan, {
         env: env,
-        videoAccountId: record.id,
-        isBan: record.isBan,
-        notBanTime: record.notBanTime,
+        videoAccountId: (record === null || record === void 0 ? void 0 : record.id) || 0,
+        isBan: (record === null || record === void 0 ? void 0 : record.isBan) || false,
+        notBanTime: (record === null || record === void 0 ? void 0 : record.notBanTime) || 0,
         onSuccess: function onSuccess() {
           runVideoAccount();
           dialog.destroy();

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

@@ -39,12 +39,23 @@
       top: -13px;
       right: -8px;
       a{
-        display: inline-block;
-        font-size: 12px;
-        background-color: #C00;
-        color: #FFF;
-        padding: 2px 3px;
         line-height: 1em;
+        font-size: 12px;
+        .ban{
+          display: inline-block;
+          background-color: #C00;
+          color: #FFF;
+          padding: 2px 3px;
+          line-height: 1em;
+        }
+        .normal{
+          display: inline-block;
+          min-width: 12px;
+          padding: 2px 3px;
+          line-height: 1em;
+          background-color: #F6F6F6;
+          color: #F6F6F6;
+        }
       }
     }
   }
@@ -75,4 +86,7 @@
     }
   }
 
+  .disabledActiveAccountMode{
+    color: #AAA;
+  }
 }

package/dist/lib/openChrome.js

@@ -219,22 +219,23 @@ var getOpenQuery = /*#__PURE__*/function () {
           cmdList.push("--window-position=".concat(position.x, ",").concat(position.y));
           cmdList.push("--window-size=".concat(window.screen.width, ",").concat(window.screen.height - 100));
           cmdList.push("--user-data-dir=".concat(chromeProfileDir));
+          cmdList.push("--disable-session-crashed-bubble");
           cmdList.push("--user-agent=".concat(userAgent()));
 
           // 不要检查
           cmdList.push('--no-first-run', '--no-default-browser-check', '--disable-default-apps');
-          _context4.next = 25;
+          _context4.next = 26;
           return getPublishExtensionDir(env).catch(function (err) {
             notification.notificationError('获取插件地址失败', err.message);
           });
-        case 25:
+        case 26:
           publishExtensionDir = _context4.sent;
           if (publishExtensionDir) {
-            _context4.next = 28;
+            _context4.next = 29;
             break;
           }
           return _context4.abrupt("return", Promise.reject(new Error('获取插件地址失败')));
-        case 28:
+        case 29:
           cmdList.push("--load-extension=".concat(publishExtensionDir));
           cmdList.push("".concat(openUrl));
           console.log('profileName:', cmdList, chromeProfileDir);
@@ -242,7 +243,7 @@ var getOpenQuery = /*#__PURE__*/function () {
             commandList: cmdList,
             chromeProfileDir: chromeProfileDir
           });
-        case 32:
+        case 33:
         case "end":
           return _context4.stop();
       }

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

@@ -2,4 +2,5 @@ export declare function list(body: {
     productType: string;
     from: 'web' | 'client';
     dealerId: number;
+    position: string;
 }, options?: Global.RequestOptions): Promise<Ad.List[]>;

package/dist/types/VideoPublish.d.ts

@@ -87,6 +87,7 @@ declare namespace VideoPublish {
         videoFromFolder: string;
         notBanTime: number;
         isBan: boolean;
+        enabledActiveAccountMode: boolean;
         created: number;
         updated: number;
     }

package/dist/types/VideoPublishVideoAccount.d.ts

@@ -101,6 +101,7 @@ declare namespace VideoPublishVideoAccount {
         staffId: number;
         created: number;
         updated: number;
+        enabledActiveAccountMode: boolean;
     }
     interface ExpireQuery {
         promoterId: number;

package/package.json

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