@kmkf-fe-packages/basic-components 2.0.79-beta.87 → 2.0.79-beta.90

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
 import { EyeOutlined, DeleteOutlined, CloseOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, VideoCameraTwoTone } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, filterKmOrders, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, updateSkxGoodsHandle, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, filterKmOrders, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, updateSkxGoodsHandle, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
 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';
@@ -21343,7 +21343,7 @@ var refundTypeOptions = Object.entries(refundTypeMap).map(function (_ref) {
     value = _ref2[1];
   return {
     label: value,
-    value: key
+    value: Number(key)
   };
 });
 var onlineStatusMap = {
@@ -21365,7 +21365,7 @@ var onlineStatusOptions = Object.entries(onlineStatusMap).map(function (_ref3) {
     value = _ref4[1];
   return {
     label: value,
-    value: key
+    value: Number(key)
   };
 });
 var consignTypeMap = {
@@ -21378,7 +21378,7 @@ var consignTypeOptions = Object.entries(consignTypeMap).map(function (_ref5) {
     value = _ref6[1];
   return {
     label: value,
-    value: key
+    value: Number(key)
   };
 });
 var getOrderSubformColumns = function getOrderSubformColumns(parmas) {
@@ -21903,57 +21903,54 @@ var OrderSubForm = function OrderSubForm(props) {
     }, {});
   }, [newTableHeader]);
   var deleteHandle = function deleteHandle(uuid) {
-    var _valueRef$current3, _valueRef$current3$su;
-    var newList = (_valueRef$current3 = valueRef.current) === null || _valueRef$current3 === void 0 ? void 0 : (_valueRef$current3$su = _valueRef$current3.subOrderList) === null || _valueRef$current3$su === void 0 ? void 0 : _valueRef$current3$su.filter(function (item) {
+    var _value$subOrderList;
+    var newList = value === null || value === void 0 ? void 0 : (_value$subOrderList = value.subOrderList) === null || _value$subOrderList === void 0 ? void 0 : _value$subOrderList.filter(function (item) {
       return item.uuid !== uuid;
     });
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
       subOrderList: newList
     }));
   };
   var addHandle = function addHandle(index) {
-    var _valueRef$current4, _valueRef$current4$su, _valueRef$current5;
-    if (maxCount && ((_valueRef$current4 = valueRef.current) === null || _valueRef$current4 === void 0 ? void 0 : (_valueRef$current4$su = _valueRef$current4.subOrderList) === null || _valueRef$current4$su === void 0 ? void 0 : _valueRef$current4$su.length) >= maxCount) {
+    var _value$subOrderList2;
+    if (maxCount && (value === null || value === void 0 ? void 0 : (_value$subOrderList2 = value.subOrderList) === null || _value$subOrderList2 === void 0 ? void 0 : _value$subOrderList2.length) >= maxCount) {
       message.error("\u8BE5\u5B50\u8868\u5355\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u6761"));
       return;
     }
-    var subOrderList = _toConsumableArray(((_valueRef$current5 = valueRef.current) === null || _valueRef$current5 === void 0 ? void 0 : _valueRef$current5.subOrderList) || []);
+    var subOrderList = _toConsumableArray((value === null || value === void 0 ? void 0 : value.subOrderList) || []);
     subOrderList.splice(index, 0, _objectSpread2(_objectSpread2({}, defaultValueMap), {}, {
       uuid: uuid()
     }));
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
       subOrderList: subOrderList
     }));
   };
   var getDataSourceAsync = function getDataSourceAsync() {
-    var _effects$form, _valueRef$current6, _valueRef$current7;
+    var _effects$form;
     var _ref = (effects === null || effects === void 0 ? void 0 : (_effects$form = effects.form) === null || _effects$form === void 0 ? void 0 : _effects$form.getFieldsValue()) || {},
       _ref$shopId = _ref.shopId,
       shopId = _ref$shopId === void 0 ? '' : _ref$shopId;
-    return ((_valueRef$current6 = valueRef.current) === null || _valueRef$current6 === void 0 ? void 0 : _valueRef$current6.orderNo) && shopId ? getOrderListSingleton$4({
-      orderNo: (_valueRef$current7 = valueRef.current) === null || _valueRef$current7 === void 0 ? void 0 : _valueRef$current7.orderNo,
+    return (value === null || value === void 0 ? void 0 : value.orderNo) && shopId ? getOrderListSingleton$4({
+      orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
       shopId: shopId
     }).then(function (data) {
-      // const list = processAllOrders({
-      //   data,
-      //   orderNo: value?.orderNo,
-      //   type: compType,
-      // });
-      // onChange({ ...valueRef.current, allOrders: list || [] });
+      var allOrders = updateOrderSubFormGoodsHandle(data || []);
+      onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        allOrders: allOrders
+      }));
     }) : Promise.resolve();
   };
   var getAllTradeGoodsDetails = function getAllTradeGoodsDetails() {
-    var _valueRef$current8;
-    var goodDetails = ((_valueRef$current8 = valueRef.current) === null || _valueRef$current8 === void 0 ? void 0 : _valueRef$current8.allOrders) || [];
+    var goodDetails = (value === null || value === void 0 ? void 0 : value.allOrders) || [];
     return goodDetails;
   };
   var selectedGoodsChange = useCallback(function (skuList) {
-    var _valueRef$current9, _uniqBy;
-    var newValue = _objectSpread2({}, valueRef.current);
+    var _uniqBy;
+    var newValue = _objectSpread2({}, value);
     // 原订单商品
     var originTradeGoodList = getAllTradeGoodsDetails() || [];
     // 当前选中的所有商品【包含了原订单+商品库】
-    var currentSelectGoodList = ((_valueRef$current9 = valueRef.current) === null || _valueRef$current9 === void 0 ? void 0 : _valueRef$current9.subOrderList) || [];
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value.subOrderList) || [];
     newValue['subOrderList'] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
       return skuList.includes(item.uuid);
     });
@@ -21961,8 +21958,8 @@ var OrderSubForm = function OrderSubForm(props) {
   }, [value === null || value === void 0 ? void 0 : value.subOrderList]);
   // TODO: 商品订单中以选中商品
   var selectedGoods = useMemo(function () {
-    var _valueRef$current10, _valueRef$current10$s;
-    return (_valueRef$current10 = valueRef.current) === null || _valueRef$current10 === void 0 ? void 0 : (_valueRef$current10$s = _valueRef$current10.subOrderList) === null || _valueRef$current10$s === void 0 ? void 0 : _valueRef$current10$s.map(function (v) {
+    var _value$subOrderList3;
+    return value === null || value === void 0 ? void 0 : (_value$subOrderList3 = value.subOrderList) === null || _value$subOrderList3 === void 0 ? void 0 : _value$subOrderList3.map(function (v) {
       return v === null || v === void 0 ? void 0 : v.uuid;
     });
   }, [value === null || value === void 0 ? void 0 : value.subOrderList]);

package/dist/index.js

@@ -21356,7 +21356,7 @@ var refundTypeOptions = Object.entries(refundTypeMap).map(function (_ref) {
     value = _ref2[1];
   return {
     label: value,
-    value: key
+    value: Number(key)
   };
 });
 var onlineStatusMap = {
@@ -21378,7 +21378,7 @@ var onlineStatusOptions = Object.entries(onlineStatusMap).map(function (_ref3) {
     value = _ref4[1];
   return {
     label: value,
-    value: key
+    value: Number(key)
   };
 });
 var consignTypeMap = {
@@ -21391,7 +21391,7 @@ var consignTypeOptions = Object.entries(consignTypeMap).map(function (_ref5) {
     value = _ref6[1];
   return {
     label: value,
-    value: key
+    value: Number(key)
   };
 });
 var getOrderSubformColumns = function getOrderSubformColumns(parmas) {
@@ -21916,57 +21916,54 @@ var OrderSubForm = function OrderSubForm(props) {
     }, {});
   }, [newTableHeader]);
   var deleteHandle = function deleteHandle(uuid) {
-    var _valueRef$current3, _valueRef$current3$su;
-    var newList = (_valueRef$current3 = valueRef.current) === null || _valueRef$current3 === void 0 ? void 0 : (_valueRef$current3$su = _valueRef$current3.subOrderList) === null || _valueRef$current3$su === void 0 ? void 0 : _valueRef$current3$su.filter(function (item) {
+    var _value$subOrderList;
+    var newList = value === null || value === void 0 ? void 0 : (_value$subOrderList = value.subOrderList) === null || _value$subOrderList === void 0 ? void 0 : _value$subOrderList.filter(function (item) {
       return item.uuid !== uuid;
     });
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
       subOrderList: newList
     }));
   };
   var addHandle = function addHandle(index) {
-    var _valueRef$current4, _valueRef$current4$su, _valueRef$current5;
-    if (maxCount && ((_valueRef$current4 = valueRef.current) === null || _valueRef$current4 === void 0 ? void 0 : (_valueRef$current4$su = _valueRef$current4.subOrderList) === null || _valueRef$current4$su === void 0 ? void 0 : _valueRef$current4$su.length) >= maxCount) {
+    var _value$subOrderList2;
+    if (maxCount && (value === null || value === void 0 ? void 0 : (_value$subOrderList2 = value.subOrderList) === null || _value$subOrderList2 === void 0 ? void 0 : _value$subOrderList2.length) >= maxCount) {
       antd.message.error("\u8BE5\u5B50\u8868\u5355\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u6761"));
       return;
     }
-    var subOrderList = _toConsumableArray(((_valueRef$current5 = valueRef.current) === null || _valueRef$current5 === void 0 ? void 0 : _valueRef$current5.subOrderList) || []);
+    var subOrderList = _toConsumableArray((value === null || value === void 0 ? void 0 : value.subOrderList) || []);
     subOrderList.splice(index, 0, _objectSpread2(_objectSpread2({}, defaultValueMap), {}, {
       uuid: kmkfUtils.uuid()
     }));
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
       subOrderList: subOrderList
     }));
   };
   var getDataSourceAsync = function getDataSourceAsync() {
-    var _effects$form, _valueRef$current6, _valueRef$current7;
+    var _effects$form;
     var _ref = (effects === null || effects === void 0 ? void 0 : (_effects$form = effects.form) === null || _effects$form === void 0 ? void 0 : _effects$form.getFieldsValue()) || {},
       _ref$shopId = _ref.shopId,
       shopId = _ref$shopId === void 0 ? '' : _ref$shopId;
-    return ((_valueRef$current6 = valueRef.current) === null || _valueRef$current6 === void 0 ? void 0 : _valueRef$current6.orderNo) && shopId ? getOrderListSingleton$4({
-      orderNo: (_valueRef$current7 = valueRef.current) === null || _valueRef$current7 === void 0 ? void 0 : _valueRef$current7.orderNo,
+    return (value === null || value === void 0 ? void 0 : value.orderNo) && shopId ? getOrderListSingleton$4({
+      orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
       shopId: shopId
     }).then(function (data) {
-      // const list = processAllOrders({
-      //   data,
-      //   orderNo: value?.orderNo,
-      //   type: compType,
-      // });
-      // onChange({ ...valueRef.current, allOrders: list || [] });
+      var allOrders = kmkfUtils.updateOrderSubFormGoodsHandle(data || []);
+      onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        allOrders: allOrders
+      }));
     }) : Promise.resolve();
   };
   var getAllTradeGoodsDetails = function getAllTradeGoodsDetails() {
-    var _valueRef$current8;
-    var goodDetails = ((_valueRef$current8 = valueRef.current) === null || _valueRef$current8 === void 0 ? void 0 : _valueRef$current8.allOrders) || [];
+    var goodDetails = (value === null || value === void 0 ? void 0 : value.allOrders) || [];
     return goodDetails;
   };
   var selectedGoodsChange = React.useCallback(function (skuList) {
-    var _valueRef$current9, _uniqBy;
-    var newValue = _objectSpread2({}, valueRef.current);
+    var _uniqBy;
+    var newValue = _objectSpread2({}, value);
     // 原订单商品
     var originTradeGoodList = getAllTradeGoodsDetails() || [];
     // 当前选中的所有商品【包含了原订单+商品库】
-    var currentSelectGoodList = ((_valueRef$current9 = valueRef.current) === null || _valueRef$current9 === void 0 ? void 0 : _valueRef$current9.subOrderList) || [];
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value.subOrderList) || [];
     newValue['subOrderList'] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
       return skuList.includes(item.uuid);
     });
@@ -21974,8 +21971,8 @@ var OrderSubForm = function OrderSubForm(props) {
   }, [value === null || value === void 0 ? void 0 : value.subOrderList]);
   // TODO: 商品订单中以选中商品
   var selectedGoods = React.useMemo(function () {
-    var _valueRef$current10, _valueRef$current10$s;
-    return (_valueRef$current10 = valueRef.current) === null || _valueRef$current10 === void 0 ? void 0 : (_valueRef$current10$s = _valueRef$current10.subOrderList) === null || _valueRef$current10$s === void 0 ? void 0 : _valueRef$current10$s.map(function (v) {
+    var _value$subOrderList3;
+    return value === null || value === void 0 ? void 0 : (_value$subOrderList3 = value.subOrderList) === null || _value$subOrderList3 === void 0 ? void 0 : _value$subOrderList3.map(function (v) {
       return v === null || v === void 0 ? void 0 : v.uuid;
     });
   }, [value === null || value === void 0 ? void 0 : value.subOrderList]);

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

@@ -25,7 +25,7 @@ export declare const refundTypeMap: {
 };
 export declare const refundTypeOptions: {
     label: string;
-    value: string;
+    value: number;
 }[];
 export declare const onlineStatusMap: {
     1: string;
@@ -42,7 +42,7 @@ export declare const onlineStatusMap: {
 };
 export declare const onlineStatusOptions: {
     label: string;
-    value: string;
+    value: number;
 }[];
 export declare const consignTypeMap: {
     1: string;
@@ -50,7 +50,7 @@ export declare const consignTypeMap: {
 };
 export declare const consignTypeOptions: {
     label: string;
-    value: string;
+    value: number;
 }[];
 type ParmasData = {
     expressData: any[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.0.79-beta.87",
+  "version": "2.0.79-beta.90",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "57ff0160e642956e47c7f730cbe835dad37a6ca5"
+  "gitHead": "a332e59fa7d5088f2a49fccbca98975a75789115"
 }