@zgfe/modules-interval 1.0.3-alpha.5 → 1.0.3-alpha.7

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

@@ -22,7 +22,7 @@ export declare namespace IntervalProps {
         /**
          * 用户钻取
          */
-        onUserDrill: (data: IntervalDrillParams) => void;
+        onUserDrill: (data: IntervalDrillParams, isSubject: boolean) => void;
         onJumpWarning: (data: Record<string, any>, searchData: SearchValue) => void;
     }
     interface Value {
@@ -69,6 +69,7 @@ export declare namespace IntervalProps {
         min?: number;
         perValue?: number;
         peopleNum?: number;
+        names?: string[];
         children?: ColumnsDataType[];
     }
 }

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

@@ -37,6 +37,7 @@ export declare function formTableData(originalData: ChartData): {
     perValue: number;
     total: number;
     peopleNum: number;
+    names: string[];
 }[] | {
     key: number;
     time: string;
@@ -59,6 +60,7 @@ export declare function formTableData(originalData: ChartData): {
         perValue: number;
         total: number;
         peopleNum: number;
+        names: string[];
     }[];
 }[] | undefined;
 type ChartData = {

package/dist/esm/utils/formData.js

@@ -16,6 +16,7 @@ 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);
@@ -164,31 +165,30 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
         className: "interval-drill",
         onClick: function onClick() {
           var params;
+          var searchParam = searchDataParams(searchData);
           // 主体下钻
           if (searchData.analysisSubject) {
             params = {
               url: Apis.subjectDrill,
               count: Number(text),
-              params: _objectSpread({}, searchData)
+              params: _objectSpread({}, searchParam)
             };
           } else {
             // 用户下钻
             params = {
               url: Apis.userDrill,
               count: Number(text),
-              params: _objectSpread(_objectSpread({}, searchData), {}, {
-                groupValue: searchData.dimension ? record.time : undefined
-              })
+              params: _objectSpread({}, searchParam)
             };
           }
-          if (searchData.dimension) {
-            params.params.groupValue = record.time;
+          if (searchParam.dimension) {
+            params.params.groupValue = /\d{4}-\d{2}-\d{2}/.test(record.time || '') ? record.names ? record.names[0] : undefined : record.time;
           }
-          if (/dddd-dd-dd/.test(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] || params.params.time.end;
+            params.params.time.end = record.time.split('|')[1] || record.time.split('|')[0];
           }
-          onUserDrill === null || onUserDrill === void 0 ? void 0 : onUserDrill(params);
+          onUserDrill === null || onUserDrill === void 0 ? void 0 : onUserDrill(params, searchData.analysisSubject ? true : false);
         }
       }, /*#__PURE__*/React.createElement(IconFont, {
         type: "a-yanjingkai"
@@ -291,7 +291,8 @@ function getChildrenData(data, index) {
         min: values[i][4] || 0,
         perValue: values[i][5] || 0,
         total: values[i][6] || 0,
-        peopleNum: values[i][7] || 0
+        peopleNum: values[i][7] || 0,
+        names: firstSeries.names
       };
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.3-alpha.5",
+  "version": "1.0.3-alpha.7",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -62,5 +62,5 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "502a09099976208baf7e37532ba69fa6e260c26a"
+  "gitHead": "802d131a050ab271873a660c0479908f6a663142"
 }