@zgfe/modules-interval 1.0.3-alpha.3 → 1.0.3-alpha.30

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

@@ -17,15 +17,18 @@
 }
 
 .panel-form-interval {
+  .ant-form-item-explain-error {
+    margin-left: 24px;
+  }
   &-item {
     .ant-form-item-label {
-      padding-left: 24px;
+      padding-left: 24px !important;
       font-weight: 500;
     }
     .ant-form-item-control-input-content {
       height: 40px;
-      padding: 0 24px;
-      line-height: 40px;
+      padding: 0 24px !important;
+      line-height: 40px !important;
       .biz-select-handle {
         display: inline-block;
         width: 208px;
@@ -203,5 +206,8 @@
       line-height: 32px;
       text-align: right;
     }
+    .ant-form-item-explain-error {
+      margin-left: 0 !important;
+    }
   }
 }

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

@@ -42,23 +42,14 @@ export interface TopPanelProps {
      * 默认值
      */
     defaultValue?: SearchValue;
-    urlParam?: SearchValue;
     loading?: boolean;
     /**
      * 数据更新
      */
     onChange: (data: SearchValue, flag: boolean) => void;
-    /**
-     * 是否请求数据
-     */
-    ajaxFlag: boolean;
     /**
      * 请求后的最新查询数据
      */
     finalSearchData?: SearchValue;
-    /**
-     * 请求数据方法
-     */
-    fetchRequest: (flag?: boolean) => void;
     collapseRef?: any;
 }

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);
@@ -144,6 +145,11 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     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));
     }
@@ -164,22 +170,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({}, searchData)
+              params: _objectSpread({}, searchParam)
             };
           }
-          onUserDrill === null || onUserDrill === void 0 ? void 0 : onUserDrill(params);
+          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"
@@ -282,7 +296,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.3",
+  "version": "1.0.3-alpha.30",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -47,7 +47,7 @@
     "@types/uuid": "^9.0.2",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.89-qirui.10",
+    "@zgfe/business-lib": "1.1.89-qirui.20",
     "@zgfe/modules-demo-manage": "^1.0.1",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
@@ -62,5 +62,5 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "ff72ad7d6d914c1f5d4e1659b0efaed33059dd3a"
+  "gitHead": "3c71b0146a12fcdaa4c35e4e595bb144aaa09ec3"
 }