@zat-design/sisyphus-react 3.3.0-beta.3 → 3.3.0-beta.5

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/ProEnum/index.js +5 -15
  2. package/es/ProEnum/propsType.d.ts +1 -0
  3. package/es/ProUpload/components/ImageRender.js +4 -5
  4. package/lib/ProEnum/index.js +5 -15
  5. package/lib/ProEnum/propsType.d.ts +1 -0
  6. package/lib/ProUpload/components/ImageRender.js +4 -5
  7. package/package.json +1 -1
package/es/ProEnum/index.js CHANGED
@@ -79,7 +79,6 @@ var ProEnum = function ProEnum(props) {
79
79
  var _useProConfig = useProConfig('ProEnum'),
80
80
  _useProConfig$dics = _useProConfig.dics,
81
81
  dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
82
- // const enumList = dics?.[code] || [];
83
82
  var _useRequestFunc = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({
84
83
  manual: true,
85
84
  cacheTime: -1
@@ -161,6 +160,7 @@ var ProEnum = function ProEnum(props) {
161
160
  onChange: onChange
162
161
  }));
163
162
  }
163
+ console.log(list);
164
164
  switch (type) {
165
165
  case 'ProSelect':
166
166
  return _jsx(ProSelect, _objectSpread(_objectSpread({}, enumProps), {}, {
@@ -174,25 +174,15 @@ var ProEnum = function ProEnum(props) {
174
174
  }));
175
175
  case 'Radio':
176
176
  return _jsx(_Radio.Group, _objectSpread(_objectSpread({}, enumProps), {}, {
177
+ options: list,
177
178
  value: value,
178
- onChange: onChange,
179
- children: list.map(function (item) {
180
- return _jsx(_Radio, {
181
- value: item[fieldValue],
182
- children: item[label]
183
- }, item[fieldValue]);
184
- })
179
+ onChange: onChange
185
180
  }));
186
181
  case 'Checkbox':
187
182
  return _jsx(_Checkbox.Group, _objectSpread(_objectSpread({}, enumProps), {}, {
183
+ options: list,
188
184
  value: value,
189
- onChange: onChange,
190
- children: list.map(function (item) {
191
- return _jsx(_Checkbox, {
192
- value: item[fieldValue],
193
- children: item[label]
194
- }, item[fieldValue]);
195
- })
185
+ onChange: onChange
196
186
  }));
197
187
  case 'Tag':
198
188
  return _jsx(ProEnumTag, {
package/es/ProEnum/propsType.d.ts CHANGED
@@ -6,6 +6,7 @@ import { PropSelectProps } from '../ProSelect/propsType';
6
6
  export interface DataOption {
7
7
  label?: string;
8
8
  value?: string;
9
+ disabled?: boolean;
9
10
  [key: string]: any;
10
11
  }
11
12
  export interface ProEnumConfig {
package/es/ProUpload/components/ImageRender.js CHANGED
@@ -17,7 +17,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
17
17
  * @Author: wangshengqiang
18
18
  * @Date: 2023-07-27 20:13:07
19
19
  * @LastEditors: wangshengqiang
20
- * @LastEditTime: 2023-11-15 17:57:53
20
+ * @LastEditTime: 2023-11-21 15:24:56
21
21
  * @Description: 图片类型
22
22
  *
23
23
  */
@@ -97,11 +97,11 @@ var ImageRender = function ImageRender(props) {
97
97
  disabled: disabled || isView,
98
98
  itemRender: function itemRender(originNode, file, fileList, actions) {
99
99
  var _file$url, _locale$ProUpload, _locale$ProUpload2, _locale$ProUpload3;
100
- var _showPreview = file.status === 'done';
101
100
  var _isShowDownload = !!onDownload && file.status === 'done';
102
101
  var _fileExt = getFileExt(file.name || (file === null || file === void 0 ? void 0 : (_file$url = file.url) === null || _file$url === void 0 ? void 0 : _file$url.split('?')[0]));
103
102
  var _fileIcon = getFileIcon(_fileExt);
104
103
  var isImg = ['.PNG', '.JPG', '.JPEG', '.GIF', '.BMP', '.JPE'].includes(_fileExt.toLocaleUpperCase());
104
+ var _showPreview = isImg;
105
105
  return _jsx(DraggableUploadListItem, {
106
106
  file: file,
107
107
  children: _jsxs("div", {
@@ -255,8 +255,7 @@ var ImageRender = function ImageRender(props) {
255
255
  style: {
256
256
  width: '400px'
257
257
  },
258
- open: !!(previewImg === null || previewImg === void 0 ? void 0 : previewImg.url),
259
- // showType="Modal"
258
+ open: (previewImg === null || previewImg === void 0 ? void 0 : previewImg.url) || (previewImg === null || previewImg === void 0 ? void 0 : previewImg.thumbUrl),
260
259
  wrapClassName: "proupload-modal-preview",
261
260
  onCancel: handlePreviewCancel,
262
261
  footer: false,
@@ -265,7 +264,7 @@ var ImageRender = function ImageRender(props) {
265
264
  style: {
266
265
  width: '100%'
267
266
  },
268
- src: previewImg === null || previewImg === void 0 ? void 0 : previewImg.url
267
+ src: (previewImg === null || previewImg === void 0 ? void 0 : previewImg.url) || previewImg.thumbUrl
269
268
  })
270
269
  })]
271
270
  });
package/lib/ProEnum/index.js CHANGED
@@ -80,7 +80,6 @@ var ProEnum = function ProEnum(props) {
80
80
  var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProEnum'),
81
81
  _useProConfig$dics = _useProConfig.dics,
82
82
  dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
83
- // const enumList = dics?.[code] || [];
84
83
  var _useRequestFunc = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread2.default)((0, _objectSpread2.default)({
85
84
  manual: true,
86
85
  cacheTime: -1
@@ -162,6 +161,7 @@ var ProEnum = function ProEnum(props) {
162
161
  onChange: onChange
163
162
  }));
164
163
  }
164
+ console.log(list);
165
165
  switch (type) {
166
166
  case 'ProSelect':
167
167
  return (0, _jsxRuntime.jsx)(_ProSelect.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enumProps), {}, {
@@ -175,25 +175,15 @@ var ProEnum = function ProEnum(props) {
175
175
  }));
176
176
  case 'Radio':
177
177
  return (0, _jsxRuntime.jsx)(_antd.Radio.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enumProps), {}, {
178
+ options: list,
178
179
  value: value,
179
- onChange: onChange,
180
- children: list.map(function (item) {
181
- return (0, _jsxRuntime.jsx)(_antd.Radio, {
182
- value: item[fieldValue],
183
- children: item[label]
184
- }, item[fieldValue]);
185
- })
180
+ onChange: onChange
186
181
  }));
187
182
  case 'Checkbox':
188
183
  return (0, _jsxRuntime.jsx)(_antd.Checkbox.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enumProps), {}, {
184
+ options: list,
189
185
  value: value,
190
- onChange: onChange,
191
- children: list.map(function (item) {
192
- return (0, _jsxRuntime.jsx)(_antd.Checkbox, {
193
- value: item[fieldValue],
194
- children: item[label]
195
- }, item[fieldValue]);
196
- })
186
+ onChange: onChange
197
187
  }));
198
188
  case 'Tag':
199
189
  return (0, _jsxRuntime.jsx)(_Tag.default, {
package/lib/ProEnum/propsType.d.ts CHANGED
@@ -6,6 +6,7 @@ import { PropSelectProps } from '../ProSelect/propsType';
6
6
  export interface DataOption {
7
7
  label?: string;
8
8
  value?: string;
9
+ disabled?: boolean;
9
10
  [key: string]: any;
10
11
  }
11
12
  export interface ProEnumConfig {
package/lib/ProUpload/components/ImageRender.js CHANGED
@@ -27,7 +27,7 @@ var _locale = _interopRequireDefault(require("../../locale"));
27
27
  * @Author: wangshengqiang
28
28
  * @Date: 2023-07-27 20:13:07
29
29
  * @LastEditors: wangshengqiang
30
- * @LastEditTime: 2023-11-15 17:57:53
30
+ * @LastEditTime: 2023-11-21 15:24:56
31
31
  * @Description: 图片类型
32
32
  *
33
33
  */
@@ -95,11 +95,11 @@ var ImageRender = function ImageRender(props) {
95
95
  disabled: disabled || isView,
96
96
  itemRender: function itemRender(originNode, file, fileList, actions) {
97
97
  var _file$url, _locale$ProUpload, _locale$ProUpload2, _locale$ProUpload3;
98
- var _showPreview = file.status === 'done';
99
98
  var _isShowDownload = !!onDownload && file.status === 'done';
100
99
  var _fileExt = (0, _FileItem.getFileExt)(file.name || (file === null || file === void 0 ? void 0 : (_file$url = file.url) === null || _file$url === void 0 ? void 0 : _file$url.split('?')[0]));
101
100
  var _fileIcon = (0, _FileItem.getFileIcon)(_fileExt);
102
101
  var isImg = ['.PNG', '.JPG', '.JPEG', '.GIF', '.BMP', '.JPE'].includes(_fileExt.toLocaleUpperCase());
102
+ var _showPreview = isImg;
103
103
  return (0, _jsxRuntime.jsx)(_DraggableUploadListItem.DraggableUploadListItem, {
104
104
  file: file,
105
105
  children: (0, _jsxRuntime.jsxs)("div", {
@@ -253,8 +253,7 @@ var ImageRender = function ImageRender(props) {
253
253
  style: {
254
254
  width: '400px'
255
255
  },
256
- open: !!(previewImg === null || previewImg === void 0 ? void 0 : previewImg.url),
257
- // showType="Modal"
256
+ open: (previewImg === null || previewImg === void 0 ? void 0 : previewImg.url) || (previewImg === null || previewImg === void 0 ? void 0 : previewImg.thumbUrl),
258
257
  wrapClassName: "proupload-modal-preview",
259
258
  onCancel: handlePreviewCancel,
260
259
  footer: false,
@@ -263,7 +262,7 @@ var ImageRender = function ImageRender(props) {
263
262
  style: {
264
263
  width: '100%'
265
264
  },
266
- src: previewImg === null || previewImg === void 0 ? void 0 : previewImg.url
265
+ src: (previewImg === null || previewImg === void 0 ? void 0 : previewImg.url) || previewImg.thumbUrl
267
266
  })
268
267
  })]
269
268
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.3.0-beta.3",
3
+ "version": "3.3.0-beta.5",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",