@kmkf-fe-packages/basic-components 0.26.1-beta.0 → 0.26.1-beta.10

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
 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';
+import { AddressData, BsAddressData, WdtAddressData, request as request$1, ExpressData, uuid, LogisticsAddressData, WDT_ORDER_TYPE_MAP } from '@kmkf-fe-packages/kmkf-utils';
 import zhCN from 'antd/lib/locale/zh_CN';
 import { cloneDeep, difference, differenceWith } from 'lodash';
 import { useDebounceEffect } from 'ahooks';
@@ -7377,75 +7377,17 @@ function ApaasRate(props) {
   }));
 }
 
-var addressData = AddressData.getInstance();
-var bsAddressData = BsAddressData.getInstance();
-var wdtAddressData = WdtAddressData.getInstance();
 var Province = function Province(props) {
+  var _mapping$type;
   var _props$type = props.type,
-    type = _props$type === void 0 ? 'workOrder' : _props$type,
-    value = props.value;
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    option = _useState2[0],
-    setOptions = _useState2[1];
-  var num = 0;
-  var isFirst = useRef(false);
-  var time = useRef();
-  var initPageSource = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var options;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            num++;
-            options = ({
-              bs: bsAddressData,
-              wdt: wdtAddressData,
-              workOrder: addressData
-            }[type] || addressData).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);
-            }
-          case 4:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function initPageSource() {
-      return _ref.apply(this, arguments);
-    };
-  }();
-  var getBsAddress = function getBsAddress() {
-    var data = JSON.parse(localStorage.getItem('bsAddressData') || '[]');
-    if (data.length) {
-      var options = toTree(data, 1);
-      setOptions(options);
-    }
+    type = _props$type === void 0 ? 'workOrder' : _props$type;
+  var mapping = {
+    workOrder: AddressData.getInstance(),
+    bs: BsAddressData.getInstance(),
+    wdt: WdtAddressData.getInstance()
   };
-  //如果值改变地址不存在则再获取一遍
-  useEffect(function () {
-    if (value && type == 'bs' && !option.length) {
-      getBsAddress();
-    }
-  }, [value, type, option]);
-  useEffect(function () {
-    if (!isFirst.current) {
-      initPageSource();
-      isFirst.current = true;
-    }
-    return function () {
-      clearTimeout(time.current);
-    };
-  }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Cascader, _objectSpread2(_objectSpread2({}, props), {}, {
-    options: option,
+    options: ((_mapping$type = mapping[type]) === null || _mapping$type === void 0 ? void 0 : _mapping$type.addressOptions) || [],
     style: {
       minWidth: '100px'
     },
@@ -7622,7 +7564,6 @@ function ApaasPosting(props) {
 }
 
 var _excluded$a = ["value", "onChange"];
-var express = ExpressData.getInstance();
 function ApaasLogistics(props) {
   var value = props.value,
     onChange = props.onChange,
@@ -7634,11 +7575,13 @@ function ApaasLogistics(props) {
   var isFirst = useRef(false);
   var initPageSource = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var express;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            express = ExpressData.getInstance();
             setOptions(express.expressData || []);
-          case 1:
+          case 2:
           case "end":
             return _context.stop();
         }
@@ -9775,7 +9718,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;
     }
@@ -10065,7 +10008,7 @@ var LogisticsMoreInterception = function LogisticsMoreInterception(props) {
   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", {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
       style: {
         position: 'relative',
         color: changeIndex === index ? '#4569d4' : 'black',
@@ -10075,25 +10018,23 @@ var LogisticsMoreInterception = function LogisticsMoreInterception(props) {
         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);
-    }
-  }));
+    }) : null));
+  }) : null), value.length ? (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) {

package/dist/index.js

@@ -7388,75 +7388,17 @@ function ApaasRate(props) {
   }));
 }
 
-var addressData = kmkfUtils.AddressData.getInstance();
-var bsAddressData = kmkfUtils.BsAddressData.getInstance();
-var wdtAddressData = kmkfUtils.WdtAddressData.getInstance();
 var Province = function Province(props) {
+  var _mapping$type;
   var _props$type = props.type,
-    type = _props$type === void 0 ? 'workOrder' : _props$type,
-    value = props.value;
-  var _useState = React.useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    option = _useState2[0],
-    setOptions = _useState2[1];
-  var num = 0;
-  var isFirst = React.useRef(false);
-  var time = React.useRef();
-  var initPageSource = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var options;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            num++;
-            options = ({
-              bs: bsAddressData,
-              wdt: wdtAddressData,
-              workOrder: addressData
-            }[type] || addressData).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);
-            }
-          case 4:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function initPageSource() {
-      return _ref.apply(this, arguments);
-    };
-  }();
-  var getBsAddress = function getBsAddress() {
-    var data = JSON.parse(localStorage.getItem('bsAddressData') || '[]');
-    if (data.length) {
-      var options = kmkfUtils.toTree(data, 1);
-      setOptions(options);
-    }
+    type = _props$type === void 0 ? 'workOrder' : _props$type;
+  var mapping = {
+    workOrder: kmkfUtils.AddressData.getInstance(),
+    bs: kmkfUtils.BsAddressData.getInstance(),
+    wdt: kmkfUtils.WdtAddressData.getInstance()
   };
-  //如果值改变地址不存在则再获取一遍
-  React.useEffect(function () {
-    if (value && type == 'bs' && !option.length) {
-      getBsAddress();
-    }
-  }, [value, type, option]);
-  React.useEffect(function () {
-    if (!isFirst.current) {
-      initPageSource();
-      isFirst.current = true;
-    }
-    return function () {
-      clearTimeout(time.current);
-    };
-  }, []);
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, _objectSpread2(_objectSpread2({}, props), {}, {
-    options: option,
+    options: ((_mapping$type = mapping[type]) === null || _mapping$type === void 0 ? void 0 : _mapping$type.addressOptions) || [],
     style: {
       minWidth: '100px'
     },
@@ -7633,7 +7575,6 @@ function ApaasPosting(props) {
 }
 
 var _excluded$a = ["value", "onChange"];
-var express = kmkfUtils.ExpressData.getInstance();
 function ApaasLogistics(props) {
   var value = props.value,
     onChange = props.onChange,
@@ -7645,11 +7586,13 @@ function ApaasLogistics(props) {
   var isFirst = React.useRef(false);
   var initPageSource = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var express;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            express = kmkfUtils.ExpressData.getInstance();
             setOptions(express.expressData || []);
-          case 1:
+          case 2:
           case "end":
             return _context.stop();
         }
@@ -9786,7 +9729,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;
     }
@@ -10076,7 +10019,7 @@ var LogisticsMoreInterception = function LogisticsMoreInterception(props) {
   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", {
+    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',
@@ -10086,25 +10029,23 @@ var LogisticsMoreInterception = function LogisticsMoreInterception(props) {
         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);
-    }
-  }));
+    }) : null));
+  }) : null), value.length ? (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) {

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

@@ -3,7 +3,7 @@ interface ProvinceType {
     value: string[];
     disabled: boolean;
     onChange: (value: any, selectedOptions: any) => void;
-    type?: string;
+    type?: 'workOrder' | 'bs' | 'wdt';
 }
 declare const Province: (props: Partial<ProvinceType>) => React.JSX.Element;
 export default Province;

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

@@ -9,7 +9,7 @@ interface ApaasPostingProps {
     value: Partial<PostingValueType>;
     disabled: boolean;
     onChange: (val: any) => void;
-    type?: string;
+    type?: 'workOrder' | 'bs' | 'wdt';
 }
 declare function ApaasPosting(props: Partial<ApaasPostingProps>): React.JSX.Element;
 export default ApaasPosting;

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

@@ -9,7 +9,7 @@ interface IdentifyAddressProps {
     onChange: (value: any) => void;
     disabled?: boolean;
     showIdentify?: boolean;
-    type?: string;
+    type?: 'workOrder' | 'bs' | 'wdt';
 }
 declare const IdentifyAddress: (props: IdentifyAddressProps) => React.JSX.Element;
 export default IdentifyAddress;

package/package.json

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