@zgfe/business-lib 1.1.82-user.4 → 1.1.82-user.6

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/attrCondition/group.js +7 -6
  2. package/es/attrCondition/styles/index.less +11 -3
  3. package/es/userGroup/styles/index.less +3 -0
  4. package/es/userGroupHeader/demo/index.js +1 -1
  5. package/es/userGroupHeader/index.js +12 -45
  6. package/es/userGroupHeader/styles/index.less +10 -14
  7. package/package.json +2 -2
package/es/attrCondition/group.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import React from 'react';
2
2
  import useConditionGroup from './useConditionGroup';
3
- import { Skeleton, Space } from 'antd';
3
+ import { Skeleton } from 'antd';
4
4
  import BizAttrCondition from '.';
5
5
  var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref) {
6
6
  var showHandle = props.showHandle,
@@ -38,11 +38,12 @@ var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref)
38
38
  className: "".concat(classPrefix, "-operate-text ").concat(relation === 'and' || props.onlyAnd ? 'active' : '', " ").concat(props.onlyAnd ? 'only-and' : '')
39
39
  }, /*#__PURE__*/React.createElement("span", null, "\u4E14")), !props.onlyAnd && /*#__PURE__*/React.createElement("div", {
40
40
  className: "".concat(classPrefix, "-operate-text ").concat(relation === 'or' ? 'active' : '')
41
- }, /*#__PURE__*/React.createElement("span", null, "\u6216")))) : null, /*#__PURE__*/React.createElement(Space, {
42
- className: "".concat(classPrefix, "-container"),
43
- direction: "vertical"
41
+ }, /*#__PURE__*/React.createElement("span", null, "\u6216")))) : null, /*#__PURE__*/React.createElement("div", {
42
+ className: "".concat(classPrefix, "-container")
44
43
  }, conditions.map(function (item, index) {
45
- return /*#__PURE__*/React.createElement(BizAttrCondition, {
44
+ return /*#__PURE__*/React.createElement("div", {
45
+ className: "".concat(classPrefix, "-container-item")
46
+ }, /*#__PURE__*/React.createElement(BizAttrCondition, {
46
47
  key: item.key,
47
48
  value: item.data,
48
49
  eventIdList: eventIdList,
@@ -57,7 +58,7 @@ var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref)
57
58
  onDelete: function onDelete() {
58
59
  return _onDelete(index);
59
60
  }
60
- });
61
+ }));
61
62
  }))));
62
63
  });
63
64
  BizAttrConditionGroup.defaultProps = {
package/es/attrCondition/styles/index.less CHANGED
@@ -29,14 +29,22 @@
29
29
  }
30
30
  &-container {
31
31
  flex: 1;
32
- gap: 12px !important;
33
32
  width: 100%;
33
+ max-width: calc(100% + 33px);
34
+ margin-left: -33px;
35
+
36
+ &-item {
37
+ padding: 4px 0 4px 48px;
38
+ &:hover {
39
+ background: #e8efff;
40
+ }
41
+ }
34
42
  }
35
43
  &-handle {
36
44
  position: relative;
37
45
  width: 1px;
38
- margin-right: 20px;
39
- margin-left: 8px;
46
+ margin-right: 0;
47
+ margin-left: 32px;
40
48
  background: @border-color-base;
41
49
  }
42
50
  &-operate {
package/es/userGroup/styles/index.less CHANGED
@@ -8,6 +8,7 @@
8
8
  .__select-handle();
9
9
  display: flex;
10
10
  flex-direction: row;
11
+ align-items: center;
11
12
  width: 100%;
12
13
  min-height: @height-base;
13
14
  padding: 4px 4px 4px 12px;
@@ -50,6 +51,8 @@
50
51
  display: none;
51
52
  flex: none;
52
53
  width: 16px;
54
+ max-height: 24px;
55
+ margin-left: 6px;
53
56
  text-align: center;
54
57
  border-radius: @border-radius-small;
55
58
  &:hover {
package/es/userGroupHeader/demo/index.js CHANGED
@@ -11,7 +11,7 @@ export default (function () {
11
11
  }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
12
12
  max: 3,
13
13
  enableTags: true,
14
- value: [['4061:679558480527360'], 786, 758],
14
+ value: [['4077:685001635528704'], 836, 837],
15
15
  onChange: function onChange(value) {
16
16
  console.log('>>>>>>>>回传值', value);
17
17
  }
package/es/userGroupHeader/index.js CHANGED
@@ -10,7 +10,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
10
10
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
11
11
  import React, { useEffect } from 'react';
12
12
  import './styles/index.less';
13
- import { Space } from 'antd';
13
+ import { Space, Tooltip } from 'antd';
14
14
  import BizUserGroup from '../userGroup';
15
15
  import IconFont from '../icon/iconFont';
16
16
  import _ from 'lodash';
@@ -22,16 +22,8 @@ var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
22
22
  var classPrefix = 'biz-user-group-header';
23
23
  var _React$useState = React.useState([]),
24
24
  _React$useState2 = _slicedToArray(_React$useState, 2),
25
- groupList = _React$useState2[0],
26
- setGroupList = _React$useState2[1];
27
- var _React$useState3 = React.useState([]),
28
- _React$useState4 = _slicedToArray(_React$useState3, 2),
29
- tempValue = _React$useState4[0],
30
- setTempValue = _React$useState4[1];
31
- var _React$useState5 = React.useState(false),
32
- _React$useState6 = _slicedToArray(_React$useState5, 2),
33
- showBtn = _React$useState6[0],
34
- setShowBtn = _React$useState6[1];
25
+ tempValue = _React$useState2[0],
26
+ setTempValue = _React$useState2[1];
35
27
  useEffect(function () {
36
28
  var defaultValue = (value === null || value === void 0 ? void 0 : value.map(function (item) {
37
29
  return {
@@ -41,22 +33,14 @@ var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
41
33
  })) || [{
42
34
  id: Math.random().toString()
43
35
  }];
44
- setGroupList(defaultValue);
45
36
  setTempValue(_.cloneDeep(defaultValue));
46
37
  }, []);
47
38
  useEffect(function () {
48
39
  if (!onChange) return;
49
- onChange(groupList.map(function (item) {
40
+ onChange(tempValue.map(function (item) {
50
41
  return item.value;
51
42
  }));
52
- }, [groupList]);
53
- useEffect(function () {
54
- setShowBtn(!_.isEqual(groupList.map(function (item) {
55
- return item.value;
56
- }), tempValue.map(function (item) {
57
- return item.value;
58
- })));
59
- }, [groupList, tempValue]);
43
+ }, [tempValue]);
60
44
  function onAdd() {
61
45
  if (max && tempValue.length >= max) return;
62
46
  var list = _toConsumableArray(tempValue);
@@ -65,32 +49,13 @@ var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
65
49
  });
66
50
  setTempValue(list);
67
51
  }
68
- function onSure() {
69
- setGroupList(_.cloneDeep(tempValue));
70
- }
71
- function onCancel() {
72
- setTempValue(_.cloneDeep(groupList).map(function (item) {
73
- item.id = Math.random().toString();
74
- return item;
75
- }));
76
- }
77
52
  return /*#__PURE__*/React.createElement("div", {
78
53
  className: classPrefix
79
- }, /*#__PURE__*/React.createElement(Space, {
80
- direction: "vertical",
81
- size: 12
82
- }, /*#__PURE__*/React.createElement(Space, {
83
- size: 16
84
- }, /*#__PURE__*/React.createElement("label", {
54
+ }, /*#__PURE__*/React.createElement("div", {
85
55
  className: "".concat(classPrefix, "-title")
86
- }, "\u5206\u6790\u7528\u6237\u7FA4"), showBtn && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("a", {
87
- className: "".concat(classPrefix, "-sure"),
88
- onClick: onSure
89
- }, "\u786E\u5B9A"), /*#__PURE__*/React.createElement("a", {
90
- className: "".concat(classPrefix, "-cancel"),
91
- onClick: onCancel
92
- }, "\u53D6\u6D88"))), /*#__PURE__*/React.createElement(Space, {
93
- size: 16
56
+ }, "\u5206\u6790\u7528\u6237\u7FA4"), /*#__PURE__*/React.createElement(Space, {
57
+ size: 16,
58
+ className: "".concat(classPrefix, "-container")
94
59
  }, [tempValue.map(function (item, i) {
95
60
  return /*#__PURE__*/React.createElement(BizUserGroup, {
96
61
  key: item.id,
@@ -108,7 +73,9 @@ var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
108
73
  setTempValue(list);
109
74
  }
110
75
  });
111
- })], /*#__PURE__*/React.createElement(IconFont, {
76
+ })], /*#__PURE__*/React.createElement(Tooltip, {
77
+ title: "\u6DFB\u52A0\u7528\u6237\u7FA4\u505A\u5BF9\u6BD4"
78
+ }, /*#__PURE__*/React.createElement(IconFont, {
112
79
  type: "tianjia",
113
80
  className: "".concat(classPrefix, "-add ").concat(max && tempValue.length >= max ? 'disabled' : ''),
114
81
  onClick: onAdd
package/es/userGroupHeader/styles/index.less CHANGED
@@ -1,21 +1,16 @@
1
1
  @import '../../assets/styles/inner.less';
2
2
  .biz-user-group-header {
3
- padding: 6px @margin-lg;
4
3
  background: #fff;
5
4
  &-title {
5
+ margin-bottom: @margin-xs;
6
+ padding-left: @padding-lg;
6
7
  color: @text-color-secondary;
7
8
  font-weight: 500;
8
9
  }
9
- &-sure {
10
- display: none;
11
- color: @primary-color;
12
- }
13
- &-cancel {
14
- display: none;
15
- color: @text-color-secondary;
16
- }
10
+
17
11
  &-add {
18
12
  color: @primary-color;
13
+ font-size: 20px !important;
19
14
  cursor: pointer;
20
15
  &.disabled {
21
16
  display: none;
@@ -24,11 +19,12 @@
24
19
  .biz-user {
25
20
  width: 208px;
26
21
  }
27
- &:hover {
28
- background: #e8efff;
29
- .biz-user-group-header-sure,
30
- .biz-user-group-header-cancel {
31
- display: inline-block;
22
+ &-container {
23
+ width: 100%;
24
+ padding: @padding-xss @padding-lg;
25
+
26
+ &:hover {
27
+ background: #e8efff;
32
28
  }
33
29
  }
34
30
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/business-lib",
3
- "version": "1.1.82-user.4",
3
+ "version": "1.1.82-user.6",
4
4
  "module": "es/index.js",
5
5
  "typings": "es/index.d.ts",
6
6
  "files": [
@@ -55,7 +55,7 @@
55
55
  "react": "^16.12.0 || ^17.0.0",
56
56
  "yorkie": "^2.0.0"
57
57
  },
58
- "gitHead": "b7fe45b6a2a770e850361bd6e4e7b0b868a18c5e",
58
+ "gitHead": "5ff173c3100a4eeed675f1933a97859b354d5ed5",
59
59
  "gitHooks": {
60
60
  "pre-commit": "lint-staged"
61
61
  }