@zgfe/modules-interval 1.0.23-zhongyuan.0 → 1.0.23-zhongyuan.10

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

@@ -44,7 +44,7 @@
         padding-left: 12px;
       }
       &:hover {
-        background-color: #e8efff;
+        background-color: #e7f3fe;
       }
     }
   }
@@ -66,7 +66,7 @@
       }
 
       .ant-space-item:nth-child(2):hover {
-        background-color: #e8efff;
+        background-color: #e7f3fe;
       }
     }
   }
@@ -110,7 +110,7 @@
       }
 
       > div:nth-child(1):hover {
-        background-color: #e8efff;
+        background-color: #e7f3fe;
       }
 
       .biz-attr-condition-group-handle {
@@ -135,7 +135,7 @@
       }
 
       .ant-space-item:hover {
-        background-color: #e8efff;
+        background-color: #e7f3fe;
       }
     }
 
@@ -145,7 +145,7 @@
       }
 
       .ant-form-item-control-input:hover {
-        background-color: #e8efff;
+        background-color: #e7f3fe;
       }
     }
   }
@@ -186,7 +186,7 @@
     }
 
     .ant-form-item-control-input:hover {
-      background-color: #e8efff;
+      background-color: #e7f3fe;
     }
 
     .associated-link {

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

@@ -42,6 +42,7 @@ export interface TopPanelProps {
      * 默认值
      */
     defaultValue?: SearchValue;
+    propsDefaultValue?: SearchValue;
     loading?: boolean;
     /**
      * 数据更新

package/dist/esm/style/image/ring.svg

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; background: rgb(255, 255, 255); display: block; shape-rendering: auto;" width="80px" height="80px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
-<circle cx="50" cy="50" r="32" stroke-width="4" stroke="#165dff" stroke-dasharray="50.26548245743669 50.26548245743669" fill="none" stroke-linecap="round">
-  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;360 50 50"></animateTransform>
-</circle>
-<circle cx="50" cy="50" r="27" stroke-width="4" stroke="#85adfc" stroke-dasharray="42.411500823462205 42.411500823462205" stroke-dashoffset="42.411500823462205" fill="none" stroke-linecap="round">
-  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;-360 50 50"></animateTransform>
-</circle>
-<!-- [ldio] generated by https://loading.io/ --></svg>
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; background: rgb(255, 255, 255); display: block; shape-rendering: auto;" width="80px" height="80px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
+<circle cx="50" cy="50" r="32" stroke-width="4" stroke="#165dff" stroke-dasharray="50.26548245743669 50.26548245743669" fill="none" stroke-linecap="round">
+  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;360 50 50"></animateTransform>
+</circle>
+<circle cx="50" cy="50" r="27" stroke-width="4" stroke="#85adfc" stroke-dasharray="42.411500823462205 42.411500823462205" stroke-dashoffset="42.411500823462205" fill="none" stroke-linecap="round">
+  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;-360 50 50"></animateTransform>
+</circle>
+<!-- [ldio] generated by https://loading.io/ --></svg>

package/dist/esm/style/index.less

@@ -1,67 +1,67 @@
-.interval-form-data {
-  &-table-td {
-    padding: 0 !important;
-
-    .ant-table-column-sorters {
-      justify-content: end !important;
-    }
-
-    &-show {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      min-width: 60px;
-      height: 48px;
-      cursor: pointer;
-
-      span {
-        width: 10px;
-        height: 10px;
-        border-radius: 50%;
-        cursor: pointer;
-      }
-    }
-
-    &-name {
-      display: flex;
-      align-items: center;
-
-      .bsicon {
-        margin-right: 4px;
-        color: #fd9f41;
-      }
-
-      &-content {
-        display: inline-block;
-        max-width: 300px;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        cursor: pointer;
-      }
-    }
-
-    &-link {
-      cursor: pointer;
-
-      &:hover {
-        color: #165dff;
-        text-decoration: underline;
-      }
-    }
-  }
-}
-.interval-drill {
-  display: block;
-  .bsicon {
-    display: none;
-    margin-right: 4px;
-  }
-  &:hover {
-    color: @primary-color;
-    cursor: pointer;
-    .bsicon {
-      display: inline;
-    }
-  }
-}
+.interval-form-data {
+  &-table-td {
+    padding: 0 !important;
+
+    .ant-table-column-sorters {
+      justify-content: end !important;
+    }
+
+    &-show {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      min-width: 60px;
+      height: 48px;
+      cursor: pointer;
+
+      span {
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        cursor: pointer;
+      }
+    }
+
+    &-name {
+      display: flex;
+      align-items: center;
+
+      .bsicon {
+        margin-right: 4px;
+        color: #fd9f41;
+      }
+
+      &-content {
+        display: inline-block;
+        max-width: 300px;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        cursor: pointer;
+      }
+    }
+
+    &-link {
+      cursor: pointer;
+
+      &:hover {
+        color: #165dff;
+        text-decoration: underline;
+      }
+    }
+  }
+}
+.interval-drill {
+  display: block;
+  .bsicon {
+    display: none;
+    margin-right: 4px;
+  }
+  &:hover {
+    color: @primary-color;
+    cursor: pointer;
+    .bsicon {
+      display: inline;
+    }
+  }
+}

package/dist/esm/types.js

@@ -1,15 +1,15 @@
 import { createContext } from 'react';
 
-/**
- * 属性选择器 默认值
+/**
+ * 属性选择器 默认值
  */
 
-/**
- * 图表选择类型
+/**
+ * 图表选择类型
  */
 
-/**
- * series value
+/**
+ * series value
  */
 
 var defaultContext = {

package/dist/esm/utils/ajaxConfig.js

@@ -1,10 +1,10 @@
 import _ from 'lodash';
 
-/**
- * 接口option封装
- * @param url url
- * @param options  操作
- * @returns
+/**
+ * 接口option封装
+ * @param url url
+ * @param options  操作
+ * @returns
  */
 function setOptionWapper(url, options) {
   var reqOption = _.cloneDeep(options);

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

@@ -38,9 +38,11 @@ export declare function formTableData(originalData: ChartData): {
     total: number;
     peopleNum: number;
     names: string[];
+    originalNames: string[];
 }[] | {
     key: number;
     time: string;
+    originalNames: string[];
     max: number;
     Q1: number;
     median: number;
@@ -61,12 +63,14 @@ export declare function formTableData(originalData: ChartData): {
         total: number;
         peopleNum: number;
         names: string[];
+        originalNames: string[];
     }[];
 }[] | undefined;
 type ChartData = {
     appData: {
         series?: {
             names: string[];
+            originalNames: string[];
             values: number[][];
             total: number[];
         }[];

package/dist/esm/utils/formData.js

@@ -12,6 +12,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import React from 'react';
+import { Tooltip } from 'antd';
 import { chartColors } from "../constants/color";
 import "../style/index.less";
 import { IconFont } from '@zgfe/business-lib';
@@ -27,10 +28,10 @@ function convertToHMS(seconds) {
   var s = remainingSeconds ? remainingSeconds + '秒' : '0秒';
   return h + m + s;
 }
-/**
- * 获取table的columns
- * @param columnData xAxis
- * @returns column fields
+/**
+ * 获取table的columns
+ * @param columnData xAxis
+ * @returns column fields
  */
 export function getColumns(eventGroupList, userPropList, eventEnvList, columnData, dataSource, userGroup, searchData, showList, onUserDrill, currentApp
 // onClickToDetailCallback: Function,
@@ -46,7 +47,9 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     dataIndex: 'time',
     className: "".concat(classPrefix, "-table-td"),
     render: function render(text, record) {
-      return /*#__PURE__*/React.createElement("span", null, " ", text);
+      return /*#__PURE__*/React.createElement(Tooltip, {
+        title: text
+      }, /*#__PURE__*/React.createElement("span", null, " ", text));
     }
   }, {
     title: '最大值',
@@ -188,7 +191,8 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
             };
           }
           if (searchParam.dimension) {
-            params.params.groupValue = /\d{4}-\d{2}-\d{2}/.test(record.time || '') ? record.names ? record.names[0] : undefined : record.time;
+            params.params.groupValue = record.originalNames ? record.originalNames[0] : undefined;
+            params.params.groupValueEncry = searchParam.dimension.encryptionType > 0;
           }
           if (/\d{4}-\d{2}-\d{2}/.test(record.time || '')) {
             params.params.time.begin = record.time.split('|')[0];
@@ -204,22 +208,22 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
   return data;
 }
 
-/**
- * 获取属性的label
- * @param attrData 当前属性
- * @param eventGroupList 事件属性列表
- * @param userPropList 用户属性列表
- * @param eventEnvList 环境属性列表
- * @returns label
+/**
+ * 获取属性的label
+ * @param attrData 当前属性
+ * @param eventGroupList 事件属性列表
+ * @param userPropList 用户属性列表
+ * @param eventEnvList 环境属性列表
+ * @returns label
  */
 
-/**
- * 格式化表格数据
- * @param originalData 查询的数据
- * @param hasUserGroup 是否有多个用户群
- * @param attrNum 属性细分个数
- * @param showList 要展示的内容，如果没传，则展示全部
- * @returns
+/**
+ * 格式化表格数据
+ * @param originalData 查询的数据
+ * @param hasUserGroup 是否有多个用户群
+ * @param attrNum 属性细分个数
+ * @param showList 要展示的内容，如果没传，则展示全部
+ * @returns
  */
 export function formTableData(originalData) {
   var result = createNewArray(originalData);
@@ -236,6 +240,7 @@ function createNewArray(data) {
       return {
         key: i + 1,
         time: item.names[0],
+        originalNames: item.originalNames,
         max: item.total[0] || 0,
         Q1: item.total[1] || 0,
         median: item.total[2] || 0,
@@ -298,16 +303,17 @@ function getChildrenData(data, index) {
         perValue: values[i][5] || 0,
         total: values[i][6] || 0,
         peopleNum: values[i][7] || 0,
-        names: firstSeries.names
+        names: firstSeries.names,
+        originalNames: firstSeries.originalNames
       };
     });
   }
   return [];
 }
-/**
- * 获取查询结果
- * @param source 结果数据
- * @returns 获取查询结果
+/**
+ * 获取查询结果
+ * @param source 结果数据
+ * @returns 获取查询结果
  */
 export function getDefaultShow(source, data) {
   if (source.appData.series) {
@@ -329,11 +335,11 @@ export function getDefaultShow(source, data) {
   }
   return [];
 }
-/**
- * 获取显示事件对应的颜色
- * @param source 结果数据
- * @param showList 展示列表
- * @returns 展示列表对应的颜色
+/**
+ * 获取显示事件对应的颜色
+ * @param source 结果数据
+ * @param showList 展示列表
+ * @returns 展示列表对应的颜色
  */
 export function getShowColor(source, showList) {
   var colors = [];

package/dist/esm/utils/util.js

@@ -29,11 +29,11 @@ var util = {
   equal: function equal(a, b) {
     return JSON.stringify(a) === JSON.stringify(b);
   },
-  /**
-   * 获取指定范围的随机数
-   * @param min
-   * @param max
-   * @returns {*}
+  /**
+   * 获取指定范围的随机数
+   * @param min
+   * @param max
+   * @returns {*}
    */
   random: function random(min, max) {
     return Math.round(Math.random() * (max - min)) + min;
@@ -68,42 +68,42 @@ var util = {
     }
     return option;
   },
-  /**
-   * 将数字转为千分位分割格式
-   * @param num
-   * @returns {string}
+  /**
+   * 将数字转为千分位分割格式
+   * @param num
+   * @returns {string}
    */
   toThousands: function toThousands(num) {
     var source = String(num).split('.'); // 按小数点分成2部分
     source[0] = source[0].replace(new RegExp('(\\d)(?=(\\d{3})+$)', 'ig'), '$1,'); // 只将整数部分进行都好分割
     return source.join('.'); // 再将小数部分合并进来
   },
-  /**
-   * 为单数前补0
-   * @param num
-   * @returns {string}
+  /**
+   * 为单数前补0
+   * @param num
+   * @returns {string}
    */
   toDoubleNumber: function toDoubleNumber(num) {
     // num += ''
     var num2 = num.toString();
     return num > 9 ? num2 : '0' + num2;
   },
-  /**
-   * 日期格式化
-   * @param date
-   * @param formatter
-   * @returns {string}
+  /**
+   * 日期格式化
+   * @param date
+   * @param formatter
+   * @returns {string}
    */
   dateFormat: function dateFormat() {
     var date = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date();
     var formatter = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'yyyy-mm-dd';
     return formatter.replace('yyyy', date.getFullYear()).replace('mm', this.toDoubleNumber(date.getMonth() + 1)).replace('dd', this.toDoubleNumber(date.getDate()));
   },
-  /**
-   * 日期格式化
-   * @param date
-   * @param formatter
-   * @returns {string}
+  /**
+   * 日期格式化
+   * @param date
+   * @param formatter
+   * @returns {string}
    */
   timeFormat: function timeFormat() {
     var date = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date();
@@ -128,11 +128,11 @@ var util = {
       return formatter.replace('hh', this.toDoubleNumber(h)).replace('mm', this.toDoubleNumber(m)).replace('ss', this.toDoubleNumber(s));
     }
   },
-  /**
-   * 从中间拆分字符串,长度超出的话，解析为xxx...xxx
-   * @param str
-   * @param config
-   * @returns {string}
+  /**
+   * 从中间拆分字符串,长度超出的话，解析为xxx...xxx
+   * @param str
+   * @param config
+   * @returns {string}
    */
   strMiddleSplit: function strMiddleSplit(str) {
     var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {

package/package.json

@@ -1,12 +1,9 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.23-zhongyuan.0",
+  "version": "1.0.23-zhongyuan.10",
+  "private": false,
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
-  "private": false,
-  "publishConfig": {
-    "access": "public"
-  },
   "files": [
     "dist"
   ],
@@ -59,7 +56,10 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "c1029ad4038cc39d49878a4ced941e120ec59982",
+  "publishConfig": {
+    "access": "public"
+  },
+  "gitHead": "84e4a80651712930d3f41e02179b62c9c8891793",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }