@kmkf-fe-packages/basic-components 0.25.0-alpha.1 → 0.25.0-alpha.3

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, CloseCircleOutlined, CaretUpOutlined } from '@ant-design/icons';
+import { EyeOutlined, DeleteOutlined, CaretUpOutlined } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 import { AddressData, BsAddressData, toTree, request as request$1, ExpressData, uuid, LogisticsAddressData } from '@kmkf-fe-packages/kmkf-utils';
@@ -516,8 +516,18 @@ function ApaasInput(props) {
   var isNumber = props.isNumber,
     replaceWarn = props.replaceWarn,
     other = _objectWithoutProperties(props, _excluded$1);
+  var handleBlur = function handleBlur(e) {
+    // 去除头尾空格
+    e.target.value = e.target.value.trim();
+    var onChange = props.onChange,
+      onBlur = props.onBlur;
+    typeof onChange === 'function' && onChange(e);
+    typeof onBlur === 'function' && onBlur(e);
+  };
   // @ts-ignore
-  return isNumber ? /*#__PURE__*/React.createElement(InputNumber, _objectSpread2({}, other)) : /*#__PURE__*/React.createElement(Input, _objectSpread2({}, other));
+  return isNumber ? /*#__PURE__*/React.createElement(InputNumber, _objectSpread2({}, other)) : /*#__PURE__*/React.createElement(Input, _objectSpread2(_objectSpread2({}, other), {}, {
+    onBlur: handleBlur
+  }));
 }
 
 function ApaasInputNumber(props) {
@@ -7389,14 +7399,11 @@ var Province = function Province(props) {
             num++;
             options = type !== 'bs' ? addressData.addressOptions || [] : bsAddressData.addressOptions || [];
             if (!(options === null || options === void 0 ? void 0 : options.length) && num < 6) {
-              getBsAddress();
               time.current = setTimeout(function () {
                 initPageSource();
               }, 1000);
             }
-            if (options.length) {
-              setOptions(options);
-            }
+            setOptions(options);
           case 4:
           case "end":
             return _context.stop();
@@ -9728,6 +9735,7 @@ 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,
@@ -10019,64 +10027,6 @@ 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("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), /*#__PURE__*/React.createElement(LogisticsInterception, {
-    required: required,
-    expressInterceptData: expressInterceptData,
-    value: value[changeIndex],
-    disabled: disabled,
-    isEditing: false,
-    onChange: function onChange(val) {
-      return handleChange(val, changeIndex);
-    }
-  }));
-};
-
 var LogisticsTrajectory = function LogisticsTrajectory(props) {
   var showField = props.showField,
     _props$value = props.value,
@@ -12913,4 +12863,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, 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 };
+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, 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 };

package/dist/index.js

@@ -527,8 +527,18 @@ function ApaasInput(props) {
   var isNumber = props.isNumber,
     replaceWarn = props.replaceWarn,
     other = _objectWithoutProperties(props, _excluded$1);
+  var handleBlur = function handleBlur(e) {
+    // 去除头尾空格
+    e.target.value = e.target.value.trim();
+    var onChange = props.onChange,
+      onBlur = props.onBlur;
+    typeof onChange === 'function' && onChange(e);
+    typeof onBlur === 'function' && onBlur(e);
+  };
   // @ts-ignore
-  return isNumber ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, _objectSpread2({}, other)) : /*#__PURE__*/React__default['default'].createElement(antd.Input, _objectSpread2({}, other));
+  return isNumber ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, _objectSpread2({}, other)) : /*#__PURE__*/React__default['default'].createElement(antd.Input, _objectSpread2(_objectSpread2({}, other), {}, {
+    onBlur: handleBlur
+  }));
 }
 
 function ApaasInputNumber(props) {
@@ -7400,14 +7410,11 @@ var Province = function Province(props) {
             num++;
             options = type !== 'bs' ? addressData.addressOptions || [] : bsAddressData.addressOptions || [];
             if (!(options === null || options === void 0 ? void 0 : options.length) && num < 6) {
-              getBsAddress();
               time.current = setTimeout(function () {
                 initPageSource();
               }, 1000);
             }
-            if (options.length) {
-              setOptions(options);
-            }
+            setOptions(options);
           case 4:
           case "end":
             return _context.stop();
@@ -9739,6 +9746,7 @@ 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,
@@ -10030,64 +10038,6 @@ 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("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), /*#__PURE__*/React__default['default'].createElement(LogisticsInterception, {
-    required: required,
-    expressInterceptData: expressInterceptData,
-    value: value[changeIndex],
-    disabled: disabled,
-    isEditing: false,
-    onChange: function onChange(val) {
-      return handleChange(val, changeIndex);
-    }
-  }));
-};
-
 var LogisticsTrajectory = function LogisticsTrajectory(props) {
   var showField = props.showField,
     _props$value = props.value,
@@ -12963,7 +12913,6 @@ 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,6 +14,7 @@ interface LogisticsInterceptionValueType {
 }
 interface LogisticsInterceptionProps {
     value: Partial<LogisticsInterceptionValueType>;
+    logisticsOptions: any[];
     expressInterceptData: any[];
     required: boolean;
     disabled: boolean;

package/dist/src/index.d.ts

@@ -32,7 +32,6 @@ 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.25.0-alpha.1",
+  "version": "0.25.0-alpha.3",
   "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.25.0-alpha.0",
+    "@kmkf-fe-packages/kmkf-utils": "^0.24.1",
     "ahooks": "^3.7.4",
     "kmkf-monitor": "^0.8.8",
     "lodash": "^4.17.21",
@@ -64,5 +64,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "14c977ae5d8e8f13d1517306002db80e78826748"
+  "gitHead": "0746b0db23513d40fb7ee8a71672560bdb7c57ed"
 }

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

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