@zat-design/sisyphus-react 3.13.19 → 3.13.20-beta.2

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/ProEnum/utils/index.js +1 -1
  2. package/es/ProForm/components/render/Render.js +10 -5
  3. package/lib/ProEnum/utils/index.js +1 -1
  4. package/lib/ProForm/components/render/Render.js +10 -5
  5. package/package.json +1 -1
package/es/ProEnum/utils/index.js CHANGED
@@ -114,7 +114,7 @@ export function cacheFieldNames(fieldNames, dataSource) {
114
114
  restFieldNames = _objectWithoutProperties(fieldNames, _excluded);
115
115
  var result = {};
116
116
  Object.keys(restFieldNames).forEach(key => {
117
- var value = dataSource[restFieldNames[key]] ? dataSource[restFieldNames[key]] : dataSource[key];
117
+ var value = dataSource[restFieldNames[key]] !== undefined ? dataSource[restFieldNames[key]] : dataSource[key];
118
118
  if (!(isUndefined(value) || isNull(value))) {
119
119
  result[key] = dataSource[restFieldNames[key]] ? dataSource[restFieldNames[key]] : dataSource[key];
120
120
  }
package/es/ProForm/components/render/Render.js CHANGED
@@ -422,13 +422,18 @@ var Render = props => {
422
422
 
423
423
  // 表单提示
424
424
  if (tooltip) {
425
- _otherFormItemProps.tooltip = {
426
- title: isString(tooltip) ? tooltip : tooltip.title,
427
- icon: isString(tooltip) ? /*#__PURE__*/_jsx(ReactSVG, {
425
+ _otherFormItemProps.tooltip = isString(tooltip) ? {
426
+ title: tooltip,
427
+ icon: /*#__PURE__*/_jsx(ReactSVG, {
428
428
  className: "pro-icon-tip",
429
429
  src: tipSvg
430
- }) : tooltip.icon
431
- };
430
+ })
431
+ } : _objectSpread({
432
+ icon: /*#__PURE__*/_jsx(ReactSVG, {
433
+ className: "pro-icon-tip",
434
+ src: tipSvg
435
+ })
436
+ }, tooltip);
432
437
  }
433
438
 
434
439
  // 需要过滤掉的form_item的key
package/lib/ProEnum/utils/index.js CHANGED
@@ -127,7 +127,7 @@ function cacheFieldNames(fieldNames, dataSource) {
127
127
  restFieldNames = (0, _objectWithoutProperties2.default)(fieldNames, _excluded);
128
128
  var result = {};
129
129
  Object.keys(restFieldNames).forEach(key => {
130
- var value = dataSource[restFieldNames[key]] ? dataSource[restFieldNames[key]] : dataSource[key];
130
+ var value = dataSource[restFieldNames[key]] !== undefined ? dataSource[restFieldNames[key]] : dataSource[key];
131
131
  if (!((0, _lodash.isUndefined)(value) || (0, _lodash.isNull)(value))) {
132
132
  result[key] = dataSource[restFieldNames[key]] ? dataSource[restFieldNames[key]] : dataSource[key];
133
133
  }
package/lib/ProForm/components/render/Render.js CHANGED
@@ -427,13 +427,18 @@ var Render = props => {
427
427
 
428
428
  // 表单提示
429
429
  if (tooltip) {
430
- _otherFormItemProps.tooltip = {
431
- title: (0, _lodash.isString)(tooltip) ? tooltip : tooltip.title,
432
- icon: (0, _lodash.isString)(tooltip) ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
430
+ _otherFormItemProps.tooltip = (0, _lodash.isString)(tooltip) ? {
431
+ title: tooltip,
432
+ icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
433
433
  className: "pro-icon-tip",
434
434
  src: _tip.default
435
- }) : tooltip.icon
436
- };
435
+ })
436
+ } : (0, _objectSpread2.default)({
437
+ icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
438
+ className: "pro-icon-tip",
439
+ src: _tip.default
440
+ })
441
+ }, tooltip);
437
442
  }
438
443
 
439
444
  // 需要过滤掉的form_item的key
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.13.19",
3
+ "version": "3.13.20-beta.2",
4
4
  "license": "MIT",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",