@zgfe/modules-interval 1.0.3-alpha.15 → 1.0.3-alpha.17

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

@@ -98,11 +98,11 @@ var IntervalEventChart = function IntervalEventChart(props) {
     showList: showList,
     dataSourceList: dataSourceList,
     params: params
-  }), (params === null || params === void 0 ? void 0 : params.chartType) === 'line' ? /*#__PURE__*/React.createElement(EventTable, {
+  }), /*#__PURE__*/React.createElement(EventTable, {
     dataSource: dataSource,
     searchData: params,
     showList: [],
     changeShow: onChangeShow
-  }) : null);
+  }));
 };
 export default IntervalEventChart;

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

@@ -19,7 +19,7 @@ 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,
@@ -72,6 +72,10 @@ var TopPanel = function TopPanel(props) {
     _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 = {};
@@ -107,6 +111,27 @@ var TopPanel = function TopPanel(props) {
       } : undefined
     }));
   };
+  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({
@@ -252,6 +277,7 @@ var TopPanel = function TopPanel(props) {
     keyField: "id",
     onChange: function onChange(val) {
       setCurrentSubject(val);
+      setRelevancy(false);
       form.setFieldsValue({
         start: undefined,
         end: undefined
@@ -304,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');
     }
@@ -322,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');
     }
@@ -353,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,
@@ -374,7 +403,7 @@ 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() {
       props.onChange(currentParams, (finalSearchData === null || finalSearchData === void 0 ? void 0 : finalSearchData.chartType) === 'boxplot' ? true : false);

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.3-alpha.15",
+  "version": "1.0.3-alpha.17",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -62,5 +62,5 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "814e05be1e01d7920493d203f687142e5b349c85"
+  "gitHead": "f58883f81626f6976b35134494d53fcaa5fc1ea0"
 }