@kmkf-fe-packages/basic-components 2.2.20 → 2.2.21

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 (3) hide show
  1. package/dist/index.esm.js +37 -31
  2. package/dist/index.js +37 -31
  3. package/package.json +3 -3
package/dist/index.esm.js CHANGED
@@ -19800,19 +19800,21 @@ var getColumns$5 = function getColumns() {
19800
19800
  ellipsis: true,
19801
19801
  align: 'center',
19802
19802
  width: 120,
19803
- validator: function validator(_rule, value) {
19804
- var goodsName = '';
19805
- if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).some(function (goods) {
19806
- var v = toNum$1(goods === null || goods === void 0 ? void 0 : goods.salePrice);
19807
- var res = typeof v === 'number' ? v < 0 : true;
19808
- if (res) {
19809
- goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
19810
- }
19811
- return res;
19812
- })) {
19813
- return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
19814
- }
19815
- },
19803
+ // validator: (_rule: any, value: any) => {
19804
+ // let goodsName = '';
19805
+ // if (
19806
+ // (value?.jstReissueGoods || []).some((goods: any) => {
19807
+ // const v = toNum(goods?.salePrice);
19808
+ // const res = typeof v === 'number' ? v < 0 : true;
19809
+ // if (res) {
19810
+ // goodsName = goods?.name ? `[${goods?.name}]` : '';
19811
+ // }
19812
+ // return res;
19813
+ // })
19814
+ // ) {
19815
+ // return Promise.reject(`${goodsName}单价为大于等于0的数`);
19816
+ // }
19817
+ // },
19816
19818
  render: function render(val, record, index) {
19817
19819
  return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
19818
19820
  style: {
@@ -20500,19 +20502,6 @@ var getColumns$7 = function getColumns(_ref) {
20500
20502
  dataIndex: 'sellCount',
20501
20503
  title: "\u6570\u91CF",
20502
20504
  width: 100,
20503
- validator: function validator(_rule, value) {
20504
- var productName = '';
20505
- if (((value === null || value === void 0 ? void 0 : value.jyGoods) || []).some(function (goods) {
20506
- var qty = toNum$3(goods === null || goods === void 0 ? void 0 : goods.sellCount);
20507
- var res = typeof qty === 'number' ? qty < 1 : true;
20508
- if (res) {
20509
- productName = (goods === null || goods === void 0 ? void 0 : goods.productName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.productName, "]") : '';
20510
- }
20511
- return res;
20512
- })) {
20513
- return Promise.reject("".concat(productName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
20514
- }
20515
- },
20516
20505
  render: function render(val, record, index) {
20517
20506
  return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
20518
20507
  style: {
@@ -21787,8 +21776,9 @@ var GoodItem$1 = function GoodItem(props) {
21787
21776
  var COLUMNS_INFO = COLUMNS_MAP(text);
21788
21777
  return COLUMNS_INFO(type);
21789
21778
  };
21790
- var newColumns = useMemo(function () {
21791
- var initBaseInfoColumns = GOODS_INFO_COLUMNS();
21779
+ var getShowFilterColumns = useCallback(function (_ref2) {
21780
+ var showHeader = _ref2.showHeader,
21781
+ initBaseInfoColumns = _ref2.initBaseInfoColumns;
21792
21782
  var baseInfoColumns = [];
21793
21783
  var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === 'string';
21794
21784
  var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === '[object Object]';
@@ -21808,6 +21798,14 @@ var GoodItem$1 = function GoodItem(props) {
21808
21798
  return undefined;
21809
21799
  }).filter(Boolean);
21810
21800
  }
21801
+ return baseInfoColumns;
21802
+ }, [showHeader]);
21803
+ var newColumns = useMemo(function () {
21804
+ var initBaseInfoColumns = GOODS_INFO_COLUMNS();
21805
+ var baseInfoColumns = getShowFilterColumns({
21806
+ showHeader: showHeader,
21807
+ initBaseInfoColumns: initBaseInfoColumns
21808
+ });
21811
21809
  var columnList = [{
21812
21810
  dataIndex: '',
21813
21811
  title: '序号',
@@ -21844,8 +21842,16 @@ var GoodItem$1 = function GoodItem(props) {
21844
21842
  return columnList;
21845
21843
  }, [showHeader, value, disabled, hoveredRowIndex]);
21846
21844
  var orderModalColumns = useMemo(function () {
21847
- var list = newColumns.filter(function (col) {
21848
- return !['操作', '序号'].includes(col.title);
21845
+ var initBaseInfoColumns = COLUMNS_MAP('', {
21846
+ operate: false,
21847
+ disabled: true
21848
+ })(type);
21849
+ var baseInfoColumns = getShowFilterColumns({
21850
+ showHeader: showHeader,
21851
+ initBaseInfoColumns: initBaseInfoColumns
21852
+ });
21853
+ var list = baseInfoColumns.filter(function (col) {
21854
+ return !['操作'].includes(col.title);
21849
21855
  });
21850
21856
  return [{
21851
21857
  dataIndex: '',
@@ -21857,7 +21863,7 @@ var GoodItem$1 = function GoodItem(props) {
21857
21863
  return /*#__PURE__*/React.createElement("span", null, index + 1);
21858
21864
  }
21859
21865
  }].concat(_toConsumableArray(list));
21860
- }, [newColumns]);
21866
+ }, [showHeader, value, disabled, hoveredRowIndex]);
21861
21867
  var orderColumns = useMemo(function () {
21862
21868
  var columns = COLUMNS_MAP('', {
21863
21869
  operate: false,
package/dist/index.js CHANGED
@@ -19815,19 +19815,21 @@ var getColumns$5 = function getColumns() {
19815
19815
  ellipsis: true,
19816
19816
  align: 'center',
19817
19817
  width: 120,
19818
- validator: function validator(_rule, value) {
19819
- var goodsName = '';
19820
- if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).some(function (goods) {
19821
- var v = toNum$1(goods === null || goods === void 0 ? void 0 : goods.salePrice);
19822
- var res = typeof v === 'number' ? v < 0 : true;
19823
- if (res) {
19824
- goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
19825
- }
19826
- return res;
19827
- })) {
19828
- return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
19829
- }
19830
- },
19818
+ // validator: (_rule: any, value: any) => {
19819
+ // let goodsName = '';
19820
+ // if (
19821
+ // (value?.jstReissueGoods || []).some((goods: any) => {
19822
+ // const v = toNum(goods?.salePrice);
19823
+ // const res = typeof v === 'number' ? v < 0 : true;
19824
+ // if (res) {
19825
+ // goodsName = goods?.name ? `[${goods?.name}]` : '';
19826
+ // }
19827
+ // return res;
19828
+ // })
19829
+ // ) {
19830
+ // return Promise.reject(`${goodsName}单价为大于等于0的数`);
19831
+ // }
19832
+ // },
19831
19833
  render: function render(val, record, index) {
19832
19834
  return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
19833
19835
  style: {
@@ -20515,19 +20517,6 @@ var getColumns$7 = function getColumns(_ref) {
20515
20517
  dataIndex: 'sellCount',
20516
20518
  title: "\u6570\u91CF",
20517
20519
  width: 100,
20518
- validator: function validator(_rule, value) {
20519
- var productName = '';
20520
- if (((value === null || value === void 0 ? void 0 : value.jyGoods) || []).some(function (goods) {
20521
- var qty = toNum$3(goods === null || goods === void 0 ? void 0 : goods.sellCount);
20522
- var res = typeof qty === 'number' ? qty < 1 : true;
20523
- if (res) {
20524
- productName = (goods === null || goods === void 0 ? void 0 : goods.productName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.productName, "]") : '';
20525
- }
20526
- return res;
20527
- })) {
20528
- return Promise.reject("".concat(productName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
20529
- }
20530
- },
20531
20520
  render: function render(val, record, index) {
20532
20521
  return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
20533
20522
  style: {
@@ -21802,8 +21791,9 @@ var GoodItem$1 = function GoodItem(props) {
21802
21791
  var COLUMNS_INFO = COLUMNS_MAP(text);
21803
21792
  return COLUMNS_INFO(type);
21804
21793
  };
21805
- var newColumns = React.useMemo(function () {
21806
- var initBaseInfoColumns = GOODS_INFO_COLUMNS();
21794
+ var getShowFilterColumns = React.useCallback(function (_ref2) {
21795
+ var showHeader = _ref2.showHeader,
21796
+ initBaseInfoColumns = _ref2.initBaseInfoColumns;
21807
21797
  var baseInfoColumns = [];
21808
21798
  var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === 'string';
21809
21799
  var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === '[object Object]';
@@ -21823,6 +21813,14 @@ var GoodItem$1 = function GoodItem(props) {
21823
21813
  return undefined;
21824
21814
  }).filter(Boolean);
21825
21815
  }
21816
+ return baseInfoColumns;
21817
+ }, [showHeader]);
21818
+ var newColumns = React.useMemo(function () {
21819
+ var initBaseInfoColumns = GOODS_INFO_COLUMNS();
21820
+ var baseInfoColumns = getShowFilterColumns({
21821
+ showHeader: showHeader,
21822
+ initBaseInfoColumns: initBaseInfoColumns
21823
+ });
21826
21824
  var columnList = [{
21827
21825
  dataIndex: '',
21828
21826
  title: '序号',
@@ -21859,8 +21857,16 @@ var GoodItem$1 = function GoodItem(props) {
21859
21857
  return columnList;
21860
21858
  }, [showHeader, value, disabled, hoveredRowIndex]);
21861
21859
  var orderModalColumns = React.useMemo(function () {
21862
- var list = newColumns.filter(function (col) {
21863
- return !['操作', '序号'].includes(col.title);
21860
+ var initBaseInfoColumns = COLUMNS_MAP('', {
21861
+ operate: false,
21862
+ disabled: true
21863
+ })(type);
21864
+ var baseInfoColumns = getShowFilterColumns({
21865
+ showHeader: showHeader,
21866
+ initBaseInfoColumns: initBaseInfoColumns
21867
+ });
21868
+ var list = baseInfoColumns.filter(function (col) {
21869
+ return !['操作'].includes(col.title);
21864
21870
  });
21865
21871
  return [{
21866
21872
  dataIndex: '',
@@ -21872,7 +21878,7 @@ var GoodItem$1 = function GoodItem(props) {
21872
21878
  return /*#__PURE__*/React__default['default'].createElement("span", null, index + 1);
21873
21879
  }
21874
21880
  }].concat(_toConsumableArray(list));
21875
- }, [newColumns]);
21881
+ }, [showHeader, value, disabled, hoveredRowIndex]);
21876
21882
  var orderColumns = React.useMemo(function () {
21877
21883
  var columns = COLUMNS_MAP('', {
21878
21884
  operate: false,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "2.2.20",
3
+ "version": "2.2.21",
4
4
  "description": "> TODO: description",
5
5
  "homepage": "",
6
6
  "license": "ISC",
@@ -20,7 +20,7 @@
20
20
  "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
21
21
  },
22
22
  "dependencies": {
23
- "@kmkf-fe-packages/kmkf-utils": "2.2.20",
23
+ "@kmkf-fe-packages/kmkf-utils": "2.2.21",
24
24
  "ahooks": "^3.7.4",
25
25
  "ali-react-table": "2.6.1",
26
26
  "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
66
66
  "publishConfig": {
67
67
  "access": "public"
68
68
  },
69
- "gitHead": "251c7eb415db5fee9404462720250c11329a2b6a"
69
+ "gitHead": "1426042144c662d01ea92d1004e75b4b878668e9"
70
70
  }