@kmkf-fe-packages/basic-components 0.13.0-alpha.3 → 0.13.0-beta.2

package/dist/index.esm.js

@@ -618,7 +618,7 @@ var ApaasUpload = function ApaasUpload(_ref) {
     _ref$accept = _ref.accept,
     accept = _ref$accept === void 0 ? 'image/gif,image/jpg,image/jpeg,image/png' : _ref$accept,
     _ref$canPreview = _ref.canPreview,
-    canPreview = _ref$canPreview === void 0 ? true : _ref$canPreview,
+    canPreview = _ref$canPreview === void 0 ? false : _ref$canPreview,
     _ref$disabled = _ref.disabled,
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     resetProps = _objectWithoutProperties(_ref, _excluded$4);
@@ -789,7 +789,7 @@ var ApaasUpload = function ApaasUpload(_ref) {
     className: styles.upload,
     beforeUpload: beforeUpload
   }, resetProps), value.length >= maxCount ? null : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
-    className: "addBtn"
+    className: 'addBtn'
   }, "+"), /*#__PURE__*/React.createElement("div", null, uploadText))), /*#__PURE__*/React.createElement(Image, {
     width: 0,
     style: {
@@ -913,7 +913,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref) {
     _ref$accept = _ref.accept,
     accept = _ref$accept === void 0 ? 'image/gif,image/jpg,image/jpeg,image/png' : _ref$accept,
     _ref$canPreview = _ref.canPreview,
-    canPreview = _ref$canPreview === void 0 ? true : _ref$canPreview,
+    canPreview = _ref$canPreview === void 0 ? false : _ref$canPreview,
     _ref$disabled = _ref.disabled,
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     uniqueKey = _ref.uniqueKey,
@@ -6853,12 +6853,12 @@ hooks.HTML5_FMT = {
     MONTH: 'YYYY-MM', // <input type="month" />
 };
 
-var _excluded$7 = ["maxCount", "maxSize", "onChange", "value", "accept", "disabled", "hostUrl", "canDownload", "actionUrl", "platform"];
+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;
 };
-var ApaasUploadFile = function ApaasUploadFile(_ref) {
+var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
   var _ref$maxCount = _ref.maxCount,
     maxCount = _ref$maxCount === void 0 ? 10 : _ref$maxCount,
     _ref$maxSize = _ref.maxSize,
@@ -6871,6 +6871,7 @@ var ApaasUploadFile = function ApaasUploadFile(_ref) {
     accept = _ref$accept === void 0 ? '' : _ref$accept,
     _ref$disabled = _ref.disabled,
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    uniqueKey = _ref.uniqueKey,
     _ref$hostUrl = _ref.hostUrl,
     hostUrl = _ref$hostUrl === void 0 ? '' : _ref$hostUrl,
     _ref$canDownload = _ref.canDownload,
@@ -6896,6 +6897,7 @@ var ApaasUploadFile = function ApaasUploadFile(_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),
@@ -6908,11 +6910,16 @@ var ApaasUploadFile = function ApaasUploadFile(_ref) {
   var fileList = useMemo(function () {
     return value.map(function (t, i) {
       return _objectSpread2(_objectSpread2({}, t), {}, {
+        // status: 'success',
         percent: 100,
         uid: i + ''
+        // name: ,
       });
     });
   }, [value]);
+  // useEffect(() => {
+  //   getVideoBlack();
+  // }, []);
   useEffect(function () {
     valueRef.current = value;
   }, [value]);
@@ -6932,6 +6939,20 @@ var ApaasUploadFile = function ApaasUploadFile(_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;
@@ -6998,9 +7019,46 @@ var ApaasUploadFile = function ApaasUploadFile(_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);
+    console.log('beforeUpload', file);
     var size = file.size / 1024 / 1024 < maxSize;
     if (value.length >= maxCount) {
       message.error("\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u4E2A\u6587\u4EF6\uFF01"));
@@ -7010,6 +7068,7 @@ var ApaasUploadFile = function ApaasUploadFile(_ref) {
       message.error("\u6587\u4EF6\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
       return Upload.LIST_IGNORE;
     }
+    // verificationFormat(file);
     asyncUpload(file);
     return Upload.LIST_IGNORE;
   };
@@ -11806,7 +11865,7 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
         maxHeight: '300px',
         overflowY: 'auto'
       }
-    }, type === 1 ? /*#__PURE__*/React.createElement("span", null, "\u7CFB\u7EDF\u8BA2\u5355\u53F7", index + 1, "\uFF1A", item.systemOrderId) : null);
+    }, [1, 2, 3, 4].includes(type) ? /*#__PURE__*/React.createElement("span", null, "\u7CFB\u7EDF\u8BA2\u5355\u53F7", index + 1, "\uFF1A", item.systemOrderId) : null);
   };
   var changeInputHandle = function changeInputHandle(val, type) {
     var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
@@ -11855,14 +11914,14 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
     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
+    value: (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3.billNo
   })) : null, type === 4 ? /*#__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, 'exchangeTradeId');
     },
-    value: (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4.reissueTradeId
+    value: (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4.billNo
   })) : null) : null);
 };
 
@@ -11959,4 +12018,4 @@ var CalculationInput = function CalculationInput(props) {
   }, config === null || config === void 0 ? void 0 : config.unit));
 };
 
-export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync, ApaasUploadFile, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonSystemOrder$1 as CommonMultiStatus, CommonStatus, CommonSystemOrder, ExpressLogistics, Goods, index$1 as GoodsTable, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsTrajectory, ParseLogistics, Payment, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, Supplier, TBGoodId, TBGoodSerial, TradeId, WlnGoods };
+export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync, ApaasUploadAsync$1 as ApaasUploadFile, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonSystemOrder$1 as CommonMultiStatus, CommonStatus, CommonSystemOrder, ExpressLogistics, Goods, index$1 as GoodsTable, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsTrajectory, ParseLogistics, Payment, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, Supplier, TBGoodId, TBGoodSerial, TradeId, WlnGoods };

package/dist/index.js

@@ -629,7 +629,7 @@ var ApaasUpload = function ApaasUpload(_ref) {
     _ref$accept = _ref.accept,
     accept = _ref$accept === void 0 ? 'image/gif,image/jpg,image/jpeg,image/png' : _ref$accept,
     _ref$canPreview = _ref.canPreview,
-    canPreview = _ref$canPreview === void 0 ? true : _ref$canPreview,
+    canPreview = _ref$canPreview === void 0 ? false : _ref$canPreview,
     _ref$disabled = _ref.disabled,
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     resetProps = _objectWithoutProperties(_ref, _excluded$4);
@@ -800,7 +800,7 @@ var ApaasUpload = function ApaasUpload(_ref) {
     className: styles.upload,
     beforeUpload: beforeUpload
   }, resetProps), value.length >= maxCount ? null : /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("span", {
-    className: "addBtn"
+    className: 'addBtn'
   }, "+"), /*#__PURE__*/React__default['default'].createElement("div", null, uploadText))), /*#__PURE__*/React__default['default'].createElement(antd.Image, {
     width: 0,
     style: {
@@ -924,7 +924,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref) {
     _ref$accept = _ref.accept,
     accept = _ref$accept === void 0 ? 'image/gif,image/jpg,image/jpeg,image/png' : _ref$accept,
     _ref$canPreview = _ref.canPreview,
-    canPreview = _ref$canPreview === void 0 ? true : _ref$canPreview,
+    canPreview = _ref$canPreview === void 0 ? false : _ref$canPreview,
     _ref$disabled = _ref.disabled,
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     uniqueKey = _ref.uniqueKey,
@@ -6864,12 +6864,12 @@ hooks.HTML5_FMT = {
     MONTH: 'YYYY-MM', // <input type="month" />
 };
 
-var _excluded$7 = ["maxCount", "maxSize", "onChange", "value", "accept", "disabled", "hostUrl", "canDownload", "actionUrl", "platform"];
+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;
 };
-var ApaasUploadFile = function ApaasUploadFile(_ref) {
+var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
   var _ref$maxCount = _ref.maxCount,
     maxCount = _ref$maxCount === void 0 ? 10 : _ref$maxCount,
     _ref$maxSize = _ref.maxSize,
@@ -6882,6 +6882,7 @@ var ApaasUploadFile = function ApaasUploadFile(_ref) {
     accept = _ref$accept === void 0 ? '' : _ref$accept,
     _ref$disabled = _ref.disabled,
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    uniqueKey = _ref.uniqueKey,
     _ref$hostUrl = _ref.hostUrl,
     hostUrl = _ref$hostUrl === void 0 ? '' : _ref$hostUrl,
     _ref$canDownload = _ref.canDownload,
@@ -6907,6 +6908,7 @@ var ApaasUploadFile = function ApaasUploadFile(_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),
@@ -6919,11 +6921,16 @@ var ApaasUploadFile = function ApaasUploadFile(_ref) {
   var fileList = React.useMemo(function () {
     return value.map(function (t, i) {
       return _objectSpread2(_objectSpread2({}, t), {}, {
+        // status: 'success',
         percent: 100,
         uid: i + ''
+        // name: ,
       });
     });
   }, [value]);
+  // useEffect(() => {
+  //   getVideoBlack();
+  // }, []);
   React.useEffect(function () {
     valueRef.current = value;
   }, [value]);
@@ -6943,6 +6950,20 @@ var ApaasUploadFile = function ApaasUploadFile(_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;
@@ -7009,9 +7030,46 @@ var ApaasUploadFile = function ApaasUploadFile(_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);
+    console.log('beforeUpload', file);
     var size = file.size / 1024 / 1024 < maxSize;
     if (value.length >= maxCount) {
       antd.message.error("\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u4E2A\u6587\u4EF6\uFF01"));
@@ -7021,6 +7079,7 @@ var ApaasUploadFile = function ApaasUploadFile(_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;
   };
@@ -11817,7 +11876,7 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
         maxHeight: '300px',
         overflowY: 'auto'
       }
-    }, type === 1 ? /*#__PURE__*/React__default['default'].createElement("span", null, "\u7CFB\u7EDF\u8BA2\u5355\u53F7", index + 1, "\uFF1A", item.systemOrderId) : null);
+    }, [1, 2, 3, 4].includes(type) ? /*#__PURE__*/React__default['default'].createElement("span", null, "\u7CFB\u7EDF\u8BA2\u5355\u53F7", index + 1, "\uFF1A", item.systemOrderId) : null);
   };
   var changeInputHandle = function changeInputHandle(val, type) {
     var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
@@ -11866,14 +11925,14 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
     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
+    value: (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3.billNo
   })) : null, type === 4 ? /*#__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, 'exchangeTradeId');
     },
-    value: (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4.reissueTradeId
+    value: (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4.billNo
   })) : null) : null);
 };
 
@@ -11989,7 +12048,7 @@ exports.ApaasSlider = ApaasSlider;
 exports.ApaasTextArea = ApaasTextArea;
 exports.ApaasUpload = ApaasUpload;
 exports.ApaasUploadAsync = ApaasUploadAsync;
-exports.ApaasUploadFile = ApaasUploadFile;
+exports.ApaasUploadFile = ApaasUploadAsync$1;
 exports.BsExchange = BsExchange;
 exports.BsGoods = BsGoods;
 exports.BsReissue = BsReissue;

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.13.0-alpha.3",
+  "version": "0.13.0-beta.2",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "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.13.0-alpha.3",
+    "@kmkf-fe-packages/kmkf-utils": "^0.13.0-beta.1",
     "lodash": "^4.17.21",
     "pubsub-js": "^1.9.4",
     "react-copy-to-clipboard": "^5.1.0",
@@ -61,5 +61,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "324ac5eec7deb67c75a650e7594e01ff9effe72e"
+  "gitHead": "f6e588014c54ae541f5a33b98ba77452b84aaefc"
 }