@zat-design/sisyphus-react 3.9.4-beta.10 → 3.9.4-beta.12

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 (7) hide show
  1. package/es/ProForm/components/combination/Group/component/ComRender.js +8 -1
  2. package/es/ProForm/components/combination/Group/index.js +1 -1
  3. package/es/ProTable/components/FormatColumn/index.js +4 -15
  4. package/lib/ProForm/components/combination/Group/component/ComRender.js +7 -0
  5. package/lib/ProForm/components/combination/Group/index.js +1 -1
  6. package/lib/ProTable/components/FormatColumn/index.js +4 -15
  7. package/package.json +1 -1
package/es/ProForm/components/combination/Group/component/ComRender.js CHANGED
@@ -2,7 +2,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
2
2
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
3
3
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
4
  var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType", "isView", "viewRender"];
5
- import { jsx as _jsx } from "react/jsx-runtime";
5
+ import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
6
6
  import React from 'react';
7
7
  import ConfirmWrapper from '../../../../components/render/ConfirmWrapper';
8
8
  import { FieldProvider } from '../../../../utils/useFieldProps';
@@ -30,6 +30,7 @@ var getComRender = function getComRender(component, props, componentProps) {
30
30
  };
31
31
  /** 渲染组件 */
32
32
  var ComRender = function ComRender(props) {
33
+ var _props$component, _props$component$prop;
33
34
  var type = props.type,
34
35
  confirm = props.confirm,
35
36
  component = props.component,
@@ -50,6 +51,12 @@ var ComRender = function ComRender(props) {
50
51
  };
51
52
  var _props = mergedGetValueProps(fieldProps.value);
52
53
  var componentProps = _objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), _props);
54
+ var isSeparator = (props === null || props === void 0 ? void 0 : (_props$component = props.component) === null || _props$component === void 0 ? void 0 : (_props$component$prop = _props$component.props) === null || _props$component$prop === void 0 ? void 0 : _props$component$prop.className) === 'group-separator';
55
+ if (isSeparator && isView) {
56
+ return _jsx(_Fragment, {
57
+ children: "/"
58
+ });
59
+ }
53
60
  if (viewRender && isView) {
54
61
  return _jsx(FieldProvider, {
55
62
  value: _objectSpread(_objectSpread({}, contextProps), {}, {
package/es/ProForm/components/combination/Group/index.js CHANGED
@@ -71,7 +71,7 @@ var Group = function Group(props) {
71
71
  children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {
72
72
  children: columns.map(function (column, index) {
73
73
  column.otherProps = otherProps;
74
- // 自定义间隔移除对于参数
74
+ // 自定义间隔移除对应参数
75
75
  if (column === null || column === void 0 ? void 0 : column.separator) {
76
76
  delete column.separator;
77
77
  delete column.otherProps;
package/es/ProTable/components/FormatColumn/index.js CHANGED
@@ -123,13 +123,11 @@ export var formatColumn = function formatColumn(_ref2) {
123
123
  var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : null;
124
124
  var originalResult = getOriginalValue(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
125
125
  var originalValue = originalResult.originalValue;
126
- var _originalValue = originalValue;
127
126
  var isChanged = originalResult.isChanged,
128
127
  isAddCell = originalResult.isAddCell;
129
128
  var isInNewRowFlag = isInNewRow(record);
130
129
  var _isAddCell = isAddCell;
131
130
  otherProps.isChanged = isChanged;
132
- var nextValue = value;
133
131
  // 存在比对
134
132
  if (isFunction(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender) && (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource)) {
135
133
  var _originalObj$record$r;
@@ -144,31 +142,22 @@ export var formatColumn = function formatColumn(_ref2) {
144
142
  if (isBoolean(diffResult) && !diffResult) {
145
143
  otherProps.isChanged = false;
146
144
  }
147
- _originalValue = diffResult;
148
- nextValue = otherProps.viewRender({
149
- originalValue: value,
150
- originalRecord: record !== null && record !== void 0 ? record : {},
151
- value: value,
152
- record: record,
153
- index: index
154
- });
145
+ originalValue = diffResult;
155
146
  }
156
147
  // 存在自定义onDiff比对
157
148
  if (isFunction(onDiff)) {
158
149
  var _originalObj$record$r2;
159
150
  var _diffResult = onDiff({
160
- originalValue: _originalValue,
151
+ originalValue: originalValue,
161
152
  originalRecord: (_originalObj$record$r2 = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r2 !== void 0 ? _originalObj$record$r2 : {},
162
- value: nextValue,
153
+ value: value,
163
154
  record: record,
164
155
  index: index
165
156
  });
166
157
  if (_diffResult === 'changed') {
167
- _isAddCell = false;
168
158
  otherProps.isChanged = true;
169
159
  }
170
160
  if (_diffResult === 'same') {
171
- _isAddCell = false;
172
161
  otherProps.isChanged = false;
173
162
  }
174
163
  if (_diffResult === 'add') {
@@ -178,7 +167,7 @@ export var formatColumn = function formatColumn(_ref2) {
178
167
  }
179
168
  return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
180
169
  valueType: valueType,
181
- originalValue: isEmpty(_originalValue) ? null : _originalValue,
170
+ originalValue: isEmpty(originalValue) ? null : originalValue,
182
171
  ellipsis: ellipsis,
183
172
  width: width,
184
173
  value: _value,
package/lib/ProForm/components/combination/Group/component/ComRender.js CHANGED
@@ -38,6 +38,7 @@ var getComRender = function getComRender(component, props, componentProps) {
38
38
  };
39
39
  /** 渲染组件 */
40
40
  var ComRender = function ComRender(props) {
41
+ var _props$component, _props$component$prop;
41
42
  var type = props.type,
42
43
  confirm = props.confirm,
43
44
  component = props.component,
@@ -58,6 +59,12 @@ var ComRender = function ComRender(props) {
58
59
  };
59
60
  var _props = mergedGetValueProps(fieldProps.value);
60
61
  var componentProps = (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldProps), rest), _props);
62
+ var isSeparator = (props === null || props === void 0 ? void 0 : (_props$component = props.component) === null || _props$component === void 0 ? void 0 : (_props$component$prop = _props$component.props) === null || _props$component$prop === void 0 ? void 0 : _props$component$prop.className) === 'group-separator';
63
+ if (isSeparator && isView) {
64
+ return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
65
+ children: "/"
66
+ });
67
+ }
61
68
  if (viewRender && isView) {
62
69
  return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
63
70
  value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {
package/lib/ProForm/components/combination/Group/index.js CHANGED
@@ -77,7 +77,7 @@ var Group = function Group(props) {
77
77
  children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? (0, _jsxRuntime.jsx)(_antd.Space.Compact, {
78
78
  children: columns.map(function (column, index) {
79
79
  column.otherProps = otherProps;
80
- // 自定义间隔移除对于参数
80
+ // 自定义间隔移除对应参数
81
81
  if (column === null || column === void 0 ? void 0 : column.separator) {
82
82
  delete column.separator;
83
83
  delete column.otherProps;
package/lib/ProTable/components/FormatColumn/index.js CHANGED
@@ -129,13 +129,11 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
129
129
  var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : null;
130
130
  var originalResult = (0, _utils2.getOriginalValue)(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
131
131
  var originalValue = originalResult.originalValue;
132
- var _originalValue = originalValue;
133
132
  var isChanged = originalResult.isChanged,
134
133
  isAddCell = originalResult.isAddCell;
135
134
  var isInNewRowFlag = isInNewRow(record);
136
135
  var _isAddCell = isAddCell;
137
136
  otherProps.isChanged = isChanged;
138
- var nextValue = value;
139
137
  // 存在比对
140
138
  if ((0, _lodash.isFunction)(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender) && (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource)) {
141
139
  var _originalObj$record$r;
@@ -150,31 +148,22 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
150
148
  if ((0, _lodash.isBoolean)(diffResult) && !diffResult) {
151
149
  otherProps.isChanged = false;
152
150
  }
153
- _originalValue = diffResult;
154
- nextValue = otherProps.viewRender({
155
- originalValue: value,
156
- originalRecord: record !== null && record !== void 0 ? record : {},
157
- value: value,
158
- record: record,
159
- index: index
160
- });
151
+ originalValue = diffResult;
161
152
  }
162
153
  // 存在自定义onDiff比对
163
154
  if ((0, _lodash.isFunction)(onDiff)) {
164
155
  var _originalObj$record$r2;
165
156
  var _diffResult = onDiff({
166
- originalValue: _originalValue,
157
+ originalValue: originalValue,
167
158
  originalRecord: (_originalObj$record$r2 = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r2 !== void 0 ? _originalObj$record$r2 : {},
168
- value: nextValue,
159
+ value: value,
169
160
  record: record,
170
161
  index: index
171
162
  });
172
163
  if (_diffResult === 'changed') {
173
- _isAddCell = false;
174
164
  otherProps.isChanged = true;
175
165
  }
176
166
  if (_diffResult === 'same') {
177
- _isAddCell = false;
178
167
  otherProps.isChanged = false;
179
168
  }
180
169
  if (_diffResult === 'add') {
@@ -184,7 +173,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
184
173
  }
185
174
  return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
186
175
  valueType: valueType,
187
- originalValue: (0, _utils3.isEmpty)(_originalValue) ? null : _originalValue,
176
+ originalValue: (0, _utils3.isEmpty)(originalValue) ? null : originalValue,
188
177
  ellipsis: ellipsis,
189
178
  width: width,
190
179
  value: _value,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.9.4-beta.10",
3
+ "version": "3.9.4-beta.12",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",