@kmkf-fe-packages/basic-components 1.19.8-beta.12 → 1.19.8-beta.15

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, SendDataCenter, 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 { AddressData, BsAddressData, WdtAddressData, request as request$1, ExpressData, uuid, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, BS_E3_ORDER_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, isEmpty } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
@@ -12100,7 +12100,7 @@ var columns$2 = [{
       }
     }, index + 1);
   },
-  width: 100
+  width: 80
 }, {
   dataIndex: 'specNo',
   title: "SKU",
@@ -12110,17 +12110,17 @@ var columns$2 = [{
   dataIndex: 'specId',
   title: "SKU ID",
   ellipsis: true,
-  width: 150
+  width: 80
 }, {
   dataIndex: 'goodName',
   title: "\u5546\u54C1\u540D\u79F0",
   ellipsis: true,
-  width: 200
+  width: 250
 }, {
   dataIndex: 'goodShortName',
   title: "\u5546\u54C1\u7B80\u79F0",
   ellipsis: true,
-  width: 150
+  width: 250
 },
 // {
 //   dataIndex: 'goodPicUrl',
@@ -12149,7 +12149,7 @@ var columns$2 = [{
   dataIndex: 'goodId',
   title: "\u8D27\u53F7ID",
   ellipsis: true,
-  width: 150
+  width: 100
 }, {
   dataIndex: 'colorName',
   title: "\u989C\u8272\u540D\u79F0",
@@ -12159,7 +12159,7 @@ var columns$2 = [{
   dataIndex: 'colorCode',
   title: "\u989C\u8272\u4EE3\u7801",
   ellipsis: true,
-  width: 150
+  width: 100
 }, {
   dataIndex: 'sizeName',
   title: "\u5C3A\u7801\u540D\u79F0",
@@ -12169,12 +12169,12 @@ var columns$2 = [{
   dataIndex: 'sizeCode',
   title: "\u5C3A\u7801\u4EE3\u7801",
   ellipsis: true,
-  width: 150
+  width: 100
 }, {
   dataIndex: 'brandName',
   title: "\u54C1\u724C\u540D\u79F0",
   ellipsis: true,
-  width: 150
+  width: 100
 }, {
   dataIndex: 'marketPrice',
   title: "\u5E02\u573A\u4EF7",
@@ -12522,10 +12522,10 @@ var renderFieldMap = {
     return function (val, record, index) {
       var options = [{
         label: '是',
-        value: '赠品'
+        value: '是'
       }, {
         label: '否',
-        value: '非赠品'
+        value: '否'
       }];
       return !disabled ? /*#__PURE__*/React.createElement(Select, {
         style: {
@@ -13186,7 +13186,10 @@ var GoodItem$1 = function GoodItem(props) {
               title: "\u662F\u5426\u8D60\u54C1",
               align: 'center',
               ellipsis: true,
-              width: 100
+              width: 100,
+              render: function render(val) {
+                return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
+              }
             }];
           }
           break;
@@ -14176,25 +14179,7 @@ var getBsE3OrderListSingleton = function getBsE3OrderListSingleton(orderNo) {
         if (data === null || data === void 0 ? void 0 : data.success) {
           var _data$data, _data$data$orderList;
           if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$orderList = _data$data.orderList) === null || _data$data$orderList === void 0 ? void 0 : _data$data$orderList.length) {
-            var _filterBsE3Orders;
-            data.data.orderList = (_filterBsE3Orders = filterBsE3Orders(data === null || data === void 0 ? void 0 : data.data, orderNo)) === null || _filterBsE3Orders === void 0 ? void 0 : _filterBsE3Orders.map(function (item) {
-              var isSplit = item.isSplit,
-                isSplitNew = item.isSplitNew,
-                isCopy = item.isCopy,
-                isExchangeOrder = item.isExchangeOrder,
-                isCombineNew = item.isCombineNew,
-                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],
-                isCopy: BS_E3_BOOLEAN_STATUS_MAP[isCopy],
-                isCombineNew: BS_E3_BOOLEAN_STATUS_MAP[isCombineNew],
-                isCombine: BS_E3_BOOLEAN_STATUS_MAP[isCombine]
-              });
-            });
+            data.data.orderList = filterBsE3Orders(data === null || data === void 0 ? void 0 : data.data, orderNo);
           }
           resolve(data.data);
         } else {
@@ -14259,37 +14244,58 @@ var columnsMap = {
     title: '订单状态',
     dataIndex: 'orderStatus',
     width: 100,
-    ellipsis: true
+    ellipsis: true,
+    render: function render(val) {
+      return /*#__PURE__*/React.createElement("span", null, BS_E3_ORDER_STATUS_MAP[val] || val);
+    }
   }, {
     title: '是否被拆分',
     dataIndex: 'isSplit',
     width: 100,
-    ellipsis: true
+    ellipsis: true,
+    render: function render(val) {
+      return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
+    }
   }, {
     title: '是否拆分子单',
     dataIndex: 'isSplitNew',
     width: 100,
-    ellipsis: true
+    ellipsis: true,
+    render: function render(val) {
+      return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
+    }
   }, {
     title: '是否被合并',
     dataIndex: 'isCombine',
     width: 100,
-    ellipsis: true
+    ellipsis: true,
+    render: function render(val) {
+      return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
+    }
   }, {
     title: '是否合并新单',
     dataIndex: 'isCombineNew',
     width: 100,
-    ellipsis: true
+    ellipsis: true,
+    render: function render(val) {
+      return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
+    }
   }, {
     title: '是否复制单',
     dataIndex: 'isCopy',
     width: 100,
-    ellipsis: true
+    ellipsis: true,
+    render: function render(val) {
+      return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
+    }
   }, {
     title: '是否换货单',
     dataIndex: 'isExchangeOrder',
     width: 100,
-    ellipsis: true
+    ellipsis: true,
+    render: function render(val) {
+      return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
+    }
   }, {
     title: '订单备注',
     dataIndex: 'orderMsg',

package/dist/index.js

@@ -12112,7 +12112,7 @@ var columns$2 = [{
       }
     }, index + 1);
   },
-  width: 100
+  width: 80
 }, {
   dataIndex: 'specNo',
   title: "SKU",
@@ -12122,17 +12122,17 @@ var columns$2 = [{
   dataIndex: 'specId',
   title: "SKU ID",
   ellipsis: true,
-  width: 150
+  width: 80
 }, {
   dataIndex: 'goodName',
   title: "\u5546\u54C1\u540D\u79F0",
   ellipsis: true,
-  width: 200
+  width: 250
 }, {
   dataIndex: 'goodShortName',
   title: "\u5546\u54C1\u7B80\u79F0",
   ellipsis: true,
-  width: 150
+  width: 250
 },
 // {
 //   dataIndex: 'goodPicUrl',
@@ -12161,7 +12161,7 @@ var columns$2 = [{
   dataIndex: 'goodId',
   title: "\u8D27\u53F7ID",
   ellipsis: true,
-  width: 150
+  width: 100
 }, {
   dataIndex: 'colorName',
   title: "\u989C\u8272\u540D\u79F0",
@@ -12171,7 +12171,7 @@ var columns$2 = [{
   dataIndex: 'colorCode',
   title: "\u989C\u8272\u4EE3\u7801",
   ellipsis: true,
-  width: 150
+  width: 100
 }, {
   dataIndex: 'sizeName',
   title: "\u5C3A\u7801\u540D\u79F0",
@@ -12181,12 +12181,12 @@ var columns$2 = [{
   dataIndex: 'sizeCode',
   title: "\u5C3A\u7801\u4EE3\u7801",
   ellipsis: true,
-  width: 150
+  width: 100
 }, {
   dataIndex: 'brandName',
   title: "\u54C1\u724C\u540D\u79F0",
   ellipsis: true,
-  width: 150
+  width: 100
 }, {
   dataIndex: 'marketPrice',
   title: "\u5E02\u573A\u4EF7",
@@ -12534,10 +12534,10 @@ var renderFieldMap = {
     return function (val, record, index) {
       var options = [{
         label: '是',
-        value: '赠品'
+        value: '是'
       }, {
         label: '否',
-        value: '非赠品'
+        value: '否'
       }];
       return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
         style: {
@@ -13198,7 +13198,10 @@ var GoodItem$1 = function GoodItem(props) {
               title: "\u662F\u5426\u8D60\u54C1",
               align: 'center',
               ellipsis: true,
-              width: 100
+              width: 100,
+              render: function render(val) {
+                return /*#__PURE__*/React__default['default'].createElement("span", null, kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[val] || val);
+              }
             }];
           }
           break;
@@ -14188,25 +14191,7 @@ var getBsE3OrderListSingleton = function getBsE3OrderListSingleton(orderNo) {
         if (data === null || data === void 0 ? void 0 : data.success) {
           var _data$data, _data$data$orderList;
           if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$orderList = _data$data.orderList) === null || _data$data$orderList === void 0 ? void 0 : _data$data$orderList.length) {
-            var _filterBsE3Orders;
-            data.data.orderList = (_filterBsE3Orders = kmkfUtils.filterBsE3Orders(data === null || data === void 0 ? void 0 : data.data, orderNo)) === null || _filterBsE3Orders === void 0 ? void 0 : _filterBsE3Orders.map(function (item) {
-              var isSplit = item.isSplit,
-                isSplitNew = item.isSplitNew,
-                isCopy = item.isCopy,
-                isExchangeOrder = item.isExchangeOrder,
-                isCombineNew = item.isCombineNew,
-                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],
-                isCopy: kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[isCopy],
-                isCombineNew: kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[isCombineNew],
-                isCombine: kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[isCombine]
-              });
-            });
+            data.data.orderList = kmkfUtils.filterBsE3Orders(data === null || data === void 0 ? void 0 : data.data, orderNo);
           }
           resolve(data.data);
         } else {
@@ -14271,37 +14256,58 @@ var columnsMap = {
     title: '订单状态',
     dataIndex: 'orderStatus',
     width: 100,
-    ellipsis: true
+    ellipsis: true,
+    render: function render(val) {
+      return /*#__PURE__*/React__default['default'].createElement("span", null, kmkfUtils.BS_E3_ORDER_STATUS_MAP[val] || val);
+    }
   }, {
     title: '是否被拆分',
     dataIndex: 'isSplit',
     width: 100,
-    ellipsis: true
+    ellipsis: true,
+    render: function render(val) {
+      return /*#__PURE__*/React__default['default'].createElement("span", null, kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[val] || val);
+    }
   }, {
     title: '是否拆分子单',
     dataIndex: 'isSplitNew',
     width: 100,
-    ellipsis: true
+    ellipsis: true,
+    render: function render(val) {
+      return /*#__PURE__*/React__default['default'].createElement("span", null, kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[val] || val);
+    }
   }, {
     title: '是否被合并',
     dataIndex: 'isCombine',
     width: 100,
-    ellipsis: true
+    ellipsis: true,
+    render: function render(val) {
+      return /*#__PURE__*/React__default['default'].createElement("span", null, kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[val] || val);
+    }
   }, {
     title: '是否合并新单',
     dataIndex: 'isCombineNew',
     width: 100,
-    ellipsis: true
+    ellipsis: true,
+    render: function render(val) {
+      return /*#__PURE__*/React__default['default'].createElement("span", null, kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[val] || val);
+    }
   }, {
     title: '是否复制单',
     dataIndex: 'isCopy',
     width: 100,
-    ellipsis: true
+    ellipsis: true,
+    render: function render(val) {
+      return /*#__PURE__*/React__default['default'].createElement("span", null, kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[val] || val);
+    }
   }, {
     title: '是否换货单',
     dataIndex: 'isExchangeOrder',
     width: 100,
-    ellipsis: true
+    ellipsis: true,
+    render: function render(val) {
+      return /*#__PURE__*/React__default['default'].createElement("span", null, kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[val] || val);
+    }
   }, {
     title: '订单备注',
     dataIndex: 'orderMsg',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "1.19.8-beta.12",
+  "version": "1.19.8-beta.15",
   "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.19.8-beta.12",
+    "@kmkf-fe-packages/kmkf-utils": "1.19.8-beta.15",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "45e2f33de8bd7a301bca54100ae04d4e8f9d6db0"
+  "gitHead": "d38edefc7901087a2d7c1606755cf5ff74615e45"
 }