@zgfe/modules-interval 1.0.0-interval.26 → 1.0.0-interval.28

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) {

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

@@ -42,7 +42,7 @@ var IntervalEventChart = function IntervalEventChart(props) {
     setLoading = _useState8[1];
   useEffect(function () {
     // 没有dataSource时（看板列表访问），请求查询
-    if (!props.dataSource) {
+    if (!props.dataSource || (params === null || params === void 0 ? void 0 : params.module) === 'interval') {
       fetchResult();
     }
   }, []);

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

@@ -27,10 +27,10 @@
   .custom-tooltip-div {
     display: flex;
     flex-direction: column;
-    gap: 7px;
+    gap: 6px;
     width: 100%;
     height: 100%;
-    padding: 4px 8px;
+    padding: 0px 8px;
     background: #fff;
     border-radius: 4px;
     // box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.04);

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

@@ -86,7 +86,7 @@ var IntervalChart = function IntervalChart(props) {
         end: 20,
         height: 20 // 设置内置的dataZoom的高度
       }, {
-        show: true,
+        show: (params === null || params === void 0 ? void 0 : params.module) === 'interval' ? false : true,
         type: 'slider',
         bottom: '38px',
         xAxisIndex: [0],
@@ -107,7 +107,7 @@ var IntervalChart = function IntervalChart(props) {
           tooltip: {
             show: true,
             // 单独配置series中的tooltip为显示
-            extraCssText: 'border: none;padding:0',
+            extraCssText: 'border: none;padding:0;border-radius:10px',
             // 添加自定义的CSS样式，去掉边框
             formatter: function formatter(params) {
               var tooltipString = renderToString( /*#__PURE__*/React.createElement(CustomTooltip, {

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;
     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);

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

@@ -15,9 +15,6 @@
     .biz-layout-collapse-handle {
       height: 24px;
     }
-    .biz-layout-content {
-      padding-bottom: 0;
-    }
   }
   &-header-title {
     height: 48px;

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

@@ -18,6 +18,7 @@ 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,

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

@@ -110,6 +110,10 @@ export interface SearchValue {
      * @description  结束事件
      */
     end?: start;
+    /**
+     * @description  分类
+     */
+    module?: string;
 }
 export interface UserDrillParamsProp {
     /**

package/package.json

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