@zgfe/modules-interval 1.0.23-zhongyuan.21 → 1.0.23-zhongyuan.24

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

@@ -22,5 +22,8 @@ export interface EventTableProps {
     /**
      * 改变展示内容
      */
-    changeShow: (names: string[]) => void;
+    changeShow: (names: {
+        label: string;
+        value: number;
+    }[]) => void;
 }

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

@@ -20,7 +20,7 @@ import { searchDataParams } from "../content/utils";
 import { ERROR_RESPONESE_CODE } from "../../constants/code";
 import { Spin } from 'antd';
 var IntervalEventChart = function IntervalEventChart(props) {
-  var _dataSource$appData2;
+  var _dataSource$appData;
   var params = props.params,
     onChangeException = props.onChangeException;
   // 显示内容
@@ -47,16 +47,16 @@ var IntervalEventChart = function IntervalEventChart(props) {
 
   // 初始化，判断showList是否有值，如果没值，取结果的前10条
   useEffect(function () {
-    var _dataSource$appData, _dataSource$appData$s;
-    var dataSource = props.dataSource;
-    if ((dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$appData = dataSource.appData) === null || _dataSource$appData === void 0 ? void 0 : (_dataSource$appData$s = _dataSource$appData.series) === null || _dataSource$appData$s === void 0 ? void 0 : _dataSource$appData$s.length) > 0) {
+    var _dataSourceCopy$appDa, _dataSourceCopy$appDa2;
+    var dataSourceCopy = props.dataSource;
+    if ((dataSourceCopy === null || dataSourceCopy === void 0 ? void 0 : (_dataSourceCopy$appDa = dataSourceCopy.appData) === null || _dataSourceCopy$appDa === void 0 ? void 0 : (_dataSourceCopy$appDa2 = _dataSourceCopy$appDa.series) === null || _dataSourceCopy$appDa2 === void 0 ? void 0 : _dataSourceCopy$appDa2.length) > 0) {
       var _extractNames, _extractNames2;
-      var arr = params !== null && params !== void 0 && params.displaySetup ? params === null || params === void 0 ? void 0 : params.displaySetup : props !== null && props !== void 0 && props.eventOldData ? (_extractNames = extractNames(props === null || props === void 0 ? void 0 : props.eventOldData)) === null || _extractNames === void 0 ? void 0 : _extractNames.splice(0, 4) : (_extractNames2 = extractNames(dataSource)) === null || _extractNames2 === void 0 ? void 0 : _extractNames2.splice(0, 4);
-      var app = getDefaultShow(dataSource, arr);
+      var arr = params !== null && params !== void 0 && params.displaySetup ? params === null || params === void 0 ? void 0 : params.displaySetup : props !== null && props !== void 0 && props.eventOldData ? (_extractNames = extractNames(props === null || props === void 0 ? void 0 : props.eventOldData)) === null || _extractNames === void 0 ? void 0 : _extractNames.splice(0, 4) : (_extractNames2 = extractNames(dataSourceCopy)) === null || _extractNames2 === void 0 ? void 0 : _extractNames2.splice(0, 4);
+      var app = getDefaultShow(dataSourceCopy, arr);
       setShowList(app);
       setDataSource(app);
     } else {
-      setDataSource(dataSource);
+      setDataSource(dataSourceCopy);
     }
   }, [params === null || params === void 0 ? void 0 : params.displaySetup, props.dataSource, params]);
   var fetchResult = function fetchResult() {
@@ -119,7 +119,7 @@ var IntervalEventChart = function IntervalEventChart(props) {
       }, "\u4E8B\u4EF6\u5DF2\u88AB\u5220\u9664\u65E0\u6CD5\u67E5\u770B\uFF0C\u8BF7\u91CD\u65B0\u8BBE\u7F6E")
     }));
   }
-  if (!dataSource || !(dataSource !== null && dataSource !== void 0 && (_dataSource$appData2 = dataSource.appData) !== null && _dataSource$appData2 !== void 0 && _dataSource$appData2.series.length)) {
+  if (!dataSource || !(dataSource !== null && dataSource !== void 0 && (_dataSource$appData = dataSource.appData) !== null && _dataSource$appData !== void 0 && _dataSource$appData.series.length)) {
     return /*#__PURE__*/React.createElement(MiNone, {
       label: !dataSource ? '请选择条件进行查询' : '暂无数据'
     });

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

@@ -21,6 +21,7 @@ var _currentAxisBreaks = [{
   gap: '1.5%'
 }];
 var IntervalChart = function IntervalChart(props) {
+  var _props$dataSource2, _props$dataSource2$ap;
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     optionECharts = _useState2[0],
@@ -37,9 +38,13 @@ var IntervalChart = function IntervalChart(props) {
   }, []);
   useEffect(function () {
     var _props$showList$appDa, _props$showList, _props$dataSource, _seriesData$series;
-    // chartRef && chartRef.current.getEchartsInstance().clear();
+    chartInstance && chartInstance.clear();
     var seriesData = (_props$showList$appDa = props === null || props === void 0 ? void 0 : (_props$showList = props.showList) === null || _props$showList === void 0 ? void 0 : _props$showList.appData) !== null && _props$showList$appDa !== void 0 ? _props$showList$appDa : props === null || props === void 0 ? void 0 : (_props$dataSource = props.dataSource) === null || _props$dataSource === void 0 ? void 0 : _props$dataSource.appData;
     var params = props === null || props === void 0 ? void 0 : props.params;
+    var hasUndefined = convertDateArray(params, seriesData === null || seriesData === void 0 ? void 0 : seriesData.xAxis).some(function (item) {
+      return item === undefined;
+    });
+    if (hasUndefined) return;
     var eCharts = {
       tooltip: {
         trigger: 'item',
@@ -233,10 +238,14 @@ var IntervalChart = function IntervalChart(props) {
     setOptionECharts(function () {
       return eCharts;
     });
-  }, [props === null || props === void 0 ? void 0 : props.showList]);
+  }, [props === null || props === void 0 ? void 0 : (_props$dataSource2 = props.dataSource) === null || _props$dataSource2 === void 0 ? void 0 : (_props$dataSource2$ap = _props$dataSource2.appData) === null || _props$dataSource2$ap === void 0 ? void 0 : _props$dataSource2$ap.xAxis]);
   useEffect(function () {
     // true 表示ecahrt不合并，直接替换
-    chartInstance && chartInstance.setOption(optionECharts, true);
+    chartInstance && chartInstance.setOption(optionECharts, {
+      notMerge: true,
+      // 核心：不合并新旧配置，完全覆盖
+      lazyUpdate: false // 立即更新，不延迟渲染
+    });
   }, [optionECharts]);
   useEffect(function () {
     setTimeout(function () {

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

@@ -391,7 +391,10 @@ var TopPanel = function TopPanel(props) {
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u6309\u5C5E\u6027\u7EC6\u5206",
     name: "dimension",
-    className: "dimension-interval"
+    className: "dimension-interval",
+    labelCol: {
+      span: 12
+    }
   }, /*#__PURE__*/React.createElement(BizAttributeSelector, {
     enableEventProp: true,
     enableUserProp: analysisType === 'user',

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

@@ -1,219 +1,220 @@
-@import '~@zgfe/business-lib/es/assets/styles/inner.less';
-
-.top-panel-interval {
-  &-form-botton-box {
-    display: flex;
-    justify-content: flex-end;
-    margin-top: 24px;
-    margin-right: 24px;
-
-    > :nth-child(1) {
-      margin-right: 16px;
-      color: #fff;
-      background-color: #29bd52;
-      border-color: #29bd52;
-    }
-  }
-
-  &-label-hasIcon {
-    .bsicon {
-      cursor: pointer;
-    }
-  }
-}
-
-.panel-form-interval {
-  .ant-form-item-explain-error {
-    margin-left: 24px;
-  }
-  &-item {
-    .ant-form-item-label {
-      padding-left: 24px !important;
-      font-weight: 500;
-    }
-    .ant-form-item-control-input-content {
-      height: 40px;
-      padding: 0 24px !important;
-      line-height: 40px !important;
-      .biz-select-handle {
-        display: inline-block;
-        width: 208px;
-      }
-      span.ant-radio + * {
-        padding-right: 40px;
-        padding-left: 12px;
-      }
-      &:hover {
-        background-color: #e7f3fe;
-      }
-    }
-  }
-  .interval-item {
-    margin-top: -2px;
-    .ant-space-vertical {
-      gap: 0px !important;
-      width: 100%;
-      .ant-space-item:nth-child(1) {
-        padding: 0 12px;
-      }
-
-      .ant-space-item:nth-child(2) {
-        display: flex;
-        align-items: center;
-        height: 42px;
-        margin-top: 4px;
-        padding: 0 12px;
-      }
-
-      .ant-space-item:nth-child(2):hover {
-        background-color: #e7f3fe;
-      }
-    }
-  }
-
-  .biz-user-group-header {
-    padding: 0;
-    background-color: #fff;
-  }
-
-  .space-item {
-    .ant-space-item {
-      .biz-user-group {
-        width: 100%;
-        min-width: 208px;
-      }
-    }
-
-    .ant-space-horizontal .ant-space-item:nth-child(2) .tianjia {
-      display: none;
-    }
-  }
-
-  .collapseRefs {
-    .ant-form-item {
-      margin-bottom: 16px;
-    }
-
-    .ant-form-item-control-input {
-      display: flex;
-      align-items: center;
-    }
-
-    .ant-form-item-label {
-      padding-left: 24px;
-      font-weight: 500;
-    }
-
-    .interval-box {
-      > div:nth-child(1) {
-        padding: 4px 24px;
-      }
-
-      > div:nth-child(1):hover {
-        background-color: #e7f3fe;
-      }
-
-      .biz-attr-condition-group-handle {
-        margin-right: 0;
-        margin-left: 32px;
-      }
-
-      .biz-attr-condition-group-container {
-        gap: 0px !important;
-      }
-
-      .biz-attr-condition-group-container-item {
-        max-width: calc(100% + 32px) !important;
-        margin-top: 4px;
-        padding: 4px 56px;
-        .ant-space-item {
-          width: auto;
-          max-width: auto;
-          margin-left: 0px;
-          padding: 0;
-        }
-      }
-
-      .ant-space-item:hover {
-        background-color: #e7f3fe;
-      }
-    }
-
-    .dimension-interval {
-      .ant-form-item-control-input {
-        padding: 4px 24px;
-      }
-
-      .ant-form-item-control-input:hover {
-        background-color: #e7f3fe;
-      }
-    }
-  }
-
-  .biz-event-select {
-    width: 208px;
-  }
-
-  > .ant-form-item {
-    margin-bottom: 16px;
-    .biz-user-group-val {
-      color: #021429;
-    }
-  }
-
-  .associated {
-    margin-top: -10px;
-    margin-bottom: 12px;
-
-    .qingchu {
-      color: #9aa1a9;
-    }
-
-    .qingchu:hover {
-      color: @error-color;
-    }
-
-    .ant-form-item-control-input {
-      padding: 4px 24px;
-
-      .ant-form-item-control-input {
-        padding: 0;
-      }
-
-      .ant-form-item {
-        margin-bottom: 0;
-      }
-    }
-
-    .ant-form-item-control-input:hover {
-      background-color: #e7f3fe;
-    }
-
-    .associated-link {
-      display: block;
-      line-height: 32px;
-    }
-
-    .ant-form-item-row {
-      flex-direction: inherit;
-    }
-
-    .ant-form-item-control-input-content {
-      display: flex;
-      gap: 12px;
-    }
-
-    .associated-label {
-      color: var(--3, #5f6085);
-      font-weight: 400;
-      font-size: 14px;
-      font-family: PingFang SC;
-      font-style: normal;
-      line-height: 32px;
-      text-align: right;
-    }
-    .ant-form-item-explain-error {
-      margin-left: 0 !important;
-    }
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+
+.top-panel-interval {
+  &-form-botton-box {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 24px;
+    margin-right: 24px;
+
+    > :nth-child(1) {
+      margin-right: 16px;
+      color: #fff;
+      background-color: #29bd52;
+      border-color: #29bd52;
+    }
+  }
+
+  &-label-hasIcon {
+    .bsicon {
+      cursor: pointer;
+    }
+  }
+}
+
+.panel-form-interval {
+  .ant-form-item-explain-error {
+    margin-left: 24px;
+  }
+  &-item {
+    .ant-form-item-label {
+      padding-left: 24px !important;
+      font-weight: 500;
+    }
+    .ant-form-item-control-input-content {
+      height: 40px;
+      padding: 0 24px !important;
+      line-height: 40px !important;
+      .biz-select-handle {
+        display: inline-block;
+        width: 208px;
+      }
+      span.ant-radio + * {
+        padding-right: 40px;
+        padding-left: 12px;
+      }
+      &:hover {
+        background-color: #e7f3fe;
+      }
+    }
+  }
+  .interval-item {
+    margin-top: -2px;
+    .ant-space-vertical {
+      gap: 0px !important;
+      width: 100%;
+      .ant-space-item:nth-child(1) {
+        padding: 0 12px;
+      }
+
+      .ant-space-item:nth-child(2) {
+        display: flex;
+        align-items: center;
+        height: 42px;
+        margin-top: 4px;
+        padding: 0 12px;
+      }
+
+      .ant-space-item:nth-child(2):hover {
+        background-color: #e7f3fe;
+      }
+    }
+  }
+
+  .biz-user-group-header {
+    padding: 0;
+    background-color: #fff;
+  }
+
+  .space-item {
+    .ant-space-item {
+      .biz-user-group {
+        width: 100%;
+        min-width: 208px;
+      }
+    }
+
+    .ant-space-horizontal .ant-space-item:nth-child(2) .tianjia {
+      display: none;
+    }
+  }
+
+  .collapseRefs {
+    .ant-form-item {
+      margin-bottom: 16px;
+    }
+
+    .ant-form-item-control-input {
+      display: flex;
+      align-items: center;
+    }
+
+    .ant-form-item-label {
+      padding-left: 24px;
+      font-weight: 500;
+    }
+
+    .interval-box {
+      > div:nth-child(1) {
+        padding: 4px 24px;
+      }
+
+      > div:nth-child(1):hover {
+        background-color: #e7f3fe;
+      }
+
+      .biz-attr-condition-group-handle {
+        margin-right: 0;
+        margin-left: 32px;
+      }
+
+      .biz-attr-condition-group-container {
+        gap: 0px !important;
+      }
+
+      .biz-attr-condition-group-container-item {
+        max-width: calc(100% + 32px) !important;
+        margin-top: 4px;
+        padding: 4px 56px;
+        .ant-space-item {
+          width: auto;
+          max-width: auto;
+          margin-left: 0px;
+          padding: 0;
+        }
+      }
+
+      .ant-space-item:hover {
+        background-color: #e7f3fe;
+      }
+    }
+
+    .dimension-interval {
+      .ant-form-item-control-input {
+        width: 208px;
+        padding: 4px 24px;
+      }
+
+      .ant-form-item-control-input:hover {
+        background-color: #e7f3fe;
+      }
+    }
+  }
+
+  .biz-event-select {
+    width: 208px;
+  }
+
+  > .ant-form-item {
+    margin-bottom: 16px;
+    .biz-user-group-val {
+      color: #021429;
+    }
+  }
+
+  .associated {
+    margin-top: -10px;
+    margin-bottom: 12px;
+
+    .qingchu {
+      color: #9aa1a9;
+    }
+
+    .qingchu:hover {
+      color: @error-color;
+    }
+
+    .ant-form-item-control-input {
+      padding: 4px 24px;
+
+      .ant-form-item-control-input {
+        padding: 0;
+      }
+
+      .ant-form-item {
+        margin-bottom: 0;
+      }
+    }
+
+    .ant-form-item-control-input:hover {
+      background-color: #e7f3fe;
+    }
+
+    .associated-link {
+      display: block;
+      line-height: 32px;
+    }
+
+    .ant-form-item-row {
+      flex-direction: inherit;
+    }
+
+    .ant-form-item-control-input-content {
+      display: flex;
+      gap: 12px;
+    }
+
+    .associated-label {
+      color: var(--3, #5f6085);
+      font-weight: 400;
+      font-size: 14px;
+      font-family: PingFang SC;
+      font-style: normal;
+      line-height: 32px;
+      text-align: right;
+    }
+    .ant-form-item-explain-error {
+      margin-left: 0 !important;
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.23-zhongyuan.21",
+  "version": "1.0.23-zhongyuan.24",
   "private": false,
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
@@ -59,7 +59,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1f96c7a67cd1b71447a953b6aa9367cb592671ab",
+  "gitHead": "9d7d3c7b598f1aca3c87ddc179c2ca4748b1ff02",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }