@kmkf-fe-packages/basic-components 0.8.17-alpha.27 → 0.8.17-alpha.29

package/dist/index.esm.js

@@ -10353,11 +10353,13 @@ var GoodItem = function GoodItem(props) {
         name = item.name,
         code = item.code,
         skuCode = item.skuCode,
-        marketPrice = item.marketPrice;
+        marketPrice = item.marketPrice,
+        skuName = item.skuName;
       return {
         id: goodsId,
         mark: '是',
         pic: '',
+        skuName: skuName,
         name: name,
         code: code,
         sku: skuCode,
@@ -11472,7 +11474,7 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
         maxHeight: '300px',
         overflowY: 'auto'
       }
-    }, type === 1 ? /*#__PURE__*/React.createElement("span", null, "\u7CFB\u7EDF\u8BA2\u5355\u53F7\uFF1A", item.systemOrderId) : null);
+    }, type === 1 ? /*#__PURE__*/React.createElement("span", null, "\u7CFB\u7EDF\u8BA2\u5355\u53F7", index + 1, "\uFF1A", item.systemOrderId) : null);
   };
   var changeInputHandle = function changeInputHandle(val, type) {
     var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
@@ -11489,7 +11491,7 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
     wrap: true
   }, (value || []).map(function (item, index) {
     return /*#__PURE__*/React.createElement(Popover, {
-      content: content(item),
+      content: content(item, index),
       key: index
     }, /*#__PURE__*/React.createElement("span", {
       style: {
@@ -11517,6 +11519,7 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
   })) : null) : null);
 };
 
+var _excluded$g = ["value", "onChange", "disabled", "failValue", "type"];
 var CommonSystemOrder$1 = function CommonSystemOrder(props) {
   var _value$changeIndex;
   var _props$value = props.value,
@@ -11525,7 +11528,8 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
     disabled = props.disabled,
     failValue = props.failValue,
     _props$type = props.type,
-    type = _props$type === void 0 ? 1 : _props$type;
+    type = _props$type === void 0 ? 1 : _props$type,
+    other = _objectWithoutProperties(props, _excluded$g);
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
@@ -11539,9 +11543,10 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
         maxHeight: '300px',
         overflowY: 'auto'
       }
-    }, type === 1 ? /*#__PURE__*/React.createElement("span", null, "\u7CFB\u7EDF\u8BA2\u5355\u53F7\uFF1A", item.systemOrderId) : null);
+    }, type === 1 ? /*#__PURE__*/React.createElement("span", null, "\u7CFB\u7EDF\u8BA2\u5355\u53F7", index + 1, "\uFF1A", item.systemOrderId) : null);
   };
   var changeHandle = function changeHandle(val, valType) {
+    console.log(val, valType);
     var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
     changeOrderInfo[valType] = val;
     if (val === failValue) {
@@ -11559,7 +11564,7 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
     wrap: true
   }, (value || []).map(function (item, index) {
     return /*#__PURE__*/React.createElement(Popover, {
-      content: content(item),
+      content: content(item, index),
       key: index
     }, /*#__PURE__*/React.createElement("span", {
       style: {
@@ -11570,18 +11575,35 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
         return setChangeIndex(index);
       }
     }, "\u7CFB\u7EDF\u8BA2\u5355\u53F7".concat(index + 1)));
-  }))) : null, value.length ? /*#__PURE__*/React.createElement(React.Fragment, null, type === 1 ? /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, {
+  }))) : null, value.length ? /*#__PURE__*/React.createElement(React.Fragment, null, type === 1 ? /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({}, other), {}, {
     showSearch: true,
     value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
     },
+    style: {
+      width: 200
+    },
     placeholder: "\u8BF7\u9009\u62E9",
     disabled: disabled,
     onChange: function onChange(val) {
       return changeHandle(val, 'status');
     }
-  })) : null) : null);
+  }))) : null) : null);
+};
+
+var CalculationInput = function CalculationInput(props) {
+  return /*#__PURE__*/React.createElement("span", {
+    style: {
+      display: 'flex',
+      alignItems: 'center'
+    }
+  }, /*#__PURE__*/React.createElement(ApaasInput, _objectSpread2({}, props)), /*#__PURE__*/React.createElement("span", {
+    style: {
+      marginLeft: '4px',
+      width: '88px'
+    }
+  }, props === null || props === void 0 ? void 0 : props.unit));
 };
 
-export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync, ApaasUploadAsync$1 as ApaasUploadFile, BsExchange, BsGoods, BsReissue, index as BsSystemOrder, BuyerNick, ChooseBaby, CommonSystemOrder$1 as CommonMultiStatus, CommonStatus, CommonSystemOrder, ExpressLogistics, Goods, index$1 as GoodsTable, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsTrajectory, ParseLogistics, Payment, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, Supplier, TBGoodId, TBGoodSerial, TradeId };
+export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync, ApaasUploadAsync$1 as ApaasUploadFile, BsExchange, BsGoods, BsReissue, index as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonSystemOrder$1 as CommonMultiStatus, CommonStatus, CommonSystemOrder, ExpressLogistics, Goods, index$1 as GoodsTable, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsTrajectory, ParseLogistics, Payment, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, Supplier, TBGoodId, TBGoodSerial, TradeId };

package/dist/index.js

@@ -10364,11 +10364,13 @@ var GoodItem = function GoodItem(props) {
         name = item.name,
         code = item.code,
         skuCode = item.skuCode,
-        marketPrice = item.marketPrice;
+        marketPrice = item.marketPrice,
+        skuName = item.skuName;
       return {
         id: goodsId,
         mark: '是',
         pic: '',
+        skuName: skuName,
         name: name,
         code: code,
         sku: skuCode,
@@ -11483,7 +11485,7 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
         maxHeight: '300px',
         overflowY: 'auto'
       }
-    }, type === 1 ? /*#__PURE__*/React__default['default'].createElement("span", null, "\u7CFB\u7EDF\u8BA2\u5355\u53F7\uFF1A", item.systemOrderId) : null);
+    }, type === 1 ? /*#__PURE__*/React__default['default'].createElement("span", null, "\u7CFB\u7EDF\u8BA2\u5355\u53F7", index + 1, "\uFF1A", item.systemOrderId) : null);
   };
   var changeInputHandle = function changeInputHandle(val, type) {
     var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
@@ -11500,7 +11502,7 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
     wrap: true
   }, (value || []).map(function (item, index) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Popover, {
-      content: content(item),
+      content: content(item, index),
       key: index
     }, /*#__PURE__*/React__default['default'].createElement("span", {
       style: {
@@ -11528,6 +11530,7 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
   })) : null) : null);
 };
 
+var _excluded$g = ["value", "onChange", "disabled", "failValue", "type"];
 var CommonSystemOrder$1 = function CommonSystemOrder(props) {
   var _value$changeIndex;
   var _props$value = props.value,
@@ -11536,7 +11539,8 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
     disabled = props.disabled,
     failValue = props.failValue,
     _props$type = props.type,
-    type = _props$type === void 0 ? 1 : _props$type;
+    type = _props$type === void 0 ? 1 : _props$type,
+    other = _objectWithoutProperties(props, _excluded$g);
   var _useState = React.useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
@@ -11550,9 +11554,10 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
         maxHeight: '300px',
         overflowY: 'auto'
       }
-    }, type === 1 ? /*#__PURE__*/React__default['default'].createElement("span", null, "\u7CFB\u7EDF\u8BA2\u5355\u53F7\uFF1A", item.systemOrderId) : null);
+    }, type === 1 ? /*#__PURE__*/React__default['default'].createElement("span", null, "\u7CFB\u7EDF\u8BA2\u5355\u53F7", index + 1, "\uFF1A", item.systemOrderId) : null);
   };
   var changeHandle = function changeHandle(val, valType) {
+    console.log(val, valType);
     var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
     changeOrderInfo[valType] = val;
     if (val === failValue) {
@@ -11570,7 +11575,7 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
     wrap: true
   }, (value || []).map(function (item, index) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Popover, {
-      content: content(item),
+      content: content(item, index),
       key: index
     }, /*#__PURE__*/React__default['default'].createElement("span", {
       style: {
@@ -11581,18 +11586,35 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
         return setChangeIndex(index);
       }
     }, "\u7CFB\u7EDF\u8BA2\u5355\u53F7".concat(index + 1)));
-  }))) : null, value.length ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, type === 1 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+  }))) : null, value.length ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, type === 1 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, other), {}, {
     showSearch: true,
     value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
     },
+    style: {
+      width: 200
+    },
     placeholder: "\u8BF7\u9009\u62E9",
     disabled: disabled,
     onChange: function onChange(val) {
       return changeHandle(val, 'status');
     }
-  })) : null) : null);
+  }))) : null) : null);
+};
+
+var CalculationInput = function CalculationInput(props) {
+  return /*#__PURE__*/React__default['default'].createElement("span", {
+    style: {
+      display: 'flex',
+      alignItems: 'center'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(ApaasInput, _objectSpread2({}, props)), /*#__PURE__*/React__default['default'].createElement("span", {
+    style: {
+      marginLeft: '4px',
+      width: '88px'
+    }
+  }, props === null || props === void 0 ? void 0 : props.unit));
 };
 
 exports.Address = ApaasAddress;
@@ -11620,6 +11642,7 @@ exports.BsGoods = BsGoods;
 exports.BsReissue = BsReissue;
 exports.BsSystemOrder = index;
 exports.BuyerNick = BuyerNick;
+exports.CalculationInput = CalculationInput;
 exports.ChooseBaby = ChooseBaby;
 exports.CommonMultiStatus = CommonSystemOrder$1;
 exports.CommonStatus = CommonStatus;

package/dist/src/apaas/CalculationInput/index.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const CalculationInput: (props: any) => React.JSX.Element;
+export default CalculationInput;

package/dist/src/index.d.ts

@@ -46,3 +46,4 @@ export { default as CommonSystemOrder } from './common/CommonSystemOrder';
 export { default as CommonMultiStatus } from './common/CommonMultiStatus';
 export { default as ParseLogistics } from './common/ParseLogistics';
 export { default as IdentifyAddress } from './common/IdentifyAddress';
+export { default as CalculationInput } from './apaas/CalculationInput';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.8.17-alpha.27",
+  "version": "0.8.17-alpha.29",
   "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": "^0.8.17-alpha.27",
+    "@kmkf-fe-packages/kmkf-utils": "^0.8.17-alpha.29",
     "lodash": "^4.17.21",
     "pubsub-js": "^1.9.4",
     "react-copy-to-clipboard": "^5.1.0",
@@ -60,5 +60,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bfa540a247701811987ae018c84eb7b83d919673"
+  "gitHead": "01f01467ce0a333277f19096d36e1fa386c9bcda"
 }