@kmkf-fe-packages/basic-components 2.2.44-beta.29 → 2.2.44-beta.30

package/dist/index.esm.js

@@ -22576,12 +22576,12 @@ var getColumns$9 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: '1'
+            value: 1
           }, {
             label: '否',
-            value: '0'
+            value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, val === '1' ? '是' : '否');
+        }) : /*#__PURE__*/React.createElement("span", null, val === 1 ? '是' : '否');
       }
     }, {
       dataIndex: 'isFit',
@@ -22601,12 +22601,12 @@ var getColumns$9 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: '1'
+            value: 1
           }, {
             label: '否',
-            value: '0'
+            value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, val === '1' ? '是' : '否');
+        }) : /*#__PURE__*/React.createElement("span", null, val === 1 ? '是' : '否');
       }
     }, {
       dataIndex: 'isPresell',
@@ -22867,12 +22867,12 @@ var getColumns$9 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: '1'
+            value: 1
           }, {
             label: '否',
-            value: '0'
+            value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, val === '1' ? '是' : '否');
+        }) : /*#__PURE__*/React.createElement("span", null, val === 1 ? '是' : '否');
       }
     }, {
       dataIndex: 'isFit',
@@ -22886,12 +22886,12 @@ var getColumns$9 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: 'True'
+            value: 1
           }, {
             label: '否',
-            value: 'False'
+            value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, val === 'True' ? '是' : '否');
+        }) : /*#__PURE__*/React.createElement("span", null, val === 1 ? '是' : '否');
       }
     }, {
       dataIndex: 'brandName',
@@ -23780,6 +23780,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     }
   }), /*#__PURE__*/React.createElement("span", null, "\u5DF2\u9009\u62E9(", currentTradeOriginGoods === null || currentTradeOriginGoods === void 0 ? void 0 : currentTradeOriginGoods.length, "/", filterDataSource === null || filterDataSource === void 0 ? void 0 : filterDataSource.length, ")")));
 };
+SelectTradeGoods.displayName = 'SelectTradeGoods';
 var getButtonText = function getButtonText() {
   var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   if (['KM_GOODS', 'KM_REISSUE_GOODS'].includes(type)) {
@@ -25178,6 +25179,9 @@ var getJkyOrderListSingleton = function getJkyOrderListSingleton(orderNo) {
             var _filterJkyOrders;
             res.data.trades = (_filterJkyOrders = filterJkyOrders(res === null || res === void 0 ? void 0 : res.data, orderNo)) === null || _filterJkyOrders === void 0 ? void 0 : _filterJkyOrders.map(function (item) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
+                goodsDetail: (item.goodsDetail || []).map(function (goodsItem) {
+                  return _objectSpread2({}, goodsItem);
+                }),
                 tradeFrom: JKY_ORDER_FROM_MAP[item.tradeFrom],
                 tradeType: JKY_ORDER_TYPE_MAP[item.tradeType],
                 tradeStatus: JKY_ORDER_STATUS_MAP[item.tradeStatus]
@@ -27246,6 +27250,7 @@ var CommonGoods = function CommonGoods(props) {
     }
   }));
 };
+CommonGoods.displayName = 'CommonGoods';
 
 var componentMap$3 = {
   WDT_RETURN_GOODS: {
@@ -27910,7 +27915,7 @@ var typeMap$2 = {
     orderTypeKey: 'orderType',
     oIdKey: 'tradeNo',
     outerOiIdKey: '',
-    goodDetailsKey: 'subOrderDetails',
+    goodDetailsKey: 'goodsDetail',
     isShowSelectTradeGoods: true,
     showModeBtn: true
   }
@@ -28298,6 +28303,7 @@ var PublicReissue = function PublicReissue(props) {
     }
   })));
 };
+PublicReissue.displayName = 'PublicReissue';
 
 var css_248z$g = ".goodsBox {\n  display: flex;\n  flex-wrap: wrap;\n}\n.goods-imgBox {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border: 1px solid #F2F3F5;\n  margin: 0 10px 10px 0;\n  text-align: center;\n}\n.icon-close {\n  position: absolute;\n  top: -5px;\n  right: -5px;\n  width: 13px;\n  height: 13px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  border-radius: 50%;\n  z-index: 3;\n  background-color: #fff;\n  cursor: pointer;\n}\n.img {\n  width: 100%;\n  height: 100%;\n  -o-object-fit: contain;\n     object-fit: contain;\n}\n.goods-title {\n  margin: 0 0 10px 5px;\n  color: #4E5969;\n}\n.deg90 {\n  transform: rotate(90deg);\n}\n.goodMain {\n  display: flex;\n  flex-wrap: wrap;\n  height: 265px;\n  overflow-y: auto;\n  margin-bottom: 10px;\n}\n.goodMain .goodItem {\n  width: 140px;\n  height: 175px;\n  padding: 11px 10px 0;\n  text-align: center;\n  display: inline-block;\n  vertical-align: top;\n  margin-bottom: 10px;\n  margin-right: 30px;\n  border: 1px solid #e6e6e6;\n  cursor: pointer;\n  transition: border 0.3s;\n}\n.goodMain .goodItem .goodImg {\n  width: 120px;\n  height: 120px;\n}\n.goodMain .goodItem .goodText {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.goodMain .goodItem.active {\n  border: 1px solid #3089dc;\n}\n.right-context {\n  display: flex;\n  flex-direction: column;\n}\n";
 styleInject(css_248z$g);

package/dist/index.js

@@ -22591,12 +22591,12 @@ var getColumns$9 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: '1'
+            value: 1
           }, {
             label: '否',
-            value: '0'
+            value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 1 ? '是' : '否');
       }
     }, {
       dataIndex: 'isFit',
@@ -22616,12 +22616,12 @@ var getColumns$9 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: '1'
+            value: 1
           }, {
             label: '否',
-            value: '0'
+            value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 1 ? '是' : '否');
       }
     }, {
       dataIndex: 'isPresell',
@@ -22882,12 +22882,12 @@ var getColumns$9 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: '1'
+            value: 1
           }, {
             label: '否',
-            value: '0'
+            value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 1 ? '是' : '否');
       }
     }, {
       dataIndex: 'isFit',
@@ -22901,12 +22901,12 @@ var getColumns$9 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: 'True'
+            value: 1
           }, {
             label: '否',
-            value: 'False'
+            value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 'True' ? '是' : '否');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 1 ? '是' : '否');
       }
     }, {
       dataIndex: 'brandName',
@@ -23795,6 +23795,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     }
   }), /*#__PURE__*/React__default['default'].createElement("span", null, "\u5DF2\u9009\u62E9(", currentTradeOriginGoods === null || currentTradeOriginGoods === void 0 ? void 0 : currentTradeOriginGoods.length, "/", filterDataSource === null || filterDataSource === void 0 ? void 0 : filterDataSource.length, ")")));
 };
+SelectTradeGoods.displayName = 'SelectTradeGoods';
 var getButtonText = function getButtonText() {
   var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   if (['KM_GOODS', 'KM_REISSUE_GOODS'].includes(type)) {
@@ -25193,6 +25194,9 @@ var getJkyOrderListSingleton = function getJkyOrderListSingleton(orderNo) {
             var _filterJkyOrders;
             res.data.trades = (_filterJkyOrders = kmkfUtils.filterJkyOrders(res === null || res === void 0 ? void 0 : res.data, orderNo)) === null || _filterJkyOrders === void 0 ? void 0 : _filterJkyOrders.map(function (item) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
+                goodsDetail: (item.goodsDetail || []).map(function (goodsItem) {
+                  return _objectSpread2({}, goodsItem);
+                }),
                 tradeFrom: kmkfUtils.JKY_ORDER_FROM_MAP[item.tradeFrom],
                 tradeType: kmkfUtils.JKY_ORDER_TYPE_MAP[item.tradeType],
                 tradeStatus: kmkfUtils.JKY_ORDER_STATUS_MAP[item.tradeStatus]
@@ -27261,6 +27265,7 @@ var CommonGoods = function CommonGoods(props) {
     }
   }));
 };
+CommonGoods.displayName = 'CommonGoods';
 
 var componentMap$3 = {
   WDT_RETURN_GOODS: {
@@ -27925,7 +27930,7 @@ var typeMap$2 = {
     orderTypeKey: 'orderType',
     oIdKey: 'tradeNo',
     outerOiIdKey: '',
-    goodDetailsKey: 'subOrderDetails',
+    goodDetailsKey: 'goodsDetail',
     isShowSelectTradeGoods: true,
     showModeBtn: true
   }
@@ -28313,6 +28318,7 @@ var PublicReissue = function PublicReissue(props) {
     }
   })));
 };
+PublicReissue.displayName = 'PublicReissue';
 
 var css_248z$g = ".goodsBox {\n  display: flex;\n  flex-wrap: wrap;\n}\n.goods-imgBox {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border: 1px solid #F2F3F5;\n  margin: 0 10px 10px 0;\n  text-align: center;\n}\n.icon-close {\n  position: absolute;\n  top: -5px;\n  right: -5px;\n  width: 13px;\n  height: 13px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  border-radius: 50%;\n  z-index: 3;\n  background-color: #fff;\n  cursor: pointer;\n}\n.img {\n  width: 100%;\n  height: 100%;\n  -o-object-fit: contain;\n     object-fit: contain;\n}\n.goods-title {\n  margin: 0 0 10px 5px;\n  color: #4E5969;\n}\n.deg90 {\n  transform: rotate(90deg);\n}\n.goodMain {\n  display: flex;\n  flex-wrap: wrap;\n  height: 265px;\n  overflow-y: auto;\n  margin-bottom: 10px;\n}\n.goodMain .goodItem {\n  width: 140px;\n  height: 175px;\n  padding: 11px 10px 0;\n  text-align: center;\n  display: inline-block;\n  vertical-align: top;\n  margin-bottom: 10px;\n  margin-right: 30px;\n  border: 1px solid #e6e6e6;\n  cursor: pointer;\n  transition: border 0.3s;\n}\n.goodMain .goodItem .goodImg {\n  width: 120px;\n  height: 120px;\n}\n.goodMain .goodItem .goodText {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.goodMain .goodItem.active {\n  border: 1px solid #3089dc;\n}\n.right-context {\n  display: flex;\n  flex-direction: column;\n}\n";
 styleInject(css_248z$g);

package/dist/src/bs/component/GoodItem/index.d.ts

@@ -65,6 +65,9 @@ type SelectTradeGoodsProps = {
     validSystemOrder?: boolean;
     isReissueType?: boolean;
 };
-export declare const SelectTradeGoods: ({ columns, dataSource, getDataSourceAsync, selectedRowKeys, onChangeSelectedKeys, uniqueKey, isShowSelect, systemOrders, selectedSystemOrders, validSystemOrder, type, width, isReissueType, }: SelectTradeGoodsProps) => React.JSX.Element;
+export declare const SelectTradeGoods: {
+    ({ columns, dataSource, getDataSourceAsync, selectedRowKeys, onChangeSelectedKeys, uniqueKey, isShowSelect, systemOrders, selectedSystemOrders, validSystemOrder, type, width, isReissueType, }: SelectTradeGoodsProps): React.JSX.Element;
+    displayName: string;
+};
 declare const GoodItem: (props: MakeRequired<Partial<BsGoodsProps>, 'useGoodsSourceFormat'>) => React.JSX.Element;
 export default GoodItem;

package/dist/src/common/CommonGoods/index.d.ts

@@ -1,3 +1,6 @@
 import React from 'react';
-declare const CommonGoods: (props: any) => React.JSX.Element;
+declare const CommonGoods: {
+    (props: any): React.JSX.Element;
+    displayName: string;
+};
 export default CommonGoods;

package/dist/src/common/Reissue/index.d.ts

@@ -1,3 +1,6 @@
 import React from 'react';
-declare const PublicReissue: (props: any) => React.JSX.Element;
+declare const PublicReissue: {
+    (props: any): React.JSX.Element;
+    displayName: string;
+};
 export default PublicReissue;

package/dist/src/constants/systemOrderColumnsMap.d.ts

@@ -69,11 +69,16 @@ declare const SYSTEM_ORDER_COLUMNS_MAP: {
         title: string;
         width: number;
         render?: undefined;
+        headerMapping?: undefined;
     } | {
         dataIndex: string;
         title: string;
         width: number;
         render: (val: number) => "否" | "是";
+        headerMapping: {
+            transformValue: (val: number) => "否" | "是";
+            renderExport: (val: number) => "否" | "是";
+        };
     })[];
     WDT_RETURN_BILL_NO: ({
         title: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.2.44-beta.29",
+  "version": "2.2.44-beta.30",
   "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.2.44-beta.29",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.30",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0b8d55a96caae2226e4251995d6c6ab430400d81"
+  "gitHead": "03fafd04703ba41a459dcab586efa0fbb4e27af5"
 }