@kmkf-fe-packages/basic-components 0.26.0 → 0.26.1-beta.1

package/dist/index.esm.js

@@ -1,6 +1,6 @@
 import React, { useRef, useState, useEffect, forwardRef, useImperativeHandle, useMemo } from 'react';
 import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, message, Radio, Space, Spin, Modal, Button, Checkbox, Row, Col, Slider, Rate, Form, Tabs, ConfigProvider, Pagination, Popover, Table } from 'antd';
-import { EyeOutlined, DeleteOutlined, CaretUpOutlined } from '@ant-design/icons';
+import { EyeOutlined, DeleteOutlined, CloseCircleOutlined, CaretUpOutlined } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 import { AddressData, BsAddressData, WdtAddressData, toTree, request as request$1, ExpressData, uuid, LogisticsAddressData, WDT_ORDER_TYPE_MAP } from '@kmkf-fe-packages/kmkf-utils';
@@ -7404,11 +7404,14 @@ var Province = function Province(props) {
               workOrder: addressData
             }[type] || addressData).addressOptions || [];
             if (!(options === null || options === void 0 ? void 0 : options.length) && num < 6) {
+              getBsAddress();
               time.current = setTimeout(function () {
                 initPageSource();
               }, 1000);
             }
-            setOptions(options);
+            if (options.length) {
+              setOptions(options);
+            }
           case 4:
           case "end":
             return _context.stop();
@@ -9744,7 +9747,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
   var address = AddressData.getInstance();
   var _props$value = props.value,
     value = _props$value === void 0 ? {} : _props$value,
-    _props$logisticsOptio = props.logisticsOptions,
     _props$expressInterce = props.expressInterceptData,
     expressInterceptData = _props$expressInterce === void 0 ? [] : _props$expressInterce,
     _props$required = props.required,
@@ -9773,7 +9775,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
   var firstIn = useRef(true);
   useEffect(function () {
     //存入第一次的物流地址，防止非对接物流切换成对接物流后无法编辑
-    if (firstIn.current && JSON.stringify(value) !== '{}') {
+    if (firstIn.current && (value === null || value === void 0 ? void 0 : value.interceptCompany)) {
       setInitCompany(value === null || value === void 0 ? void 0 : value.interceptCompany);
       firstIn.current = false;
     }
@@ -10036,6 +10038,67 @@ var LogisticsInterception = function LogisticsInterception(props) {
   })));
 };
 
+var LogisticsMoreInterception = function LogisticsMoreInterception(props) {
+  var required = props.required,
+    expressInterceptData = props.expressInterceptData,
+    _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
+    disabled = props.disabled,
+    onChange = props.onChange,
+    isEditing = props.isEditing;
+  var _useState = useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    changeIndex = _useState2[0],
+    setChangeIndex = _useState2[1];
+  var handleChange = function handleChange(val, index) {
+    var newValue = cloneDeep(value);
+    newValue.splice(index, 1, val);
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  };
+  var handleDelete = function handleDelete(e, index) {
+    e.stopPropagation();
+    var newValue = cloneDeep(value);
+    newValue.splice(index, 1);
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+    setChangeIndex(0);
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, {
+    wrap: true
+  }, value.length > 1 ? (value || []).map(function (item, index) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
+      style: {
+        position: 'relative',
+        color: changeIndex === index ? '#4569d4' : 'black',
+        cursor: 'pointer'
+      },
+      onClick: function onClick() {
+        return setChangeIndex(index);
+      }
+    }, "\u5305\u88F9".concat(index + 1), !disabled ? /*#__PURE__*/React.createElement(CloseCircleOutlined, {
+      style: {
+        position: 'absolute',
+        right: '-7px',
+        top: '-10px'
+      },
+      onClick: function onClick(e) {
+        return handleDelete(e, index);
+      }
+    }) : null));
+  }) : null), value.length > 1 ? (value || []).map(function (item, index) {
+    return changeIndex === index ? /*#__PURE__*/React.createElement(LogisticsInterception, {
+      key: "logistics-".concat(index),
+      required: required,
+      expressInterceptData: expressInterceptData,
+      value: item,
+      disabled: disabled,
+      isEditing: false,
+      onChange: function onChange(val) {
+        return handleChange(val, index);
+      }
+    }) : null;
+  }) : null);
+};
+
 var LogisticsTrajectory = function LogisticsTrajectory(props) {
   var showField = props.showField,
     _props$value = props.value,
@@ -13499,7 +13562,7 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
     changeOrderInfo[type] = val;
     var newList = _toConsumableArray(value);
     newList[changeIndex] = changeOrderInfo;
-    console.log(newList, val, type);
+    // console.log(newList, val, type);
     onChange === null || onChange === void 0 ? void 0 : onChange(newList);
   };
   //判断是否是单个且没有商品数据
@@ -13575,7 +13638,6 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
     }, [1, 2].includes(type) ? /*#__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) {
@@ -13708,4 +13770,4 @@ var CalculationInput = function CalculationInput(props) {
   }, config === null || config === void 0 ? void 0 : config.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, index as ApaasUploadAsync, ApaasUploadFile, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$1 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonStatus, CommonSystemOrder, ExpressLogistics, Goods, index$2 as GoodsTable, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, Supplier, TBGoodId, TBGoodSerial, TradeId, WlnGoods };
+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, index as ApaasUploadAsync, ApaasUploadFile, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$1 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonStatus, CommonSystemOrder, ExpressLogistics, Goods, index$2 as GoodsTable, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, Supplier, TBGoodId, TBGoodSerial, TradeId, WlnGoods };

package/dist/index.js

@@ -7415,11 +7415,14 @@ var Province = function Province(props) {
               workOrder: addressData
             }[type] || addressData).addressOptions || [];
             if (!(options === null || options === void 0 ? void 0 : options.length) && num < 6) {
+              getBsAddress();
               time.current = setTimeout(function () {
                 initPageSource();
               }, 1000);
             }
-            setOptions(options);
+            if (options.length) {
+              setOptions(options);
+            }
           case 4:
           case "end":
             return _context.stop();
@@ -9755,7 +9758,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
   var address = kmkfUtils.AddressData.getInstance();
   var _props$value = props.value,
     value = _props$value === void 0 ? {} : _props$value,
-    _props$logisticsOptio = props.logisticsOptions,
     _props$expressInterce = props.expressInterceptData,
     expressInterceptData = _props$expressInterce === void 0 ? [] : _props$expressInterce,
     _props$required = props.required,
@@ -9784,7 +9786,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
   var firstIn = React.useRef(true);
   React.useEffect(function () {
     //存入第一次的物流地址，防止非对接物流切换成对接物流后无法编辑
-    if (firstIn.current && JSON.stringify(value) !== '{}') {
+    if (firstIn.current && (value === null || value === void 0 ? void 0 : value.interceptCompany)) {
       setInitCompany(value === null || value === void 0 ? void 0 : value.interceptCompany);
       firstIn.current = false;
     }
@@ -10047,6 +10049,67 @@ var LogisticsInterception = function LogisticsInterception(props) {
   })));
 };
 
+var LogisticsMoreInterception = function LogisticsMoreInterception(props) {
+  var required = props.required,
+    expressInterceptData = props.expressInterceptData,
+    _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
+    disabled = props.disabled,
+    onChange = props.onChange,
+    isEditing = props.isEditing;
+  var _useState = React.useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    changeIndex = _useState2[0],
+    setChangeIndex = _useState2[1];
+  var handleChange = function handleChange(val, index) {
+    var newValue = lodash.cloneDeep(value);
+    newValue.splice(index, 1, val);
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  };
+  var handleDelete = function handleDelete(e, index) {
+    e.stopPropagation();
+    var newValue = lodash.cloneDeep(value);
+    newValue.splice(index, 1);
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+    setChangeIndex(0);
+  };
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Space, {
+    wrap: true
+  }, value.length > 1 ? (value || []).map(function (item, index) {
+    return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("span", {
+      style: {
+        position: 'relative',
+        color: changeIndex === index ? '#4569d4' : 'black',
+        cursor: 'pointer'
+      },
+      onClick: function onClick() {
+        return setChangeIndex(index);
+      }
+    }, "\u5305\u88F9".concat(index + 1), !disabled ? /*#__PURE__*/React__default['default'].createElement(icons.CloseCircleOutlined, {
+      style: {
+        position: 'absolute',
+        right: '-7px',
+        top: '-10px'
+      },
+      onClick: function onClick(e) {
+        return handleDelete(e, index);
+      }
+    }) : null));
+  }) : null), value.length > 1 ? (value || []).map(function (item, index) {
+    return changeIndex === index ? /*#__PURE__*/React__default['default'].createElement(LogisticsInterception, {
+      key: "logistics-".concat(index),
+      required: required,
+      expressInterceptData: expressInterceptData,
+      value: item,
+      disabled: disabled,
+      isEditing: false,
+      onChange: function onChange(val) {
+        return handleChange(val, index);
+      }
+    }) : null;
+  }) : null);
+};
+
 var LogisticsTrajectory = function LogisticsTrajectory(props) {
   var showField = props.showField,
     _props$value = props.value,
@@ -13510,7 +13573,7 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
     changeOrderInfo[type] = val;
     var newList = _toConsumableArray(value);
     newList[changeIndex] = changeOrderInfo;
-    console.log(newList, val, type);
+    // console.log(newList, val, type);
     onChange === null || onChange === void 0 ? void 0 : onChange(newList);
   };
   //判断是否是单个且没有商品数据
@@ -13586,7 +13649,6 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
     }, [1, 2].includes(type) ? /*#__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) {
@@ -13759,6 +13821,7 @@ exports.Invoice = Invoice;
 exports.JstGoods = jstGoods;
 exports.JstItemList = ItemList;
 exports.LogisticsInterception = LogisticsInterception;
+exports.LogisticsMoreInterception = LogisticsMoreInterception;
 exports.LogisticsMoreTrajectory = LogisticsMoreTrajectory;
 exports.LogisticsTrajectory = LogisticsTrajectory;
 exports.MsgStatus = MsgStatus;

package/dist/src/business/LogisticsInterception/index.d.ts

@@ -14,7 +14,6 @@ interface LogisticsInterceptionValueType {
 }
 interface LogisticsInterceptionProps {
     value: Partial<LogisticsInterceptionValueType>;
-    logisticsOptions: any[];
     expressInterceptData: any[];
     required: boolean;
     disabled: boolean;

package/dist/src/business/LogisticsMoreInterception/index.d.ts

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

package/dist/src/index.d.ts

@@ -32,6 +32,7 @@ export { default as Invoice } from './business/Invoice';
 export { default as Status } from './business/Status';
 export { default as Payment } from './business/Payment';
 export { default as LogisticsInterception } from './business/LogisticsInterception';
+export { default as LogisticsMoreInterception } from './business/LogisticsMoreInterception';
 export { default as LogisticsTrajectory } from './business/LogisticsTrajectory';
 export { default as LogisticsMoreTrajectory } from './business/LogisticsMoreTrajectory';
 export { default as Goods } from './common/Goods';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.26.0",
+  "version": "0.26.1-beta.1",
   "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.26.0",
+    "@kmkf-fe-packages/kmkf-utils": "^0.26.1-beta.1",
     "ahooks": "^3.7.4",
     "kmkf-monitor": "^0.8.8",
     "lodash": "^4.17.21",
@@ -64,5 +64,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fc3cec9daee2efddf45a4c4ff9a81b13b1e89aec"
+  "gitHead": "1c8d441453e71ad13b9f3d52f25bcd6d6b2a3635"
 }