@zgfe/modules-interval 1.0.0-interval.36 → 1.0.0-interval.38

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

@@ -26,7 +26,6 @@ var CancelToken = Request.CancelToken;
 var cancel;
 var classPrefix = 'interval-content';
 var EventContent = function EventContent(props) {
-  // console.log('EventContent', props);
   // 最后的查询数据（防止图表在还没查询时就改变了类型）
   var _useState = useState(props.value),
     _useState2 = _slicedToArray(_useState, 2),
@@ -112,7 +111,7 @@ var EventContent = function EventContent(props) {
   }, [ajaxFlag]);
   // 查询
   var fetchRequest = function fetchRequest(flag) {
-    var _searchData$start, _searchData$end, _searchData$associate, _searchData$associate2, _searchData$associate3, _finalSearchData$star;
+    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) {
@@ -128,7 +127,10 @@ var EventContent = function EventContent(props) {
     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)) {
       return message.error('您查询的属性不一致，暂不支持查询');
     }
-    var params = finalSearchData !== null && finalSearchData !== void 0 && (_finalSearchData$star = finalSearchData.start) !== null && _finalSearchData$star !== void 0 && _finalSearchData$star.id ? searchDataParams(finalSearchData) : searchDataParams(searchData);
+    // const params = finalSearchData?.module === "interval"
+    //   ? searchDataParams(finalSearchData)
+    //   : searchDataParams(searchData);
+    var params = searchDataParams(searchData);
     props.onChange && props.onChange(searchData);
     // console.log(77771111, searchData, params);
     ajax(Apis.dataList, {
@@ -157,10 +159,10 @@ var EventContent = function EventContent(props) {
 
   // 改变时间和图表类型
   var onChangeContent = function onChangeContent(data) {
-    setAjaxFlag(true);
     setSearchData(function (value) {
       return _objectSpread(_objectSpread({}, value), data);
     });
+    setAjaxFlag(true);
   };
 
   // 改变显示内容
@@ -170,21 +172,21 @@ var EventContent = function EventContent(props) {
 
   // 平台变更
   var platformChange = function platformChange(data) {
-    setAjaxFlag(true);
     setSearchData(function (_searchData) {
       return _objectSpread(_objectSpread({}, _searchData), {}, {
         platform: data
       });
     });
+    setAjaxFlag(true);
   };
 
   // TopPanel组件数值变更
   var onChangeSearch = function onChangeSearch(data, flag) {
-    setAjaxFlag(false);
     data.id ? setEventId(data.id) : setEventId(-1);
     setSearchData(function (_searchData) {
       return _objectSpread(_objectSpread({}, _searchData), data);
     });
+    setAjaxFlag(false);
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TopBar, {
     searchData: searchData,

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

@@ -18,7 +18,6 @@ import "./styles/index.less";
 var classPrefix = 'top-panel-interval';
 var TopPanel = function TopPanel(props) {
   var _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;
-  console.log(777777, props);
   var defaultValue = props.defaultValue,
     loading = props.loading,
     collapseRef = props.collapseRef,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.0-interval.36",
+  "version": "1.0.0-interval.38",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",