@kmkf-fe-packages/basic-components 2.0.79-beta.82 → 2.0.79-beta.83

package/dist/index.esm.js

@@ -21306,8 +21306,6 @@ var CustomizeUpload = function CustomizeUpload(_ref) {
   }))), renderImages());
 };
 
-var expressDateInstance = ExpressData.getInstance();
-var expressData = expressDateInstance.expressData;
 var refundTypeMap = {
   0: '其他',
   1: '已发货仅退款',
@@ -21367,216 +21365,218 @@ var consignTypeOptions = Object.entries(consignTypeMap).map(function (_ref5) {
     value: key
   };
 });
-var orderSubformColumns = [{
-  dataIndex: 'title',
-  title: '商品名称',
-  widget: 'input',
-  widgetProps: {},
-  width: 150
-}, {
-  dataIndex: 'productCode',
-  title: '商品编码',
-  widget: 'input',
-  width: 150,
-  widgetProps: {}
-}, {
-  dataIndex: 'picUrl',
-  title: '图片',
-  widget: 'upload',
-  widgetProps: {},
-  width: 100,
-  customizeComponent: function customizeComponent(config) {
-    return /*#__PURE__*/React.createElement(CustomizeUpload, {
-      value: config.value,
-      onChange: config.onChange,
-      maxCount: config.maxCount,
-      maxSize: config.maxSize
-    });
-  }
-}, {
-  dataIndex: 'numIid',
-  title: '商品id',
-  widget: 'input',
-  widgetProps: {},
-  width: 150
-}, {
-  dataIndex: 'quantity',
-  title: '商品数量',
-  widget: 'inputNumber',
-  width: 100,
-  widgetProps: {
-    precision: 0,
-    min: 0
-  }
-}, {
-  dataIndex: 'skuId',
-  title: 'SKU ID',
-  widget: 'input',
-  width: 150,
-  widgetProps: {}
-}, {
-  dataIndex: 'outerSkuId',
-  title: 'SKU 编码',
-  widget: 'input',
-  width: 150,
-  widgetProps: {}
-}, {
-  dataIndex: 'propertiesName',
-  title: 'SKU 信息',
-  widget: 'input',
-  width: 200,
-  widgetProps: {}
-}, {
-  dataIndex: 'oid',
-  title: '子订单号',
-  widget: 'input',
-  width: 150,
-  widgetProps: {}
-}, {
-  dataIndex: 'price',
-  title: '商品单价',
-  widget: 'inputNumber',
-  width: 100,
-  widgetProps: {
-    precision: 2,
-    min: 0
-  }
-}, {
-  dataIndex: 'actualPayment',
-  title: '[子]实付金额',
-  widget: 'inputNumber',
-  width: 100,
-  widgetProps: {
-    precision: 2,
-    min: 0
-  }
-}, {
-  dataIndex: 'expressLogisticsCode',
-  title: '[子]运单号',
-  widget: 'input',
-  width: 150,
-  widgetProps: {}
-}, {
-  dataIndex: 'expressLogisticsCompany',
-  title: '[子]发货快递',
-  widget: 'select',
-  width: 150,
-  widgetProps: {
-    options: expressData,
-    showSearch: true,
-    allowClear: true
-  }
-}, {
-  dataIndex: 'refundId',
-  title: '退款单ID',
-  widget: 'input',
-  width: 150,
-  widgetProps: {}
-}, {
-  dataIndex: 'returnExpressLogisticsCode',
-  title: '退货物流单号',
-  widget: 'input',
-  width: 150,
-  widgetProps: {}
-}, {
-  dataIndex: 'returnExpressLogisticsCompany',
-  title: '退货物流公司',
-  widget: 'select',
-  width: 150,
-  widgetProps: {
-    options: expressData,
-    showSearch: true,
-    allowClear: true
-  }
-}, {
-  dataIndex: 'reason',
-  title: '退款原因',
-  widget: 'input',
-  width: 200,
-  widgetProps: {}
-}, {
-  dataIndex: 'refundAmount',
-  title: '退款金额',
-  widget: 'inputNumber',
-  width: 100,
-  widgetProps: {
-    precision: 2,
-    min: 0
-  }
-}, {
-  dataIndex: 'afterSaleType',
-  title: '退款类型',
-  widget: 'select',
-  width: 150,
-  widgetProps: {
-    options: refundTypeOptions,
-    showSearch: true,
-    allowClear: true
-  }
-}, {
-  dataIndex: 'platformStatus',
-  title: '退款状态(平台)',
-  widget: 'input',
-  width: 150,
-  widgetProps: {}
-}, {
-  dataIndex: 'onlineStatus',
-  title: '退款状态(快麦)',
-  widget: 'select',
-  width: 150,
-  widgetProps: {
-    options: onlineStatusOptions,
-    showSearch: true,
-    allowClear: true
-  }
-}, {
-  dataIndex: 'applyTime',
-  title: '退款申请时间',
-  widget: 'datePicker',
-  width: 150,
-  widgetProps: {
-    showTime: true,
-    format: 'YYYY-MM-DD HH:mm:ss'
-  }
-}, {
-  dataIndex: 'returnFreeShipping',
-  title: '退货免运费',
-  widget: 'input',
-  width: 150,
-  widgetProps: {}
-}, {
-  dataIndex: 'isCNShipment',
-  title: '是否菜鸟仓发货',
-  widget: 'select',
-  width: 100,
-  widgetProps: {
-    options: consignTypeOptions,
-    showSearch: true,
-    allowClear: true
-  }
-}];
-var orderSubformColumnMap = orderSubformColumns.reduce(function (prv, next) {
-  prv[next.dataIndex] = next;
-  return prv;
-}, {});
-var selectWidgetMap = {
-  expressCode: function expressCode(code) {
-    return expressDateInstance === null || expressDateInstance === void 0 ? void 0 : expressDateInstance.getExpressNameByCode(code);
-  },
-  subExpressCode: function subExpressCode(code) {
-    return expressDateInstance === null || expressDateInstance === void 0 ? void 0 : expressDateInstance.getExpressNameByCode(code);
-  },
-  refundType: refundTypeMap,
-  consignType: consignTypeMap,
-  kmRefundStatus: onlineStatusMap
+var getOrderSubformColumns = function getOrderSubformColumns(parmas) {
+  var _ref7 = parmas || {},
+    _ref7$expressData = _ref7.expressData,
+    expressData = _ref7$expressData === void 0 ? [] : _ref7$expressData;
+  return [{
+    dataIndex: 'title',
+    title: '商品名称',
+    widget: 'input',
+    widgetProps: {},
+    width: 150
+  }, {
+    dataIndex: 'productCode',
+    title: '商品编码',
+    widget: 'input',
+    width: 150,
+    widgetProps: {}
+  }, {
+    dataIndex: 'picUrl',
+    title: '图片',
+    widget: 'upload',
+    widgetProps: {},
+    width: 100,
+    customizeComponent: function customizeComponent(config) {
+      return /*#__PURE__*/React.createElement(CustomizeUpload, {
+        value: config.value,
+        onChange: config.onChange,
+        maxCount: config.maxCount,
+        maxSize: config.maxSize
+      });
+    }
+  }, {
+    dataIndex: 'numIid',
+    title: '商品id',
+    widget: 'input',
+    widgetProps: {},
+    width: 150
+  }, {
+    dataIndex: 'quantity',
+    title: '商品数量',
+    widget: 'inputNumber',
+    width: 100,
+    widgetProps: {
+      precision: 0,
+      min: 0
+    }
+  }, {
+    dataIndex: 'skuId',
+    title: 'SKU ID',
+    widget: 'input',
+    width: 150,
+    widgetProps: {}
+  }, {
+    dataIndex: 'outerSkuId',
+    title: 'SKU 编码',
+    widget: 'input',
+    width: 150,
+    widgetProps: {}
+  }, {
+    dataIndex: 'propertiesName',
+    title: 'SKU 信息',
+    widget: 'input',
+    width: 200,
+    widgetProps: {}
+  }, {
+    dataIndex: 'oid',
+    title: '子订单号',
+    widget: 'input',
+    width: 150,
+    widgetProps: {}
+  }, {
+    dataIndex: 'price',
+    title: '商品单价',
+    widget: 'inputNumber',
+    width: 100,
+    widgetProps: {
+      precision: 2,
+      min: 0
+    }
+  }, {
+    dataIndex: 'actualPayment',
+    title: '[子]实付金额',
+    widget: 'inputNumber',
+    width: 100,
+    widgetProps: {
+      precision: 2,
+      min: 0
+    }
+  }, {
+    dataIndex: 'expressLogisticsCode',
+    title: '[子]运单号',
+    widget: 'input',
+    width: 150,
+    widgetProps: {}
+  }, {
+    dataIndex: 'expressLogisticsCompany',
+    title: '[子]发货快递',
+    widget: 'select',
+    width: 150,
+    widgetProps: {
+      options: expressData,
+      showSearch: true,
+      allowClear: true
+    }
+  }, {
+    dataIndex: 'refundId',
+    title: '退款单ID',
+    widget: 'input',
+    width: 150,
+    widgetProps: {}
+  }, {
+    dataIndex: 'returnExpressLogisticsCode',
+    title: '退货物流单号',
+    widget: 'input',
+    width: 150,
+    widgetProps: {}
+  }, {
+    dataIndex: 'returnExpressLogisticsCompany',
+    title: '退货物流公司',
+    widget: 'select',
+    width: 150,
+    widgetProps: {
+      options: expressData,
+      showSearch: true,
+      allowClear: true
+    }
+  }, {
+    dataIndex: 'reason',
+    title: '退款原因',
+    widget: 'input',
+    width: 200,
+    widgetProps: {}
+  }, {
+    dataIndex: 'refundAmount',
+    title: '退款金额',
+    widget: 'inputNumber',
+    width: 100,
+    widgetProps: {
+      precision: 2,
+      min: 0
+    }
+  }, {
+    dataIndex: 'afterSaleType',
+    title: '退款类型',
+    widget: 'select',
+    width: 150,
+    widgetProps: {
+      options: refundTypeOptions,
+      showSearch: true,
+      allowClear: true
+    }
+  }, {
+    dataIndex: 'platformStatusText',
+    title: '退款状态(平台)',
+    widget: 'input',
+    width: 150,
+    widgetProps: {}
+  }, {
+    dataIndex: 'onlineStatus',
+    title: '退款状态(快麦)',
+    widget: 'select',
+    width: 150,
+    widgetProps: {
+      options: onlineStatusOptions,
+      showSearch: true,
+      allowClear: true
+    }
+  }, {
+    dataIndex: 'applyTime',
+    title: '退款申请时间',
+    widget: 'datePicker',
+    width: 150,
+    widgetProps: {
+      showTime: true,
+      format: 'YYYY-MM-DD HH:mm:ss'
+    }
+  }, {
+    dataIndex: 'returnFreeShipping',
+    title: '退货免运费',
+    widget: 'input',
+    width: 150,
+    widgetProps: {}
+  }, {
+    dataIndex: 'isCNShipment',
+    title: '是否菜鸟仓发货',
+    widget: 'select',
+    width: 100,
+    widgetProps: {
+      options: consignTypeOptions,
+      showSearch: true,
+      allowClear: true
+    }
+  }];
+};
+var getSelectWidgetMap = function getSelectWidgetMap(expressDateInstance) {
+  return {
+    expressLogisticsCompany: function expressLogisticsCompany(code) {
+      return expressDateInstance === null || expressDateInstance === void 0 ? void 0 : expressDateInstance.getExpressNameByCode(code);
+    },
+    returnExpressLogisticsCompany: function returnExpressLogisticsCompany(code) {
+      return expressDateInstance === null || expressDateInstance === void 0 ? void 0 : expressDateInstance.getExpressNameByCode(code);
+    },
+    afterSaleType: refundTypeMap,
+    isCNShipment: consignTypeMap,
+    onlineStatus: onlineStatusMap
+  };
 };
 var orderSubFormConstants = {
-  orderSubformColumns: orderSubformColumns,
-  selectWidgetMap: selectWidgetMap,
-  orderSubformColumnMap: orderSubformColumnMap
+  getSelectWidgetMap: getSelectWidgetMap,
+  getOrderSubformColumns: getOrderSubformColumns
 };
 
-var selectWidgetMap$1 = orderSubFormConstants.selectWidgetMap;
+var getSelectWidgetMap$1 = orderSubFormConstants.getSelectWidgetMap;
 var singletonMap$8 = new Map();
 var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
   var orderNo = parmas.orderNo,
@@ -21681,7 +21681,6 @@ var renderDate = function renderDate(value) {
   return value ? hooks(value).format('YYYY-MM-DD HH:mm:ss') : '';
 };
 var renderImages = function renderImages(value) {
-  console.log('renderImages', value);
   var list = value ? value.split(',') : [];
   return list.map(function (url) {
     var finalSrc = (url === null || url === void 0 ? void 0 : url.startsWith('http')) ? url : "https://kefu.kuaimai.com/".concat(url);
@@ -21695,11 +21694,13 @@ var renderImages = function renderImages(value) {
 var renderDetailItem = function renderDetailItem(_ref2) {
   var item = _ref2.item,
     val = _ref2.val;
+  var expressDateInstance = ExpressData.getInstance();
   var Component = /*#__PURE__*/React.createElement(React.Fragment, null, "\u4E0D\u652F\u6301\u7684\u7C7B\u578B\u7EC4\u4EF6\uFF1A", JSON.stringify(item.widget));
   if (['input', 'inputNumber'].includes(item.widget)) {
     Component = val;
   } else if (item.widget === 'select') {
-    var mapValue = selectWidgetMap$1 === null || selectWidgetMap$1 === void 0 ? void 0 : selectWidgetMap$1[item.dataIndex];
+    var _getSelectWidgetMap;
+    var mapValue = (_getSelectWidgetMap = getSelectWidgetMap$1(expressDateInstance)) === null || _getSelectWidgetMap === void 0 ? void 0 : _getSelectWidgetMap[item.dataIndex];
     var selectValue;
     if (mapValue && typeof mapValue === 'function') {
       selectValue = mapValue === null || mapValue === void 0 ? void 0 : mapValue(val);
@@ -21720,8 +21721,7 @@ var utils = {
   renderDetailItem: renderDetailItem
 };
 
-var orderSubformColumns$1 = orderSubFormConstants.orderSubformColumns,
-  orderSubformColumnMap$1 = orderSubFormConstants.orderSubformColumnMap;
+var getOrderSubformColumns$1 = orderSubFormConstants.getOrderSubformColumns;
 var renderEditItem$1 = utils.renderEditItem,
   renderDetailItem$1 = utils.renderDetailItem,
   getOrderListSingleton$4 = utils.getOrderListSingleton;
@@ -21736,38 +21736,46 @@ var OrderSubForm = function OrderSubForm(props) {
     manual = props.manual,
     correlationList = props.subConfig.correlationList,
     effects = props.effects;
-  console.log('orderForm', value);
+  var valueRef = useRef(value);
+  useEffect(function () {
+    valueRef.current = value;
+    return;
+  }, [value]);
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     hoveredRowIndex = _useState2[0],
     setHoveredRowIndex = _useState2[1];
-  var updateHandle = function updateHandle(val, index, type) {
-    var _value$subOrderList;
-    if (value === null || value === void 0 ? void 0 : (_value$subOrderList = value.subOrderList) === null || _value$subOrderList === void 0 ? void 0 : _value$subOrderList.length) {
-      var subOrderList = JSON.parse(JSON.stringify(value === null || value === void 0 ? void 0 : value.subOrderList));
+  var updateHandle = useCallback(function (val, index, type) {
+    var _valueRef$current, _valueRef$current$sub;
+    if ((_valueRef$current = valueRef.current) === null || _valueRef$current === void 0 ? void 0 : (_valueRef$current$sub = _valueRef$current.subOrderList) === null || _valueRef$current$sub === void 0 ? void 0 : _valueRef$current$sub.length) {
+      var _valueRef$current2;
+      var subOrderList = JSON.parse(JSON.stringify((_valueRef$current2 = valueRef.current) === null || _valueRef$current2 === void 0 ? void 0 : _valueRef$current2.subOrderList));
       subOrderList[index][type] = val;
-      onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+      onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
         subOrderList: subOrderList
       }));
     }
-  };
+  }, [value === null || value === void 0 ? void 0 : value.subOrderList]);
+  var orderSubformColumns = useMemo(function () {
+    return getOrderSubformColumns$1({
+      expressData: ExpressData.getInstance().getExpressData()
+    });
+  }, [ExpressData]);
+  var orderSubformColumnMap = useMemo(function () {
+    return orderSubformColumns.reduce(function (prv, next) {
+      prv[next.dataIndex] = next;
+      return prv;
+    }, {});
+  }, [orderSubformColumns]);
   var initColumns = useMemo(function () {
     return correlationList && (correlationList === null || correlationList === void 0 ? void 0 : correlationList.length) ? correlationList.map(function (t) {
-      return orderSubformColumnMap$1[t.dataIndex];
-    }) : orderSubformColumns$1;
-  }, [correlationList]);
-  // const initColumnsMap = useMemo(
-  //   () =>
-  //     initColumns.reduce((prv: any, next) => {
-  //       prv[next.dataIndex] = next;
-  //       return prv;
-  //     }, {}),
-  //   [initColumns],
-  // );
+      return orderSubformColumnMap === null || orderSubformColumnMap === void 0 ? void 0 : orderSubformColumnMap[t === null || t === void 0 ? void 0 : t.dataIndex];
+    }) : orderSubformColumns;
+  }, [correlationList, orderSubformColumns]);
   var newTableHeader = useMemo(function () {
     return initColumns.reduce(function (prv, next) {
       var t = tableHeader.find(function (t) {
-        return t.key === next.dataIndex;
+        return t.key === (next === null || next === void 0 ? void 0 : next.dataIndex);
       }) || {
         isShow: true,
         isEdit: false,
@@ -21775,77 +21783,80 @@ var OrderSubForm = function OrderSubForm(props) {
         width: 150
       };
       if (t && t.isShow) {
-        prv.push(_objectSpread2(_objectSpread2({}, next), t));
+        prv.push(_objectSpread2(_objectSpread2(_objectSpread2({}, next), t), {}, {
+          widgetProps: (next === null || next === void 0 ? void 0 : next.widgetProps) || {}
+        }));
       }
       return prv;
     }, []);
-  }, [orderSubformColumns$1, tableHeader]);
-  var column = [{
-    dataIndex: 'index',
-    title: '序号',
-    width: 80,
-    render: function render(val, record, index) {
-      return /*#__PURE__*/React.createElement(HoverTableRowDeleteIcon, {
-        index: index,
-        hoveredRowIndex: hoveredRowIndex,
-        handleClick: function handleClick() {
-          return deleteHandle(record.uuid);
-        }
-      });
-      // return <div style={{ width: 25 }}>{index + 1}</div>;
-    }
-  }].concat(_toConsumableArray(newTableHeader.map(function (t) {
-    return _objectSpread2(_objectSpread2({}, t), {}, {
-      dataIndex: t.dataIndex,
-      title: /*#__PURE__*/React.createElement("span", null, t.isRequired ? /*#__PURE__*/React.createElement("span", {
-        style: {
-          color: 'red'
-        }
-      }, "*") : null, (t === null || t === void 0 ? void 0 : t.settingName) || t.title),
-      ellipsis: true,
-      width: t.width,
+  }, [orderSubformColumns, tableHeader]);
+  var column = useMemo(function () {
+    return [{
+      dataIndex: 'index',
+      title: '序号',
+      width: 80,
       render: function render(val, record, index) {
-        // const column = orderSubformColumnMap[t.dataIndex];
-        var isDisabled = t.isEdit || disabled;
-        return renderEditItem$1({
-          item: t || {},
-          val: val,
-          disabled: isDisabled,
+        return /*#__PURE__*/React.createElement(HoverTableRowDeleteIcon, {
           index: index,
-          type: t.dataIndex,
-          updateHandle: updateHandle
+          hoveredRowIndex: hoveredRowIndex,
+          handleClick: function handleClick() {
+            return deleteHandle(record.uuid);
+          }
         });
+        // return <div style={{ width: 25 }}>{index + 1}</div>;
       }
-    });
-  })), [disabled ? {} : {
-    dataIndex: 'operation',
-    title: '操作',
-    width: 70,
-    fixed: 'right',
-    render: function render(val, record, index) {
-      return /*#__PURE__*/React.createElement(Space, null, manual && /*#__PURE__*/React.createElement(Tooltip, {
-        title: "\u6DFB\u52A0"
-      }, /*#__PURE__*/React.createElement(PlusCircleFilled, {
-        style: {
-          fontSize: 18,
-          color: '#1890ff'
-        },
-        onClick: function onClick() {
-          return addHandle(index + 1);
-        }
-      })), /*#__PURE__*/React.createElement(Tooltip, {
-        title: "\u5220\u9664"
-      }, /*#__PURE__*/React.createElement(MinusCircleFilled, {
-        style: {
-          fontSize: 18
-        },
-        onClick: function onClick() {
-          return deleteHandle(record.uuid);
+    }].concat(_toConsumableArray(newTableHeader.map(function (t) {
+      return _objectSpread2(_objectSpread2({}, t), {}, {
+        dataIndex: t === null || t === void 0 ? void 0 : t.dataIndex,
+        title: /*#__PURE__*/React.createElement("span", null, t.isRequired ? /*#__PURE__*/React.createElement("span", {
+          style: {
+            color: 'red'
+          }
+        }, "*") : null, (t === null || t === void 0 ? void 0 : t.settingName) || t.title),
+        ellipsis: true,
+        width: Number(t.width),
+        render: function render(val, record, index) {
+          // const column = orderSubformColumnMap[t.dataIndex];
+          var isDisabled = t.isEdit || disabled;
+          return renderEditItem$1({
+            item: t || {},
+            val: val,
+            disabled: isDisabled,
+            index: index,
+            type: t === null || t === void 0 ? void 0 : t.dataIndex,
+            updateHandle: updateHandle
+          });
         }
-      })));
-    }
-  }]);
-  console.log('value?.allOrders', value, (value === null || value === void 0 ? void 0 : value.allOrders) || []);
+      });
+    })), [disabled ? {} : {
+      dataIndex: 'operation',
+      title: '操作',
+      width: 70,
+      fixed: 'right',
+      render: function render(val, record, index) {
+        return /*#__PURE__*/React.createElement(Space, null, manual && /*#__PURE__*/React.createElement(Tooltip, {
+          title: "\u6DFB\u52A0"
+        }, /*#__PURE__*/React.createElement(PlusCircleFilled, {
+          style: {
+            fontSize: 18,
+            color: '#1890ff'
+          },
+          onClick: function onClick() {
+            return addHandle(index + 1);
+          }
+        })), /*#__PURE__*/React.createElement(Tooltip, {
+          title: "\u5220\u9664"
+        }, /*#__PURE__*/React.createElement(MinusCircleFilled, {
+          style: {
+            fontSize: 18
+          },
+          onClick: function onClick() {
+            return deleteHandle(record.uuid);
+          }
+        })));
+      }
+    }]);
+  }, [newTableHeader, disabled, updateHandle]);
   var orderModalColumns = useMemo(function () {
     return [{
       dataIndex: '',
@@ -21876,37 +21887,37 @@ var OrderSubForm = function OrderSubForm(props) {
     }, {});
   }, [newTableHeader]);
   var deleteHandle = function deleteHandle(uuid) {
-    var _value$subOrderList2;
-    var newList = value === null || value === void 0 ? void 0 : (_value$subOrderList2 = value.subOrderList) === null || _value$subOrderList2 === void 0 ? void 0 : _value$subOrderList2.filter(function (item) {
+    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) {
       return item.uuid !== uuid;
     });
-    onChange === null || onChange === void 0 ? void 0 : onChange(newList);
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
+      subOrderList: newList
+    }));
   };
   var addHandle = function addHandle(index) {
-    var _value$subOrderList3;
-    if (maxCount && (value === null || value === void 0 ? void 0 : (_value$subOrderList3 = value.subOrderList) === null || _value$subOrderList3 === void 0 ? void 0 : _value$subOrderList3.length) >= maxCount) {
+    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) {
       message.error("\u8BE5\u5B50\u8868\u5355\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u6761"));
       return;
     }
-    var subOrderList = _toConsumableArray((value === null || value === void 0 ? void 0 : value.subOrderList) || []);
+    var subOrderList = _toConsumableArray(((_valueRef$current5 = valueRef.current) === null || _valueRef$current5 === void 0 ? void 0 : _valueRef$current5.subOrderList) || []);
     subOrderList.splice(index, 0, _objectSpread2(_objectSpread2({}, defaultValueMap), {}, {
       uuid: uuid()
     }));
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
       subOrderList: subOrderList
     }));
   };
   var getDataSourceAsync = function getDataSourceAsync() {
-    var _effects$form;
-    console.log('22222');
+    var _effects$form, _valueRef$current6, _valueRef$current7;
     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 (value === null || value === void 0 ? void 0 : value.orderNo) && shopId ? getOrderListSingleton$4({
-      orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
+    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,
       shopId: shopId
     }).then(function (data) {
-      console.log('333');
       // const list = processAllOrders({
       //   data,
       //   orderNo: value?.orderNo,
@@ -21916,16 +21927,17 @@ var OrderSubForm = function OrderSubForm(props) {
     }) : Promise.resolve();
   };
   var getAllTradeGoodsDetails = function getAllTradeGoodsDetails() {
-    var goodDetails = (value === null || value === void 0 ? void 0 : value.allOrders) || [];
+    var _valueRef$current8;
+    var goodDetails = ((_valueRef$current8 = valueRef.current) === null || _valueRef$current8 === void 0 ? void 0 : _valueRef$current8.allOrders) || [];
     return goodDetails;
   };
   var selectedGoodsChange = useCallback(function (skuList) {
-    var _uniqBy;
-    var newValue = _objectSpread2({}, value);
+    var _valueRef$current9, _uniqBy;
+    var newValue = _objectSpread2({}, valueRef.current);
     // 原订单商品
     var originTradeGoodList = getAllTradeGoodsDetails() || [];
     // 当前选中的所有商品【包含了原订单+商品库】
-    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value.subOrderList) || [];
+    var currentSelectGoodList = ((_valueRef$current9 = valueRef.current) === null || _valueRef$current9 === void 0 ? void 0 : _valueRef$current9.subOrderList) || [];
     newValue['subOrderList'] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
       return skuList.includes(item.uuid);
     });
@@ -21933,8 +21945,8 @@ var OrderSubForm = function OrderSubForm(props) {
   }, [value === null || value === void 0 ? void 0 : value.subOrderList]);
   // TODO: 商品订单中以选中商品
   var selectedGoods = useMemo(function () {
-    var _value$subOrderList4;
-    return value === null || value === void 0 ? void 0 : (_value$subOrderList4 = value.subOrderList) === null || _value$subOrderList4 === void 0 ? void 0 : _value$subOrderList4.map(function (v) {
+    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) {
       return v === null || v === void 0 ? void 0 : v.uuid;
     });
   }, [value === null || value === void 0 ? void 0 : value.subOrderList]);
@@ -21952,7 +21964,7 @@ var OrderSubForm = function OrderSubForm(props) {
     width: 850
   })), /*#__PURE__*/React.createElement(Table, {
     columns: column,
-    dataSource: value === null || value === void 0 ? void 0 : value.subOrderList,
+    dataSource: (value === null || value === void 0 ? void 0 : value.subOrderList) || [],
     rowKey: 'uuid',
     size: "small",
     pagination: false,