@fle-ui/plus-choose-goods 0.0.12 → 0.0.14-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/es/index.d.ts +4 -0
  2. package/es/index.js +21 -18
  3. package/lib/index.d.ts +4 -0
  4. package/lib/index.js +21 -18
  5. package/package.json +3 -3
package/es/index.d.ts CHANGED
@@ -3,6 +3,10 @@ import { EnvType } from './utils/serviceEnv';
3
3
  import type { ProColumns } from '@ant-design/pro-table';
4
4
  import './index.less';
5
5
  export interface ChooseGoodsProps {
6
+ /** 弹窗标题 */
7
+ title?: string;
8
+ /** 按钮文案 */
9
+ actionText?: string;
6
10
  open: boolean;
7
11
  env?: EnvType;
8
12
  token?: string;
package/es/index.js CHANGED
@@ -38,8 +38,8 @@ import React, { useEffect, useState, useRef, useMemo } from 'react';
38
38
  import lodash from 'lodash';
39
39
  import { useRequest } from 'ahooks';
40
40
  import PlusRangeInput from '@fle-ui/plus-range-input';
41
- import { ProTable, QueryFilter } from '@ant-design/pro-components';
42
41
  import PlusConfigProvider from '@fle-ui/plus-config-provider';
42
+ import { ProTable, QueryFilter } from '@ant-design/pro-components';
43
43
  import ProImage from '@fle-ui/plus-image';
44
44
  import { priceRangeForPurchase, sortOptions } from './utils/options';
45
45
  import httpClient from './utils/request';
@@ -49,7 +49,11 @@ import Icon from './components/icon';
49
49
  import { showMoney, formartNum } from './utils/common';
50
50
  import './index.less';
51
51
  var ChooseSiteGoods = function ChooseSiteGoods(props) {
52
- var open = props.open,
52
+ var _props$title = props.title,
53
+ title = _props$title === void 0 ? '挑选商品' : _props$title,
54
+ _props$actionText = props.actionText,
55
+ actionText = _props$actionText === void 0 ? '挑选' : _props$actionText,
56
+ open = props.open,
53
57
  env = props.env,
54
58
  token = props.token,
55
59
  serviceUrl = props.serviceUrl,
@@ -117,15 +121,20 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
117
121
  params['isPurchase'] = 1;
118
122
  }
119
123
  }
120
- _context.next = 4;
124
+ if (val.flagTags) {
125
+ params['flagTags'] = val.flagTags.map(function (item) {
126
+ return item[1];
127
+ }).join(',');
128
+ }
129
+ _context.next = 5;
121
130
  return $http.post(serviceUrl || api['getGoodsList'], params);
122
- case 4:
131
+ case 5:
123
132
  res = _context.sent;
124
133
  return _context.abrupt("return", {
125
134
  list: (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [],
126
135
  total: (res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.total) || 0
127
136
  });
128
- case 6:
137
+ case 7:
129
138
  case "end":
130
139
  return _context.stop();
131
140
  }
@@ -318,7 +327,6 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
318
327
  (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.resetFields();
319
328
  }
320
329
  }, [open]);
321
- // 选择 begin
322
330
  var _useState17 = useState([]),
323
331
  _useState18 = _slicedToArray(_useState17, 2),
324
332
  selectedRowKeys = _useState18[0],
@@ -386,8 +394,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
386
394
  align: 'center',
387
395
  width: 150,
388
396
  render: function render(_, record) {
389
- var _record$flagCategoryI;
390
- return (record === null || record === void 0 ? void 0 : (_record$flagCategoryI = record.flagCategoryInfo) === null || _record$flagCategoryI === void 0 ? void 0 : _record$flagCategoryI.goodsCategoryTreeName) || '-';
397
+ return (record === null || record === void 0 ? void 0 : record.goodsCategoryTreeName) || '-';
391
398
  }
392
399
  }, {
393
400
  title: '所属供应商',
@@ -395,7 +402,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
395
402
  key: 'subSupplierName',
396
403
  align: 'center',
397
404
  width: 150,
398
- colSpan: show.supplierShow ? 1 : 0
405
+ hidden: !show.supplierShow
399
406
  }, {
400
407
  title: '一件代发价格',
401
408
  key: 'oncePrice',
@@ -435,18 +442,18 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
435
442
  style: {
436
443
  color: '#999'
437
444
  }
438
- }, "\u5DF2\u6311\u9009");
445
+ }, "\u5DF2", actionText);
439
446
  }
440
447
  return /*#__PURE__*/React.createElement("a", {
441
448
  onClick: function onClick() {
442
449
  return onOk([record[rowKey]], [record]);
443
450
  }
444
- }, "\u6311\u9009");
451
+ }, actionText);
445
452
  }
446
453
  }];
447
454
  return /*#__PURE__*/React.createElement(PlusConfigProvider, null, /*#__PURE__*/React.createElement(_Modal, {
448
455
  centered: true,
449
- title: "\u6311\u9009\u5546\u54C1",
456
+ title: title,
450
457
  open: open,
451
458
  footer: null,
452
459
  width: 1300,
@@ -465,11 +472,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
465
472
  orderWay: 'desc'
466
473
  },
467
474
  onFinish: function onFinish(values) {
468
- var params = _objectSpread(_objectSpread(_objectSpread({}, DefaultParams), values), {}, {
469
- flagTags: values.flagTags.map(function (item) {
470
- return item[1];
471
- }).join(',')
472
- });
475
+ var params = _objectSpread(_objectSpread({}, DefaultParams), values);
473
476
  setSearchParams(params);
474
477
  getGoodsList(params);
475
478
  },
@@ -639,6 +642,6 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
639
642
  onOk(selectedRowKeys, selectedRows);
640
643
  },
641
644
  disabled: selectedRowKeys.length === 0
642
- }, "\u6279\u91CF\u6311\u9009(", Math.max(selectedRowKeys.length, 0), ")"))));
645
+ }, "\u6279\u91CF", actionText, "(", Math.max(selectedRowKeys.length, 0), ")"))));
643
646
  };
644
647
  export default ChooseSiteGoods;
package/lib/index.d.ts CHANGED
@@ -3,6 +3,10 @@ import { EnvType } from './utils/serviceEnv';
3
3
  import type { ProColumns } from '@ant-design/pro-table';
4
4
  import './index.less';
5
5
  export interface ChooseGoodsProps {
6
+ /** 弹窗标题 */
7
+ title?: string;
8
+ /** 按钮文案 */
9
+ actionText?: string;
6
10
  open: boolean;
7
11
  env?: EnvType;
8
12
  token?: string;
package/lib/index.js CHANGED
@@ -10,8 +10,8 @@ var _antd = require("antd");
10
10
  var _lodash = _interopRequireDefault(require("lodash"));
11
11
  var _ahooks = require("ahooks");
12
12
  var _plusRangeInput = _interopRequireDefault(require("@fle-ui/plus-range-input"));
13
- var _proComponents = require("@ant-design/pro-components");
14
13
  var _plusConfigProvider = _interopRequireDefault(require("@fle-ui/plus-config-provider"));
14
+ var _proComponents = require("@ant-design/pro-components");
15
15
  var _plusImage = _interopRequireDefault(require("@fle-ui/plus-image"));
16
16
  var _options = require("./utils/options");
17
17
  var _request = _interopRequireDefault(require("./utils/request"));
@@ -43,7 +43,11 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
43
43
  function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
44
44
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
45
45
  var ChooseSiteGoods = function ChooseSiteGoods(props) {
46
- var open = props.open,
46
+ var _props$title = props.title,
47
+ title = _props$title === void 0 ? '挑选商品' : _props$title,
48
+ _props$actionText = props.actionText,
49
+ actionText = _props$actionText === void 0 ? '挑选' : _props$actionText,
50
+ open = props.open,
47
51
  env = props.env,
48
52
  token = props.token,
49
53
  serviceUrl = props.serviceUrl,
@@ -111,15 +115,20 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
111
115
  params['isPurchase'] = 1;
112
116
  }
113
117
  }
114
- _context.next = 4;
118
+ if (val.flagTags) {
119
+ params['flagTags'] = val.flagTags.map(function (item) {
120
+ return item[1];
121
+ }).join(',');
122
+ }
123
+ _context.next = 5;
115
124
  return $http.post(serviceUrl || _api.default['getGoodsList'], params);
116
- case 4:
125
+ case 5:
117
126
  res = _context.sent;
118
127
  return _context.abrupt("return", {
119
128
  list: (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [],
120
129
  total: (res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.total) || 0
121
130
  });
122
- case 6:
131
+ case 7:
123
132
  case "end":
124
133
  return _context.stop();
125
134
  }
@@ -312,7 +321,6 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
312
321
  (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.resetFields();
313
322
  }
314
323
  }, [open]);
315
- // 选择 begin
316
324
  var _useState17 = (0, _react.useState)([]),
317
325
  _useState18 = _slicedToArray(_useState17, 2),
318
326
  selectedRowKeys = _useState18[0],
@@ -380,8 +388,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
380
388
  align: 'center',
381
389
  width: 150,
382
390
  render: function render(_, record) {
383
- var _record$flagCategoryI;
384
- return (record === null || record === void 0 ? void 0 : (_record$flagCategoryI = record.flagCategoryInfo) === null || _record$flagCategoryI === void 0 ? void 0 : _record$flagCategoryI.goodsCategoryTreeName) || '-';
391
+ return (record === null || record === void 0 ? void 0 : record.goodsCategoryTreeName) || '-';
385
392
  }
386
393
  }, {
387
394
  title: '所属供应商',
@@ -389,7 +396,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
389
396
  key: 'subSupplierName',
390
397
  align: 'center',
391
398
  width: 150,
392
- colSpan: show.supplierShow ? 1 : 0
399
+ hidden: !show.supplierShow
393
400
  }, {
394
401
  title: '一件代发价格',
395
402
  key: 'oncePrice',
@@ -429,18 +436,18 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
429
436
  style: {
430
437
  color: '#999'
431
438
  }
432
- }, "\u5DF2\u6311\u9009");
439
+ }, "\u5DF2", actionText);
433
440
  }
434
441
  return /*#__PURE__*/_react.default.createElement("a", {
435
442
  onClick: function onClick() {
436
443
  return onOk([record[rowKey]], [record]);
437
444
  }
438
- }, "\u6311\u9009");
445
+ }, actionText);
439
446
  }
440
447
  }];
441
448
  return /*#__PURE__*/_react.default.createElement(_plusConfigProvider.default, null, /*#__PURE__*/_react.default.createElement(_antd.Modal, {
442
449
  centered: true,
443
- title: "\u6311\u9009\u5546\u54C1",
450
+ title: title,
444
451
  open: open,
445
452
  footer: null,
446
453
  width: 1300,
@@ -459,11 +466,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
459
466
  orderWay: 'desc'
460
467
  },
461
468
  onFinish: function onFinish(values) {
462
- var params = _objectSpread(_objectSpread(_objectSpread({}, DefaultParams), values), {}, {
463
- flagTags: values.flagTags.map(function (item) {
464
- return item[1];
465
- }).join(',')
466
- });
469
+ var params = _objectSpread(_objectSpread({}, DefaultParams), values);
467
470
  setSearchParams(params);
468
471
  getGoodsList(params);
469
472
  },
@@ -633,6 +636,6 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
633
636
  onOk(selectedRowKeys, selectedRows);
634
637
  },
635
638
  disabled: selectedRowKeys.length === 0
636
- }, "\u6279\u91CF\u6311\u9009(", Math.max(selectedRowKeys.length, 0), ")"))));
639
+ }, "\u6279\u91CF", actionText, "(", Math.max(selectedRowKeys.length, 0), ")"))));
637
640
  };
638
641
  var _default = exports.default = ChooseSiteGoods;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fle-ui/plus-choose-goods",
3
- "version": "0.0.12",
3
+ "version": "0.0.14-alpha.0",
4
4
  "description": "@fle-ui/plus-choose-goods",
5
5
  "keywords": [
6
6
  "fle-ui",
@@ -24,7 +24,7 @@
24
24
  "@ant-design/icons": "^5.3.0",
25
25
  "@fle-tools/env": "^1.0.3",
26
26
  "@fle-ui/plus-address-selection": "^1.0.14",
27
- "@fle-ui/plus-choose-mall-goods": "^1.1.9",
27
+ "@fle-ui/plus-choose-mall-goods": "^1.1.11-alpha.1",
28
28
  "@fle-ui/plus-config-provider": "~1.0.15",
29
29
  "ahooks": "^3.8.0",
30
30
  "lodash": "^4.17.21"
@@ -45,5 +45,5 @@
45
45
  "publishConfig": {
46
46
  "access": "public"
47
47
  },
48
- "gitHead": "78d16169a36349aacd44e43a9923104e950067e3"
48
+ "gitHead": "9ce001b68d454301889a4b20e766a0cbfe7a5f6e"
49
49
  }