@kmkf-fe-packages/basic-components 0.7.15-alpha.27 → 0.7.15-alpha.28

package/dist/index.esm.js

@@ -9396,7 +9396,6 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
   //sf手机号
   var LogisticsPhone = function LogisticsPhone() {
     return /*#__PURE__*/React.createElement(Input, {
-      disabled: disabled,
       style: {
         marginTop: '8px'
       },
@@ -9700,15 +9699,21 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     _useState18 = _slicedToArray(_useState17, 2),
     shopInfo = _useState18[0],
     setShopInfo = _useState18[1]; //店铺信息
-  var _Form$useForm = Form.useForm(),
-    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-    form = _Form$useForm2[0];
+  var _useState19 = useState([{
+      tab: '所选商品',
+      key: 'onSale'
+    }
+    // { tab: '已选商品', key: 'select' },
+    ]),
+    _useState20 = _slicedToArray(_useState19, 1),
+    tabs = _useState20[0];
   //选择页码
   var pageChange = function pageChange(page, pageSize) {
     setSearch(_objectSpread2(_objectSpread2({}, searchParams), {}, {
       pageNo: page,
       pageSize: pageSize
     }));
+    queryItems();
   };
   /**
    *
@@ -9732,48 +9737,53 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   /**
    * 查询商品
    */
-  var queryItems = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var params, res, _ref2, list, _total, nextKey, newList;
-    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', {
-            method: 'post',
-            data: params
-          });
-        case 9:
-          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;
-          setLoading(false);
-          return _context.finish(15);
-        case 18:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[0,, 15, 18]]);
-  })), [searchParams]);
+  var queryItems = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var params, res, _ref2, list, _total, nextKey, newList;
+      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', {
+              method: 'post',
+              data: params
+            });
+          case 9:
+            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;
+            setLoading(false);
+            return _context.finish(15);
+          case 18:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[0,, 15, 18]]);
+    }));
+    return function queryItems() {
+      return _ref.apply(this, arguments);
+    };
+  }();
   useEffect(function () {
     var shopInfo = shopList.find(function (item) {
       return shopId === item.shopId || shopId === item.shopName;
@@ -9797,14 +9807,6 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     onSubmit(selectList);
     _onCancel();
   };
-  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, {
     title: '选择商品',
     okText: '确认',
@@ -9817,27 +9819,17 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     onOk: onOk,
     wrapClassName: "goodModal"
   }, /*#__PURE__*/React.createElement(Form, {
-    layout: "inline",
-    form: form,
-    onFinish: onFinish
-  }, /*#__PURE__*/React.createElement(Form.Item, {
-    name: "code"
-  }, /*#__PURE__*/React.createElement(Input, {
+    layout: "inline"
+  }, /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u6B3E\u5F0F\u7F16\u7801"
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "sku"
-  }, /*#__PURE__*/React.createElement(Input, {
+  })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u5546\u54C1\u7F16\u7801"
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "name"
-  }, /*#__PURE__*/React.createElement(Input, {
+  })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u5546\u54C1\u540D\u79F0"
   })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     htmlType: "submit"
-  }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, {
-    onClick: onReset
-  }, "\u91CD\u7F6E"))), /*#__PURE__*/React.createElement(Spin, {
+  }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, null, "\u91CD\u7F6E"))), /*#__PURE__*/React.createElement(Spin, {
     spinning: loading
   }, /*#__PURE__*/React.createElement(Table, {
     rowSelection: rowSelection,
@@ -9870,8 +9862,8 @@ var GoodItem = function GoodItem(props) {
     value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
     disabled = props.disabled,
-    _props$showHeader = props.showHeader,
-    showHeader = _props$showHeader === void 0 ? [] : _props$showHeader,
+    _props$showField = props.showField,
+    showField = _props$showField === void 0 ? [] : _props$showField,
     width = props.width,
     _props$shopList = props.shopList,
     shopList = _props$shopList === void 0 ? [] : _props$shopList,
@@ -9990,7 +9982,7 @@ var GoodItem = function GoodItem(props) {
         return /*#__PURE__*/React.createElement("span", null, index + 1);
       }
     }].concat(_toConsumableArray(GOODS_INFO_COLUMNS().filter(function (t) {
-      return showHeader.includes(t === null || t === void 0 ? void 0 : t.dataIndex);
+      return showField.includes(t === null || t === void 0 ? void 0 : t.dataIndex);
     })));
     if (!disabled) {
       columnList.push({
@@ -10010,7 +10002,7 @@ var GoodItem = function GoodItem(props) {
       });
     }
     return columnList;
-  }, [showHeader, value, disabled]);
+  }, [showField, value, disabled]);
   var onSubmit = function onSubmit(list) {
     var newList = list.map(function (item) {
       var picUrl = item.picUrl,

package/dist/index.js

@@ -9407,7 +9407,6 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
   //sf手机号
   var LogisticsPhone = function LogisticsPhone() {
     return /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-      disabled: disabled,
       style: {
         marginTop: '8px'
       },
@@ -9711,15 +9710,21 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     _useState18 = _slicedToArray(_useState17, 2),
     shopInfo = _useState18[0],
     setShopInfo = _useState18[1]; //店铺信息
-  var _Form$useForm = antd.Form.useForm(),
-    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-    form = _Form$useForm2[0];
+  var _useState19 = React.useState([{
+      tab: '所选商品',
+      key: 'onSale'
+    }
+    // { tab: '已选商品', key: 'select' },
+    ]),
+    _useState20 = _slicedToArray(_useState19, 1),
+    tabs = _useState20[0];
   //选择页码
   var pageChange = function pageChange(page, pageSize) {
     setSearch(_objectSpread2(_objectSpread2({}, searchParams), {}, {
       pageNo: page,
       pageSize: pageSize
     }));
+    queryItems();
   };
   /**
    *
@@ -9743,48 +9748,53 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   /**
    * 查询商品
    */
-  var queryItems = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var params, res, _ref2, list, _total, nextKey, newList;
-    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', {
-            method: 'post',
-            data: params
-          });
-        case 9:
-          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;
-          setLoading(false);
-          return _context.finish(15);
-        case 18:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[0,, 15, 18]]);
-  })), [searchParams]);
+  var queryItems = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var params, res, _ref2, list, _total, nextKey, newList;
+      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', {
+              method: 'post',
+              data: params
+            });
+          case 9:
+            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;
+            setLoading(false);
+            return _context.finish(15);
+          case 18:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[0,, 15, 18]]);
+    }));
+    return function queryItems() {
+      return _ref.apply(this, arguments);
+    };
+  }();
   React.useEffect(function () {
     var shopInfo = shopList.find(function (item) {
       return shopId === item.shopId || shopId === item.shopName;
@@ -9808,14 +9818,6 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     onSubmit(selectList);
     _onCancel();
   };
-  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, {
     title: '选择商品',
     okText: '确认',
@@ -9828,27 +9830,17 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     onOk: onOk,
     wrapClassName: "goodModal"
   }, /*#__PURE__*/React__default['default'].createElement(antd.Form, {
-    layout: "inline",
-    form: form,
-    onFinish: onFinish
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "code"
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    layout: "inline"
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     placeholder: "\u6B3E\u5F0F\u7F16\u7801"
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "sku"
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     placeholder: "\u5546\u54C1\u7F16\u7801"
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "name"
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, null, /*#__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, {
     type: "primary",
     htmlType: "submit"
-  }, "\u67E5\u8BE2"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
-    onClick: onReset
-  }, "\u91CD\u7F6E"))), /*#__PURE__*/React__default['default'].createElement(antd.Spin, {
+  }, "\u67E5\u8BE2"), /*#__PURE__*/React__default['default'].createElement(antd.Button, null, "\u91CD\u7F6E"))), /*#__PURE__*/React__default['default'].createElement(antd.Spin, {
     spinning: loading
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
     rowSelection: rowSelection,
@@ -9881,8 +9873,8 @@ var GoodItem = function GoodItem(props) {
     value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
     disabled = props.disabled,
-    _props$showHeader = props.showHeader,
-    showHeader = _props$showHeader === void 0 ? [] : _props$showHeader,
+    _props$showField = props.showField,
+    showField = _props$showField === void 0 ? [] : _props$showField,
     width = props.width,
     _props$shopList = props.shopList,
     shopList = _props$shopList === void 0 ? [] : _props$shopList,
@@ -10001,7 +9993,7 @@ var GoodItem = function GoodItem(props) {
         return /*#__PURE__*/React__default['default'].createElement("span", null, index + 1);
       }
     }].concat(_toConsumableArray(GOODS_INFO_COLUMNS().filter(function (t) {
-      return showHeader.includes(t === null || t === void 0 ? void 0 : t.dataIndex);
+      return showField.includes(t === null || t === void 0 ? void 0 : t.dataIndex);
     })));
     if (!disabled) {
       columnList.push({
@@ -10021,7 +10013,7 @@ var GoodItem = function GoodItem(props) {
       });
     }
     return columnList;
-  }, [showHeader, value, disabled]);
+  }, [showField, value, disabled]);
   var onSubmit = function onSubmit(list) {
     var newList = list.map(function (item) {
       var picUrl = item.picUrl,

package/dist/src/bs/component/GoodItem/index.d.ts

@@ -4,7 +4,7 @@ interface BsGoodsProps {
     type: number;
     options: any[];
     disabled: boolean;
-    showHeader: string[];
+    showField: string[];
     width: number;
     shopList: any[];
     shopId: string | number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.7.15-alpha.27",
+  "version": "0.7.15-alpha.28",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "60218b9dc2250d8cbe366629af669ba395ca2551"
+  "gitHead": "22184ba541f26bbefc6cfa405b5dcd6983a3fd0c"
 }