@zat-design/sisyphus-react 3.8.2-beta.10 → 3.8.2-beta.11

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/ProTable/components/FormatColumn/index.js +2 -1
  2. package/es/ProTable/index.js +4 -3
  3. package/lib/ProTable/components/FormatColumn/index.js +2 -1
  4. package/lib/ProTable/index.js +4 -3
  5. package/package.json +1 -1
package/es/ProTable/components/FormatColumn/index.js CHANGED
@@ -71,10 +71,11 @@ export var formatColumn = function formatColumn(_ref) {
71
71
  var originalRender = column.render; // 保存原始的 render 方法
72
72
  // 自定义render 手动重载下
73
73
  column.render = function (value, record, index) {
74
+ var _originalObj$record$r;
74
75
  var isFn = isFunction(originalRender);
75
76
  var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : undefined;
76
77
  var originalValue = getOriginalValue(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
77
- var originalRenderValue = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(originalValue, originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]], index) : undefined;
78
+ var originalRenderValue = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(originalValue, (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {}, index) : undefined;
78
79
  return _jsx(RenderColumn, {
79
80
  valueType: valueType,
80
81
  originalValue: originalValue === undefined ? undefined : originalRenderValue,
package/es/ProTable/index.js CHANGED
@@ -228,9 +228,10 @@ function ProTable(props) {
228
228
  return true;
229
229
  });
230
230
  }, [columns]);
231
- var isExistPercentWidth = !!_columns.find(function (item) {
232
- return item.width && typeof item.width === 'string' && item.width.endsWith('%');
233
- });
231
+ var isExistPercentWidth = !!(_columns === null || _columns === void 0 ? void 0 : _columns.find(function (item) {
232
+ var _item$width;
233
+ return (item === null || item === void 0 ? void 0 : item.width) && typeof (item === null || item === void 0 ? void 0 : item.width) === 'string' && (item === null || item === void 0 ? void 0 : (_item$width = item.width) === null || _item$width === void 0 ? void 0 : _item$width.endsWith('%'));
234
+ }));
234
235
  if (isExistPercentWidth) {
235
236
  _scroll = props === null || props === void 0 ? void 0 : props.scroll;
236
237
  }
package/lib/ProTable/components/FormatColumn/index.js CHANGED
@@ -77,10 +77,11 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref) {
77
77
  var originalRender = column.render; // 保存原始的 render 方法
78
78
  // 自定义render 手动重载下
79
79
  column.render = function (value, record, index) {
80
+ var _originalObj$record$r;
80
81
  var isFn = (0, _lodash.isFunction)(originalRender);
81
82
  var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : undefined;
82
83
  var originalValue = (0, _utils2.getOriginalValue)(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
83
- var originalRenderValue = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(originalValue, originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]], index) : undefined;
84
+ var originalRenderValue = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(originalValue, (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {}, index) : undefined;
84
85
  return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
85
86
  valueType: valueType,
86
87
  originalValue: originalValue === undefined ? undefined : originalRenderValue,
package/lib/ProTable/index.js CHANGED
@@ -235,9 +235,10 @@ function ProTable(props) {
235
235
  return true;
236
236
  });
237
237
  }, [columns]);
238
- var isExistPercentWidth = !!_columns.find(function (item) {
239
- return item.width && typeof item.width === 'string' && item.width.endsWith('%');
240
- });
238
+ var isExistPercentWidth = !!(_columns === null || _columns === void 0 ? void 0 : _columns.find(function (item) {
239
+ var _item$width;
240
+ return (item === null || item === void 0 ? void 0 : item.width) && typeof (item === null || item === void 0 ? void 0 : item.width) === 'string' && (item === null || item === void 0 ? void 0 : (_item$width = item.width) === null || _item$width === void 0 ? void 0 : _item$width.endsWith('%'));
241
+ }));
241
242
  if (isExistPercentWidth) {
242
243
  _scroll = props === null || props === void 0 ? void 0 : props.scroll;
243
244
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.8.2-beta.10",
3
+ "version": "3.8.2-beta.11",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",