@zgfe/business-lib 1.0.15-user.10 → 1.0.15-user.11

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.
@@ -20,6 +20,7 @@
20
20
  }
21
21
  }
22
22
  &-today {
23
+ margin-left: @margin-xs;
23
24
  white-space: nowrap;
24
25
  }
25
26
  }
@@ -1,10 +1,12 @@
1
1
  @import '../../../assets/styles/variable.less';
2
2
  .biz-user-condition-tags-condition {
3
3
  display: flex;
4
- &-label,
5
- &-value {
4
+ &-label {
6
5
  margin-right: @margin-xs;
7
6
  }
7
+ &-value {
8
+ margin-left: @margin-xs;
9
+ }
8
10
  &-label {
9
11
  line-height: 40px;
10
12
  }
@@ -78,17 +78,6 @@ var TagsCondition = function TagsCondition(props) {
78
78
  }, /*#__PURE__*/React.createElement("div", {
79
79
  className: "".concat(classPrefix, "-tags-condition-label")
80
80
  }, "\u7528\u6237\u6807\u7B7E"), /*#__PURE__*/React.createElement("div", {
81
- className: "".concat(classPrefix, "-tags-condition-value")
82
- }, /*#__PURE__*/React.createElement(BizUserTagsSelect, {
83
- defaultValue: defaultValues,
84
- data: userTagsData,
85
- childFields: ['children'],
86
- keyFields: ['labelGroup', 'labelId'],
87
- labelFields: ['labelGroup', 'labelName'],
88
- valueFields: ['labelGroup', 'labelId'],
89
- onChange: onTagsChange,
90
- destroyPopupOnHide: true
91
- })), /*#__PURE__*/React.createElement("div", {
92
81
  className: "".concat(classPrefix, "-tags-condition-operator")
93
82
  }, /*#__PURE__*/React.createElement(BizSelect, {
94
83
  options: options,
@@ -99,6 +88,17 @@ var TagsCondition = function TagsCondition(props) {
99
88
  text: operatorMap[labels.operator]
100
89
  },
101
90
  onChange: onOperatorChange
91
+ })), /*#__PURE__*/React.createElement("div", {
92
+ className: "".concat(classPrefix, "-tags-condition-value")
93
+ }, /*#__PURE__*/React.createElement(BizUserTagsSelect, {
94
+ defaultValue: defaultValues,
95
+ data: userTagsData,
96
+ childFields: ['children'],
97
+ keyFields: ['labelGroup', 'labelId'],
98
+ labelFields: ['labelGroup', 'labelName'],
99
+ valueFields: ['labelGroup', 'labelId'],
100
+ onChange: onTagsChange,
101
+ destroyPopupOnHide: true
102
102
  })), /*#__PURE__*/React.createElement("div", {
103
103
  className: "".concat(classPrefix, "-tags-condition-unit")
104
104
  }));
@@ -12,6 +12,7 @@
12
12
  flex-wrap: wrap;
13
13
  min-width: 0;
14
14
  margin-bottom: 0;
15
+ line-height: 32px;
15
16
  border: none;
16
17
  .biz-user-condition-and-desc {
17
18
  margin: 0 @margin-xs;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/business-lib",
3
- "version": "1.0.15-user.10",
3
+ "version": "1.0.15-user.11",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
@@ -53,7 +53,7 @@
53
53
  "@types/qs": "^6.9.7",
54
54
  "@umijs/fabric": "^2.8.1",
55
55
  "@umijs/test": "^3.0.5",
56
- "@zgfe/business-lib": "^1.0.15-user.10",
56
+ "@zgfe/business-lib": "^1.0.15-user.11",
57
57
  "antd": "^4.19.2",
58
58
  "dumi": "^1.1.0",
59
59
  "father-build": "^1.17.2",
@@ -62,5 +62,5 @@
62
62
  "prettier": "^2.2.1",
63
63
  "yorkie": "^2.0.0"
64
64
  },
65
- "gitHead": "2ab0769309e533bb40620be5c21f6cfa682a3f6b"
65
+ "gitHead": "e5b9aaca67bcf5e284c50782add6154562165999"
66
66
  }