@zgfe/modules-interval 1.0.0-interval.27 → 1.0.0-interval.29

package/dist/esm/components/table/styles/index.less

@@ -41,6 +41,7 @@
     line-height: 50px;
     background: #fafafb;
     border: 1px solid var(--gray-6, #ecedf0);
+    border-bottom: none;
     border-radius: 8px 8px 0 0;
 
     > :nth-child(2) {
@@ -54,11 +55,11 @@
         border: 1px solid #f2f3f4;
         border-radius: 4px;
         cursor: pointer;
-
+        display: flex;
+        align-items: center;
         .xiazai1 {
           margin-right: 4px;
-          font-size: 18px !important;
-          vertical-align: -2px;
+          font-size: 16px !important;
         }
       }
       div:hover {

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

@@ -33,7 +33,7 @@
     padding: 0px 8px;
     background: #fff;
     border-radius: 4px;
-    // box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.04);
+    box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.04);
 
     .tooltip-span {
       display: block;

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

@@ -84,6 +84,7 @@ var IntervalChart = function IntervalChart(props) {
         type: 'inside',
         start: 0,
         end: 20,
+        right: 3,
         height: 20 // 设置内置的dataZoom的高度
       }, {
         show: (params === null || params === void 0 ? void 0 : params.module) === 'interval' ? false : true,
@@ -92,6 +93,7 @@ var IntervalChart = function IntervalChart(props) {
         xAxisIndex: [0],
         start: 0,
         end: 20,
+        right: 3,
         height: 20 // 设置滑动条的高度
       }],
 

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

@@ -112,12 +112,15 @@ var EventContent = function EventContent(props) {
   }, [ajaxFlag]);
   // 查询
   var fetchRequest = function fetchRequest(flag) {
-    var _searchData$start, _searchData$end, _searchData$associate, _searchData$associate2, _searchData$associate3;
+    var _finalSearchData$star, _finalSearchData$end, _searchData$associate, _searchData$associate2, _searchData$associate3, _finalSearchData$star2;
     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;
+    if ((finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$star = finalSearchData.start) === null || _finalSearchData$star === void 0 ? void 0 : _finalSearchData$star.eventId) === null || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$end = finalSearchData.end) === null || _finalSearchData$end === void 0 ? void 0 : _finalSearchData$end.eventId) === null) {
+      var _searchData$start, _searchData$end;
+      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;
+      }
     }
     setLoading(true);
     setEventData(undefined);
@@ -128,7 +131,7 @@ 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 = searchDataParams(searchData);
+    var params = finalSearchData !== null && finalSearchData !== void 0 && (_finalSearchData$star2 = finalSearchData.start) !== null && _finalSearchData$star2 !== void 0 && _finalSearchData$star2.eventId ? finalSearchData : searchDataParams(searchData);
     props.onChange && props.onChange(searchData);
     // console.log(77771111, searchData, params);
     ajax(Apis.dataList, {

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, _defaultValue$associa3, _defaultValue$associa4, _defaultValue$associa5, _defaultValue$associa6, _defaultValue$associa7, _defaultValue$associa8, _defaultValue$dimensi, _defaultValue$dimensi2, _defaultValue$dimensi3, _defaultValue$dimensi4;
-  console.log(666661111, props);
   var defaultValue = props.defaultValue,
     loading = props.loading,
     collapseRef = props.collapseRef,
@@ -54,23 +53,25 @@ var TopPanel = function TopPanel(props) {
   // 用户组和事件变更
   var onValuesChange = function onValuesChange(data, allData) {
     var _data = {};
+    setRelevancyFl(false);
     if (allData.start) {
       if (allData.start.id !== null) {
         var _allData$start;
         _data = allData.start;
         setStartId(allData.start.id);
         setRelevancy(allData === null || allData === void 0 ? void 0 : (_allData$start = allData.start) === null || _allData$start === void 0 ? void 0 : _allData$start.relevancy);
+      } else {
+        setRelevancyFl(true);
       }
     }
     if (allData.end) {
       if (allData.end.id !== null) {
         _data = allData.end;
         setEndId(allData.end.id);
+      } else {
+        setRelevancyFl(true);
       }
     }
-    if (startId && endId) {
-      setRelevancyFl(false);
-    }
     if (allData.userGroup) {
       _data.userGroup = allData.userGroup;
       if (_data.userGroup.length <= 0) _data.userGroup = [0];

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

@@ -1,6 +1,7 @@
 import { AttrConditionTypes } from '@zgfe/business-lib';
 import { bizAttributeSelectorValueProp, SearchValue } from '../../types';
 export interface start {
+    eventId?: number;
     id?: number;
     name?: string;
     relevancy?: boolean;

package/dist/esm/types.d.ts

@@ -111,8 +111,8 @@ export interface SearchValue {
      */
     end?: start;
     /**
-   * @description  分类
-   */
+     * @description  分类
+     */
     module?: string;
 }
 export interface UserDrillParamsProp {

package/package.json

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