@kmkf-fe-packages/basic-components 2.0.54-beta.57 → 2.0.54-beta.59

package/dist/index.esm.js

@@ -18087,6 +18087,7 @@ var getGyOrderListSingleton = function getGyOrderListSingleton(orderNo) {
                 deliveryState: item.deliveryState,
                 vipCode: item.vipCode,
                 shopCode: item.shopCode,
+                cancelName: item.cancel ? '是' : '否',
                 deliveryStateName: GY_DELIVERY_STATE_MAPPING[item.deliveryState]
               });
             });
@@ -18205,7 +18206,7 @@ var kmUtils = {
   getOrderListSingleton: getOrderListSingleton
 };
 
-var _excluded$h = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode"];
+var _excluded$h = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode", "cancel"];
 var columnsMap = {
   BS_SYSTEM_ORDER: BS_SYSTEM_ORDER_CONFIG.columns,
   KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
@@ -18480,6 +18481,7 @@ var index$3 = (function (props) {
                     deliveryState = _ref10.deliveryState,
                     vipCode = _ref10.vipCode,
                     shopCode = _ref10.shopCode,
+                    cancel = _ref10.cancel,
                     rest = _objectWithoutProperties(_ref10, _excluded$h);
                   return _objectSpread2(_objectSpread2({}, rest), {}, {
                     billNo: billNo,
@@ -18487,6 +18489,7 @@ var index$3 = (function (props) {
                     billTag: billTag,
                     tradeTagName: tradeTagName,
                     deliveryState: deliveryState,
+                    cancelName: cancel ? '是' : '否',
                     deliveryStateName: GY_DELIVERY_STATE_MAPPING[deliveryState],
                     vipCode: vipCode,
                     shopCode: shopCode
@@ -21106,7 +21109,7 @@ var GyReissue = function GyReissue(props) {
   }, /*#__PURE__*/React.createElement(Col, {
     className: "gutter-row",
     xs: {
-      span: 11
+      span: 12
     },
     sm: {
       span: 6
@@ -21127,12 +21130,13 @@ var GyReissue = function GyReissue(props) {
     return /*#__PURE__*/React.createElement(Select.Option, {
       key: item.billNo,
       value: item.billNo,
-      label: item.billNo
-    }, item.billNo);
+      label: item.billNo,
+      disabled: item.cancel
+    }, (item === null || item === void 0 ? void 0 : item.cancel) ? '[已取消]' : '', item.billNo);
   }))), /*#__PURE__*/React.createElement(Col, {
     className: "gutter-row",
     xs: {
-      span: 11
+      span: 12
     },
     sm: {
       span: 6
@@ -21420,8 +21424,9 @@ var GyReturnGoods = function GyReturnGoods(props) {
     return /*#__PURE__*/React.createElement(Select.Option, {
       key: item.billNo,
       value: item.billNo,
-      label: item.billNo
-    }, item.billNo);
+      label: item.billNo,
+      disabled: item === null || item === void 0 ? void 0 : item.cancel
+    }, (item === null || item === void 0 ? void 0 : item.cancel) ? '[已取消]' : '', " ", item.billNo);
   }))), /*#__PURE__*/React.createElement(Col, {
     className: "gutter-row",
     xs: {
@@ -21467,11 +21472,11 @@ var GyReturnGoods = function GyReturnGoods(props) {
   })));
 };
 
-var css_248z$c = ".index-module_imageBox__1f2AI {\n  display: flex;\n  flex-wrap: wrap;\n}\n.index-module_imageBox__1f2AI .ant-upload {\n  padding: 0;\n  height: 80px;\n  width: 80px;\n  border: none;\n  border-radius: 2px;\n  background: #F2F3F5;\n  text-align: center;\n  color: #86909C;\n  font-size: 14px;\n}\n.index-module_imageBox__1f2AI .ant-upload .index-module_addBtn__1DY59 {\n  color: #86909C;\n  font-size: 14px;\n}\n.index-module_tips__1XQjf {\n  color: #4E5969;\n  font-size: 12px;\n}\n";
+var css_248z$c = ".index-module_imageBox__1f2AI {\n  display: flex;\n  flex-wrap: wrap;\n}\n.index-module_imageBox__1f2AI .ant-upload {\n  padding: 0;\n  height: 80px;\n  width: 80px;\n  border: none;\n  border-radius: 2px;\n  background: #F2F3F5;\n  text-align: center;\n  color: #86909C;\n  font-size: 14px;\n}\n.index-module_imageBox__1f2AI .ant-upload .index-module_addBtn__1DY59 {\n  color: #86909C;\n  font-size: 14px;\n}\n.index-module_imageBox__1f2AI > span {\n  max-width: 100%;\n}\n.index-module_tips__1XQjf {\n  color: #4E5969;\n  font-size: 12px;\n}\n";
 var styles$5 = {"imageBox":"index-module_imageBox__1f2AI","addBtn":"index-module_addBtn__1DY59","tips":"index-module_tips__1XQjf"};
 styleInject(css_248z$c);
 
-var _excluded$r = ["maxCount", "maxSize", "onChange", "value", "disabled", "hostUrl", "canDownload", "actionUrl"];
+var _excluded$r = ["maxCount", "maxSize", "onChange", "value", "disabled", "hostUrl", "actionUrl"];
 var Dragger$1 = Upload.Dragger;
 var fn$4 = function fn() {
   return void 0;
@@ -21490,8 +21495,6 @@ var KmVideo = function KmVideo(_ref) {
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     _ref$hostUrl = _ref.hostUrl,
     hostUrl = _ref$hostUrl === void 0 ? '' : _ref$hostUrl,
-    _ref$canDownload = _ref.canDownload,
-    canDownload = _ref$canDownload === void 0 ? false : _ref$canDownload,
     _ref$actionUrl = _ref.actionUrl,
     actionUrl = _ref$actionUrl === void 0 ? '/qy/common/uploadWorkOrderImg' : _ref$actionUrl,
     resetProps = _objectWithoutProperties(_ref, _excluded$r);
@@ -21579,21 +21582,6 @@ var KmVideo = function KmVideo(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
-  var download = function download(url, name) {
-    fetch(url).then(function (res) {
-      return res.blob();
-    }).then(function (blob) {
-      var a = document.createElement('a');
-      document.body.appendChild(a);
-      a.style.display = 'none';
-      var url = window.URL.createObjectURL(blob);
-      a.href = url;
-      a.download = name;
-      a.click();
-      document.body.removeChild(a);
-      window.URL.revokeObjectURL(url);
-    });
-  };
   var handleChange = function handleChange(list) {
     valueRef.current = list;
     onChange(list);
@@ -21677,12 +21665,7 @@ var KmVideo = function KmVideo(_ref) {
     title: fileName,
     footer: null,
     onCancel: handleCancel
-  }, canDownload ? /*#__PURE__*/React.createElement(Button, {
-    type: "link",
-    onClick: function onClick() {
-      return download(fileUrl, fileName);
-    }
-  }, "\u4E0B\u8F7D") : /*#__PURE__*/React.createElement(CopyToClipboard, {
+  }, /*#__PURE__*/React.createElement(CopyToClipboard, {
     text: fileUrl,
     onCopy: function onCopy() {
       message.success('复制成功');

package/dist/index.js

@@ -18099,6 +18099,7 @@ var getGyOrderListSingleton = function getGyOrderListSingleton(orderNo) {
                 deliveryState: item.deliveryState,
                 vipCode: item.vipCode,
                 shopCode: item.shopCode,
+                cancelName: item.cancel ? '是' : '否',
                 deliveryStateName: kmkfUtils.GY_DELIVERY_STATE_MAPPING[item.deliveryState]
               });
             });
@@ -18217,7 +18218,7 @@ var kmUtils = {
   getOrderListSingleton: getOrderListSingleton
 };
 
-var _excluded$h = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode"];
+var _excluded$h = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode", "cancel"];
 var columnsMap = {
   BS_SYSTEM_ORDER: kmkfUtils.BS_SYSTEM_ORDER_CONFIG.columns,
   KM_SYSTEM_ORDER: kmkfUtils.KM_SYSTEM_ORDER_CONFIG.columns,
@@ -18492,6 +18493,7 @@ var index$3 = (function (props) {
                     deliveryState = _ref10.deliveryState,
                     vipCode = _ref10.vipCode,
                     shopCode = _ref10.shopCode,
+                    cancel = _ref10.cancel,
                     rest = _objectWithoutProperties(_ref10, _excluded$h);
                   return _objectSpread2(_objectSpread2({}, rest), {}, {
                     billNo: billNo,
@@ -18499,6 +18501,7 @@ var index$3 = (function (props) {
                     billTag: billTag,
                     tradeTagName: tradeTagName,
                     deliveryState: deliveryState,
+                    cancelName: cancel ? '是' : '否',
                     deliveryStateName: kmkfUtils.GY_DELIVERY_STATE_MAPPING[deliveryState],
                     vipCode: vipCode,
                     shopCode: shopCode
@@ -21118,7 +21121,7 @@ var GyReissue = function GyReissue(props) {
   }, /*#__PURE__*/React__default['default'].createElement(antd.Col, {
     className: "gutter-row",
     xs: {
-      span: 11
+      span: 12
     },
     sm: {
       span: 6
@@ -21139,12 +21142,13 @@ var GyReissue = function GyReissue(props) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
       key: item.billNo,
       value: item.billNo,
-      label: item.billNo
-    }, item.billNo);
+      label: item.billNo,
+      disabled: item.cancel
+    }, (item === null || item === void 0 ? void 0 : item.cancel) ? '[已取消]' : '', item.billNo);
   }))), /*#__PURE__*/React__default['default'].createElement(antd.Col, {
     className: "gutter-row",
     xs: {
-      span: 11
+      span: 12
     },
     sm: {
       span: 6
@@ -21432,8 +21436,9 @@ var GyReturnGoods = function GyReturnGoods(props) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
       key: item.billNo,
       value: item.billNo,
-      label: item.billNo
-    }, item.billNo);
+      label: item.billNo,
+      disabled: item === null || item === void 0 ? void 0 : item.cancel
+    }, (item === null || item === void 0 ? void 0 : item.cancel) ? '[已取消]' : '', " ", item.billNo);
   }))), /*#__PURE__*/React__default['default'].createElement(antd.Col, {
     className: "gutter-row",
     xs: {
@@ -21479,11 +21484,11 @@ var GyReturnGoods = function GyReturnGoods(props) {
   })));
 };
 
-var css_248z$c = ".index-module_imageBox__1f2AI {\n  display: flex;\n  flex-wrap: wrap;\n}\n.index-module_imageBox__1f2AI .ant-upload {\n  padding: 0;\n  height: 80px;\n  width: 80px;\n  border: none;\n  border-radius: 2px;\n  background: #F2F3F5;\n  text-align: center;\n  color: #86909C;\n  font-size: 14px;\n}\n.index-module_imageBox__1f2AI .ant-upload .index-module_addBtn__1DY59 {\n  color: #86909C;\n  font-size: 14px;\n}\n.index-module_tips__1XQjf {\n  color: #4E5969;\n  font-size: 12px;\n}\n";
+var css_248z$c = ".index-module_imageBox__1f2AI {\n  display: flex;\n  flex-wrap: wrap;\n}\n.index-module_imageBox__1f2AI .ant-upload {\n  padding: 0;\n  height: 80px;\n  width: 80px;\n  border: none;\n  border-radius: 2px;\n  background: #F2F3F5;\n  text-align: center;\n  color: #86909C;\n  font-size: 14px;\n}\n.index-module_imageBox__1f2AI .ant-upload .index-module_addBtn__1DY59 {\n  color: #86909C;\n  font-size: 14px;\n}\n.index-module_imageBox__1f2AI > span {\n  max-width: 100%;\n}\n.index-module_tips__1XQjf {\n  color: #4E5969;\n  font-size: 12px;\n}\n";
 var styles$5 = {"imageBox":"index-module_imageBox__1f2AI","addBtn":"index-module_addBtn__1DY59","tips":"index-module_tips__1XQjf"};
 styleInject(css_248z$c);
 
-var _excluded$r = ["maxCount", "maxSize", "onChange", "value", "disabled", "hostUrl", "canDownload", "actionUrl"];
+var _excluded$r = ["maxCount", "maxSize", "onChange", "value", "disabled", "hostUrl", "actionUrl"];
 var Dragger$1 = antd.Upload.Dragger;
 var fn$4 = function fn() {
   return void 0;
@@ -21502,8 +21507,6 @@ var KmVideo = function KmVideo(_ref) {
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     _ref$hostUrl = _ref.hostUrl,
     hostUrl = _ref$hostUrl === void 0 ? '' : _ref$hostUrl,
-    _ref$canDownload = _ref.canDownload,
-    canDownload = _ref$canDownload === void 0 ? false : _ref$canDownload,
     _ref$actionUrl = _ref.actionUrl,
     actionUrl = _ref$actionUrl === void 0 ? '/qy/common/uploadWorkOrderImg' : _ref$actionUrl,
     resetProps = _objectWithoutProperties(_ref, _excluded$r);
@@ -21591,21 +21594,6 @@ var KmVideo = function KmVideo(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
-  var download = function download(url, name) {
-    fetch(url).then(function (res) {
-      return res.blob();
-    }).then(function (blob) {
-      var a = document.createElement('a');
-      document.body.appendChild(a);
-      a.style.display = 'none';
-      var url = window.URL.createObjectURL(blob);
-      a.href = url;
-      a.download = name;
-      a.click();
-      document.body.removeChild(a);
-      window.URL.revokeObjectURL(url);
-    });
-  };
   var handleChange = function handleChange(list) {
     valueRef.current = list;
     onChange(list);
@@ -21689,12 +21677,7 @@ var KmVideo = function KmVideo(_ref) {
     title: fileName,
     footer: null,
     onCancel: handleCancel
-  }, canDownload ? /*#__PURE__*/React__default['default'].createElement(antd.Button, {
-    type: "link",
-    onClick: function onClick() {
-      return download(fileUrl, fileName);
-    }
-  }, "\u4E0B\u8F7D") : /*#__PURE__*/React__default['default'].createElement(reactCopyToClipboard.CopyToClipboard, {
+  }, /*#__PURE__*/React__default['default'].createElement(reactCopyToClipboard.CopyToClipboard, {
     text: fileUrl,
     onCopy: function onCopy() {
       antd.message.success('复制成功');

package/dist/src/km/KmVideo/index.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.0.54-beta.57",
+  "version": "2.0.54-beta.59",
   "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": "2.0.54-beta.57",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.54-beta.59",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8243d9f752c54db54fcbcdc9df0a2e5a4b9f7bc6"
+  "gitHead": "c86cddf43ae9403763c5fad9ea243984c05cc29c"
 }