@kmkf-fe-packages/basic-components 2.0.79-beta.60 → 2.0.79-beta.62

package/dist/index.esm.js

@@ -1,6 +1,6 @@
 import React, { useRef, useState, useEffect, forwardRef, useImperativeHandle, useMemo, useCallback } from 'react';
-import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, message, Radio, Space, Spin, Modal, Button, Checkbox, Row, Col, Slider, Rate as Rate$1, Form, Popover, Table, Tabs, ConfigProvider, Pagination, Typography, Skeleton, Empty, Tooltip } from 'antd';
-import { EyeOutlined, DeleteOutlined, CloseOutlined, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, MinusCircleFilled, VideoCameraTwoTone } from '@ant-design/icons';
+import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, message, Radio, Space, Spin, Modal, Button, Checkbox, Row, Col, Slider, Rate as Rate$1, Form, Tooltip, Popover, Table, Tabs, ConfigProvider, Pagination, Typography, Skeleton, Empty } from 'antd';
+import { EyeOutlined, DeleteOutlined, CloseOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, VideoCameraTwoTone } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, filterKmOrders, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
@@ -8046,6 +8046,29 @@ function withFormItem(WrappedComponent) {
  */
 var extendRequest = extend$1({});
 
+function HoverTableRowDeleteIcon(_ref) {
+  var index = _ref.index,
+    hoveredRowIndex = _ref.hoveredRowIndex,
+    handleClick = _ref.handleClick;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
+    style: {
+      display: hoveredRowIndex === index ? 'none' : 'inline'
+    }
+  }, index + 1), /*#__PURE__*/React.createElement("span", {
+    style: {
+      cursor: 'pointer'
+    },
+    onClick: handleClick,
+    title: "\u5220\u9664"
+  }, /*#__PURE__*/React.createElement(MinusCircleFilled, {
+    style: {
+      fontSize: 18,
+      color: '#1890ff',
+      display: hoveredRowIndex === index ? 'inline' : 'none'
+    }
+  })));
+}
+
 var WidgetMap = {
   INPUT: 'input',
   TEXTAREA: 'textarea'
@@ -8066,7 +8089,8 @@ var SubForm = function SubForm(props) {
     tableHeader = props.tableHeader,
     disabled = props.disabled,
     platform = props.platform,
-    maxCount = props.maxCount;
+    maxCount = props.maxCount,
+    manual = props.manual;
   var ref = useRef(null);
   var isRequest = useRef(false);
   var _useState = useState(false),
@@ -8093,6 +8117,10 @@ var SubForm = function SubForm(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     hasMore = _useState12[0],
     setHasMore = _useState12[1];
+  var _useState13 = useState(null),
+    _useState14 = _slicedToArray(_useState13, 2),
+    hoveredRowIndex = _useState14[0],
+    setHoveredRowIndex = _useState14[1];
   var updateHandle = function updateHandle(val, index, type) {
     if (value === null || value === void 0 ? void 0 : value.length) {
       var valueItem = tableHeader.find(function (t) {
@@ -8126,11 +8154,14 @@ var SubForm = function SubForm(props) {
     title: '序号',
     width: 50,
     render: function render(val, record, index) {
-      return /*#__PURE__*/React.createElement("div", {
-        style: {
-          width: 25
+      return /*#__PURE__*/React.createElement(HoverTableRowDeleteIcon, {
+        index: index,
+        hoveredRowIndex: hoveredRowIndex,
+        handleClick: function handleClick() {
+          return deleteHandle(record.uuid);
         }
-      }, index + 1);
+      });
+      // return <div style={{ width: 25 }}>{index + 1}</div>;
     }
   }].concat(_toConsumableArray(newTableHeader.map(function (t) {
     return {
@@ -8172,12 +8203,26 @@ var SubForm = function SubForm(props) {
     title: '操作',
     width: 70,
     render: function render(val, record, index) {
-      return /*#__PURE__*/React.createElement(Button, {
-        type: "link",
+      return /*#__PURE__*/React.createElement(Space, null, manual && /*#__PURE__*/React.createElement(Tooltip, {
+        title: "\u6DFB\u52A0"
+      }, /*#__PURE__*/React.createElement(PlusCircleFilled, {
+        style: {
+          fontSize: 18,
+          color: '#1890ff'
+        },
+        onClick: function onClick() {
+          return addHandle();
+        }
+      })), /*#__PURE__*/React.createElement(Tooltip, {
+        title: "\u5220\u9664"
+      }, /*#__PURE__*/React.createElement(MinusCircleFilled, {
+        style: {
+          fontSize: 18
+        },
         onClick: function onClick() {
           return deleteHandle(record.uuid);
         }
-      }, "\u5220\u9664");
+      })));
     }
   }]);
   var columsSearch = useMemo(function () {
@@ -8203,6 +8248,12 @@ var SubForm = function SubForm(props) {
       return prv;
     }, {});
   }, [newTableHeader]);
+  var defaultValueMap = useMemo(function () {
+    return Object.keys(valueMap).reduce(function (prv, next) {
+      prv["".concat(valueMap[next])] = '';
+      return prv;
+    }, {});
+  }, [valueMap]);
   var selectOptions = useMemo(function () {
     var _options$;
     var options = newTableHeader.map(function (item) {
@@ -8220,6 +8271,11 @@ var SubForm = function SubForm(props) {
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newList);
   };
+  var addHandle = function addHandle() {
+    onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value || []), [_objectSpread2(_objectSpread2({}, defaultValueMap), {}, {
+      uuid: uuid()
+    })]));
+  };
   var onScrollCapture = function onScrollCapture(e) {
     if (e.target.scrollTop + e.target.clientHeight >= e.target.scrollHeight - 20) {
       if (hasMore && !isRequest.current) {
@@ -8431,7 +8487,22 @@ var SubForm = function SubForm(props) {
       x: '100%'
     },
     locale: {
-      emptyText: '暂无数据'
+      emptyText: manual ? /*#__PURE__*/React.createElement("span", null, "\u6682\u65E0\u6570\u636E,", /*#__PURE__*/React.createElement(Button, {
+        type: "link",
+        onClick: function onClick() {
+          return addHandle();
+        }
+      }, "\u70B9\u51FB\u6DFB\u52A0")) : '暂无数据'
+    },
+    onRow: function onRow(_, index) {
+      return {
+        onMouseEnter: function onMouseEnter() {
+          return setHoveredRowIndex(index !== null && index !== void 0 ? index : null);
+        },
+        onMouseLeave: function onMouseLeave() {
+          return setHoveredRowIndex(null);
+        }
+      };
     }
   }));
 };
@@ -19024,29 +19095,6 @@ var getBsE3ReissueGoodColumns = function getBsE3ReissueGoodColumns(_ref4) {
   });
 };
 
-function HoverTableRowDeleteIcon(_ref) {
-  var index = _ref.index,
-    hoveredRowIndex = _ref.hoveredRowIndex,
-    handleClick = _ref.handleClick;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
-    style: {
-      display: hoveredRowIndex === index ? 'none' : 'inline'
-    }
-  }, index + 1), /*#__PURE__*/React.createElement("span", {
-    style: {
-      cursor: 'pointer'
-    },
-    onClick: handleClick,
-    title: "\u5220\u9664"
-  }, /*#__PURE__*/React.createElement(MinusCircleFilled, {
-    style: {
-      fontSize: 18,
-      color: '#1890ff',
-      display: hoveredRowIndex === index ? 'inline' : 'none'
-    }
-  })));
-}
-
 var isErpType = {
   isWdt: function isWdt(type) {
     return ['WDT_REISSUE_GOODS', 'WDT_GOODS', 'WDT_EXCHANGE_GOODS'].includes(type);

package/dist/index.js

@@ -8059,6 +8059,29 @@ function withFormItem(WrappedComponent) {
  */
 var extendRequest = request.extend({});
 
+function HoverTableRowDeleteIcon(_ref) {
+  var index = _ref.index,
+    hoveredRowIndex = _ref.hoveredRowIndex,
+    handleClick = _ref.handleClick;
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("span", {
+    style: {
+      display: hoveredRowIndex === index ? 'none' : 'inline'
+    }
+  }, index + 1), /*#__PURE__*/React__default['default'].createElement("span", {
+    style: {
+      cursor: 'pointer'
+    },
+    onClick: handleClick,
+    title: "\u5220\u9664"
+  }, /*#__PURE__*/React__default['default'].createElement(icons.MinusCircleFilled, {
+    style: {
+      fontSize: 18,
+      color: '#1890ff',
+      display: hoveredRowIndex === index ? 'inline' : 'none'
+    }
+  })));
+}
+
 var WidgetMap = {
   INPUT: 'input',
   TEXTAREA: 'textarea'
@@ -8079,7 +8102,8 @@ var SubForm = function SubForm(props) {
     tableHeader = props.tableHeader,
     disabled = props.disabled,
     platform = props.platform,
-    maxCount = props.maxCount;
+    maxCount = props.maxCount,
+    manual = props.manual;
   var ref = React.useRef(null);
   var isRequest = React.useRef(false);
   var _useState = React.useState(false),
@@ -8106,6 +8130,10 @@ var SubForm = function SubForm(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     hasMore = _useState12[0],
     setHasMore = _useState12[1];
+  var _useState13 = React.useState(null),
+    _useState14 = _slicedToArray(_useState13, 2),
+    hoveredRowIndex = _useState14[0],
+    setHoveredRowIndex = _useState14[1];
   var updateHandle = function updateHandle(val, index, type) {
     if (value === null || value === void 0 ? void 0 : value.length) {
       var valueItem = tableHeader.find(function (t) {
@@ -8139,11 +8167,14 @@ var SubForm = function SubForm(props) {
     title: '序号',
     width: 50,
     render: function render(val, record, index) {
-      return /*#__PURE__*/React__default['default'].createElement("div", {
-        style: {
-          width: 25
+      return /*#__PURE__*/React__default['default'].createElement(HoverTableRowDeleteIcon, {
+        index: index,
+        hoveredRowIndex: hoveredRowIndex,
+        handleClick: function handleClick() {
+          return deleteHandle(record.uuid);
         }
-      }, index + 1);
+      });
+      // return <div style={{ width: 25 }}>{index + 1}</div>;
     }
   }].concat(_toConsumableArray(newTableHeader.map(function (t) {
     return {
@@ -8185,12 +8216,26 @@ var SubForm = function SubForm(props) {
     title: '操作',
     width: 70,
     render: function render(val, record, index) {
-      return /*#__PURE__*/React__default['default'].createElement(antd.Button, {
-        type: "link",
+      return /*#__PURE__*/React__default['default'].createElement(antd.Space, null, manual && /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+        title: "\u6DFB\u52A0"
+      }, /*#__PURE__*/React__default['default'].createElement(icons.PlusCircleFilled, {
+        style: {
+          fontSize: 18,
+          color: '#1890ff'
+        },
+        onClick: function onClick() {
+          return addHandle();
+        }
+      })), /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+        title: "\u5220\u9664"
+      }, /*#__PURE__*/React__default['default'].createElement(icons.MinusCircleFilled, {
+        style: {
+          fontSize: 18
+        },
         onClick: function onClick() {
           return deleteHandle(record.uuid);
         }
-      }, "\u5220\u9664");
+      })));
     }
   }]);
   var columsSearch = React.useMemo(function () {
@@ -8216,6 +8261,12 @@ var SubForm = function SubForm(props) {
       return prv;
     }, {});
   }, [newTableHeader]);
+  var defaultValueMap = React.useMemo(function () {
+    return Object.keys(valueMap).reduce(function (prv, next) {
+      prv["".concat(valueMap[next])] = '';
+      return prv;
+    }, {});
+  }, [valueMap]);
   var selectOptions = React.useMemo(function () {
     var _options$;
     var options = newTableHeader.map(function (item) {
@@ -8233,6 +8284,11 @@ var SubForm = function SubForm(props) {
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newList);
   };
+  var addHandle = function addHandle() {
+    onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value || []), [_objectSpread2(_objectSpread2({}, defaultValueMap), {}, {
+      uuid: kmkfUtils.uuid()
+    })]));
+  };
   var onScrollCapture = function onScrollCapture(e) {
     if (e.target.scrollTop + e.target.clientHeight >= e.target.scrollHeight - 20) {
       if (hasMore && !isRequest.current) {
@@ -8444,7 +8500,22 @@ var SubForm = function SubForm(props) {
       x: '100%'
     },
     locale: {
-      emptyText: '暂无数据'
+      emptyText: manual ? /*#__PURE__*/React__default['default'].createElement("span", null, "\u6682\u65E0\u6570\u636E,", /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+        type: "link",
+        onClick: function onClick() {
+          return addHandle();
+        }
+      }, "\u70B9\u51FB\u6DFB\u52A0")) : '暂无数据'
+    },
+    onRow: function onRow(_, index) {
+      return {
+        onMouseEnter: function onMouseEnter() {
+          return setHoveredRowIndex(index !== null && index !== void 0 ? index : null);
+        },
+        onMouseLeave: function onMouseLeave() {
+          return setHoveredRowIndex(null);
+        }
+      };
     }
   }));
 };
@@ -19037,29 +19108,6 @@ var getBsE3ReissueGoodColumns = function getBsE3ReissueGoodColumns(_ref4) {
   });
 };
 
-function HoverTableRowDeleteIcon(_ref) {
-  var index = _ref.index,
-    hoveredRowIndex = _ref.hoveredRowIndex,
-    handleClick = _ref.handleClick;
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("span", {
-    style: {
-      display: hoveredRowIndex === index ? 'none' : 'inline'
-    }
-  }, index + 1), /*#__PURE__*/React__default['default'].createElement("span", {
-    style: {
-      cursor: 'pointer'
-    },
-    onClick: handleClick,
-    title: "\u5220\u9664"
-  }, /*#__PURE__*/React__default['default'].createElement(icons.MinusCircleFilled, {
-    style: {
-      fontSize: 18,
-      color: '#1890ff',
-      display: hoveredRowIndex === index ? 'inline' : 'none'
-    }
-  })));
-}
-
 var isErpType = {
   isWdt: function isWdt(type) {
     return ['WDT_REISSUE_GOODS', 'WDT_GOODS', 'WDT_EXCHANGE_GOODS'].includes(type);

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

@@ -26,6 +26,7 @@ type SubFormProps = {
     disabled: boolean;
     platform: string;
     maxCount?: number;
+    manual?: boolean;
 };
 declare const SubForm: (props: SubFormProps) => React.JSX.Element;
 export default SubForm;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.0.79-beta.60",
+  "version": "2.0.79-beta.62",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0f294f5f72f0150cdfa41ad70b34446d1a7c37b0"
+  "gitHead": "cc2d4b6d70bf4cfafa78720cf3ff3bb7f861de63"
 }