@kmkf-fe-packages/basic-components 0.7.15-alpha.35 → 0.7.15-alpha.38

package/dist/index.esm.js

@@ -9620,36 +9620,49 @@ var ItemList = function ItemList(props) {
 };
 
 var TabPane$1 = Tabs.TabPane;
-var columns = [{
-  dataIndex: 'picUrl',
-  title: '主图',
-  render: function render(val) {
-    return /*#__PURE__*/React.createElement(Image, {
-      width: 60,
-      src: val
-    });
-  }
+var columns = [
+// {
+//   dataIndex: 'picUrl',
+//   title: '主图',
+//   render: (val: string) => {
+//     return <Image width={60} src={val} />;
+//   },
+// },
+{
+  dataIndex: 'code',
+  title: '商品sku编码'
+}, {
+  dataIndex: 'name',
+  title: '商品sku名称'
 }, {
-  dataIndex: 'outerId',
-  title: '款式编码'
+  dataIndex: 'simpleName',
+  title: '简称'
 }, {
-  dataIndex: 'numIid',
+  dataIndex: 'goodsId',
+  title: '商品id'
+}, {
+  dataIndex: 'goodsCode',
   title: '商品编码'
 }, {
-  dataIndex: 'title',
+  dataIndex: 'goodsName',
   title: '商品名称'
 }, {
-  dataIndex: 'skus',
-  title: '颜色及规格'
+  dataIndex: 'status',
+  title: '商品状态'
+}, {
+  dataIndex: 'marketPrice',
+  title: '市场价'
 }];
 var GoodsModal$1 = function GoodsModal(props, ref) {
   useImperativeHandle(ref, function () {
     return {
       open: function open() {
         setVisible(true);
+        setPageNo(1);
         setSelect([]);
         setSelectIds([]);
         queryItems();
+        onReset();
       }
     };
   });
@@ -9671,13 +9684,28 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     setSelectIds = _useState6[1];
   var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    goodList = _useState8[0],
-    setGoodList = _useState8[1];
-  var _useState9 = useState(false),
+    allList = _useState8[0],
+    setAllList = _useState8[1]; //获取到的所有数据
+  var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    loading = _useState10[0],
-    setLoading = _useState10[1];
-  var _useState11 = useState({
+    filterList = _useState10[0],
+    setFilterList = _useState10[1]; //获取到的筛选数据
+  var _useState11 = useState(1),
+    _useState12 = _slicedToArray(_useState11, 2),
+    pageNo = _useState12[0],
+    setPageNo = _useState12[1];
+  var _useState13 = useState(20),
+    _useState14 = _slicedToArray(_useState13, 1),
+    pageSize = _useState14[0];
+  var _useState15 = useState([]),
+    _useState16 = _slicedToArray(_useState15, 2),
+    goodList = _useState16[0],
+    setGoodList = _useState16[1];
+  var _useState17 = useState(false),
+    _useState18 = _slicedToArray(_useState17, 2),
+    loading = _useState18[0],
+    setLoading = _useState18[1];
+  var _useState19 = useState({
       apiName: 'queryItems',
       desc: true,
       numIids: '',
@@ -9689,94 +9717,98 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
       cids: '',
       title: ''
     }),
-    _useState12 = _slicedToArray(_useState11, 2),
-    searchParams = _useState12[0],
-    setSearch = _useState12[1];
-  var _useState13 = useState(0),
-    _useState14 = _slicedToArray(_useState13, 2),
-    total = _useState14[0],
-    setTotal = _useState14[1];
-  var _useState15 = useState(''),
-    _useState16 = _slicedToArray(_useState15, 2),
-    platform = _useState16[0],
-    setPlatform = _useState16[1]; //平台 taobao=淘宝 fxg=抖音 pdd=拼多多 sph=微信视屏号
-  var _useState17 = useState({}),
-    _useState18 = _slicedToArray(_useState17, 2),
-    shopInfo = _useState18[0],
-    setShopInfo = _useState18[1]; //店铺信息
+    _useState20 = _slicedToArray(_useState19, 2),
+    searchParams = _useState20[0],
+    setSearch = _useState20[1];
+  var _useState21 = useState(0),
+    _useState22 = _slicedToArray(_useState21, 2),
+    total = _useState22[0],
+    setTotal = _useState22[1];
+  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]; //店铺信息
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   //选择页码
-  var pageChange = function pageChange(page, pageSize) {
-    setSearch(_objectSpread2(_objectSpread2({}, searchParams), {}, {
-      pageNo: page,
-      pageSize: pageSize
-    }));
+  var pageChange = function pageChange(page) {
+    setPageNo(page);
+    setGoodList(allList.splice((page - 1) * pageSize, pageSize));
   };
   /**
-   *
-   * @returns 获取查询参数
+   * 查询商品
    */
-  var queryPd = function queryPd() {
-    var params = {
-      apiName: 'queryItems',
-      desc: searchParams.desc,
-      productIds: searchParams.numIids,
-      orderBy: searchParams.orderBy,
-      pageNo: searchParams.pageNo,
-      pageSize: searchParams.pageSize,
-      shopId: shopId,
-      type: searchParams.type,
-      title: searchParams.title,
-      cids: searchParams.cids
-    };
-    return params;
-  };
+  // 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, _ref2, list, _total, nextKey, newList;
+    var params, res, products;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.prev = 0;
           setLoading(true);
-          params = _objectSpread2({}, queryPd());
-          params.shopName = shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.shopName;
-          params.platform = platform;
-          params.status = params.type === 'onSale' ? 1 : 0;
-          delete params.type;
-          _context.next = 9;
-          return extendRequest('/qy/gdfw/product/listProduct', {
+          params = {
+            shopCode: ''
+          };
+          _context.next = 5;
+          return extendRequest('/qy/gdfw/product/bsListProduct', {
             method: 'post',
             data: params
           });
-        case 9:
+        case 5:
           res = _context.sent;
-          _ref2 = res.data || {
-            result: [],
-            total: 0
-          }, list = _ref2.result, _total = _ref2.total, nextKey = _ref2.nextKey;
-          newList = list || [];
-          newList.forEach(function (item) {
-            item.numIid = item.productId;
-            item.outerId = item.outId;
-            item.title = item.productName;
-            item.platform = platform;
-          });
-          setGoodList(newList);
-          setTotal(_total);
-        case 15:
-          _context.prev = 15;
+          products = res.data.products;
+          console.log(products.length);
+          setAllList(_toConsumableArray(products));
+          setGoodList(products.splice(0, pageSize));
+          setTotal(products.length);
+        case 11:
+          _context.prev = 11;
           setLoading(false);
-          return _context.finish(15);
-        case 18:
+          return _context.finish(11);
+        case 14:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0,, 15, 18]]);
+    }, _callee, null, [[0,, 11, 14]]);
   })), [searchParams]);
   useEffect(function () {
     var shopInfo = shopList.find(function (item) {
@@ -9803,10 +9835,8 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   };
   var onFinish = function onFinish(value) {
     console.log(value);
-    setSearch(_objectSpread2({}, searchParams));
   };
   var onReset = function onReset() {
-    setSearch(_objectSpread2({}, searchParams));
     form.resetFields();
   };
   return /*#__PURE__*/React.createElement(Modal, {
@@ -9825,15 +9855,11 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     form: form,
     onFinish: onFinish
   }, /*#__PURE__*/React.createElement(Form.Item, {
-    name: "code"
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u6B3E\u5F0F\u7F16\u7801"
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "sku"
+    name: "goodsCode"
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u5546\u54C1\u7F16\u7801"
   })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "name"
+    name: "goodsName"
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u5546\u54C1\u540D\u79F0"
   })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Button, {
@@ -9846,7 +9872,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   }, /*#__PURE__*/React.createElement(Table, {
     rowSelection: rowSelection,
     columns: columns,
-    rowKey: 'numIid',
+    rowKey: 'id',
     dataSource: searchParams.type == 'select' ? selectList : goodList,
     scroll: {
       y: 300
@@ -9854,8 +9880,9 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     pagination: {
       size: 'small',
       total: total,
-      current: searchParams.pageNo,
-      pageSize: searchParams.pageSize,
+      current: pageNo,
+      pageSize: pageSize,
+      pageSizeOptions: [],
       onChange: pageChange
     }
   })));

package/dist/index.js

@@ -9631,36 +9631,49 @@ var ItemList = function ItemList(props) {
 };
 
 var TabPane$1 = antd.Tabs.TabPane;
-var columns = [{
-  dataIndex: 'picUrl',
-  title: '主图',
-  render: function render(val) {
-    return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
-      width: 60,
-      src: val
-    });
-  }
+var columns = [
+// {
+//   dataIndex: 'picUrl',
+//   title: '主图',
+//   render: (val: string) => {
+//     return <Image width={60} src={val} />;
+//   },
+// },
+{
+  dataIndex: 'code',
+  title: '商品sku编码'
+}, {
+  dataIndex: 'name',
+  title: '商品sku名称'
 }, {
-  dataIndex: 'outerId',
-  title: '款式编码'
+  dataIndex: 'simpleName',
+  title: '简称'
 }, {
-  dataIndex: 'numIid',
+  dataIndex: 'goodsId',
+  title: '商品id'
+}, {
+  dataIndex: 'goodsCode',
   title: '商品编码'
 }, {
-  dataIndex: 'title',
+  dataIndex: 'goodsName',
   title: '商品名称'
 }, {
-  dataIndex: 'skus',
-  title: '颜色及规格'
+  dataIndex: 'status',
+  title: '商品状态'
+}, {
+  dataIndex: 'marketPrice',
+  title: '市场价'
 }];
 var GoodsModal$1 = function GoodsModal(props, ref) {
   React.useImperativeHandle(ref, function () {
     return {
       open: function open() {
         setVisible(true);
+        setPageNo(1);
         setSelect([]);
         setSelectIds([]);
         queryItems();
+        onReset();
       }
     };
   });
@@ -9682,13 +9695,28 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     setSelectIds = _useState6[1];
   var _useState7 = React.useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    goodList = _useState8[0],
-    setGoodList = _useState8[1];
-  var _useState9 = React.useState(false),
+    allList = _useState8[0],
+    setAllList = _useState8[1]; //获取到的所有数据
+  var _useState9 = React.useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    loading = _useState10[0],
-    setLoading = _useState10[1];
-  var _useState11 = React.useState({
+    filterList = _useState10[0],
+    setFilterList = _useState10[1]; //获取到的筛选数据
+  var _useState11 = React.useState(1),
+    _useState12 = _slicedToArray(_useState11, 2),
+    pageNo = _useState12[0],
+    setPageNo = _useState12[1];
+  var _useState13 = React.useState(20),
+    _useState14 = _slicedToArray(_useState13, 1),
+    pageSize = _useState14[0];
+  var _useState15 = React.useState([]),
+    _useState16 = _slicedToArray(_useState15, 2),
+    goodList = _useState16[0],
+    setGoodList = _useState16[1];
+  var _useState17 = React.useState(false),
+    _useState18 = _slicedToArray(_useState17, 2),
+    loading = _useState18[0],
+    setLoading = _useState18[1];
+  var _useState19 = React.useState({
       apiName: 'queryItems',
       desc: true,
       numIids: '',
@@ -9700,94 +9728,98 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
       cids: '',
       title: ''
     }),
-    _useState12 = _slicedToArray(_useState11, 2),
-    searchParams = _useState12[0],
-    setSearch = _useState12[1];
-  var _useState13 = React.useState(0),
-    _useState14 = _slicedToArray(_useState13, 2),
-    total = _useState14[0],
-    setTotal = _useState14[1];
-  var _useState15 = React.useState(''),
-    _useState16 = _slicedToArray(_useState15, 2),
-    platform = _useState16[0],
-    setPlatform = _useState16[1]; //平台 taobao=淘宝 fxg=抖音 pdd=拼多多 sph=微信视屏号
-  var _useState17 = React.useState({}),
-    _useState18 = _slicedToArray(_useState17, 2),
-    shopInfo = _useState18[0],
-    setShopInfo = _useState18[1]; //店铺信息
+    _useState20 = _slicedToArray(_useState19, 2),
+    searchParams = _useState20[0],
+    setSearch = _useState20[1];
+  var _useState21 = React.useState(0),
+    _useState22 = _slicedToArray(_useState21, 2),
+    total = _useState22[0],
+    setTotal = _useState22[1];
+  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]; //店铺信息
   var _Form$useForm = antd.Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   //选择页码
-  var pageChange = function pageChange(page, pageSize) {
-    setSearch(_objectSpread2(_objectSpread2({}, searchParams), {}, {
-      pageNo: page,
-      pageSize: pageSize
-    }));
+  var pageChange = function pageChange(page) {
+    setPageNo(page);
+    setGoodList(allList.splice((page - 1) * pageSize, pageSize));
   };
   /**
-   *
-   * @returns 获取查询参数
+   * 查询商品
    */
-  var queryPd = function queryPd() {
-    var params = {
-      apiName: 'queryItems',
-      desc: searchParams.desc,
-      productIds: searchParams.numIids,
-      orderBy: searchParams.orderBy,
-      pageNo: searchParams.pageNo,
-      pageSize: searchParams.pageSize,
-      shopId: shopId,
-      type: searchParams.type,
-      title: searchParams.title,
-      cids: searchParams.cids
-    };
-    return params;
-  };
+  // 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, _ref2, list, _total, nextKey, newList;
+    var params, res, products;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.prev = 0;
           setLoading(true);
-          params = _objectSpread2({}, queryPd());
-          params.shopName = shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.shopName;
-          params.platform = platform;
-          params.status = params.type === 'onSale' ? 1 : 0;
-          delete params.type;
-          _context.next = 9;
-          return extendRequest('/qy/gdfw/product/listProduct', {
+          params = {
+            shopCode: ''
+          };
+          _context.next = 5;
+          return extendRequest('/qy/gdfw/product/bsListProduct', {
             method: 'post',
             data: params
           });
-        case 9:
+        case 5:
           res = _context.sent;
-          _ref2 = res.data || {
-            result: [],
-            total: 0
-          }, list = _ref2.result, _total = _ref2.total, nextKey = _ref2.nextKey;
-          newList = list || [];
-          newList.forEach(function (item) {
-            item.numIid = item.productId;
-            item.outerId = item.outId;
-            item.title = item.productName;
-            item.platform = platform;
-          });
-          setGoodList(newList);
-          setTotal(_total);
-        case 15:
-          _context.prev = 15;
+          products = res.data.products;
+          console.log(products.length);
+          setAllList(_toConsumableArray(products));
+          setGoodList(products.splice(0, pageSize));
+          setTotal(products.length);
+        case 11:
+          _context.prev = 11;
           setLoading(false);
-          return _context.finish(15);
-        case 18:
+          return _context.finish(11);
+        case 14:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0,, 15, 18]]);
+    }, _callee, null, [[0,, 11, 14]]);
   })), [searchParams]);
   React.useEffect(function () {
     var shopInfo = shopList.find(function (item) {
@@ -9814,10 +9846,8 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   };
   var onFinish = function onFinish(value) {
     console.log(value);
-    setSearch(_objectSpread2({}, searchParams));
   };
   var onReset = function onReset() {
-    setSearch(_objectSpread2({}, searchParams));
     form.resetFields();
   };
   return /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
@@ -9836,15 +9866,11 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     form: form,
     onFinish: onFinish
   }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "code"
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u6B3E\u5F0F\u7F16\u7801"
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "sku"
+    name: "goodsCode"
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     placeholder: "\u5546\u54C1\u7F16\u7801"
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "name"
+    name: "goodsName"
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     placeholder: "\u5546\u54C1\u540D\u79F0"
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
@@ -9857,7 +9883,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
     rowSelection: rowSelection,
     columns: columns,
-    rowKey: 'numIid',
+    rowKey: 'id',
     dataSource: searchParams.type == 'select' ? selectList : goodList,
     scroll: {
       y: 300
@@ -9865,8 +9891,9 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     pagination: {
       size: 'small',
       total: total,
-      current: searchParams.pageNo,
-      pageSize: searchParams.pageSize,
+      current: pageNo,
+      pageSize: pageSize,
+      pageSizeOptions: [],
       onChange: pageChange
     }
   })));

package/package.json

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