@kmkf-fe-packages/basic-components 1.22.1-beta.39 → 1.22.1-beta.40

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, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterKmOrders, KM_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, updateWdtGoodsHandle, updateBsE3GoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterKmOrders, KM_SYSTEM_ORDER_CONFIG, 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, intersection, uniqBy } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
@@ -9485,7 +9485,8 @@ var GoodItem = function GoodItem(props) {
                 picUrl: item.picUrl,
                 numIid: item.numIid,
                 skuId: item.skuId,
-                outerSkuId: item.outerSkuId
+                outerSkuId: item.outerSkuId,
+                num: 1 //手动选择商品默认数量
               };
               // if (type === 1) {
               //   params.outerId = item.outerId; //编码
@@ -9575,9 +9576,9 @@ var GoodItem = function GoodItem(props) {
     };
   }();
   var headerList = useMemo(function () {
-    if (!Array.isArray(showHeader)) return ['title', 'outerId', 'picUrl', 'numIid', 'skuId', 'outerSkuId', 'propertiesName' // sku 信息
-    ];
-
+    if (!Array.isArray(showHeader)) return columnsGoodsList.map(function (item) {
+      return item.dataIndex;
+    });
     var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === 'string';
     var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === '[object Object]';
     var dataIndexList = [];
@@ -9593,16 +9594,17 @@ var GoodItem = function GoodItem(props) {
     }).map(function (item) {
       return item.dataIndex;
     }) : [] || {
-      1: ['title', 'outerId', 'picUrl', 'numIid', 'skuId', 'outerSkuId', 'propertiesName' // sku 信息
-      ]
+      1: columnsGoodsList.map(function (item) {
+        return item.dataIndex;
+      })
     }[type] || [];
   }, [showHeader]);
   //修改参数
-  var handleChangeValue = function handleChangeValue(key, index) {
+  var handleChangeValue = function handleChangeValue(key, index, replaceFn) {
     return function (e) {
-      var _e$target;
+      var _e$target, _e$target2;
       var newImgList = _toConsumableArray(imgList);
-      newImgList[index][key] = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value;
+      newImgList[index][key] = replaceFn ? replaceFn(e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value) : e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.value;
       var newValue = {
         shopId: shopId,
         imgList: newImgList
@@ -9626,6 +9628,20 @@ var GoodItem = function GoodItem(props) {
       isShow: headerList.includes('numIid'),
       key: 'numIid',
       label: '商品id'
+    }, {
+      isShow: headerList.includes('num'),
+      key: 'num',
+      label: '商品数量',
+      replaceFn: function replaceFn(value) {
+        // 使用正则表达式匹配所有数字字符
+        var numbers = String(value || '').match(/\d+/g);
+        // 如果没有匹配到任何数字字符，返回null
+        if (!numbers) {
+          return null;
+        }
+        // 将匹配到的数字字符拼接成一个新的数字
+        return Number(numbers.join('')) ? Number(numbers.join('')) : null;
+      }
     }, {
       isShow: changeSku && headerList.includes('skuId'),
       key: 'skuId',
@@ -9641,11 +9657,7 @@ var GoodItem = function GoodItem(props) {
     }];
     if (!Array.isArray(showHeader)) return initList;
     var newList = [];
-    var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === 'string';
-    var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === '[object Object]';
-    (isStringArray ? showHeader : isObjectArray ? showHeader.map(function (item) {
-      return item.dataIndex;
-    }) : []).forEach(function (dataIndex) {
+    headerList.forEach(function (dataIndex) {
       if (initList.find(function (item) {
         return item.key === dataIndex;
       })) {
@@ -9719,7 +9731,7 @@ var GoodItem = function GoodItem(props) {
         title: String(img[item.key] || ''),
         value: img[item.key],
         disabled: item.disabled || disabled,
-        onChange: handleChangeValue(item.key, index)
+        onChange: handleChangeValue(item.key, index, item.replaceFn)
       }));
     }), !disabled && !hasPic && type !== 4 && changeSku ? /*#__PURE__*/React.createElement(Button, {
       style: {

package/dist/index.js

@@ -9497,7 +9497,8 @@ var GoodItem = function GoodItem(props) {
                 picUrl: item.picUrl,
                 numIid: item.numIid,
                 skuId: item.skuId,
-                outerSkuId: item.outerSkuId
+                outerSkuId: item.outerSkuId,
+                num: 1 //手动选择商品默认数量
               };
               // if (type === 1) {
               //   params.outerId = item.outerId; //编码
@@ -9587,9 +9588,9 @@ var GoodItem = function GoodItem(props) {
     };
   }();
   var headerList = React.useMemo(function () {
-    if (!Array.isArray(showHeader)) return ['title', 'outerId', 'picUrl', 'numIid', 'skuId', 'outerSkuId', 'propertiesName' // sku 信息
-    ];
-
+    if (!Array.isArray(showHeader)) return kmkfUtils.columnsGoodsList.map(function (item) {
+      return item.dataIndex;
+    });
     var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === 'string';
     var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === '[object Object]';
     var dataIndexList = [];
@@ -9605,16 +9606,17 @@ var GoodItem = function GoodItem(props) {
     }).map(function (item) {
       return item.dataIndex;
     }) : [] || {
-      1: ['title', 'outerId', 'picUrl', 'numIid', 'skuId', 'outerSkuId', 'propertiesName' // sku 信息
-      ]
+      1: kmkfUtils.columnsGoodsList.map(function (item) {
+        return item.dataIndex;
+      })
     }[type] || [];
   }, [showHeader]);
   //修改参数
-  var handleChangeValue = function handleChangeValue(key, index) {
+  var handleChangeValue = function handleChangeValue(key, index, replaceFn) {
     return function (e) {
-      var _e$target;
+      var _e$target, _e$target2;
       var newImgList = _toConsumableArray(imgList);
-      newImgList[index][key] = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value;
+      newImgList[index][key] = replaceFn ? replaceFn(e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value) : e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.value;
       var newValue = {
         shopId: shopId,
         imgList: newImgList
@@ -9638,6 +9640,20 @@ var GoodItem = function GoodItem(props) {
       isShow: headerList.includes('numIid'),
       key: 'numIid',
       label: '商品id'
+    }, {
+      isShow: headerList.includes('num'),
+      key: 'num',
+      label: '商品数量',
+      replaceFn: function replaceFn(value) {
+        // 使用正则表达式匹配所有数字字符
+        var numbers = String(value || '').match(/\d+/g);
+        // 如果没有匹配到任何数字字符，返回null
+        if (!numbers) {
+          return null;
+        }
+        // 将匹配到的数字字符拼接成一个新的数字
+        return Number(numbers.join('')) ? Number(numbers.join('')) : null;
+      }
     }, {
       isShow: changeSku && headerList.includes('skuId'),
       key: 'skuId',
@@ -9653,11 +9669,7 @@ var GoodItem = function GoodItem(props) {
     }];
     if (!Array.isArray(showHeader)) return initList;
     var newList = [];
-    var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === 'string';
-    var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === '[object Object]';
-    (isStringArray ? showHeader : isObjectArray ? showHeader.map(function (item) {
-      return item.dataIndex;
-    }) : []).forEach(function (dataIndex) {
+    headerList.forEach(function (dataIndex) {
       if (initList.find(function (item) {
         return item.key === dataIndex;
       })) {
@@ -9731,7 +9743,7 @@ var GoodItem = function GoodItem(props) {
         title: String(img[item.key] || ''),
         value: img[item.key],
         disabled: item.disabled || disabled,
-        onChange: handleChangeValue(item.key, index)
+        onChange: handleChangeValue(item.key, index, item.replaceFn)
       }));
     }), !disabled && !hasPic && type !== 4 && changeSku ? /*#__PURE__*/React__default['default'].createElement(antd.Button, {
       style: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "1.22.1-beta.39",
+  "version": "1.22.1-beta.40",
   "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.22.1-beta.38",
+    "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.40",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9e437f40a3d69cebe8f152d63b8454a09db6f2c5"
+  "gitHead": "caa912596f663c9d3725775c83f455a5edd4b977"
 }