@zgfe/modules-interval 1.0.9 → 1.0.10-beiming.1

package/dist/esm/types.js

@@ -1,19 +1,19 @@
 import { createContext } from 'react';
 
-/**
- * 属性选择器 默认值
+/**
+ * 属性选择器 默认值
  */
 
-/**
- * 图表选择类型
+/**
+ * 图表选择类型
  */
 
-/**
- * series value
+/**
+ * series value
  */
 
 var defaultContext = {
   onUserDrill: null,
   defaultSearch: {}
 };
-export var EventContext = /*#__PURE__*/createContext(defaultContext);
+export var IntervalContext = /*#__PURE__*/createContext(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

@@ -1,7 +1,7 @@
 import type { ColumnsType } from 'antd/es/table';
 import { EventGroup, UserProp, EnvProp } from '@zgfe/business-lib/es/attributeSelector/types';
 import { ResponseDataProps, SearchValue, SeriesProps } from '../types';
-import { EventProps } from '../modules/home/types';
+import { IntervalProps } from '../modules/home/types';
 import '../style/index.less';
 import { DisplaySetup } from '../components/searchPanel/types';
 /**
@@ -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[]): 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[], onUserDrill: IntervalProps.Props['onUserDrill']): ColumnsType<IntervalProps.ColumnsDataType>;
 /**
  * 获取属性的label
  * @param attrData 当前属性
@@ -35,7 +35,9 @@ export declare function formTableData(originalData: ChartData): {
     Q3: number;
     min: number;
     perValue: number;
+    total: number;
     peopleNum: number;
+    names: string[];
 }[] | {
     key: number;
     time: string;
@@ -45,6 +47,7 @@ export declare function formTableData(originalData: ChartData): {
     Q3: number;
     min: number;
     perValue: number;
+    total: number;
     peopleNum: number;
     children: {
         key: string;
@@ -55,7 +58,9 @@ export declare function formTableData(originalData: ChartData): {
         Q3: number;
         min: number;
         perValue: number;
+        total: number;
         peopleNum: number;
+        names: string[];
     }[];
 }[] | undefined;
 type ChartData = {

package/dist/esm/utils/formData.js

@@ -1,19 +1,22 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-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); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 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; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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 { chartColors } from "../constants/color";
 import "../style/index.less";
+import { IconFont } from '@zgfe/business-lib';
+import { Apis } from "../constants";
+import { searchDataParams } from "../modules/content/utils";
 var classPrefix = 'interval-form-data';
 function convertToHMS(seconds) {
   var hours = Math.floor(seconds / 3600);
@@ -24,12 +27,12 @@ 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
+export function getColumns(eventGroupList, userPropList, eventEnvList, columnData, dataSource, userGroup, searchData, showList, onUserDrill
 // onClickToDetailCallback: Function,
 ) {
   var _dataSource$appData, _dataSource$appData$s, _searchData$dimension;
@@ -121,7 +124,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
       return /*#__PURE__*/React.createElement("span", null, " ", convertToHMS(text));
     }
   }, {
-    title: '人均值',
+    title: '均值',
     width: 148,
     ellipsis: true,
     align: 'right',
@@ -136,7 +139,22 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
       return /*#__PURE__*/React.createElement("span", null, " ", convertToHMS(text));
     }
   }, {
-    title: '人数',
+    title: '合计',
+    width: 148,
+    ellipsis: true,
+    align: 'right',
+    dataIndex: 'total',
+    key: 'total',
+    className: "".concat(classPrefix, "-table-td"),
+    sorter: function sorter(a, b) {
+      var _a$total, _b$total;
+      return ((_a$total = a === null || a === void 0 ? void 0 : a.total) !== null && _a$total !== void 0 ? _a$total : 0) - ((_b$total = b === null || b === void 0 ? void 0 : b.total) !== null && _b$total !== void 0 ? _b$total : 0);
+    },
+    render: function render(text, record) {
+      return /*#__PURE__*/React.createElement("span", null, " ", convertToHMS(text));
+    }
+  }, {
+    title: searchData.analysisSubject ? "".concat(searchData.analysisSubject.subjectAlias || searchData.analysisSubject.subjectName, "\u6570") : '人数',
     width: 148,
     ellipsis: true,
     align: 'right',
@@ -148,28 +166,59 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     key: 'peopleNum',
     className: "".concat(classPrefix, "-table-td"),
     render: function render(text, record) {
-      return /*#__PURE__*/React.createElement("span", null, " ", text);
+      return /*#__PURE__*/React.createElement("span", {
+        className: "interval-drill",
+        onClick: function onClick() {
+          var params;
+          var searchParam = searchDataParams(searchData);
+          // 主体下钻
+          if (searchData.analysisSubject) {
+            params = {
+              url: Apis.subjectDrill,
+              count: Number(text),
+              params: _objectSpread({}, searchParam)
+            };
+          } else {
+            // 用户下钻
+            params = {
+              url: Apis.userDrill,
+              count: Number(text),
+              params: _objectSpread({}, searchParam)
+            };
+          }
+          if (searchParam.dimension) {
+            params.params.groupValue = /\d{4}-\d{2}-\d{2}/.test(record.time || '') ? record.names ? record.names[0] : undefined : record.time;
+          }
+          if (/\d{4}-\d{2}-\d{2}/.test(record.time || '')) {
+            params.params.time.begin = record.time.split('|')[0];
+            params.params.time.end = record.time.split('|')[1] || record.time.split('|')[0];
+          }
+          onUserDrill === null || onUserDrill === void 0 ? void 0 : onUserDrill(params, searchData.analysisSubject ? true : false);
+        }
+      }, /*#__PURE__*/React.createElement(IconFont, {
+        type: "a-yanjingkai"
+      }), " ", text);
     }
   }];
   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);
@@ -192,7 +241,8 @@ function createNewArray(data) {
         Q3: item.total[3] || 0,
         min: item.total[4] || 0,
         perValue: item.total[5] || 0,
-        peopleNum: item.total[6] || 0,
+        total: item.total[6] || 0,
+        peopleNum: item.total[7] || 0,
         children: getChildrenData(data, i)
       };
     });
@@ -221,7 +271,7 @@ export function convertDateArray(params, dateArray) {
         var resultArray = dateArray.map(function (date) {
           var dateObj = new Date(date);
           var weekday = weekdays[dateObj.getDay()];
-          return "".concat(date, " (").concat(weekday, ")");
+          return "".concat(date).concat(weekday ? " (".concat(weekday, ")") : '');
         });
         return resultArray;
         break;
@@ -245,16 +295,18 @@ function getChildrenData(data, index) {
         Q3: values[i][3] || 0,
         min: values[i][4] || 0,
         perValue: values[i][5] || 0,
-        peopleNum: values[i][6] || 0
+        total: values[i][6] || 0,
+        peopleNum: values[i][7] || 0,
+        names: firstSeries.names
       };
     });
   }
   return [];
 }
-/**
- * 获取查询结果
- * @param source 结果数据
- * @returns 获取查询结果
+/**
+ * 获取查询结果
+ * @param source 结果数据
+ * @returns 获取查询结果
  */
 export function getDefaultShow(source, data) {
   if (source.appData.series) {
@@ -276,11 +328,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,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.9",
+  "version": "1.0.10-beiming.1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -9,12 +9,16 @@
     "deploy": "npm run docs:build && npm run docs:deploy",
     "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": {
@@ -43,7 +47,7 @@
     "@types/uuid": "^9.0.2",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.87-auth.7",
+    "@zgfe/business-lib": "1.1.99",
     "@zgfe/modules-demo-manage": "^1.0.1",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
@@ -51,11 +55,12 @@
     "echarts-for-react": "^3.0.2",
     "father-build": "^1.17.2",
     "gh-pages": "^3.0.0",
-    "lerna": "^5.1.7",
+    "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": "0d06662620eb36b58c9d90d29cd2e0093f954aff"
 }