@kmkf-fe-packages/basic-components 2.0.0-rc.10 → 2.0.0-rc.12

package/README.md

@@ -17,4 +17,6 @@ yarn start
 - business 快麦工单业务组件
 - common 公共组件
 - config 公共方法
-- assets 静态资源 
+- assets 静态资源
+
+1

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';
@@ -7469,7 +7469,12 @@ var IdentifyAddress = function IdentifyAddress(props) {
       workOrder: AddressData
     }[type] || AddressData).getInstance();
     if ((val === null || val === void 0 ? void 0 : val.province) && addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.province)) {
-      params.address = [addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.province), addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.city), addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.district)];
+      // params.address = [
+      //   addressData.getProCodeByName(val?.province),
+      //   addressData.getProCodeByName(val?.city),
+      //   addressData.getProCodeByName(val?.district),
+      // ];
+      params.address = addressData.getCodesByNames([val === null || val === void 0 ? void 0 : val.province, val === null || val === void 0 ? void 0 : val.city, val === null || val === void 0 ? void 0 : val.district]);
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, params));
   };
@@ -7580,7 +7585,8 @@ function ApaasLogistics(props) {
   return /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({}, other), {}, {
     value: value,
     onChange: onChange,
-    options: option
+    options: option,
+    virtual: true
   }));
 }
 
@@ -8110,7 +8116,12 @@ function ApaasAddress(props) {
     };
     var addressData = type === 'bs' ? BsAddressData.getInstance() : AddressData.getInstance();
     if ((val === null || val === void 0 ? void 0 : val.province) && addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.province)) {
-      params.address = [addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.province), addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.city), addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.district)];
+      // params.address = [
+      //   addressData.getProCodeByName(val?.province),
+      //   addressData.getProCodeByName(val?.city),
+      //   addressData.getProCodeByName(val?.district),
+      // ];
+      params.address = addressData.getCodesByNames([val === null || val === void 0 ? void 0 : val.province, val === null || val === void 0 ? void 0 : val.city, val === null || val === void 0 ? void 0 : val.district]);
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(params);
   };
@@ -9474,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; //编码
@@ -9564,34 +9576,33 @@ 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 = [];
     if (isStringArray) {
       dataIndexList = showHeader;
     } else if (isObjectArray) {
-      dataIndexList = showHeader.map(function (item) {
+      dataIndexList = showHeader.filter(function (item) {
+        return item.show !== false;
+      }).map(function (item) {
         return item.dataIndex;
       });
     }
-    return isStringArray ? showHeader : isObjectArray ? showHeader.filter(function (item) {
-      return item.show !== false;
-    }).map(function (item) {
-      return item.dataIndex;
-    }) : [] || {
-      1: ['title', 'outerId', 'picUrl', 'numIid', 'skuId', 'outerSkuId', 'propertiesName' // sku 信息
-      ]
+    return dataIndexList || {
+      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
@@ -9615,6 +9626,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',
@@ -9630,11 +9655,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;
       })) {
@@ -9708,7 +9729,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

@@ -7481,7 +7481,12 @@ var IdentifyAddress = function IdentifyAddress(props) {
       workOrder: kmkfUtils.AddressData
     }[type] || kmkfUtils.AddressData).getInstance();
     if ((val === null || val === void 0 ? void 0 : val.province) && addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.province)) {
-      params.address = [addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.province), addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.city), addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.district)];
+      // params.address = [
+      //   addressData.getProCodeByName(val?.province),
+      //   addressData.getProCodeByName(val?.city),
+      //   addressData.getProCodeByName(val?.district),
+      // ];
+      params.address = addressData.getCodesByNames([val === null || val === void 0 ? void 0 : val.province, val === null || val === void 0 ? void 0 : val.city, val === null || val === void 0 ? void 0 : val.district]);
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, params));
   };
@@ -7592,7 +7597,8 @@ function ApaasLogistics(props) {
   return /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, other), {}, {
     value: value,
     onChange: onChange,
-    options: option
+    options: option,
+    virtual: true
   }));
 }
 
@@ -8122,7 +8128,12 @@ function ApaasAddress(props) {
     };
     var addressData = type === 'bs' ? kmkfUtils.BsAddressData.getInstance() : kmkfUtils.AddressData.getInstance();
     if ((val === null || val === void 0 ? void 0 : val.province) && addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.province)) {
-      params.address = [addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.province), addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.city), addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.district)];
+      // params.address = [
+      //   addressData.getProCodeByName(val?.province),
+      //   addressData.getProCodeByName(val?.city),
+      //   addressData.getProCodeByName(val?.district),
+      // ];
+      params.address = addressData.getCodesByNames([val === null || val === void 0 ? void 0 : val.province, val === null || val === void 0 ? void 0 : val.city, val === null || val === void 0 ? void 0 : val.district]);
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(params);
   };
@@ -9486,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; //编码
@@ -9576,34 +9588,33 @@ 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 = [];
     if (isStringArray) {
       dataIndexList = showHeader;
     } else if (isObjectArray) {
-      dataIndexList = showHeader.map(function (item) {
+      dataIndexList = showHeader.filter(function (item) {
+        return item.show !== false;
+      }).map(function (item) {
         return item.dataIndex;
       });
     }
-    return isStringArray ? showHeader : isObjectArray ? showHeader.filter(function (item) {
-      return item.show !== false;
-    }).map(function (item) {
-      return item.dataIndex;
-    }) : [] || {
-      1: ['title', 'outerId', 'picUrl', 'numIid', 'skuId', 'outerSkuId', 'propertiesName' // sku 信息
-      ]
+    return dataIndexList || {
+      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
@@ -9627,6 +9638,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',
@@ -9642,11 +9667,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;
       })) {
@@ -9720,7 +9741,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": "2.0.0-rc.10",
+  "version": "2.0.0-rc.12",
   "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.0.0-rc.10",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.0-rc.12",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f11ed21234fa598b32fb9c12b423a4a040df7511"
+  "gitHead": "96f09e017972fe48bc687dfa2d79824510811330"
 }

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

@@ -1,36 +0,0 @@
-import React from 'react';
-interface BsGoodsProps {
-    value: any[];
-    type: string;
-    options: any[];
-    disabled: boolean;
-    showHeader: string[];
-    columnsSetting: {
-        title: string;
-        dataIndex: string;
-        show?: boolean;
-    }[];
-    width: number;
-    shopList: any[];
-    shopId: string | number;
-    maxLength: number;
-    showChangeBtn: boolean;
-    showModeBtn: boolean;
-    isStrict: boolean;
-    tableSelect?: boolean;
-    selectType?: string;
-    otherOperations: any;
-    canUpdateNumber: boolean;
-    shopCode: string;
-    companyKey: string;
-    onChange: (val: any[]) => void;
-    onSelect: (val: any[]) => void;
-    onDelete: (val: any[]) => void;
-    onModeChange: (val: boolean) => void;
-    tradeGoods?: {
-        originDataSource: Array<any>;
-        selectedGoodsChange: (p: React.Key[]) => void;
-    };
-}
-declare const GoodItem: (props: Partial<BsGoodsProps>) => React.JSX.Element;
-export default GoodItem;

package/dist/src/common/Goods/RichItem copy.d.ts

@@ -1,26 +0,0 @@
-import React from 'react';
-import './richItem.less';
-export interface RichGoodProps {
-    isSingleRow: boolean;
-    value?: {
-        shopId: string;
-        imgList: any[];
-    };
-    showChangeBtn?: boolean;
-    type?: number;
-    enableItemId?: boolean;
-    enableSupplierName?: boolean;
-    userNick?: string;
-    maxLength: number;
-    canUpdateNumber?: boolean;
-    onChange?: (value: any) => void;
-    shopList: any[];
-    otherOperations?: React.JSX.Element;
-    showHeader?: string[];
-    shopId?: string;
-    disabled?: boolean;
-    changeSku?: boolean;
-    width?: string | number;
-}
-declare const GoodItem: (props: Partial<RichGoodProps>) => React.JSX.Element;
-export default GoodItem;