@kmkf-fe-packages/basic-components 1.17.8-beta.34 → 1.17.8-beta.36

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
 import { EyeOutlined, DeleteOutlined, CloseCircleOutlined, CaretUpOutlined } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { AddressData, BsAddressData, WdtAddressData, request as request$1, ExpressData, uuid, LogisticsAddressData, WdtSendData, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, BS_E3_BOOLEAN_STATUS_MAP, updateWdtGoodsHandle, updateBsE3GoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, request as request$1, ExpressData, uuid, LogisticsAddressData, WdtSendData, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, BS_E3_ORDER_STATUS_MAP, BS_E3_BOOLEAN_STATUS_MAP, updateWdtGoodsHandle, updateBsE3GoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, takeRight, reject } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
@@ -12153,7 +12153,7 @@ var columns$2 = [{
   ellipsis: true,
   width: 70
 }, {
-  dataIndex: 'goodsSname',
+  dataIndex: 'goodsShortName',
   title: "\u5546\u54C1\u7B80\u79F0",
   ellipsis: true,
   width: 70
@@ -12165,8 +12165,8 @@ var columns$2 = [{
   render: function render(picUrl) {
     return /*#__PURE__*/React.createElement("img", {
       style: {
-        width: '40px',
-        height: '40px',
+        width: '60px',
+        height: '60px',
         objectFit: 'contain'
       },
       src: picUrl
@@ -12248,7 +12248,7 @@ var columns$2 = [{
   ellipsis: true,
   width: 70
 }, {
-  dataIndex: 'taocanSingleSl',
+  dataIndex: 'taoCanSingleSl',
   title: "\u5355\u4E2A\u5957\u9910\u6570\u91CF",
   ellipsis: true,
   width: 70
@@ -12497,6 +12497,7 @@ var BsE3GoodsModal = /*#__PURE__*/forwardRef(GoodsModal$4);
 //   styleId: string;
 // }
 var GoodItem$1 = function GoodItem(props) {
+  var _ref;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     type = props.type,
@@ -12954,7 +12955,7 @@ var GoodItem$1 = function GoodItem(props) {
               ellipsis: true,
               width: 150
             }, {
-              dataIndex: 'goodsSname',
+              dataIndex: 'goodsShortName',
               title: "\u5546\u54C1\u7B80\u79F0",
               align: 'center',
               ellipsis: true,
@@ -12964,7 +12965,13 @@ var GoodItem$1 = function GoodItem(props) {
               title: "\u5546\u54C1\u56FE\u7247",
               align: 'center',
               ellipsis: true,
-              width: 100
+              width: 100,
+              render: function render(val) {
+                return /*#__PURE__*/React.createElement(Image, {
+                  width: 60,
+                  src: val
+                });
+              }
             }, {
               dataIndex: 'goodsSn',
               title: "\u8D27\u53F7",
@@ -13056,7 +13063,7 @@ var GoodItem$1 = function GoodItem(props) {
               ellipsis: true,
               width: 100
             }, {
-              dataIndex: 'taocanSingleSl',
+              dataIndex: 'taoCanSingleSl',
               title: "\u5355\u4E2A\u5957\u9910\u6570\u91CF",
               align: 'center',
               ellipsis: true,
@@ -13293,7 +13300,7 @@ var GoodItem$1 = function GoodItem(props) {
   }, showModeBtn && /*#__PURE__*/React.createElement(Checkbox, {
     checked: isStrict,
     onChange: handleCheckboxChange
-  }, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), /*#__PURE__*/React.createElement(Button, {
+  }, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), !((_ref = ['BS_E3_GOODS']) === null || _ref === void 0 ? void 0 : _ref.includes(type)) && /*#__PURE__*/React.createElement(Button, {
     type: "link",
     onClick: handleChangeGoods
   }, "\u9009\u62E9\u5546\u54C1"), otherOperations), /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
@@ -14015,6 +14022,7 @@ var getBsE3OrderListSingleton = function getBsE3OrderListSingleton(orderNo) {
                 isCombine = item.isCombine,
                 orderStatus = item.orderStatus;
               return _objectSpread2(_objectSpread2({}, item), {}, {
+                orderStatus: BS_E3_ORDER_STATUS_MAP[orderStatus],
                 isSplit: BS_E3_BOOLEAN_STATUS_MAP[isSplit],
                 isSplitNew: BS_E3_BOOLEAN_STATUS_MAP[isSplitNew],
                 isExchangeOrder: BS_E3_BOOLEAN_STATUS_MAP[isExchangeOrder],
@@ -14277,16 +14285,7 @@ var index$1 = (function (props) {
               });
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
                 orders: trades,
-                showOrderInfo: trades.map(function (_ref6) {
-                  var billNo = _ref6.billNo,
-                    billType = _ref6.billType,
-                    billTag = _ref6.billTag;
-                  return {
-                    billNo: billNo,
-                    billType: billType,
-                    billTag: billTag
-                  };
-                })
+                showOrderInfo: trades
               }));
             });
             onceRef.current = false;
@@ -14382,7 +14381,7 @@ var componentMap$1 = {
   'BS_E3_GOODS': {
     type: 'e3',
     key: 'bsE3Goods',
-    name: '旺店通',
+    name: '百胜E3',
     orderNo: 'dealCode',
     goodDetailOrderNo: 'originalDealCode',
     eventNameMap: {

package/dist/index.js

@@ -12165,7 +12165,7 @@ var columns$2 = [{
   ellipsis: true,
   width: 70
 }, {
-  dataIndex: 'goodsSname',
+  dataIndex: 'goodsShortName',
   title: "\u5546\u54C1\u7B80\u79F0",
   ellipsis: true,
   width: 70
@@ -12177,8 +12177,8 @@ var columns$2 = [{
   render: function render(picUrl) {
     return /*#__PURE__*/React__default['default'].createElement("img", {
       style: {
-        width: '40px',
-        height: '40px',
+        width: '60px',
+        height: '60px',
         objectFit: 'contain'
       },
       src: picUrl
@@ -12260,7 +12260,7 @@ var columns$2 = [{
   ellipsis: true,
   width: 70
 }, {
-  dataIndex: 'taocanSingleSl',
+  dataIndex: 'taoCanSingleSl',
   title: "\u5355\u4E2A\u5957\u9910\u6570\u91CF",
   ellipsis: true,
   width: 70
@@ -12509,6 +12509,7 @@ var BsE3GoodsModal = /*#__PURE__*/React.forwardRef(GoodsModal$4);
 //   styleId: string;
 // }
 var GoodItem$1 = function GoodItem(props) {
+  var _ref;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     type = props.type,
@@ -12966,7 +12967,7 @@ var GoodItem$1 = function GoodItem(props) {
               ellipsis: true,
               width: 150
             }, {
-              dataIndex: 'goodsSname',
+              dataIndex: 'goodsShortName',
               title: "\u5546\u54C1\u7B80\u79F0",
               align: 'center',
               ellipsis: true,
@@ -12976,7 +12977,13 @@ var GoodItem$1 = function GoodItem(props) {
               title: "\u5546\u54C1\u56FE\u7247",
               align: 'center',
               ellipsis: true,
-              width: 100
+              width: 100,
+              render: function render(val) {
+                return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+                  width: 60,
+                  src: val
+                });
+              }
             }, {
               dataIndex: 'goodsSn',
               title: "\u8D27\u53F7",
@@ -13068,7 +13075,7 @@ var GoodItem$1 = function GoodItem(props) {
               ellipsis: true,
               width: 100
             }, {
-              dataIndex: 'taocanSingleSl',
+              dataIndex: 'taoCanSingleSl',
               title: "\u5355\u4E2A\u5957\u9910\u6570\u91CF",
               align: 'center',
               ellipsis: true,
@@ -13305,7 +13312,7 @@ var GoodItem$1 = function GoodItem(props) {
   }, showModeBtn && /*#__PURE__*/React__default['default'].createElement(antd.Checkbox, {
     checked: isStrict,
     onChange: handleCheckboxChange
-  }, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+  }, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), !((_ref = ['BS_E3_GOODS']) === null || _ref === void 0 ? void 0 : _ref.includes(type)) && /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "link",
     onClick: handleChangeGoods
   }, "\u9009\u62E9\u5546\u54C1"), otherOperations), /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
@@ -14027,6 +14034,7 @@ var getBsE3OrderListSingleton = function getBsE3OrderListSingleton(orderNo) {
                 isCombine = item.isCombine,
                 orderStatus = item.orderStatus;
               return _objectSpread2(_objectSpread2({}, item), {}, {
+                orderStatus: kmkfUtils.BS_E3_ORDER_STATUS_MAP[orderStatus],
                 isSplit: kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[isSplit],
                 isSplitNew: kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[isSplitNew],
                 isExchangeOrder: kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[isExchangeOrder],
@@ -14289,16 +14297,7 @@ var index$1 = (function (props) {
               });
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
                 orders: trades,
-                showOrderInfo: trades.map(function (_ref6) {
-                  var billNo = _ref6.billNo,
-                    billType = _ref6.billType,
-                    billTag = _ref6.billTag;
-                  return {
-                    billNo: billNo,
-                    billType: billType,
-                    billTag: billTag
-                  };
-                })
+                showOrderInfo: trades
               }));
             });
             onceRef.current = false;
@@ -14394,7 +14393,7 @@ var componentMap$1 = {
   'BS_E3_GOODS': {
     type: 'e3',
     key: 'bsE3Goods',
-    name: '旺店通',
+    name: '百胜E3',
     orderNo: 'dealCode',
     goodDetailOrderNo: 'originalDealCode',
     eventNameMap: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "1.17.8-beta.34",
+  "version": "1.17.8-beta.36",
   "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": "1.17.8-beta.34",
+    "@kmkf-fe-packages/kmkf-utils": "1.17.8-beta.36",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d23156fc1428df9314e47905d42c0b6dc8e88197"
+  "gitHead": "c6bc7848aac5c80085b1ccc50d9d5c15f594bfe1"
 }