@kmkf-fe-packages/basic-components 0.8.9-alpha.0 → 0.8.9-alpha.1

package/dist/index.esm.js

@@ -9763,7 +9763,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
         setSelect([]);
         setSelectIds([]);
         queryItems();
-        onReset();
+        getShopList();
       }
     };
   });
@@ -9811,14 +9811,10 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     _useState20 = _slicedToArray(_useState19, 2),
     total = _useState20[0],
     setTotal = _useState20[1];
-  var _useState21 = useState(''),
+  var _useState21 = useState(),
     _useState22 = _slicedToArray(_useState21, 2),
-    platform = _useState22[0],
-    setPlatform = _useState22[1]; //平台 taobao=淘宝 fxg=抖音 pdd=拼多多 sph=微信视屏号
-  var _useState23 = useState({}),
-    _useState24 = _slicedToArray(_useState23, 2),
-    shopInfo = _useState24[0],
-    setShopInfo = _useState24[1]; //店铺信息
+    shopOptions = _useState22[0],
+    setShopList = _useState22[1];
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -9835,17 +9831,20 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _context.prev = 0;
+          form.setFieldsValue({
+            shopId: shopCode
+          });
+          _context.prev = 1;
           setLoading(true);
           params = {
             shopCode: shopCode
           };
-          _context.next = 5;
+          _context.next = 6;
           return extendRequest('/qy/gdfw/product/bsListProduct', {
             method: 'post',
             data: params
           });
-        case 5:
+        case 6:
           res = _context.sent;
           products = res.data.products;
           newProducts = (products || []).map(function (item, index) {
@@ -9855,29 +9854,20 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
           });
           setAllList(_toConsumableArray(newProducts));
           initData(_toConsumableArray(newProducts));
-        case 10:
-          _context.prev = 10;
+        case 11:
+          _context.prev = 11;
           setLoading(false);
-          return _context.finish(10);
-        case 13:
+          return _context.finish(11);
+        case 14:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0,, 10, 13]]);
+    }, _callee, null, [[1,, 11, 14]]);
   })), [shopCode]);
-  useEffect(function () {
-    var shopInfo = shopList.find(function (item) {
-      return shopId === item.shopId || shopId === item.shopName;
-    });
-    setShopInfo(shopInfo);
-    var platform = shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.shopSourceStr.toLowerCase();
-    setPlatform(platform);
-  }, [shopId]);
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
     onChange: function onChange(selectedRowKeys, selectedRows, info) {
-      console.log(selectedRowKeys, selectedRows, info);
       setSelectIds(selectedRowKeys);
       setSelect(_toConsumableArray(selectedRows));
     }
@@ -9889,6 +9879,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     setPageNo(1);
   };
   var _onCancel = function onCancel() {
+    onReset();
     setVisible(false);
   };
   var onOk = function onOk() {
@@ -9903,8 +9894,9 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     if (hasValue) {
       Object.keys(value).forEach(function (key) {
         if (value[key]) {
+          var trimValue = value[key].trim();
           newFilterList = allList.filter(function (item) {
-            return item[key].indexOf(value[key]) > -1;
+            return item[key].indexOf(trimValue) > -1;
           });
         }
       });
@@ -9915,7 +9907,50 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   };
   var onReset = function onReset() {
     form.resetFields();
-    initData(_toConsumableArray(allList));
+    initData([]);
+  };
+  var getShopList = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _yield$request, success, data, _ref3, list;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return extendRequest('/qy/gdfw/product/bsListProduct', {
+              method: 'post',
+              data: {
+                shopCode: 'DP007'
+              }
+            });
+          case 2:
+            _yield$request = _context2.sent;
+            success = _yield$request.success;
+            data = _yield$request.data;
+            if (success) {
+              list = (_ref3 = data.products || []) === null || _ref3 === void 0 ? void 0 : _ref3.map(function (item, index) {
+                return {
+                  label: "\u5E97\u94FA\u540D\u79F0".concat(index),
+                  value: index
+                };
+              });
+              setShopList(list);
+            }
+          case 6:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function getShopList() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var onValuesChange = function onValuesChange(changedValues) {
+    if (changedValues === null || changedValues === void 0 ? void 0 : changedValues['shopId']) {
+      pubsub.publish('changeShopCode', {
+        shopCode: changedValues.shopId
+      });
+    }
   };
   return /*#__PURE__*/React.createElement(Modal, {
     title: '选择商品',
@@ -9931,8 +9966,21 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   }, /*#__PURE__*/React.createElement(Form, {
     layout: "inline",
     form: form,
-    onFinish: onFinish
+    onFinish: onFinish,
+    onValuesChange: onValuesChange
   }, /*#__PURE__*/React.createElement(Form.Item, {
+    name: "shopId"
+  }, /*#__PURE__*/React.createElement(Select, {
+    placeholder: "\u5E97\u94FA",
+    style: {
+      width: 150
+    },
+    options: shopOptions || [],
+    showSearch: true,
+    filterOption: function filterOption(input, option) {
+      return option.label.includes(input);
+    }
+  })), /*#__PURE__*/React.createElement(Form.Item, {
     name: "skuName"
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u5546\u54C1sku\u540D\u79F0",
@@ -10284,7 +10332,6 @@ var BsGoods = function BsGoods(props) {
     //补发
     pubsub.subscribe('reissueType', function (type, data) {
       if (disabled) return;
-      console.log(type, data);
       withInfo.current = {
         type: type,
         val: data.val,
@@ -10299,6 +10346,11 @@ var BsGoods = function BsGoods(props) {
         });
       }
     });
+    pubsub.subscribeOnce('changeShopCode', function (type, data) {
+      onChange(_objectSpread2(_objectSpread2({}, valueRef === null || valueRef === void 0 ? void 0 : valueRef.current), {}, {
+        shopCode: data.shopCode
+      }));
+    });
   }, [disabled]);
   var _onSelect = function onSelect(list) {
     var _withInfo$current, _withInfo$current2;
@@ -10377,10 +10429,14 @@ var BsExchange = function BsExchange(props) {
         onChange(newValue);
       }
     });
+    pubsub.subscribeOnce('changeShopCode', function (type, data) {
+      onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        shopCode: data.shopCode
+      }));
+    });
   }, [value]);
   useEffect(function () {
     pubsub.subscribe('selectList', function (_, data) {
-      console.log('selectList', data, valueRef.current);
       if (disabled) return;
       var newDataList = cloneDeep((data === null || data === void 0 ? void 0 : data.list) || []);
       onChange(_objectSpread2(_objectSpread2({}, data.goodValue), {}, {
@@ -10390,7 +10446,6 @@ var BsExchange = function BsExchange(props) {
   }, []);
   useEffect(function () {
     pubsub.subscribe('selectListReturn', function (_, data) {
-      console.log('selectListReturn', data);
       if (disabled) return;
       var newValue = _objectSpread2({}, data.goodValue);
       var newDataList = cloneDeep((data === null || data === void 0 ? void 0 : data.list) || []);
@@ -10621,6 +10676,11 @@ var BsReissue = function BsReissue(props) {
         onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
       }
     });
+    pubsub.subscribeOnce('changeShopCode', function (type, data) {
+      onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        shopCode: data.shopCode
+      }));
+    });
   }, [value, disabled]);
   var changeTypeHandle = function changeTypeHandle(val) {
     var newValue = _objectSpread2({}, value);

package/dist/index.js

@@ -9774,7 +9774,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
         setSelect([]);
         setSelectIds([]);
         queryItems();
-        onReset();
+        getShopList();
       }
     };
   });
@@ -9822,14 +9822,10 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     _useState20 = _slicedToArray(_useState19, 2),
     total = _useState20[0],
     setTotal = _useState20[1];
-  var _useState21 = React.useState(''),
+  var _useState21 = React.useState(),
     _useState22 = _slicedToArray(_useState21, 2),
-    platform = _useState22[0],
-    setPlatform = _useState22[1]; //平台 taobao=淘宝 fxg=抖音 pdd=拼多多 sph=微信视屏号
-  var _useState23 = React.useState({}),
-    _useState24 = _slicedToArray(_useState23, 2),
-    shopInfo = _useState24[0],
-    setShopInfo = _useState24[1]; //店铺信息
+    shopOptions = _useState22[0],
+    setShopList = _useState22[1];
   var _Form$useForm = antd.Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -9846,17 +9842,20 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _context.prev = 0;
+          form.setFieldsValue({
+            shopId: shopCode
+          });
+          _context.prev = 1;
           setLoading(true);
           params = {
             shopCode: shopCode
           };
-          _context.next = 5;
+          _context.next = 6;
           return extendRequest('/qy/gdfw/product/bsListProduct', {
             method: 'post',
             data: params
           });
-        case 5:
+        case 6:
           res = _context.sent;
           products = res.data.products;
           newProducts = (products || []).map(function (item, index) {
@@ -9866,29 +9865,20 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
           });
           setAllList(_toConsumableArray(newProducts));
           initData(_toConsumableArray(newProducts));
-        case 10:
-          _context.prev = 10;
+        case 11:
+          _context.prev = 11;
           setLoading(false);
-          return _context.finish(10);
-        case 13:
+          return _context.finish(11);
+        case 14:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0,, 10, 13]]);
+    }, _callee, null, [[1,, 11, 14]]);
   })), [shopCode]);
-  React.useEffect(function () {
-    var shopInfo = shopList.find(function (item) {
-      return shopId === item.shopId || shopId === item.shopName;
-    });
-    setShopInfo(shopInfo);
-    var platform = shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.shopSourceStr.toLowerCase();
-    setPlatform(platform);
-  }, [shopId]);
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
     onChange: function onChange(selectedRowKeys, selectedRows, info) {
-      console.log(selectedRowKeys, selectedRows, info);
       setSelectIds(selectedRowKeys);
       setSelect(_toConsumableArray(selectedRows));
     }
@@ -9900,6 +9890,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     setPageNo(1);
   };
   var _onCancel = function onCancel() {
+    onReset();
     setVisible(false);
   };
   var onOk = function onOk() {
@@ -9914,8 +9905,9 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     if (hasValue) {
       Object.keys(value).forEach(function (key) {
         if (value[key]) {
+          var trimValue = value[key].trim();
           newFilterList = allList.filter(function (item) {
-            return item[key].indexOf(value[key]) > -1;
+            return item[key].indexOf(trimValue) > -1;
           });
         }
       });
@@ -9926,7 +9918,50 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   };
   var onReset = function onReset() {
     form.resetFields();
-    initData(_toConsumableArray(allList));
+    initData([]);
+  };
+  var getShopList = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _yield$request, success, data, _ref3, list;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return extendRequest('/qy/gdfw/product/bsListProduct', {
+              method: 'post',
+              data: {
+                shopCode: 'DP007'
+              }
+            });
+          case 2:
+            _yield$request = _context2.sent;
+            success = _yield$request.success;
+            data = _yield$request.data;
+            if (success) {
+              list = (_ref3 = data.products || []) === null || _ref3 === void 0 ? void 0 : _ref3.map(function (item, index) {
+                return {
+                  label: "\u5E97\u94FA\u540D\u79F0".concat(index),
+                  value: index
+                };
+              });
+              setShopList(list);
+            }
+          case 6:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function getShopList() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var onValuesChange = function onValuesChange(changedValues) {
+    if (changedValues === null || changedValues === void 0 ? void 0 : changedValues['shopId']) {
+      pubsub__default['default'].publish('changeShopCode', {
+        shopCode: changedValues.shopId
+      });
+    }
   };
   return /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
     title: '选择商品',
@@ -9942,8 +9977,21 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   }, /*#__PURE__*/React__default['default'].createElement(antd.Form, {
     layout: "inline",
     form: form,
-    onFinish: onFinish
+    onFinish: onFinish,
+    onValuesChange: onValuesChange
   }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
+    name: "shopId"
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+    placeholder: "\u5E97\u94FA",
+    style: {
+      width: 150
+    },
+    options: shopOptions || [],
+    showSearch: true,
+    filterOption: function filterOption(input, option) {
+      return option.label.includes(input);
+    }
+  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
     name: "skuName"
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     placeholder: "\u5546\u54C1sku\u540D\u79F0",
@@ -10295,7 +10343,6 @@ var BsGoods = function BsGoods(props) {
     //补发
     pubsub__default['default'].subscribe('reissueType', function (type, data) {
       if (disabled) return;
-      console.log(type, data);
       withInfo.current = {
         type: type,
         val: data.val,
@@ -10310,6 +10357,11 @@ var BsGoods = function BsGoods(props) {
         });
       }
     });
+    pubsub__default['default'].subscribeOnce('changeShopCode', function (type, data) {
+      onChange(_objectSpread2(_objectSpread2({}, valueRef === null || valueRef === void 0 ? void 0 : valueRef.current), {}, {
+        shopCode: data.shopCode
+      }));
+    });
   }, [disabled]);
   var _onSelect = function onSelect(list) {
     var _withInfo$current, _withInfo$current2;
@@ -10388,10 +10440,14 @@ var BsExchange = function BsExchange(props) {
         onChange(newValue);
       }
     });
+    pubsub__default['default'].subscribeOnce('changeShopCode', function (type, data) {
+      onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        shopCode: data.shopCode
+      }));
+    });
   }, [value]);
   React.useEffect(function () {
     pubsub__default['default'].subscribe('selectList', function (_, data) {
-      console.log('selectList', data, valueRef.current);
       if (disabled) return;
       var newDataList = lodash.cloneDeep((data === null || data === void 0 ? void 0 : data.list) || []);
       onChange(_objectSpread2(_objectSpread2({}, data.goodValue), {}, {
@@ -10401,7 +10457,6 @@ var BsExchange = function BsExchange(props) {
   }, []);
   React.useEffect(function () {
     pubsub__default['default'].subscribe('selectListReturn', function (_, data) {
-      console.log('selectListReturn', data);
       if (disabled) return;
       var newValue = _objectSpread2({}, data.goodValue);
       var newDataList = lodash.cloneDeep((data === null || data === void 0 ? void 0 : data.list) || []);
@@ -10632,6 +10687,11 @@ var BsReissue = function BsReissue(props) {
         onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
       }
     });
+    pubsub__default['default'].subscribeOnce('changeShopCode', function (type, data) {
+      onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        shopCode: data.shopCode
+      }));
+    });
   }, [value, disabled]);
   var changeTypeHandle = function changeTypeHandle(val) {
     var newValue = _objectSpread2({}, value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.8.9-alpha.0",
+  "version": "0.8.9-alpha.1",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "97f6ab166f536ac9098b1883732a91c848165a04"
+  "gitHead": "ac4f58b96e2bde8340eefe7264e26a691078c729"
 }