@zgfe/business-lib 1.0.22-bugfix.1 → 1.0.22-bugfix.2
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/es/attrConditions/components/operateList.js +1 -0
- package/es/attrConditions/components/valuesList.js +3 -0
- package/es/eventSelector/index.js +3 -1
- package/es/eventSelector/types.d.ts +2 -0
- package/es/select/index.js +1 -1
- package/es/userCondition/conditions/periodCondition.js +3 -2
- package/es/userCondition/conditions/runTimesCondition.js +2 -1
- package/es/userCondition/conditions/styles/eventCondition.less +1 -1
- package/es/userCondition/conditions/styles/propCondition.less +2 -2
- package/es/userCondition/styles/index.less +0 -7
- package/package.json +2 -2
|
@@ -120,6 +120,7 @@ var ValuesList = function ValuesList(props) {
|
|
|
120
120
|
disable: true,
|
|
121
121
|
className: "".concat(classPrefix, "-multi-select"),
|
|
122
122
|
theme: theme,
|
|
123
|
+
size: "middle",
|
|
123
124
|
options: []
|
|
124
125
|
});
|
|
125
126
|
}
|
|
@@ -139,6 +140,7 @@ var ValuesList = function ValuesList(props) {
|
|
|
139
140
|
},
|
|
140
141
|
keyField: "value",
|
|
141
142
|
labelField: "label",
|
|
143
|
+
size: "middle",
|
|
142
144
|
theme: props.theme,
|
|
143
145
|
className: "".concat(classPrefix, "-input-select"),
|
|
144
146
|
onChange: onChangeUnit,
|
|
@@ -151,6 +153,7 @@ var ValuesList = function ValuesList(props) {
|
|
|
151
153
|
value: current && current.length ? current[0] : '',
|
|
152
154
|
placeholder: "\u8BF7\u8F93\u5165",
|
|
153
155
|
type: "number",
|
|
156
|
+
size: "middle",
|
|
154
157
|
onChange: onChangeNumber,
|
|
155
158
|
suffix: attr.propCategory === 'userProp' && attr.subtype === 1 ? '%' : null
|
|
156
159
|
}), attr.propCategory === 'userProp' && attr.subtype === 2 && numberAfter);
|
|
@@ -151,7 +151,8 @@ var BizEventSelector = function BizEventSelector(props) {
|
|
|
151
151
|
theme: theme,
|
|
152
152
|
border: false,
|
|
153
153
|
label: getLabel(),
|
|
154
|
-
placeholder: placeholder
|
|
154
|
+
placeholder: placeholder,
|
|
155
|
+
size: props.size
|
|
155
156
|
}))));
|
|
156
157
|
};
|
|
157
158
|
|
|
@@ -161,6 +162,7 @@ BizEventSelector.defaultProps = {
|
|
|
161
162
|
popupContainer: true,
|
|
162
163
|
border: true,
|
|
163
164
|
theme: 'secondary',
|
|
165
|
+
size: 'middle',
|
|
164
166
|
destroyPopupOnHide: false
|
|
165
167
|
};
|
|
166
168
|
export default BizEventSelector;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { SizeType } from 'antd/es/config-provider/SizeContext';
|
|
1
2
|
import { AnalysisEvent, EventGroup } from '../attributeSelector/types';
|
|
2
3
|
export declare namespace EventSelectTypes {
|
|
3
4
|
interface Value {
|
|
@@ -25,6 +26,7 @@ export declare namespace EventSelectTypes {
|
|
|
25
26
|
onVisibleChange?: (visible: boolean) => void;
|
|
26
27
|
border?: boolean;
|
|
27
28
|
theme?: string;
|
|
29
|
+
size?: SizeType;
|
|
28
30
|
destroyPopupOnHide?: boolean;
|
|
29
31
|
onChange?: (val: Value) => void;
|
|
30
32
|
}
|
package/es/select/index.js
CHANGED
|
@@ -182,7 +182,7 @@ var BizSelect = function BizSelect(props) {
|
|
|
182
182
|
disable: props.disable,
|
|
183
183
|
multiple: props.multiple,
|
|
184
184
|
theme: props.theme,
|
|
185
|
-
size: props.size,
|
|
185
|
+
size: props.size || 'middle',
|
|
186
186
|
border: props.border,
|
|
187
187
|
onDelete: onDelete,
|
|
188
188
|
onSearch: function onSearch(v) {
|
|
@@ -107,7 +107,7 @@ var PeriodCondition = function PeriodCondition(props) {
|
|
|
107
107
|
|
|
108
108
|
if (operator === 'relative' || operator === 'join_time') {
|
|
109
109
|
return /*#__PURE__*/React.createElement(Input, {
|
|
110
|
-
size: "
|
|
110
|
+
size: "middle",
|
|
111
111
|
value: values[0],
|
|
112
112
|
onChange: onDateChange,
|
|
113
113
|
style: {
|
|
@@ -118,7 +118,7 @@ var PeriodCondition = function PeriodCondition(props) {
|
|
|
118
118
|
|
|
119
119
|
if (operator === 'absolute') {
|
|
120
120
|
return /*#__PURE__*/React.createElement(RangePicker, {
|
|
121
|
-
size: "
|
|
121
|
+
size: "middle",
|
|
122
122
|
defaultValue: [moment(values[0]), moment(values[1])],
|
|
123
123
|
onChange: onDateChange,
|
|
124
124
|
allowClear: false
|
|
@@ -142,6 +142,7 @@ var PeriodCondition = function PeriodCondition(props) {
|
|
|
142
142
|
options: options,
|
|
143
143
|
labelField: "text",
|
|
144
144
|
keyField: "value",
|
|
145
|
+
size: "middle",
|
|
145
146
|
value: {
|
|
146
147
|
value: runPeriod.operator,
|
|
147
148
|
text: operatorMap[runPeriod.operator]
|
|
@@ -59,11 +59,12 @@ var RunTimesCondition = function RunTimesCondition(props) {
|
|
|
59
59
|
value: runTimes.operator,
|
|
60
60
|
text: runTimes.operator === 'not equal' ? '≠' : runTimes.operator
|
|
61
61
|
},
|
|
62
|
+
size: "middle",
|
|
62
63
|
onChange: onOperatorChange
|
|
63
64
|
})), /*#__PURE__*/React.createElement("div", {
|
|
64
65
|
className: "".concat(classPrefix, "-runtimes-condition-value")
|
|
65
66
|
}, /*#__PURE__*/React.createElement(Input, {
|
|
66
|
-
size: "
|
|
67
|
+
size: "middle",
|
|
67
68
|
value: runTimes.values[0],
|
|
68
69
|
onChange: onValueChange
|
|
69
70
|
})), /*#__PURE__*/React.createElement("div", {
|
|
@@ -22,12 +22,5 @@
|
|
|
22
22
|
.biz-user-condition-and-conditions-empty {
|
|
23
23
|
margin-bottom: 0;
|
|
24
24
|
}
|
|
25
|
-
.biz-select-handle-input-multiple {
|
|
26
|
-
min-height: 40px;
|
|
27
|
-
padding: calc(@margin-xs - 2px) @margin-xs calc(@margin-xs - 2px) @margin-sm;
|
|
28
|
-
.biz-select-handle-holder {
|
|
29
|
-
line-height: 28px;
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
25
|
}
|
|
33
26
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/business-lib",
|
|
3
|
-
"version": "1.0.22-bugfix.
|
|
3
|
+
"version": "1.0.22-bugfix.2",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"start": "dumi dev",
|
|
6
6
|
"docs:build": "dumi build",
|
|
@@ -58,5 +58,5 @@
|
|
|
58
58
|
"react": "^16.12.0 || ^17.0.0",
|
|
59
59
|
"yorkie": "^2.0.0"
|
|
60
60
|
},
|
|
61
|
-
"gitHead": "
|
|
61
|
+
"gitHead": "f3ea834dcbec8fbd66d0a595a0af520dad61d225"
|
|
62
62
|
}
|