@kmkf-fe-packages/basic-components 1.22.1-beta.51 → 1.22.1-beta.54

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 (4) hide show
  1. package/README.md +1 -1
  2. package/dist/index.esm.js +37 -9
  3. package/dist/index.js +37 -9
  4. package/package.json +3 -3
package/README.md CHANGED
@@ -19,4 +19,4 @@ yarn start
19
19
  - config 公共方法
20
20
  - assets 静态资源
21
21
 
22
- 11
22
+ 111
package/dist/index.esm.js CHANGED
@@ -13733,6 +13733,11 @@ var getColumns$3 = function getColumns(_ref) {
13733
13733
  };
13734
13734
  };
13735
13735
 
13736
+ var isNumberOrNumberString = function isNumberOrNumberString(value) {
13737
+ if (typeof value === 'number') return true;
13738
+ if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
13739
+ return false;
13740
+ };
13736
13741
  var getColumns$4 = function getColumns(_ref) {
13737
13742
  var _ref$text = _ref.text,
13738
13743
  disabled = _ref.disabled,
@@ -13802,7 +13807,7 @@ var getColumns$4 = function getColumns(_ref) {
13802
13807
  title: "\u5B9E\u9645\u91D1\u989D",
13803
13808
  width: 150,
13804
13809
  render: function render(_, record) {
13805
- return /*#__PURE__*/React.createElement("span", null, typeof record.qty === 'number' && typeof record.price === 'number' ? record.qty * record.price : '');
13810
+ return /*#__PURE__*/React.createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.price) ? record.qty * record.price : '');
13806
13811
  }
13807
13812
  }, {
13808
13813
  dataIndex: 'originPrice',
@@ -13811,7 +13816,10 @@ var getColumns$4 = function getColumns(_ref) {
13811
13816
  }, {
13812
13817
  dataIndex: 'originAmount',
13813
13818
  title: "\u6807\u51C6\u91D1\u989D",
13814
- width: 150
13819
+ width: 150,
13820
+ render: function render(_, record) {
13821
+ return /*#__PURE__*/React.createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.originPrice) ? record.qty * record.originPrice : '');
13822
+ }
13815
13823
  }, {
13816
13824
  dataIndex: 'discountFee',
13817
13825
  title: "\u8BA9\u5229\u91D1\u989D",
@@ -13915,7 +13923,7 @@ var getColumns$4 = function getColumns(_ref) {
13915
13923
  title: "\u5B9E\u9645\u91D1\u989D",
13916
13924
  width: 150,
13917
13925
  render: function render(_, record) {
13918
- return /*#__PURE__*/React.createElement("span", null, typeof record.qty === 'number' && typeof record.price === 'number' ? record.qty * record.price : '');
13926
+ return /*#__PURE__*/React.createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.price) ? record.qty * record.price : '');
13919
13927
  }
13920
13928
  }, {
13921
13929
  dataIndex: 'originPrice',
@@ -13924,7 +13932,10 @@ var getColumns$4 = function getColumns(_ref) {
13924
13932
  }, {
13925
13933
  dataIndex: 'originAmount',
13926
13934
  title: "\u6807\u51C6\u91D1\u989D",
13927
- width: 150
13935
+ width: 150,
13936
+ render: function render(_, record) {
13937
+ return /*#__PURE__*/React.createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.originPrice) ? record.qty * record.originPrice : '');
13938
+ }
13928
13939
  }, {
13929
13940
  dataIndex: 'isGift',
13930
13941
  title: "\u662F\u5426\u8D60\u54C1",
@@ -14574,7 +14585,7 @@ var GoodItem$1 = function GoodItem(props) {
14574
14585
  goodNo = item.goodNo,
14575
14586
  specName = item.specName,
14576
14587
  specNo = item.specNo,
14577
- originPrice = item.originPrice;
14588
+ retailPrice = item.retailPrice;
14578
14589
  return _objectSpread2(_objectSpread2({}, item), {}, {
14579
14590
  uuid: uuid(),
14580
14591
  canDelete: true,
@@ -14585,7 +14596,7 @@ var GoodItem$1 = function GoodItem(props) {
14585
14596
  goodNo: goodNo,
14586
14597
  specName: specName,
14587
14598
  specNo: specNo,
14588
- originPrice: originPrice
14599
+ originPrice: retailPrice
14589
14600
  });
14590
14601
  });
14591
14602
  } else {
@@ -15877,7 +15888,24 @@ var index$1 = (function (props) {
15877
15888
  };
15878
15889
  }
15879
15890
  };
15880
- return /*#__PURE__*/React.createElement(Table, {
15891
+ // useEffect(() => {
15892
+ // const dom = document.querySelector(
15893
+ // `.${type}_SYSTEM_ORDER_COMPONENT .ant-table-content`,
15894
+ // );
15895
+ // //解决列表出现横向滚动条时选择数据造成行内闪烁问题
15896
+ // if (
15897
+ // (value?.selectIds || []).length > 0 &&
15898
+ // dom &&
15899
+ // dom.scrollWidth > dom.clientWidth &&
15900
+ // dom.scrollLeft === 0
15901
+ // ) {
15902
+ // console.log(dom.scrollWidth > dom.clientWidth, dom.scrollLeft === 0);
15903
+ // dom.scrollLeft = 1;
15904
+ // }
15905
+ // }, [JSON.stringify(value?.selectIds || [])]);
15906
+ return /*#__PURE__*/React.createElement("div", {
15907
+ className: "".concat(type, "_SYSTEM_ORDER_COMPONENT")
15908
+ }, /*#__PURE__*/React.createElement(Table, {
15881
15909
  dataSource: (value === null || value === void 0 ? void 0 : value.orders) || [],
15882
15910
  columns: columns,
15883
15911
  rowSelection: rowSelection,
@@ -15885,12 +15913,12 @@ var index$1 = (function (props) {
15885
15913
  size: "small",
15886
15914
  pagination: false,
15887
15915
  scroll: {
15888
- x: '100%'
15916
+ x: 'max-content'
15889
15917
  },
15890
15918
  locale: {
15891
15919
  emptyText: '暂无数据'
15892
15920
  }
15893
- });
15921
+ }));
15894
15922
  });
15895
15923
 
15896
15924
  var WlnGoods = function WlnGoods(props) {
package/dist/index.js CHANGED
@@ -13745,6 +13745,11 @@ var getColumns$3 = function getColumns(_ref) {
13745
13745
  };
13746
13746
  };
13747
13747
 
13748
+ var isNumberOrNumberString = function isNumberOrNumberString(value) {
13749
+ if (typeof value === 'number') return true;
13750
+ if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
13751
+ return false;
13752
+ };
13748
13753
  var getColumns$4 = function getColumns(_ref) {
13749
13754
  var _ref$text = _ref.text,
13750
13755
  disabled = _ref.disabled,
@@ -13814,7 +13819,7 @@ var getColumns$4 = function getColumns(_ref) {
13814
13819
  title: "\u5B9E\u9645\u91D1\u989D",
13815
13820
  width: 150,
13816
13821
  render: function render(_, record) {
13817
- return /*#__PURE__*/React__default['default'].createElement("span", null, typeof record.qty === 'number' && typeof record.price === 'number' ? record.qty * record.price : '');
13822
+ return /*#__PURE__*/React__default['default'].createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.price) ? record.qty * record.price : '');
13818
13823
  }
13819
13824
  }, {
13820
13825
  dataIndex: 'originPrice',
@@ -13823,7 +13828,10 @@ var getColumns$4 = function getColumns(_ref) {
13823
13828
  }, {
13824
13829
  dataIndex: 'originAmount',
13825
13830
  title: "\u6807\u51C6\u91D1\u989D",
13826
- width: 150
13831
+ width: 150,
13832
+ render: function render(_, record) {
13833
+ return /*#__PURE__*/React__default['default'].createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.originPrice) ? record.qty * record.originPrice : '');
13834
+ }
13827
13835
  }, {
13828
13836
  dataIndex: 'discountFee',
13829
13837
  title: "\u8BA9\u5229\u91D1\u989D",
@@ -13927,7 +13935,7 @@ var getColumns$4 = function getColumns(_ref) {
13927
13935
  title: "\u5B9E\u9645\u91D1\u989D",
13928
13936
  width: 150,
13929
13937
  render: function render(_, record) {
13930
- return /*#__PURE__*/React__default['default'].createElement("span", null, typeof record.qty === 'number' && typeof record.price === 'number' ? record.qty * record.price : '');
13938
+ return /*#__PURE__*/React__default['default'].createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.price) ? record.qty * record.price : '');
13931
13939
  }
13932
13940
  }, {
13933
13941
  dataIndex: 'originPrice',
@@ -13936,7 +13944,10 @@ var getColumns$4 = function getColumns(_ref) {
13936
13944
  }, {
13937
13945
  dataIndex: 'originAmount',
13938
13946
  title: "\u6807\u51C6\u91D1\u989D",
13939
- width: 150
13947
+ width: 150,
13948
+ render: function render(_, record) {
13949
+ return /*#__PURE__*/React__default['default'].createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.originPrice) ? record.qty * record.originPrice : '');
13950
+ }
13940
13951
  }, {
13941
13952
  dataIndex: 'isGift',
13942
13953
  title: "\u662F\u5426\u8D60\u54C1",
@@ -14586,7 +14597,7 @@ var GoodItem$1 = function GoodItem(props) {
14586
14597
  goodNo = item.goodNo,
14587
14598
  specName = item.specName,
14588
14599
  specNo = item.specNo,
14589
- originPrice = item.originPrice;
14600
+ retailPrice = item.retailPrice;
14590
14601
  return _objectSpread2(_objectSpread2({}, item), {}, {
14591
14602
  uuid: kmkfUtils.uuid(),
14592
14603
  canDelete: true,
@@ -14597,7 +14608,7 @@ var GoodItem$1 = function GoodItem(props) {
14597
14608
  goodNo: goodNo,
14598
14609
  specName: specName,
14599
14610
  specNo: specNo,
14600
- originPrice: originPrice
14611
+ originPrice: retailPrice
14601
14612
  });
14602
14613
  });
14603
14614
  } else {
@@ -15889,7 +15900,24 @@ var index$1 = (function (props) {
15889
15900
  };
15890
15901
  }
15891
15902
  };
15892
- return /*#__PURE__*/React__default['default'].createElement(antd.Table, {
15903
+ // useEffect(() => {
15904
+ // const dom = document.querySelector(
15905
+ // `.${type}_SYSTEM_ORDER_COMPONENT .ant-table-content`,
15906
+ // );
15907
+ // //解决列表出现横向滚动条时选择数据造成行内闪烁问题
15908
+ // if (
15909
+ // (value?.selectIds || []).length > 0 &&
15910
+ // dom &&
15911
+ // dom.scrollWidth > dom.clientWidth &&
15912
+ // dom.scrollLeft === 0
15913
+ // ) {
15914
+ // console.log(dom.scrollWidth > dom.clientWidth, dom.scrollLeft === 0);
15915
+ // dom.scrollLeft = 1;
15916
+ // }
15917
+ // }, [JSON.stringify(value?.selectIds || [])]);
15918
+ return /*#__PURE__*/React__default['default'].createElement("div", {
15919
+ className: "".concat(type, "_SYSTEM_ORDER_COMPONENT")
15920
+ }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
15893
15921
  dataSource: (value === null || value === void 0 ? void 0 : value.orders) || [],
15894
15922
  columns: columns,
15895
15923
  rowSelection: rowSelection,
@@ -15897,12 +15925,12 @@ var index$1 = (function (props) {
15897
15925
  size: "small",
15898
15926
  pagination: false,
15899
15927
  scroll: {
15900
- x: '100%'
15928
+ x: 'max-content'
15901
15929
  },
15902
15930
  locale: {
15903
15931
  emptyText: '暂无数据'
15904
15932
  }
15905
- });
15933
+ }));
15906
15934
  });
15907
15935
 
15908
15936
  var WlnGoods = function WlnGoods(props) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "1.22.1-beta.51",
3
+ "version": "1.22.1-beta.54",
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": "1.22.1-beta.51",
23
+ "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.53",
24
24
  "ahooks": "^3.7.4",
25
25
  "bignumber.js": "^9.1.2",
26
26
  "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
65
65
  "publishConfig": {
66
66
  "access": "public"
67
67
  },
68
- "gitHead": "391e837fb7d4604884e841979ee2b993a7d06c9b"
68
+ "gitHead": "f2c791c4f2c83b7bb3057a5dccd4dbf22a058196"
69
69
  }