@kmkf-fe-packages/basic-components 0.23.1-beta.16 → 0.23.1-beta.17

package/dist/index.esm.js

@@ -10765,6 +10765,8 @@ var expandedColumns = [{
 }];
 var dateFormat = 'YYYY-MM-DD HH:mm:ss';
 var GoodsModal$3 = function GoodsModal(props, ref) {
+  var initStartTime = hooks().subtract(1, 'M');
+  var initEndTime = hooks();
   useImperativeHandle(ref, function () {
     return {
       open: function open(shopCode) {
@@ -10772,14 +10774,15 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
         setPageNo(1);
         setSelect([]);
         setSelectIds([]);
-        queryItems(shopCode);
+        form.setFieldsValue({
+          dateTimePicker: [initStartTime, initEndTime],
+          code: ''
+        });
         // getShopList();
       }
     };
   });
 
-  var initStartTime = hooks().subtract(1, 'M').format(dateFormat);
-  var initEndTime = hooks().format(dateFormat);
   var onSubmit = props.onSubmit,
     shopId = props.shopId,
     shopList = props.shopList,
@@ -10816,14 +10819,6 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     _useState16 = _slicedToArray(_useState15, 2),
     total = _useState16[0],
     setTotal = _useState16[1];
-  var _useState17 = useState(initStartTime),
-    _useState18 = _slicedToArray(_useState17, 2),
-    startTime = _useState18[0],
-    setStartTime = _useState18[1];
-  var _useState19 = useState(initEndTime),
-    _useState20 = _slicedToArray(_useState19, 2),
-    endTime = _useState20[0],
-    setEndTime = _useState20[1];
   var displaySelectList = useMemo(function () {
     return selectList.map(function (item, i) {
       item.index = i + 1;
@@ -10831,8 +10826,10 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     });
   }, [selectList]);
   useEffect(function () {
-    queryItems();
-  }, [pageNo]);
+    if (visible) {
+      queryItems();
+    }
+  }, [pageNo, visible]);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -10846,6 +10843,15 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
   var queryItems = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var search,
+        _formData$dateTimePic,
+        _formData$dateTimePic2,
+        _formData$dateTimePic3,
+        _formData$dateTimePic4,
+        _formData$dateTimePic5,
+        _formData$dateTimePic6,
+        formData,
+        startTime,
+        endTime,
         params,
         res,
         _res$data,
@@ -10853,6 +10859,7 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
         productList,
         _res$data$total,
         _total,
+        errorMsg,
         newProducts,
         _args = arguments;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -10861,6 +10868,9 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
             search = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
             _context.prev = 1;
             setLoading(true);
+            formData = form.getFieldsValue();
+            startTime = ((_formData$dateTimePic = formData.dateTimePicker) === null || _formData$dateTimePic === void 0 ? void 0 : (_formData$dateTimePic2 = _formData$dateTimePic[0]) === null || _formData$dateTimePic2 === void 0 ? void 0 : (_formData$dateTimePic3 = _formData$dateTimePic2.format) === null || _formData$dateTimePic3 === void 0 ? void 0 : _formData$dateTimePic3.call(_formData$dateTimePic2, dateFormat)) || hooks().subtract(1, 'M').format(dateFormat);
+            endTime = ((_formData$dateTimePic4 = formData.dateTimePicker) === null || _formData$dateTimePic4 === void 0 ? void 0 : (_formData$dateTimePic5 = _formData$dateTimePic4[1]) === null || _formData$dateTimePic5 === void 0 ? void 0 : (_formData$dateTimePic6 = _formData$dateTimePic5.format) === null || _formData$dateTimePic6 === void 0 ? void 0 : _formData$dateTimePic6.call(_formData$dateTimePic5, dateFormat)) || hooks().format(dateFormat);
             params = {
               // shopCode: shopCode,
               pageSize: pageSize,
@@ -10869,15 +10879,15 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
               startTime: startTime,
               endTime: endTime
             };
-            _context.next = 6;
+            _context.next = 9;
             return extendRequest('/qy/gdfw/product/wdtListProduct', {
               method: 'post',
               data: params
             });
-          case 6:
+          case 9:
             res = _context.sent;
+            _res$data = res.data, _res$data$productList = _res$data.productList, productList = _res$data$productList === void 0 ? [] : _res$data$productList, _res$data$total = _res$data.total, _total = _res$data$total === void 0 ? 0 : _res$data$total, errorMsg = _res$data.errorMsg;
             if (res.success) {
-              _res$data = res.data, _res$data$productList = _res$data.productList, productList = _res$data$productList === void 0 ? [] : _res$data$productList, _res$data$total = _res$data.total, _total = _res$data$total === void 0 ? 0 : _res$data$total;
               newProducts = productList.map(function (item, index) {
                 return _objectSpread2(_objectSpread2({}, item), {}, {
                   index: index + 1
@@ -10887,23 +10897,26 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
               if (pageNo === 1) {
                 setTotal(_total);
               }
+            } else {
+              setGoodList([]);
+              setTotal(0);
+              message.error(errorMsg || res.message);
             }
-          case 8:
-            _context.prev = 8;
+          case 12:
+            _context.prev = 12;
             setLoading(false);
-            return _context.finish(8);
-          case 11:
+            return _context.finish(12);
+          case 15:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1,, 8, 11]]);
+      }, _callee, null, [[1,, 12, 15]]);
     }));
     return function queryItems() {
       return _ref.apply(this, arguments);
     };
   }();
   var _onCancel = function onCancel() {
-    onReset();
     setVisible(false);
   };
   var onOk = function onOk() {
@@ -10918,8 +10931,16 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
   };
   var onReset = function onReset() {
     form.resetFields();
-    setPageNo(1);
-    // queryItems()
+    form.setFieldsValue({
+      dateTimePicker: [hooks().subtract(1, 'M'), hooks()],
+      code: ''
+    });
+    setPageNo(function (prev) {
+      if (prev === 1 && visible) {
+        queryItems();
+      }
+      return 1;
+    });
   };
   // const getShopList = async () => {
   //   const { success, data } = await request('/qy/diamond/getConfigInfo', {
@@ -10946,10 +10967,6 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
         shopCode: changedValues.shopId
       });
     }
-    if (Array.isArray(changedValues.dateTimePicker)) {
-      setStartTime(changedValues.dateTimePicker[0].format(dateFormat));
-      setEndTime(changedValues.dateTimePicker[1].format(dateFormat));
-    }
   };
   var handleDelete = function handleDelete(record, index) {
     var newSelectList = selectList.filter(function (item) {
@@ -11045,7 +11062,6 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     onFinish: onFinish,
     onValuesChange: onValuesChange,
     initialValues: {
-      dateTimePicker: [hooks(initStartTime, dateFormat), hooks(initEndTime, dateFormat)],
       code: ''
     }
   }, /*#__PURE__*/React.createElement(Form.Item, {
@@ -11053,7 +11069,7 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
   }, /*#__PURE__*/React.createElement(RangePicker, {
     placeholder: ['开始日期', '结束日期'],
     showTime: true,
-    defaultValue: [hooks(startTime, dateFormat), hooks(endTime, dateFormat)]
+    defaultValue: [hooks(initStartTime.format(dateFormat), dateFormat), hooks(initEndTime.format(dateFormat), dateFormat)]
   })), /*#__PURE__*/React.createElement(Form.Item, {
     name: "code"
   }, /*#__PURE__*/React.createElement(Input, {

package/dist/index.js

@@ -10776,6 +10776,8 @@ var expandedColumns = [{
 }];
 var dateFormat = 'YYYY-MM-DD HH:mm:ss';
 var GoodsModal$3 = function GoodsModal(props, ref) {
+  var initStartTime = hooks().subtract(1, 'M');
+  var initEndTime = hooks();
   React.useImperativeHandle(ref, function () {
     return {
       open: function open(shopCode) {
@@ -10783,14 +10785,15 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
         setPageNo(1);
         setSelect([]);
         setSelectIds([]);
-        queryItems(shopCode);
+        form.setFieldsValue({
+          dateTimePicker: [initStartTime, initEndTime],
+          code: ''
+        });
         // getShopList();
       }
     };
   });
 
-  var initStartTime = hooks().subtract(1, 'M').format(dateFormat);
-  var initEndTime = hooks().format(dateFormat);
   var onSubmit = props.onSubmit,
     shopId = props.shopId,
     shopList = props.shopList,
@@ -10827,14 +10830,6 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     _useState16 = _slicedToArray(_useState15, 2),
     total = _useState16[0],
     setTotal = _useState16[1];
-  var _useState17 = React.useState(initStartTime),
-    _useState18 = _slicedToArray(_useState17, 2),
-    startTime = _useState18[0],
-    setStartTime = _useState18[1];
-  var _useState19 = React.useState(initEndTime),
-    _useState20 = _slicedToArray(_useState19, 2),
-    endTime = _useState20[0],
-    setEndTime = _useState20[1];
   var displaySelectList = React.useMemo(function () {
     return selectList.map(function (item, i) {
       item.index = i + 1;
@@ -10842,8 +10837,10 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     });
   }, [selectList]);
   React.useEffect(function () {
-    queryItems();
-  }, [pageNo]);
+    if (visible) {
+      queryItems();
+    }
+  }, [pageNo, visible]);
   var _Form$useForm = antd.Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -10857,6 +10854,15 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
   var queryItems = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var search,
+        _formData$dateTimePic,
+        _formData$dateTimePic2,
+        _formData$dateTimePic3,
+        _formData$dateTimePic4,
+        _formData$dateTimePic5,
+        _formData$dateTimePic6,
+        formData,
+        startTime,
+        endTime,
         params,
         res,
         _res$data,
@@ -10864,6 +10870,7 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
         productList,
         _res$data$total,
         _total,
+        errorMsg,
         newProducts,
         _args = arguments;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -10872,6 +10879,9 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
             search = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
             _context.prev = 1;
             setLoading(true);
+            formData = form.getFieldsValue();
+            startTime = ((_formData$dateTimePic = formData.dateTimePicker) === null || _formData$dateTimePic === void 0 ? void 0 : (_formData$dateTimePic2 = _formData$dateTimePic[0]) === null || _formData$dateTimePic2 === void 0 ? void 0 : (_formData$dateTimePic3 = _formData$dateTimePic2.format) === null || _formData$dateTimePic3 === void 0 ? void 0 : _formData$dateTimePic3.call(_formData$dateTimePic2, dateFormat)) || hooks().subtract(1, 'M').format(dateFormat);
+            endTime = ((_formData$dateTimePic4 = formData.dateTimePicker) === null || _formData$dateTimePic4 === void 0 ? void 0 : (_formData$dateTimePic5 = _formData$dateTimePic4[1]) === null || _formData$dateTimePic5 === void 0 ? void 0 : (_formData$dateTimePic6 = _formData$dateTimePic5.format) === null || _formData$dateTimePic6 === void 0 ? void 0 : _formData$dateTimePic6.call(_formData$dateTimePic5, dateFormat)) || hooks().format(dateFormat);
             params = {
               // shopCode: shopCode,
               pageSize: pageSize,
@@ -10880,15 +10890,15 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
               startTime: startTime,
               endTime: endTime
             };
-            _context.next = 6;
+            _context.next = 9;
             return extendRequest('/qy/gdfw/product/wdtListProduct', {
               method: 'post',
               data: params
             });
-          case 6:
+          case 9:
             res = _context.sent;
+            _res$data = res.data, _res$data$productList = _res$data.productList, productList = _res$data$productList === void 0 ? [] : _res$data$productList, _res$data$total = _res$data.total, _total = _res$data$total === void 0 ? 0 : _res$data$total, errorMsg = _res$data.errorMsg;
             if (res.success) {
-              _res$data = res.data, _res$data$productList = _res$data.productList, productList = _res$data$productList === void 0 ? [] : _res$data$productList, _res$data$total = _res$data.total, _total = _res$data$total === void 0 ? 0 : _res$data$total;
               newProducts = productList.map(function (item, index) {
                 return _objectSpread2(_objectSpread2({}, item), {}, {
                   index: index + 1
@@ -10898,23 +10908,26 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
               if (pageNo === 1) {
                 setTotal(_total);
               }
+            } else {
+              setGoodList([]);
+              setTotal(0);
+              antd.message.error(errorMsg || res.message);
             }
-          case 8:
-            _context.prev = 8;
+          case 12:
+            _context.prev = 12;
             setLoading(false);
-            return _context.finish(8);
-          case 11:
+            return _context.finish(12);
+          case 15:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1,, 8, 11]]);
+      }, _callee, null, [[1,, 12, 15]]);
     }));
     return function queryItems() {
       return _ref.apply(this, arguments);
     };
   }();
   var _onCancel = function onCancel() {
-    onReset();
     setVisible(false);
   };
   var onOk = function onOk() {
@@ -10929,8 +10942,16 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
   };
   var onReset = function onReset() {
     form.resetFields();
-    setPageNo(1);
-    // queryItems()
+    form.setFieldsValue({
+      dateTimePicker: [hooks().subtract(1, 'M'), hooks()],
+      code: ''
+    });
+    setPageNo(function (prev) {
+      if (prev === 1 && visible) {
+        queryItems();
+      }
+      return 1;
+    });
   };
   // const getShopList = async () => {
   //   const { success, data } = await request('/qy/diamond/getConfigInfo', {
@@ -10957,10 +10978,6 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
         shopCode: changedValues.shopId
       });
     }
-    if (Array.isArray(changedValues.dateTimePicker)) {
-      setStartTime(changedValues.dateTimePicker[0].format(dateFormat));
-      setEndTime(changedValues.dateTimePicker[1].format(dateFormat));
-    }
   };
   var handleDelete = function handleDelete(record, index) {
     var newSelectList = selectList.filter(function (item) {
@@ -11056,7 +11073,6 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     onFinish: onFinish,
     onValuesChange: onValuesChange,
     initialValues: {
-      dateTimePicker: [hooks(initStartTime, dateFormat), hooks(initEndTime, dateFormat)],
       code: ''
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
@@ -11064,7 +11080,7 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
   }, /*#__PURE__*/React__default['default'].createElement(RangePicker, {
     placeholder: ['开始日期', '结束日期'],
     showTime: true,
-    defaultValue: [hooks(startTime, dateFormat), hooks(endTime, dateFormat)]
+    defaultValue: [hooks(initStartTime.format(dateFormat), dateFormat), hooks(initEndTime.format(dateFormat), dateFormat)]
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
     name: "code"
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.23.1-beta.16",
+  "version": "0.23.1-beta.17",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -64,5 +64,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b25d0a7eff9d6692d21f0f554367111c917fd552"
+  "gitHead": "10da0e957795edc5323d4983a28eb1126d9e13ae"
 }