@kmkf-fe-packages/basic-components 0.8.17-alpha.24 → 0.8.17-alpha.28

package/dist/index.esm.js

@@ -10246,6 +10246,12 @@ var GoodItem = function GoodItem(props) {
       align: 'center',
       ellipsis: true,
       width: 250
+    }, {
+      dataIndex: 'sku',
+      title: "".concat(text, "sku\u7F16\u7801"),
+      align: 'center',
+      ellipsis: true,
+      width: 100
     }, {
       dataIndex: 'name',
       title: "".concat(text, "\u540D\u79F0"),
@@ -10270,12 +10276,6 @@ var GoodItem = function GoodItem(props) {
       align: 'center',
       ellipsis: true,
       width: 100
-    }, {
-      dataIndex: 'sku',
-      title: "".concat(text, "sku\u7F16\u7801"),
-      align: 'center',
-      ellipsis: true,
-      width: 100
     }, {
       dataIndex: 'money',
       title: "\u5B9E\u4ED8\u91D1\u989D",
@@ -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,
@@ -11429,7 +11431,7 @@ var Goods$1 = function Goods(props, ref) {
 var index$1 = /*#__PURE__*/forwardRef(Goods$1);
 
 var _excluded$f = ["onChange", "value", "failValue"];
-function MultiStatus(props) {
+function CommonStatus(props) {
   var onChange = props.onChange,
     value = props.value,
     failValue = props.failValue,
@@ -11451,4 +11453,143 @@ function MultiStatus(props) {
   }));
 }
 
-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, MultiStatus as CommonStatus, 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 };
+var CommonSystemOrder = function CommonSystemOrder(props) {
+  var _value$changeIndex, _value$changeIndex2;
+  var _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
+    onChange = props.onChange,
+    disabled = props.disabled,
+    _props$type = props.type,
+    type = _props$type === void 0 ? 1 : _props$type;
+  var _useState = useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    changeIndex = _useState2[0],
+    setChangeIndex = _useState2[1]; //选中的包裹
+  useEffect(function () {
+    setChangeIndex(0);
+  }, []);
+  var content = function content(item, index) {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        maxHeight: '300px',
+        overflowY: 'auto'
+      }
+    }, 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]);
+    changeOrderInfo[type] = val;
+    var newList = _toConsumableArray(value);
+    newList[changeIndex] = changeOrderInfo;
+    onChange === null || onChange === void 0 ? void 0 : onChange(newList);
+  };
+  //判断是否是单个且没有商品数据
+  var isSingle = useMemo(function () {
+    return value && value.length === 1;
+  }, [value]);
+  return /*#__PURE__*/React.createElement("div", null, !isSingle ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, {
+    wrap: true
+  }, (value || []).map(function (item, index) {
+    return /*#__PURE__*/React.createElement(Popover, {
+      content: content(item, index),
+      key: index
+    }, /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: changeIndex === index ? '#4569d4' : 'black',
+        cursor: 'pointer'
+      },
+      onClick: function onClick() {
+        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(Input, {
+    disabled: disabled,
+    placeholder: "\u8BF7\u8F93\u5165\u51FA\u5E93\u5355\u7F16\u53F7",
+    onChange: function onChange(e) {
+      return changeInputHandle(e.target.value, 'deliveryNo');
+    },
+    value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.deliveryNo
+  })) : null, type === 2 ? /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Input, {
+    disabled: disabled,
+    placeholder: "\u8BF7\u8F93\u5165\u9000\u8D27\u5355id",
+    onChange: function onChange(e) {
+      return changeInputHandle(e.target.value, 'returnGoodsTradeId');
+    },
+    value: (_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2.returnGoodsTradeId
+  })) : null) : null);
+};
+
+var _excluded$g = ["value", "onChange", "disabled", "failValue", "type"];
+var CommonSystemOrder$1 = function CommonSystemOrder(props) {
+  var _value$changeIndex;
+  var _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
+    onChange = props.onChange,
+    disabled = props.disabled,
+    failValue = props.failValue,
+    _props$type = 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],
+    setChangeIndex = _useState2[1]; //选中的包裹
+  useEffect(function () {
+    setChangeIndex(0);
+  }, []);
+  var content = function content(item, index) {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        maxHeight: '300px',
+        overflowY: 'auto'
+      }
+    }, 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) {
+      changeOrderInfo.reason = '';
+    }
+    var newList = _toConsumableArray(value);
+    newList[changeIndex] = changeOrderInfo;
+    onChange === null || onChange === void 0 ? void 0 : onChange(newList);
+  };
+  //判断是否是单个且没有商品数据
+  var isSingle = useMemo(function () {
+    return value && value.length === 1;
+  }, [value]);
+  return /*#__PURE__*/React.createElement("div", null, !isSingle ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, {
+    wrap: true
+  }, (value || []).map(function (item, index) {
+    return /*#__PURE__*/React.createElement(Popover, {
+      content: content(item, index),
+      key: index
+    }, /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: changeIndex === index ? '#4569d4' : 'black',
+        cursor: 'pointer'
+      },
+      onClick: function onClick() {
+        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, _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);
+};
+
+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 };

package/dist/index.js

@@ -10257,6 +10257,12 @@ var GoodItem = function GoodItem(props) {
       align: 'center',
       ellipsis: true,
       width: 250
+    }, {
+      dataIndex: 'sku',
+      title: "".concat(text, "sku\u7F16\u7801"),
+      align: 'center',
+      ellipsis: true,
+      width: 100
     }, {
       dataIndex: 'name',
       title: "".concat(text, "\u540D\u79F0"),
@@ -10281,12 +10287,6 @@ var GoodItem = function GoodItem(props) {
       align: 'center',
       ellipsis: true,
       width: 100
-    }, {
-      dataIndex: 'sku',
-      title: "".concat(text, "sku\u7F16\u7801"),
-      align: 'center',
-      ellipsis: true,
-      width: 100
     }, {
       dataIndex: 'money',
       title: "\u5B9E\u4ED8\u91D1\u989D",
@@ -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,
@@ -11440,7 +11442,7 @@ var Goods$1 = function Goods(props, ref) {
 var index$1 = /*#__PURE__*/React.forwardRef(Goods$1);
 
 var _excluded$f = ["onChange", "value", "failValue"];
-function MultiStatus(props) {
+function CommonStatus(props) {
   var onChange = props.onChange,
     value = props.value,
     failValue = props.failValue,
@@ -11462,6 +11464,145 @@ function MultiStatus(props) {
   }));
 }
 
+var CommonSystemOrder = function CommonSystemOrder(props) {
+  var _value$changeIndex, _value$changeIndex2;
+  var _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
+    onChange = props.onChange,
+    disabled = props.disabled,
+    _props$type = props.type,
+    type = _props$type === void 0 ? 1 : _props$type;
+  var _useState = React.useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    changeIndex = _useState2[0],
+    setChangeIndex = _useState2[1]; //选中的包裹
+  React.useEffect(function () {
+    setChangeIndex(0);
+  }, []);
+  var content = function content(item, index) {
+    return /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        maxHeight: '300px',
+        overflowY: 'auto'
+      }
+    }, 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]);
+    changeOrderInfo[type] = val;
+    var newList = _toConsumableArray(value);
+    newList[changeIndex] = changeOrderInfo;
+    onChange === null || onChange === void 0 ? void 0 : onChange(newList);
+  };
+  //判断是否是单个且没有商品数据
+  var isSingle = React.useMemo(function () {
+    return value && value.length === 1;
+  }, [value]);
+  return /*#__PURE__*/React__default['default'].createElement("div", null, !isSingle ? /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(antd.Space, {
+    wrap: true
+  }, (value || []).map(function (item, index) {
+    return /*#__PURE__*/React__default['default'].createElement(antd.Popover, {
+      content: content(item, index),
+      key: index
+    }, /*#__PURE__*/React__default['default'].createElement("span", {
+      style: {
+        color: changeIndex === index ? '#4569d4' : 'black',
+        cursor: 'pointer'
+      },
+      onClick: function onClick() {
+        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.Input, {
+    disabled: disabled,
+    placeholder: "\u8BF7\u8F93\u5165\u51FA\u5E93\u5355\u7F16\u53F7",
+    onChange: function onChange(e) {
+      return changeInputHandle(e.target.value, 'deliveryNo');
+    },
+    value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.deliveryNo
+  })) : null, type === 2 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    disabled: disabled,
+    placeholder: "\u8BF7\u8F93\u5165\u9000\u8D27\u5355id",
+    onChange: function onChange(e) {
+      return changeInputHandle(e.target.value, 'returnGoodsTradeId');
+    },
+    value: (_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2.returnGoodsTradeId
+  })) : null) : null);
+};
+
+var _excluded$g = ["value", "onChange", "disabled", "failValue", "type"];
+var CommonSystemOrder$1 = function CommonSystemOrder(props) {
+  var _value$changeIndex;
+  var _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
+    onChange = props.onChange,
+    disabled = props.disabled,
+    failValue = props.failValue,
+    _props$type = 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],
+    setChangeIndex = _useState2[1]; //选中的包裹
+  React.useEffect(function () {
+    setChangeIndex(0);
+  }, []);
+  var content = function content(item, index) {
+    return /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        maxHeight: '300px',
+        overflowY: 'auto'
+      }
+    }, 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) {
+      changeOrderInfo.reason = '';
+    }
+    var newList = _toConsumableArray(value);
+    newList[changeIndex] = changeOrderInfo;
+    onChange === null || onChange === void 0 ? void 0 : onChange(newList);
+  };
+  //判断是否是单个且没有商品数据
+  var isSingle = React.useMemo(function () {
+    return value && value.length === 1;
+  }, [value]);
+  return /*#__PURE__*/React__default['default'].createElement("div", null, !isSingle ? /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(antd.Space, {
+    wrap: true
+  }, (value || []).map(function (item, index) {
+    return /*#__PURE__*/React__default['default'].createElement(antd.Popover, {
+      content: content(item, index),
+      key: index
+    }, /*#__PURE__*/React__default['default'].createElement("span", {
+      style: {
+        color: changeIndex === index ? '#4569d4' : 'black',
+        cursor: 'pointer'
+      },
+      onClick: function onClick() {
+        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, _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);
+};
+
 exports.Address = ApaasAddress;
 exports.AliPay = AliPay;
 exports.ApaasAddress = Province;
@@ -11488,7 +11629,9 @@ exports.BsReissue = BsReissue;
 exports.BsSystemOrder = index;
 exports.BuyerNick = BuyerNick;
 exports.ChooseBaby = ChooseBaby;
-exports.CommonStatus = MultiStatus;
+exports.CommonMultiStatus = CommonSystemOrder$1;
+exports.CommonStatus = CommonStatus;
+exports.CommonSystemOrder = CommonSystemOrder;
 exports.ExpressLogistics = ExpressLogistics;
 exports.Goods = Goods;
 exports.GoodsTable = index$1;

package/dist/src/common/CommonMultiStatus/index.d.ts

@@ -0,0 +1,15 @@
+import React from 'react';
+interface CommonSystemOrderProps {
+    value: {
+        status: string;
+        reason?: string;
+        systemOrderId?: string;
+    }[];
+    failValue: string;
+    options: any[];
+    onChange: (val: any) => void;
+    disabled: boolean;
+    type: number;
+}
+declare const CommonSystemOrder: (props: Partial<CommonSystemOrderProps>) => React.JSX.Element;
+export default CommonSystemOrder;

package/dist/src/common/CommonStatus/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-interface MultiStatusProps {
+interface CommonStatusProps {
     value: {
         status: string;
         reason: string;
@@ -8,5 +8,5 @@ interface MultiStatusProps {
     options: any[];
     onChange: (val: any) => void;
 }
-declare function MultiStatus(props: Partial<MultiStatusProps>): React.JSX.Element;
-export default MultiStatus;
+declare function CommonStatus(props: Partial<CommonStatusProps>): React.JSX.Element;
+export default CommonStatus;

package/dist/src/common/CommonSystemOrder/index.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+interface CommonSystemOrderProps {
+    value: any[];
+    type: number;
+    options: any[];
+    disabled: boolean;
+    onChange: (val: any[]) => void;
+}
+declare const CommonSystemOrder: (props: Partial<CommonSystemOrderProps>) => React.JSX.Element;
+export default CommonSystemOrder;

package/dist/src/index.d.ts

@@ -42,5 +42,7 @@ export { default as BsReissue } from './bs/Reissue';
 export { default as BsSystemOrder } from './bs/SystemOrder';
 export { default as GoodsTable } from './common/GoodsTable';
 export { default as CommonStatus } from './common/CommonStatus';
+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';

package/package.json

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