@zgfe/modules-interval 1.0.11-zhongbang.8 → 1.0.23-zhongyuan.1

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

@@ -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[], dataSource: ResponseDataProps, userGroup: number[], searchData: SearchValue, showList: string[], onUserDrill: IntervalProps.Props['onUserDrill']): ColumnsType<IntervalProps.ColumnsDataType>;
+export declare function getColumns(eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined, columnData: string[], dataSource: ResponseDataProps, userGroup: number[], searchData: SearchValue, showList: string[], onUserDrill: IntervalProps.Props['onUserDrill'], currentApp?: any): ColumnsType<IntervalProps.ColumnsDataType>;
 /**
  * 获取属性的label
  * @param attrData 当前属性
@@ -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;
@@ -48,7 +50,7 @@ export declare function formTableData(originalData: ChartData): {
     min: number;
     perValue: number;
     total: number;
-    peopleNum: number;
+    peopleNum: string;
     children: {
         key: string;
         time: string;
@@ -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

@@ -32,7 +32,7 @@ function convertToHMS(seconds) {
  * @param columnData xAxis
  * @returns column fields
  */
-export function getColumns(eventGroupList, userPropList, eventEnvList, columnData, dataSource, userGroup, searchData, showList, onUserDrill
+export function getColumns(eventGroupList, userPropList, eventEnvList, columnData, dataSource, userGroup, searchData, showList, onUserDrill, currentApp
 // onClickToDetailCallback: Function,
 ) {
   var _dataSource$appData, _dataSource$appData$s, _searchData$dimension;
@@ -154,7 +154,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
       return /*#__PURE__*/React.createElement("span", null, " ", convertToHMS(text));
     }
   }, {
-    title: searchData.analysisSubject ? "".concat(searchData.analysisSubject.subjectAlias || searchData.analysisSubject.subjectName, "\u6570") : '人数',
+    title: searchData.analysisSubject ? "".concat(searchData.analysisSubject.subjectAlias || searchData.analysisSubject.subjectName, "\u6570") : "".concat(currentApp.type != 'user' ? currentApp.unit : '人', "\u6570"),
     width: 148,
     ellipsis: true,
     align: 'right',
@@ -166,6 +166,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     key: 'peopleNum',
     className: "".concat(classPrefix, "-table-td"),
     render: function render(text, record) {
+      if (text == '-') return text;
       return /*#__PURE__*/React.createElement("span", {
         className: "interval-drill",
         onClick: function onClick() {
@@ -187,7 +188,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];
@@ -235,6 +237,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,
@@ -242,7 +245,7 @@ function createNewArray(data) {
         min: item.total[4] || 0,
         perValue: item.total[5] || 0,
         total: item.total[6] || 0,
-        peopleNum: item.total[7] || 0,
+        peopleNum: '-',
         children: getChildrenData(data, i)
       };
     });
@@ -297,7 +300,8 @@ 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
       };
     });
   }

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,28 +1,23 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.11-zhongbang.8",
+  "version": "1.0.23-zhongyuan.1",
+  "private": false,
+  "module": "dist/esm/index.js",
+  "typings": "dist/esm/index.d.ts",
+  "files": [
+    "dist"
+  ],
   "scripts": {
-    "start": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:deploy": "gh-pages -d docs-dist",
     "build": "father build",
     "deploy": "npm run docs:build && npm run docs:deploy",
+    "docs:build": "dumi build",
+    "docs:deploy": "gh-pages -d docs-dist",
+    "prepublishOnly": "npm run build",
     "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "test": "umi-test",
     "pub": "lerna publish",
-    "test:coverage": "umi-test --coverage",
-    "prepublishOnly": "npm run build"
-  },
-  "files": [
-    "dist"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "module": "dist/esm/index.js",
-  "typings": "dist/esm/index.d.ts",
-  "gitHooks": {
-    "pre-commit": "lint-staged"
+    "start": "dumi dev",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage"
   },
   "lint-staged": {
     "*.{js,jsx,less,md,json}": [
@@ -47,20 +42,25 @@
     "@types/uuid": "^9.0.2",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.2.11-zhongbang.1",
-    "@zgfe/modules-demo-manage": "^1.0.1",
+    "@zgfe/business-lib": "1.2.70-hxd.10",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "echarts": "^5.3.2",
     "echarts-for-react": "^3.0.2",
     "father-build": "^1.17.2",
     "gh-pages": "^3.0.0",
-    "lerna": "5.1.8",
+    "lerna": "^5.1.8",
     "lint-staged": "^10.0.7",
     "lodash": "^4.17.21",
     "prettier": "^2.2.1",
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "5ab172fb8b3dd2d1d3b0e9a796960bd5e3b71759"
+  "publishConfig": {
+    "access": "public"
+  },
+  "gitHead": "e0ab09536ecccea2965d6c3e0e73ba24b31fea65",
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  }
 }