ls-pro-common 3.0.3 → 3.0.4
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.
- package/dist/common.css +41 -6
- package/dist/common.js +1 -1
- package/dist/common.min.css +41 -6
- package/dist/common.min.js +1 -1
- package/es/components/DtlLayout.js +3 -2
- package/es/components/ImageSelector.d.ts +6 -0
- package/es/components/ImageSelector.js +57 -12
- package/es/components/antd-custom.less +19 -8
- package/es/components/common.less +2 -2
- package/es/utils/index.d.ts +1 -0
- package/es/utils/index.js +6 -0
- package/lib/components/DtlLayout.js +2 -1
- package/lib/components/ImageSelector.d.ts +6 -0
- package/lib/components/ImageSelector.js +57 -12
- package/lib/components/antd-custom.less +19 -8
- package/lib/components/common.less +2 -2
- package/lib/utils/index.d.ts +1 -0
- package/lib/utils/index.js +9 -2
- package/package.json +8 -8
|
@@ -4,9 +4,10 @@ import "antd/es/button/style";
|
|
|
4
4
|
import _Button from "antd/es/button";
|
|
5
5
|
import React, { useMemo } from 'react';
|
|
6
6
|
import classNames from 'classnames';
|
|
7
|
-
import { SaveOutlined, AuditOutlined
|
|
7
|
+
import { SaveOutlined, AuditOutlined } from '@ant-design/icons';
|
|
8
8
|
import './common.less';
|
|
9
9
|
import usePermission from '../hooks/usePermission';
|
|
10
|
+
import IconBack from './IconBack';
|
|
10
11
|
function DtlLayout(props) {
|
|
11
12
|
var title = props.title,
|
|
12
13
|
_props$keyField = props.keyField,
|
|
@@ -56,7 +57,7 @@ function DtlLayout(props) {
|
|
|
56
57
|
onClick: function onClick() {
|
|
57
58
|
return props.onExit(false);
|
|
58
59
|
},
|
|
59
|
-
icon: /*#__PURE__*/React.createElement(
|
|
60
|
+
icon: /*#__PURE__*/React.createElement(IconBack, null)
|
|
60
61
|
}, btnExitText);
|
|
61
62
|
var btnList = [back];
|
|
62
63
|
// 有新增或更改权限且未审核,开放出保存按钮
|
|
@@ -16,10 +16,16 @@ export declare type ImageSelectorProps = ProFormItemProps<InputProps> & {
|
|
|
16
16
|
* @name 最大值, 默认2M
|
|
17
17
|
*/
|
|
18
18
|
maxSize?: number;
|
|
19
|
+
/**弹框的属性 */
|
|
19
20
|
modalProps?: ModalProps;
|
|
21
|
+
/**是否输入框模式 */
|
|
20
22
|
isInput?: boolean;
|
|
23
|
+
/**非输入框模式上传提示语 默认为:支持 png | jpg | gif 格式图片 */
|
|
21
24
|
desc?: string;
|
|
25
|
+
/** 非输入框模式下 展示图片class */
|
|
22
26
|
imageClass?: string;
|
|
27
|
+
/** 一次最多选择多少张图片 默认为 1 */
|
|
28
|
+
maxCount?: number;
|
|
23
29
|
};
|
|
24
30
|
declare function ImageSelector(prop: ImageSelectorProps): JSX.Element;
|
|
25
31
|
export default ImageSelector;
|
|
@@ -16,7 +16,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
|
|
16
16
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
17
17
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
18
18
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
19
|
-
var _excluded = ["type", "uploadable", "readonly", "allowClear", "title", "modalWidth", "name", "maxSize", "modalProps", "code", "isInput", "desc", "imageClass"];
|
|
19
|
+
var _excluded = ["type", "uploadable", "readonly", "allowClear", "title", "modalWidth", "name", "maxSize", "modalProps", "code", "isInput", "desc", "imageClass", "maxCount"];
|
|
20
20
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
21
21
|
import React from "react";
|
|
22
22
|
import { useMemo, useState, useEffect, useContext, useRef } from 'react';
|
|
@@ -74,6 +74,8 @@ function ImageSelector(prop) {
|
|
|
74
74
|
desc = _prop$desc === void 0 ? '支持 png | jpg | gif 格式图片' : _prop$desc,
|
|
75
75
|
_prop$imageClass = prop.imageClass,
|
|
76
76
|
imageClass = _prop$imageClass === void 0 ? '' : _prop$imageClass,
|
|
77
|
+
_prop$maxCount = prop.maxCount,
|
|
78
|
+
maxCount = _prop$maxCount === void 0 ? 1 : _prop$maxCount,
|
|
77
79
|
rest = _objectWithoutProperties(prop, _excluded);
|
|
78
80
|
// 上传地址
|
|
79
81
|
var uploadImgApi = useMemo(function () {
|
|
@@ -87,6 +89,10 @@ function ImageSelector(prop) {
|
|
|
87
89
|
var showImgApi = useMemo(function () {
|
|
88
90
|
return fileCenter + 'show/' + code;
|
|
89
91
|
}, [code]);
|
|
92
|
+
var _useState11 = useState([]),
|
|
93
|
+
_useState12 = _slicedToArray(_useState11, 2),
|
|
94
|
+
selectedUrl = _useState12[0],
|
|
95
|
+
setSelectedUrl = _useState12[1];
|
|
90
96
|
var loadData = /*#__PURE__*/function () {
|
|
91
97
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(keys) {
|
|
92
98
|
var _result$data, _result$data2;
|
|
@@ -143,8 +149,14 @@ function ImageSelector(prop) {
|
|
|
143
149
|
}, [visible, searchKey]);
|
|
144
150
|
useEffect(function () {
|
|
145
151
|
var val = formRef.current.getFieldsValue();
|
|
146
|
-
|
|
147
|
-
|
|
152
|
+
var url = val === null || val === void 0 ? void 0 : val[name];
|
|
153
|
+
if (!url) {
|
|
154
|
+
url = formRef.current.getFieldValue(name);
|
|
155
|
+
}
|
|
156
|
+
if (url) {
|
|
157
|
+
var urls = url.toString().split(',');
|
|
158
|
+
setImgUrl(urls[0]);
|
|
159
|
+
setSelectedUrl(urls);
|
|
148
160
|
}
|
|
149
161
|
}, []);
|
|
150
162
|
// 验证上传文件大小
|
|
@@ -208,6 +220,28 @@ function ImageSelector(prop) {
|
|
|
208
220
|
}
|
|
209
221
|
} catch (e) {}
|
|
210
222
|
}, [imgUrl]);
|
|
223
|
+
var toggleSelectImage = function toggleSelectImage(url) {
|
|
224
|
+
if (selectedUrl.includes(url)) {
|
|
225
|
+
setSelectedUrl(function (val) {
|
|
226
|
+
return val.filter(function (o) {
|
|
227
|
+
return o !== url;
|
|
228
|
+
});
|
|
229
|
+
});
|
|
230
|
+
} else if (selectedUrl.length < maxCount && maxCount > 1) {
|
|
231
|
+
setSelectedUrl([].concat(_toConsumableArray(selectedUrl), [url]));
|
|
232
|
+
} else if (maxCount === 1) {
|
|
233
|
+
setSelectedUrl([url]);
|
|
234
|
+
}
|
|
235
|
+
};
|
|
236
|
+
var confirmImage = function confirmImage() {
|
|
237
|
+
var formVal = formRef.current.getFieldsValue();
|
|
238
|
+
var val = _objectSpread({}, formVal);
|
|
239
|
+
//@ts-ignore
|
|
240
|
+
val[name] = selectedUrl.join(',');
|
|
241
|
+
formRef.current.setFieldsValue(val);
|
|
242
|
+
setImgUrl(selectedUrl.join(','));
|
|
243
|
+
setVisible(false);
|
|
244
|
+
};
|
|
211
245
|
var clearValue = function clearValue(e) {
|
|
212
246
|
if (!e || !e.target.value) {
|
|
213
247
|
var _formRef$current;
|
|
@@ -225,7 +259,7 @@ function ImageSelector(prop) {
|
|
|
225
259
|
maxWidth: 22,
|
|
226
260
|
maxHeight: 22
|
|
227
261
|
},
|
|
228
|
-
src: imgUrl,
|
|
262
|
+
src: (imgUrl || '').split(',')[0],
|
|
229
263
|
onClick: function onClick() {
|
|
230
264
|
return showSelect();
|
|
231
265
|
}
|
|
@@ -259,7 +293,7 @@ function ImageSelector(prop) {
|
|
|
259
293
|
className: "img-wrapper"
|
|
260
294
|
}, /*#__PURE__*/React.createElement("img", {
|
|
261
295
|
className: "img-preview ".concat(imageClass),
|
|
262
|
-
src: imgUrl
|
|
296
|
+
src: (imgUrl || '').split(',')[0]
|
|
263
297
|
}), (rest === null || rest === void 0 ? void 0 : rest.disabled) !== true && (rest === null || rest === void 0 ? void 0 : (_rest$fieldProps3 = rest.fieldProps) === null || _rest$fieldProps3 === void 0 ? void 0 : _rest$fieldProps3.disabled) !== true && /*#__PURE__*/React.createElement("div", {
|
|
264
298
|
className: "clear-btn"
|
|
265
299
|
}, /*#__PURE__*/React.createElement(CloseOutlined, {
|
|
@@ -330,11 +364,19 @@ function ImageSelector(prop) {
|
|
|
330
364
|
onClick: function onClick() {
|
|
331
365
|
return loadData(searchKey);
|
|
332
366
|
}
|
|
333
|
-
}, nextMarker ? '加载更多' : '刷新')
|
|
334
|
-
|
|
367
|
+
}, nextMarker ? '加载更多' : '刷新'), maxCount > 1 && /*#__PURE__*/React.createElement(_Button, {
|
|
368
|
+
onClick: confirmImage
|
|
369
|
+
}, "\u786E\u8BA4")),
|
|
370
|
+
getContainer: function getContainer() {
|
|
371
|
+
return document.body;
|
|
372
|
+
}
|
|
335
373
|
}, modalProps), /*#__PURE__*/React.createElement("div", {
|
|
336
374
|
style: {
|
|
337
|
-
minHeight: '120px'
|
|
375
|
+
minHeight: '120px',
|
|
376
|
+
display: 'flex',
|
|
377
|
+
marginLeft: 16,
|
|
378
|
+
gap: 16,
|
|
379
|
+
flexWrap: 'wrap'
|
|
338
380
|
}
|
|
339
381
|
}, list.map(function (o) {
|
|
340
382
|
return /*#__PURE__*/React.createElement(_Card, {
|
|
@@ -342,9 +384,8 @@ function ImageSelector(prop) {
|
|
|
342
384
|
style: {
|
|
343
385
|
width: '125px',
|
|
344
386
|
height: '130px',
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
verticalAlign: 'middle'
|
|
387
|
+
verticalAlign: 'middle',
|
|
388
|
+
background: selectedUrl.includes(o.url) ? '#efefef' : '#fff'
|
|
348
389
|
},
|
|
349
390
|
bodyStyle: {
|
|
350
391
|
padding: '15px 8px',
|
|
@@ -361,8 +402,12 @@ function ImageSelector(prop) {
|
|
|
361
402
|
val[name] = o.url;
|
|
362
403
|
formRef.current.setFieldsValue(val);
|
|
363
404
|
setImgUrl(o.url);
|
|
405
|
+
setSelectedUrl([o.url]);
|
|
364
406
|
setVisible(false);
|
|
365
407
|
},
|
|
408
|
+
onClick: function onClick() {
|
|
409
|
+
toggleSelectImage(o.url);
|
|
410
|
+
},
|
|
366
411
|
key: o.path
|
|
367
412
|
}, /*#__PURE__*/React.createElement("div", {
|
|
368
413
|
style: {
|
|
@@ -374,7 +419,7 @@ function ImageSelector(prop) {
|
|
|
374
419
|
maxWidth: '80px',
|
|
375
420
|
maxHeight: '80px'
|
|
376
421
|
},
|
|
377
|
-
src:
|
|
422
|
+
src: o.url
|
|
378
423
|
})), /*#__PURE__*/React.createElement("div", {
|
|
379
424
|
style: {
|
|
380
425
|
whiteSpace: 'nowrap',
|
|
@@ -34,8 +34,11 @@
|
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
.ant-modal-content {
|
|
37
|
-
border-radius
|
|
38
|
-
|
|
37
|
+
border-radius: 8px !important;
|
|
38
|
+
|
|
39
|
+
.ant-modal-header {
|
|
40
|
+
border-radius: 8px 8px 0 0 !important;
|
|
41
|
+
}
|
|
39
42
|
}
|
|
40
43
|
|
|
41
44
|
.ant-input-number,
|
|
@@ -45,6 +48,11 @@
|
|
|
45
48
|
border-radius: 4px !important;
|
|
46
49
|
}
|
|
47
50
|
|
|
51
|
+
.ant-input-group .ant-input-affix-wrapper:not(:last-child) {
|
|
52
|
+
border-top-right-radius : 0 !important;
|
|
53
|
+
border-bottom-right-radius: 0 !important;
|
|
54
|
+
}
|
|
55
|
+
|
|
48
56
|
.ant-picker-range-separator {
|
|
49
57
|
padding: 0 2px !important;
|
|
50
58
|
|
|
@@ -58,7 +66,7 @@
|
|
|
58
66
|
height : 32px;
|
|
59
67
|
background-color: #E6F4FF;
|
|
60
68
|
border-color : transparent;
|
|
61
|
-
color :
|
|
69
|
+
color : var(--ant-primary-color);
|
|
62
70
|
border-radius : 4px;
|
|
63
71
|
|
|
64
72
|
&.ant-btn-lg {
|
|
@@ -67,15 +75,15 @@
|
|
|
67
75
|
|
|
68
76
|
&:hover,
|
|
69
77
|
&:focus {
|
|
70
|
-
background-color: #
|
|
78
|
+
background-color: #B5DBFF;
|
|
71
79
|
border-color : transparent;
|
|
72
|
-
color :
|
|
80
|
+
color : var(--ant-primary-color);
|
|
73
81
|
}
|
|
74
82
|
|
|
75
83
|
&:active {
|
|
76
84
|
background-color: #BDDFFF;
|
|
77
85
|
border-color : transparent;
|
|
78
|
-
color :
|
|
86
|
+
color : var(--ant-primary-color);
|
|
79
87
|
}
|
|
80
88
|
|
|
81
89
|
&[disabled],
|
|
@@ -88,8 +96,6 @@
|
|
|
88
96
|
}
|
|
89
97
|
}
|
|
90
98
|
|
|
91
|
-
|
|
92
|
-
|
|
93
99
|
.ant-btn-primary {
|
|
94
100
|
background-color: var(--ant-primary-color);
|
|
95
101
|
border-color : transparent;
|
|
@@ -210,4 +216,9 @@
|
|
|
210
216
|
&[disabled]:active {
|
|
211
217
|
color: #d9d9d9;
|
|
212
218
|
}
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
.ant-checkbox-checked::after {
|
|
222
|
+
animation : none !important;
|
|
223
|
+
animation-fill-mode: none !important;
|
|
213
224
|
}
|
|
@@ -88,11 +88,11 @@ body {
|
|
|
88
88
|
}
|
|
89
89
|
|
|
90
90
|
* ::-webkit-scrollbar-thumb {
|
|
91
|
-
background-color:
|
|
91
|
+
background-color: #EFF2F4;
|
|
92
92
|
border-radius : 6px;
|
|
93
93
|
|
|
94
94
|
&:hover {
|
|
95
|
-
background-color:
|
|
95
|
+
background-color: #E4E7EA;
|
|
96
96
|
border-radius : 6px;
|
|
97
97
|
}
|
|
98
98
|
}
|
package/es/utils/index.d.ts
CHANGED
package/es/utils/index.js
CHANGED
|
@@ -662,4 +662,10 @@ export var exitLoading = function exitLoading() {
|
|
|
662
662
|
var _loading$parentNode;
|
|
663
663
|
(_loading$parentNode = loading.parentNode) === null || _loading$parentNode === void 0 ? void 0 : _loading$parentNode.removeChild(loading);
|
|
664
664
|
}
|
|
665
|
+
};
|
|
666
|
+
export var handleTheme = function handleTheme() {
|
|
667
|
+
var theme = getCache('theme');
|
|
668
|
+
if (theme) {
|
|
669
|
+
document.body.classList.add('theme-' + theme);
|
|
670
|
+
}
|
|
665
671
|
};
|
|
@@ -15,6 +15,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
|
|
|
15
15
|
var _icons = require("@ant-design/icons");
|
|
16
16
|
require("./common.less");
|
|
17
17
|
var _usePermission2 = _interopRequireDefault(require("../hooks/usePermission"));
|
|
18
|
+
var _IconBack = _interopRequireDefault(require("./IconBack"));
|
|
18
19
|
function DtlLayout(props) {
|
|
19
20
|
var title = props.title,
|
|
20
21
|
_props$keyField = props.keyField,
|
|
@@ -64,7 +65,7 @@ function DtlLayout(props) {
|
|
|
64
65
|
onClick: function onClick() {
|
|
65
66
|
return props.onExit(false);
|
|
66
67
|
},
|
|
67
|
-
icon: /*#__PURE__*/_react.default.createElement(
|
|
68
|
+
icon: /*#__PURE__*/_react.default.createElement(_IconBack.default, null)
|
|
68
69
|
}, btnExitText);
|
|
69
70
|
var btnList = [back];
|
|
70
71
|
// 有新增或更改权限且未审核,开放出保存按钮
|
|
@@ -16,10 +16,16 @@ export declare type ImageSelectorProps = ProFormItemProps<InputProps> & {
|
|
|
16
16
|
* @name 最大值, 默认2M
|
|
17
17
|
*/
|
|
18
18
|
maxSize?: number;
|
|
19
|
+
/**弹框的属性 */
|
|
19
20
|
modalProps?: ModalProps;
|
|
21
|
+
/**是否输入框模式 */
|
|
20
22
|
isInput?: boolean;
|
|
23
|
+
/**非输入框模式上传提示语 默认为:支持 png | jpg | gif 格式图片 */
|
|
21
24
|
desc?: string;
|
|
25
|
+
/** 非输入框模式下 展示图片class */
|
|
22
26
|
imageClass?: string;
|
|
27
|
+
/** 一次最多选择多少张图片 默认为 1 */
|
|
28
|
+
maxCount?: number;
|
|
23
29
|
};
|
|
24
30
|
declare function ImageSelector(prop: ImageSelectorProps): JSX.Element;
|
|
25
31
|
export default ImageSelector;
|
|
@@ -30,7 +30,7 @@ var _lsProForm = require("ls-pro-form");
|
|
|
30
30
|
var _icons = require("@ant-design/icons");
|
|
31
31
|
var _http = require("../http");
|
|
32
32
|
var _utils = require("../utils");
|
|
33
|
-
var _excluded = ["type", "uploadable", "readonly", "allowClear", "title", "modalWidth", "name", "maxSize", "modalProps", "code", "isInput", "desc", "imageClass"];
|
|
33
|
+
var _excluded = ["type", "uploadable", "readonly", "allowClear", "title", "modalWidth", "name", "maxSize", "modalProps", "code", "isInput", "desc", "imageClass", "maxCount"];
|
|
34
34
|
var fileCenter = (0, _utils.getCache)('ossPath') || '/petrel/petrel-file-center-api/lesoon/oss/file/';
|
|
35
35
|
function ImageSelector(prop) {
|
|
36
36
|
var _rest$fieldProps3;
|
|
@@ -81,6 +81,8 @@ function ImageSelector(prop) {
|
|
|
81
81
|
desc = _prop$desc === void 0 ? '支持 png | jpg | gif 格式图片' : _prop$desc,
|
|
82
82
|
_prop$imageClass = prop.imageClass,
|
|
83
83
|
imageClass = _prop$imageClass === void 0 ? '' : _prop$imageClass,
|
|
84
|
+
_prop$maxCount = prop.maxCount,
|
|
85
|
+
maxCount = _prop$maxCount === void 0 ? 1 : _prop$maxCount,
|
|
84
86
|
rest = (0, _objectWithoutProperties2.default)(prop, _excluded);
|
|
85
87
|
// 上传地址
|
|
86
88
|
var uploadImgApi = (0, _react.useMemo)(function () {
|
|
@@ -94,6 +96,10 @@ function ImageSelector(prop) {
|
|
|
94
96
|
var showImgApi = (0, _react.useMemo)(function () {
|
|
95
97
|
return fileCenter + 'show/' + code;
|
|
96
98
|
}, [code]);
|
|
99
|
+
var _useState11 = (0, _react.useState)([]),
|
|
100
|
+
_useState12 = (0, _slicedToArray2.default)(_useState11, 2),
|
|
101
|
+
selectedUrl = _useState12[0],
|
|
102
|
+
setSelectedUrl = _useState12[1];
|
|
97
103
|
var loadData = /*#__PURE__*/function () {
|
|
98
104
|
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(keys) {
|
|
99
105
|
var _result$data, _result$data2;
|
|
@@ -150,8 +156,14 @@ function ImageSelector(prop) {
|
|
|
150
156
|
}, [visible, searchKey]);
|
|
151
157
|
(0, _react.useEffect)(function () {
|
|
152
158
|
var val = formRef.current.getFieldsValue();
|
|
153
|
-
|
|
154
|
-
|
|
159
|
+
var url = val === null || val === void 0 ? void 0 : val[name];
|
|
160
|
+
if (!url) {
|
|
161
|
+
url = formRef.current.getFieldValue(name);
|
|
162
|
+
}
|
|
163
|
+
if (url) {
|
|
164
|
+
var urls = url.toString().split(',');
|
|
165
|
+
setImgUrl(urls[0]);
|
|
166
|
+
setSelectedUrl(urls);
|
|
155
167
|
}
|
|
156
168
|
}, []);
|
|
157
169
|
// 验证上传文件大小
|
|
@@ -215,6 +227,28 @@ function ImageSelector(prop) {
|
|
|
215
227
|
}
|
|
216
228
|
} catch (e) {}
|
|
217
229
|
}, [imgUrl]);
|
|
230
|
+
var toggleSelectImage = function toggleSelectImage(url) {
|
|
231
|
+
if (selectedUrl.includes(url)) {
|
|
232
|
+
setSelectedUrl(function (val) {
|
|
233
|
+
return val.filter(function (o) {
|
|
234
|
+
return o !== url;
|
|
235
|
+
});
|
|
236
|
+
});
|
|
237
|
+
} else if (selectedUrl.length < maxCount && maxCount > 1) {
|
|
238
|
+
setSelectedUrl([].concat((0, _toConsumableArray2.default)(selectedUrl), [url]));
|
|
239
|
+
} else if (maxCount === 1) {
|
|
240
|
+
setSelectedUrl([url]);
|
|
241
|
+
}
|
|
242
|
+
};
|
|
243
|
+
var confirmImage = function confirmImage() {
|
|
244
|
+
var formVal = formRef.current.getFieldsValue();
|
|
245
|
+
var val = (0, _objectSpread2.default)({}, formVal);
|
|
246
|
+
//@ts-ignore
|
|
247
|
+
val[name] = selectedUrl.join(',');
|
|
248
|
+
formRef.current.setFieldsValue(val);
|
|
249
|
+
setImgUrl(selectedUrl.join(','));
|
|
250
|
+
setVisible(false);
|
|
251
|
+
};
|
|
218
252
|
var clearValue = function clearValue(e) {
|
|
219
253
|
if (!e || !e.target.value) {
|
|
220
254
|
var _formRef$current;
|
|
@@ -232,7 +266,7 @@ function ImageSelector(prop) {
|
|
|
232
266
|
maxWidth: 22,
|
|
233
267
|
maxHeight: 22
|
|
234
268
|
},
|
|
235
|
-
src: imgUrl,
|
|
269
|
+
src: (imgUrl || '').split(',')[0],
|
|
236
270
|
onClick: function onClick() {
|
|
237
271
|
return showSelect();
|
|
238
272
|
}
|
|
@@ -266,7 +300,7 @@ function ImageSelector(prop) {
|
|
|
266
300
|
className: "img-wrapper"
|
|
267
301
|
}, /*#__PURE__*/_react.default.createElement("img", {
|
|
268
302
|
className: "img-preview ".concat(imageClass),
|
|
269
|
-
src: imgUrl
|
|
303
|
+
src: (imgUrl || '').split(',')[0]
|
|
270
304
|
}), (rest === null || rest === void 0 ? void 0 : rest.disabled) !== true && (rest === null || rest === void 0 ? void 0 : (_rest$fieldProps3 = rest.fieldProps) === null || _rest$fieldProps3 === void 0 ? void 0 : _rest$fieldProps3.disabled) !== true && /*#__PURE__*/_react.default.createElement("div", {
|
|
271
305
|
className: "clear-btn"
|
|
272
306
|
}, /*#__PURE__*/_react.default.createElement(_icons.CloseOutlined, {
|
|
@@ -337,11 +371,19 @@ function ImageSelector(prop) {
|
|
|
337
371
|
onClick: function onClick() {
|
|
338
372
|
return loadData(searchKey);
|
|
339
373
|
}
|
|
340
|
-
}, nextMarker ? '加载更多' : '刷新')
|
|
341
|
-
|
|
374
|
+
}, nextMarker ? '加载更多' : '刷新'), maxCount > 1 && /*#__PURE__*/_react.default.createElement(_button.default, {
|
|
375
|
+
onClick: confirmImage
|
|
376
|
+
}, "\u786E\u8BA4")),
|
|
377
|
+
getContainer: function getContainer() {
|
|
378
|
+
return document.body;
|
|
379
|
+
}
|
|
342
380
|
}, modalProps), /*#__PURE__*/_react.default.createElement("div", {
|
|
343
381
|
style: {
|
|
344
|
-
minHeight: '120px'
|
|
382
|
+
minHeight: '120px',
|
|
383
|
+
display: 'flex',
|
|
384
|
+
marginLeft: 16,
|
|
385
|
+
gap: 16,
|
|
386
|
+
flexWrap: 'wrap'
|
|
345
387
|
}
|
|
346
388
|
}, list.map(function (o) {
|
|
347
389
|
return /*#__PURE__*/_react.default.createElement(_card.default, {
|
|
@@ -349,9 +391,8 @@ function ImageSelector(prop) {
|
|
|
349
391
|
style: {
|
|
350
392
|
width: '125px',
|
|
351
393
|
height: '130px',
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
verticalAlign: 'middle'
|
|
394
|
+
verticalAlign: 'middle',
|
|
395
|
+
background: selectedUrl.includes(o.url) ? '#efefef' : '#fff'
|
|
355
396
|
},
|
|
356
397
|
bodyStyle: {
|
|
357
398
|
padding: '15px 8px',
|
|
@@ -368,8 +409,12 @@ function ImageSelector(prop) {
|
|
|
368
409
|
val[name] = o.url;
|
|
369
410
|
formRef.current.setFieldsValue(val);
|
|
370
411
|
setImgUrl(o.url);
|
|
412
|
+
setSelectedUrl([o.url]);
|
|
371
413
|
setVisible(false);
|
|
372
414
|
},
|
|
415
|
+
onClick: function onClick() {
|
|
416
|
+
toggleSelectImage(o.url);
|
|
417
|
+
},
|
|
373
418
|
key: o.path
|
|
374
419
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
375
420
|
style: {
|
|
@@ -381,7 +426,7 @@ function ImageSelector(prop) {
|
|
|
381
426
|
maxWidth: '80px',
|
|
382
427
|
maxHeight: '80px'
|
|
383
428
|
},
|
|
384
|
-
src:
|
|
429
|
+
src: o.url
|
|
385
430
|
})), /*#__PURE__*/_react.default.createElement("div", {
|
|
386
431
|
style: {
|
|
387
432
|
whiteSpace: 'nowrap',
|
|
@@ -34,8 +34,11 @@
|
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
.ant-modal-content {
|
|
37
|
-
border-radius
|
|
38
|
-
|
|
37
|
+
border-radius: 8px !important;
|
|
38
|
+
|
|
39
|
+
.ant-modal-header {
|
|
40
|
+
border-radius: 8px 8px 0 0 !important;
|
|
41
|
+
}
|
|
39
42
|
}
|
|
40
43
|
|
|
41
44
|
.ant-input-number,
|
|
@@ -45,6 +48,11 @@
|
|
|
45
48
|
border-radius: 4px !important;
|
|
46
49
|
}
|
|
47
50
|
|
|
51
|
+
.ant-input-group .ant-input-affix-wrapper:not(:last-child) {
|
|
52
|
+
border-top-right-radius : 0 !important;
|
|
53
|
+
border-bottom-right-radius: 0 !important;
|
|
54
|
+
}
|
|
55
|
+
|
|
48
56
|
.ant-picker-range-separator {
|
|
49
57
|
padding: 0 2px !important;
|
|
50
58
|
|
|
@@ -58,7 +66,7 @@
|
|
|
58
66
|
height : 32px;
|
|
59
67
|
background-color: #E6F4FF;
|
|
60
68
|
border-color : transparent;
|
|
61
|
-
color :
|
|
69
|
+
color : var(--ant-primary-color);
|
|
62
70
|
border-radius : 4px;
|
|
63
71
|
|
|
64
72
|
&.ant-btn-lg {
|
|
@@ -67,15 +75,15 @@
|
|
|
67
75
|
|
|
68
76
|
&:hover,
|
|
69
77
|
&:focus {
|
|
70
|
-
background-color: #
|
|
78
|
+
background-color: #B5DBFF;
|
|
71
79
|
border-color : transparent;
|
|
72
|
-
color :
|
|
80
|
+
color : var(--ant-primary-color);
|
|
73
81
|
}
|
|
74
82
|
|
|
75
83
|
&:active {
|
|
76
84
|
background-color: #BDDFFF;
|
|
77
85
|
border-color : transparent;
|
|
78
|
-
color :
|
|
86
|
+
color : var(--ant-primary-color);
|
|
79
87
|
}
|
|
80
88
|
|
|
81
89
|
&[disabled],
|
|
@@ -88,8 +96,6 @@
|
|
|
88
96
|
}
|
|
89
97
|
}
|
|
90
98
|
|
|
91
|
-
|
|
92
|
-
|
|
93
99
|
.ant-btn-primary {
|
|
94
100
|
background-color: var(--ant-primary-color);
|
|
95
101
|
border-color : transparent;
|
|
@@ -210,4 +216,9 @@
|
|
|
210
216
|
&[disabled]:active {
|
|
211
217
|
color: #d9d9d9;
|
|
212
218
|
}
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
.ant-checkbox-checked::after {
|
|
222
|
+
animation : none !important;
|
|
223
|
+
animation-fill-mode: none !important;
|
|
213
224
|
}
|
|
@@ -88,11 +88,11 @@ body {
|
|
|
88
88
|
}
|
|
89
89
|
|
|
90
90
|
* ::-webkit-scrollbar-thumb {
|
|
91
|
-
background-color:
|
|
91
|
+
background-color: #EFF2F4;
|
|
92
92
|
border-radius : 6px;
|
|
93
93
|
|
|
94
94
|
&:hover {
|
|
95
|
-
background-color:
|
|
95
|
+
background-color: #E4E7EA;
|
|
96
96
|
border-radius : 6px;
|
|
97
97
|
}
|
|
98
98
|
}
|
package/lib/utils/index.d.ts
CHANGED
package/lib/utils/index.js
CHANGED
|
@@ -30,7 +30,7 @@ Object.defineProperty(exports, "getUrlQuery", {
|
|
|
30
30
|
return _lsProTable.getUrlQuery;
|
|
31
31
|
}
|
|
32
32
|
});
|
|
33
|
-
exports.setTitle = exports.setCookie = exports.setCache = exports.reLogin = exports.rangeToSearch = exports.printView = exports.printAsync = exports.openPageInMain = exports.on = exports.off = exports.nowAdd = exports.now = exports.isLogin = exports.isDev = exports.httpError = exports.handleSizeCols = exports.getUserName = exports.getUserInfo = void 0;
|
|
33
|
+
exports.setTitle = exports.setCookie = exports.setCache = exports.reLogin = exports.rangeToSearch = exports.printView = exports.printAsync = exports.openPageInMain = exports.on = exports.off = exports.nowAdd = exports.now = exports.isLogin = exports.isDev = exports.httpError = exports.handleTheme = exports.handleSizeCols = exports.getUserName = exports.getUserInfo = void 0;
|
|
34
34
|
Object.defineProperty(exports, "setUrlQuery", {
|
|
35
35
|
enumerable: true,
|
|
36
36
|
get: function get() {
|
|
@@ -757,4 +757,11 @@ var exitLoading = function exitLoading() {
|
|
|
757
757
|
(_loading$parentNode = loading.parentNode) === null || _loading$parentNode === void 0 ? void 0 : _loading$parentNode.removeChild(loading);
|
|
758
758
|
}
|
|
759
759
|
};
|
|
760
|
-
exports.exitLoading = exitLoading;
|
|
760
|
+
exports.exitLoading = exitLoading;
|
|
761
|
+
var handleTheme = function handleTheme() {
|
|
762
|
+
var theme = getCache('theme');
|
|
763
|
+
if (theme) {
|
|
764
|
+
document.body.classList.add('theme-' + theme);
|
|
765
|
+
}
|
|
766
|
+
};
|
|
767
|
+
exports.handleTheme = handleTheme;
|
package/package.json
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ls-pro-common",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.4",
|
|
4
4
|
"description": "ls-pro-common",
|
|
5
5
|
"keywords": [
|
|
6
|
-
"antd",
|
|
6
|
+
"antd",
|
|
7
7
|
"ant-design",
|
|
8
8
|
"ant-design-pro",
|
|
9
9
|
"ls-pro-common"
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"*.less"
|
|
13
13
|
],
|
|
14
14
|
"license": "MIT",
|
|
15
|
-
"main": "lib/index.js",
|
|
15
|
+
"main": "lib/index.js",
|
|
16
16
|
"types": "lib/index.d.ts",
|
|
17
17
|
"files": [
|
|
18
18
|
"lib",
|
|
@@ -27,10 +27,10 @@
|
|
|
27
27
|
],
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"@ant-design/icons": "^4.3.0",
|
|
30
|
-
"ls-pro-table": "^3.0.
|
|
31
|
-
"ls-pro-form": "^3.0.
|
|
32
|
-
"ls-pro-descriptions":"^3.0.
|
|
33
|
-
"ls-pro-card":"^3.0.
|
|
30
|
+
"ls-pro-table": "^3.0.3",
|
|
31
|
+
"ls-pro-form": "^3.0.1",
|
|
32
|
+
"ls-pro-descriptions": "^3.0.1",
|
|
33
|
+
"ls-pro-card": "^3.0.1",
|
|
34
34
|
"@babel/runtime": "^7.16.3",
|
|
35
35
|
"classnames": "^2.2.6",
|
|
36
36
|
"moment": "^2.27.0",
|
|
@@ -46,4 +46,4 @@
|
|
|
46
46
|
"publishConfig": {
|
|
47
47
|
"access": "public"
|
|
48
48
|
}
|
|
49
|
-
}
|
|
49
|
+
}
|