@kmkf-fe-packages/basic-components 0.7.15-alpha.42 → 0.7.15-alpha.46

package/dist/index.esm.js

@@ -9354,6 +9354,10 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
             trajectoryCompany: newCompany
           }));
         } else {
+          onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+            trajectorySnapshot: '',
+            trajectoryCompany: newCompany
+          }));
           msg && message.error(msg);
         }
       });
@@ -9623,8 +9627,8 @@ var columns = [{
   dataIndex: '',
   title: '序号',
   width: 100,
-  render: function render(value, record, index) {
-    return /*#__PURE__*/React.createElement("span", null, index);
+  render: function render(val, record, index) {
+    return /*#__PURE__*/React.createElement("span", null, index + 1);
   }
 }, {
   dataIndex: 'name',
@@ -9633,7 +9637,7 @@ var columns = [{
   dataIndex: 'goodsId',
   title: '商品id'
 }, {
-  dataIndex: 'name',
+  dataIndex: 'skuName',
   title: '商品sku名称'
 }, {
   dataIndex: 'code',
@@ -9695,88 +9699,38 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     _useState18 = _slicedToArray(_useState17, 2),
     loading = _useState18[0],
     setLoading = _useState18[1];
-  var _useState19 = useState({
-      apiName: 'queryItems',
-      desc: true,
-      numIids: '',
-      orderBy: 'list_time',
-      pageNo: 1,
-      pageSize: 10,
-      shopId: shopId,
-      type: 'onSale',
-      cids: '',
-      title: ''
-    }),
+  var _useState19 = useState(0),
     _useState20 = _slicedToArray(_useState19, 2),
-    searchParams = _useState20[0],
-    setSearch = _useState20[1];
-  var _useState21 = useState(0),
+    total = _useState20[0],
+    setTotal = _useState20[1];
+  var _useState21 = useState(''),
     _useState22 = _slicedToArray(_useState21, 2),
-    total = _useState22[0],
-    setTotal = _useState22[1];
-  var _useState23 = useState(''),
+    platform = _useState22[0],
+    setPlatform = _useState22[1]; //平台 taobao=淘宝 fxg=抖音 pdd=拼多多 sph=微信视屏号
+  var _useState23 = useState({}),
     _useState24 = _slicedToArray(_useState23, 2),
-    platform = _useState24[0],
-    setPlatform = _useState24[1]; //平台 taobao=淘宝 fxg=抖音 pdd=拼多多 sph=微信视屏号
-  var _useState25 = useState({}),
-    _useState26 = _slicedToArray(_useState25, 2),
-    shopInfo = _useState26[0],
-    setShopInfo = _useState26[1]; //店铺信息
+    shopInfo = _useState24[0],
+    setShopInfo = _useState24[1]; //店铺信息
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   //选择页码
   var pageChange = function pageChange(page) {
     setPageNo(page);
-    setGoodList(allList.splice((page - 1) * pageSize, pageSize));
+    setGoodList(_toConsumableArray(filterList).splice((page - 1) * pageSize, pageSize));
   };
-  /**
-   * 查询商品
-   */
-  // const queryItems = useCallback(async () => {
-  //   try {
-  //     setLoading(true);
-  //     const params: any = {
-  //       ...queryPd(),
-  //     };
-  //     params.shopName = shopInfo?.shopName;
-  //     params.platform = platform;
-  //     params.status = params.type === 'onSale' ? 1 : 0;
-  //     delete params.type;
-  //     const res = await request('/qy/gdfw/product/listProduct', {
-  //       method: 'post',
-  //       data: params,
-  //     });
-  //     const {
-  //       result: list,
-  //       total,
-  //       nextKey,
-  //     } = res.data || { result: [], total: 0 };
-  //     const newList = list || [];
-  //     newList.forEach((item: any) => {
-  //       item.numIid = item.productId;
-  //       item.outerId = item.outId;
-  //       item.title = item.productName;
-  //       item.platform = platform;
-  //     });
-  //     setGoodList(newList);
-  //     setTotal(total);
-  //   } finally {
-  //     setLoading(false);
-  //   }
-  // }, [searchParams]);
   /**
    * 查询商品
    */
   var queryItems = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var params, res, products;
+    var params, res, products, newProducts;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.prev = 0;
           setLoading(true);
           params = {
-            shopCode: shopCode
+            shopCode: shopCode || 'DP015'
           };
           _context.next = 5;
           return extendRequest('/qy/gdfw/product/bsListProduct', {
@@ -9786,20 +9740,22 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
         case 5:
           res = _context.sent;
           products = res.data.products;
-          console.log(products.length);
-          setAllList(_toConsumableArray(products));
-          setFilterList(_toConsumableArray(products));
-          setGoodList(products.splice(0, pageSize));
-          setTotal(products.length);
-        case 12:
-          _context.prev = 12;
+          newProducts = products.map(function (item, index) {
+            return _objectSpread2(_objectSpread2({}, item), {}, {
+              index: index + 1
+            });
+          });
+          setAllList(_toConsumableArray(newProducts));
+          initData(_toConsumableArray(newProducts));
+        case 10:
+          _context.prev = 10;
           setLoading(false);
-          return _context.finish(12);
-        case 15:
+          return _context.finish(10);
+        case 13:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0,, 12, 15]]);
+    }, _callee, null, [[0,, 10, 13]]);
   })), [shopCode]);
   useEffect(function () {
     var shopInfo = shopList.find(function (item) {
@@ -9817,6 +9773,12 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
       setSelect(_toConsumableArray(selectedRows));
     }
   };
+  var initData = function initData(list) {
+    setFilterList(_toConsumableArray(list));
+    setGoodList(_toConsumableArray(list).splice(0, pageSize));
+    setTotal(list.length);
+    setPageNo(1);
+  };
   var _onCancel = function onCancel() {
     setVisible(false);
   };
@@ -9825,22 +9787,19 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     _onCancel();
   };
   var onFinish = function onFinish(value) {
-    console.log(value);
-    var filterList = allList.filter(function (item) {
-      return Object.keys(value).some(function (key) {
-        return value[key] && item[key].indexOf(value[key]) > -1;
-      });
+    var newFilterList = [];
+    Object.keys(value).forEach(function (key) {
+      if (value[key]) {
+        newFilterList = allList.filter(function (item) {
+          return item[key].indexOf(value[key]) > -1;
+        });
+      }
     });
-    console.log(filterList);
-    setFilterList(filterList);
-    setTotal(filterList.length);
-    setPageNo(1);
+    initData(newFilterList);
   };
   var onReset = function onReset() {
     form.resetFields();
-    setFilterList(allList);
-    setTotal(allList.length);
-    setPageNo(1);
+    initData(_toConsumableArray(allList));
   };
   return /*#__PURE__*/React.createElement(Modal, {
     title: '选择商品',
@@ -9858,15 +9817,15 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     form: form,
     onFinish: onFinish
   }, /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodsName"
+    name: "name"
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u8BF7\u8F93\u5165\u5546\u54C1\u540D\u79F0"
   })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodsCode"
+    name: "code"
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u8BF7\u8F93\u5165\u5546\u54C1\u7F16\u7801"
   })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "code"
+    name: "skuCode"
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u8BF7\u8F93\u5165\u5546\u54C1sku\u7F16\u7801"
   })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Button, {
@@ -10052,16 +10011,14 @@ var GoodItem = function GoodItem(props) {
   }, [showHeader, value, disabled]);
   var onSubmit = function onSubmit(list) {
     var newList = list.map(function (item) {
-      var id = item.id,
-        goodsName = item.goodsName,
-        goodsId = item.goodsId,
+      var goodsId = item.goodsId,
         name = item.name,
         code = item.code,
         skuCode = item.skuCode;
       return {
         id: goodsId,
         pic: '',
-        name: goodsName,
+        name: name,
         code: code,
         sku: skuCode,
         money: '',

package/dist/index.js

@@ -9365,6 +9365,10 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
             trajectoryCompany: newCompany
           }));
         } else {
+          onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+            trajectorySnapshot: '',
+            trajectoryCompany: newCompany
+          }));
           msg && antd.message.error(msg);
         }
       });
@@ -9634,8 +9638,8 @@ var columns = [{
   dataIndex: '',
   title: '序号',
   width: 100,
-  render: function render(value, record, index) {
-    return /*#__PURE__*/React__default['default'].createElement("span", null, index);
+  render: function render(val, record, index) {
+    return /*#__PURE__*/React__default['default'].createElement("span", null, index + 1);
   }
 }, {
   dataIndex: 'name',
@@ -9644,7 +9648,7 @@ var columns = [{
   dataIndex: 'goodsId',
   title: '商品id'
 }, {
-  dataIndex: 'name',
+  dataIndex: 'skuName',
   title: '商品sku名称'
 }, {
   dataIndex: 'code',
@@ -9706,88 +9710,38 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     _useState18 = _slicedToArray(_useState17, 2),
     loading = _useState18[0],
     setLoading = _useState18[1];
-  var _useState19 = React.useState({
-      apiName: 'queryItems',
-      desc: true,
-      numIids: '',
-      orderBy: 'list_time',
-      pageNo: 1,
-      pageSize: 10,
-      shopId: shopId,
-      type: 'onSale',
-      cids: '',
-      title: ''
-    }),
+  var _useState19 = React.useState(0),
     _useState20 = _slicedToArray(_useState19, 2),
-    searchParams = _useState20[0],
-    setSearch = _useState20[1];
-  var _useState21 = React.useState(0),
+    total = _useState20[0],
+    setTotal = _useState20[1];
+  var _useState21 = React.useState(''),
     _useState22 = _slicedToArray(_useState21, 2),
-    total = _useState22[0],
-    setTotal = _useState22[1];
-  var _useState23 = React.useState(''),
+    platform = _useState22[0],
+    setPlatform = _useState22[1]; //平台 taobao=淘宝 fxg=抖音 pdd=拼多多 sph=微信视屏号
+  var _useState23 = React.useState({}),
     _useState24 = _slicedToArray(_useState23, 2),
-    platform = _useState24[0],
-    setPlatform = _useState24[1]; //平台 taobao=淘宝 fxg=抖音 pdd=拼多多 sph=微信视屏号
-  var _useState25 = React.useState({}),
-    _useState26 = _slicedToArray(_useState25, 2),
-    shopInfo = _useState26[0],
-    setShopInfo = _useState26[1]; //店铺信息
+    shopInfo = _useState24[0],
+    setShopInfo = _useState24[1]; //店铺信息
   var _Form$useForm = antd.Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   //选择页码
   var pageChange = function pageChange(page) {
     setPageNo(page);
-    setGoodList(allList.splice((page - 1) * pageSize, pageSize));
+    setGoodList(_toConsumableArray(filterList).splice((page - 1) * pageSize, pageSize));
   };
-  /**
-   * 查询商品
-   */
-  // const queryItems = useCallback(async () => {
-  //   try {
-  //     setLoading(true);
-  //     const params: any = {
-  //       ...queryPd(),
-  //     };
-  //     params.shopName = shopInfo?.shopName;
-  //     params.platform = platform;
-  //     params.status = params.type === 'onSale' ? 1 : 0;
-  //     delete params.type;
-  //     const res = await request('/qy/gdfw/product/listProduct', {
-  //       method: 'post',
-  //       data: params,
-  //     });
-  //     const {
-  //       result: list,
-  //       total,
-  //       nextKey,
-  //     } = res.data || { result: [], total: 0 };
-  //     const newList = list || [];
-  //     newList.forEach((item: any) => {
-  //       item.numIid = item.productId;
-  //       item.outerId = item.outId;
-  //       item.title = item.productName;
-  //       item.platform = platform;
-  //     });
-  //     setGoodList(newList);
-  //     setTotal(total);
-  //   } finally {
-  //     setLoading(false);
-  //   }
-  // }, [searchParams]);
   /**
    * 查询商品
    */
   var queryItems = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var params, res, products;
+    var params, res, products, newProducts;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.prev = 0;
           setLoading(true);
           params = {
-            shopCode: shopCode
+            shopCode: shopCode || 'DP015'
           };
           _context.next = 5;
           return extendRequest('/qy/gdfw/product/bsListProduct', {
@@ -9797,20 +9751,22 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
         case 5:
           res = _context.sent;
           products = res.data.products;
-          console.log(products.length);
-          setAllList(_toConsumableArray(products));
-          setFilterList(_toConsumableArray(products));
-          setGoodList(products.splice(0, pageSize));
-          setTotal(products.length);
-        case 12:
-          _context.prev = 12;
+          newProducts = products.map(function (item, index) {
+            return _objectSpread2(_objectSpread2({}, item), {}, {
+              index: index + 1
+            });
+          });
+          setAllList(_toConsumableArray(newProducts));
+          initData(_toConsumableArray(newProducts));
+        case 10:
+          _context.prev = 10;
           setLoading(false);
-          return _context.finish(12);
-        case 15:
+          return _context.finish(10);
+        case 13:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0,, 12, 15]]);
+    }, _callee, null, [[0,, 10, 13]]);
   })), [shopCode]);
   React.useEffect(function () {
     var shopInfo = shopList.find(function (item) {
@@ -9828,6 +9784,12 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
       setSelect(_toConsumableArray(selectedRows));
     }
   };
+  var initData = function initData(list) {
+    setFilterList(_toConsumableArray(list));
+    setGoodList(_toConsumableArray(list).splice(0, pageSize));
+    setTotal(list.length);
+    setPageNo(1);
+  };
   var _onCancel = function onCancel() {
     setVisible(false);
   };
@@ -9836,22 +9798,19 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     _onCancel();
   };
   var onFinish = function onFinish(value) {
-    console.log(value);
-    var filterList = allList.filter(function (item) {
-      return Object.keys(value).some(function (key) {
-        return value[key] && item[key].indexOf(value[key]) > -1;
-      });
+    var newFilterList = [];
+    Object.keys(value).forEach(function (key) {
+      if (value[key]) {
+        newFilterList = allList.filter(function (item) {
+          return item[key].indexOf(value[key]) > -1;
+        });
+      }
     });
-    console.log(filterList);
-    setFilterList(filterList);
-    setTotal(filterList.length);
-    setPageNo(1);
+    initData(newFilterList);
   };
   var onReset = function onReset() {
     form.resetFields();
-    setFilterList(allList);
-    setTotal(allList.length);
-    setPageNo(1);
+    initData(_toConsumableArray(allList));
   };
   return /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
     title: '选择商品',
@@ -9869,15 +9828,15 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     form: form,
     onFinish: onFinish
   }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodsName"
+    name: "name"
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     placeholder: "\u8BF7\u8F93\u5165\u5546\u54C1\u540D\u79F0"
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodsCode"
+    name: "code"
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     placeholder: "\u8BF7\u8F93\u5165\u5546\u54C1\u7F16\u7801"
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "code"
+    name: "skuCode"
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     placeholder: "\u8BF7\u8F93\u5165\u5546\u54C1sku\u7F16\u7801"
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
@@ -10063,16 +10022,14 @@ var GoodItem = function GoodItem(props) {
   }, [showHeader, value, disabled]);
   var onSubmit = function onSubmit(list) {
     var newList = list.map(function (item) {
-      var id = item.id,
-        goodsName = item.goodsName,
-        goodsId = item.goodsId,
+      var goodsId = item.goodsId,
         name = item.name,
         code = item.code,
         skuCode = item.skuCode;
       return {
         id: goodsId,
         pic: '',
-        name: goodsName,
+        name: name,
         code: code,
         sku: skuCode,
         money: '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.7.15-alpha.42",
+  "version": "0.7.15-alpha.46",
   "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.42",
+    "@kmkf-fe-packages/kmkf-utils": "^0.7.15-alpha.46",
     "lodash": "^4.17.21",
     "pubsub-js": "^1.9.4",
     "umi-request": "^1.4.0"
@@ -58,5 +58,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "76ad2144cdbee64aaa196879a8d3553015700999"
+  "gitHead": "e29ac507f8d6b7bcd4a5859d190c1e8a0f4a9614"
 }