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

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import React, { useRef, useState, useEffect, useMemo, forwardRef, useImperativeHandle, useCallback } from 'react';
+import React, { useRef, useState, useEffect, useMemo, forwardRef, useImperativeHandle } from 'react';
 import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, message, Radio, Space, Spin, Checkbox, Row, Col, Slider, Rate, Button, Form, Tabs, Modal, ConfigProvider, Pagination, Popover, Table } from 'antd';
 import { EyeOutlined, DeleteOutlined, InboxOutlined } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
@@ -513,19 +513,22 @@ function ApaasInputNumber(props) {
   return /*#__PURE__*/React.createElement(InputNumber, _objectSpread2({}, props));
 }
 
-var _excluded$2 = ["options", "basicMultSelect"];
+var _excluded$2 = ["options", "basicMultSelect", "readonly"];
 function ApaasSelect(props) {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   var _props$options = props.options,
     options = _props$options === void 0 ? [] : _props$options,
     basicMultSelect = props.basicMultSelect,
+    readonly = props.readonly,
     otherProps = _objectWithoutProperties(props, _excluded$2);
   return /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({}, otherProps), {}, {
+    showSearch: !readonly,
     style: {
       width: '100%'
     }
   }), options.map(function (item) {
     return /*#__PURE__*/React.createElement(Select.Option, {
+      disabled: readonly,
       value: item.value,
       key: item.value
     }, item.label);
@@ -803,7 +806,7 @@ var ApaasUpload = function ApaasUpload(_ref) {
   })));
 };
 
-var _excluded$5 = ["showOther", "horizontal", "options", "value", "onChange", "disabled"];
+var _excluded$5 = ["showOther", "horizontal", "options", "value", "onChange", "disabled", "hideUnselectedItem"];
 function ApaasRadio(props) {
   var showOther = props.showOther,
     _props$horizontal = props.horizontal,
@@ -814,6 +817,7 @@ function ApaasRadio(props) {
     value = _props$value === void 0 ? {} : _props$value,
     onChange = props.onChange,
     disabled = props.disabled,
+    hideUnselectedItem = props.hideUnselectedItem,
     otherProps = _objectWithoutProperties(props, _excluded$5);
   var radioValue = value.value,
     other = value.other;
@@ -841,13 +845,14 @@ function ApaasRadio(props) {
     direction: horizontal ? 'horizontal' : 'vertical',
     wrap: true
   }, options.map(function (item) {
+    if (hideUnselectedItem && item.value !== radioValue) return /*#__PURE__*/React.createElement(React.Fragment, null);
     return /*#__PURE__*/React.createElement(Radio, {
       value: item.value,
       key: item.label,
       disabled: disabled,
       onClick: onRadioClick
     }, item.label);
-  }), showOther && /*#__PURE__*/React.createElement(Radio, {
+  }), showOther && (!hideUnselectedItem || radioValue === '其他') && /*#__PURE__*/React.createElement(Radio, {
     value: "\u5176\u4ED6",
     disabled: disabled,
     onClick: onRadioClick
@@ -9699,13 +9704,14 @@ var ItemList = function ItemList(props) {
   }, "\u6682\u4E0D\u652F\u6301\u6DFB\u52A0")) : null);
 };
 
+var _excluded$c = ["shopId"];
 var columns = [{
   dataIndex: 'index',
-  title: '序号',
+  title: 'NO',
   render: function render(val, record, index) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
-        width: '30px'
+        width: 25
       }
     }, index + 1);
   }
@@ -9757,13 +9763,13 @@ var columns = [{
 var GoodsModal$1 = function GoodsModal(props, ref) {
   useImperativeHandle(ref, function () {
     return {
-      open: function open() {
+      open: function open(shopCode) {
         setVisible(true);
         setPageNo(1);
         setSelect([]);
         setSelectIds([]);
-        queryItems();
-        onReset();
+        queryItems(shopCode);
+        getShopList();
       }
     };
   });
@@ -9771,7 +9777,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     shopId = props.shopId,
     shopList = props.shopList,
     width = props.width,
-    shopCode = props.shopCode;
+    companyKey = props.companyKey;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
@@ -9811,14 +9817,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];
@@ -9830,54 +9832,53 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   /**
    * 查询商品
    */
-  var queryItems = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    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
-          };
-          _context.next = 5;
-          return extendRequest('/qy/gdfw/product/bsListProduct', {
-            method: 'post',
-            data: params
-          });
-        case 5:
-          res = _context.sent;
-          products = res.data.products;
-          newProducts = (products || []).map(function (item, index) {
-            return _objectSpread2(_objectSpread2({}, item), {}, {
-              index: index + 1
+  var queryItems = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(shopCode) {
+      var params, res, products, newProducts;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            form.setFieldsValue({
+              shopId: shopCode
             });
-          });
-          setAllList(_toConsumableArray(newProducts));
-          initData(_toConsumableArray(newProducts));
-        case 10:
-          _context.prev = 10;
-          setLoading(false);
-          return _context.finish(10);
-        case 13:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[0,, 10, 13]]);
-  })), [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]);
+            _context.prev = 1;
+            setLoading(true);
+            params = {
+              shopCode: shopCode
+            };
+            _context.next = 6;
+            return extendRequest('/qy/gdfw/product/bsListProduct', {
+              method: 'post',
+              data: params
+            });
+          case 6:
+            res = _context.sent;
+            products = res.data.products;
+            newProducts = (products || []).map(function (item, index) {
+              return _objectSpread2(_objectSpread2({}, item), {}, {
+                index: index + 1
+              });
+            });
+            setAllList(_toConsumableArray(newProducts));
+            initData(_toConsumableArray(newProducts));
+          case 11:
+            _context.prev = 11;
+            setLoading(false);
+            return _context.finish(11);
+          case 14:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[1,, 11, 14]]);
+    }));
+    return function queryItems(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
     onChange: function onChange(selectedRowKeys, selectedRows, info) {
-      console.log(selectedRowKeys, selectedRows, info);
       setSelectIds(selectedRowKeys);
       setSelect(_toConsumableArray(selectedRows));
     }
@@ -9889,13 +9890,17 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     setPageNo(1);
   };
   var _onCancel = function onCancel() {
+    onReset();
     setVisible(false);
   };
   var onOk = function onOk() {
     onSubmit(selectList);
     _onCancel();
   };
-  var onFinish = function onFinish(value) {
+  var onFinish = function onFinish(val) {
+    var shopId = val.shopId,
+      other = _objectWithoutProperties(val, _excluded$c);
+    var value = other;
     var newFilterList = [];
     var hasValue = Object.values(value).some(function (t) {
       return !!t;
@@ -9903,8 +9908,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 +9921,52 @@ 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, obj, list;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return extendRequest('/qy/diamond/getConfigInfo', {
+              method: 'get',
+              params: {
+                key: 'company-third-shop-info'
+              }
+            });
+          case 2:
+            _yield$request = _context2.sent;
+            success = _yield$request.success;
+            data = _yield$request.data;
+            obj = JSON.parse(data || '{}');
+            if (success) {
+              list = ((obj === null || obj === void 0 ? void 0 : obj[companyKey]) || []).map(function (item) {
+                return {
+                  label: item.shopName,
+                  value: item.shopCode
+                };
+              });
+              setShopList(list);
+            }
+          case 7:
+          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']) {
+      queryItems(changedValues === null || changedValues === void 0 ? void 0 : changedValues.shopId);
+      pubsub.publish('changeShopCode', {
+        shopCode: changedValues.shopId
+      });
+    }
   };
   return /*#__PURE__*/React.createElement(Modal, {
     title: '选择商品',
@@ -9931,8 +9982,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",
@@ -10024,6 +10088,8 @@ var GoodItem = function GoodItem(props) {
     _props$canUpdateNumbe = props.canUpdateNumber,
     canUpdateNumber = _props$canUpdateNumbe === void 0 ? false : _props$canUpdateNumbe,
     shopCode = props.shopCode,
+    _props$companyKey = props.companyKey,
+    companyKey = _props$companyKey === void 0 ? '' : _props$companyKey,
     onSelect = props.onSelect,
     onDelete = props.onDelete;
   var refModal = useRef();
@@ -10205,7 +10271,7 @@ var GoodItem = function GoodItem(props) {
     }));
   };
   var handleChangeGoods = function handleChangeGoods() {
-    refModal.current.open();
+    refModal.current.open(shopCode);
   };
   var rowSelection = {
     selectedRowKeys: selectedRowKeys,
@@ -10245,7 +10311,7 @@ var GoodItem = function GoodItem(props) {
     shopList: shopList,
     shopId: shopId,
     maxLength: maxLength,
-    shopCode: shopCode
+    companyKey: companyKey
   }));
 };
 
@@ -10284,7 +10350,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 +10364,12 @@ var BsGoods = function BsGoods(props) {
         });
       }
     });
+    pubsub.subscribeOnce('changeShopCode', function (type, data) {
+      console.log(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;
@@ -10345,7 +10416,7 @@ var BsGoods = function BsGoods(props) {
   }));
 };
 
-var _excluded$c = ["value", "onChange", "reasonList", "disabled"];
+var _excluded$d = ["value", "onChange", "reasonList", "disabled"];
 var BsExchange = function BsExchange(props) {
   var _value$bsExchangeType4, _value$bsExchangeType5, _value$bsExchangeType6;
   var value = props.value,
@@ -10353,7 +10424,7 @@ var BsExchange = function BsExchange(props) {
     _props$reasonList = props.reasonList,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
-    other = _objectWithoutProperties(props, _excluded$c);
+    other = _objectWithoutProperties(props, _excluded$d);
   var valueRef = useRef({});
   useEffect(function () {
     valueRef.current = value;
@@ -10377,10 +10448,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 +10465,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) || []);
@@ -10572,14 +10646,14 @@ var BsExchange = function BsExchange(props) {
   }))) : null);
 };
 
-var _excluded$d = ["value", "onChange", "reasonList", "disabled"];
+var _excluded$e = ["value", "onChange", "reasonList", "disabled"];
 var BsReissue = function BsReissue(props) {
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
-    other = _objectWithoutProperties(props, _excluded$d);
+    other = _objectWithoutProperties(props, _excluded$e);
   var valueRef = useRef({});
   useEffect(function () {
     pubsub.subscribe('reissueSelectList', function (_, data) {
@@ -10621,6 +10695,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

@@ -524,19 +524,22 @@ function ApaasInputNumber(props) {
   return /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, _objectSpread2({}, props));
 }
 
-var _excluded$2 = ["options", "basicMultSelect"];
+var _excluded$2 = ["options", "basicMultSelect", "readonly"];
 function ApaasSelect(props) {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   var _props$options = props.options,
     options = _props$options === void 0 ? [] : _props$options,
     basicMultSelect = props.basicMultSelect,
+    readonly = props.readonly,
     otherProps = _objectWithoutProperties(props, _excluded$2);
   return /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, otherProps), {}, {
+    showSearch: !readonly,
     style: {
       width: '100%'
     }
   }), options.map(function (item) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
+      disabled: readonly,
       value: item.value,
       key: item.value
     }, item.label);
@@ -814,7 +817,7 @@ var ApaasUpload = function ApaasUpload(_ref) {
   })));
 };
 
-var _excluded$5 = ["showOther", "horizontal", "options", "value", "onChange", "disabled"];
+var _excluded$5 = ["showOther", "horizontal", "options", "value", "onChange", "disabled", "hideUnselectedItem"];
 function ApaasRadio(props) {
   var showOther = props.showOther,
     _props$horizontal = props.horizontal,
@@ -825,6 +828,7 @@ function ApaasRadio(props) {
     value = _props$value === void 0 ? {} : _props$value,
     onChange = props.onChange,
     disabled = props.disabled,
+    hideUnselectedItem = props.hideUnselectedItem,
     otherProps = _objectWithoutProperties(props, _excluded$5);
   var radioValue = value.value,
     other = value.other;
@@ -852,13 +856,14 @@ function ApaasRadio(props) {
     direction: horizontal ? 'horizontal' : 'vertical',
     wrap: true
   }, options.map(function (item) {
+    if (hideUnselectedItem && item.value !== radioValue) return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
     return /*#__PURE__*/React__default['default'].createElement(antd.Radio, {
       value: item.value,
       key: item.label,
       disabled: disabled,
       onClick: onRadioClick
     }, item.label);
-  }), showOther && /*#__PURE__*/React__default['default'].createElement(antd.Radio, {
+  }), showOther && (!hideUnselectedItem || radioValue === '其他') && /*#__PURE__*/React__default['default'].createElement(antd.Radio, {
     value: "\u5176\u4ED6",
     disabled: disabled,
     onClick: onRadioClick
@@ -9710,13 +9715,14 @@ var ItemList = function ItemList(props) {
   }, "\u6682\u4E0D\u652F\u6301\u6DFB\u52A0")) : null);
 };
 
+var _excluded$c = ["shopId"];
 var columns = [{
   dataIndex: 'index',
-  title: '序号',
+  title: 'NO',
   render: function render(val, record, index) {
     return /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
-        width: '30px'
+        width: 25
       }
     }, index + 1);
   }
@@ -9768,13 +9774,13 @@ var columns = [{
 var GoodsModal$1 = function GoodsModal(props, ref) {
   React.useImperativeHandle(ref, function () {
     return {
-      open: function open() {
+      open: function open(shopCode) {
         setVisible(true);
         setPageNo(1);
         setSelect([]);
         setSelectIds([]);
-        queryItems();
-        onReset();
+        queryItems(shopCode);
+        getShopList();
       }
     };
   });
@@ -9782,7 +9788,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     shopId = props.shopId,
     shopList = props.shopList,
     width = props.width,
-    shopCode = props.shopCode;
+    companyKey = props.companyKey;
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
@@ -9822,14 +9828,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];
@@ -9841,54 +9843,53 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   /**
    * 查询商品
    */
-  var queryItems = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    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
-          };
-          _context.next = 5;
-          return extendRequest('/qy/gdfw/product/bsListProduct', {
-            method: 'post',
-            data: params
-          });
-        case 5:
-          res = _context.sent;
-          products = res.data.products;
-          newProducts = (products || []).map(function (item, index) {
-            return _objectSpread2(_objectSpread2({}, item), {}, {
-              index: index + 1
+  var queryItems = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(shopCode) {
+      var params, res, products, newProducts;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            form.setFieldsValue({
+              shopId: shopCode
             });
-          });
-          setAllList(_toConsumableArray(newProducts));
-          initData(_toConsumableArray(newProducts));
-        case 10:
-          _context.prev = 10;
-          setLoading(false);
-          return _context.finish(10);
-        case 13:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[0,, 10, 13]]);
-  })), [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]);
+            _context.prev = 1;
+            setLoading(true);
+            params = {
+              shopCode: shopCode
+            };
+            _context.next = 6;
+            return extendRequest('/qy/gdfw/product/bsListProduct', {
+              method: 'post',
+              data: params
+            });
+          case 6:
+            res = _context.sent;
+            products = res.data.products;
+            newProducts = (products || []).map(function (item, index) {
+              return _objectSpread2(_objectSpread2({}, item), {}, {
+                index: index + 1
+              });
+            });
+            setAllList(_toConsumableArray(newProducts));
+            initData(_toConsumableArray(newProducts));
+          case 11:
+            _context.prev = 11;
+            setLoading(false);
+            return _context.finish(11);
+          case 14:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[1,, 11, 14]]);
+    }));
+    return function queryItems(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
     onChange: function onChange(selectedRowKeys, selectedRows, info) {
-      console.log(selectedRowKeys, selectedRows, info);
       setSelectIds(selectedRowKeys);
       setSelect(_toConsumableArray(selectedRows));
     }
@@ -9900,13 +9901,17 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     setPageNo(1);
   };
   var _onCancel = function onCancel() {
+    onReset();
     setVisible(false);
   };
   var onOk = function onOk() {
     onSubmit(selectList);
     _onCancel();
   };
-  var onFinish = function onFinish(value) {
+  var onFinish = function onFinish(val) {
+    var shopId = val.shopId,
+      other = _objectWithoutProperties(val, _excluded$c);
+    var value = other;
     var newFilterList = [];
     var hasValue = Object.values(value).some(function (t) {
       return !!t;
@@ -9914,8 +9919,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 +9932,52 @@ 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, obj, list;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return extendRequest('/qy/diamond/getConfigInfo', {
+              method: 'get',
+              params: {
+                key: 'company-third-shop-info'
+              }
+            });
+          case 2:
+            _yield$request = _context2.sent;
+            success = _yield$request.success;
+            data = _yield$request.data;
+            obj = JSON.parse(data || '{}');
+            if (success) {
+              list = ((obj === null || obj === void 0 ? void 0 : obj[companyKey]) || []).map(function (item) {
+                return {
+                  label: item.shopName,
+                  value: item.shopCode
+                };
+              });
+              setShopList(list);
+            }
+          case 7:
+          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']) {
+      queryItems(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 +9993,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",
@@ -10035,6 +10099,8 @@ var GoodItem = function GoodItem(props) {
     _props$canUpdateNumbe = props.canUpdateNumber,
     canUpdateNumber = _props$canUpdateNumbe === void 0 ? false : _props$canUpdateNumbe,
     shopCode = props.shopCode,
+    _props$companyKey = props.companyKey,
+    companyKey = _props$companyKey === void 0 ? '' : _props$companyKey,
     onSelect = props.onSelect,
     onDelete = props.onDelete;
   var refModal = React.useRef();
@@ -10216,7 +10282,7 @@ var GoodItem = function GoodItem(props) {
     }));
   };
   var handleChangeGoods = function handleChangeGoods() {
-    refModal.current.open();
+    refModal.current.open(shopCode);
   };
   var rowSelection = {
     selectedRowKeys: selectedRowKeys,
@@ -10256,7 +10322,7 @@ var GoodItem = function GoodItem(props) {
     shopList: shopList,
     shopId: shopId,
     maxLength: maxLength,
-    shopCode: shopCode
+    companyKey: companyKey
   }));
 };
 
@@ -10295,7 +10361,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 +10375,12 @@ var BsGoods = function BsGoods(props) {
         });
       }
     });
+    pubsub__default['default'].subscribeOnce('changeShopCode', function (type, data) {
+      console.log(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;
@@ -10356,7 +10427,7 @@ var BsGoods = function BsGoods(props) {
   }));
 };
 
-var _excluded$c = ["value", "onChange", "reasonList", "disabled"];
+var _excluded$d = ["value", "onChange", "reasonList", "disabled"];
 var BsExchange = function BsExchange(props) {
   var _value$bsExchangeType4, _value$bsExchangeType5, _value$bsExchangeType6;
   var value = props.value,
@@ -10364,7 +10435,7 @@ var BsExchange = function BsExchange(props) {
     _props$reasonList = props.reasonList,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
-    other = _objectWithoutProperties(props, _excluded$c);
+    other = _objectWithoutProperties(props, _excluded$d);
   var valueRef = React.useRef({});
   React.useEffect(function () {
     valueRef.current = value;
@@ -10388,10 +10459,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 +10476,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) || []);
@@ -10583,14 +10657,14 @@ var BsExchange = function BsExchange(props) {
   }))) : null);
 };
 
-var _excluded$d = ["value", "onChange", "reasonList", "disabled"];
+var _excluded$e = ["value", "onChange", "reasonList", "disabled"];
 var BsReissue = function BsReissue(props) {
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
-    other = _objectWithoutProperties(props, _excluded$d);
+    other = _objectWithoutProperties(props, _excluded$e);
   var valueRef = React.useRef({});
   React.useEffect(function () {
     pubsub__default['default'].subscribe('reissueSelectList', function (_, data) {
@@ -10632,6 +10706,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/dist/src/apaas/ApaasRadio/index.d.ts

@@ -14,6 +14,7 @@ export interface ApaasRadioProps extends Omit<RadioGroupProps, 'onChange' | 'val
     horizontal?: boolean;
     options?: OptionsType[];
     disabled?: boolean;
+    hideUnselectedItem?: boolean;
     onChange?: (value: RadioValue) => void;
     value?: RadioValue;
 }

package/dist/src/apaas/ApaasSelect/index.d.ts

@@ -7,6 +7,7 @@ type OptionsType = {
 };
 export interface ApaasSelectProps extends SelectProps<string[]> {
     options?: OptionsType[];
+    readonly?: boolean;
     [propName: string]: any;
 }
 declare function ApaasSelect(props: ApaasSelectProps): React.JSX.Element;

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

@@ -15,6 +15,7 @@ interface BsGoodsProps {
     otherOperations: any;
     canUpdateNumber: boolean;
     shopCode: string;
+    companyKey: string;
     onChange: (val: any[]) => void;
     onSelect: (val: any[]) => void;
     onDelete: (val: any[]) => void;

package/dist/src/bs/component/GoodsModal.d.ts

@@ -5,6 +5,7 @@ interface GoodModelProps {
     shopList: any[];
     width?: string | number;
     shopCode?: string;
+    companyKey: string;
     onSubmit: (...args: any[]) => any;
 }
 declare const _default: React.ForwardRefExoticComponent<GoodModelProps & React.RefAttributes<unknown>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.8.9-alpha.0",
+  "version": "0.8.9-alpha.14",
   "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.8.7-alpha.0",
+    "@kmkf-fe-packages/kmkf-utils": "^0.8.9-alpha.9",
     "lodash": "^4.17.21",
     "pubsub-js": "^1.9.4",
     "umi-request": "^1.4.0"
@@ -58,5 +58,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "97f6ab166f536ac9098b1883732a91c848165a04"
+  "gitHead": "3a28d034441471c57ea0b8a5d123fdbae7722b2e"
 }