@zat-design/sisyphus-react 3.11.13 → 3.11.14-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.
@@ -1832,14 +1832,17 @@
1832
1832
  .pro-table.pro-table-draggable-only .ant-table-tbody .anticon {
1833
1833
  margin-right: 0;
1834
1834
  }
1835
+ .pro-table.pro-table-draggable-only .ant-table-row-expand-icon {
1836
+ position: absolute;
1837
+ left: -16px;
1838
+ }
1835
1839
  .pro-table .ant-table-cell-with-append {
1836
1840
  position: relative;
1837
1841
  z-index: 100;
1838
1842
  white-space: nowrap;
1839
1843
  }
1840
- .pro-table .ant-table-row-expand-icon {
1841
- position: absolute;
1842
- left: -16px;
1844
+ .pro-table .ant-table-cell-with-append > div {
1845
+ display: inline-block;
1843
1846
  }
1844
1847
  .pro-table .ant-table-content > table .ant-table-summary {
1845
1848
  color: var(--zaui-text, #343434);
@@ -2116,7 +2119,7 @@
2116
2119
  margin-left: var(--zaui-space-size-sm, 8px);
2117
2120
  }
2118
2121
  .pro-table .pro-table-empty {
2119
- margin: var(--zaui-space-size-lg, 32px) 0;
2122
+ margin: 0;
2120
2123
  color: rgba(0, 0, 0, 0.25);
2121
2124
  font-size: var(--zaui-font-size-md, 14px);
2122
2125
  text-align: center;
package/dist/less.esm.css CHANGED
@@ -1832,14 +1832,17 @@
1832
1832
  .pro-table.pro-table-draggable-only .ant-table-tbody .anticon {
1833
1833
  margin-right: 0;
1834
1834
  }
1835
+ .pro-table.pro-table-draggable-only .ant-table-row-expand-icon {
1836
+ position: absolute;
1837
+ left: -16px;
1838
+ }
1835
1839
  .pro-table .ant-table-cell-with-append {
1836
1840
  position: relative;
1837
1841
  z-index: 100;
1838
1842
  white-space: nowrap;
1839
1843
  }
1840
- .pro-table .ant-table-row-expand-icon {
1841
- position: absolute;
1842
- left: -16px;
1844
+ .pro-table .ant-table-cell-with-append > div {
1845
+ display: inline-block;
1843
1846
  }
1844
1847
  .pro-table .ant-table-content > table .ant-table-summary {
1845
1848
  color: var(--zaui-text, #343434);
@@ -2116,7 +2119,7 @@
2116
2119
  margin-left: var(--zaui-space-size-sm, 8px);
2117
2120
  }
2118
2121
  .pro-table .pro-table-empty {
2119
- margin: var(--zaui-space-size-lg, 32px) 0;
2122
+ margin: 0;
2120
2123
  color: rgba(0, 0, 0, 0.25);
2121
2124
  font-size: var(--zaui-font-size-md, 14px);
2122
2125
  text-align: center;
@@ -64,7 +64,7 @@ var ActionButton = function ActionButton(_ref) {
64
64
  mulDelete: mulDeletePoConfirmMsg
65
65
  };
66
66
  // 判断当前行是否正在编辑
67
- var isEditing = !virtualKey || btnConfig.isEditable === (editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$includes = editingKeys.includes) === null || _editingKeys$includes === void 0 ? void 0 : _editingKeys$includes.call(editingKeys, record === null || record === void 0 ? void 0 : record.rowKey));
67
+ var _isEditing = !virtualKey || btnConfig.isEditable === (editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$includes = editingKeys.includes) === null || _editingKeys$includes === void 0 ? void 0 : _editingKeys$includes.call(editingKeys, record === null || record === void 0 ? void 0 : record.rowKey));
68
68
  // 单行删除、多行删除按钮Props
69
69
  var delBtnProps = _objectSpread(_objectSpread({}, btnConfig.buttonProps), {}, {
70
70
  disabled: getDisabled((_btnConfig$buttonProp = (_btnConfig$buttonProp2 = btnConfig.buttonProps) === null || _btnConfig$buttonProp2 === void 0 ? void 0 : _btnConfig$buttonProp2.disabled) !== null && _btnConfig$buttonProp !== void 0 ? _btnConfig$buttonProp : !selectedRowKeys.length && btnConfig.type === 'mulDelete')
@@ -98,7 +98,7 @@ var ActionButton = function ActionButton(_ref) {
98
98
  });
99
99
  }
100
100
  var isDisabled = !selectedRowKeys.length && btnConfig.type === 'mulDelete' || editingKeys.length || (delBtnProps === null || delBtnProps === void 0 ? void 0 : delBtnProps.disabled);
101
- return isEditing && getShow(btnConfig.show) ? _jsx(_Fragment, {
101
+ return _isEditing && getShow(btnConfig.show) ? _jsx(_Fragment, {
102
102
  children: ['delete', 'mulDelete'].includes(btnConfig.type) ? _jsx(_Fragment, {
103
103
  children: (btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.needConfirm) ? _jsx(_Popconfirm, {
104
104
  placement: "topRight",
@@ -64,7 +64,7 @@ var RenderField = function RenderField(_ref) {
64
64
  var mode = config.mode,
65
65
  cellName = config.cellName,
66
66
  cellNamePath = config.cellNamePath,
67
- isEditing = config.isEditing,
67
+ _isEditing = config._isEditing,
68
68
  form = config.form,
69
69
  setState = config.setState,
70
70
  name = config.name,
@@ -139,7 +139,7 @@ var RenderField = function RenderField(_ref) {
139
139
  // }, 100);
140
140
  }
141
141
  // 是否只读文本
142
- var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !isEditing || getDisabled({
142
+ var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !_isEditing || getDisabled({
143
143
  globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
144
144
  formDisabled: otherProps === null || otherProps === void 0 ? void 0 : otherProps.formDisabled,
145
145
  column: column,
@@ -157,7 +157,7 @@ var RenderField = function RenderField(_ref) {
157
157
  label: label,
158
158
  labelRequired: labelRequired,
159
159
  required: !isView && _required,
160
- rules: isEditing ? _rules : [],
160
+ rules: _isEditing ? _rules : [],
161
161
  isSelect: isSelect({
162
162
  dataSource: (_fieldProps2 = _fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.dataSource,
163
163
  type: type
@@ -242,7 +242,7 @@ var RenderField = function RenderField(_ref) {
242
242
  var _componentMap$type;
243
243
  TargetComponent = (_componentMap$type = componentMap[type]) !== null && _componentMap$type !== void 0 ? _componentMap$type : _jsx(_Fragment, {});
244
244
  }
245
- if (isEditable && isEditing) {
245
+ if (isEditable && _isEditing) {
246
246
  if (typeof _editRender === 'function') {
247
247
  TargetComponent = _editRender.apply(void 0, rowParams);
248
248
  }
@@ -189,14 +189,12 @@ var ProEditTable = function ProEditTable(_ref, ref) {
189
189
  recursive: true
190
190
  });
191
191
  case 7:
192
- if (current !== page.pageNum) {
193
- setState({
194
- page: {
195
- pageNum: current,
196
- pageSize: pageSize !== null && pageSize !== void 0 ? pageSize : page.pageSize
197
- }
198
- });
199
- }
192
+ setState({
193
+ page: {
194
+ pageNum: current,
195
+ pageSize: pageSize !== null && pageSize !== void 0 ? pageSize : page.pageSize
196
+ }
197
+ });
200
198
  case 8:
201
199
  _context.next = 13;
202
200
  break;
@@ -53,9 +53,9 @@ export var actions = {
53
53
  nextEditingKeys.push(record.rowKey);
54
54
  // 编辑时赋值编辑状态,供validator做保存校验
55
55
  if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
56
- record.isEditing = true;
56
+ record._isEditing = true;
57
57
  } else {
58
- delete record.isEditing;
58
+ delete record._isEditing;
59
59
  }
60
60
  // 复制当前行数据
61
61
  form.setFieldValue(virtualRowName, _objectSpread({}, record));
@@ -73,15 +73,15 @@ export var actions = {
73
73
  // 保存返回数据与当前行内数据做合并
74
74
  updateData = _typeof(result) === 'object' ? result : {};
75
75
  record = _objectSpread(_objectSpread(_objectSpread({}, record), form.getFieldValue(virtualRowName)), updateData);
76
- delete record.addFlag; // 删除第一次新增的标记
76
+ delete record._addFlag; // 删除第一次新增的标记
77
77
  // 关闭当前保存行的编辑状态
78
78
  nextEditingKeys = editingKeys.filter(function (key) {
79
79
  return key !== record.rowKey;
80
80
  }); // 保存后取消编辑状态,供validator做保存校验
81
81
  if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
82
- record.isEditing = true;
82
+ record._isEditing = true;
83
83
  } else {
84
- delete record.isEditing;
84
+ delete record._isEditing;
85
85
  }
86
86
  // 防止value引用不变, 值不更新 - (自定义组件)
87
87
  values = form.getFieldsValue();
@@ -114,15 +114,15 @@ export var actions = {
114
114
  });
115
115
  // 保存后取消编辑状态,供validator做保存校验
116
116
  if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
117
- record.isEditing = true;
117
+ record._isEditing = true;
118
118
  } else {
119
- delete record.isEditing;
119
+ delete record._isEditing;
120
120
  }
121
121
  setState({
122
122
  editingKeys: nextEditingKeys
123
123
  }); // 关闭编辑状态
124
124
  // 取消分两种,一编辑取消,二添加取消
125
- if (record.addFlag) {
125
+ if (record._addFlag) {
126
126
  onDelete({
127
127
  name: name,
128
128
  form: form,
@@ -187,8 +187,8 @@ export var actions = {
187
187
  rowKey: rowKey
188
188
  }); // 单行编辑时,需要操作一下数据结构,判断是否第一次新增,以及是否是编辑状态
189
189
  if (virtualKey) {
190
- addData.addFlag = true;
191
- addData.isEditing = true;
190
+ addData._addFlag = true;
191
+ addData._isEditing = true;
192
192
  }
193
193
  if (insertType === 'before') {
194
194
  nextData.unshift(addData);
@@ -277,7 +277,7 @@ export var transformColumns = function transformColumns() {
277
277
  item.className = _toConsumableArray(new Set(item.className.split(' '))).join(' ');
278
278
  }
279
279
  var _render = function _render(text, record, index) {
280
- var isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record.addFlag;
280
+ var _isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record._addFlag;
281
281
  var namePath = isArray(name) ? name : [name];
282
282
  if (virtualKey && editingKeys.includes(record.rowKey)) {
283
283
  namePath = getNamePath(name, virtualKey);
@@ -298,7 +298,7 @@ export var transformColumns = function transformColumns() {
298
298
  return record === null || record === void 0 ? void 0 : record[item];
299
299
  });
300
300
  }
301
- if (!isEditing && ellipsis) {
301
+ if (!_isEditing && ellipsis) {
302
302
  return _jsx(ProTooltip, {
303
303
  text: _text,
304
304
  line: 1,
@@ -337,7 +337,7 @@ export var transformColumns = function transformColumns() {
337
337
  column: item,
338
338
  config: _objectSpread(_objectSpread({}, config), {}, {
339
339
  cellName: cellName,
340
- isEditing: isEditing // 是否正在编辑
340
+ _isEditing: _isEditing // 是否正在编辑
341
341
  })
342
342
  })]
343
343
  });
@@ -8,16 +8,20 @@
8
8
  margin-right: 0;
9
9
  }
10
10
  }
11
+ .@{ant-prefix}-table-row-expand-icon {
12
+ position: absolute;
13
+ left: -16px;
14
+ }
11
15
  }
12
16
  .@{ant-prefix}-table-cell-with-append {
13
17
  position: relative;
14
18
  z-index: 100;
15
19
  white-space: nowrap;
20
+ > div {
21
+ display: inline-block;
22
+ }
16
23
  }
17
- .@{ant-prefix}-table-row-expand-icon {
18
- position: absolute;
19
- left: -16px;
20
- }
24
+
21
25
 
22
26
  .@{ant-prefix}-table-content {
23
27
  > table {
@@ -433,7 +437,7 @@
433
437
  }
434
438
 
435
439
  .pro-table-empty {
436
- margin: var(--zaui-space-size-lg, 32px) 0;
440
+ margin: 0;
437
441
  color: rgba(0, 0, 0, 0.25);
438
442
  font-size: var(--zaui-font-size-md, 14px);
439
443
  text-align: center;
@@ -333,15 +333,12 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
333
333
  });
334
334
  if (_showEllipse) {
335
335
  title = _jsx(AdaptiveTooltip, {
336
- children: treeCheckable ? titleHtml : _jsxs("span", {
336
+ children: treeCheckable ? titleHtml : _jsx("span", {
337
337
  className: "check-option-text",
338
- children: [_jsx("span", {
338
+ children: _jsx("span", {
339
339
  className: "check-option-text-content",
340
340
  children: titleHtml
341
- }), !disabled ? _jsx("span", {
342
- className: "check-mark-icon",
343
- children: _jsx(Icon, {})
344
- }) : null]
341
+ })
345
342
  })
346
343
  });
347
344
  }
@@ -22,6 +22,9 @@ import ButtonRender from './components/ButtonRender';
22
22
  import ImageRender from './components/ImageRender';
23
23
  import { validateSize, validateFileExt } from './uitls';
24
24
  import locale from '../locale';
25
+ var defaultCustomRequest = function defaultCustomRequest(option) {
26
+ return option.onSuccess();
27
+ };
25
28
  var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
26
29
  var _locale$ProUpload;
27
30
  var _useState = useState([]),
@@ -242,7 +245,7 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
242
245
  };
243
246
  }, [_fileList]);
244
247
  // 通用props
245
- var baseUploadProps = _objectSpread({
248
+ var baseUploadProps = _objectSpread(_objectSpread({
246
249
  action: action,
247
250
  beforeUpload: handleBeforeUpload,
248
251
  onRemove: handleRemove,
@@ -253,7 +256,9 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
253
256
  accept: accept,
254
257
  data: _objectSpread({}, dataParams),
255
258
  name: name
256
- }, residueProps);
259
+ }, residueProps), {}, {
260
+ customRequest: !action && !residueProps.customRequest ? defaultCustomRequest : residueProps.customRequest
261
+ });
257
262
  var baseProps = {
258
263
  isView: isView,
259
264
  headerRender: _headerRender,
@@ -1,5 +1,6 @@
1
1
  import React from 'react';
2
2
  import { UploadFile } from 'antd/es/upload/interface';
3
+ import { UploadRequestOption } from 'rc-upload/lib/interface';
3
4
  export type UploadType = 'drag' | 'button' | 'image';
4
5
  export interface UploadFileRes {
5
6
  url: string;
@@ -200,6 +201,11 @@ export interface ProUploadProps {
200
201
  * @default false
201
202
  */
202
203
  isView?: boolean;
204
+ /**
205
+ * @description 自定义上传实现
206
+ * @default false
207
+ */
208
+ customRequest?: (option: UploadRequestOption) => void;
203
209
  }
204
210
  export interface DraggableUploadListItemProps {
205
211
  file: UploadFile<any>;
@@ -68,7 +68,7 @@ var ActionButton = function ActionButton(_ref) {
68
68
  mulDelete: mulDeletePoConfirmMsg
69
69
  };
70
70
  // 判断当前行是否正在编辑
71
- var isEditing = !virtualKey || btnConfig.isEditable === (editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$includes = editingKeys.includes) === null || _editingKeys$includes === void 0 ? void 0 : _editingKeys$includes.call(editingKeys, record === null || record === void 0 ? void 0 : record.rowKey));
71
+ var _isEditing = !virtualKey || btnConfig.isEditable === (editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$includes = editingKeys.includes) === null || _editingKeys$includes === void 0 ? void 0 : _editingKeys$includes.call(editingKeys, record === null || record === void 0 ? void 0 : record.rowKey));
72
72
  // 单行删除、多行删除按钮Props
73
73
  var delBtnProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, btnConfig.buttonProps), {}, {
74
74
  disabled: getDisabled((_btnConfig$buttonProp = (_btnConfig$buttonProp2 = btnConfig.buttonProps) === null || _btnConfig$buttonProp2 === void 0 ? void 0 : _btnConfig$buttonProp2.disabled) !== null && _btnConfig$buttonProp !== void 0 ? _btnConfig$buttonProp : !selectedRowKeys.length && btnConfig.type === 'mulDelete')
@@ -102,7 +102,7 @@ var ActionButton = function ActionButton(_ref) {
102
102
  });
103
103
  }
104
104
  var isDisabled = !selectedRowKeys.length && btnConfig.type === 'mulDelete' || editingKeys.length || (delBtnProps === null || delBtnProps === void 0 ? void 0 : delBtnProps.disabled);
105
- return isEditing && getShow(btnConfig.show) ? (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
105
+ return _isEditing && getShow(btnConfig.show) ? (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
106
106
  children: ['delete', 'mulDelete'].includes(btnConfig.type) ? (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
107
107
  children: (btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.needConfirm) ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, {
108
108
  placement: "topRight",
@@ -71,7 +71,7 @@ var RenderField = function RenderField(_ref) {
71
71
  var mode = config.mode,
72
72
  cellName = config.cellName,
73
73
  cellNamePath = config.cellNamePath,
74
- isEditing = config.isEditing,
74
+ _isEditing = config._isEditing,
75
75
  form = config.form,
76
76
  setState = config.setState,
77
77
  name = config.name,
@@ -146,7 +146,7 @@ var RenderField = function RenderField(_ref) {
146
146
  // }, 100);
147
147
  }
148
148
  // 是否只读文本
149
- var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !isEditing || (0, _tools.getDisabled)({
149
+ var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !_isEditing || (0, _tools.getDisabled)({
150
150
  globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
151
151
  formDisabled: otherProps === null || otherProps === void 0 ? void 0 : otherProps.formDisabled,
152
152
  column: column,
@@ -164,7 +164,7 @@ var RenderField = function RenderField(_ref) {
164
164
  label: label,
165
165
  labelRequired: labelRequired,
166
166
  required: !isView && _required,
167
- rules: isEditing ? _rules : [],
167
+ rules: _isEditing ? _rules : [],
168
168
  isSelect: (0, _utils.isSelect)({
169
169
  dataSource: (_fieldProps2 = _fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.dataSource,
170
170
  type: type
@@ -249,7 +249,7 @@ var RenderField = function RenderField(_ref) {
249
249
  var _componentMap$type;
250
250
  TargetComponent = (_componentMap$type = componentMap[type]) !== null && _componentMap$type !== void 0 ? _componentMap$type : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
251
251
  }
252
- if (isEditable && isEditing) {
252
+ if (isEditable && _isEditing) {
253
253
  if (typeof _editRender === 'function') {
254
254
  TargetComponent = _editRender.apply(void 0, rowParams);
255
255
  }
@@ -192,14 +192,12 @@ var ProEditTable = function ProEditTable(_ref, ref) {
192
192
  recursive: true
193
193
  });
194
194
  case 7:
195
- if (current !== page.pageNum) {
196
- setState({
197
- page: {
198
- pageNum: current,
199
- pageSize: pageSize !== null && pageSize !== void 0 ? pageSize : page.pageSize
200
- }
201
- });
202
- }
195
+ setState({
196
+ page: {
197
+ pageNum: current,
198
+ pageSize: pageSize !== null && pageSize !== void 0 ? pageSize : page.pageSize
199
+ }
200
+ });
203
201
  case 8:
204
202
  _context.next = 13;
205
203
  break;
@@ -59,9 +59,9 @@ var actions = exports.actions = {
59
59
  nextEditingKeys.push(record.rowKey);
60
60
  // 编辑时赋值编辑状态,供validator做保存校验
61
61
  if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
62
- record.isEditing = true;
62
+ record._isEditing = true;
63
63
  } else {
64
- delete record.isEditing;
64
+ delete record._isEditing;
65
65
  }
66
66
  // 复制当前行数据
67
67
  form.setFieldValue(virtualRowName, (0, _objectSpread2.default)({}, record));
@@ -79,15 +79,15 @@ var actions = exports.actions = {
79
79
  // 保存返回数据与当前行内数据做合并
80
80
  updateData = (0, _typeof2.default)(result) === 'object' ? result : {};
81
81
  record = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, record), form.getFieldValue(virtualRowName)), updateData);
82
- delete record.addFlag; // 删除第一次新增的标记
82
+ delete record._addFlag; // 删除第一次新增的标记
83
83
  // 关闭当前保存行的编辑状态
84
84
  nextEditingKeys = editingKeys.filter(function (key) {
85
85
  return key !== record.rowKey;
86
86
  }); // 保存后取消编辑状态,供validator做保存校验
87
87
  if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
88
- record.isEditing = true;
88
+ record._isEditing = true;
89
89
  } else {
90
- delete record.isEditing;
90
+ delete record._isEditing;
91
91
  }
92
92
  // 防止value引用不变, 值不更新 - (自定义组件)
93
93
  values = form.getFieldsValue();
@@ -120,15 +120,15 @@ var actions = exports.actions = {
120
120
  });
121
121
  // 保存后取消编辑状态,供validator做保存校验
122
122
  if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
123
- record.isEditing = true;
123
+ record._isEditing = true;
124
124
  } else {
125
- delete record.isEditing;
125
+ delete record._isEditing;
126
126
  }
127
127
  setState({
128
128
  editingKeys: nextEditingKeys
129
129
  }); // 关闭编辑状态
130
130
  // 取消分两种,一编辑取消,二添加取消
131
- if (record.addFlag) {
131
+ if (record._addFlag) {
132
132
  (0, _tools.onDelete)({
133
133
  name: name,
134
134
  form: form,
@@ -193,8 +193,8 @@ var actions = exports.actions = {
193
193
  rowKey: rowKey
194
194
  }); // 单行编辑时,需要操作一下数据结构,判断是否第一次新增,以及是否是编辑状态
195
195
  if (virtualKey) {
196
- addData.addFlag = true;
197
- addData.isEditing = true;
196
+ addData._addFlag = true;
197
+ addData._isEditing = true;
198
198
  }
199
199
  if (insertType === 'before') {
200
200
  nextData.unshift(addData);
@@ -281,7 +281,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
281
281
  item.className = (0, _toConsumableArray2.default)(new Set(item.className.split(' '))).join(' ');
282
282
  }
283
283
  var _render = function _render(text, record, index) {
284
- var isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record.addFlag;
284
+ var _isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record._addFlag;
285
285
  var namePath = (0, _lodash.isArray)(name) ? name : [name];
286
286
  if (virtualKey && editingKeys.includes(record.rowKey)) {
287
287
  namePath = (0, _tools.getNamePath)(name, virtualKey);
@@ -302,7 +302,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
302
302
  return record === null || record === void 0 ? void 0 : record[item];
303
303
  });
304
304
  }
305
- if (!isEditing && ellipsis) {
305
+ if (!_isEditing && ellipsis) {
306
306
  return (0, _jsxRuntime.jsx)(_ProTooltip.default, {
307
307
  text: _text,
308
308
  line: 1,
@@ -341,7 +341,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
341
341
  column: item,
342
342
  config: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
343
343
  cellName: cellName,
344
- isEditing: isEditing // 是否正在编辑
344
+ _isEditing: _isEditing // 是否正在编辑
345
345
  })
346
346
  })]
347
347
  });
@@ -8,16 +8,20 @@
8
8
  margin-right: 0;
9
9
  }
10
10
  }
11
+ .@{ant-prefix}-table-row-expand-icon {
12
+ position: absolute;
13
+ left: -16px;
14
+ }
11
15
  }
12
16
  .@{ant-prefix}-table-cell-with-append {
13
17
  position: relative;
14
18
  z-index: 100;
15
19
  white-space: nowrap;
20
+ > div {
21
+ display: inline-block;
22
+ }
16
23
  }
17
- .@{ant-prefix}-table-row-expand-icon {
18
- position: absolute;
19
- left: -16px;
20
- }
24
+
21
25
 
22
26
  .@{ant-prefix}-table-content {
23
27
  > table {
@@ -433,7 +437,7 @@
433
437
  }
434
438
 
435
439
  .pro-table-empty {
436
- margin: var(--zaui-space-size-lg, 32px) 0;
440
+ margin: 0;
437
441
  color: rgba(0, 0, 0, 0.25);
438
442
  font-size: var(--zaui-font-size-md, 14px);
439
443
  text-align: center;
@@ -333,15 +333,12 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
333
333
  });
334
334
  if (_showEllipse) {
335
335
  title = (0, _jsxRuntime.jsx)(_AdaptiveTooltip.default, {
336
- children: treeCheckable ? titleHtml : (0, _jsxRuntime.jsxs)("span", {
336
+ children: treeCheckable ? titleHtml : (0, _jsxRuntime.jsx)("span", {
337
337
  className: "check-option-text",
338
- children: [(0, _jsxRuntime.jsx)("span", {
338
+ children: (0, _jsxRuntime.jsx)("span", {
339
339
  className: "check-option-text-content",
340
340
  children: titleHtml
341
- }), !disabled ? (0, _jsxRuntime.jsx)("span", {
342
- className: "check-mark-icon",
343
- children: (0, _jsxRuntime.jsx)(Icon, {})
344
- }) : null]
341
+ })
345
342
  })
346
343
  });
347
344
  }
@@ -29,6 +29,9 @@ var _excluded = ["value", "size", "action", "maxCount", "headerRender", "footerR
29
29
  * @LastEditors: wangshengqiang
30
30
  * @Description: 上传控件
31
31
  */
32
+ var defaultCustomRequest = function defaultCustomRequest(option) {
33
+ return option.onSuccess();
34
+ };
32
35
  var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
33
36
  var _locale$ProUpload;
34
37
  var _useState = (0, _react.useState)([]),
@@ -249,7 +252,7 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
249
252
  };
250
253
  }, [_fileList]);
251
254
  // 通用props
252
- var baseUploadProps = (0, _objectSpread2.default)({
255
+ var baseUploadProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
253
256
  action: action,
254
257
  beforeUpload: handleBeforeUpload,
255
258
  onRemove: handleRemove,
@@ -260,7 +263,9 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
260
263
  accept: accept,
261
264
  data: (0, _objectSpread2.default)({}, dataParams),
262
265
  name: name
263
- }, residueProps);
266
+ }, residueProps), {}, {
267
+ customRequest: !action && !residueProps.customRequest ? defaultCustomRequest : residueProps.customRequest
268
+ });
264
269
  var baseProps = {
265
270
  isView: isView,
266
271
  headerRender: _headerRender,
@@ -1,5 +1,6 @@
1
1
  import React from 'react';
2
2
  import { UploadFile } from 'antd/es/upload/interface';
3
+ import { UploadRequestOption } from 'rc-upload/lib/interface';
3
4
  export type UploadType = 'drag' | 'button' | 'image';
4
5
  export interface UploadFileRes {
5
6
  url: string;
@@ -200,6 +201,11 @@ export interface ProUploadProps {
200
201
  * @default false
201
202
  */
202
203
  isView?: boolean;
204
+ /**
205
+ * @description 自定义上传实现
206
+ * @default false
207
+ */
208
+ customRequest?: (option: UploadRequestOption) => void;
203
209
  }
204
210
  export interface DraggableUploadListItemProps {
205
211
  file: UploadFile<any>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.11.13",
3
+ "version": "3.11.14-beta.2",
4
4
  "license": "MIT",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",