@zgfe/business-lib 1.1.69-beta.3 → 1.1.69-beta.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.
Files changed (5) hide show
  1. package/es/attributeSelector/index.js +7 -3
  2. package/es/attributeSelector/styles/index.less +25 -8
  3. package/es/userGroup/index.js +7 -5
  4. package/es/userGroup/styles/index.less +20 -6
  5. package/package.json +2 -2
package/es/attributeSelector/index.js CHANGED
@@ -84,6 +84,8 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
84
84
  };
85
85
  return /*#__PURE__*/React.createElement("div", {
86
86
  className: classPrefix
87
+ }, /*#__PURE__*/React.createElement("div", {
88
+ className: "".concat(classPrefix, "-handle").concat(visible ? ' focus' : '')
87
89
  }, /*#__PURE__*/React.createElement(Dropdown, {
88
90
  dropdownRender: function dropdownRender() {
89
91
  return /*#__PURE__*/React.createElement(AttrListPanel, _objectSpread(_objectSpread({
@@ -102,7 +104,9 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
102
104
  onOpenChange: onVisibleChange,
103
105
  destroyPopupOnHide: props.destroyPopupOnHide
104
106
  }, /*#__PURE__*/React.createElement("div", {
105
- className: "".concat(classPrefix, "-handle")
107
+ style: {
108
+ width: '100%'
109
+ }
106
110
  }, /*#__PURE__*/React.createElement(SelectHandle, {
107
111
  ref: boxRef,
108
112
  theme: theme,
@@ -115,10 +119,10 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
115
119
  return '删除';
116
120
  }
117
121
  }, /*#__PURE__*/React.createElement(IconFont, {
118
- className: "".concat(classPrefix, "-del-icon delete"),
122
+ className: "".concat(classPrefix, "-del-icon"),
119
123
  type: 'qingchu',
120
124
  onClick: onDelete
121
- })));
125
+ }))));
122
126
  };
123
127
  BizAttributeSelector.defaultProps = {
124
128
  enableDelete: false,
package/es/attributeSelector/styles/index.less CHANGED
@@ -1,18 +1,35 @@
1
1
  @import '../../assets/styles/inner.less';
2
2
 
3
3
  .biz-attr-select {
4
- display: flex;
5
- align-items: center;
6
-
7
4
  &-handle {
8
- min-width: 208px;
9
- max-width: calc(100% - 56px);
5
+ display: flex;
6
+ flex-direction: row;
7
+ .__select-handle();
8
+ &:hover .biz-attr-select-del-icon {
9
+ display: flex;
10
+ align-items: center;
11
+ justify-content: center;
12
+ }
13
+
14
+ .biz-select-handle-input {
15
+ border: none;
16
+ &.middle {
17
+ height: 30px;
18
+ line-height: 30px;
19
+ }
20
+ }
10
21
  }
11
22
 
12
23
  &-del-icon {
13
- .__icon();
14
- margin-left: 16px;
15
- font-size: 16px !important;
24
+ display: none;
25
+ flex: none;
26
+ width: @icon-width;
27
+ color: @text-color-secondary;
28
+ border-radius: @border-radius-small;
29
+
30
+ &:hover {
31
+ .__error-hover();
32
+ }
16
33
  }
17
34
 
18
35
  &-drowdown {
package/es/userGroup/index.js CHANGED
@@ -9,7 +9,7 @@ import './styles/index.less';
9
9
  import BizSelect from '../select';
10
10
  import { Skeleton } from 'antd';
11
11
  import BizGlobalDataContext from '../context';
12
- import { IconFont } from '..';
12
+ import BizTargetOptionIcon from '../targetSelector/optionIcon';
13
13
  var BizUserGroup = function BizUserGroup(props) {
14
14
  var enableDelete = props.enableDelete,
15
15
  keyField = props.keyField,
@@ -64,11 +64,13 @@ var BizUserGroup = function BizUserGroup(props) {
64
64
  onChange: onChange,
65
65
  minDropdownWidth: 284,
66
66
  onVisibleChange: onVisibleChange
67
- }), enableDelete ? /*#__PURE__*/React.createElement(IconFont, {
68
- className: "".concat(classPrefix, "-icon delete ").concat(!enableDelete ? 'disabled' : ''),
69
- type: "qingchu",
67
+ }), /*#__PURE__*/React.createElement(BizTargetOptionIcon, {
68
+ name: "delete",
69
+ icon: "qingchu",
70
+ title: "\u5220\u9664",
71
+ enabled: enableDelete,
70
72
  onClick: onClickDelete
71
- }) : null));
73
+ })));
72
74
  };
73
75
  BizUserGroup.defaultProps = {
74
76
  keyField: 'id',
package/es/userGroup/styles/index.less CHANGED
@@ -4,15 +4,29 @@
4
4
  position: relative;
5
5
  display: flex;
6
6
  align-items: center;
7
+ .__select-handle();
7
8
 
8
9
  .biz-select-handle {
9
- min-width: 208px;
10
- max-width: calc(100% - 56px);
10
+ flex: 1;
11
+ width: 100%;
12
+ padding: 0;
13
+ border: none;
14
+ border-radius: 0;
15
+ .biz-select-handle-input {
16
+ border: none;
17
+ &.middle {
18
+ height: 30px;
19
+ line-height: 30px;
20
+ }
21
+ &.active:not(.disable) {
22
+ box-shadow: none;
23
+ }
24
+ }
11
25
  }
12
26
 
13
- &-icon {
14
- .__icon();
15
- margin-left: 16px;
16
- font-size: 16px !important;
27
+ &:hover {
28
+ .biz-target-select-option-icon {
29
+ display: inline-block;
30
+ }
17
31
  }
18
32
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/business-lib",
3
- "version": "1.1.69-beta.3",
3
+ "version": "1.1.69-beta.4",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
@@ -60,5 +60,5 @@
60
60
  "react": "^16.12.0 || ^17.0.0",
61
61
  "yorkie": "^2.0.0"
62
62
  },
63
- "gitHead": "a973de7c2159fb85d1a048ebe22d526ef8aa35c0"
63
+ "gitHead": "f42175ce039bfbc81278fc212f5f4376b846341f"
64
64
  }