@kdcloudjs/kdesign 1.7.68-stable.1 → 1.7.68-stable.3
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/kdesign-complete.less +28 -6
- package/dist/kdesign.css +27 -7
- package/dist/kdesign.css.map +1 -1
- package/dist/kdesign.js +12 -8
- package/dist/kdesign.js.map +1 -1
- package/dist/kdesign.min.css +3 -3
- package/dist/kdesign.min.js +4 -4
- package/dist/kdesign.min.js.map +1 -1
- package/es/color-picker/color-picker-panel.js +3 -2
- package/es/color-picker/style/index.css +19 -2
- package/es/color-picker/style/index.less +19 -1
- package/es/grid/col.js +2 -2
- package/es/grid/row.js +2 -2
- package/es/modal/modal.js +2 -1
- package/es/modal/style/index.css +3 -0
- package/es/modal/style/index.less +4 -0
- package/es/select/style/index.css +3 -3
- package/es/select/style/index.less +3 -3
- package/es/style/core/reset.less +2 -2
- package/es/style/index.css +1 -1
- package/lib/color-picker/color-picker-panel.js +3 -2
- package/lib/color-picker/style/index.css +19 -2
- package/lib/color-picker/style/index.less +19 -1
- package/lib/grid/col.js +2 -2
- package/lib/grid/row.js +2 -2
- package/lib/modal/modal.js +2 -1
- package/lib/modal/style/index.css +3 -0
- package/lib/modal/style/index.less +4 -0
- package/lib/select/style/index.css +3 -3
- package/lib/select/style/index.less +3 -3
- package/lib/style/core/reset.less +2 -2
- package/lib/style/index.css +1 -1
- package/package.json +1 -1
|
@@ -14,8 +14,9 @@ import Color from 'color';
|
|
|
14
14
|
import { ChromePicker } from 'react-color';
|
|
15
15
|
import devWarning from '../_utils/devwarning';
|
|
16
16
|
import { useOnClickOutside } from '../_utils/hooks';
|
|
17
|
+
import { isIE } from '../_utils/ieUtil';
|
|
17
18
|
var ColorPickerPanel = function ColorPickerPanel(props) {
|
|
18
|
-
var _classNames, _context;
|
|
19
|
+
var _classNames, _classNames2, _context;
|
|
19
20
|
var setCorrectColorValue = props.setCorrectColorValue,
|
|
20
21
|
setInputColorValue = props.setInputColorValue,
|
|
21
22
|
setAlpha = props.setAlpha,
|
|
@@ -61,7 +62,7 @@ var ColorPickerPanel = function ColorPickerPanel(props) {
|
|
|
61
62
|
var panelContainerCls = classNames("".concat(colorPickerPrefixCls, "-panel-container"));
|
|
62
63
|
var panelInputCls = classNames("".concat(colorPickerPrefixCls, "-panel-container-input"));
|
|
63
64
|
var transparentCls = classNames("".concat(colorPickerPrefixCls, "-panel-container-transparent"));
|
|
64
|
-
var colorDivContainerCls = classNames("".concat(colorPickerPrefixCls, "-panel-colorDivContainer"),
|
|
65
|
+
var colorDivContainerCls = classNames("".concat(colorPickerPrefixCls, "-panel-colorDivContainer"), (_classNames2 = {}, _defineProperty(_classNames2, "".concat(colorPickerPrefixCls, "-panel-colorDivContainer-unset-color"), (presetColor === null || presetColor === void 0 ? void 0 : presetColor.length) === 0), _defineProperty(_classNames2, "".concat(colorPickerPrefixCls, "-panel-colorDivContainer-ie11"), isIE), _classNames2));
|
|
65
66
|
var colorLiClick = function colorLiClick(index, colorValue) {
|
|
66
67
|
var formatArr = colorFormat(colorValue, alpha);
|
|
67
68
|
var formatValue = toLowerCase(formatArr[valOfCorrespondingType(currentColorType)].value);
|
|
@@ -314,8 +314,8 @@
|
|
|
314
314
|
}
|
|
315
315
|
.kd-color-picker-pop .kd-color-picker-panel-container-transparent {
|
|
316
316
|
-webkit-box-flex: 0;
|
|
317
|
-
-ms-flex: 0
|
|
318
|
-
flex: 0
|
|
317
|
+
-ms-flex: 0 1 60px;
|
|
318
|
+
flex: 0 1 60px;
|
|
319
319
|
height: 28px;
|
|
320
320
|
margin-left: 8px;
|
|
321
321
|
text-align: center;
|
|
@@ -328,6 +328,23 @@
|
|
|
328
328
|
grid-row-gap: 8px;
|
|
329
329
|
margin-top: 12px;
|
|
330
330
|
}
|
|
331
|
+
.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 {
|
|
332
|
+
display: -webkit-box;
|
|
333
|
+
display: -ms-flexbox;
|
|
334
|
+
display: flex;
|
|
335
|
+
-ms-flex-wrap: wrap;
|
|
336
|
+
flex-wrap: wrap;
|
|
337
|
+
}
|
|
338
|
+
.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 li {
|
|
339
|
+
margin-right: 8px;
|
|
340
|
+
margin-top: 8px;
|
|
341
|
+
}
|
|
342
|
+
.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 li:nth-child(12n) {
|
|
343
|
+
margin-right: 0;
|
|
344
|
+
}
|
|
345
|
+
.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 li:nth-child(-n+12) {
|
|
346
|
+
margin-top: 0;
|
|
347
|
+
}
|
|
331
348
|
.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-unset-color {
|
|
332
349
|
margin-top: 0;
|
|
333
350
|
}
|
|
@@ -257,7 +257,7 @@
|
|
|
257
257
|
}
|
|
258
258
|
|
|
259
259
|
&-transparent {
|
|
260
|
-
flex: 0
|
|
260
|
+
flex: 0 1 60px;
|
|
261
261
|
height: 28px;
|
|
262
262
|
margin-left: 8px;
|
|
263
263
|
text-align: center;
|
|
@@ -272,6 +272,24 @@
|
|
|
272
272
|
grid-row-gap: 8px;
|
|
273
273
|
margin-top: 12px;
|
|
274
274
|
|
|
275
|
+
&-ie11 {
|
|
276
|
+
display: flex;
|
|
277
|
+
flex-wrap: wrap;
|
|
278
|
+
|
|
279
|
+
li {
|
|
280
|
+
margin-right: 8px;
|
|
281
|
+
margin-top: 8px;
|
|
282
|
+
|
|
283
|
+
&:nth-child(12n) {
|
|
284
|
+
margin-right: 0;
|
|
285
|
+
}
|
|
286
|
+
|
|
287
|
+
&:nth-child(-n+12) {
|
|
288
|
+
margin-top: 0;
|
|
289
|
+
}
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
|
|
275
293
|
&-unset-color {
|
|
276
294
|
margin-top: 0;
|
|
277
295
|
}
|
package/es/grid/col.js
CHANGED
|
@@ -47,10 +47,10 @@ var Col = function Col(props) {
|
|
|
47
47
|
if (testBrowserType(/^sogou/i, 0)) return true;
|
|
48
48
|
// 判断是否是IE浏览器
|
|
49
49
|
if (/Trident|MSIE/.test(navigator.userAgent)) return true;
|
|
50
|
-
// 判断是否是chrome浏览器,chrome浏览器版本号小于
|
|
50
|
+
// 判断是否是chrome浏览器,chrome浏览器版本号小于83(统信浏览器)
|
|
51
51
|
if (/Chrome/.test(navigator.userAgent) && !/Chromium/.test(navigator.userAgent)) {
|
|
52
52
|
var version = navigator.userAgent.split('Chrome/')[1].split('.');
|
|
53
|
-
if (version[0] && parseInt(version[0]) <=
|
|
53
|
+
if (version[0] && parseInt(version[0]) <= 83) return true;
|
|
54
54
|
}
|
|
55
55
|
return false;
|
|
56
56
|
};
|
package/es/grid/row.js
CHANGED
|
@@ -48,10 +48,10 @@ var Row = function Row(props) {
|
|
|
48
48
|
if (testBrowserType(/^sogou/i, 0)) return true;
|
|
49
49
|
// 判断是否是IE浏览器
|
|
50
50
|
if (/Trident|MSIE/.test(navigator.userAgent)) return true;
|
|
51
|
-
// 判断是否是chrome浏览器,chrome浏览器版本号小于
|
|
51
|
+
// 判断是否是chrome浏览器,chrome浏览器版本号小于83(统信浏览器)
|
|
52
52
|
if (/Chrome/.test(navigator.userAgent) && !/Chromium/.test(navigator.userAgent)) {
|
|
53
53
|
var version = navigator.userAgent.split('Chrome/')[1].split('.');
|
|
54
|
-
if (version[0] && parseInt(version[0]) <=
|
|
54
|
+
if (version[0] && parseInt(version[0]) <= 83) return true;
|
|
55
55
|
}
|
|
56
56
|
return false;
|
|
57
57
|
};
|
package/es/modal/modal.js
CHANGED
|
@@ -24,6 +24,7 @@ import devWarning from '../_utils/devwarning';
|
|
|
24
24
|
import Draggable from 'react-draggable';
|
|
25
25
|
import { getLangMsg } from '../locale/locale';
|
|
26
26
|
import { useHideDocumentScrollBar } from '../_utils/hooks';
|
|
27
|
+
import { isIE } from '../_utils/ieUtil';
|
|
27
28
|
export var ConfirmModalTypes = ['confirm', 'normal'];
|
|
28
29
|
export var ModalTypes = tuple('confirm', 'warning', 'error', 'normal');
|
|
29
30
|
var DragDirection;
|
|
@@ -375,7 +376,7 @@ var InternalModal = function InternalModal(props, ref) {
|
|
|
375
376
|
}
|
|
376
377
|
};
|
|
377
378
|
var isHidden = !destroyOnClose && !(isForceController ? visible : innerVisible);
|
|
378
|
-
var modalClasses = classNames(modalPrefixCls, className, (_classNames3 = {}, _defineProperty(_classNames3, "".concat(modalPrefixCls, "-container"), true), _defineProperty(_classNames3, "".concat(modalPrefixCls, "-container-hidden"), isHidden), _defineProperty(_classNames3, "".concat(modalPrefixCls, "-container-show"), !isHidden), _classNames3));
|
|
379
|
+
var modalClasses = classNames(modalPrefixCls, className, (_classNames3 = {}, _defineProperty(_classNames3, "".concat(modalPrefixCls, "-container"), true), _defineProperty(_classNames3, "".concat(modalPrefixCls, "-container-ie"), isIE), _defineProperty(_classNames3, "".concat(modalPrefixCls, "-container-hidden"), isHidden), _defineProperty(_classNames3, "".concat(modalPrefixCls, "-container-show"), !isHidden), _classNames3));
|
|
379
380
|
var headerClass = "".concat(modalPrefixCls, "-header");
|
|
380
381
|
var container = /*#__PURE__*/React.createElement("div", {
|
|
381
382
|
className: classNames((_classNames4 = {}, _defineProperty(_classNames4, "".concat(modalPrefixCls, "-container-box"), true), _defineProperty(_classNames4, "".concat(modalPrefixCls, "-has-container-box"), modalContainer && !overroll), _defineProperty(_classNames4, "".concat(modalPrefixCls, "-showline"), showline), _classNames4)),
|
package/es/modal/style/index.css
CHANGED
|
@@ -113,6 +113,9 @@
|
|
|
113
113
|
position: relative;
|
|
114
114
|
z-index: var(--kd-c-modal-z-index, var(--kd-g-z-index-dialog, 1050));
|
|
115
115
|
}
|
|
116
|
+
.kd-modal-container-ie {
|
|
117
|
+
position: absolute;
|
|
118
|
+
}
|
|
116
119
|
.kd-modal-container-show {
|
|
117
120
|
-webkit-animation: kdModalEffect calc(0.3s - 0.1s) cubic-bezier(0.4, 0, 0.6, 1) both;
|
|
118
121
|
animation: kdModalEffect calc(0.3s - 0.1s) cubic-bezier(0.4, 0, 0.6, 1) both;
|
|
@@ -573,17 +573,17 @@
|
|
|
573
573
|
-ms-user-select: none;
|
|
574
574
|
user-select: none;
|
|
575
575
|
}
|
|
576
|
-
.kd-select .kd-select-selection-item-small {
|
|
576
|
+
.kd-select .kd-select-selection-item.kd-select-selection-item-small {
|
|
577
577
|
height: 20px;
|
|
578
578
|
line-height: 18px;
|
|
579
579
|
font-size: 12px;
|
|
580
580
|
}
|
|
581
|
-
.kd-select .kd-select-selection-item-middle {
|
|
581
|
+
.kd-select .kd-select-selection-item.kd-select-selection-item-middle {
|
|
582
582
|
font-size: 12px;
|
|
583
583
|
height: 20px;
|
|
584
584
|
line-height: 18px;
|
|
585
585
|
}
|
|
586
|
-
.kd-select .kd-select-selection-item-large {
|
|
586
|
+
.kd-select .kd-select-selection-item.kd-select-selection-item-large {
|
|
587
587
|
font-size: 14px;
|
|
588
588
|
line-height: 22px;
|
|
589
589
|
height: 22px;
|
|
@@ -311,19 +311,19 @@
|
|
|
311
311
|
max-width: 100%;
|
|
312
312
|
cursor: default;
|
|
313
313
|
user-select: none;
|
|
314
|
-
|
|
314
|
+
&.@{select-prefix-cls}-selection-item-small {
|
|
315
315
|
height: 20px;
|
|
316
316
|
line-height: 18px;
|
|
317
317
|
font-size: 12px;
|
|
318
318
|
}
|
|
319
319
|
|
|
320
|
-
|
|
320
|
+
&.@{select-prefix-cls}-selection-item-middle {
|
|
321
321
|
font-size: 12px;
|
|
322
322
|
height: 20px;
|
|
323
323
|
line-height: 18px;
|
|
324
324
|
}
|
|
325
325
|
|
|
326
|
-
|
|
326
|
+
&.@{select-prefix-cls}-selection-item-large {
|
|
327
327
|
font-size: 14px;
|
|
328
328
|
line-height: 22px;
|
|
329
329
|
height: 22px;
|
package/es/style/core/reset.less
CHANGED
|
@@ -24,8 +24,8 @@ input,
|
|
|
24
24
|
textarea,
|
|
25
25
|
select,
|
|
26
26
|
button {
|
|
27
|
-
font-family: '
|
|
28
|
-
'WenQuanYi Micro Hei', sans-serif;
|
|
27
|
+
font-family: 'Roboto', 'San Francisco', 'Helvetica Neue', Helvetica, Arial, 'PingFang SC', 'Hiragina Sans GB',
|
|
28
|
+
'WenQuanYi Micro Hei', 'microsoft yahei ui', 'microsoft yahei', sans-serif;
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
body {
|
package/es/style/index.css
CHANGED
|
@@ -1687,7 +1687,7 @@ input,
|
|
|
1687
1687
|
textarea,
|
|
1688
1688
|
select,
|
|
1689
1689
|
button {
|
|
1690
|
-
font-family: '
|
|
1690
|
+
font-family: 'Roboto', 'San Francisco', 'Helvetica Neue', Helvetica, Arial, 'PingFang SC', 'Hiragina Sans GB', 'WenQuanYi Micro Hei', 'microsoft yahei ui', 'microsoft yahei', sans-serif;
|
|
1691
1691
|
}
|
|
1692
1692
|
body {
|
|
1693
1693
|
-webkit-box-sizing: border-box;
|
|
@@ -23,12 +23,13 @@ var _color = _interopRequireDefault(require("color"));
|
|
|
23
23
|
var _reactColor = require("react-color");
|
|
24
24
|
var _devwarning = _interopRequireDefault(require("../_utils/devwarning"));
|
|
25
25
|
var _hooks = require("../_utils/hooks");
|
|
26
|
+
var _ieUtil = require("../_utils/ieUtil");
|
|
26
27
|
function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
27
28
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
28
29
|
/* eslint-disable */
|
|
29
30
|
|
|
30
31
|
var ColorPickerPanel = function ColorPickerPanel(props) {
|
|
31
|
-
var _classNames, _context;
|
|
32
|
+
var _classNames, _classNames2, _context;
|
|
32
33
|
var setCorrectColorValue = props.setCorrectColorValue,
|
|
33
34
|
setInputColorValue = props.setInputColorValue,
|
|
34
35
|
setAlpha = props.setAlpha,
|
|
@@ -74,7 +75,7 @@ var ColorPickerPanel = function ColorPickerPanel(props) {
|
|
|
74
75
|
var panelContainerCls = (0, _classnames.default)("".concat(colorPickerPrefixCls, "-panel-container"));
|
|
75
76
|
var panelInputCls = (0, _classnames.default)("".concat(colorPickerPrefixCls, "-panel-container-input"));
|
|
76
77
|
var transparentCls = (0, _classnames.default)("".concat(colorPickerPrefixCls, "-panel-container-transparent"));
|
|
77
|
-
var colorDivContainerCls = (0, _classnames.default)("".concat(colorPickerPrefixCls, "-panel-colorDivContainer"), (0, _defineProperty2.default)(
|
|
78
|
+
var colorDivContainerCls = (0, _classnames.default)("".concat(colorPickerPrefixCls, "-panel-colorDivContainer"), (_classNames2 = {}, (0, _defineProperty2.default)(_classNames2, "".concat(colorPickerPrefixCls, "-panel-colorDivContainer-unset-color"), (presetColor === null || presetColor === void 0 ? void 0 : presetColor.length) === 0), (0, _defineProperty2.default)(_classNames2, "".concat(colorPickerPrefixCls, "-panel-colorDivContainer-ie11"), _ieUtil.isIE), _classNames2));
|
|
78
79
|
var colorLiClick = function colorLiClick(index, colorValue) {
|
|
79
80
|
var formatArr = (0, _colorFormat.colorFormat)(colorValue, alpha);
|
|
80
81
|
var formatValue = (0, _convertLetters.toLowerCase)(formatArr[(0, _colorFormat.valOfCorrespondingType)(currentColorType)].value);
|
|
@@ -314,8 +314,8 @@
|
|
|
314
314
|
}
|
|
315
315
|
.kd-color-picker-pop .kd-color-picker-panel-container-transparent {
|
|
316
316
|
-webkit-box-flex: 0;
|
|
317
|
-
-ms-flex: 0
|
|
318
|
-
flex: 0
|
|
317
|
+
-ms-flex: 0 1 60px;
|
|
318
|
+
flex: 0 1 60px;
|
|
319
319
|
height: 28px;
|
|
320
320
|
margin-left: 8px;
|
|
321
321
|
text-align: center;
|
|
@@ -328,6 +328,23 @@
|
|
|
328
328
|
grid-row-gap: 8px;
|
|
329
329
|
margin-top: 12px;
|
|
330
330
|
}
|
|
331
|
+
.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 {
|
|
332
|
+
display: -webkit-box;
|
|
333
|
+
display: -ms-flexbox;
|
|
334
|
+
display: flex;
|
|
335
|
+
-ms-flex-wrap: wrap;
|
|
336
|
+
flex-wrap: wrap;
|
|
337
|
+
}
|
|
338
|
+
.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 li {
|
|
339
|
+
margin-right: 8px;
|
|
340
|
+
margin-top: 8px;
|
|
341
|
+
}
|
|
342
|
+
.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 li:nth-child(12n) {
|
|
343
|
+
margin-right: 0;
|
|
344
|
+
}
|
|
345
|
+
.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 li:nth-child(-n+12) {
|
|
346
|
+
margin-top: 0;
|
|
347
|
+
}
|
|
331
348
|
.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-unset-color {
|
|
332
349
|
margin-top: 0;
|
|
333
350
|
}
|
|
@@ -257,7 +257,7 @@
|
|
|
257
257
|
}
|
|
258
258
|
|
|
259
259
|
&-transparent {
|
|
260
|
-
flex: 0
|
|
260
|
+
flex: 0 1 60px;
|
|
261
261
|
height: 28px;
|
|
262
262
|
margin-left: 8px;
|
|
263
263
|
text-align: center;
|
|
@@ -272,6 +272,24 @@
|
|
|
272
272
|
grid-row-gap: 8px;
|
|
273
273
|
margin-top: 12px;
|
|
274
274
|
|
|
275
|
+
&-ie11 {
|
|
276
|
+
display: flex;
|
|
277
|
+
flex-wrap: wrap;
|
|
278
|
+
|
|
279
|
+
li {
|
|
280
|
+
margin-right: 8px;
|
|
281
|
+
margin-top: 8px;
|
|
282
|
+
|
|
283
|
+
&:nth-child(12n) {
|
|
284
|
+
margin-right: 0;
|
|
285
|
+
}
|
|
286
|
+
|
|
287
|
+
&:nth-child(-n+12) {
|
|
288
|
+
margin-top: 0;
|
|
289
|
+
}
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
|
|
275
293
|
&-unset-color {
|
|
276
294
|
margin-top: 0;
|
|
277
295
|
}
|
package/lib/grid/col.js
CHANGED
|
@@ -59,10 +59,10 @@ var Col = function Col(props) {
|
|
|
59
59
|
if ((0, _testBrowserType.testBrowserType)(/^sogou/i, 0)) return true;
|
|
60
60
|
// 判断是否是IE浏览器
|
|
61
61
|
if (/Trident|MSIE/.test(navigator.userAgent)) return true;
|
|
62
|
-
// 判断是否是chrome浏览器,chrome浏览器版本号小于
|
|
62
|
+
// 判断是否是chrome浏览器,chrome浏览器版本号小于83(统信浏览器)
|
|
63
63
|
if (/Chrome/.test(navigator.userAgent) && !/Chromium/.test(navigator.userAgent)) {
|
|
64
64
|
var version = navigator.userAgent.split('Chrome/')[1].split('.');
|
|
65
|
-
if (version[0] && parseInt(version[0]) <=
|
|
65
|
+
if (version[0] && parseInt(version[0]) <= 83) return true;
|
|
66
66
|
}
|
|
67
67
|
return false;
|
|
68
68
|
};
|
package/lib/grid/row.js
CHANGED
|
@@ -61,10 +61,10 @@ var Row = function Row(props) {
|
|
|
61
61
|
if ((0, _testBrowserType.testBrowserType)(/^sogou/i, 0)) return true;
|
|
62
62
|
// 判断是否是IE浏览器
|
|
63
63
|
if (/Trident|MSIE/.test(navigator.userAgent)) return true;
|
|
64
|
-
// 判断是否是chrome浏览器,chrome浏览器版本号小于
|
|
64
|
+
// 判断是否是chrome浏览器,chrome浏览器版本号小于83(统信浏览器)
|
|
65
65
|
if (/Chrome/.test(navigator.userAgent) && !/Chromium/.test(navigator.userAgent)) {
|
|
66
66
|
var version = navigator.userAgent.split('Chrome/')[1].split('.');
|
|
67
|
-
if (version[0] && parseInt(version[0]) <=
|
|
67
|
+
if (version[0] && parseInt(version[0]) <= 83) return true;
|
|
68
68
|
}
|
|
69
69
|
return false;
|
|
70
70
|
};
|
package/lib/modal/modal.js
CHANGED
|
@@ -26,6 +26,7 @@ var _devwarning = _interopRequireDefault(require("../_utils/devwarning"));
|
|
|
26
26
|
var _reactDraggable = _interopRequireDefault(require("react-draggable"));
|
|
27
27
|
var _locale = require("../locale/locale");
|
|
28
28
|
var _hooks = require("../_utils/hooks");
|
|
29
|
+
var _ieUtil = require("../_utils/ieUtil");
|
|
29
30
|
function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
30
31
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
31
32
|
var __rest = void 0 && (void 0).__rest || function (s, e) {
|
|
@@ -389,7 +390,7 @@ var InternalModal = function InternalModal(props, ref) {
|
|
|
389
390
|
}
|
|
390
391
|
};
|
|
391
392
|
var isHidden = !destroyOnClose && !(isForceController ? visible : innerVisible);
|
|
392
|
-
var modalClasses = (0, _classnames.default)(modalPrefixCls, className, (_classNames3 = {}, (0, _defineProperty2.default)(_classNames3, "".concat(modalPrefixCls, "-container"), true), (0, _defineProperty2.default)(_classNames3, "".concat(modalPrefixCls, "-container-hidden"), isHidden), (0, _defineProperty2.default)(_classNames3, "".concat(modalPrefixCls, "-container-show"), !isHidden), _classNames3));
|
|
393
|
+
var modalClasses = (0, _classnames.default)(modalPrefixCls, className, (_classNames3 = {}, (0, _defineProperty2.default)(_classNames3, "".concat(modalPrefixCls, "-container"), true), (0, _defineProperty2.default)(_classNames3, "".concat(modalPrefixCls, "-container-ie"), _ieUtil.isIE), (0, _defineProperty2.default)(_classNames3, "".concat(modalPrefixCls, "-container-hidden"), isHidden), (0, _defineProperty2.default)(_classNames3, "".concat(modalPrefixCls, "-container-show"), !isHidden), _classNames3));
|
|
393
394
|
var headerClass = "".concat(modalPrefixCls, "-header");
|
|
394
395
|
var container = /*#__PURE__*/_react.default.createElement("div", {
|
|
395
396
|
className: (0, _classnames.default)((_classNames4 = {}, (0, _defineProperty2.default)(_classNames4, "".concat(modalPrefixCls, "-container-box"), true), (0, _defineProperty2.default)(_classNames4, "".concat(modalPrefixCls, "-has-container-box"), modalContainer && !overroll), (0, _defineProperty2.default)(_classNames4, "".concat(modalPrefixCls, "-showline"), showline), _classNames4)),
|
|
@@ -113,6 +113,9 @@
|
|
|
113
113
|
position: relative;
|
|
114
114
|
z-index: var(--kd-c-modal-z-index, var(--kd-g-z-index-dialog, 1050));
|
|
115
115
|
}
|
|
116
|
+
.kd-modal-container-ie {
|
|
117
|
+
position: absolute;
|
|
118
|
+
}
|
|
116
119
|
.kd-modal-container-show {
|
|
117
120
|
-webkit-animation: kdModalEffect calc(0.3s - 0.1s) cubic-bezier(0.4, 0, 0.6, 1) both;
|
|
118
121
|
animation: kdModalEffect calc(0.3s - 0.1s) cubic-bezier(0.4, 0, 0.6, 1) both;
|
|
@@ -573,17 +573,17 @@
|
|
|
573
573
|
-ms-user-select: none;
|
|
574
574
|
user-select: none;
|
|
575
575
|
}
|
|
576
|
-
.kd-select .kd-select-selection-item-small {
|
|
576
|
+
.kd-select .kd-select-selection-item.kd-select-selection-item-small {
|
|
577
577
|
height: 20px;
|
|
578
578
|
line-height: 18px;
|
|
579
579
|
font-size: 12px;
|
|
580
580
|
}
|
|
581
|
-
.kd-select .kd-select-selection-item-middle {
|
|
581
|
+
.kd-select .kd-select-selection-item.kd-select-selection-item-middle {
|
|
582
582
|
font-size: 12px;
|
|
583
583
|
height: 20px;
|
|
584
584
|
line-height: 18px;
|
|
585
585
|
}
|
|
586
|
-
.kd-select .kd-select-selection-item-large {
|
|
586
|
+
.kd-select .kd-select-selection-item.kd-select-selection-item-large {
|
|
587
587
|
font-size: 14px;
|
|
588
588
|
line-height: 22px;
|
|
589
589
|
height: 22px;
|
|
@@ -311,19 +311,19 @@
|
|
|
311
311
|
max-width: 100%;
|
|
312
312
|
cursor: default;
|
|
313
313
|
user-select: none;
|
|
314
|
-
|
|
314
|
+
&.@{select-prefix-cls}-selection-item-small {
|
|
315
315
|
height: 20px;
|
|
316
316
|
line-height: 18px;
|
|
317
317
|
font-size: 12px;
|
|
318
318
|
}
|
|
319
319
|
|
|
320
|
-
|
|
320
|
+
&.@{select-prefix-cls}-selection-item-middle {
|
|
321
321
|
font-size: 12px;
|
|
322
322
|
height: 20px;
|
|
323
323
|
line-height: 18px;
|
|
324
324
|
}
|
|
325
325
|
|
|
326
|
-
|
|
326
|
+
&.@{select-prefix-cls}-selection-item-large {
|
|
327
327
|
font-size: 14px;
|
|
328
328
|
line-height: 22px;
|
|
329
329
|
height: 22px;
|
|
@@ -24,8 +24,8 @@ input,
|
|
|
24
24
|
textarea,
|
|
25
25
|
select,
|
|
26
26
|
button {
|
|
27
|
-
font-family: '
|
|
28
|
-
'WenQuanYi Micro Hei', sans-serif;
|
|
27
|
+
font-family: 'Roboto', 'San Francisco', 'Helvetica Neue', Helvetica, Arial, 'PingFang SC', 'Hiragina Sans GB',
|
|
28
|
+
'WenQuanYi Micro Hei', 'microsoft yahei ui', 'microsoft yahei', sans-serif;
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
body {
|
package/lib/style/index.css
CHANGED
|
@@ -1687,7 +1687,7 @@ input,
|
|
|
1687
1687
|
textarea,
|
|
1688
1688
|
select,
|
|
1689
1689
|
button {
|
|
1690
|
-
font-family: '
|
|
1690
|
+
font-family: 'Roboto', 'San Francisco', 'Helvetica Neue', Helvetica, Arial, 'PingFang SC', 'Hiragina Sans GB', 'WenQuanYi Micro Hei', 'microsoft yahei ui', 'microsoft yahei', sans-serif;
|
|
1691
1691
|
}
|
|
1692
1692
|
body {
|
|
1693
1693
|
-webkit-box-sizing: border-box;
|