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

package/dist/index.esm.js

@@ -9428,7 +9428,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
       value: value === null || value === void 0 ? void 0 : value.trajectorySnapshot
     });
   };
-  return /*#__PURE__*/React.createElement("div", null, LogisticsCompany(), LogisticsCode(), (value === null || value === void 0 ? void 0 : value.trajectoryCompany) === 'SF' ? LogisticsPhone() : null, showField.includes('snapshot') ? /*#__PURE__*/React.createElement(LogisticsSnapshot, null) : null);
+  return /*#__PURE__*/React.createElement("div", null, LogisticsCompany(), LogisticsCode(), (value === null || value === void 0 ? void 0 : value.trajectoryCompany) === 'SF' ? LogisticsPhone() : null, showField && showField.includes('snapshot') ? /*#__PURE__*/React.createElement(LogisticsSnapshot, null) : null);
 };
 
 var jstGoods = function jstGoods(props) {
@@ -9442,7 +9442,7 @@ var jstGoods = function jstGoods(props) {
     _props$type = props.type,
     type = _props$type === void 0 ? 1 : _props$type,
     _props$showField = props.showField,
-    showField = _props$showField === void 0 ? 'all' : _props$showField;
+    showField = _props$showField === void 0 ? '' : _props$showField;
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
@@ -9619,39 +9619,28 @@ var ItemList = function ItemList(props) {
   }, "\u6682\u4E0D\u652F\u6301\u6DFB\u52A0")) : null);
 };
 
-var TabPane$1 = Tabs.TabPane;
-var columns = [
-// {
-//   dataIndex: 'picUrl',
-//   title: '主图',
-//   render: (val: string) => {
-//     return <Image width={60} src={val} />;
-//   },
-// },
-{
-  dataIndex: 'code',
-  title: '商品sku编码'
+var columns = [{
+  dataIndex: '',
+  title: '序号',
+  width: 100,
+  render: function render(value, record, index) {
+    return /*#__PURE__*/React.createElement("span", null, index);
+  }
 }, {
   dataIndex: 'name',
-  title: '商品sku名称'
-}, {
-  dataIndex: 'simpleName',
-  title: '简称'
+  title: '商品名称'
 }, {
   dataIndex: 'goodsId',
   title: '商品id'
 }, {
-  dataIndex: 'goodsCode',
-  title: '商品编码'
-}, {
-  dataIndex: 'goodsName',
-  title: '商品名称'
+  dataIndex: 'name',
+  title: '商品sku名称'
 }, {
-  dataIndex: 'status',
-  title: '商品状态'
+  dataIndex: 'code',
+  title: '商品编码'
 }, {
-  dataIndex: 'marketPrice',
-  title: '市场价'
+  dataIndex: 'skuCode',
+  title: '商品sku编码'
 }];
 var GoodsModal$1 = function GoodsModal(props, ref) {
   useImperativeHandle(ref, function () {
@@ -9669,7 +9658,8 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   var onSubmit = props.onSubmit,
     shopId = props.shopId,
     shopList = props.shopList,
-    width = props.width;
+    width = props.width,
+    shopCode = props.shopCode;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
@@ -9786,7 +9776,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
           _context.prev = 0;
           setLoading(true);
           params = {
-            shopCode: ''
+            shopCode: shopCode
           };
           _context.next = 5;
           return extendRequest('/qy/gdfw/product/bsListProduct', {
@@ -9798,18 +9788,19 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
           products = res.data.products;
           console.log(products.length);
           setAllList(_toConsumableArray(products));
+          setFilterList(_toConsumableArray(products));
           setGoodList(products.splice(0, pageSize));
           setTotal(products.length);
-        case 11:
-          _context.prev = 11;
+        case 12:
+          _context.prev = 12;
           setLoading(false);
-          return _context.finish(11);
-        case 14:
+          return _context.finish(12);
+        case 15:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0,, 11, 14]]);
-  })), [searchParams]);
+    }, _callee, null, [[0,, 12, 15]]);
+  })), [shopCode]);
   useEffect(function () {
     var shopInfo = shopList.find(function (item) {
       return shopId === item.shopId || shopId === item.shopName;
@@ -9835,9 +9826,21 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   };
   var onFinish = function onFinish(value) {
     console.log(value);
+    var filterList = allList.filter(function (item) {
+      return Object.keys(value).some(function (key) {
+        return value[key] && item[key].indexOf(value[key]) > -1;
+      });
+    });
+    console.log(filterList);
+    setFilterList(filterList);
+    setTotal(filterList.length);
+    setPageNo(1);
   };
   var onReset = function onReset() {
     form.resetFields();
+    setFilterList(allList);
+    setTotal(allList.length);
+    setPageNo(1);
   };
   return /*#__PURE__*/React.createElement(Modal, {
     title: '选择商品',
@@ -9855,13 +9858,17 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     form: form,
     onFinish: onFinish
   }, /*#__PURE__*/React.createElement(Form.Item, {
+    name: "goodsName"
+  }, /*#__PURE__*/React.createElement(Input, {
+    placeholder: "\u8BF7\u8F93\u5165\u5546\u54C1\u540D\u79F0"
+  })), /*#__PURE__*/React.createElement(Form.Item, {
     name: "goodsCode"
   }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u7F16\u7801"
+    placeholder: "\u8BF7\u8F93\u5165\u5546\u54C1\u7F16\u7801"
   })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodsName"
+    name: "code"
   }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u540D\u79F0"
+    placeholder: "\u8BF7\u8F93\u5165\u5546\u54C1sku\u7F16\u7801"
   })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     htmlType: "submit"
@@ -9873,7 +9880,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     rowSelection: rowSelection,
     columns: columns,
     rowKey: 'id',
-    dataSource: searchParams.type == 'select' ? selectList : goodList,
+    dataSource: goodList,
     scroll: {
       y: 300
     },
@@ -9918,6 +9925,7 @@ var GoodItem = function GoodItem(props) {
     otherOperations = _props$otherOperation === void 0 ? null : _props$otherOperation,
     _props$canUpdateNumbe = props.canUpdateNumber,
     canUpdateNumber = _props$canUpdateNumbe === void 0 ? false : _props$canUpdateNumbe,
+    shopCode = props.shopCode,
     onSelect = props.onSelect,
     onDelete = props.onDelete;
   var refModal = useRef();
@@ -10044,17 +10052,19 @@ var GoodItem = function GoodItem(props) {
   }, [showHeader, value, disabled]);
   var onSubmit = function onSubmit(list) {
     var newList = list.map(function (item) {
-      var picUrl = item.picUrl,
-        title = item.title,
-        price = item.price,
-        numIid = item.numIid;
+      var id = item.id,
+        goodsName = item.goodsName,
+        goodsId = item.goodsId,
+        name = item.name,
+        code = item.code,
+        skuCode = item.skuCode;
       return {
-        id: numIid,
-        pic: picUrl,
-        name: title,
-        code: '',
-        sku: '',
-        money: price,
+        id: goodsId,
+        pic: '',
+        name: goodsName,
+        code: code,
+        sku: skuCode,
+        money: '',
         share: '',
         number: 1,
         type: '',
@@ -10110,13 +10120,15 @@ var GoodItem = function GoodItem(props) {
     width: width,
     shopList: shopList,
     shopId: shopId,
-    maxLength: maxLength
+    maxLength: maxLength,
+    shopCode: shopCode
   }));
 };
 
 var BsGoods = function BsGoods(props) {
   var value = props.value,
-    disabled = props.disabled;
+    disabled = props.disabled,
+    onChange = props.onChange;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     tableSelect = _useState2[0],
@@ -10132,17 +10144,17 @@ var BsGoods = function BsGoods(props) {
   var reissueRef = useRef();
   useEffect(function () {
     ref.current = pubsub.subscribeOnce('type', function (type, val) {
-      console.log('goods', type, val, value);
+      var _value$bsGoods;
       if (disabled) return;
       setWithInfo({
         type: type,
         val: val
       });
       setTableSelect(['2', '4'].includes(val));
-      if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : value.length)) {
+      if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : (_value$bsGoods = value.bsGoods) === null || _value$bsGoods === void 0 ? void 0 : _value$bsGoods.length)) {
         pubsub.publish('selectList', {
           type: val,
-          list: _toConsumableArray(value).map(function (item) {
+          list: ((value === null || value === void 0 ? void 0 : value.bsGoods) || []).map(function (item) {
             item.canDelete = false;
             return item;
           })
@@ -10151,17 +10163,17 @@ var BsGoods = function BsGoods(props) {
     });
     //补发
     reissueRef.current = pubsub.subscribeOnce('reissueType', function (type, val) {
+      var _value$bsGoods2;
       if (disabled) return;
-      console.log('reissueType', type, val, value);
       setWithInfo({
         type: type,
         val: val
       });
       setTableSelect(['2', '4'].includes(val));
-      if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : value.length)) {
+      if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : (_value$bsGoods2 = value.bsGoods) === null || _value$bsGoods2 === void 0 ? void 0 : _value$bsGoods2.length)) {
         pubsub.publish('reissueSelectList', {
           type: val,
-          list: (value || []).map(function (item) {
+          list: ((value === null || value === void 0 ? void 0 : value.bsGoods) || []).map(function (item) {
             item.canDelete = false;
             return item;
           })
@@ -10190,16 +10202,26 @@ var BsGoods = function BsGoods(props) {
     pubsub.publish('deleteGood', deleteId);
     pubsub.publish('reissueDeleteGood', deleteId);
   };
+  var changeHandle = function changeHandle(list) {
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+      bsGoods: list
+    }));
+  };
   return /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
-    key: 'bsGoods',
-    disabled: disabled
+    key: 'bsGoods'
   }, props), {}, {
+    disabled: disabled,
+    value: value === null || value === void 0 ? void 0 : value.bsGoods,
+    shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     tableSelect: tableSelect,
     onSelect: function onSelect(list) {
       return _onSelect(list);
     },
     onDelete: function onDelete(item) {
       return _onDelete(item);
+    },
+    onChange: function onChange(val) {
+      return changeHandle(val);
     }
   }));
 };
@@ -10214,16 +10236,6 @@ var BsExchange = function BsExchange(props) {
     disabled = props.disabled,
     other = _objectWithoutProperties(props, _excluded$b);
   useEffect(function () {
-    pubsub.subscribeOnce('selectList', function (_, data) {
-      if (disabled) return;
-      if (value) {
-        var newData = cloneDeep(data);
-        console.log('BsExchange', 'getListHandle', data, value, getListHandle(_toConsumableArray(newData.list), value));
-        onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-          bsExchangeReturnGoods: getListHandle(_toConsumableArray(newData.list), value)
-        }));
-      }
-    });
     pubsub.subscribeOnce('deleteGood', function (_, data) {
       if (disabled) return;
       if (value) {
@@ -10295,6 +10307,15 @@ var BsExchange = function BsExchange(props) {
     newValue.bsExchangeGiftGoods = [];
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     pubsub.publish('type', val[0]);
+    pubsub.subscribeOnce('selectList', function (_, data) {
+      if (disabled) return;
+      if (newValue) {
+        var newData = cloneDeep(data);
+        onChange(_objectSpread2(_objectSpread2({}, newValue), {}, {
+          bsExchangeReturnGoods: getListHandle(_toConsumableArray(newData.list), newValue)
+        }));
+      }
+    });
   };
   var changeHandle = function changeHandle(val, key) {
     var newValue = _objectSpread2({}, value);
@@ -10355,6 +10376,7 @@ var BsExchange = function BsExchange(props) {
     disabled: disabled,
     showChangeBtn: false,
     value: value === null || value === void 0 ? void 0 : value.bsExchangeReturnGoods,
+    shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     onChange: function onChange(val) {
       return changeHandle(val, 'bsExchangeReturnGoods');
     }
@@ -10364,6 +10386,7 @@ var BsExchange = function BsExchange(props) {
     }, other), {}, {
       disabled: disabled,
       showChangeBtn: showChangeBtn,
+      shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
       value: item === null || item === void 0 ? void 0 : item.bsExchangeReturnGoods,
       onChange: function onChange(val) {
         return changeReturnHandle(val, index, 'bsExchangeReturnGoods');
@@ -10375,6 +10398,7 @@ var BsExchange = function BsExchange(props) {
       showChangeBtn: showChangeBtn,
       otherOperations: copyGoods(index),
       value: item === null || item === void 0 ? void 0 : item.bsExchangeSwapOutGoods,
+      shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
       onChange: function onChange(val) {
         return changeReturnHandle(val, index, 'bsExchangeSwapOutGoods');
       }
@@ -10400,20 +10424,6 @@ var BsReissue = function BsReissue(props) {
     disabled = props.disabled,
     other = _objectWithoutProperties(props, _excluded$c);
   useEffect(function () {
-    pubsub.subscribeOnce('reissueSelectList', function (_, data) {
-      if (disabled) return;
-      console.log(data, value);
-      if (value) {
-        var newData = cloneDeep(data);
-        onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-          bsReissueGoods: ((newData === null || newData === void 0 ? void 0 : newData.list) || []).map(function (item) {
-            item.money = 0;
-            item.canUpdateNumber = ['2', '4'].includes(newData === null || newData === void 0 ? void 0 : newData.type);
-            return item;
-          })
-        }));
-      }
-    });
     pubsub.subscribeOnce('reissueDeleteGood', function (_, data) {
       if (disabled) return;
       if (value) {
@@ -10436,10 +10446,23 @@ var BsReissue = function BsReissue(props) {
     newValue[key] = val;
     if (key === 'bsReissueType') {
       newValue.bsReissueGoods = [];
+      onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
     }
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
     if (key === 'bsReissueType') {
       pubsub.publish('reissueType', val[0]);
+      pubsub.subscribeOnce('reissueSelectList', function (_, data) {
+        if (disabled) return;
+        if (value) {
+          var newData = cloneDeep(data);
+          onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, newValue), {}, {
+            bsReissueGoods: ((newData === null || newData === void 0 ? void 0 : newData.list) || []).map(function (item) {
+              item.money = 0;
+              item.canUpdateNumber = ['2', '4'].includes(newData === null || newData === void 0 ? void 0 : newData.type);
+              return item;
+            })
+          }));
+        }
+      });
     }
   };
   //显示选择商品按钮 原单换不显示选择商品
@@ -10464,6 +10487,7 @@ var BsReissue = function BsReissue(props) {
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
+    shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     value: value === null || value === void 0 ? void 0 : value.bsReissueGoods,
     onChange: function onChange(val) {
       return changeHandle(val, 'bsReissueGoods');
@@ -10474,7 +10498,7 @@ var BsReissue = function BsReissue(props) {
 var css_248z$9 = ".goodsBox {\n  display: flex;\n  flex-wrap: wrap;\n}\n.goods-imgBox {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border: 1px solid #F2F3F5;\n  margin: 0 10px 10px 0;\n  text-align: center;\n}\n.icon-close {\n  position: absolute;\n  top: -5px;\n  right: -5px;\n  width: 13px;\n  height: 13px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  border-radius: 50%;\n  z-index: 3;\n  background-color: #fff;\n  cursor: pointer;\n}\n.img {\n  width: 100%;\n  height: 100%;\n  -o-object-fit: contain;\n     object-fit: contain;\n}\n.goods-title {\n  margin: 0 0 10px 5px;\n  color: #4E5969;\n}\n.deg90 {\n  transform: rotate(90deg);\n}\n.goodMain {\n  display: flex;\n  flex-wrap: wrap;\n  height: 265px;\n  overflow-y: auto;\n  margin-bottom: 10px;\n}\n.goodMain .goodItem {\n  width: 140px;\n  height: 175px;\n  padding: 11px 10px 0;\n  text-align: center;\n  display: inline-block;\n  vertical-align: top;\n  margin-bottom: 10px;\n  margin-right: 30px;\n  border: 1px solid #e6e6e6;\n  cursor: pointer;\n  transition: border 0.3s;\n}\n.goodMain .goodItem .goodImg {\n  width: 120px;\n  height: 120px;\n}\n.goodMain .goodItem .goodText {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.goodMain .goodItem.active {\n  border: 1px solid #3089dc;\n}\n.right-context {\n  display: flex;\n  flex-direction: column;\n}\n";
 styleInject(css_248z$9);
 
-var TabPane$2 = Tabs.TabPane;
+var TabPane$1 = Tabs.TabPane;
 var Option$2 = Select.Option;
 var Search$1 = Input.Search;
 var GoodsModal$3 = function GoodsModal(props) {
@@ -10790,7 +10814,7 @@ var GoodsModal$3 = function GoodsModal(props) {
       }));
     }
   }, tabs.map(function (tab) {
-    return /*#__PURE__*/React.createElement(TabPane$2, {
+    return /*#__PURE__*/React.createElement(TabPane$1, {
       tab: tab.tab + (tab.key === 'all' ? "(".concat(selectList.length, ")") : ''),
       key: tab.key
     });

package/dist/index.js

@@ -9439,7 +9439,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
       value: value === null || value === void 0 ? void 0 : value.trajectorySnapshot
     });
   };
-  return /*#__PURE__*/React__default['default'].createElement("div", null, LogisticsCompany(), LogisticsCode(), (value === null || value === void 0 ? void 0 : value.trajectoryCompany) === 'SF' ? LogisticsPhone() : null, showField.includes('snapshot') ? /*#__PURE__*/React__default['default'].createElement(LogisticsSnapshot, null) : null);
+  return /*#__PURE__*/React__default['default'].createElement("div", null, LogisticsCompany(), LogisticsCode(), (value === null || value === void 0 ? void 0 : value.trajectoryCompany) === 'SF' ? LogisticsPhone() : null, showField && showField.includes('snapshot') ? /*#__PURE__*/React__default['default'].createElement(LogisticsSnapshot, null) : null);
 };
 
 var jstGoods = function jstGoods(props) {
@@ -9453,7 +9453,7 @@ var jstGoods = function jstGoods(props) {
     _props$type = props.type,
     type = _props$type === void 0 ? 1 : _props$type,
     _props$showField = props.showField,
-    showField = _props$showField === void 0 ? 'all' : _props$showField;
+    showField = _props$showField === void 0 ? '' : _props$showField;
   var _useState = React.useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
@@ -9630,39 +9630,28 @@ var ItemList = function ItemList(props) {
   }, "\u6682\u4E0D\u652F\u6301\u6DFB\u52A0")) : null);
 };
 
-var TabPane$1 = antd.Tabs.TabPane;
-var columns = [
-// {
-//   dataIndex: 'picUrl',
-//   title: '主图',
-//   render: (val: string) => {
-//     return <Image width={60} src={val} />;
-//   },
-// },
-{
-  dataIndex: 'code',
-  title: '商品sku编码'
+var columns = [{
+  dataIndex: '',
+  title: '序号',
+  width: 100,
+  render: function render(value, record, index) {
+    return /*#__PURE__*/React__default['default'].createElement("span", null, index);
+  }
 }, {
   dataIndex: 'name',
-  title: '商品sku名称'
-}, {
-  dataIndex: 'simpleName',
-  title: '简称'
+  title: '商品名称'
 }, {
   dataIndex: 'goodsId',
   title: '商品id'
 }, {
-  dataIndex: 'goodsCode',
-  title: '商品编码'
-}, {
-  dataIndex: 'goodsName',
-  title: '商品名称'
+  dataIndex: 'name',
+  title: '商品sku名称'
 }, {
-  dataIndex: 'status',
-  title: '商品状态'
+  dataIndex: 'code',
+  title: '商品编码'
 }, {
-  dataIndex: 'marketPrice',
-  title: '市场价'
+  dataIndex: 'skuCode',
+  title: '商品sku编码'
 }];
 var GoodsModal$1 = function GoodsModal(props, ref) {
   React.useImperativeHandle(ref, function () {
@@ -9680,7 +9669,8 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   var onSubmit = props.onSubmit,
     shopId = props.shopId,
     shopList = props.shopList,
-    width = props.width;
+    width = props.width,
+    shopCode = props.shopCode;
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
@@ -9797,7 +9787,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
           _context.prev = 0;
           setLoading(true);
           params = {
-            shopCode: ''
+            shopCode: shopCode
           };
           _context.next = 5;
           return extendRequest('/qy/gdfw/product/bsListProduct', {
@@ -9809,18 +9799,19 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
           products = res.data.products;
           console.log(products.length);
           setAllList(_toConsumableArray(products));
+          setFilterList(_toConsumableArray(products));
           setGoodList(products.splice(0, pageSize));
           setTotal(products.length);
-        case 11:
-          _context.prev = 11;
+        case 12:
+          _context.prev = 12;
           setLoading(false);
-          return _context.finish(11);
-        case 14:
+          return _context.finish(12);
+        case 15:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0,, 11, 14]]);
-  })), [searchParams]);
+    }, _callee, null, [[0,, 12, 15]]);
+  })), [shopCode]);
   React.useEffect(function () {
     var shopInfo = shopList.find(function (item) {
       return shopId === item.shopId || shopId === item.shopName;
@@ -9846,9 +9837,21 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   };
   var onFinish = function onFinish(value) {
     console.log(value);
+    var filterList = allList.filter(function (item) {
+      return Object.keys(value).some(function (key) {
+        return value[key] && item[key].indexOf(value[key]) > -1;
+      });
+    });
+    console.log(filterList);
+    setFilterList(filterList);
+    setTotal(filterList.length);
+    setPageNo(1);
   };
   var onReset = function onReset() {
     form.resetFields();
+    setFilterList(allList);
+    setTotal(allList.length);
+    setPageNo(1);
   };
   return /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
     title: '选择商品',
@@ -9866,13 +9869,17 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     form: form,
     onFinish: onFinish
   }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
+    name: "goodsName"
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    placeholder: "\u8BF7\u8F93\u5165\u5546\u54C1\u540D\u79F0"
+  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
     name: "goodsCode"
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1\u7F16\u7801"
+    placeholder: "\u8BF7\u8F93\u5165\u5546\u54C1\u7F16\u7801"
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodsName"
+    name: "code"
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1\u540D\u79F0"
+    placeholder: "\u8BF7\u8F93\u5165\u5546\u54C1sku\u7F16\u7801"
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "primary",
     htmlType: "submit"
@@ -9884,7 +9891,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     rowSelection: rowSelection,
     columns: columns,
     rowKey: 'id',
-    dataSource: searchParams.type == 'select' ? selectList : goodList,
+    dataSource: goodList,
     scroll: {
       y: 300
     },
@@ -9929,6 +9936,7 @@ var GoodItem = function GoodItem(props) {
     otherOperations = _props$otherOperation === void 0 ? null : _props$otherOperation,
     _props$canUpdateNumbe = props.canUpdateNumber,
     canUpdateNumber = _props$canUpdateNumbe === void 0 ? false : _props$canUpdateNumbe,
+    shopCode = props.shopCode,
     onSelect = props.onSelect,
     onDelete = props.onDelete;
   var refModal = React.useRef();
@@ -10055,17 +10063,19 @@ var GoodItem = function GoodItem(props) {
   }, [showHeader, value, disabled]);
   var onSubmit = function onSubmit(list) {
     var newList = list.map(function (item) {
-      var picUrl = item.picUrl,
-        title = item.title,
-        price = item.price,
-        numIid = item.numIid;
+      var id = item.id,
+        goodsName = item.goodsName,
+        goodsId = item.goodsId,
+        name = item.name,
+        code = item.code,
+        skuCode = item.skuCode;
       return {
-        id: numIid,
-        pic: picUrl,
-        name: title,
-        code: '',
-        sku: '',
-        money: price,
+        id: goodsId,
+        pic: '',
+        name: goodsName,
+        code: code,
+        sku: skuCode,
+        money: '',
         share: '',
         number: 1,
         type: '',
@@ -10121,13 +10131,15 @@ var GoodItem = function GoodItem(props) {
     width: width,
     shopList: shopList,
     shopId: shopId,
-    maxLength: maxLength
+    maxLength: maxLength,
+    shopCode: shopCode
   }));
 };
 
 var BsGoods = function BsGoods(props) {
   var value = props.value,
-    disabled = props.disabled;
+    disabled = props.disabled,
+    onChange = props.onChange;
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     tableSelect = _useState2[0],
@@ -10143,17 +10155,17 @@ var BsGoods = function BsGoods(props) {
   var reissueRef = React.useRef();
   React.useEffect(function () {
     ref.current = pubsub__default['default'].subscribeOnce('type', function (type, val) {
-      console.log('goods', type, val, value);
+      var _value$bsGoods;
       if (disabled) return;
       setWithInfo({
         type: type,
         val: val
       });
       setTableSelect(['2', '4'].includes(val));
-      if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : value.length)) {
+      if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : (_value$bsGoods = value.bsGoods) === null || _value$bsGoods === void 0 ? void 0 : _value$bsGoods.length)) {
         pubsub__default['default'].publish('selectList', {
           type: val,
-          list: _toConsumableArray(value).map(function (item) {
+          list: ((value === null || value === void 0 ? void 0 : value.bsGoods) || []).map(function (item) {
             item.canDelete = false;
             return item;
           })
@@ -10162,17 +10174,17 @@ var BsGoods = function BsGoods(props) {
     });
     //补发
     reissueRef.current = pubsub__default['default'].subscribeOnce('reissueType', function (type, val) {
+      var _value$bsGoods2;
       if (disabled) return;
-      console.log('reissueType', type, val, value);
       setWithInfo({
         type: type,
         val: val
       });
       setTableSelect(['2', '4'].includes(val));
-      if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : value.length)) {
+      if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : (_value$bsGoods2 = value.bsGoods) === null || _value$bsGoods2 === void 0 ? void 0 : _value$bsGoods2.length)) {
         pubsub__default['default'].publish('reissueSelectList', {
           type: val,
-          list: (value || []).map(function (item) {
+          list: ((value === null || value === void 0 ? void 0 : value.bsGoods) || []).map(function (item) {
             item.canDelete = false;
             return item;
           })
@@ -10201,16 +10213,26 @@ var BsGoods = function BsGoods(props) {
     pubsub__default['default'].publish('deleteGood', deleteId);
     pubsub__default['default'].publish('reissueDeleteGood', deleteId);
   };
+  var changeHandle = function changeHandle(list) {
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+      bsGoods: list
+    }));
+  };
   return /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
-    key: 'bsGoods',
-    disabled: disabled
+    key: 'bsGoods'
   }, props), {}, {
+    disabled: disabled,
+    value: value === null || value === void 0 ? void 0 : value.bsGoods,
+    shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     tableSelect: tableSelect,
     onSelect: function onSelect(list) {
       return _onSelect(list);
     },
     onDelete: function onDelete(item) {
       return _onDelete(item);
+    },
+    onChange: function onChange(val) {
+      return changeHandle(val);
     }
   }));
 };
@@ -10225,16 +10247,6 @@ var BsExchange = function BsExchange(props) {
     disabled = props.disabled,
     other = _objectWithoutProperties(props, _excluded$b);
   React.useEffect(function () {
-    pubsub__default['default'].subscribeOnce('selectList', function (_, data) {
-      if (disabled) return;
-      if (value) {
-        var newData = lodash.cloneDeep(data);
-        console.log('BsExchange', 'getListHandle', data, value, getListHandle(_toConsumableArray(newData.list), value));
-        onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-          bsExchangeReturnGoods: getListHandle(_toConsumableArray(newData.list), value)
-        }));
-      }
-    });
     pubsub__default['default'].subscribeOnce('deleteGood', function (_, data) {
       if (disabled) return;
       if (value) {
@@ -10306,6 +10318,15 @@ var BsExchange = function BsExchange(props) {
     newValue.bsExchangeGiftGoods = [];
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     pubsub__default['default'].publish('type', val[0]);
+    pubsub__default['default'].subscribeOnce('selectList', function (_, data) {
+      if (disabled) return;
+      if (newValue) {
+        var newData = lodash.cloneDeep(data);
+        onChange(_objectSpread2(_objectSpread2({}, newValue), {}, {
+          bsExchangeReturnGoods: getListHandle(_toConsumableArray(newData.list), newValue)
+        }));
+      }
+    });
   };
   var changeHandle = function changeHandle(val, key) {
     var newValue = _objectSpread2({}, value);
@@ -10366,6 +10387,7 @@ var BsExchange = function BsExchange(props) {
     disabled: disabled,
     showChangeBtn: false,
     value: value === null || value === void 0 ? void 0 : value.bsExchangeReturnGoods,
+    shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     onChange: function onChange(val) {
       return changeHandle(val, 'bsExchangeReturnGoods');
     }
@@ -10375,6 +10397,7 @@ var BsExchange = function BsExchange(props) {
     }, other), {}, {
       disabled: disabled,
       showChangeBtn: showChangeBtn,
+      shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
       value: item === null || item === void 0 ? void 0 : item.bsExchangeReturnGoods,
       onChange: function onChange(val) {
         return changeReturnHandle(val, index, 'bsExchangeReturnGoods');
@@ -10386,6 +10409,7 @@ var BsExchange = function BsExchange(props) {
       showChangeBtn: showChangeBtn,
       otherOperations: copyGoods(index),
       value: item === null || item === void 0 ? void 0 : item.bsExchangeSwapOutGoods,
+      shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
       onChange: function onChange(val) {
         return changeReturnHandle(val, index, 'bsExchangeSwapOutGoods');
       }
@@ -10411,20 +10435,6 @@ var BsReissue = function BsReissue(props) {
     disabled = props.disabled,
     other = _objectWithoutProperties(props, _excluded$c);
   React.useEffect(function () {
-    pubsub__default['default'].subscribeOnce('reissueSelectList', function (_, data) {
-      if (disabled) return;
-      console.log(data, value);
-      if (value) {
-        var newData = lodash.cloneDeep(data);
-        onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-          bsReissueGoods: ((newData === null || newData === void 0 ? void 0 : newData.list) || []).map(function (item) {
-            item.money = 0;
-            item.canUpdateNumber = ['2', '4'].includes(newData === null || newData === void 0 ? void 0 : newData.type);
-            return item;
-          })
-        }));
-      }
-    });
     pubsub__default['default'].subscribeOnce('reissueDeleteGood', function (_, data) {
       if (disabled) return;
       if (value) {
@@ -10447,10 +10457,23 @@ var BsReissue = function BsReissue(props) {
     newValue[key] = val;
     if (key === 'bsReissueType') {
       newValue.bsReissueGoods = [];
+      onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
     }
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
     if (key === 'bsReissueType') {
       pubsub__default['default'].publish('reissueType', val[0]);
+      pubsub__default['default'].subscribeOnce('reissueSelectList', function (_, data) {
+        if (disabled) return;
+        if (value) {
+          var newData = lodash.cloneDeep(data);
+          onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, newValue), {}, {
+            bsReissueGoods: ((newData === null || newData === void 0 ? void 0 : newData.list) || []).map(function (item) {
+              item.money = 0;
+              item.canUpdateNumber = ['2', '4'].includes(newData === null || newData === void 0 ? void 0 : newData.type);
+              return item;
+            })
+          }));
+        }
+      });
     }
   };
   //显示选择商品按钮 原单换不显示选择商品
@@ -10475,6 +10498,7 @@ var BsReissue = function BsReissue(props) {
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
+    shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     value: value === null || value === void 0 ? void 0 : value.bsReissueGoods,
     onChange: function onChange(val) {
       return changeHandle(val, 'bsReissueGoods');
@@ -10485,7 +10509,7 @@ var BsReissue = function BsReissue(props) {
 var css_248z$9 = ".goodsBox {\n  display: flex;\n  flex-wrap: wrap;\n}\n.goods-imgBox {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border: 1px solid #F2F3F5;\n  margin: 0 10px 10px 0;\n  text-align: center;\n}\n.icon-close {\n  position: absolute;\n  top: -5px;\n  right: -5px;\n  width: 13px;\n  height: 13px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  border-radius: 50%;\n  z-index: 3;\n  background-color: #fff;\n  cursor: pointer;\n}\n.img {\n  width: 100%;\n  height: 100%;\n  -o-object-fit: contain;\n     object-fit: contain;\n}\n.goods-title {\n  margin: 0 0 10px 5px;\n  color: #4E5969;\n}\n.deg90 {\n  transform: rotate(90deg);\n}\n.goodMain {\n  display: flex;\n  flex-wrap: wrap;\n  height: 265px;\n  overflow-y: auto;\n  margin-bottom: 10px;\n}\n.goodMain .goodItem {\n  width: 140px;\n  height: 175px;\n  padding: 11px 10px 0;\n  text-align: center;\n  display: inline-block;\n  vertical-align: top;\n  margin-bottom: 10px;\n  margin-right: 30px;\n  border: 1px solid #e6e6e6;\n  cursor: pointer;\n  transition: border 0.3s;\n}\n.goodMain .goodItem .goodImg {\n  width: 120px;\n  height: 120px;\n}\n.goodMain .goodItem .goodText {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.goodMain .goodItem.active {\n  border: 1px solid #3089dc;\n}\n.right-context {\n  display: flex;\n  flex-direction: column;\n}\n";
 styleInject(css_248z$9);
 
-var TabPane$2 = antd.Tabs.TabPane;
+var TabPane$1 = antd.Tabs.TabPane;
 var Option$2 = antd.Select.Option;
 var Search$1 = antd.Input.Search;
 var GoodsModal$3 = function GoodsModal(props) {
@@ -10801,7 +10825,7 @@ var GoodsModal$3 = function GoodsModal(props) {
       }));
     }
   }, tabs.map(function (tab) {
-    return /*#__PURE__*/React__default['default'].createElement(TabPane$2, {
+    return /*#__PURE__*/React__default['default'].createElement(TabPane$1, {
       tab: tab.tab + (tab.key === 'all' ? "(".concat(selectList.length, ")") : ''),
       key: tab.key
     });

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

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

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

@@ -4,6 +4,7 @@ interface GoodModelProps {
     maxLength: number;
     shopList: any[];
     width?: string | number;
+    shopCode?: 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.7.15-alpha.38",
+  "version": "0.7.15-alpha.40",
   "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.36",
+    "@kmkf-fe-packages/kmkf-utils": "^0.7.15-alpha.40",
     "lodash": "^4.17.21",
     "pubsub-js": "^1.9.4",
     "umi-request": "^1.4.0"
@@ -58,5 +58,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d65f522019c81b1f86a99b4af3fbc9892c185f59"
+  "gitHead": "57c6d523ffca6dc56f9593cdd18e89a142971318"
 }