@fle-ui/plus-choose-goods 0.0.15-alpha.0 → 0.0.15-beta.0

package/es/index.d.ts

@@ -8,9 +8,7 @@ export interface ChooseGoodsProps {
     /** 按钮文案 */
     actionText?: string;
     open: boolean;
-    /** 接口环境，默认取localstorage中的env */
     env?: EnvType;
-    /** 默认取Cookies中的token */
     token?: string;
     loginErrFn?: () => void;
     multiple?: boolean;

package/es/index.js

@@ -38,8 +38,8 @@ import React, { useEffect, useState, useRef, useMemo } from 'react';
 import lodash from 'lodash';
 import { useRequest } from 'ahooks';
 import PlusRangeInput from '@fle-ui/plus-range-input';
-import { ProTable, QueryFilter } from '@ant-design/pro-components';
 import PlusConfigProvider from '@fle-ui/plus-config-provider';
+import { ProTable, QueryFilter } from '@ant-design/pro-components';
 import ProImage from '@fle-ui/plus-image';
 import { priceRangeForPurchase, sortOptions } from './utils/options';
 import httpClient from './utils/request';
@@ -121,15 +121,20 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
                   params['isPurchase'] = 1;
                 }
               }
-              _context.next = 4;
+              if (val.flagTags) {
+                params['flagTags'] = val.flagTags.map(function (item) {
+                  return item[1];
+                }).join(',');
+              }
+              _context.next = 5;
               return $http.post(serviceUrl || api['getGoodsList'], params);
-            case 4:
+            case 5:
               res = _context.sent;
               return _context.abrupt("return", {
                 list: (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [],
                 total: (res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.total) || 0
               });
-            case 6:
+            case 7:
             case "end":
               return _context.stop();
           }
@@ -322,7 +327,6 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
       (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.resetFields();
     }
   }, [open]);
-  // 选择 begin
   var _useState17 = useState([]),
     _useState18 = _slicedToArray(_useState17, 2),
     selectedRowKeys = _useState18[0],
@@ -468,11 +472,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
       orderWay: 'desc'
     },
     onFinish: function onFinish(values) {
-      var params = _objectSpread(_objectSpread(_objectSpread({}, DefaultParams), values), {}, {
-        flagTags: values.flagTags.map(function (item) {
-          return item[1];
-        }).join(',')
-      });
+      var params = _objectSpread(_objectSpread({}, DefaultParams), values);
       setSearchParams(params);
       getGoodsList(params);
     },

package/lib/index.d.ts

@@ -8,9 +8,7 @@ export interface ChooseGoodsProps {
     /** 按钮文案 */
     actionText?: string;
     open: boolean;
-    /** 接口环境，默认取localstorage中的env */
     env?: EnvType;
-    /** 默认取Cookies中的token */
     token?: string;
     loginErrFn?: () => void;
     multiple?: boolean;

package/lib/index.js

@@ -10,8 +10,8 @@ var _antd = require("antd");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _ahooks = require("ahooks");
 var _plusRangeInput = _interopRequireDefault(require("@fle-ui/plus-range-input"));
-var _proComponents = require("@ant-design/pro-components");
 var _plusConfigProvider = _interopRequireDefault(require("@fle-ui/plus-config-provider"));
+var _proComponents = require("@ant-design/pro-components");
 var _plusImage = _interopRequireDefault(require("@fle-ui/plus-image"));
 var _options = require("./utils/options");
 var _request = _interopRequireDefault(require("./utils/request"));
@@ -115,15 +115,20 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
                   params['isPurchase'] = 1;
                 }
               }
-              _context.next = 4;
+              if (val.flagTags) {
+                params['flagTags'] = val.flagTags.map(function (item) {
+                  return item[1];
+                }).join(',');
+              }
+              _context.next = 5;
               return $http.post(serviceUrl || _api.default['getGoodsList'], params);
-            case 4:
+            case 5:
               res = _context.sent;
               return _context.abrupt("return", {
                 list: (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [],
                 total: (res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.total) || 0
               });
-            case 6:
+            case 7:
             case "end":
               return _context.stop();
           }
@@ -316,7 +321,6 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
       (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.resetFields();
     }
   }, [open]);
-  // 选择 begin
   var _useState17 = (0, _react.useState)([]),
     _useState18 = _slicedToArray(_useState17, 2),
     selectedRowKeys = _useState18[0],
@@ -462,11 +466,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
       orderWay: 'desc'
     },
     onFinish: function onFinish(values) {
-      var params = _objectSpread(_objectSpread(_objectSpread({}, DefaultParams), values), {}, {
-        flagTags: values.flagTags.map(function (item) {
-          return item[1];
-        }).join(',')
-      });
+      var params = _objectSpread(_objectSpread({}, DefaultParams), values);
       setSearchParams(params);
       getGoodsList(params);
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fle-ui/plus-choose-goods",
-  "version": "0.0.15-alpha.0",
+  "version": "0.0.15-beta.0",
   "description": "@fle-ui/plus-choose-goods",
   "keywords": [
     "fle-ui",
@@ -24,7 +24,7 @@
     "@ant-design/icons": "^5.3.0",
     "@fle-tools/env": "^1.0.3",
     "@fle-ui/plus-address-selection": "^1.0.14",
-    "@fle-ui/plus-choose-mall-goods": "^1.1.11-alpha.0",
+    "@fle-ui/plus-choose-mall-goods": "^1.1.11-alpha.1",
     "@fle-ui/plus-config-provider": "~1.0.15",
     "ahooks": "^3.8.0",
     "lodash": "^4.17.21"
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7d48264a50c81e811e73264aade348b57a58592b"
+  "gitHead": "c8b2c2660ddd9d063f44506f1c27d407ca0504fe"
 }