@kmkf-fe-packages/basic-components 2.10.9-beta.6 → 2.10.9-beta.8

package/dist/index.esm.js

@@ -24567,7 +24567,7 @@ var getColumns$a = function getColumns() {
       },
       render: function render(_val, record, index) {
         var options = DxdSuppliersData.getInstance().getSuppliersBySkuCode(record === null || record === void 0 ? void 0 : record.skuCode);
-        return /*#__PURE__*/React.createElement(Select, {
+        return !disabled ? /*#__PURE__*/React.createElement(Select, {
           style: {
             width: '100%'
           },
@@ -24587,7 +24587,7 @@ var getColumns$a = function getColumns() {
               supplierName: (_opt$label = opt === null || opt === void 0 ? void 0 : opt.label) !== null && _opt$label !== void 0 ? _opt$label : ''
             }, index);
           }
-        });
+        }) : DxdSuppliersData.getInstance().getSupplierNameByCode(record === null || record === void 0 ? void 0 : record.supplierCode);
       },
       conditionOptionsSetting: {
         dataType: 'weakenArray',
@@ -25504,6 +25504,9 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     return setTradeGoodsVisible(false);
   };
   var filterDataSource = useMemo(function () {
+    console.log('filterDataSource--', dataSource, selectSystemNo, dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (item) {
+      return selectSystemNo === null || selectSystemNo === void 0 ? void 0 : selectSystemNo.includes(item.systemOrderNo);
+    }));
     return (selectSystemNo === null || selectSystemNo === void 0 ? void 0 : selectSystemNo.length) ? dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (item) {
       return selectSystemNo === null || selectSystemNo === void 0 ? void 0 : selectSystemNo.includes(item.systemOrderNo);
     }) : dataSource;
@@ -27178,8 +27181,7 @@ var kmUtils = {
 };
 
 var _excluded$k = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode", "cancel"],
-  _excluded2 = ["shopCode"],
-  _excluded3 = ["doOrders", "isSplit", "billNo", "billType", "billTag", "sysStatus"];
+  _excluded2 = ["shopCode"];
 var columnsMap = {
   BS_SYSTEM_ORDER: BS_SYSTEM_ORDER_CONFIG.columns,
   KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
@@ -27694,44 +27696,26 @@ var index$2 = (function (props) {
       return _regeneratorRuntime().wrap(function _callee11$(_context11) {
         while (1) switch (_context11.prev = _context11.next) {
           case 0:
-            dxdUtils.getOrderListSingleton(orderNo).then(function (trades) {
-              var formatDxdOrders = (trades || []).reduce(function (prv, trade) {
-                var _ref15 = trade || {},
-                  _ref15$doOrders = _ref15.doOrders,
-                  doOrders = _ref15$doOrders === void 0 ? [] : _ref15$doOrders,
-                  isSplit = _ref15.isSplit,
-                  billNo = _ref15.billNo,
-                  billType = _ref15.billType,
-                  billTag = _ref15.billTag,
-                  sysStatus = _ref15.sysStatus,
-                  restTrade = _objectWithoutProperties(_ref15, _excluded3);
-                if (!doOrders.length) {
-                  prv.push(_objectSpread2(_objectSpread2({}, restTrade), {}, {
-                    billNo: billNo,
-                    billType: billType,
-                    billTag: billTag,
-                    sysStatus: sysStatus,
-                    isSplit: isSplit,
-                    rowKey: billNo
-                  }));
-                  return prv;
-                }
-                doOrders.forEach(function (doOrder, index) {
-                  var currentOrderNo = doOrder === null || doOrder === void 0 ? void 0 : doOrder.orderNo;
-                  prv.push(_objectSpread2(_objectSpread2(_objectSpread2({}, restTrade), doOrder), {}, {
-                    billNo: billNo,
-                    billType: billType,
-                    billTag: billTag,
-                    sysStatus: sysStatus,
-                    isSplit: isSplit,
-                    rowKey: currentOrderNo ? "".concat(billNo, "_").concat(currentOrderNo) : "".concat(billNo, "_").concat(index)
-                  }));
+            dxdUtils.getOrderListSingleton(orderNo).then(function (trade) {
+              var _trade$doOrders;
+              var _ref15 = trade || {},
+                isSplit = _ref15.isSplit,
+                billNo = _ref15.billNo,
+                billType = _ref15.billType,
+                billTag = _ref15.billTag,
+                sysStatus = _ref15.sysStatus;
+              var data = (_trade$doOrders = trade.doOrders) === null || _trade$doOrders === void 0 ? void 0 : _trade$doOrders.map(function (item) {
+                return _objectSpread2(_objectSpread2({}, item), {}, {
+                  billNo: billNo,
+                  billType: billType,
+                  billTag: billTag,
+                  isSplit: isSplit,
+                  sysStatus: sysStatus
                 });
-                return prv;
-              }, []);
+              });
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
-                orders: formatDxdOrders,
-                showOrderInfo: formatDxdOrders
+                orders: data || [],
+                showOrderInfo: data || []
               }));
             });
             onceRef.current = false;
@@ -28726,7 +28710,9 @@ var processAllOrders = function processAllOrders(_ref) {
     });
   } else if (isErpType$1.isDxd(type)) {
     // DXD 选品用出库订单 doOrders（每项含 skus[]）
-    newList = (data === null || data === void 0 ? void 0 : data.doOrders) || [];
+    newList = processDxdOrders({
+      data: data
+    });
   } else {
     newList = processDefaultOrders({
       data: data
@@ -28773,8 +28759,28 @@ var processWlnOrders = function processWlnOrders(_ref6) {
   var data = _ref6.data;
   return (data === null || data === void 0 ? void 0 : data.orders) || [];
 };
-var processDefaultOrders = function processDefaultOrders(_ref7) {
+var processDxdOrders = function processDxdOrders(_ref7) {
+  var _data$doOrders;
   var data = _ref7.data;
+  var _ref8 = data || {},
+    isSplit = _ref8.isSplit,
+    billNo = _ref8.billNo,
+    billType = _ref8.billType,
+    billTag = _ref8.billTag,
+    sysStatus = _ref8.sysStatus;
+  var trades = (_data$doOrders = data.doOrders) === null || _data$doOrders === void 0 ? void 0 : _data$doOrders.map(function (item) {
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      billNo: billNo,
+      billType: billType,
+      billTag: billTag,
+      isSplit: isSplit,
+      sysStatus: sysStatus
+    });
+  });
+  return trades;
+};
+var processDefaultOrders = function processDefaultOrders(_ref9) {
+  var data = _ref9.data;
   return data || [];
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.10.9-beta.6",
+  "version": "2.10.9-beta.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.9-beta.6",
+    "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.8",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a114400ea3b0788d00a456f7a8b8e49a18612a8e"
+  "gitHead": "ef23434ac241e1f55b81b943d250e6ccba7c51fd"
 }