@zgfe/modules-interval 1.0.3-alpha.14 → 1.0.3-alpha.16

package/dist/esm/components/eventFilter/index.js

@@ -12,7 +12,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Switch, Tooltip, message } from 'antd';
 import React, { useEffect, useRef, useState } from 'react';
-import { BizEventSelector, IconFont, BizAttrConditionGroup, useChanged } from '@zgfe/business-lib';
+import { BizEventSelector, IconFont, BizAttrConditionGroup } from '@zgfe/business-lib';
 import "./styles/index.less";
 import _ from 'lodash';
 var classPrefix = 'interval-box';
@@ -59,7 +59,7 @@ var EventFilter = function EventFilter(props) {
     setBizAttributeSelectorValue = _useState14[1];
 
   // 初始化
-  useChanged(function () {
+  useEffect(function () {
     if (props.value) {
       var _data = props.value;
       if (_data && _data.id) {
@@ -80,17 +80,8 @@ var EventFilter = function EventFilter(props) {
           key: _data.dimension.propCategory === 'eventProp' ? _data.dimension.value : _data.dimension.propCategory + '-' + _data.dimension.value
         }));
       }
-    } else {
-      setEvent({
-        id: null,
-        name: ''
-      });
-      setEventOverview(false);
-      setFilter(undefined);
-      setBizAttributeSelectorValue(undefined);
-      setRelevancy(false);
     }
-  }, props.value);
+  }, []);
 
   // 添加筛选
   var onAdd = function onAdd() {
@@ -207,7 +198,7 @@ var EventFilter = function EventFilter(props) {
     ref: conditionRef,
     value: filter,
     enableEventProp: true,
-    enableUserProp: props.subject ? false : true,
+    enableUserProp: props.analysisType === 'user',
     enableDelete: true,
     eventIdList: [event.id],
     onChange: onChangeFilters,

package/dist/esm/components/eventFilter/types.d.ts

@@ -50,5 +50,6 @@ export interface EventFilterProps {
     relevancyFl?: boolean;
     relevancy?: boolean;
     subject?: SubjectTypes.Subject;
+    analysisType?: 'user' | 'eventProp';
     onChange?: (event: eventProps) => {};
 }

package/dist/esm/modules/content/index.js

@@ -56,14 +56,10 @@ var EventContent = function EventContent(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     isCity = _useState12[0],
     setIsCity = _useState12[1];
-  var _useState13 = useState(false),
+  var _useState13 = useState(-1),
     _useState14 = _slicedToArray(_useState13, 2),
-    ajaxFlag = _useState14[0],
-    setAjaxFlag = _useState14[1];
-  var _useState15 = useState(-1),
-    _useState16 = _slicedToArray(_useState15, 2),
-    eventId = _useState16[0],
-    setEventId = _useState16[1];
+    eventId = _useState14[0],
+    setEventId = _useState14[1];
   var _useContext2 = useContext(IntervalContext),
     searchData = _useContext2.searchData,
     setSearchData = _useContext2.setSearchData,
@@ -72,11 +68,17 @@ var EventContent = function EventContent(props) {
     userPropList = _useContext2.userPropList;
   var _useContext3 = useContext(BizTargetFromPanelContext),
     handleSearch = _useContext3.handleSearch;
+  var _useState15 = useState(),
+    _useState16 = _slicedToArray(_useState15, 2),
+    searchTimer = _useState16[0],
+    setSearchTimer = _useState16[1];
   var collapseRef = useRef();
   // 初始化
   useEffect(function () {
     if (props.defaultValue) {
       setEventId(props.defaultValue.id);
+    } else {
+      setLoading(false);
     }
   }, [props.defaultValue]);
   useEffect(function () {
@@ -89,42 +91,27 @@ var EventContent = function EventContent(props) {
       }
     }
     if (!searchData || !searchData.analysisModel) return;
-    if (timer) clearTimeout(timer);
-    var flag = true;
-    timer = setTimeout(function () {
-      if (flag) {
-        fetchRequest(false);
-      }
-    }, 500);
+    if (searchTimer) clearTimeout(searchTimer);
+    setSearchTimer(setTimeout(function () {
+      fetchRequest();
+    }, 300));
     return function () {
-      // 清理异步任务
-      if (timer) clearTimeout(timer);
-      flag = false;
+      clearTimeout(searchTimer);
     };
   }, [searchData]);
   useEffect(function () {
     handleSearch && handleSearch(loading);
   }, [loading]);
-  useEffect(function () {
-    if (ajaxFlag) {
-      fetchRequest(true);
-    }
-  }, [ajaxFlag]);
+
   // 查询
-  var fetchRequest = function fetchRequest(flag) {
+  var fetchRequest = function fetchRequest() {
     var _searchData$start, _searchData$end, _searchData$associate, _searchData$associate2, _searchData$associate3;
-    if (flag !== undefined) setAjaxFlag(flag);
-    if (!ajaxFlag) return;
     if ((searchData === null || searchData === void 0 ? void 0 : (_searchData$start = searchData.start) === null || _searchData$start === void 0 ? void 0 : _searchData$start.id) === null || (searchData === null || searchData === void 0 ? void 0 : (_searchData$end = searchData.end) === null || _searchData$end === void 0 ? void 0 : _searchData$end.id) === null) {
       setLoading(false);
       return;
     }
     setEventData(undefined);
     setLoading(true);
-    // 取消上次未完成的请求
-    // if (typeof cancel === 'function') {
-    //   cancel();
-    // }
     if (searchData !== null && searchData !== void 0 && (_searchData$associate = searchData.associatedNextAttr) !== null && _searchData$associate !== void 0 && _searchData$associate.type && (searchData === null || searchData === void 0 ? void 0 : (_searchData$associate2 = searchData.associatedPreAttr) === null || _searchData$associate2 === void 0 ? void 0 : _searchData$associate2.type) !== (searchData === null || searchData === void 0 ? void 0 : (_searchData$associate3 = searchData.associatedNextAttr) === null || _searchData$associate3 === void 0 ? void 0 : _searchData$associate3.type)) {
       setLoading(false);
       return message.error('您查询的属性不一致，暂不支持查询');
@@ -160,7 +147,6 @@ var EventContent = function EventContent(props) {
     setSearchData(function (value) {
       return _objectSpread(_objectSpread({}, value), data);
     });
-    setAjaxFlag(true);
   };
 
   // 改变显示内容
@@ -175,9 +161,6 @@ var EventContent = function EventContent(props) {
         platform: data
       });
     });
-    setTimeout(function () {
-      setAjaxFlag(true);
-    }, 100);
   };
 
   // TopPanel组件数值变更
@@ -189,7 +172,6 @@ var EventContent = function EventContent(props) {
         analysisSubject: data.analysisSubject ? data.analysisSubject : undefined
       });
     });
-    setAjaxFlag(false);
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TopBar, {
     searchData: searchData,
@@ -206,10 +188,8 @@ var EventContent = function EventContent(props) {
       collapseRef: collapseRef,
       onChange: onChangeSearch,
       defaultValue: searchData,
-      ajaxFlag: ajaxFlag,
       loading: loading,
-      finalSearchData: finalSearchData,
-      fetchRequest: fetchRequest
+      finalSearchData: finalSearchData
     })
   }, /*#__PURE__*/React.createElement("div", {
     className: classPrefix

package/dist/esm/modules/topPanel/index.js

@@ -19,12 +19,11 @@ import { AnalysisMode } from "./types";
 import { IntervalContext } from "../../types";
 var classPrefix = 'top-panel-interval';
 var TopPanel = function TopPanel(props) {
-  var _props$defaultValue, _props$defaultValue2, _props$defaultValue3, _defaultValue$associa, _defaultValue$associa2, _finalSearchData$asso, _finalSearchData$asso2, _defaultValue$associa3, _finalSearchData$asso3, _defaultValue$associa4, _finalSearchData$asso4, _defaultValue$associa5, _finalSearchData$asso5, _defaultValue$associa6, _finalSearchData$asso6, _defaultValue$associa7, _finalSearchData$asso7, _defaultValue$associa8, _finalSearchData$asso8, _defaultValue$associa9, _finalSearchData$asso9, _defaultValue$associa10, _finalSearchData$asso10, _defaultValue$dimensi, _finalSearchData$dime, _defaultValue$dimensi2, _finalSearchData$dime2, _defaultValue$dimensi3, _finalSearchData$dime3, _defaultValue$dimensi4, _finalSearchData$dime4;
+  var _props$defaultValue, _props$defaultValue2, _props$defaultValue3, _defaultValue$associa, _defaultValue$associa2, _finalSearchData$asso, _finalSearchData$asso2, _defaultValue$associa3, _finalSearchData$asso3, _defaultValue$associa4, _finalSearchData$asso4, _defaultValue$associa5, _finalSearchData$asso5, _defaultValue$associa6, _finalSearchData$asso6, _defaultValue$associa7, _finalSearchData$asso7, _defaultValue$associa8, _finalSearchData$asso8, _defaultValue$associa9, _finalSearchData$asso9, _defaultValue$associa10, _finalSearchData$asso10, _defaultValue$dimensi, _finalSearchData$dime, _defaultValue$dimensi2, _finalSearchData$dime2, _defaultValue$dimensi3, _finalSearchData$dime3, _defaultValue$dimensi4, _finalSearchData$dime4, _currentParams$start2, _currentParams$end2, _currentParams$start3, _currentParams$end3;
   var defaultValue = props.defaultValue,
     loading = props.loading,
     collapseRef = props.collapseRef,
-    finalSearchData = props.finalSearchData,
-    fetchRequest = props.fetchRequest;
+    finalSearchData = props.finalSearchData;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -69,6 +68,14 @@ var TopPanel = function TopPanel(props) {
     _useState16 = _slicedToArray(_useState15, 2),
     inited = _useState16[0],
     setInited = _useState16[1];
+  var _useState17 = useState(),
+    _useState18 = _slicedToArray(_useState17, 2),
+    currentParams = _useState18[0],
+    setCurrentParams = _useState18[1];
+  var _useState19 = useState(true),
+    _useState20 = _slicedToArray(_useState19, 2),
+    searchDisabled = _useState20[0],
+    setSearchDisabled = _useState20[1];
   // 用户组和事件变更
   var onValuesChange = function onValuesChange(data, allData) {
     var _data = {};
@@ -95,15 +102,36 @@ var TopPanel = function TopPanel(props) {
       _data.userGroup = allData.userGroup;
       if (_data.userGroup.length <= 0) _data.userGroup = [0];
     }
-    props.onChange(_objectSpread(_objectSpread({}, allData), {}, {
+    setCurrentParams(_objectSpread(_objectSpread({}, allData), {}, {
       analysisSubject: allData.analysisSubject ? {
         subjectId: allData.analysisSubject.id,
         subjectName: allData.analysisSubject.subjectName,
         subjectAlias: allData.analysisSubject.subjectAlias,
         unit: allData.analysisSubject.unit
       } : undefined
-    }), (finalSearchData === null || finalSearchData === void 0 ? void 0 : finalSearchData.chartType) === 'boxplot' ? true : false);
+    }));
   };
+  useEffect(function () {
+    var _currentParams$start, _currentParams$start$, _currentParams$start$2, _currentParams$end, _currentParams$end$fi, _currentParams$end$fi2;
+    var conditionValid = true;
+    currentParams === null || currentParams === void 0 ? void 0 : (_currentParams$start = currentParams.start) === null || _currentParams$start === void 0 ? void 0 : (_currentParams$start$ = _currentParams$start.filters) === null || _currentParams$start$ === void 0 ? void 0 : (_currentParams$start$2 = _currentParams$start$.conditions) === null || _currentParams$start$2 === void 0 ? void 0 : _currentParams$start$2.forEach(function (item) {
+      var _item$values;
+      if (!/null/.test(item.operator || '') && !((_item$values = item.values) !== null && _item$values !== void 0 && _item$values.length)) {
+        conditionValid = false;
+      }
+    });
+    currentParams === null || currentParams === void 0 ? void 0 : (_currentParams$end = currentParams.end) === null || _currentParams$end === void 0 ? void 0 : (_currentParams$end$fi = _currentParams$end.filters) === null || _currentParams$end$fi === void 0 ? void 0 : (_currentParams$end$fi2 = _currentParams$end$fi.conditions) === null || _currentParams$end$fi2 === void 0 ? void 0 : _currentParams$end$fi2.forEach(function (item) {
+      var _item$values2;
+      if (!/null/.test(item.operator || '') && !((_item$values2 = item.values) !== null && _item$values2 !== void 0 && _item$values2.length)) {
+        conditionValid = false;
+      }
+    });
+    if (loading || !(currentParams !== null && currentParams !== void 0 && currentParams.start) || !(currentParams !== null && currentParams !== void 0 && currentParams.start.id) || !(currentParams !== null && currentParams !== void 0 && currentParams.end) || !(currentParams !== null && currentParams !== void 0 && currentParams.end.id) || !conditionValid || relevancy && !(currentParams !== null && currentParams !== void 0 && currentParams.associatedNextAttr) && !(currentParams !== null && currentParams !== void 0 && currentParams.associatedNextAttr) || analysisType === 'eventProp' && !currentSubject) {
+      setSearchDisabled(true);
+    } else {
+      setSearchDisabled(false);
+    }
+  }, [currentParams]);
   var resetting = function resetting() {
     form.resetFields();
     form.setFieldsValue({
@@ -249,6 +277,7 @@ var TopPanel = function TopPanel(props) {
     keyField: "id",
     onChange: function onChange(val) {
       setCurrentSubject(val);
+      setRelevancy(false);
       form.setFieldsValue({
         start: undefined,
         end: undefined
@@ -274,7 +303,8 @@ var TopPanel = function TopPanel(props) {
     subject: currentSubject,
     relevancyFl: relevancyFl,
     relevancy: true,
-    key: "begin"
+    key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
+    analysisType: analysisType
   })), relevancy ? /*#__PURE__*/React.createElement(Form.Item, {
     className: "associated"
   }, /*#__PURE__*/React.createElement("span", {
@@ -300,6 +330,7 @@ var TopPanel = function TopPanel(props) {
     value: bizAttributeSelectorValue,
     enableDelete: true,
     onChange: onChangeAttr,
+    key: "".concat(currentParams === null || currentParams === void 0 ? void 0 : (_currentParams$start2 = currentParams.start) === null || _currentParams$start2 === void 0 ? void 0 : _currentParams$start2.id, "-").concat(currentParams === null || currentParams === void 0 ? void 0 : (_currentParams$end2 = currentParams.end) === null || _currentParams$end2 === void 0 ? void 0 : _currentParams$end2.id, "-pre"),
     onDelete: function onDelete() {
       onChangeAttr(undefined, 'associatedPreAttr');
     }
@@ -318,6 +349,7 @@ var TopPanel = function TopPanel(props) {
     value: bizAttributeSelectorValue,
     enableDelete: true,
     onChange: onChangeAttr,
+    key: "".concat(currentParams === null || currentParams === void 0 ? void 0 : (_currentParams$start3 = currentParams.start) === null || _currentParams$start3 === void 0 ? void 0 : _currentParams$start3.id, "-").concat(currentParams === null || currentParams === void 0 ? void 0 : (_currentParams$end3 = currentParams.end) === null || _currentParams$end3 === void 0 ? void 0 : _currentParams$end3.id, "-next"),
     onDelete: function onDelete() {
       onChangeAttr(undefined, 'associatedNextAttr');
     }
@@ -339,7 +371,8 @@ var TopPanel = function TopPanel(props) {
     name: "end"
   }, /*#__PURE__*/React.createElement(EventFilter, {
     subject: currentSubject,
-    key: "end"
+    analysisType: analysisType,
+    key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start")
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u6309\u5C5E\u6027\u7EC6\u5206",
     name: "dimension",
@@ -348,6 +381,7 @@ var TopPanel = function TopPanel(props) {
     enableEventProp: true,
     enableUserProp: analysisType === 'user',
     enableEnvProp: true,
+    key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-dimension"),
     eventIdList: startId === endId ? [startId] : [startId, endId],
     value: bizAttributeSelectorValue,
     enableDelete: true,
@@ -369,10 +403,10 @@ var TopPanel = function TopPanel(props) {
     onClick: resetting
   }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
     loading: loading || subjectLoading,
-    disabled: loading || !startId || !endId || relevancy && !(defaultValue !== null && defaultValue !== void 0 && defaultValue.associatedNextAttr) && !(defaultValue !== null && defaultValue !== void 0 && defaultValue.associatedNextAttr),
+    disabled: searchDisabled,
     type: "primary",
     onClick: function onClick() {
-      fetchRequest(true);
+      props.onChange(currentParams, (finalSearchData === null || finalSearchData === void 0 ? void 0 : finalSearchData.chartType) === 'boxplot' ? true : false);
     }
   }, "\u67E5\u8BE2"))));
 };

package/dist/esm/modules/topPanel/styles/index.less

@@ -19,13 +19,13 @@
 .panel-form-interval {
   &-item {
     .ant-form-item-label {
-      padding-left: 24px;
+      padding-left: 24px !important;
       font-weight: 500;
     }
     .ant-form-item-control-input-content {
       height: 40px;
-      padding: 0 24px;
-      line-height: 40px;
+      padding: 0 24px !important;
+      line-height: 40px !important;
       .biz-select-handle {
         display: inline-block;
         width: 208px;

package/dist/esm/modules/topPanel/types.d.ts

@@ -47,17 +47,9 @@ export interface TopPanelProps {
      * 数据更新
      */
     onChange: (data: SearchValue, flag: boolean) => void;
-    /**
-     * 是否请求数据
-     */
-    ajaxFlag: boolean;
     /**
      * 请求后的最新查询数据
      */
     finalSearchData?: SearchValue;
-    /**
-     * 请求数据方法
-     */
-    fetchRequest: (flag?: boolean) => void;
     collapseRef?: any;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.3-alpha.14",
+  "version": "1.0.3-alpha.16",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -62,5 +62,5 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "9d0b2cc2d9ac5ff219a0d7fde2d96acb1dcfc22a"
+  "gitHead": "077b080775af77fc27177df447fbf795afd8a021"
 }