@zat-design/sisyphus-react 3.4.2-beta.11 → 3.4.2-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 (16) hide show
  1. package/dist/index.esm.css +7 -0
  2. package/es/ProEnum/components/Group.d.ts +0 -1
  3. package/es/ProEnum/components/Group.js +8 -21
  4. package/es/ProEnum/index.js +2 -4
  5. package/es/ProEnum/style/index.less +1 -7
  6. package/es/ProLayout/components/ProCollapse/PropTypes.d.ts +5 -0
  7. package/es/ProLayout/components/ProCollapse/index.js +17 -3
  8. package/es/ProLayout/components/ProCollapse/style/index.less +7 -0
  9. package/lib/ProEnum/components/Group.d.ts +0 -1
  10. package/lib/ProEnum/components/Group.js +8 -21
  11. package/lib/ProEnum/index.js +2 -4
  12. package/lib/ProEnum/style/index.less +1 -7
  13. package/lib/ProLayout/components/ProCollapse/PropTypes.d.ts +5 -0
  14. package/lib/ProLayout/components/ProCollapse/index.js +15 -3
  15. package/lib/ProLayout/components/ProCollapse/style/index.less +7 -0
  16. package/package.json +1 -1
package/dist/index.esm.css CHANGED
@@ -675,6 +675,13 @@
675
675
  width: 12px;
676
676
  margin-right: 0;
677
677
  }
678
+ .pro-collapse .pro-collapse-icon {
679
+ max-width: 18px;
680
+ min-width: 16px;
681
+ }
682
+ .pro-collapse .pro-collapse-icon img {
683
+ vertical-align: sub;
684
+ }
678
685
  .pro-collapse.pro-collapse-no-title .ant-collapse-header {
679
686
  display: none !important;
680
687
  }
package/es/ProEnum/components/Group.d.ts CHANGED
@@ -2,7 +2,6 @@ import { ProEnum } from '../propsType';
2
2
  interface Props extends Pick<ProEnum, 'value' | 'onChange' | 'dataSource'> {
3
3
  fieldValue: string;
4
4
  fieldLabel: string;
5
- disabled?: boolean;
6
5
  }
7
6
  declare const Group: (props: Props) => JSX.Element;
8
7
  export default Group;
package/es/ProEnum/components/Group.js CHANGED
@@ -8,8 +8,7 @@ var Group = function Group(props) {
8
8
  onChange = props.onChange,
9
9
  dataSource = props.dataSource,
10
10
  fieldValue = props.fieldValue,
11
- fieldLabel = props.fieldLabel,
12
- disabled = props.disabled;
11
+ fieldLabel = props.fieldLabel;
13
12
  var idx = useRef(-1);
14
13
  var _useSetState = useSetState({
15
14
  checked: ''
@@ -21,25 +20,13 @@ var Group = function Group(props) {
21
20
  setState({
22
21
  checked: value
23
22
  });
24
- var index = dataSource.findIndex(function (item) {
25
- return item[fieldValue] === value;
26
- });
27
- idx.current = index;
28
23
  }, [value]);
29
24
  var handleClick = function handleClick(val, index) {
30
- if (state.checked === val) {
31
- setState({
32
- checked: ''
33
- });
34
- onChange === null || onChange === void 0 ? void 0 : onChange('');
35
- idx.current = -1;
36
- } else {
37
- setState({
38
- checked: val
39
- });
40
- idx.current = index;
41
- onChange === null || onChange === void 0 ? void 0 : onChange(val);
42
- }
25
+ setState({
26
+ checked: val
27
+ });
28
+ idx.current = index;
29
+ onChange === null || onChange === void 0 ? void 0 : onChange(val);
43
30
  };
44
31
  if (dataSource.length === 0) {
45
32
  return _jsx("span", {
@@ -47,11 +34,11 @@ var Group = function Group(props) {
47
34
  });
48
35
  }
49
36
  return _jsx("div", {
50
- className: classNames('pro-enum-group-root', disabled ? 'pro-enum-group-root-disabled' : ''),
37
+ className: "pro-enum-group-root",
51
38
  children: dataSource.map(function (item, index) {
52
39
  return _jsx("div", {
53
40
  onClick: function onClick() {
54
- if (!item.disabled && !disabled) {
41
+ if (!item.disabled) {
55
42
  handleClick(item[fieldValue], index);
56
43
  }
57
44
  },
package/es/ProEnum/index.js CHANGED
@@ -41,8 +41,7 @@ var ProEnum = function ProEnum(props) {
41
41
  enumProps = _objectWithoutProperties(props, _excluded);
42
42
  var _ref = otherProps || {},
43
43
  isView = _ref.isView,
44
- viewEmpty = _ref.viewEmpty,
45
- disabled = _ref.disabled;
44
+ viewEmpty = _ref.viewEmpty;
46
45
  var _ref2 = useProConfig('ProEnum') || {},
47
46
  fieldNames = _ref2.fieldNames,
48
47
  _ref2$clear = _ref2.clear,
@@ -213,8 +212,7 @@ var ProEnum = function ProEnum(props) {
213
212
  onChange: onChange,
214
213
  fieldLabel: label,
215
214
  fieldValue: fieldValue,
216
- dataSource: list,
217
- disabled: disabled
215
+ dataSource: list
218
216
  });
219
217
  default:
220
218
  return null;
package/es/ProEnum/style/index.less CHANGED
@@ -7,12 +7,6 @@
7
7
  flex-direction: row;
8
8
  flex-wrap: wrap;
9
9
  }
10
- &-group-root-disabled {
11
- color: rgba(0, 0, 0, 0.25);
12
- .pro-enum-group-item{
13
- cursor: not-allowed !important;
14
- }
15
- }
16
10
  &-tag-item {
17
11
  display: flex;
18
12
  align-items: center;
@@ -77,8 +71,8 @@
77
71
 
78
72
  .pro-enum-group-item-selected {
79
73
  color: var(--zaui-brand);
80
- background: #fff;
81
74
  border: 1px solid var(--zaui-brand);
75
+ background: #fff;
82
76
  &::after {
83
77
  background: transparent;
84
78
  }
package/es/ProLayout/components/ProCollapse/PropTypes.d.ts CHANGED
@@ -20,6 +20,11 @@ export interface ProCollapseProps {
20
20
  */
21
21
  title?: string | React.ReactNode;
22
22
  /**
23
+ * @description 标题前图标
24
+ * @default -
25
+ */
26
+ icon?: React.ReactNode;
27
+ /**
23
28
  * @description 折叠头部多个标题
24
29
  * @default []
25
30
  */
package/es/ProLayout/components/ProCollapse/index.js CHANGED
@@ -1,5 +1,7 @@
1
1
  import "antd/es/descriptions/style";
2
2
  import _Descriptions from "antd/es/descriptions";
3
+ import "antd/es/space/style";
4
+ import _Space from "antd/es/space";
3
5
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
6
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
5
7
  import "antd/es/collapse/style";
@@ -27,7 +29,8 @@ var ProCollapse = function ProCollapse(props) {
27
29
  folding = _props$folding === void 0 ? false : _props$folding,
28
30
  collapseProps = props.collapseProps,
29
31
  collapsePanelProps = props.collapsePanelProps,
30
- className = props.className;
32
+ className = props.className,
33
+ icon = props.icon;
31
34
  var cls = classNames(_defineProperty({
32
35
  'pro-collapse': true,
33
36
  'pro-collapse-level2': level === '2',
@@ -40,6 +43,7 @@ var ProCollapse = function ProCollapse(props) {
40
43
  children: children
41
44
  });
42
45
  var renderPanel = function renderPanel() {
46
+ var _title = title;
43
47
  if (level === '2') {
44
48
  var level2Panel = classNames({
45
49
  'pro-collapse-level2-collapse': towCollapse,
@@ -51,7 +55,7 @@ var ProCollapse = function ProCollapse(props) {
51
55
  hasCollapse.collapsible = 'disabled';
52
56
  }
53
57
  return _jsx(Panel, _objectSpread(_objectSpread(_objectSpread({
54
- header: title,
58
+ header: _title,
55
59
  className: level2Panel,
56
60
  extra: _jsx("div", {
57
61
  className: "extra-info",
@@ -62,8 +66,18 @@ var ProCollapse = function ProCollapse(props) {
62
66
  children: content
63
67
  }), "1");
64
68
  }
69
+ if (icon) {
70
+ _title = _jsxs(_Space, {
71
+ size: 8,
72
+ align: "center",
73
+ children: [_jsx("div", {
74
+ className: "pro-collapse-icon",
75
+ children: icon
76
+ }), title]
77
+ });
78
+ }
65
79
  return _jsx(Panel, _objectSpread(_objectSpread({
66
- header: title,
80
+ header: _title,
67
81
  className: "pro-collapse-panel",
68
82
  extra: _jsx("div", {
69
83
  className: "extra-info",
package/es/ProLayout/components/ProCollapse/style/index.less CHANGED
@@ -2,6 +2,13 @@
2
2
  @import (reference) '~antd/es/style/themes/index.less';
3
3
 
4
4
  .pro-collapse {
5
+ .pro-collapse-icon{
6
+ max-width: 18px;
7
+ min-width: 16px;
8
+ img{
9
+ vertical-align: sub;
10
+ }
11
+ }
5
12
 
6
13
  &.pro-collapse-no-title {
7
14
  .@{ant-prefix}-collapse-header {
package/lib/ProEnum/components/Group.d.ts CHANGED
@@ -2,7 +2,6 @@ import { ProEnum } from '../propsType';
2
2
  interface Props extends Pick<ProEnum, 'value' | 'onChange' | 'dataSource'> {
3
3
  fieldValue: string;
4
4
  fieldLabel: string;
5
- disabled?: boolean;
6
5
  }
7
6
  declare const Group: (props: Props) => JSX.Element;
8
7
  export default Group;
package/lib/ProEnum/components/Group.js CHANGED
@@ -15,8 +15,7 @@ var Group = function Group(props) {
15
15
  onChange = props.onChange,
16
16
  dataSource = props.dataSource,
17
17
  fieldValue = props.fieldValue,
18
- fieldLabel = props.fieldLabel,
19
- disabled = props.disabled;
18
+ fieldLabel = props.fieldLabel;
20
19
  var idx = (0, _react.useRef)(-1);
21
20
  var _useSetState = (0, _ahooks.useSetState)({
22
21
  checked: ''
@@ -28,25 +27,13 @@ var Group = function Group(props) {
28
27
  setState({
29
28
  checked: value
30
29
  });
31
- var index = dataSource.findIndex(function (item) {
32
- return item[fieldValue] === value;
33
- });
34
- idx.current = index;
35
30
  }, [value]);
36
31
  var handleClick = function handleClick(val, index) {
37
- if (state.checked === val) {
38
- setState({
39
- checked: ''
40
- });
41
- onChange === null || onChange === void 0 ? void 0 : onChange('');
42
- idx.current = -1;
43
- } else {
44
- setState({
45
- checked: val
46
- });
47
- idx.current = index;
48
- onChange === null || onChange === void 0 ? void 0 : onChange(val);
49
- }
32
+ setState({
33
+ checked: val
34
+ });
35
+ idx.current = index;
36
+ onChange === null || onChange === void 0 ? void 0 : onChange(val);
50
37
  };
51
38
  if (dataSource.length === 0) {
52
39
  return (0, _jsxRuntime.jsx)("span", {
@@ -54,11 +41,11 @@ var Group = function Group(props) {
54
41
  });
55
42
  }
56
43
  return (0, _jsxRuntime.jsx)("div", {
57
- className: (0, _classnames.default)('pro-enum-group-root', disabled ? 'pro-enum-group-root-disabled' : ''),
44
+ className: "pro-enum-group-root",
58
45
  children: dataSource.map(function (item, index) {
59
46
  return (0, _jsxRuntime.jsx)("div", {
60
47
  onClick: function onClick() {
61
- if (!item.disabled && !disabled) {
48
+ if (!item.disabled) {
62
49
  handleClick(item[fieldValue], index);
63
50
  }
64
51
  },
package/lib/ProEnum/index.js CHANGED
@@ -42,8 +42,7 @@ var ProEnum = function ProEnum(props) {
42
42
  enumProps = (0, _objectWithoutProperties2.default)(props, _excluded);
43
43
  var _ref = otherProps || {},
44
44
  isView = _ref.isView,
45
- viewEmpty = _ref.viewEmpty,
46
- disabled = _ref.disabled;
45
+ viewEmpty = _ref.viewEmpty;
47
46
  var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
48
47
  fieldNames = _ref2.fieldNames,
49
48
  _ref2$clear = _ref2.clear,
@@ -214,8 +213,7 @@ var ProEnum = function ProEnum(props) {
214
213
  onChange: onChange,
215
214
  fieldLabel: label,
216
215
  fieldValue: fieldValue,
217
- dataSource: list,
218
- disabled: disabled
216
+ dataSource: list
219
217
  });
220
218
  default:
221
219
  return null;
package/lib/ProEnum/style/index.less CHANGED
@@ -7,12 +7,6 @@
7
7
  flex-direction: row;
8
8
  flex-wrap: wrap;
9
9
  }
10
- &-group-root-disabled {
11
- color: rgba(0, 0, 0, 0.25);
12
- .pro-enum-group-item{
13
- cursor: not-allowed !important;
14
- }
15
- }
16
10
  &-tag-item {
17
11
  display: flex;
18
12
  align-items: center;
@@ -77,8 +71,8 @@
77
71
 
78
72
  .pro-enum-group-item-selected {
79
73
  color: var(--zaui-brand);
80
- background: #fff;
81
74
  border: 1px solid var(--zaui-brand);
75
+ background: #fff;
82
76
  &::after {
83
77
  background: transparent;
84
78
  }
package/lib/ProLayout/components/ProCollapse/PropTypes.d.ts CHANGED
@@ -20,6 +20,11 @@ export interface ProCollapseProps {
20
20
  */
21
21
  title?: string | React.ReactNode;
22
22
  /**
23
+ * @description 标题前图标
24
+ * @default -
25
+ */
26
+ icon?: React.ReactNode;
27
+ /**
23
28
  * @description 折叠头部多个标题
24
29
  * @default []
25
30
  */
package/lib/ProLayout/components/ProCollapse/index.js CHANGED
@@ -31,7 +31,8 @@ var ProCollapse = function ProCollapse(props) {
31
31
  folding = _props$folding === void 0 ? false : _props$folding,
32
32
  collapseProps = props.collapseProps,
33
33
  collapsePanelProps = props.collapsePanelProps,
34
- className = props.className;
34
+ className = props.className,
35
+ icon = props.icon;
35
36
  var cls = (0, _classnames.default)((0, _defineProperty2.default)({
36
37
  'pro-collapse': true,
37
38
  'pro-collapse-level2': level === '2',
@@ -44,6 +45,7 @@ var ProCollapse = function ProCollapse(props) {
44
45
  children: children
45
46
  });
46
47
  var renderPanel = function renderPanel() {
48
+ var _title = title;
47
49
  if (level === '2') {
48
50
  var level2Panel = (0, _classnames.default)({
49
51
  'pro-collapse-level2-collapse': towCollapse,
@@ -55,7 +57,7 @@ var ProCollapse = function ProCollapse(props) {
55
57
  hasCollapse.collapsible = 'disabled';
56
58
  }
57
59
  return (0, _jsxRuntime.jsx)(Panel, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
58
- header: title,
60
+ header: _title,
59
61
  className: level2Panel,
60
62
  extra: (0, _jsxRuntime.jsx)("div", {
61
63
  className: "extra-info",
@@ -66,8 +68,18 @@ var ProCollapse = function ProCollapse(props) {
66
68
  children: content
67
69
  }), "1");
68
70
  }
71
+ if (icon) {
72
+ _title = (0, _jsxRuntime.jsxs)(_antd.Space, {
73
+ size: 8,
74
+ align: "center",
75
+ children: [(0, _jsxRuntime.jsx)("div", {
76
+ className: "pro-collapse-icon",
77
+ children: icon
78
+ }), title]
79
+ });
80
+ }
69
81
  return (0, _jsxRuntime.jsx)(Panel, (0, _objectSpread2.default)((0, _objectSpread2.default)({
70
- header: title,
82
+ header: _title,
71
83
  className: "pro-collapse-panel",
72
84
  extra: (0, _jsxRuntime.jsx)("div", {
73
85
  className: "extra-info",
package/lib/ProLayout/components/ProCollapse/style/index.less CHANGED
@@ -2,6 +2,13 @@
2
2
  @import (reference) '~antd/es/style/themes/index.less';
3
3
 
4
4
  .pro-collapse {
5
+ .pro-collapse-icon{
6
+ max-width: 18px;
7
+ min-width: 16px;
8
+ img{
9
+ vertical-align: sub;
10
+ }
11
+ }
5
12
 
6
13
  &.pro-collapse-no-title {
7
14
  .@{ant-prefix}-collapse-header {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.4.2-beta.11",
3
+ "version": "3.4.2-beta.12",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",