@fle-ui/plus-choose-goods 0.0.7 → 0.0.9

package/es/index.js

@@ -210,7 +210,9 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     if (open) {
       var _formRef$current;
       var values = (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getFieldsValue();
-      getGoodsList(_objectSpread(_objectSpread({}, searchParams), values));
+      var newParams = _objectSpread(_objectSpread({}, DefaultParams), values);
+      setSearchParams(newParams);
+      getGoodsList(newParams);
       getSelfGoodsFlag();
       getSelfGoodsFlagCategory();
     } else {
@@ -234,6 +236,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
   };
   var rowSelection = {
     selectedRowKeys: selectedRowKeys,
+    defaultSelectedRowKeys: defaultSelectedGoodsIds,
     onChange: onSelectChange,
     getCheckboxProps: function getCheckboxProps(row) {
       return {
@@ -241,9 +244,10 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
       };
     }
   };
-  useEffect(function () {
-    setSelectedRowKeys(defaultSelectedGoodsIds);
-  }, [defaultSelectedGoodsIds]);
+  var resetRows = function resetRows() {
+    setSelectedRowKeys([]);
+    setSelectedRows([]);
+  };
   var defaultColumns = [{
     title: '商品信息',
     key: 'goodsInfo',
@@ -326,12 +330,11 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     align: 'center',
     fixed: 'right',
     width: 80,
-    hideInTable: multiple,
     render: function render(text, record) {
       if (defaultSelectedGoodsIds.includes(record[rowKey])) {
         return /*#__PURE__*/React.createElement("span", {
           style: {
-            color: "#999"
+            color: '#999'
           }
         }, "\u5DF2\u6311\u9009");
       }
@@ -343,13 +346,13 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     }
   }];
   return /*#__PURE__*/React.createElement(PlusConfigProvider, null, /*#__PURE__*/React.createElement(_Modal, {
+    centered: true,
     title: "\u6311\u9009\u5546\u54C1",
     open: open,
     footer: null,
-    width: 1366,
+    width: 1300,
     onCancel: onCancel,
-    className: "choose-goods-modal",
-    centered: true
+    className: "choose-goods-modal"
   }, /*#__PURE__*/React.createElement(QueryFilter, {
     className: "fle-choose-mall-filter",
     formRef: formRef,
@@ -514,17 +517,26 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     loading: getGoodsListLoading,
     scroll: scroll,
     rowSelection: multiple ? rowSelection : undefined
-  }), multiple && /*#__PURE__*/React.createElement(_Button, {
-    type: "primary",
+  }), multiple && /*#__PURE__*/React.createElement("div", {
     style: {
       position: 'absolute',
       bottom: 16,
       right: 24
+    }
+  }, defaultSelectedGoodsIds.length > 0 && /*#__PURE__*/React.createElement("span", {
+    style: {
+      fontSize: 12
+    }
+  }, "\u5DF2\u6311\u9009\uFF1A", defaultSelectedGoodsIds.length), /*#__PURE__*/React.createElement(_Button, {
+    type: "primary",
+    style: {
+      marginLeft: 8
     },
     onClick: function onClick() {
-      return onOk(selectedRowKeys, selectedRows);
+      resetRows();
+      onOk(selectedRowKeys, selectedRows);
     },
     disabled: selectedRowKeys.length === 0
-  }, "\u6279\u91CF\u6311\u9009(", selectedRowKeys.length, ")")));
+  }, "\u6279\u91CF\u6311\u9009(", Math.max(selectedRowKeys.length, 0), ")"))));
 };
 export default ChooseSiteGoods;

package/es/index.less

@@ -4,6 +4,7 @@
   .fle-modal-body {
     padding: 0 !important;
   }
+
   .fle-radio-button-wrapper {
     padding-inline: 12px;
   }

package/es/utils/options.js

@@ -48,6 +48,12 @@ export var priceRangeForOnce = [{
 }];
 // 集采价格筛选配置 - 营销云
 export var priceRangeForPurchase = [{
+  label: '集采采购价',
+  value: 'purchasePurchasePrice'
+}, {
+  label: '代发采购价',
+  value: 'oncePurchasePrice'
+}, {
   label: '集采市场价',
   value: 'purchaseMarketPrice'
 }, {
@@ -59,12 +65,6 @@ export var priceRangeForPurchase = [{
 }, {
   label: '代发销售价',
   value: 'onceSalePrice'
-}, {
-  label: '集采分销价',
-  value: 'purchaseSitePrice'
-}, {
-  label: '代发分销价',
-  value: 'onceSitePrice'
 }];
 // 一件代发利润率筛选配置 - 非营销云
 export var profitRangeForOnce = [{

package/lib/index.js

@@ -204,7 +204,9 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     if (open) {
       var _formRef$current;
       var values = (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getFieldsValue();
-      getGoodsList(_objectSpread(_objectSpread({}, searchParams), values));
+      var newParams = _objectSpread(_objectSpread({}, DefaultParams), values);
+      setSearchParams(newParams);
+      getGoodsList(newParams);
       getSelfGoodsFlag();
       getSelfGoodsFlagCategory();
     } else {
@@ -228,6 +230,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
   };
   var rowSelection = {
     selectedRowKeys: selectedRowKeys,
+    defaultSelectedRowKeys: defaultSelectedGoodsIds,
     onChange: onSelectChange,
     getCheckboxProps: function getCheckboxProps(row) {
       return {
@@ -235,9 +238,10 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
       };
     }
   };
-  (0, _react.useEffect)(function () {
-    setSelectedRowKeys(defaultSelectedGoodsIds);
-  }, [defaultSelectedGoodsIds]);
+  var resetRows = function resetRows() {
+    setSelectedRowKeys([]);
+    setSelectedRows([]);
+  };
   var defaultColumns = [{
     title: '商品信息',
     key: 'goodsInfo',
@@ -320,12 +324,11 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     align: 'center',
     fixed: 'right',
     width: 80,
-    hideInTable: multiple,
     render: function render(text, record) {
       if (defaultSelectedGoodsIds.includes(record[rowKey])) {
         return /*#__PURE__*/_react.default.createElement("span", {
           style: {
-            color: "#999"
+            color: '#999'
           }
         }, "\u5DF2\u6311\u9009");
       }
@@ -337,13 +340,13 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     }
   }];
   return /*#__PURE__*/_react.default.createElement(_plusConfigProvider.default, null, /*#__PURE__*/_react.default.createElement(_antd.Modal, {
+    centered: true,
     title: "\u6311\u9009\u5546\u54C1",
     open: open,
     footer: null,
-    width: 1366,
+    width: 1300,
     onCancel: onCancel,
-    className: "choose-goods-modal",
-    centered: true
+    className: "choose-goods-modal"
   }, /*#__PURE__*/_react.default.createElement(_proComponents.QueryFilter, {
     className: "fle-choose-mall-filter",
     formRef: formRef,
@@ -508,17 +511,26 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     loading: getGoodsListLoading,
     scroll: scroll,
     rowSelection: multiple ? rowSelection : undefined
-  }), multiple && /*#__PURE__*/_react.default.createElement(_antd.Button, {
-    type: "primary",
+  }), multiple && /*#__PURE__*/_react.default.createElement("div", {
     style: {
       position: 'absolute',
       bottom: 16,
       right: 24
+    }
+  }, defaultSelectedGoodsIds.length > 0 && /*#__PURE__*/_react.default.createElement("span", {
+    style: {
+      fontSize: 12
+    }
+  }, "\u5DF2\u6311\u9009\uFF1A", defaultSelectedGoodsIds.length), /*#__PURE__*/_react.default.createElement(_antd.Button, {
+    type: "primary",
+    style: {
+      marginLeft: 8
     },
     onClick: function onClick() {
-      return onOk(selectedRowKeys, selectedRows);
+      resetRows();
+      onOk(selectedRowKeys, selectedRows);
     },
     disabled: selectedRowKeys.length === 0
-  }, "\u6279\u91CF\u6311\u9009(", selectedRowKeys.length, ")")));
+  }, "\u6279\u91CF\u6311\u9009(", Math.max(selectedRowKeys.length, 0), ")"))));
 };
 var _default = exports.default = ChooseSiteGoods;

package/lib/index.less

@@ -4,6 +4,7 @@
   .fle-modal-body {
     padding: 0 !important;
   }
+
   .fle-radio-button-wrapper {
     padding-inline: 12px;
   }

package/lib/utils/options.js

@@ -54,6 +54,12 @@ var priceRangeForOnce = exports.priceRangeForOnce = [{
 }];
 // 集采价格筛选配置 - 营销云
 var priceRangeForPurchase = exports.priceRangeForPurchase = [{
+  label: '集采采购价',
+  value: 'purchasePurchasePrice'
+}, {
+  label: '代发采购价',
+  value: 'oncePurchasePrice'
+}, {
   label: '集采市场价',
   value: 'purchaseMarketPrice'
 }, {
@@ -65,12 +71,6 @@ var priceRangeForPurchase = exports.priceRangeForPurchase = [{
 }, {
   label: '代发销售价',
   value: 'onceSalePrice'
-}, {
-  label: '集采分销价',
-  value: 'purchaseSitePrice'
-}, {
-  label: '代发分销价',
-  value: 'onceSitePrice'
 }];
 // 一件代发利润率筛选配置 - 非营销云
 var profitRangeForOnce = exports.profitRangeForOnce = [{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fle-ui/plus-choose-goods",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "@fle-ui/plus-choose-goods",
   "keywords": [
     "fle-ui",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9904de2c188c1fb3c7def6a5407556e4f49deb09"
+  "gitHead": "37abc672563ff256b57c831082a80dd310e847c6"
 }