@kmkf-fe-packages/basic-components 2.10.8 → 2.10.9-beta.0

package/dist/index.esm.js

@@ -8672,7 +8672,8 @@ var processSceneStatus = function processSceneStatus(getValue) {
       WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
       JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList',
       JST_WAREHOUSING_STATUS: 'jstInStockStatusItemList',
-      WLN_WAREHOUSING_STATUS: 'wlnInStockStatusItemList'
+      WLN_WAREHOUSING_STATUS: 'wlnInStockStatusItemList',
+      KM_WAREHOUSING_STATUS: 'kmInStockStatusItemList'
     };
     return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])), []));
   };
@@ -9521,6 +9522,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       WDT_WAREHOUSING_STATUS: processSceneStatus,
       WLN_WAREHOUSING_STATUS: processSceneStatus,
       JKY_WAREHOUSING_STATUS: processSceneStatus,
+      KM_WAREHOUSING_STATUS: processSceneStatus,
       JST_WAREHOUSING_STATUS: processSceneStatus,
       BS_LOGISTICS: processErpLogistics,
       WLN_LOGISTICS: processErpLogistics,
@@ -11708,7 +11710,7 @@ var GoodsModal = function GoodsModal(props) {
       key: item.value
     }, item.label);
   })), /*#__PURE__*/React.createElement(Search, {
-    placeholder: searchParams.type !== 'orderProduct' ? platform === 'taobao' ? '宝贝链接，标题' : '商品ID' : '宝贝标题',
+    placeholder: searchParams.type !== 'orderProduct' ? platform === 'taobao' ? '宝贝标题' : '商品ID' : '宝贝标题',
     // enterButton="搜索"
     className: "search",
     value: platform === 'taobao' ? searchParams.title : searchParams.numIids,
@@ -16349,30 +16351,33 @@ var GoodList = function GoodList(props, ref) {
     selectedRowKeys: selectIds,
     fixed: true,
     onSelect: function onSelect(record, selected) {
+      var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), [record.specNo]));
+        setSelectIds([].concat(_toConsumableArray(selectIds), [uniqueKey]));
         setSelect([].concat(_toConsumableArray(selectList), [record]));
       } else {
         setSelectIds(selectIds.filter(function (t) {
-          return t !== record.specNo;
+          return t !== uniqueKey;
         }));
         setSelect(selectList.filter(function (t) {
-          return t.specNo !== record.specNo;
+          return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
         }));
       }
     },
     onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
-          return t.specNo;
-        }))));
+        var changeKeys = changeRows.map(function (t) {
+          return "".concat(t.goodNo, "-").concat(t.specNo);
+        });
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeKeys)));
         setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
       } else {
-        setSelectIds(difference(selectIds, changeRows.map(function (t) {
-          return t.specNo;
-        })));
+        var _changeKeys = changeRows.map(function (t) {
+          return "".concat(t.goodNo, "-").concat(t.specNo);
+        });
+        setSelectIds(difference(selectIds, _changeKeys));
         var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
-          return arrVal.specNo !== othVal.specNo;
+          return "".concat(arrVal.goodNo, "-").concat(arrVal.specNo) !== "".concat(othVal.goodNo, "-").concat(othVal.specNo);
         });
         setSelect(list);
       }
@@ -16380,11 +16385,12 @@ var GoodList = function GoodList(props, ref) {
   };
   var showTable = function showTable() {
     var handleDelete = function handleDelete(record) {
+      var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
       setSelectIds(selectIds.filter(function (t) {
-        return t !== record.specNo;
+        return t !== uniqueKey;
       }));
       setSelect(selectList.filter(function (t) {
-        return t.specNo !== record.specNo;
+        return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
       }));
     };
     var showColumns = [{
@@ -16408,7 +16414,9 @@ var GoodList = function GoodList(props, ref) {
       }
     }, /*#__PURE__*/React.createElement(Table, {
       columns: showColumns,
-      rowKey: 'specNo',
+      rowKey: function rowKey(record) {
+        return "".concat(record.goodNo, "-").concat(record.specNo);
+      },
       dataSource: selectList,
       scroll: {
         x: '100%',
@@ -16438,7 +16446,9 @@ var GoodList = function GoodList(props, ref) {
   }, /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({
     className: "GoodModalColumns",
     rowSelection: rowSelection,
-    rowKey: "specNo",
+    rowKey: function rowKey(record) {
+      return "".concat(record.goodNo, "-").concat(record.specNo);
+    },
     columns: columns,
     scroll: {
       x: '100%',
@@ -21008,9 +21018,20 @@ var getColumns$2 = function getColumns(_ref) {
 };
 
 var getYesOrNo$4 = function getYesOrNo(val) {
-  if (isNull(val)) return null;
-  return val ? '是' : '否';
+  switch (val) {
+    case true:
+    case '1':
+    case 1:
+      return '是';
+    case false:
+    case '0':
+    case 0:
+      return '否';
+    default:
+      return null;
+  }
 };
+
 function toNum$1(value) {
   if (typeof value === 'string') {
     return value ? +value : void 0;
@@ -21206,7 +21227,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '非赠品',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React.createElement("span", null, isNull(val) ? null : val ? '赠品' : '非赠品');
       }
     }, {
       dataIndex: 'isPackage',
@@ -21438,7 +21459,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '非赠品',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React.createElement("span", null, isNull(val) ? null : val ? '赠品' : '非赠品');
       }
     }, {
       dataIndex: 'isPackage',
@@ -21498,10 +21519,6 @@ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
-var getYesOrNo$5 = function getYesOrNo(val) {
-  if (isNull(val)) return null;
-  return val ? '是' : '否';
-};
 function toNum$2(value) {
   if (typeof value === 'string') {
     return value ? +value : void 0;
@@ -21613,7 +21630,7 @@ var getColumns$4 = function getColumns(_ref) {
       title: "\u662F\u5426\u53D6\u6D88",
       width: 150,
       render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
+        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
       }
     }, {
       dataIndex: 'isGift',
@@ -21632,7 +21649,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
       }
     }, {
       dataIndex: 'skuNote',
@@ -21758,7 +21775,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -21887,7 +21904,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -30645,7 +30662,7 @@ var GoodsModal$5 = function GoodsModal(props) {
       key: item.value
     }, item.label);
   })), /*#__PURE__*/React.createElement(Search$1, {
-    placeholder: "\u5B9D\u8D1D\u94FE\u63A5\uFF0C\u6807\u9898",
+    placeholder: "\u5B9D\u8D1D\u6807\u9898",
     allowClear: true,
     enterButton: "\u641C\u7D22",
     style: {

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

@@ -0,0 +1 @@
+export declare const getYesOrNo: (val: boolean | string | number) => "是" | "否" | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.10.8",
+  "version": "2.10.9-beta.0",
   "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.10.8",
+    "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.0",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fcdfb6ed797689b6cfcca1b25d410c59999271aa"
+  "gitHead": "2d04275db0bedc2fce5e120c012da38ad4adec99"
 }