@kmkf-fe-packages/basic-components 0.9.2 → 0.10.0-alpha.4

package/dist/index.esm.js

@@ -6853,7 +6853,7 @@ hooks.HTML5_FMT = {
     MONTH: 'YYYY-MM', // <input type="month" />
 };
 
-var _excluded$7 = ["maxCount", "maxSize", "onChange", "value", "accept", "disabled", "uniqueKey", "hostUrl", "canDownload", "actionUrl"];
+var _excluded$7 = ["maxCount", "maxSize", "onChange", "value", "accept", "disabled", "uniqueKey", "hostUrl", "canDownload", "actionUrl", "platform"];
 var Dragger = Upload.Dragger;
 var fn$2 = function fn() {
   return void 0;
@@ -6878,6 +6878,7 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
     canDownload = _ref$canDownload === void 0 ? false : _ref$canDownload,
     _ref$actionUrl = _ref.actionUrl,
     actionUrl = _ref$actionUrl === void 0 ? '/qy/common/uploadWorkOrderImg' : _ref$actionUrl,
+    _ref$platform = _ref.platform,
     resetProps = _objectWithoutProperties(_ref, _excluded$7);
   var inputRef = useRef(null);
   var _useState = useState(false),
@@ -6896,6 +6897,7 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     fileName = _useState8[0],
     setFileName = _useState8[1];
+  // const [blackList, setBlackList] = useState<any>({});
   var valueRef = useRef(value);
   var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
@@ -6915,6 +6917,9 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
       });
     });
   }, [value]);
+  // useEffect(() => {
+  //   getVideoBlack();
+  // }, []);
   useEffect(function () {
     valueRef.current = value;
   }, [value]);
@@ -6934,6 +6939,20 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
       });
     };
   }, [pasteDefaultStates]);
+  //获取视频上传黑名单
+  // const getVideoBlack = async () => {
+  //   request('/qy/diamond/getConfigInfo', {
+  //     method: 'get',
+  //     params: {
+  //       key: 'video-upload-code',
+  //       name: 'getConfigInfo',
+  //     },
+  //   }).then((res) => {
+  //     if (res.success && res.data) {
+  //       setBlackList(JSON.parse(res.data));
+  //     }
+  //   });
+  // };
   var asyncUpload = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
       var formData, fileName, _yield$request, success, data;
@@ -6985,9 +7004,9 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
     fetch(url).then(function (res) {
       return res.blob();
     }).then(function (blob) {
-      var a = document.createElement("a");
+      var a = document.createElement('a');
       document.body.appendChild(a);
-      a.style.display = "none";
+      a.style.display = 'none';
       var url = window.URL.createObjectURL(blob);
       a.href = url;
       a.download = name;
@@ -7000,6 +7019,43 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
     valueRef.current = list;
     onChange(list);
   };
+  // const verificationFormat = async (file: any) => {
+  //   //飞鸽端不支持worker没有办法使用react-mediainfo插件
+  //   if (platform !== 'fxg') {
+  //     const { getInfo } = await require('react-mediainfo');
+  //     getInfo(file).then((res: any) => {
+  //       const {
+  //         media: { track },
+  //       } = res;
+  //       console.log(res);
+  //       const videoItem = track.find((item: any) => item['@type'] === 'Video');
+  //       const generalItem = track.find(
+  //         (item: any) => item['@type'] === 'General',
+  //       );
+  //       if (
+  //         videoItem &&
+  //         blackList[generalItem?.Format.toUpperCase()] &&
+  //         blackList[generalItem?.Format.toUpperCase()].includes(
+  //           videoItem?.Format.toUpperCase(),
+  //         )
+  //       ) {
+  //         Modal.confirm({
+  //           title: '提示',
+  //           content: '上传的视频可能无法播放，确认要上传吗？',
+  //           okText: '确定',
+  //           cancelText: '取消',
+  //           onOk: () => {
+  //             asyncUpload(file);
+  //           },
+  //         });
+  //       } else {
+  //         asyncUpload(file);
+  //       }
+  //     });
+  //   } else {
+  //     asyncUpload(file);
+  //   }
+  // };
   // 手动上传模式, 一直返回false
   var beforeUpload = function beforeUpload(file) {
     console.log('beforeUpload', file);
@@ -7012,6 +7068,7 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
       message.error("\u6587\u4EF6\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
       return Upload.LIST_IGNORE;
     }
+    // verificationFormat(file);
     asyncUpload(file);
     return Upload.LIST_IGNORE;
   };
@@ -7083,6 +7140,7 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
               fileName = blob.name;
               file = dataURLtoFile(result, fileName);
               asyncUpload(file);
+              // verificationFormat(file);
             case 4:
             case "end":
               return _context2.stop();
@@ -7153,7 +7211,7 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
   }, "\u4E0B\u8F7D") : /*#__PURE__*/React.createElement(CopyToClipboard, {
     text: fileUrl,
     onCopy: function onCopy() {
-      message.success("复制成功");
+      message.success('复制成功');
     }
   }, /*#__PURE__*/React.createElement(Button, {
     type: "link"
@@ -9437,7 +9495,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);
@@ -10732,12 +10791,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;
@@ -10757,7 +10818,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;
@@ -11694,7 +11755,7 @@ function CommonStatus(props) {
 }
 
 var CommonSystemOrder = function CommonSystemOrder(props) {
-  var _value$changeIndex, _value$changeIndex2;
+  var _value$changeIndex, _value$changeIndex2, _value$changeIndex3;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
@@ -11756,6 +11817,13 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
       return changeInputHandle(e.target.value, 'returnGoodsTradeId');
     },
     value: (_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2.returnGoodsTradeId
+  })) : null, type === 3 ? /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Input, {
+    disabled: true,
+    placeholder: "\u8BF7\u8F93\u5165\u6362\u8D27\u5355id",
+    onChange: function onChange(e) {
+      return changeInputHandle(e.target.value, 'reissueTradeId');
+    },
+    value: (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3.reissueTradeId
   })) : null) : null);
 };
 

package/dist/index.js

@@ -6864,7 +6864,7 @@ hooks.HTML5_FMT = {
     MONTH: 'YYYY-MM', // <input type="month" />
 };
 
-var _excluded$7 = ["maxCount", "maxSize", "onChange", "value", "accept", "disabled", "uniqueKey", "hostUrl", "canDownload", "actionUrl"];
+var _excluded$7 = ["maxCount", "maxSize", "onChange", "value", "accept", "disabled", "uniqueKey", "hostUrl", "canDownload", "actionUrl", "platform"];
 var Dragger = antd.Upload.Dragger;
 var fn$2 = function fn() {
   return void 0;
@@ -6889,6 +6889,7 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
     canDownload = _ref$canDownload === void 0 ? false : _ref$canDownload,
     _ref$actionUrl = _ref.actionUrl,
     actionUrl = _ref$actionUrl === void 0 ? '/qy/common/uploadWorkOrderImg' : _ref$actionUrl,
+    _ref$platform = _ref.platform,
     resetProps = _objectWithoutProperties(_ref, _excluded$7);
   var inputRef = React.useRef(null);
   var _useState = React.useState(false),
@@ -6907,6 +6908,7 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     fileName = _useState8[0],
     setFileName = _useState8[1];
+  // const [blackList, setBlackList] = useState<any>({});
   var valueRef = React.useRef(value);
   var _useState9 = React.useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
@@ -6926,6 +6928,9 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
       });
     });
   }, [value]);
+  // useEffect(() => {
+  //   getVideoBlack();
+  // }, []);
   React.useEffect(function () {
     valueRef.current = value;
   }, [value]);
@@ -6945,6 +6950,20 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
       });
     };
   }, [pasteDefaultStates]);
+  //获取视频上传黑名单
+  // const getVideoBlack = async () => {
+  //   request('/qy/diamond/getConfigInfo', {
+  //     method: 'get',
+  //     params: {
+  //       key: 'video-upload-code',
+  //       name: 'getConfigInfo',
+  //     },
+  //   }).then((res) => {
+  //     if (res.success && res.data) {
+  //       setBlackList(JSON.parse(res.data));
+  //     }
+  //   });
+  // };
   var asyncUpload = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
       var formData, fileName, _yield$request, success, data;
@@ -6996,9 +7015,9 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
     fetch(url).then(function (res) {
       return res.blob();
     }).then(function (blob) {
-      var a = document.createElement("a");
+      var a = document.createElement('a');
       document.body.appendChild(a);
-      a.style.display = "none";
+      a.style.display = 'none';
       var url = window.URL.createObjectURL(blob);
       a.href = url;
       a.download = name;
@@ -7011,6 +7030,43 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
     valueRef.current = list;
     onChange(list);
   };
+  // const verificationFormat = async (file: any) => {
+  //   //飞鸽端不支持worker没有办法使用react-mediainfo插件
+  //   if (platform !== 'fxg') {
+  //     const { getInfo } = await require('react-mediainfo');
+  //     getInfo(file).then((res: any) => {
+  //       const {
+  //         media: { track },
+  //       } = res;
+  //       console.log(res);
+  //       const videoItem = track.find((item: any) => item['@type'] === 'Video');
+  //       const generalItem = track.find(
+  //         (item: any) => item['@type'] === 'General',
+  //       );
+  //       if (
+  //         videoItem &&
+  //         blackList[generalItem?.Format.toUpperCase()] &&
+  //         blackList[generalItem?.Format.toUpperCase()].includes(
+  //           videoItem?.Format.toUpperCase(),
+  //         )
+  //       ) {
+  //         Modal.confirm({
+  //           title: '提示',
+  //           content: '上传的视频可能无法播放，确认要上传吗？',
+  //           okText: '确定',
+  //           cancelText: '取消',
+  //           onOk: () => {
+  //             asyncUpload(file);
+  //           },
+  //         });
+  //       } else {
+  //         asyncUpload(file);
+  //       }
+  //     });
+  //   } else {
+  //     asyncUpload(file);
+  //   }
+  // };
   // 手动上传模式, 一直返回false
   var beforeUpload = function beforeUpload(file) {
     console.log('beforeUpload', file);
@@ -7023,6 +7079,7 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
       antd.message.error("\u6587\u4EF6\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
       return antd.Upload.LIST_IGNORE;
     }
+    // verificationFormat(file);
     asyncUpload(file);
     return antd.Upload.LIST_IGNORE;
   };
@@ -7094,6 +7151,7 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
               fileName = blob.name;
               file = dataURLtoFile(result, fileName);
               asyncUpload(file);
+              // verificationFormat(file);
             case 4:
             case "end":
               return _context2.stop();
@@ -7164,7 +7222,7 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
   }, "\u4E0B\u8F7D") : /*#__PURE__*/React__default['default'].createElement(reactCopyToClipboard.CopyToClipboard, {
     text: fileUrl,
     onCopy: function onCopy() {
-      antd.message.success("复制成功");
+      antd.message.success('复制成功');
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "link"
@@ -9448,7 +9506,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);
@@ -10743,12 +10802,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;
@@ -10768,7 +10829,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;
@@ -11705,7 +11766,7 @@ function CommonStatus(props) {
 }
 
 var CommonSystemOrder = function CommonSystemOrder(props) {
-  var _value$changeIndex, _value$changeIndex2;
+  var _value$changeIndex, _value$changeIndex2, _value$changeIndex3;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
@@ -11767,6 +11828,13 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
       return changeInputHandle(e.target.value, 'returnGoodsTradeId');
     },
     value: (_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2.returnGoodsTradeId
+  })) : null, type === 3 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    disabled: true,
+    placeholder: "\u8BF7\u8F93\u5165\u6362\u8D27\u5355id",
+    onChange: function onChange(e) {
+      return changeInputHandle(e.target.value, 'reissueTradeId');
+    },
+    value: (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3.reissueTradeId
   })) : null) : null);
 };
 

package/dist/src/apaas/ApaasUploadFile/index.d.ts

@@ -15,7 +15,8 @@ export interface ApaasUploadProps extends Omit<UploadProps, 'onChange' | 'value'
     uniqueKey?: string;
     hostUrl?: string;
     actionUrl?: string;
+    platform?: string;
     canDownload?: boolean;
 }
-declare const ApaasUploadAsync: ({ maxCount, maxSize, onChange, value, accept, disabled, uniqueKey, hostUrl, canDownload, actionUrl, ...resetProps }: ApaasUploadProps) => React.JSX.Element;
+declare const ApaasUploadAsync: ({ maxCount, maxSize, onChange, value, accept, disabled, uniqueKey, hostUrl, canDownload, actionUrl, platform, ...resetProps }: ApaasUploadProps) => React.JSX.Element;
 export default ApaasUploadAsync;

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.9.2",
+  "version": "0.10.0-alpha.4",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,10 +20,11 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "^0.8.19",
+    "@kmkf-fe-packages/kmkf-utils": "^0.10.0-alpha.0",
     "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": "88fe1312b17cdff99c8ec6010b57629e5ca3f75f"
+  "gitHead": "d1b0f15627f25ddaa686dc679fc7b19720725cc6"
 }