@bit-sun/business-component 2.0.33 → 2.0.34

package/dist/index.esm.js

@@ -4827,7 +4827,13 @@ var InputElement = function InputElement(_ref) {
 };
 
 var BillEntry = function BillEntry(_ref3) {
-  var onSaveCallback = _ref3.onSaveCallback;
+  var onSaveCallback = _ref3.onSaveCallback,
+      _ref3$validDataUrl = _ref3.validDataUrl,
+      validDataUrl = _ref3$validDataUrl === void 0 ? "/items/sku/import/check" : _ref3$validDataUrl,
+      _ref3$isBrandAuth = _ref3.isBrandAuth,
+      isBrandAuth = _ref3$isBrandAuth === void 0 ? true : _ref3$isBrandAuth,
+      _ref3$isCheckStockNum = _ref3.isCheckStockNum,
+      isCheckStockNum = _ref3$isCheckStockNum === void 0 ? true : _ref3$isCheckStockNum;
   var columns = [{
     title: 'SKU编码',
     width: 150,
@@ -4909,6 +4915,11 @@ var BillEntry = function BillEntry(_ref3) {
 
   var tableRef = useRef(null);
 
+  var _useState13 = useState(false),
+      _useState14 = _slicedToArray(_useState13, 2),
+      loading = _useState14[0],
+      setLoading = _useState14[1];
+
   var callSelectItem = function callSelectItem(index, item) {
     var _tableRef$current2;
 
@@ -4983,6 +4994,136 @@ var BillEntry = function BillEntry(_ref3) {
       }
     }
   }]);
+
+  var isSkuCanEntry = function isSkuCanEntry(resultData) {
+    // 处理业务参数
+    var otherParams = {};
+
+    if (isBrandAuth) {
+      otherParams = {
+        brandAuth: 'ctl-withAuth'
+      };
+    }
+
+    return axios.post(validDataUrl, _objectSpread2(_objectSpread2({}, otherParams), {}, {
+      columns: ["skuCode", "quantity"],
+      data: resultData.map(function (i) {
+        return {
+          skuCode: i.skuCode,
+          quality: i.count
+        };
+      }),
+      checkStockNum: isCheckStockNum
+    })).then(function (result) {
+      result = result.data;
+
+      if (result.status !== '0') {
+        message.error(result.msg);
+        return {
+          flag: false
+        };
+      } else {
+        var res = result.data || [];
+        var errorList = res.filter(function (i) {
+          return !i.flag;
+        });
+        return {
+          flag: !(errorList === null || errorList === void 0 ? void 0 : errorList.length),
+          errorList: errorList
+        };
+      }
+    }).catch(function () {
+      return {
+        flag: false
+      };
+    });
+  };
+
+  var handleSubmit = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var canEntryObject, _canEntryObject$error, messageInfo;
+
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (data === null || data === void 0 ? void 0 : data.length) {
+                _context.next = 3;
+                break;
+              }
+
+              message.warning('至少录入一条数据');
+              return _context.abrupt("return");
+
+            case 3:
+              if (data === null || data === void 0 ? void 0 : data.every(function (d) {
+                return d.skuCode && d.name;
+              })) {
+                _context.next = 6;
+                break;
+              }
+
+              message.warning('请选择商品！');
+              return _context.abrupt("return");
+
+            case 6:
+              if (data === null || data === void 0 ? void 0 : data.every(function (d) {
+                return d.count;
+              })) {
+                _context.next = 9;
+                break;
+              }
+
+              message.warning('请填写商品数量！');
+              return _context.abrupt("return");
+
+            case 9:
+              _context.next = 11;
+              return isSkuCanEntry(data);
+
+            case 11:
+              canEntryObject = _context.sent;
+
+              if (!((canEntryObject === null || canEntryObject === void 0 ? void 0 : canEntryObject.flag) === false)) {
+                _context.next = 16;
+                break;
+              }
+
+              messageInfo = (canEntryObject === null || canEntryObject === void 0 ? void 0 : (_canEntryObject$error = canEntryObject.errorList) === null || _canEntryObject$error === void 0 ? void 0 : _canEntryObject$error.length) && (canEntryObject === null || canEntryObject === void 0 ? void 0 : canEntryObject.errorList.map(function (i) {
+                return /*#__PURE__*/React.createElement("div", null, i.skuCode, "\u6821\u9A8C\u5931\u8D25\uFF1A", i.checkResults);
+              }));
+              messageInfo && message.warning({
+                content: messageInfo,
+                duration: 6
+              });
+              return _context.abrupt("return");
+
+            case 16:
+              setLoading(true);
+              onSaveCallback(data).then(function (res) {
+                {
+                  message.success('保存成功');
+                }
+
+                setLoading(false);
+              }).catch(function (Error) {
+                message.error(Error);
+                setLoading(false);
+              });
+
+            case 18:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function handleSubmit() {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+
   return /*#__PURE__*/React.createElement("div", {
     className: 'add_select'
   }, /*#__PURE__*/React.createElement("div", {
@@ -4992,8 +5133,9 @@ var BillEntry = function BillEntry(_ref3) {
   }, /*#__PURE__*/React.createElement("div", null, "\u5FEB\u901F\u5F55\u5165"), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: function onClick() {
-      onSaveCallback(data);
-    }
+      return handleSubmit();
+    },
+    loading: loading
   }, "\u63D0\u4EA4")), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("span", null, "*"), " \xA0\u5FEB\u6377\u952E\uFF1A\u3010Tab\u3011-\u8DF3\u683C\u5207\u6362\uFF1B\u3010Shift+\u2190\u3001\u2192\u3011-\u5F53\u524D\u884C\u5DE6\u3001\u53F3\u79FB\u52A8\uFF1B\u3010  \u2191\u3001\u2193\u3011-\u5F53\u524D\u5217\u4E0A\u3001\u4E0B\u79FB\u52A8\uFF1B\u3010ctrl+Delete\u3011-\u5220\u9664\u5F53\u524D\u884C\uFF1B")), /*#__PURE__*/React.createElement("div", {
     className: 'add_select_wrapper_select add_select_wrapper_select_quick'
   }, /*#__PURE__*/React.createElement(Table, _defineProperty({

package/dist/index.js

@@ -4837,7 +4837,13 @@ var InputElement = function InputElement(_ref) {
 };
 
 var BillEntry = function BillEntry(_ref3) {
-  var onSaveCallback = _ref3.onSaveCallback;
+  var onSaveCallback = _ref3.onSaveCallback,
+      _ref3$validDataUrl = _ref3.validDataUrl,
+      validDataUrl = _ref3$validDataUrl === void 0 ? "/items/sku/import/check" : _ref3$validDataUrl,
+      _ref3$isBrandAuth = _ref3.isBrandAuth,
+      isBrandAuth = _ref3$isBrandAuth === void 0 ? true : _ref3$isBrandAuth,
+      _ref3$isCheckStockNum = _ref3.isCheckStockNum,
+      isCheckStockNum = _ref3$isCheckStockNum === void 0 ? true : _ref3$isCheckStockNum;
   var columns = [{
     title: 'SKU编码',
     width: 150,
@@ -4919,6 +4925,11 @@ var BillEntry = function BillEntry(_ref3) {
 
   var tableRef = React.useRef(null);
 
+  var _useState13 = React.useState(false),
+      _useState14 = _slicedToArray(_useState13, 2),
+      loading = _useState14[0],
+      setLoading = _useState14[1];
+
   var callSelectItem = function callSelectItem(index, item) {
     var _tableRef$current2;
 
@@ -4993,6 +5004,136 @@ var BillEntry = function BillEntry(_ref3) {
       }
     }
   }]);
+
+  var isSkuCanEntry = function isSkuCanEntry(resultData) {
+    // 处理业务参数
+    var otherParams = {};
+
+    if (isBrandAuth) {
+      otherParams = {
+        brandAuth: 'ctl-withAuth'
+      };
+    }
+
+    return axios__default['default'].post(validDataUrl, _objectSpread2(_objectSpread2({}, otherParams), {}, {
+      columns: ["skuCode", "quantity"],
+      data: resultData.map(function (i) {
+        return {
+          skuCode: i.skuCode,
+          quality: i.count
+        };
+      }),
+      checkStockNum: isCheckStockNum
+    })).then(function (result) {
+      result = result.data;
+
+      if (result.status !== '0') {
+        antd.message.error(result.msg);
+        return {
+          flag: false
+        };
+      } else {
+        var res = result.data || [];
+        var errorList = res.filter(function (i) {
+          return !i.flag;
+        });
+        return {
+          flag: !(errorList === null || errorList === void 0 ? void 0 : errorList.length),
+          errorList: errorList
+        };
+      }
+    }).catch(function () {
+      return {
+        flag: false
+      };
+    });
+  };
+
+  var handleSubmit = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var canEntryObject, _canEntryObject$error, messageInfo;
+
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (data === null || data === void 0 ? void 0 : data.length) {
+                _context.next = 3;
+                break;
+              }
+
+              antd.message.warning('至少录入一条数据');
+              return _context.abrupt("return");
+
+            case 3:
+              if (data === null || data === void 0 ? void 0 : data.every(function (d) {
+                return d.skuCode && d.name;
+              })) {
+                _context.next = 6;
+                break;
+              }
+
+              antd.message.warning('请选择商品！');
+              return _context.abrupt("return");
+
+            case 6:
+              if (data === null || data === void 0 ? void 0 : data.every(function (d) {
+                return d.count;
+              })) {
+                _context.next = 9;
+                break;
+              }
+
+              antd.message.warning('请填写商品数量！');
+              return _context.abrupt("return");
+
+            case 9:
+              _context.next = 11;
+              return isSkuCanEntry(data);
+
+            case 11:
+              canEntryObject = _context.sent;
+
+              if (!((canEntryObject === null || canEntryObject === void 0 ? void 0 : canEntryObject.flag) === false)) {
+                _context.next = 16;
+                break;
+              }
+
+              messageInfo = (canEntryObject === null || canEntryObject === void 0 ? void 0 : (_canEntryObject$error = canEntryObject.errorList) === null || _canEntryObject$error === void 0 ? void 0 : _canEntryObject$error.length) && (canEntryObject === null || canEntryObject === void 0 ? void 0 : canEntryObject.errorList.map(function (i) {
+                return /*#__PURE__*/React__default['default'].createElement("div", null, i.skuCode, "\u6821\u9A8C\u5931\u8D25\uFF1A", i.checkResults);
+              }));
+              messageInfo && antd.message.warning({
+                content: messageInfo,
+                duration: 6
+              });
+              return _context.abrupt("return");
+
+            case 16:
+              setLoading(true);
+              onSaveCallback(data).then(function (res) {
+                {
+                  antd.message.success('保存成功');
+                }
+
+                setLoading(false);
+              }).catch(function (Error) {
+                antd.message.error(Error);
+                setLoading(false);
+              });
+
+            case 18:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function handleSubmit() {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'add_select'
   }, /*#__PURE__*/React__default['default'].createElement("div", {
@@ -5002,8 +5143,9 @@ var BillEntry = function BillEntry(_ref3) {
   }, /*#__PURE__*/React__default['default'].createElement("div", null, "\u5FEB\u901F\u5F55\u5165"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "primary",
     onClick: function onClick() {
-      onSaveCallback(data);
-    }
+      return handleSubmit();
+    },
+    loading: loading
   }, "\u63D0\u4EA4")), /*#__PURE__*/React__default['default'].createElement("span", null, /*#__PURE__*/React__default['default'].createElement("span", null, "*"), " \xA0\u5FEB\u6377\u952E\uFF1A\u3010Tab\u3011-\u8DF3\u683C\u5207\u6362\uFF1B\u3010Shift+\u2190\u3001\u2192\u3011-\u5F53\u524D\u884C\u5DE6\u3001\u53F3\u79FB\u52A8\uFF1B\u3010  \u2191\u3001\u2193\u3011-\u5F53\u524D\u5217\u4E0A\u3001\u4E0B\u79FB\u52A8\uFF1B\u3010ctrl+Delete\u3011-\u5220\u9664\u5F53\u524D\u884C\uFF1B")), /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'add_select_wrapper_select add_select_wrapper_select_quick'
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _defineProperty({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -28,7 +28,8 @@
   },
   "peerDependencies": {
     "bssula": "^2.0.0",
-    "umi-plugin-bssula": "1.0.13"
+    "umi-plugin-bssula": "1.0.13",
+    "umi": "^3.5.20"
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -41,6 +42,8 @@
     "bssula": "^2.0.0",
     "classnames": "^2.3.1",
     "lodash": "^4.17.21",
+    "memoize-one": "^6.0.0",
+    "path-to-regexp": "^6.2.1",
     "querystring": "^0.2.1",
     "react": "^16.12.0",
     "react-beautiful-dnd": "10.0.0",

package/src/components/Functional/BillEntry/index.md

@@ -26,6 +26,8 @@ export default () => {
       <BillEntry
         onSaveCallback={(rows) => {
           console.log(rows)
+          return Promise.resolve(true);
+          // return Promise.reject('FAILE')
         }}
       />
       <div style={{height: '1000px'}}></div>

package/src/components/Functional/BillEntry/index.tsx

@@ -390,7 +390,7 @@ const InputElement = ({
   )
 }
 
-const BillEntry: React.FC = ({ onSaveCallback }) => {
+const BillEntry: React.FC = ({ onSaveCallback, validDataUrl="/items/sku/import/check", isBrandAuth=true, isCheckStockNum=true }) => {
   const columns = [
     {
       title: 'SKU编码',
@@ -464,6 +464,8 @@ const BillEntry: React.FC = ({ onSaveCallback }) => {
   const [data, setData] = useState([{ hovered: false }]);
   const tableRef = useRef(null)
 
+  const [loading, setLoading] = useState(false);
+
   const callSelectItem = (index, item) => {
     if (item) {
       let newData = [].concat(data)
@@ -516,13 +518,71 @@ const BillEntry: React.FC = ({ onSaveCallback }) => {
     }
   }]
 
+  const isSkuCanEntry = (resultData) => {
+    // 处理业务参数
+    let otherParams={}
+    if(isBrandAuth){
+      otherParams = { brandAuth: 'ctl-withAuth' }
+    }
+    return axios
+      .post(validDataUrl, {
+        ...otherParams,
+        columns: ["skuCode", "quantity"],
+        data: resultData.map((i:any) => ({ skuCode: i.skuCode, quality: i.count })),
+        checkStockNum: isCheckStockNum,
+      })
+      .then((result) => {
+        result = result.data;
+        if (result.status !== '0') {
+          message.error(result.msg);
+          return { flag: false }
+        } else {
+          let res = result.data || [];
+          const errorList = res.filter((i: any) => !i.flag);
+          return  { flag: !errorList?.length, errorList }
+        }
+      }).catch(() => {
+        return { flag:false }
+      })
+  }
+
+  const handleSubmit = async () => {
+    // 加校验逻辑
+    if (!data?.length) {
+      message.warning('至少录入一条数据');
+      return;
+    }
+    if (!data?.every((d: any) => d.skuCode && d.name)) {
+      message.warning('请选择商品！');
+      return;
+    }
+    if (!data?.every((d: any) => d.count)) {
+      message.warning('请填写商品数量！');
+      return;
+    }
+    const canEntryObject = await isSkuCanEntry(data)
+    if(canEntryObject?.flag === false) {
+      const messageInfo = canEntryObject?.errorList?.length && canEntryObject?.errorList.map((i: any) => <div>{i.skuCode}校验失败：{i.checkResults}</div>)
+        messageInfo && message.warning({ content: messageInfo, duration: 6 });
+      return;
+    }
+
+    setLoading(true)
+    onSaveCallback(data).then(res => {
+      if(true) {
+        message.success('保存成功')
+      }
+      setLoading(false)
+    }).catch(Error => {
+      message.error(Error);
+      setLoading(false)
+    })
+  }
 
   return (
       <div className='add_select'>
         <div className='add_select_quick_header'>
-          <div className='add_select_quick_header_title'><div>快速录入</div><Button type="primary" onClick={() => {
-            onSaveCallback(data)
-           }}>提交</Button></div>
+          <div className='add_select_quick_header_title'><div>快速录入</div><Button type="primary" onClick={() => handleSubmit()} loading={loading}>提交</Button></div>
           <span><span>*</span> &nbsp;快捷键：【Tab】-跳格切换；【Shift+←、→】-当前行左、右移动；【  ↑、↓】-当前列上、下移动；【ctrl+Delete】-删除当前行；</span>
         </div>
         <div className={'add_select_wrapper_select add_select_wrapper_select_quick'}>