@kmkf-fe-packages/basic-components 2.10.7 → 2.10.8

package/dist/index.esm.js

@@ -9,7 +9,6 @@ import maxBy from 'lodash/maxBy';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, intersection, isEmpty } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
-import Monitor from 'kmkf-monitor';
 import pubsub from 'pubsub-js';
 import { internals, useTablePipeline, features, BaseTable } from 'ali-react-table';
 import zh_CN from 'antd/lib/locale-provider/zh_CN';
@@ -7864,6 +7863,7 @@ var ParseLogistics = function ParseLogistics(props) {
       onChange === null || onChange === void 0 ? void 0 : onChange(data);
     }).catch(function (e) {
       handleAIIdentify(fullAddress);
+      console.log(e);
     }).finally(function () {
       setLoading(false);
     });
@@ -7887,6 +7887,7 @@ var ParseLogistics = function ParseLogistics(props) {
       var data = res.data;
       onChange === null || onChange === void 0 ? void 0 : onChange(data);
     }).catch(function (e) {
+      console.log(e);
       message.error('识别失败，请输入正确的信息');
     }).finally(function () {
       setAiLoading(false);
@@ -12117,7 +12118,7 @@ var Goods = function Goods(props) {
             return querySkus({
               shopId: shopId,
               numIids: numIid
-            }).catch(function () {});
+            }).catch(console.debug);
           case 5:
             res = _context3.sent;
             data = (res === null || res === void 0 ? void 0 : res.success) && (res === null || res === void 0 ? void 0 : res.data);
@@ -12501,7 +12502,7 @@ var GoodItem = function GoodItem(props) {
             return querySkus({
               shopId: shopId,
               numIids: numIid
-            }).catch(function () {});
+            }).catch(console.debug);
           case 5:
             res = _context3.sent;
             data = (res === null || res === void 0 ? void 0 : res.success) && (res === null || res === void 0 ? void 0 : res.data);
@@ -13443,6 +13444,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
         });
       }
     }
+    console.log('newValue', newValue);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue, type);
   };
   //智能识别回调
@@ -14025,14 +14027,21 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
             }); // 1、初始值没有 传入值有请求快照
             // 2、初始值有 传入值有 其中有不一样的请求快照
             // 3、初始值有 传入值有 都一样的返回初始值
+            console.log('list', initList, valueList, changeList);
+            // console.log('old', initValue, value, changeValue);
+            // console.log('一样', JSON.stringify(initList) !== JSON.stringify(valueList));
+            // console.log(
+            //   '一样2',
+            //   JSON.stringify(changeList) !== JSON.stringify(valueList),
+            // );
             if (!(!initList.length && !valueList.length)) {
-              _context.next = 7;
+              _context.next = 8;
               break;
             }
             return _context.abrupt("return");
-          case 7:
+          case 8:
             if (!(JSON.stringify(initList) === JSON.stringify(valueList))) {
-              _context.next = 13;
+              _context.next = 14;
               break;
             }
             initSnapshotList = initValue.reduce(function (prv, next) {
@@ -14051,13 +14060,13 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
               setNewValue(initValue);
               onChange(initValue);
             }
-            _context.next = 29;
+            _context.next = 30;
             break;
-          case 13:
+          case 14:
             if (!(
             //开启了物流快照才会获取快照信息
             hasSnapshot && JSON.stringify(initList) !== JSON.stringify(valueList) && JSON.stringify(changeList) !== JSON.stringify(valueList))) {
-              _context.next = 28;
+              _context.next = 29;
               break;
             }
             hasSave.current = false;
@@ -14066,7 +14075,7 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
             });
             listValue = cloneDeep(value);
             if (!hasValue) {
-              _context.next = 23;
+              _context.next = 24;
               break;
             }
             requestList = valueList.map(function (item) {
@@ -14085,9 +14094,9 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
                 });
               }
             });
-            _context.next = 21;
+            _context.next = 22;
             return Promise.allSettled(requestList);
-          case 21:
+          case 22:
             requestValues = _context.sent;
             listValue = cloneDeep(value).map(function (item, index) {
               var _requestValues$index, _requestValues$index$, _requestValues$index$2;
@@ -14095,15 +14104,15 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
                 trajectorySnapshot: (_requestValues$index = requestValues[index]) === null || _requestValues$index === void 0 ? void 0 : (_requestValues$index$ = _requestValues$index.value) === null || _requestValues$index$ === void 0 ? void 0 : (_requestValues$index$2 = _requestValues$index$.data) === null || _requestValues$index$2 === void 0 ? void 0 : _requestValues$index$2.logisticsStatusDesc
               });
             });
-          case 23:
+          case 24:
             setChangeValue(listValue);
             setNewValue(listValue);
             onChange(listValue);
-            _context.next = 29;
+            _context.next = 30;
             break;
-          case 28:
-            setNewValue(value);
           case 29:
+            setNewValue(value);
+          case 30:
           case "end":
             return _context.stop();
         }
@@ -14179,8 +14188,7 @@ var jstGoods = function jstGoods(props) {
     _props$platformType = props.platformType,
     platformType = _props$platformType === void 0 ? 'default' : _props$platformType,
     onlyShowFieldSelect = props.onlyShowFieldSelect,
-    logisticsCompanyFormType = props.logisticsCompanyFormType,
-    form = props.form;
+    logisticsCompanyFormType = props.logisticsCompanyFormType;
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
@@ -14195,26 +14203,6 @@ var jstGoods = function jstGoods(props) {
       onChange === null || onChange === void 0 ? void 0 : onChange(typeInitValueMap[type]);
     }
   }, [value, type]);
-  useEffect(function () {
-    //丢失sendSnapshotName，未找到具体原因，兜底处理
-    if (type === 3 && isSendGoodSavedId && value && value.length && value.some(function (item) {
-      return !item.sendSnapshotName;
-    }) && value.every(function (item) {
-      return item.sendId;
-    })) {
-      var orderNo = form === null || form === void 0 ? void 0 : form.getFieldValue('m3ap1EvEyd');
-      var newValue = cloneDeep(value).map(function (item) {
-        if (item.sendSnapshotName || !item.sendId) return item;
-        return _objectSpread2(_objectSpread2({}, item), {}, {
-          sendSnapshotName: SendDataCenter.getInstance(platformType).getSendNameByCode(item.sendId)
-        });
-      });
-      Monitor.automaticReport({
-        message: "\u53D1\u8D27\u4ED3\u8D70\u515C\u5E95\u5904\u7406-".concat(orderNo || '', "-oldValue-").concat(JSON.stringify(cloneDeep(value)), ",newValue-").concat(JSON.stringify(cloneDeep(newValue)))
-      });
-      onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-    }
-  }, [JSON.stringify(value || []), type]);
   useEffect(function () {
     if (changeIndex > (value === null || value === void 0 ? void 0 : value.length) - 1) {
       setChangeIndex(0);
@@ -16294,7 +16282,7 @@ var GoodList = function GoodList(props, ref) {
         } else {
           reject$1(res);
         }
-      }).catch(function () {});
+      }).catch(console.error);
     };
     getMore();
   };
@@ -18345,6 +18333,7 @@ var SearchHeader = function SearchHeader(_ref) {
     timeOptions = _ref.timeOptions,
     ShopList = _ref.ShopList,
     onSubmit = _ref.onSubmit;
+  console.log('allFields', allFields);
   // const fixedFieldsOptions = useMemo(() => {
   //   return allFields.filter(item => fixedFields?.includes(item.id));
   // }, [fixedFields, allFields]);
@@ -18600,7 +18589,9 @@ var WorkorderList = function WorkorderList(props, ref) {
                 loading: false
               }));
               setWorkOrderList(newDataSource);
-            }).catch(function (error) {}));
+            }).catch(function (error) {
+              console.log('**** 获取表格数据错误', error);
+            }));
           case 19:
           case "end":
             return _context.stop();
@@ -22919,6 +22910,7 @@ var getColumns$6 = function getColumns() {
       title: "\u5B9E\u9645\u8865\u53D1\u6570\u91CF",
       width: 100,
       validator: function validator(_rule, value, extraParams) {
+        console.log('实际补发数量-extraParams', extraParams);
         if (!(extraParams === null || extraParams === void 0 ? void 0 : extraParams.quantityVerify)) return undefined;
         var title = '';
         if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
@@ -25193,7 +25185,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             if (!validSystemOrderFn) {
-              _context2.next = 6;
+              _context2.next = 7;
               break;
             }
             _context2.next = 3;
@@ -25201,38 +25193,39 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
           case 3:
             flag = _context2.sent;
             if (!(flag === false)) {
-              _context2.next = 6;
+              _context2.next = 7;
               break;
             }
+            console.log('validSystemOrderFn校验不通过');
             return _context2.abrupt("return");
-          case 6:
+          case 7:
             if (!validSystemOrder) {
-              _context2.next = 9;
+              _context2.next = 10;
               break;
             }
             message.warning('请选择补发系统单');
             return _context2.abrupt("return");
-          case 9:
+          case 10:
             if (!(getDataSourceAsync && (!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || isReloadSelectTable))) {
-              _context2.next = 12;
+              _context2.next = 13;
               break;
             }
-            _context2.next = 12;
+            _context2.next = 13;
             return getDataSourceAsync();
-          case 12:
+          case 13:
             if (!['KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS'].includes(type)) {
-              _context2.next = 15;
+              _context2.next = 16;
               break;
             }
-            _context2.next = 15;
+            _context2.next = 16;
             return getKmSupplier(dataSource);
-          case 15:
+          case 16:
             setTradeGoodsVisible(true);
             // 补发直接传入的是systemNo
             if (isShowSelect && isReissueType) {
               setSelectSystemNo(selectedSystemOrders || []);
             }
-          case 17:
+          case 18:
           case "end":
             return _context2.stop();
         }
@@ -25434,6 +25427,7 @@ var GoodItem$1 = function GoodItem(props) {
   var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'WLN_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
   var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS', 'JKY_REISSUE_GOODS', 'WLN_REISSUE_GOODS'].includes(type) || false;
   var refModal = useRef();
+  console.debug('表格数据', value);
   var handleDelete = function handleDelete(record, index) {
     onDelete === null || onDelete === void 0 ? void 0 : onDelete(value[index]);
     var newList = _toConsumableArray(value).filter(function (item, i) {
@@ -26214,6 +26208,7 @@ var BsReissue = function BsReissue(props) {
     var _typeMap$type2;
     pubsub.subscribe("".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type2 = typeMap[type]) === null || _typeMap$type2 === void 0 ? void 0 : _typeMap$type2.reissueSelectList), function (_, data) {
       var _typeMap$type3;
+      console.log('reissueSelectList', data);
       if (disabled) return;
       var newValue = _objectSpread2(_objectSpread2({}, data.goodValue), {}, {
         shopCode: data === null || data === void 0 ? void 0 : data.shopCode
@@ -28019,6 +28014,7 @@ var OrderSubForm = function OrderSubForm(props) {
     manual = props.manual,
     correlationList = props.subConfig.correlationList,
     effects = props.effects;
+  console.log('effects', effects);
   var valueRef = useRef(value);
   useEffect(function () {
     valueRef.current = value;
@@ -28215,7 +28211,7 @@ var OrderSubForm = function OrderSubForm(props) {
       onChange(_objectSpread2(_objectSpread2({}, value), {}, {
         allOrders: allOrders
       }));
-    }).catch(function () {}) : Promise.resolve();
+    }).catch(console.debug) : Promise.resolve();
   };
   var getAllTradeGoodsDetails = function getAllTradeGoodsDetails() {
     var goodDetails = (value === null || value === void 0 ? void 0 : value.allOrders) || [];
@@ -29450,23 +29446,29 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
   var getDataSourceAsync = function getDataSourceAsync() {
     return new Promise(function (resolve) {
       pubsub.subscribeOnce(componentMap$4[compType].eventNameMap.returnGoodsSysorderBack, function (_, data) {
-        var _componentMap$compTyp9;
+        var _componentMap$compTyp9, _componentMap$compTyp10;
         resolve(data);
+        console.log('getDataSourceAsync---111data--', data, getGoodDetails({
+          returnGoodsValue: data,
+          mode: isStrict,
+          isAllOrders: componentMap$4 === null || componentMap$4 === void 0 ? void 0 : (_componentMap$compTyp9 = componentMap$4[compType]) === null || _componentMap$compTyp9 === void 0 ? void 0 : _componentMap$compTyp9.isShowSelectTradeGoods
+        }));
         setOriginDataSource(getGoodDetails({
           returnGoodsValue: data,
-          isAllOrders: componentMap$4 === null || componentMap$4 === void 0 ? void 0 : (_componentMap$compTyp9 = componentMap$4[compType]) === null || _componentMap$compTyp9 === void 0 ? void 0 : _componentMap$compTyp9.isShowSelectTradeGoods,
+          isAllOrders: componentMap$4 === null || componentMap$4 === void 0 ? void 0 : (_componentMap$compTyp10 = componentMap$4[compType]) === null || _componentMap$compTyp10 === void 0 ? void 0 : _componentMap$compTyp10.isShowSelectTradeGoods,
           mode: isStrict
         }));
       });
       pubsub.publish(componentMap$4[compType].eventNameMap.returnGoodsSysorder, compType);
     });
   };
+  console.log('aaa--', originDataSource);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(GoodItem$1, _objectSpread2(_objectSpread2({
     key: componentMap$4[compType].type
   }, props), {}, {
     validSystemOrderFn: function validSystemOrderFn() {
-      var _componentMap$compTyp10, _componentMap$compTyp11;
-      return (_componentMap$compTyp10 = (_componentMap$compTyp11 = componentMap$4[compType]).validSystemOrderFn) === null || _componentMap$compTyp10 === void 0 ? void 0 : _componentMap$compTyp10.call(_componentMap$compTyp11, form);
+      var _componentMap$compTyp11, _componentMap$compTyp12;
+      return (_componentMap$compTyp11 = (_componentMap$compTyp12 = componentMap$4[compType]).validSystemOrderFn) === null || _componentMap$compTyp11 === void 0 ? void 0 : _componentMap$compTyp11.call(_componentMap$compTyp12, form);
     },
     isReloadSelectTable: componentMap$4[compType].isReloadSelectTable,
     disabled: disabled,
@@ -32317,13 +32319,20 @@ var IdInputSelect = function IdInputSelect(props) {
             tradeId = form.getFieldValue('m3ap1EvEyd');
             skxReturnExpressCode = (_form$getFieldValue = form.getFieldValue('4487c6516b')) === null || _form$getFieldValue === void 0 ? void 0 : (_form$getFieldValue$ = _form$getFieldValue[0]) === null || _form$getFieldValue$ === void 0 ? void 0 : _form$getFieldValue$.logisticsCode;
             blurFrom = form.getFieldValue('skx_return_billNo_blur_from');
+            console.log('asyncQueryData---', {
+              skxReturnExpressCode: skxReturnExpressCode,
+              blurFrom: blurFrom,
+              tradeId: tradeId,
+              tradeIdRef: tradeIdRef.current,
+              form: form
+            });
             if (!(type === 'SKX_OUTBOUND_NOTICE_NO' && !tradeId || type === 'SKX_RETURN_BILL_NO' && !tradeId && !skxReturnExpressCode)) {
-              _context3.next = 6;
+              _context3.next = 7;
               break;
             }
             setDataSource([]);
             return _context3.abrupt("return");
-          case 6:
+          case 7:
             setSpinning(true);
             // 判断是从哪个组件失焦，若是从[SKX]退换物流信息(TH)失焦，则根据物流单号查询，若是从订单号组件失焦，则根据订单号查询
             typeMap$6[type].asyncGetData(type === 'SKX_RETURN_BILL_NO' && blurFrom === '4487c6516b' ? {
@@ -32337,7 +32346,7 @@ var IdInputSelect = function IdInputSelect(props) {
             }).finally(function () {
               setSpinning(false);
             });
-          case 8:
+          case 9:
           case "end":
             return _context3.stop();
         }
@@ -32429,6 +32438,11 @@ var IdInputSelect = function IdInputSelect(props) {
     }))));
   };
   var handleChange = function handleChange(val, isInput) {
+    console.log('handleChange---', {
+      val: val,
+      value: value,
+      isInput: isInput
+    });
     var isReturnBillNoChange = type === 'SKX_RETURN_BILL_NO' && form.getFieldValue('skx_return_billNo_blur_from') === '4487c6516b';
     onChange === null || onChange === void 0 ? void 0 : onChange(val, value !== val && (!!isInput || isReturnBillNoChange));
     // 如果类型是[SKX]退换货单号，则根据blurFrom判断是从[SKX]退换物流信息(TH)失焦，则调用onBlur

package/dist/src/jst/Goods/index.d.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-import { FormInstance } from 'antd';
 import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
 interface JstGoodsProps {
     value: any[];
@@ -13,7 +12,6 @@ interface JstGoodsProps {
     onlyShowFieldSelect: boolean;
     expressDateInstance: InstanceType<typeof ExpressData>;
     logisticsCompanyFormType?: string;
-    form?: FormInstance;
 }
 declare const jstGoods: (props: Partial<JstGoodsProps>) => React.JSX.Element;
 export default jstGoods;

package/package.json

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