@zgfe/modules-interval 1.0.0-interval.1 → 1.0.0-interval.10

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

@@ -4,25 +4,27 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useState } from 'react';
-import { Form, Button } from 'antd';
+import React, { useEffect, useState } from 'react';
+import { Form, Button, message } from 'antd';
 import { BizAttributeSelector, BizUserGroupHeader } from '@zgfe/business-lib';
 import EventFilter from "../../components/eventFilter";
 import "./styles/index.less";
-var classPrefix = 'top-panel';
+import _ from 'lodash';
+import { transformData } from "../content/utils";
+var classPrefix = 'top-panel-interval';
 var TopPanel = function TopPanel(props) {
   var defaultValue = props.defaultValue,
-    ajaxFlag = props.ajaxFlag,
-    finalSearchData = props.finalSearchData,
+    loading = props.loading,
+    collapseRef = props.collapseRef,
     fetchRequest = props.fetchRequest;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var _useState = useState(-100),
+  var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     startId = _useState2[0],
     setStartId = _useState2[1];
-  var _useState3 = useState(-100),
+  var _useState3 = useState(null),
     _useState4 = _slicedToArray(_useState3, 2),
     endId = _useState4[0],
     setEndId = _useState4[1];
@@ -31,6 +33,10 @@ var TopPanel = function TopPanel(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     relevancy = _useState6[0],
     setRelevancy = _useState6[1];
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    relevancyFl = _useState8[0],
+    setRelevancyFl = _useState8[1];
   // 筛选条件值
   var _ref = defaultValue,
     id = _ref.id,
@@ -39,58 +45,54 @@ var TopPanel = function TopPanel(props) {
     filters = _ref.filters,
     userGroup = _ref.userGroup;
   // 细分属性初始值
-  var _useState7 = useState(),
-    _useState8 = _slicedToArray(_useState7, 2),
-    bizAttributeSelectorValue = _useState8[0],
-    setBizAttributeSelectorValue = _useState8[1];
+  var _useState9 = useState(),
+    _useState10 = _slicedToArray(_useState9, 2),
+    bizAttributeSelectorValue = _useState10[0],
+    setBizAttributeSelectorValue = _useState10[1];
   // 用户组和事件变更
   var onValuesChange = function onValuesChange(data, allData) {
     var _data = {};
     if (allData.start) {
-      if (allData.start.id !== -100) {
+      if (allData.start.id !== null) {
+        var _allData$start;
         _data = allData.start;
         setStartId(allData.start.id);
-        if (allData.start.relevancy !== undefined) {
-          // form.setFieldsValue({
-          //   associatedPreAttr: undefined,
-          //   associatedNextAttr: undefined,
-          // });
-        }
-        setRelevancy(allData.start.relevancy);
+        setRelevancy(allData === null || allData === void 0 ? void 0 : (_allData$start = allData.start) === null || _allData$start === void 0 ? void 0 : _allData$start.relevancy);
       }
     }
     if (allData.end) {
-      if (allData.end.id !== -100) {
+      if (allData.end.id !== null) {
         _data = allData.end;
         setEndId(allData.end.id);
       }
     }
+    if (startId && endId) {
+      setRelevancyFl(true);
+    }
     if (allData.userGroup) {
       _data.userGroup = [];
-      allData.userGroup.map(function (item) {
-        _data.userGroup && _data.userGroup.push(item);
-      });
-      if (_data.userGroup.length <= 0) _data.userGroup = [0];
-    }
-    if (data.start) {
-      // 事件id不变，不自动请求
-      if (finalSearchData && finalSearchData.id && data.start.id === finalSearchData.id) {
-        ajaxFlag = false;
-      } else {
-        ajaxFlag = true;
-      }
-    }
-    if (data.end) {
-      // 事件id不变，不自动请求
-      if (finalSearchData && finalSearchData.id && data.end.id === finalSearchData.id) {
-        ajaxFlag = false;
+      if (_.isArray(allData.userGroup[0])) {
+        if (allData.userGroup[0].length > 20) {
+          message.warning('最多添加20个');
+        }
+        var app = [transformData(allData.userGroup)];
+        allData.userGroup = app;
       } else {
-        ajaxFlag = true;
+        allData.userGroup = allData === null || allData === void 0 ? void 0 : allData.userGroup.map(function (group) {
+          return group === null || group === void 0 ? void 0 : group.id;
+        });
       }
     }
-    props.onChange(allData, ajaxFlag);
+    props.onChange(allData, false);
   };
-
+  useEffect(function () {
+    onChangeAttr(undefined, 'dimension');
+    onChangeAttr(undefined, 'associatedPreAttr');
+  }, [startId]);
+  useEffect(function () {
+    onChangeAttr(undefined, 'dimension');
+    onChangeAttr(undefined, 'associatedNextAttr');
+  }, [endId]);
   // 重置
   var resetting = function resetting() {
     form.resetFields();
@@ -111,9 +113,35 @@ var TopPanel = function TopPanel(props) {
     }, true);
   };
   // 细分属性
-  var onChangeAttr = function onChangeAttr(attr) {
+  var onChangeAttr = function onChangeAttr(attr, type) {
     if (attr === undefined) {
       // 删除细分属性
+      switch (type) {
+        case 'associatedPreAttr':
+          form.setFieldsValue({
+            associatedPreAttr: undefined
+          });
+          props.onChange({
+            associatedPreAttr: undefined
+          }, true);
+          break;
+        case 'associatedNextAttr':
+          form.setFieldsValue({
+            associatedNextAttr: undefined
+          });
+          props.onChange({
+            associatedNextAttr: undefined
+          }, true);
+          break;
+        case 'dimension':
+          form.setFieldsValue({
+            dimension: undefined
+          });
+          props.onChange({
+            dimension: undefined
+          }, true);
+          break;
+      }
       setBizAttributeSelectorValue(undefined);
     } else {
       var _value = attr.propCategory === 'eventProp' ? attr.id : attr.name;
@@ -162,12 +190,22 @@ var TopPanel = function TopPanel(props) {
       paddingLeft: 0
     }
   }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
+    value: [{
+      id: 0
+    }],
+    enableTags: true,
     max: 1
-  })), /*#__PURE__*/React.createElement(Form.Item, {
+  })), /*#__PURE__*/React.createElement("div", {
+    ref: collapseRef,
+    style: {
+      paddingLeft: 24
+    },
+    className: "collapseRefs"
+  }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5F00\u59CB\u4E8B\u4EF6",
     name: "start"
   }, /*#__PURE__*/React.createElement(EventFilter, {
-    relevancy: true
+    relevancy: relevancyFl
   })), relevancy ? /*#__PURE__*/React.createElement(Form.Item, {
     style: {
       marginBottom: 0
@@ -197,7 +235,7 @@ var TopPanel = function TopPanel(props) {
     enableDelete: true,
     onChange: onChangeAttr,
     onDelete: function onDelete() {
-      onChangeAttr(undefined);
+      onChangeAttr(undefined, 'associatedPreAttr');
     }
   })), /*#__PURE__*/React.createElement("span", {
     className: "associated-label"
@@ -215,9 +253,23 @@ var TopPanel = function TopPanel(props) {
     enableDelete: true,
     onChange: onChangeAttr,
     onDelete: function onDelete() {
-      onChangeAttr(undefined);
+      onChangeAttr(undefined, 'associatedNextAttr');
     }
-  }))) : '', /*#__PURE__*/React.createElement(Form.Item, {
+  })), /*#__PURE__*/React.createElement("i", {
+    style: {
+      lineHeight: '32px',
+      color: '#9AA1A9',
+      marginLeft: '28px',
+      cursor: 'pointer'
+    },
+    onClick: function onClick() {
+      onChangeAttr(undefined, 'associatedPreAttr');
+      onChangeAttr(undefined, 'associatedNextAttr');
+      setRelevancy(false);
+      setRelevancyFl(false);
+    },
+    className: "bsicon qingchu"
+  })) : '', /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u7ED3\u675F\u4E8B\u4EF6",
     name: "end"
   }, /*#__PURE__*/React.createElement(EventFilter, null)), /*#__PURE__*/React.createElement(Form.Item, {
@@ -232,19 +284,19 @@ var TopPanel = function TopPanel(props) {
     enableDelete: true,
     onChange: onChangeAttr,
     onDelete: function onDelete() {
-      onChangeAttr(undefined);
+      onChangeAttr(undefined, 'dimension');
     }
   })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-form-botton-box")
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: resetting
-  }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button
-  // disabled={ajaxFlag}
-  , {
+  }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
+    loading: loading,
+    disabled: loading || !startId || !endId || relevancy && !(defaultValue !== null && defaultValue !== void 0 && defaultValue.associatedNextAttr) && !(defaultValue !== null && defaultValue !== void 0 && defaultValue.associatedNextAttr),
     type: "primary",
     onClick: function onClick() {
       fetchRequest(true);
     }
-  }, "\u67E5\u8BE2")));
+  }, "\u67E5\u8BE2"))));
 };
 export default TopPanel;

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

@@ -1,7 +1,7 @@
 @import '../../../assets/icons/iconfont.css';
 @import '../../../assets/business/iconfont.css';
 
-.top-panel {
+.top-panel-interval {
   &-form-botton-box {
     display: flex;
     justify-content: flex-end;
@@ -18,6 +18,25 @@
 }
 
 .panel-form {
+  .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: 12px;
+    }
+  }
+
   .biz-event-select {
     width: 208px;
   }
@@ -53,15 +72,3 @@
     }
   }
 }
-
-.space-item {
-  .ant-space-item {
-    .biz-user-group {
-      max-width: 208px;
-    }
-  }
-
-  .ant-space-horizontal .ant-space-item:nth-child(2) .tianjia {
-    display: none;
-  }
-}

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

@@ -10,7 +10,7 @@ export interface FormDataProps {
     /**
      * 用户群
      */
-    userGroup?: number[];
+    userGroup?: any[];
     /**
      * 事件、属性、属性细分
      */
@@ -35,6 +35,7 @@ export interface TopPanelProps {
      * 默认值
      */
     defaultValue?: SearchValue;
+    loading?: boolean;
     /**
      * 数据更新
      */
@@ -51,4 +52,5 @@ export interface TopPanelProps {
      * 请求数据方法
      */
     fetchRequest: (flag?: boolean) => void;
+    collapseRef?: any;
 }

package/dist/esm/style/index.less

@@ -1,7 +1,11 @@
-.event-form-data {
+.interval-form-data {
   &-table-td {
     padding: 0 !important;
 
+    .ant-table-column-sorters {
+      justify-content: end !important;
+    }
+
     &-show {
       display: flex;
       align-items: center;
@@ -9,6 +13,7 @@
       min-width: 60px;
       height: 48px;
       cursor: pointer;
+
       span {
         width: 10px;
         height: 10px;
@@ -20,6 +25,7 @@
     &-name {
       display: flex;
       align-items: center;
+
       .bsicon {
         margin-right: 4px;
         color: #fd9f41;
@@ -37,6 +43,7 @@
 
     &-link {
       cursor: pointer;
+
       &:hover {
         color: #165dff;
         text-decoration: underline;

package/dist/esm/types.d.ts

@@ -135,7 +135,7 @@ export interface ChartItemProp {
     disabled?: boolean;
 }
 export interface ChartData {
-    app_data: {
+    appData: {
         series?: {
             names: string[];
             values: number[][];
@@ -145,7 +145,7 @@ export interface ChartData {
     };
 }
 export interface ResponseDataProps {
-    app_data: any;
+    appData: any;
     xAxis?: string[];
     x_axis?: string[];
     series: SeriesProps[];

package/dist/esm/utils/formData.d.ts

@@ -9,7 +9,7 @@ import { DisplaySetup } from '../components/searchPanel/types';
  * @param columnData xAxis
  * @returns column fields
  */
-export declare function getColumns(eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined, columnData: string[], userGroup: number[], searchData: SearchValue, showList: string[]): ColumnsType<EventProps.ColumnsDataType>;
+export declare function getColumns(eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined, columnData: string[], dataSource: ResponseDataProps, userGroup: number[], searchData: SearchValue, showList: string[]): ColumnsType<EventProps.ColumnsDataType>;
 /**
  * 获取属性的label
  * @param attrData 当前属性
@@ -27,6 +27,16 @@ export declare function getColumns(eventGroupList: EventGroup[] | undefined, use
  * @returns
  */
 export declare function formTableData(originalData: ChartData): {
+    key: string;
+    time: string;
+    max: number;
+    Q1: number;
+    median: number;
+    Q3: number;
+    min: number;
+    perValue: number;
+    peopleNum: number;
+}[] | {
     key: number;
     time: string;
     max: number;
@@ -36,24 +46,36 @@ export declare function formTableData(originalData: ChartData): {
     min: number;
     perValue: number;
     peopleNum: number;
+    children: {
+        key: string;
+        time: string;
+        max: number;
+        Q1: number;
+        median: number;
+        Q3: number;
+        min: number;
+        perValue: number;
+        peopleNum: number;
+    }[];
 }[] | undefined;
 type ChartData = {
-    app_data: {
+    appData: {
         series?: {
             names: string[];
             values: number[][];
             total: number[];
         }[];
-        x_axis?: string[];
+        xAxis?: string[];
     };
 };
+export declare function convertDateArray(params: SearchValue | undefined, dateArray: string[]): string[] | undefined;
 /**
- * 获取查询结果的前10条
+ * 获取查询结果
  * @param source 结果数据
- * @returns 获取查询结果的前10条
+ * @returns 获取查询结果
  */
 export declare function getDefaultShow(source: ResponseDataProps, data: DisplaySetup[]): never[] | {
-    app_data: any;
+    appData: any;
     xAxis?: string[] | undefined;
     x_axis?: string[] | undefined;
     series: SeriesProps[];