@kmkf-fe-packages/basic-components 0.8.21-alpha.1 → 0.8.21-alpha.5

package/dist/index.esm.js

@@ -3,6 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
 import { EyeOutlined, DeleteOutlined } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
+import { getInfo } from 'react-mediainfo';
 import { AddressData, BsAddressData, request as request$1, ExpressData, LogisticsAddressData, uuid } from '@kmkf-fe-packages/kmkf-utils';
 import zhCN from 'antd/lib/locale/zh_CN';
 import pubsub from 'pubsub-js';
@@ -6894,15 +6895,19 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     fileName = _useState8[0],
     setFileName = _useState8[1];
-  var valueRef = useRef(value);
-  var _useState9 = useState(false),
+  var _useState9 = useState({}),
     _useState10 = _slicedToArray(_useState9, 2),
-    uploading = _useState10[0],
-    setUploading = _useState10[1];
-  var _useState11 = useState(true),
+    blackList = _useState10[0],
+    setBlackList = _useState10[1];
+  var valueRef = useRef(value);
+  var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    pasteDefaultStates = _useState12[0],
-    setPasteDefaultStates = _useState12[1];
+    uploading = _useState12[0],
+    setUploading = _useState12[1];
+  var _useState13 = useState(true),
+    _useState14 = _slicedToArray(_useState13, 2),
+    pasteDefaultStates = _useState14[0],
+    setPasteDefaultStates = _useState14[1];
   var fileList = useMemo(function () {
     return value.map(function (t, i) {
       return _objectSpread2(_objectSpread2({}, t), {}, {
@@ -6913,6 +6918,9 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
       });
     });
   }, [value]);
+  useEffect(function () {
+    getVideoBlack();
+  }, []);
   useEffect(function () {
     valueRef.current = value;
   }, [value]);
@@ -6932,25 +6940,52 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
       });
     };
   }, [pasteDefaultStates]);
-  var asyncUpload = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
-      var formData, fileName, _yield$request, success, data;
+  //获取视频上传黑名单
+  var getVideoBlack = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
+          case 0:
+            request('/qy/diamond/getConfigInfo', {
+              method: 'get',
+              params: {
+                key: 'video-upload-code',
+                name: 'getConfigInfo'
+              }
+            }).then(function (res) {
+              if (res.success && res.data) {
+                setBlackList(JSON.parse(res.data));
+              }
+            });
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getVideoBlack() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var asyncUpload = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(file) {
+      var formData, fileName, _yield$request, success, data;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             setUploading(true);
             formData = new FormData();
             formData.append('file', file);
             fileName = "".concat(hooks(new Date().getTime()).format('YYYY-MM-DD hh:mm:ss'), "_").concat(file.name);
             formData.append('fileName', fileName);
-            _context.prev = 5;
-            _context.next = 8;
+            _context2.prev = 5;
+            _context2.next = 8;
             return request(actionUrl, {
               method: 'post',
               body: formData
             });
           case 8:
-            _yield$request = _context.sent;
+            _yield$request = _context2.sent;
             success = _yield$request.success;
             data = _yield$request.data;
             if (success) {
@@ -6959,30 +6994,55 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
                 url: "".concat(hostUrl, "/").concat(data)
               }]));
             }
-            _context.next = 17;
+            _context2.next = 17;
             break;
           case 14:
-            _context.prev = 14;
-            _context.t0 = _context["catch"](5);
+            _context2.prev = 14;
+            _context2.t0 = _context2["catch"](5);
             message.error('文件上传失败');
           case 17:
-            _context.prev = 17;
+            _context2.prev = 17;
             setUploading(false);
-            return _context.finish(17);
+            return _context2.finish(17);
           case 20:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee, null, [[5, 14, 17, 20]]);
+      }, _callee2, null, [[5, 14, 17, 20]]);
     }));
     return function asyncUpload(_x) {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   var handleChange = function handleChange(list) {
     valueRef.current = list;
     onChange(list);
   };
+  var verificationFormat = function verificationFormat(file) {
+    getInfo(file).then(function (res) {
+      var track = res.media.track;
+      console.log(res);
+      var videoItem = track.find(function (item) {
+        return item['@type'] === 'Video';
+      });
+      var generalItem = track.find(function (item) {
+        return item['@type'] === 'General';
+      });
+      if (videoItem && blackList[generalItem === null || generalItem === void 0 ? void 0 : generalItem.Format.toUpperCase()] && blackList[generalItem === null || generalItem === void 0 ? void 0 : generalItem.Format.toUpperCase()].includes(videoItem === null || videoItem === void 0 ? void 0 : videoItem.Format.toUpperCase())) {
+        Modal.confirm({
+          title: '提示',
+          content: '上传的视屏无法播放确认要上传吗？',
+          okText: '确定',
+          cancelText: '取消',
+          onOk: function onOk() {
+            asyncUpload(file);
+          }
+        });
+      } else {
+        asyncUpload(file);
+      }
+    });
+  };
   // 手动上传模式, 一直返回false
   var beforeUpload = function beforeUpload(file) {
     console.log('beforeUpload', file);
@@ -6995,7 +7055,8 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
       message.error("\u6587\u4EF6\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
       return Upload.LIST_IGNORE;
     }
-    asyncUpload(file);
+    verificationFormat(file);
+    // asyncUpload(file);
     return Upload.LIST_IGNORE;
   };
   var onRemove = function onRemove(file) {
@@ -7056,24 +7117,24 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
       return;
     }
     reader.onload = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
+      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(e) {
         var _e$target;
         var result, fileName, file;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               result = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.result;
               fileName = blob.name;
-              file = dataURLtoFile(result, fileName);
-              asyncUpload(file);
+              file = dataURLtoFile(result, fileName); // asyncUpload(file);
+              verificationFormat(file);
             case 4:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2);
+        }, _callee3);
       }));
       return function (_x2) {
-        return _ref3.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }();
     reader.readAsDataURL(blob);
@@ -7445,7 +7506,7 @@ var IdentifyAddress = function IdentifyAddress(props) {
       receiverMobile: val === null || val === void 0 ? void 0 : val.phone,
       address: []
     };
-    if (val === null || val === void 0 ? void 0 : val.province) {
+    if ((val === null || val === void 0 ? void 0 : val.province) && AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.province)) {
       params.address = [AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.province), AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.city), AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.district)];
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, params));
@@ -9415,7 +9476,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
         interceptReceiverName: undefined,
         interceptReceiverMobile: undefined,
         interceptLogisticsStatus: undefined,
-        interceptLogisticsStatusOther: undefined
+        interceptLogisticsStatusOther: undefined,
+        interceptLogisticsSnapshot: undefined
       });
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
@@ -10710,12 +10772,14 @@ var BsExchange = function BsExchange(props) {
   }, []);
   var getListHandle = function getListHandle(list, val) {
     var _val$bsExchangeType, _val$bsExchangeType2;
+    //固定的sku
+    var FIXED_FIELD = ['Q0000002', '600123001', '10103003', 'Q0000003', 'Q0000004'];
     //如果是原单换
     if (['1', '3'].includes(val === null || val === void 0 ? void 0 : (_val$bsExchangeType = val.bsExchangeType) === null || _val$bsExchangeType === void 0 ? void 0 : _val$bsExchangeType[0])) {
       return list.reduce(function (prv, next) {
         next.canDelete = false;
         //数量大于1 拆开
-        if (next.number > 1) {
+        if (next.number > 1 && !FIXED_FIELD.includes(next.sku)) {
           var newList = Array(next.number).fill({}).map(function () {
             var newNext = _objectSpread2({}, next);
             newNext.money = newNext.share;
@@ -10735,7 +10799,7 @@ var BsExchange = function BsExchange(props) {
         next.canDelete = true;
         next.index = index;
         //数量大于1 拆开
-        if (next.number > 1) {
+        if (next.number > 1 && !FIXED_FIELD.includes(next.sku)) {
           var newList = Array(next.number).fill({}).map(function () {
             var newNext = _objectSpread2({}, next);
             newNext.money = newNext.share;

package/dist/index.js

@@ -7,6 +7,7 @@ var antd = require('antd');
 var icons = require('@ant-design/icons');
 var request = require('umi-request');
 var reactCopyToClipboard = require('react-copy-to-clipboard');
+var reactMediainfo = require('react-mediainfo');
 var kmkfUtils = require('@kmkf-fe-packages/kmkf-utils');
 var zhCN = require('antd/lib/locale/zh_CN');
 var pubsub = require('pubsub-js');
@@ -6905,15 +6906,19 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     fileName = _useState8[0],
     setFileName = _useState8[1];
-  var valueRef = React.useRef(value);
-  var _useState9 = React.useState(false),
+  var _useState9 = React.useState({}),
     _useState10 = _slicedToArray(_useState9, 2),
-    uploading = _useState10[0],
-    setUploading = _useState10[1];
-  var _useState11 = React.useState(true),
+    blackList = _useState10[0],
+    setBlackList = _useState10[1];
+  var valueRef = React.useRef(value);
+  var _useState11 = React.useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    pasteDefaultStates = _useState12[0],
-    setPasteDefaultStates = _useState12[1];
+    uploading = _useState12[0],
+    setUploading = _useState12[1];
+  var _useState13 = React.useState(true),
+    _useState14 = _slicedToArray(_useState13, 2),
+    pasteDefaultStates = _useState14[0],
+    setPasteDefaultStates = _useState14[1];
   var fileList = React.useMemo(function () {
     return value.map(function (t, i) {
       return _objectSpread2(_objectSpread2({}, t), {}, {
@@ -6924,6 +6929,9 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
       });
     });
   }, [value]);
+  React.useEffect(function () {
+    getVideoBlack();
+  }, []);
   React.useEffect(function () {
     valueRef.current = value;
   }, [value]);
@@ -6943,25 +6951,52 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
       });
     };
   }, [pasteDefaultStates]);
-  var asyncUpload = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
-      var formData, fileName, _yield$request, success, data;
+  //获取视频上传黑名单
+  var getVideoBlack = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
+          case 0:
+            request__default['default']('/qy/diamond/getConfigInfo', {
+              method: 'get',
+              params: {
+                key: 'video-upload-code',
+                name: 'getConfigInfo'
+              }
+            }).then(function (res) {
+              if (res.success && res.data) {
+                setBlackList(JSON.parse(res.data));
+              }
+            });
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getVideoBlack() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var asyncUpload = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(file) {
+      var formData, fileName, _yield$request, success, data;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             setUploading(true);
             formData = new FormData();
             formData.append('file', file);
             fileName = "".concat(hooks(new Date().getTime()).format('YYYY-MM-DD hh:mm:ss'), "_").concat(file.name);
             formData.append('fileName', fileName);
-            _context.prev = 5;
-            _context.next = 8;
+            _context2.prev = 5;
+            _context2.next = 8;
             return request__default['default'](actionUrl, {
               method: 'post',
               body: formData
             });
           case 8:
-            _yield$request = _context.sent;
+            _yield$request = _context2.sent;
             success = _yield$request.success;
             data = _yield$request.data;
             if (success) {
@@ -6970,30 +7005,55 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
                 url: "".concat(hostUrl, "/").concat(data)
               }]));
             }
-            _context.next = 17;
+            _context2.next = 17;
             break;
           case 14:
-            _context.prev = 14;
-            _context.t0 = _context["catch"](5);
+            _context2.prev = 14;
+            _context2.t0 = _context2["catch"](5);
             antd.message.error('文件上传失败');
           case 17:
-            _context.prev = 17;
+            _context2.prev = 17;
             setUploading(false);
-            return _context.finish(17);
+            return _context2.finish(17);
           case 20:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee, null, [[5, 14, 17, 20]]);
+      }, _callee2, null, [[5, 14, 17, 20]]);
     }));
     return function asyncUpload(_x) {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   var handleChange = function handleChange(list) {
     valueRef.current = list;
     onChange(list);
   };
+  var verificationFormat = function verificationFormat(file) {
+    reactMediainfo.getInfo(file).then(function (res) {
+      var track = res.media.track;
+      console.log(res);
+      var videoItem = track.find(function (item) {
+        return item['@type'] === 'Video';
+      });
+      var generalItem = track.find(function (item) {
+        return item['@type'] === 'General';
+      });
+      if (videoItem && blackList[generalItem === null || generalItem === void 0 ? void 0 : generalItem.Format.toUpperCase()] && blackList[generalItem === null || generalItem === void 0 ? void 0 : generalItem.Format.toUpperCase()].includes(videoItem === null || videoItem === void 0 ? void 0 : videoItem.Format.toUpperCase())) {
+        antd.Modal.confirm({
+          title: '提示',
+          content: '上传的视屏无法播放确认要上传吗？',
+          okText: '确定',
+          cancelText: '取消',
+          onOk: function onOk() {
+            asyncUpload(file);
+          }
+        });
+      } else {
+        asyncUpload(file);
+      }
+    });
+  };
   // 手动上传模式, 一直返回false
   var beforeUpload = function beforeUpload(file) {
     console.log('beforeUpload', file);
@@ -7006,7 +7066,8 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
       antd.message.error("\u6587\u4EF6\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
       return antd.Upload.LIST_IGNORE;
     }
-    asyncUpload(file);
+    verificationFormat(file);
+    // asyncUpload(file);
     return antd.Upload.LIST_IGNORE;
   };
   var onRemove = function onRemove(file) {
@@ -7067,24 +7128,24 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
       return;
     }
     reader.onload = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
+      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(e) {
         var _e$target;
         var result, fileName, file;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               result = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.result;
               fileName = blob.name;
-              file = dataURLtoFile(result, fileName);
-              asyncUpload(file);
+              file = dataURLtoFile(result, fileName); // asyncUpload(file);
+              verificationFormat(file);
             case 4:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2);
+        }, _callee3);
       }));
       return function (_x2) {
-        return _ref3.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }();
     reader.readAsDataURL(blob);
@@ -7456,7 +7517,7 @@ var IdentifyAddress = function IdentifyAddress(props) {
       receiverMobile: val === null || val === void 0 ? void 0 : val.phone,
       address: []
     };
-    if (val === null || val === void 0 ? void 0 : val.province) {
+    if ((val === null || val === void 0 ? void 0 : val.province) && kmkfUtils.AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.province)) {
       params.address = [kmkfUtils.AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.province), kmkfUtils.AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.city), kmkfUtils.AddressData.getInstance().getProCodeByName(val === null || val === void 0 ? void 0 : val.district)];
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, params));
@@ -9426,7 +9487,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
         interceptReceiverName: undefined,
         interceptReceiverMobile: undefined,
         interceptLogisticsStatus: undefined,
-        interceptLogisticsStatusOther: undefined
+        interceptLogisticsStatusOther: undefined,
+        interceptLogisticsSnapshot: undefined
       });
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
@@ -10721,12 +10783,14 @@ var BsExchange = function BsExchange(props) {
   }, []);
   var getListHandle = function getListHandle(list, val) {
     var _val$bsExchangeType, _val$bsExchangeType2;
+    //固定的sku
+    var FIXED_FIELD = ['Q0000002', '600123001', '10103003', 'Q0000003', 'Q0000004'];
     //如果是原单换
     if (['1', '3'].includes(val === null || val === void 0 ? void 0 : (_val$bsExchangeType = val.bsExchangeType) === null || _val$bsExchangeType === void 0 ? void 0 : _val$bsExchangeType[0])) {
       return list.reduce(function (prv, next) {
         next.canDelete = false;
         //数量大于1 拆开
-        if (next.number > 1) {
+        if (next.number > 1 && !FIXED_FIELD.includes(next.sku)) {
           var newList = Array(next.number).fill({}).map(function () {
             var newNext = _objectSpread2({}, next);
             newNext.money = newNext.share;
@@ -10746,7 +10810,7 @@ var BsExchange = function BsExchange(props) {
         next.canDelete = true;
         next.index = index;
         //数量大于1 拆开
-        if (next.number > 1) {
+        if (next.number > 1 && !FIXED_FIELD.includes(next.sku)) {
           var newList = Array(next.number).fill({}).map(function () {
             var newNext = _objectSpread2({}, next);
             newNext.money = newNext.share;

package/dist/src/business/LogisticsInterception/index.d.ts

@@ -10,6 +10,7 @@ interface LogisticsInterceptionValueType {
     interceptReceiverMobile: string;
     interceptLogisticsStatus: string | number;
     interceptLogisticsStatusOther: string;
+    interceptLogisticsSnapshot: string;
 }
 interface LogisticsInterceptionProps {
     value: Partial<LogisticsInterceptionValueType>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.8.21-alpha.1",
+  "version": "0.8.21-alpha.5",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -24,6 +24,7 @@
     "lodash": "^4.17.21",
     "pubsub-js": "^1.9.4",
     "react-copy-to-clipboard": "^5.1.0",
+    "react-mediainfo": "^0.0.42",
     "umi-request": "^1.4.0"
   },
   "devDependencies": {
@@ -60,5 +61,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1f85f4ce9472dc2958c5b43d45ac9a0cf219e83e"
+  "gitHead": "774fbea8e36807731a7ad1d25d462ef28da2ebb9"
 }