@kmkf-fe-packages/basic-components 2.7.7-beta.4 → 2.7.7-beta.6

package/dist/index.esm.js

@@ -21308,7 +21308,8 @@ var getColumns$3 = function getColumns(_ref) {
           min: 0,
           precision: 2,
           onChange: function onChange(num) {
-            return updateHandle(num, index, 'price');
+            updateHandle(num, index, 'price');
+            if ((num || num === 0) && (record.number || record.number === 0)) updateHandle(num * (record.number || 0), index, 'money');
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
@@ -21340,7 +21341,8 @@ var getColumns$3 = function getColumns(_ref) {
           min: 1,
           precision: 0,
           onChange: function onChange(num) {
-            return updateHandle(num, index, 'number');
+            updateHandle(num, index, 'number');
+            if ((num || num === 0) && (record.price || record.price === 0)) updateHandle(num * (record.price || 0), index, 'money');
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
@@ -21357,7 +21359,7 @@ var getColumns$3 = function getColumns(_ref) {
           min: 0,
           precision: 2,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'money');
+            updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'money');
           }
         }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
       }
@@ -28491,7 +28493,7 @@ var componentMap$2 = {
     key: 'wlnGoods',
     name: '吉客云',
     orderNo: 'tradeNo',
-    goodDetailOrderNo: 'tradeNo',
+    goodDetailOrderNo: 'tpTid',
     eventNameMap: {
       // pubsub 事件
       type: 'wlnType',
@@ -28510,7 +28512,13 @@ var componentMap$2 = {
       returnDeleteGood: 'wlnReturnDeleteGood',
       exchangeDeleteGood: 'wlnExchangeDeleteGood'
     },
-    getOrderList: wlnUtils.getOrderListSingleton
+    getOrderList: wlnUtils.getOrderListSingleton,
+    checkShowModeBtn: function checkShowModeBtn(value) {
+      var _value$allOrders;
+      return value === null || value === void 0 ? void 0 : (_value$allOrders = value.allOrders) === null || _value$allOrders === void 0 ? void 0 : _value$allOrders.some(function (order) {
+        return order === null || order === void 0 ? void 0 : order.tpTid.includes('|');
+      });
+    }
   },
   WDT_AFTERSALE_GOODS: {
     type: 'wdtAftersale',
@@ -28543,14 +28551,14 @@ var componentMap$2 = {
   }
 };
 var CommonGoods = function CommonGoods(props) {
-  var _withInfo$current3, _withInfo$current4, _componentMap$compTyp6;
+  var _componentMap$compTyp, _withInfo$current3, _withInfo$current4, _componentMap$compTyp7;
   var value = props.value,
     disabled = props.disabled,
     onChange = props.onChange,
     compType = props.type;
   // console.log('value?.orders', value?.orders);
   // 合并单订单会包含","
-  var showModeBtn = !['BS_E3_GOODS'].includes(compType) && ((value === null || value === void 0 ? void 0 : value.orders) || []).some(function (order) {
+  var showModeBtn = ((_componentMap$compTyp = componentMap$2[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.checkShowModeBtn) ? componentMap$2[compType].checkShowModeBtn(value) : !['BS_E3_GOODS'].includes(compType) && ((value === null || value === void 0 ? void 0 : value.orders) || []).some(function (order) {
     var _order$componentMap$c;
     return order === null || order === void 0 ? void 0 : (_order$componentMap$c = order[componentMap$2[compType].orderNo]) === null || _order$componentMap$c === void 0 ? void 0 : _order$componentMap$c.includes(',');
   });
@@ -28794,8 +28802,8 @@ var CommonGoods = function CommonGoods(props) {
     });
     var orderNo = value === null || value === void 0 ? void 0 : value.orderNo;
     return mode ? goodDetails.filter(function (goodItem) {
-      var _componentMap$compTyp;
-      return !orderNo || (goodItem === null || goodItem === void 0 ? void 0 : goodItem[(_componentMap$compTyp = componentMap$2[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.goodDetailOrderNo]) === orderNo;
+      var _componentMap$compTyp2;
+      return !orderNo || (goodItem === null || goodItem === void 0 ? void 0 : goodItem[(_componentMap$compTyp2 = componentMap$2[compType]) === null || _componentMap$compTyp2 === void 0 ? void 0 : _componentMap$compTyp2.goodDetailOrderNo]) === orderNo;
     }) : goodDetails;
   };
   // 找到该订单号下所有商品
@@ -28820,8 +28828,8 @@ var CommonGoods = function CommonGoods(props) {
             //   await getKmSupplier(goodDetails);
             // }
             return _context3.abrupt("return", mode ? goodDetails.filter(function (goodItem) {
-              var _componentMap$compTyp2;
-              return !orderNo || (goodItem === null || goodItem === void 0 ? void 0 : goodItem[(_componentMap$compTyp2 = componentMap$2[compType]) === null || _componentMap$compTyp2 === void 0 ? void 0 : _componentMap$compTyp2.goodDetailOrderNo]) === orderNo;
+              var _componentMap$compTyp3;
+              return !orderNo || (goodItem === null || goodItem === void 0 ? void 0 : goodItem[(_componentMap$compTyp3 = componentMap$2[compType]) === null || _componentMap$compTyp3 === void 0 ? void 0 : _componentMap$compTyp3.goodDetailOrderNo]) === orderNo;
             }) : goodDetails);
           case 7:
           case "end":
@@ -28862,7 +28870,7 @@ var CommonGoods = function CommonGoods(props) {
   }, [value === null || value === void 0 ? void 0 : value.allOrders, value === null || value === void 0 ? void 0 : value.isStrict, value === null || value === void 0 ? void 0 : value.orderNo, compType]);
   var selectedGoodsChange = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(skuList) {
-      var _valueRef$current9, _componentMap$compTyp3, _componentMap$compTyp4, _uniqBy;
+      var _valueRef$current9, _componentMap$compTyp4, _componentMap$compTyp5, _uniqBy;
       var newValue, isStrict, originTradeGoodList, currentSelectGoodList;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
@@ -28883,8 +28891,8 @@ var CommonGoods = function CommonGoods(props) {
           case 7:
             originTradeGoodList = _context5.t0;
             // 当前选中的所有商品【包含了原订单+商品库】
-            currentSelectGoodList = ((_valueRef$current9 = valueRef.current) === null || _valueRef$current9 === void 0 ? void 0 : _valueRef$current9["".concat(componentMap$2 === null || componentMap$2 === void 0 ? void 0 : (_componentMap$compTyp3 = componentMap$2[compType]) === null || _componentMap$compTyp3 === void 0 ? void 0 : _componentMap$compTyp3.key)]) || [];
-            newValue["".concat(componentMap$2 === null || componentMap$2 === void 0 ? void 0 : (_componentMap$compTyp4 = componentMap$2[compType]) === null || _componentMap$compTyp4 === void 0 ? void 0 : _componentMap$compTyp4.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+            currentSelectGoodList = ((_valueRef$current9 = valueRef.current) === null || _valueRef$current9 === void 0 ? void 0 : _valueRef$current9["".concat(componentMap$2 === null || componentMap$2 === void 0 ? void 0 : (_componentMap$compTyp4 = componentMap$2[compType]) === null || _componentMap$compTyp4 === void 0 ? void 0 : _componentMap$compTyp4.key)]) || [];
+            newValue["".concat(componentMap$2 === null || componentMap$2 === void 0 ? void 0 : (_componentMap$compTyp5 = componentMap$2[compType]) === null || _componentMap$compTyp5 === void 0 ? void 0 : _componentMap$compTyp5.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
               return skuList.includes(item.uuid);
             });
             onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
@@ -28900,8 +28908,8 @@ var CommonGoods = function CommonGoods(props) {
   }();
   // 商品信息组件暂存后 重新编辑，此时需要重新获取订单下所有系统自订单的商品信息
   var getDataSourceAsync = function getDataSourceAsync() {
-    var _componentMap$compTyp5;
-    return (value === null || value === void 0 ? void 0 : value.orderNo) ? (_componentMap$compTyp5 = componentMap$2[compType]) === null || _componentMap$compTyp5 === void 0 ? void 0 : _componentMap$compTyp5.getOrderList(value === null || value === void 0 ? void 0 : value.orderNo).then(function (data) {
+    var _componentMap$compTyp6;
+    return (value === null || value === void 0 ? void 0 : value.orderNo) ? (_componentMap$compTyp6 = componentMap$2[compType]) === null || _componentMap$compTyp6 === void 0 ? void 0 : _componentMap$compTyp6.getOrderList(value === null || value === void 0 ? void 0 : value.orderNo).then(function (data) {
       var list = processAllOrders({
         data: data,
         orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
@@ -28934,7 +28942,7 @@ var CommonGoods = function CommonGoods(props) {
     isStrict: value === null || value === void 0 ? void 0 : value.isStrict,
     systemOrders: value === null || value === void 0 ? void 0 : value.allOrders,
     selectedSystemOrders: value === null || value === void 0 ? void 0 : value.orders,
-    showChangeBtn: (_componentMap$compTyp6 = componentMap$2[compType]) === null || _componentMap$compTyp6 === void 0 ? void 0 : _componentMap$compTyp6.showChangeBtn,
+    showChangeBtn: (_componentMap$compTyp7 = componentMap$2[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.showChangeBtn,
     tradeGoods: {
       originDataSource: originDataSource,
       getDataSourceAsync: getDataSourceAsync,

package/package.json

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