@kmkf-fe-packages/basic-components 0.7.15-alpha.84 → 0.8.0

package/dist/index.esm.js

@@ -2,7 +2,7 @@ import React, { useRef, useState, useEffect, useMemo, forwardRef, useImperativeH
 import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, message, Radio, Space, Spin, Checkbox, Row, Col, Slider, Rate, Button, Form, Tabs, Modal, ConfigProvider, Pagination, Popover, Table } from 'antd';
 import { EyeOutlined, DeleteOutlined, InboxOutlined } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
-import { AddressData, BsAddressData, request as request$1, LogisticsAddressData, uuid } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, request as request$1, ExpressData, LogisticsAddressData, uuid } from '@kmkf-fe-packages/kmkf-utils';
 import zhCN from 'antd/lib/locale/zh_CN';
 import pubsub from 'pubsub-js';
 import { cloneDeep } from 'lodash';
@@ -7329,7 +7329,48 @@ function ApaasPosting(props) {
   });
 }
 
-var _excluded$a = ["label", "name", "extra", "required", "rules", "initialValue"];
+var _excluded$a = ["value", "disabled", "onChange"];
+var express = ExpressData.getInstance();
+function ApaasLogistics(props) {
+  var value = props.value,
+    disabled = props.disabled,
+    onChange = props.onChange,
+    other = _objectWithoutProperties(props, _excluded$a);
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    option = _useState2[0],
+    setOptions = _useState2[1];
+  var isFirst = useRef(false);
+  var initPageSource = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            setOptions(express.expressData || []);
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function initPageSource() {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  useEffect(function () {
+    if (!isFirst.current) {
+      initPageSource();
+      isFirst.current = true;
+    }
+  }, []);
+  return /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({}, other), {}, {
+    value: value,
+    onChange: onChange,
+    options: option
+  }));
+}
+
+var _excluded$b = ["label", "name", "extra", "required", "rules", "initialValue"];
 function withFormItem(WrappedComponent) {
   return function (props) {
     var label = props.label,
@@ -7338,7 +7379,7 @@ function withFormItem(WrappedComponent) {
       required = props.required,
       rules = props.rules,
       initialValue = props.initialValue,
-      otherProps = _objectWithoutProperties(props, _excluded$a);
+      otherProps = _objectWithoutProperties(props, _excluded$b);
     return /*#__PURE__*/React.createElement(Form.Item, _objectSpread2({}, {
       label: label,
       name: name,
@@ -7542,12 +7583,11 @@ var Logistics = function Logistics(props) {
   };
   //物流公司
   var LogisticsCompany = function LogisticsCompany() {
-    return /*#__PURE__*/React.createElement(Select, {
+    return /*#__PURE__*/React.createElement(ApaasLogistics, {
       disabled: disabled,
       placeholder: "\u7269\u6D41\u516C\u53F8",
       onChange: handelSelectChange,
       value: (value === null || value === void 0 ? void 0 : value.company) === '' ? undefined : value === null || value === void 0 ? void 0 : value.company,
-      options: options,
       showSearch: true,
       style: {
         width: '100%'
@@ -7555,7 +7595,18 @@ var Logistics = function Logistics(props) {
       filterOption: function filterOption(input, option) {
         return option.label.includes(input);
       }
-    });
+    })
+    // <Select
+    //   disabled={disabled}
+    //   placeholder="物流公司"
+    //   onChange={handelSelectChange}
+    //   value={value?.company === '' ? undefined : value?.company}
+    //   options={options}
+    //   showSearch
+    //   style={{ width: '100%' }}
+    //   filterOption={(input, option: any) => option.label.includes(input)}
+    // />
+    ;
   };
   //物流单号
   var LogisticsCode = function LogisticsCode() {
@@ -9034,7 +9085,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
   var _props$value = props.value,
     value = _props$value === void 0 ? {} : _props$value,
     _props$logisticsOptio = props.logisticsOptions,
-    logisticsOptions = _props$logisticsOptio === void 0 ? [] : _props$logisticsOptio,
     _props$expressInterce = props.expressInterceptData,
     expressInterceptData = _props$expressInterce === void 0 ? [] : _props$expressInterce,
     _props$required = props.required,
@@ -9211,7 +9261,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     label: '物流信息',
     required: required,
     key: 'logistics'
-  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, {
+  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(ApaasLogistics, {
     disabled: disabled || isEdit,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     style: {
@@ -9221,7 +9271,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return changeHandle(val, 'interceptCompany');
     },
     value: (value === null || value === void 0 ? void 0 : value.interceptCompany) === '' ? undefined : value === null || value === void 0 ? void 0 : value.interceptCompany,
-    options: logisticsOptions,
     showSearch: true,
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
@@ -9396,17 +9445,16 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
   };
   //物流公司
   var LogisticsCompany = function LogisticsCompany() {
-    return /*#__PURE__*/React.createElement(Select, {
-      disabled: disabled,
-      placeholder: "\u7269\u6D41\u516C\u53F8",
+    return /*#__PURE__*/React.createElement(ApaasLogistics, {
+      value: !(value === null || value === void 0 ? void 0 : value.trajectoryCompany) ? undefined : value === null || value === void 0 ? void 0 : value.trajectoryCompany,
       onChange: handelSelectChange,
-      value: (value === null || value === void 0 ? void 0 : value.trajectoryCompany) === '' ? undefined : value === null || value === void 0 ? void 0 : value.trajectoryCompany,
-      options: options,
-      showSearch: true,
       style: {
         width: '100%',
         marginBottom: '8px'
       },
+      disabled: disabled,
+      placeholder: "\u7269\u6D41\u516C\u53F8",
+      showSearch: true,
       filterOption: function filterOption(input, option) {
         return option.label.includes(input);
       }
@@ -9465,7 +9513,6 @@ var jstGoods = function jstGoods(props) {
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     _props$options = props.options,
-    options = _props$options === void 0 ? [] : _props$options,
     onChange = props.onChange,
     disabled = props.disabled,
     _props$type = props.type,
@@ -9526,14 +9573,13 @@ var jstGoods = function jstGoods(props) {
         return setChangeIndex(index);
       }
     }, "\u5305\u88F9".concat(index + 1)));
-  }))) : null, value.length ? /*#__PURE__*/React.createElement(React.Fragment, null, type === 1 ? /*#__PURE__*/React.createElement(Space, null, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React.createElement(Select, {
+  }))) : null, value.length ? /*#__PURE__*/React.createElement(React.Fragment, null, type === 1 ? /*#__PURE__*/React.createElement(Space, null, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React.createElement(ApaasLogistics, {
     disabled: disabled,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     onChange: function onChange(val) {
       return changeInputHandle(val, 'logisticsCompany');
     },
     value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.logisticsCompany,
-    options: options,
     showSearch: true,
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
@@ -10281,7 +10327,7 @@ var BsGoods = function BsGoods(props) {
   }));
 };
 
-var _excluded$b = ["value", "onChange", "reasonList", "disabled"];
+var _excluded$c = ["value", "onChange", "reasonList", "disabled"];
 var BsExchange = function BsExchange(props) {
   var _value$bsExchangeType4, _value$bsExchangeType5, _value$bsExchangeType6;
   var value = props.value,
@@ -10289,7 +10335,7 @@ var BsExchange = function BsExchange(props) {
     _props$reasonList = props.reasonList,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
-    other = _objectWithoutProperties(props, _excluded$b);
+    other = _objectWithoutProperties(props, _excluded$c);
   var valueRef = useRef({});
   useEffect(function () {
     valueRef.current = value;
@@ -10508,14 +10554,14 @@ var BsExchange = function BsExchange(props) {
   }))) : null);
 };
 
-var _excluded$c = ["value", "onChange", "reasonList", "disabled"];
+var _excluded$d = ["value", "onChange", "reasonList", "disabled"];
 var BsReissue = function BsReissue(props) {
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
-    other = _objectWithoutProperties(props, _excluded$c);
+    other = _objectWithoutProperties(props, _excluded$d);
   var valueRef = useRef({});
   useEffect(function () {
     pubsub.subscribe('reissueSelectList', function (_, data) {
@@ -11086,4 +11132,4 @@ var Goods$1 = function Goods(props, ref) {
 };
 var index = /*#__PURE__*/forwardRef(Goods$1);
 
-export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync, ApaasUploadAsync$1 as ApaasUploadFile, BsExchange, BsGoods, BsReissue, BuyerNick, ChooseBaby, ExpressLogistics, Goods, index 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, BuyerNick, ChooseBaby, ExpressLogistics, Goods, index 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

@@ -7340,7 +7340,48 @@ function ApaasPosting(props) {
   });
 }
 
-var _excluded$a = ["label", "name", "extra", "required", "rules", "initialValue"];
+var _excluded$a = ["value", "disabled", "onChange"];
+var express = kmkfUtils.ExpressData.getInstance();
+function ApaasLogistics(props) {
+  var value = props.value,
+    disabled = props.disabled,
+    onChange = props.onChange,
+    other = _objectWithoutProperties(props, _excluded$a);
+  var _useState = React.useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    option = _useState2[0],
+    setOptions = _useState2[1];
+  var isFirst = React.useRef(false);
+  var initPageSource = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            setOptions(express.expressData || []);
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function initPageSource() {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  React.useEffect(function () {
+    if (!isFirst.current) {
+      initPageSource();
+      isFirst.current = true;
+    }
+  }, []);
+  return /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, other), {}, {
+    value: value,
+    onChange: onChange,
+    options: option
+  }));
+}
+
+var _excluded$b = ["label", "name", "extra", "required", "rules", "initialValue"];
 function withFormItem(WrappedComponent) {
   return function (props) {
     var label = props.label,
@@ -7349,7 +7390,7 @@ function withFormItem(WrappedComponent) {
       required = props.required,
       rules = props.rules,
       initialValue = props.initialValue,
-      otherProps = _objectWithoutProperties(props, _excluded$a);
+      otherProps = _objectWithoutProperties(props, _excluded$b);
     return /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, _objectSpread2({}, {
       label: label,
       name: name,
@@ -7553,12 +7594,11 @@ var Logistics = function Logistics(props) {
   };
   //物流公司
   var LogisticsCompany = function LogisticsCompany() {
-    return /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+    return /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
       disabled: disabled,
       placeholder: "\u7269\u6D41\u516C\u53F8",
       onChange: handelSelectChange,
       value: (value === null || value === void 0 ? void 0 : value.company) === '' ? undefined : value === null || value === void 0 ? void 0 : value.company,
-      options: options,
       showSearch: true,
       style: {
         width: '100%'
@@ -7566,7 +7606,18 @@ var Logistics = function Logistics(props) {
       filterOption: function filterOption(input, option) {
         return option.label.includes(input);
       }
-    });
+    })
+    // <Select
+    //   disabled={disabled}
+    //   placeholder="物流公司"
+    //   onChange={handelSelectChange}
+    //   value={value?.company === '' ? undefined : value?.company}
+    //   options={options}
+    //   showSearch
+    //   style={{ width: '100%' }}
+    //   filterOption={(input, option: any) => option.label.includes(input)}
+    // />
+    ;
   };
   //物流单号
   var LogisticsCode = function LogisticsCode() {
@@ -9045,7 +9096,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
   var _props$value = props.value,
     value = _props$value === void 0 ? {} : _props$value,
     _props$logisticsOptio = props.logisticsOptions,
-    logisticsOptions = _props$logisticsOptio === void 0 ? [] : _props$logisticsOptio,
     _props$expressInterce = props.expressInterceptData,
     expressInterceptData = _props$expressInterce === void 0 ? [] : _props$expressInterce,
     _props$required = props.required,
@@ -9222,7 +9272,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     label: '物流信息',
     required: required,
     key: 'logistics'
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
     disabled: disabled || isEdit,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     style: {
@@ -9232,7 +9282,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return changeHandle(val, 'interceptCompany');
     },
     value: (value === null || value === void 0 ? void 0 : value.interceptCompany) === '' ? undefined : value === null || value === void 0 ? void 0 : value.interceptCompany,
-    options: logisticsOptions,
     showSearch: true,
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
@@ -9407,17 +9456,16 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
   };
   //物流公司
   var LogisticsCompany = function LogisticsCompany() {
-    return /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-      disabled: disabled,
-      placeholder: "\u7269\u6D41\u516C\u53F8",
+    return /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
+      value: !(value === null || value === void 0 ? void 0 : value.trajectoryCompany) ? undefined : value === null || value === void 0 ? void 0 : value.trajectoryCompany,
       onChange: handelSelectChange,
-      value: (value === null || value === void 0 ? void 0 : value.trajectoryCompany) === '' ? undefined : value === null || value === void 0 ? void 0 : value.trajectoryCompany,
-      options: options,
-      showSearch: true,
       style: {
         width: '100%',
         marginBottom: '8px'
       },
+      disabled: disabled,
+      placeholder: "\u7269\u6D41\u516C\u53F8",
+      showSearch: true,
       filterOption: function filterOption(input, option) {
         return option.label.includes(input);
       }
@@ -9476,7 +9524,6 @@ var jstGoods = function jstGoods(props) {
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     _props$options = props.options,
-    options = _props$options === void 0 ? [] : _props$options,
     onChange = props.onChange,
     disabled = props.disabled,
     _props$type = props.type,
@@ -9537,14 +9584,13 @@ var jstGoods = function jstGoods(props) {
         return setChangeIndex(index);
       }
     }, "\u5305\u88F9".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, !showField || showField === 'logisticsCompany' ? /*#__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, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
     disabled: disabled,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     onChange: function onChange(val) {
       return changeInputHandle(val, 'logisticsCompany');
     },
     value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.logisticsCompany,
-    options: options,
     showSearch: true,
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
@@ -10292,7 +10338,7 @@ var BsGoods = function BsGoods(props) {
   }));
 };
 
-var _excluded$b = ["value", "onChange", "reasonList", "disabled"];
+var _excluded$c = ["value", "onChange", "reasonList", "disabled"];
 var BsExchange = function BsExchange(props) {
   var _value$bsExchangeType4, _value$bsExchangeType5, _value$bsExchangeType6;
   var value = props.value,
@@ -10300,7 +10346,7 @@ var BsExchange = function BsExchange(props) {
     _props$reasonList = props.reasonList,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
-    other = _objectWithoutProperties(props, _excluded$b);
+    other = _objectWithoutProperties(props, _excluded$c);
   var valueRef = React.useRef({});
   React.useEffect(function () {
     valueRef.current = value;
@@ -10519,14 +10565,14 @@ var BsExchange = function BsExchange(props) {
   }))) : null);
 };
 
-var _excluded$c = ["value", "onChange", "reasonList", "disabled"];
+var _excluded$d = ["value", "onChange", "reasonList", "disabled"];
 var BsReissue = function BsReissue(props) {
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
-    other = _objectWithoutProperties(props, _excluded$c);
+    other = _objectWithoutProperties(props, _excluded$d);
   var valueRef = React.useRef({});
   React.useEffect(function () {
     pubsub__default['default'].subscribe('reissueSelectList', function (_, data) {
@@ -11106,6 +11152,7 @@ exports.ApaasDate = ApaasDate;
 exports.ApaasHoc = withFormItem;
 exports.ApaasInput = ApaasInput;
 exports.ApaasInputNumber = ApaasInputNumber;
+exports.ApaasLogistics = ApaasLogistics;
 exports.ApaasMultipleSelect = ApaasMultipleSelect;
 exports.ApaasPosting = ApaasPosting;
 exports.ApaasRadio = ApaasRadio;

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

@@ -0,0 +1,8 @@
+import React from 'react';
+export interface ApaasLogisticsProps {
+    value: any;
+    onChange: (val: any) => void;
+    [propName: string]: any;
+}
+declare function ApaasLogistics(props: ApaasLogisticsProps): React.JSX.Element;
+export default ApaasLogistics;

package/dist/src/index.d.ts

@@ -14,6 +14,7 @@ export { default as ApaasSlider } from './apaas/ApaasSlider';
 export { default as ApaasRate } from './apaas/ApaasRate';
 export { default as ApaasAddress } from './apaas/ApaasAddress';
 export { default as ApaasPosting } from './apaas/ApaasPosting';
+export { default as ApaasLogistics } from './apaas/ApaasLogistics';
 export { default as ApaasHoc } from './apaas/hoc/withFormItem';
 export { default as BuyerNick } from './business/BuyerNick';
 export { default as TradeId } from './business/TradeId';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.7.15-alpha.84",
+  "version": "0.8.0",
   "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.7.15-alpha.83",
+    "@kmkf-fe-packages/kmkf-utils": "^0.8.0",
     "lodash": "^4.17.21",
     "pubsub-js": "^1.9.4",
     "umi-request": "^1.4.0"
@@ -58,5 +58,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8f513f8c01dfbbcb8bc16404737f18f6689a3c68"
+  "gitHead": "cc6ccff667c191b641cc259b002a7e022fe7931c"
 }