@zgfe/modules-event 0.1.5-event.39 → 0.1.5-event.40
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.
|
@@ -108,9 +108,6 @@ var EventContent = function EventContent(props) {
|
|
|
108
108
|
});
|
|
109
109
|
}
|
|
110
110
|
var fetchRequest = function fetchRequest(flag) {
|
|
111
|
-
if (JSON.stringify(searchData) === JSON.stringify(finalSearchData)) {
|
|
112
|
-
return;
|
|
113
|
-
}
|
|
114
111
|
if (flag !== undefined) ajaxFlag = flag;
|
|
115
112
|
if (analysisSubjectType === 'eventProp' && !searchData.analysisSubject) return;
|
|
116
113
|
if (!ajaxFlag) return;
|
|
@@ -223,6 +220,7 @@ var EventContent = function EventContent(props) {
|
|
|
223
220
|
topPanel: /*#__PURE__*/React.createElement(TopPanel, {
|
|
224
221
|
ref: collapseRef,
|
|
225
222
|
onChange: onChangeSearch,
|
|
223
|
+
loading: loading,
|
|
226
224
|
value: searchData,
|
|
227
225
|
ajaxFlag: ajaxFlag,
|
|
228
226
|
subDisplay: subDisplay,
|
|
@@ -21,9 +21,11 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
21
21
|
var value = props.value,
|
|
22
22
|
setIsCity = props.setIsCity,
|
|
23
23
|
setEnableSelectChart = props.setEnableSelectChart,
|
|
24
|
-
subDisplay = props.subDisplay
|
|
24
|
+
subDisplay = props.subDisplay,
|
|
25
|
+
loading = props.loading;
|
|
25
26
|
var _useState = useState(false),
|
|
26
27
|
_useState2 = _slicedToArray(_useState, 2),
|
|
28
|
+
searchDisabled = _useState2[0],
|
|
27
29
|
setSearchDisabled = _useState2[1];
|
|
28
30
|
var _useState3 = useState(false),
|
|
29
31
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
@@ -171,8 +173,9 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
171
173
|
}, /*#__PURE__*/React.createElement(Button, {
|
|
172
174
|
onClick: resetting
|
|
173
175
|
}, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
|
|
174
|
-
loading: subjectLoading,
|
|
176
|
+
loading: subjectLoading || loading,
|
|
175
177
|
type: "primary",
|
|
178
|
+
disabled: searchDisabled,
|
|
176
179
|
onClick: function onClick() {
|
|
177
180
|
form.submit();
|
|
178
181
|
}
|
|
@@ -36,6 +36,7 @@ export interface FormHandelDataProps extends filterConditions {
|
|
|
36
36
|
export interface TopPanelProps {
|
|
37
37
|
value?: SearchValue;
|
|
38
38
|
onChange: (data: SearchValue, flag: boolean) => void;
|
|
39
|
+
loading?: boolean;
|
|
39
40
|
ajaxFlag: boolean;
|
|
40
41
|
subDisplay?: boolean;
|
|
41
42
|
finalSearchData?: SearchValue;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/modules-event",
|
|
3
|
-
"version": "0.1.5-event.
|
|
3
|
+
"version": "0.1.5-event.40",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"start": "dumi dev",
|
|
6
6
|
"docs:build": "dumi build",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@types/lodash": "^4.14.191",
|
|
37
37
|
"@umijs/fabric": "^2.8.1",
|
|
38
38
|
"@umijs/test": "^3.0.5",
|
|
39
|
-
"@zgfe/business-lib": "1.1.89-qirui.
|
|
39
|
+
"@zgfe/business-lib": "1.1.89-qirui.19",
|
|
40
40
|
"antd": "^4.22.6",
|
|
41
41
|
"dumi": "^1.1.0",
|
|
42
42
|
"echarts": "^5.3.2",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"react": "^16.12.0 || ^17.0.0",
|
|
50
50
|
"yorkie": "^2.0.0"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "c8ed08aabd48535f2fe57a395f83068e76fa34cc",
|
|
53
53
|
"dependencies": {
|
|
54
54
|
"react-copy-to-clipboard": "^5.1.0",
|
|
55
55
|
"react-highlight": "^0.15.0"
|