@kmkf-fe-packages/basic-components 0.22.0-alpha.0 → 0.22.0-alpha.2

package/dist/index.esm.js

@@ -357,6 +357,15 @@ function _regeneratorRuntime() {
     }
   }, exports;
 }
+function _typeof(obj) {
+  "@babel/helpers - typeof";
+
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+    return typeof obj;
+  } : function (obj) {
+    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+  }, _typeof(obj);
+}
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -7924,7 +7933,9 @@ var GoodsModal = function GoodsModal(props) {
     maxLength = props.maxLength,
     shopList = props.shopList,
     changeSku = props.changeSku,
-    width = props.width;
+    width = props.width,
+    _props$numIidType = props.numIidType,
+    numIidType = _props$numIidType === void 0 ? 'string' : _props$numIidType;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     selectList = _useState2[0],
@@ -7941,6 +7952,25 @@ var GoodsModal = function GoodsModal(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     loading = _useState8[0],
     setLoading = _useState8[1];
+  var transformIdType = function transformIdType(id) {
+    if (!['string', 'number'].includes(_typeof(id))) return id;
+    return numIidType === 'string' ? id + '' : +id;
+  };
+  var transformType = function transformType(item) {
+    if (!(item === null || item === void 0 ? void 0 : item.numIid)) return item;
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      numIid: transformIdType(item.numIid)
+    });
+  };
+  var handleSetSelect = function handleSetSelect(list) {
+    return setSelect(list.map(transformType));
+  };
+  var handleSelectIds = function handleSelectIds(list) {
+    return setSelectIds(list.map(transformIdType));
+  };
+  var handleSetGoodList = function handleSetGoodList(list) {
+    return setGoodList(list.map(transformType));
+  };
   var _useState9 = useState({
       apiName: 'queryItems',
       desc: true,
@@ -8034,15 +8064,15 @@ var GoodsModal = function GoodsModal(props) {
       var newSelect = selectList.filter(function (item) {
         return item.numIid !== good.numIid;
       });
-      setSelect(_toConsumableArray(newSelect));
+      handleSetSelect(_toConsumableArray(newSelect));
       var ids = newSelect.map(function (item) {
         return item.numIid;
       });
-      setSelectIds(ids);
+      handleSelectIds(ids);
     } else {
       if (type === 4 || changeSku) {
-        setSelect([good]);
-        setSelectIds([good.numIid]);
+        handleSetSelect([good]);
+        handleSelectIds([good.numIid]);
       } else {
         if (selectList.length >= maxLength) {
           message.error("\u6700\u591A\u6DFB\u52A0".concat(maxLength, "\u5F20"));
@@ -8055,14 +8085,14 @@ var GoodsModal = function GoodsModal(props) {
           var newSelectList = selectList.filter(function (item) {
             return item.numIid !== good.numIid;
           });
-          setSelect(newSelectList);
+          handleSetSelect(newSelectList);
           var _ids = newSelectList.map(function (item) {
             return item.numIid;
           });
-          setSelectIds(_ids);
+          handleSelectIds(_ids);
         } else {
-          setSelect([].concat(_toConsumableArray(selectList), [good]));
-          setSelectIds([].concat(_toConsumableArray(selectIds), [good.numIid]));
+          handleSetSelect([].concat(_toConsumableArray(selectList), [good]));
+          handleSelectIds([].concat(_toConsumableArray(selectIds), [good.numIid]));
         }
       }
     }
@@ -8154,7 +8184,7 @@ var GoodsModal = function GoodsModal(props) {
             items.forEach(function (item) {
               item.platform = platform;
             });
-            setGoodList(_toConsumableArray(items));
+            handleSetGoodList(_toConsumableArray(items));
             setTotal(totalCount);
             _context.next = 26;
             break;
@@ -8182,7 +8212,7 @@ var GoodsModal = function GoodsModal(props) {
               item.title = item.productName;
               item.platform = platform;
             });
-            setGoodList(_toConsumableArray(newList));
+            handleSetGoodList(_toConsumableArray(newList));
             setTotal(_total);
             if (platform === 'sph' && nextKey && !nextKeyList.includes(nextKey)) {
               setNextKeyList([].concat(_toConsumableArray(nextKeyList), [nextKey]));
@@ -8268,12 +8298,12 @@ var GoodsModal = function GoodsModal(props) {
   useEffect(function () {
     setPlatformHandle(platform);
     if (imgList.length) {
-      setSelect(imgList);
+      handleSetSelect(imgList);
       var ids = imgList === null || imgList === void 0 ? void 0 : imgList.map(function (item) {
         return item.numIid;
       });
       if (!(changeSku || type === 4)) {
-        setSelectIds(ids);
+        handleSelectIds(ids);
       }
     }
   }, [platform]);
@@ -8904,7 +8934,6 @@ var GoodItem = function GoodItem(props) {
     disabled = props.disabled,
     changeSku = props.changeSku,
     width = props.width;
-  console.log('value', value);
   var shopId = value.shopId,
     imgList = value.imgList;
   var _useState = useState(false),
@@ -9118,7 +9147,7 @@ var GoodItem = function GoodItem(props) {
     }];
   };
   var headerList = showHeader || {
-    1: ['title', 'outerId', 'picUrl', 'numIid', 'skuId', 'outerSkuId' // sku编码
+    1: ['title', 'outerId', 'picUrl', 'numIid', 'skuId', 'outerSkuId', 'propertiesName' // sku 信息
     ]
   }[type] || [];
   var newColumns = useMemo(function () {
@@ -9142,12 +9171,12 @@ var GoodItem = function GoodItem(props) {
         ellipsis: true,
         width: 100,
         render: function render(val, record, index) {
-          return record.canDelete ? /*#__PURE__*/React.createElement(Button, {
+          return /*#__PURE__*/React.createElement(Button, {
             type: "link",
             onClick: function onClick() {
               return handleDelete(record, index);
             }
-          }, "\u5220\u9664") : null;
+          }, "\u5220\u9664");
         }
       });
     }
@@ -9155,14 +9184,12 @@ var GoodItem = function GoodItem(props) {
   }, [headerList, value, disabled]);
   var handleChangeGoods = function handleChangeGoods() {
     var _props$value2;
-    console.log('shopId', shopId, props.value);
     if (!((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.shopId)) {
       message.error('请选择店铺');
       return;
     }
     setVisible(true);
   };
-  window.handleChangeGoods = handleChangeGoods;
   return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && showChangeBtn && /*#__PURE__*/React.createElement("div", {
     style: {
       float: 'right'

package/dist/index.js

@@ -368,6 +368,15 @@ function _regeneratorRuntime() {
     }
   }, exports;
 }
+function _typeof(obj) {
+  "@babel/helpers - typeof";
+
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+    return typeof obj;
+  } : function (obj) {
+    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+  }, _typeof(obj);
+}
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -7935,7 +7944,9 @@ var GoodsModal = function GoodsModal(props) {
     maxLength = props.maxLength,
     shopList = props.shopList,
     changeSku = props.changeSku,
-    width = props.width;
+    width = props.width,
+    _props$numIidType = props.numIidType,
+    numIidType = _props$numIidType === void 0 ? 'string' : _props$numIidType;
   var _useState = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     selectList = _useState2[0],
@@ -7952,6 +7963,25 @@ var GoodsModal = function GoodsModal(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     loading = _useState8[0],
     setLoading = _useState8[1];
+  var transformIdType = function transformIdType(id) {
+    if (!['string', 'number'].includes(_typeof(id))) return id;
+    return numIidType === 'string' ? id + '' : +id;
+  };
+  var transformType = function transformType(item) {
+    if (!(item === null || item === void 0 ? void 0 : item.numIid)) return item;
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      numIid: transformIdType(item.numIid)
+    });
+  };
+  var handleSetSelect = function handleSetSelect(list) {
+    return setSelect(list.map(transformType));
+  };
+  var handleSelectIds = function handleSelectIds(list) {
+    return setSelectIds(list.map(transformIdType));
+  };
+  var handleSetGoodList = function handleSetGoodList(list) {
+    return setGoodList(list.map(transformType));
+  };
   var _useState9 = React.useState({
       apiName: 'queryItems',
       desc: true,
@@ -8045,15 +8075,15 @@ var GoodsModal = function GoodsModal(props) {
       var newSelect = selectList.filter(function (item) {
         return item.numIid !== good.numIid;
       });
-      setSelect(_toConsumableArray(newSelect));
+      handleSetSelect(_toConsumableArray(newSelect));
       var ids = newSelect.map(function (item) {
         return item.numIid;
       });
-      setSelectIds(ids);
+      handleSelectIds(ids);
     } else {
       if (type === 4 || changeSku) {
-        setSelect([good]);
-        setSelectIds([good.numIid]);
+        handleSetSelect([good]);
+        handleSelectIds([good.numIid]);
       } else {
         if (selectList.length >= maxLength) {
           antd.message.error("\u6700\u591A\u6DFB\u52A0".concat(maxLength, "\u5F20"));
@@ -8066,14 +8096,14 @@ var GoodsModal = function GoodsModal(props) {
           var newSelectList = selectList.filter(function (item) {
             return item.numIid !== good.numIid;
           });
-          setSelect(newSelectList);
+          handleSetSelect(newSelectList);
           var _ids = newSelectList.map(function (item) {
             return item.numIid;
           });
-          setSelectIds(_ids);
+          handleSelectIds(_ids);
         } else {
-          setSelect([].concat(_toConsumableArray(selectList), [good]));
-          setSelectIds([].concat(_toConsumableArray(selectIds), [good.numIid]));
+          handleSetSelect([].concat(_toConsumableArray(selectList), [good]));
+          handleSelectIds([].concat(_toConsumableArray(selectIds), [good.numIid]));
         }
       }
     }
@@ -8165,7 +8195,7 @@ var GoodsModal = function GoodsModal(props) {
             items.forEach(function (item) {
               item.platform = platform;
             });
-            setGoodList(_toConsumableArray(items));
+            handleSetGoodList(_toConsumableArray(items));
             setTotal(totalCount);
             _context.next = 26;
             break;
@@ -8193,7 +8223,7 @@ var GoodsModal = function GoodsModal(props) {
               item.title = item.productName;
               item.platform = platform;
             });
-            setGoodList(_toConsumableArray(newList));
+            handleSetGoodList(_toConsumableArray(newList));
             setTotal(_total);
             if (platform === 'sph' && nextKey && !nextKeyList.includes(nextKey)) {
               setNextKeyList([].concat(_toConsumableArray(nextKeyList), [nextKey]));
@@ -8279,12 +8309,12 @@ var GoodsModal = function GoodsModal(props) {
   React.useEffect(function () {
     setPlatformHandle(platform);
     if (imgList.length) {
-      setSelect(imgList);
+      handleSetSelect(imgList);
       var ids = imgList === null || imgList === void 0 ? void 0 : imgList.map(function (item) {
         return item.numIid;
       });
       if (!(changeSku || type === 4)) {
-        setSelectIds(ids);
+        handleSelectIds(ids);
       }
     }
   }, [platform]);
@@ -8915,7 +8945,6 @@ var GoodItem = function GoodItem(props) {
     disabled = props.disabled,
     changeSku = props.changeSku,
     width = props.width;
-  console.log('value', value);
   var shopId = value.shopId,
     imgList = value.imgList;
   var _useState = React.useState(false),
@@ -9129,7 +9158,7 @@ var GoodItem = function GoodItem(props) {
     }];
   };
   var headerList = showHeader || {
-    1: ['title', 'outerId', 'picUrl', 'numIid', 'skuId', 'outerSkuId' // sku编码
+    1: ['title', 'outerId', 'picUrl', 'numIid', 'skuId', 'outerSkuId', 'propertiesName' // sku 信息
     ]
   }[type] || [];
   var newColumns = React.useMemo(function () {
@@ -9153,12 +9182,12 @@ var GoodItem = function GoodItem(props) {
         ellipsis: true,
         width: 100,
         render: function render(val, record, index) {
-          return record.canDelete ? /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+          return /*#__PURE__*/React__default['default'].createElement(antd.Button, {
             type: "link",
             onClick: function onClick() {
               return handleDelete(record, index);
             }
-          }, "\u5220\u9664") : null;
+          }, "\u5220\u9664");
         }
       });
     }
@@ -9166,14 +9195,12 @@ var GoodItem = function GoodItem(props) {
   }, [headerList, value, disabled]);
   var handleChangeGoods = function handleChangeGoods() {
     var _props$value2;
-    console.log('shopId', shopId, props.value);
     if (!((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.shopId)) {
       antd.message.error('请选择店铺');
       return;
     }
     setVisible(true);
   };
-  window.handleChangeGoods = handleChangeGoods;
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, !disabled && showChangeBtn && /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       float: 'right'

package/dist/src/common/Goods/goodModel.d.ts

@@ -9,6 +9,7 @@ interface GoodModelProps {
     shopList: any[];
     changeSku?: boolean;
     width?: string | number;
+    numIidType?: 'string' | 'number';
     onSubmit: (...args: any[]) => any;
     onCancel: (...args: any[]) => any;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.22.0-alpha.0",
+  "version": "0.22.0-alpha.2",
   "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": "^0.21.4-alpha.3",
+    "@kmkf-fe-packages/kmkf-utils": "^0.22.0-alpha.2",
     "lodash": "^4.17.21",
     "pubsub-js": "^1.9.4",
     "react-copy-to-clipboard": "^5.1.0",
@@ -61,5 +61,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ccf5fcc75612341a2bcb781de13344036ea369cd"
+  "gitHead": "4d837d058d55c1d265bc34262f9bcb9d44807cba"
 }