@kmkf-fe-packages/basic-components 2.2.13-beta.16 → 2.2.13-beta.19

package/dist/index.esm.js

@@ -17821,10 +17821,12 @@ var getTableData$5 = function getTableData(_ref, formData) {
 };
 var searchFormData$4 = [{
   label: '规格名称',
-  name: 'specName'
+  name: 'skuName',
+  dataIndex: 'specName'
 }, {
   label: '规格编码',
-  name: 'specNo'
+  name: 'skuCode',
+  dataIndex: 'specNo'
 }, {
   label: '商品名称',
   name: 'goodName'
@@ -17870,29 +17872,29 @@ var GoodList$5 = function GoodList(props, ref) {
     fixed: true,
     onSelect: function onSelect(record, selected) {
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), [record.goodNo]));
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.id]));
         setSelect([].concat(_toConsumableArray(selectList), [record]));
       } else {
         setSelectIds(selectIds.filter(function (t) {
-          return t !== record.goodNo;
+          return t !== record.id;
         }));
         setSelect(selectList.filter(function (t) {
-          return t.goodNo !== record.goodNo;
+          return t.id !== record.id;
         }));
       }
     },
     onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
       if (selected) {
         setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
-          return t.goodNo;
+          return t.id;
         }))));
         setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
       } else {
         setSelectIds(difference(selectIds, changeRows.map(function (t) {
-          return t.goodNo;
+          return t.id;
         })));
         var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
-          return arrVal.goodNo !== othVal.goodNo;
+          return arrVal.id !== othVal.id;
         });
         setSelect(list);
       }
@@ -17900,9 +17902,9 @@ var GoodList$5 = function GoodList(props, ref) {
     getCheckboxProps: function getCheckboxProps(record) {
       var options = {
         disabled: (props.selectedRows || []).map(function (row) {
-          return row.goodNo || row.skuId;
-        }).includes(record.goodNo || record.skuId),
-        name: record.goodNo
+          return row.id || row.specId;
+        }).includes(record.id || record.specId),
+        name: record.id
       };
       return options;
     }
@@ -17910,10 +17912,10 @@ var GoodList$5 = function GoodList(props, ref) {
   var showTable = function showTable() {
     var handleDelete = function handleDelete(record) {
       setSelectIds(selectIds.filter(function (t) {
-        return t !== record.goodNo;
+        return t !== record.id;
       }));
       setSelect(selectList.filter(function (t) {
-        return t.goodNo !== record.goodNo;
+        return t.id !== record.id;
       }));
     };
     var showColumns = [{
@@ -17937,7 +17939,7 @@ var GoodList$5 = function GoodList(props, ref) {
       }
     }, /*#__PURE__*/React.createElement(Table, {
       columns: showColumns,
-      rowKey: 'goodNo',
+      rowKey: 'id',
       dataSource: selectList,
       scroll: {
         x: '100%',
@@ -17966,7 +17968,7 @@ var GoodList$5 = function GoodList(props, ref) {
     }
   }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
     rowSelection: rowSelection,
-    rowKey: "goodNo",
+    rowKey: "id",
     columns: columns,
     scroll: {
       x: '100%',
@@ -21393,6 +21395,12 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     return item === null || item === void 0 ? void 0 : item[uniqueKey];
   }));
   var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
+    console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
+    console.log('filterDataSource', filterDataSource === null || filterDataSource === void 0 ? void 0 : filterDataSource.map(function (item) {
+      return item === null || item === void 0 ? void 0 : item[uniqueKey];
+    }));
+    console.log('selectedRowKeys', selectedRowKeys);
+    console.log('currentTradeOriginGoods', currentTradeOriginGoods);
     onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
   };
   var rowSelection = {
@@ -25211,8 +25219,7 @@ var typeMap$2 = {
     orderTypeKey: 'orderType',
     oIdKey: 'tradeNo',
     outerOiIdKey: '',
-    goodDetailsKey: 'subOrderDetails',
-    uniqueKey: 'oid'
+    goodDetailsKey: 'subOrderDetails'
   }
 };
 var PublicReissue = function PublicReissue(props) {
@@ -25405,7 +25412,7 @@ var PublicReissue = function PublicReissue(props) {
     var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)]) || [];
     newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
       var _typeMap$type37;
-      return skuList.includes(item[typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.uniqueKey]);
+      return skuList.includes(item[(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.uniqueKey) || 'uuid']);
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key)], isStrict]);

package/dist/index.js

@@ -17836,10 +17836,12 @@ var getTableData$5 = function getTableData(_ref, formData) {
 };
 var searchFormData$4 = [{
   label: '规格名称',
-  name: 'specName'
+  name: 'skuName',
+  dataIndex: 'specName'
 }, {
   label: '规格编码',
-  name: 'specNo'
+  name: 'skuCode',
+  dataIndex: 'specNo'
 }, {
   label: '商品名称',
   name: 'goodName'
@@ -17885,29 +17887,29 @@ var GoodList$5 = function GoodList(props, ref) {
     fixed: true,
     onSelect: function onSelect(record, selected) {
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), [record.goodNo]));
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.id]));
         setSelect([].concat(_toConsumableArray(selectList), [record]));
       } else {
         setSelectIds(selectIds.filter(function (t) {
-          return t !== record.goodNo;
+          return t !== record.id;
         }));
         setSelect(selectList.filter(function (t) {
-          return t.goodNo !== record.goodNo;
+          return t.id !== record.id;
         }));
       }
     },
     onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
       if (selected) {
         setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
-          return t.goodNo;
+          return t.id;
         }))));
         setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
       } else {
         setSelectIds(lodash.difference(selectIds, changeRows.map(function (t) {
-          return t.goodNo;
+          return t.id;
         })));
         var list = lodash.differenceWith(selectList, changeRows, function (arrVal, othVal) {
-          return arrVal.goodNo !== othVal.goodNo;
+          return arrVal.id !== othVal.id;
         });
         setSelect(list);
       }
@@ -17915,9 +17917,9 @@ var GoodList$5 = function GoodList(props, ref) {
     getCheckboxProps: function getCheckboxProps(record) {
       var options = {
         disabled: (props.selectedRows || []).map(function (row) {
-          return row.goodNo || row.skuId;
-        }).includes(record.goodNo || record.skuId),
-        name: record.goodNo
+          return row.id || row.specId;
+        }).includes(record.id || record.specId),
+        name: record.id
       };
       return options;
     }
@@ -17925,10 +17927,10 @@ var GoodList$5 = function GoodList(props, ref) {
   var showTable = function showTable() {
     var handleDelete = function handleDelete(record) {
       setSelectIds(selectIds.filter(function (t) {
-        return t !== record.goodNo;
+        return t !== record.id;
       }));
       setSelect(selectList.filter(function (t) {
-        return t.goodNo !== record.goodNo;
+        return t.id !== record.id;
       }));
     };
     var showColumns = [{
@@ -17952,7 +17954,7 @@ var GoodList$5 = function GoodList(props, ref) {
       }
     }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
       columns: showColumns,
-      rowKey: 'goodNo',
+      rowKey: 'id',
       dataSource: selectList,
       scroll: {
         x: '100%',
@@ -17981,7 +17983,7 @@ var GoodList$5 = function GoodList(props, ref) {
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2({
     rowSelection: rowSelection,
-    rowKey: "goodNo",
+    rowKey: "id",
     columns: columns,
     scroll: {
       x: '100%',
@@ -21408,6 +21410,12 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     return item === null || item === void 0 ? void 0 : item[uniqueKey];
   }));
   var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
+    console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
+    console.log('filterDataSource', filterDataSource === null || filterDataSource === void 0 ? void 0 : filterDataSource.map(function (item) {
+      return item === null || item === void 0 ? void 0 : item[uniqueKey];
+    }));
+    console.log('selectedRowKeys', selectedRowKeys);
+    console.log('currentTradeOriginGoods', currentTradeOriginGoods);
     onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
   };
   var rowSelection = {
@@ -25226,8 +25234,7 @@ var typeMap$2 = {
     orderTypeKey: 'orderType',
     oIdKey: 'tradeNo',
     outerOiIdKey: '',
-    goodDetailsKey: 'subOrderDetails',
-    uniqueKey: 'oid'
+    goodDetailsKey: 'subOrderDetails'
   }
 };
 var PublicReissue = function PublicReissue(props) {
@@ -25420,7 +25427,7 @@ var PublicReissue = function PublicReissue(props) {
     var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)]) || [];
     newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
       var _typeMap$type37;
-      return skuList.includes(item[typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.uniqueKey]);
+      return skuList.includes(item[(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.uniqueKey) || 'uuid']);
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key)], isStrict]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.2.13-beta.16",
+  "version": "2.2.13-beta.19",
   "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.13-beta.16",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.13-beta.19",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "05b79e8aca7096204256850b1c757e39bdfa198f"
+  "gitHead": "dc483ddbd1368267417950cb790bdf84fd7246bc"
 }