@fle-ui/plus-choose-site-goods 1.1.11-alpha.0 → 1.1.12-alpha.0

package/es/index.d.ts

@@ -18,6 +18,7 @@ export interface ChooseSiteGoodsProps extends ModalProps {
     hiddenColumns?: Array<string>;
     hiddenSearchProps?: Array<string>;
     needControl?: boolean;
+    customParams?: Record<string, any>;
 }
 declare const ChooseSiteGoods: FC<ChooseSiteGoodsProps>;
 export default ChooseSiteGoods;

package/es/index.js

@@ -31,7 +31,7 @@ import "antd/es/input/style";
 import _Input from "antd/es/input";
 import "antd/es/tabs/style";
 import _Tabs from "antd/es/tabs";
-var _excluded = ["env", "token", "loginErrFn", "onClose", "siteId", "app", "multiple", "defaultSelectedGoodsIds", "onSelectOk", "showMore", "showMoreText", "tabsConfig", "hiddenColumns", "hiddenSearchProps", "needControl"];
+var _excluded = ["env", "token", "loginErrFn", "onClose", "siteId", "app", "multiple", "defaultSelectedGoodsIds", "onSelectOk", "showMore", "showMoreText", "tabsConfig", "hiddenColumns", "hiddenSearchProps", "needControl", "customParams"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -55,12 +55,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } } return target; }
 import React, { useEffect, useState, useRef } from 'react';
+import _ from 'lodash';
 import ProImage from '@fle-ui/plus-image';
 import ChooseMallGoods from '@fle-ui/plus-choose-mall-goods';
 import AddressSelection from '@fle-ui/plus-address-selection';
 import { QuestionCircleOutlined, LoadingOutlined } from '@ant-design/icons';
 import PlusConfigProvider from '@fle-ui/plus-config-provider';
-import _ from 'lodash';
 import Icon from './components/icon';
 import { tabs, tabsSearchParamsMap, priceRangeForOnce, priceRangeForPurchase, profitRangeForOnce, profitRangeForPurchase, sortOptions } from './utils/options';
 import api from './utils/api';
@@ -97,6 +97,8 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     hiddenSearchProps = _props$hiddenSearchPr === void 0 ? [] : _props$hiddenSearchPr,
     _props$needControl = props.needControl,
     needControl = _props$needControl === void 0 ? false : _props$needControl,
+    _props$customParams = props.customParams,
+    customParams = _props$customParams === void 0 ? {} : _props$customParams,
     otherProps = _objectWithoutProperties(props, _excluded);
   var showTabs = useRef(tabs.filter(function (tab) {
     return tabsConfig.includes(tab.key);
@@ -121,13 +123,11 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     flagCategory: undefined,
     saleableCity: undefined // dgss可售卖城市
   };
-  // http ------------ begin
   var $http = request({
     baseUrl: getApiHost(env),
     token: token,
     loginErrFn: loginErrFn
   });
-  // http ------------ end
   useEffect(function () {
     if (env) {
       window.localStorage.setItem('env', env);
@@ -224,7 +224,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
               }).join(',') : '',
               flagIndustry: searchParams.flagIndustry,
               flagCategory: ((_searchParams$flagCat = searchParams.flagCategory) === null || _searchParams$flagCat === void 0 ? void 0 : _searchParams$flagCat.length) ? searchParams.flagCategory[searchParams.flagCategory.length - 1] : undefined
-            });
+            }, customParams);
             if ((_searchParams$priceTy = searchParams.priceType) === null || _searchParams$priceTy === void 0 ? void 0 : _searchParams$priceTy.includes('once')) {
               params['isOnce'] = 1;
             }
@@ -601,7 +601,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
   // 获取全局控制状态
   var getGoodControlInfo = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-      var res, _res$data3, _res$data4;
+      var res, _res$data3;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
@@ -611,8 +611,8 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
             res = _context7.sent;
             if (res === null || res === void 0 ? void 0 : res.success) {
               setShow({
-                priceShow: ((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.internal_mall_cost_price_show) == '1' ? true : false,
-                supplierShow: ((_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.internal_mall_supplier_name_show) == '1' ? true : false
+                priceShow: ((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.customer_mall_cost_price_show) == '1' ? true : false,
+                supplierShow: true
               });
             }
           case 4:

package/lib/index.d.ts

@@ -18,6 +18,7 @@ export interface ChooseSiteGoodsProps extends ModalProps {
     hiddenColumns?: Array<string>;
     hiddenSearchProps?: Array<string>;
     needControl?: boolean;
+    customParams?: Record<string, any>;
 }
 declare const ChooseSiteGoods: FC<ChooseSiteGoodsProps>;
 export default ChooseSiteGoods;

package/lib/index.js

@@ -7,12 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
+var _lodash = _interopRequireDefault(require("lodash"));
 var _plusImage = _interopRequireDefault(require("@fle-ui/plus-image"));
 var _plusChooseMallGoods = _interopRequireDefault(require("@fle-ui/plus-choose-mall-goods"));
 var _plusAddressSelection = _interopRequireDefault(require("@fle-ui/plus-address-selection"));
 var _icons = require("@ant-design/icons");
 var _plusConfigProvider = _interopRequireDefault(require("@fle-ui/plus-config-provider"));
-var _lodash = _interopRequireDefault(require("lodash"));
 var _icon = _interopRequireDefault(require("./components/icon"));
 var _options = require("./utils/options");
 var _api = _interopRequireDefault(require("./utils/api"));
@@ -20,7 +20,7 @@ var _request = _interopRequireDefault(require("./utils/request"));
 var _serviceEnv = require("./utils/serviceEnv");
 var _common = require("./utils/common");
 require("./index.less");
-var _excluded = ["env", "token", "loginErrFn", "onClose", "siteId", "app", "multiple", "defaultSelectedGoodsIds", "onSelectOk", "showMore", "showMoreText", "tabsConfig", "hiddenColumns", "hiddenSearchProps", "needControl"];
+var _excluded = ["env", "token", "loginErrFn", "onClose", "siteId", "app", "multiple", "defaultSelectedGoodsIds", "onSelectOk", "showMore", "showMoreText", "tabsConfig", "hiddenColumns", "hiddenSearchProps", "needControl", "customParams"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -75,6 +75,8 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     hiddenSearchProps = _props$hiddenSearchPr === void 0 ? [] : _props$hiddenSearchPr,
     _props$needControl = props.needControl,
     needControl = _props$needControl === void 0 ? false : _props$needControl,
+    _props$customParams = props.customParams,
+    customParams = _props$customParams === void 0 ? {} : _props$customParams,
     otherProps = _objectWithoutProperties(props, _excluded);
   var showTabs = (0, _react.useRef)(_options.tabs.filter(function (tab) {
     return tabsConfig.includes(tab.key);
@@ -99,13 +101,11 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     flagCategory: undefined,
     saleableCity: undefined // dgss可售卖城市
   };
-  // http ------------ begin
   var $http = (0, _request.default)({
     baseUrl: (0, _serviceEnv.getApiHost)(env),
     token: token,
     loginErrFn: loginErrFn
   });
-  // http ------------ end
   (0, _react.useEffect)(function () {
     if (env) {
       window.localStorage.setItem('env', env);
@@ -202,7 +202,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
               }).join(',') : '',
               flagIndustry: searchParams.flagIndustry,
               flagCategory: ((_searchParams$flagCat = searchParams.flagCategory) === null || _searchParams$flagCat === void 0 ? void 0 : _searchParams$flagCat.length) ? searchParams.flagCategory[searchParams.flagCategory.length - 1] : undefined
-            });
+            }, customParams);
             if ((_searchParams$priceTy = searchParams.priceType) === null || _searchParams$priceTy === void 0 ? void 0 : _searchParams$priceTy.includes('once')) {
               params['isOnce'] = 1;
             }
@@ -579,7 +579,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
   // 获取全局控制状态
   var getGoodControlInfo = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-      var res, _res$data3, _res$data4;
+      var res, _res$data3;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
@@ -589,8 +589,8 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
             res = _context7.sent;
             if (res === null || res === void 0 ? void 0 : res.success) {
               setShow({
-                priceShow: ((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.internal_mall_cost_price_show) == '1' ? true : false,
-                supplierShow: ((_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.internal_mall_supplier_name_show) == '1' ? true : false
+                priceShow: ((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.customer_mall_cost_price_show) == '1' ? true : false,
+                supplierShow: true
               });
             }
           case 4:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fle-ui/plus-choose-site-goods",
-  "version": "1.1.11-alpha.0",
+  "version": "1.1.12-alpha.0",
   "description": "@fle-ui/plus-choose-site-goods",
   "keywords": [
     "fle-ui",
@@ -28,7 +28,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.12-alpha.0"
   },
   "peerDependencies": {
     "antd": ">=4.23.0 || >=5.0.0",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7d48264a50c81e811e73264aade348b57a58592b"
+  "gitHead": "d4a05bbe850cdda174903f0591a84b48a63dc7b3"
 }