@zgfe/modules-interval 1.0.1 → 1.0.3-alpha.0

package/dist/esm/constants/apis.d.ts

@@ -1,6 +1,2 @@
-declare const Apis: {
-    dataList: string;
-    getEventDataSql: string;
-    eventDownloadReport: string;
-};
+declare const Apis: Record<string, string>;
 export default Apis;

package/dist/esm/constants/apis.js

@@ -1,7 +1,10 @@
 var Apis = {
-  // dataList: '/zg/web/v2/data/eventDataList',
-  dataList: '/zg/web/v2/interval/intervalData',
-  getEventDataSql: '/zg/web/v2/dataSql/getEventDataSql',
-  eventDownloadReport: '/zg/web/v2/interval/downLoadintervalData'
+  dataList: '/interval/intervalData',
+  getEventDataSql: '/dataSql/getEventDataSql',
+  eventDownloadReport: '/interval/downLoadintervalData',
+  querySubject: '/analysisSubject/queryAllSubject'
 };
+for (var key in Apis) {
+  Apis[key] = "/zg/web/v2".concat(Apis[key]);
+}
 export default Apis;

package/dist/esm/modules/topPanel/index.js

@@ -10,11 +10,13 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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; }
-import React, { useState } from 'react';
-import { Form, Button } from 'antd';
-import { BizAttributeSelector, BizUserGroupHeader } from '@zgfe/business-lib';
+import React, { useContext, useState } from 'react';
+import { Form, Button, Radio } from 'antd';
+import { BizAttributeSelector, BizGlobalDataContext, BizSelect, BizUserGroupHeader, ajax, useChanged } from '@zgfe/business-lib';
 import EventFilter from "../../components/eventFilter";
 import "./styles/index.less";
+import { AnalysisMode } from "./types";
+import { Apis } from "../../constants";
 var classPrefix = 'top-panel-interval';
 var TopPanel = function TopPanel(props) {
   var _props$urlParam, _props$urlParam2, _defaultValue$associa, _defaultValue$associa2, _finalSearchData$asso, _finalSearchData$asso2, _defaultValue$associa3, _finalSearchData$asso3, _defaultValue$associa4, _finalSearchData$asso4, _defaultValue$associa5, _finalSearchData$asso5, _defaultValue$associa6, _finalSearchData$asso6, _defaultValue$associa7, _finalSearchData$asso7, _defaultValue$associa8, _finalSearchData$asso8, _defaultValue$associa9, _finalSearchData$asso9, _defaultValue$associa10, _finalSearchData$asso10, _defaultValue$dimensi, _finalSearchData$dime, _defaultValue$dimensi2, _finalSearchData$dime2, _defaultValue$dimensi3, _finalSearchData$dime3, _defaultValue$dimensi4, _finalSearchData$dime4;
@@ -43,6 +45,8 @@ var TopPanel = function TopPanel(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     relevancyFl = _useState8[0],
     setRelevancyFl = _useState8[1];
+  var _useContext = useContext(BizGlobalDataContext),
+    currentApp = _useContext.currentApp;
   var _ref = defaultValue,
     userGroup = _ref.userGroup;
   // 细分属性初始值
@@ -143,6 +147,14 @@ var TopPanel = function TopPanel(props) {
       });
     }
   };
+  useChanged(function () {
+    ajax(Apis.querySubject, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id
+      }
+    });
+  }, currentApp === null || currentApp === void 0 ? void 0 : currentApp.id);
   return /*#__PURE__*/React.createElement(Form, {
     form: form,
     component: "div",
@@ -177,6 +189,24 @@ var TopPanel = function TopPanel(props) {
     scrollToFirstError: true,
     onValuesChange: onValuesChange
   }, /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u5206\u6790\u4E3B\u4F53",
+    className: "panel-form-interval-item"
+  }, /*#__PURE__*/React.createElement(BizSelect, {
+    options: [{
+      label: '用户',
+      value: 'user'
+    }, {
+      label: '事件属性',
+      value: 'eventProp'
+    }],
+    keyField: "value"
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u4E3B\u4F53\u540D\u79F0",
+    name: "analysisSubject",
+    className: "panel-form-interval-item"
+  }, /*#__PURE__*/React.createElement(BizSelect, {
+    options: []
+  })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "",
     name: "userGroup",
     className: "space-item interval-item",
@@ -272,7 +302,15 @@ var TopPanel = function TopPanel(props) {
     onDelete: function onDelete() {
       onChangeAttr(undefined, 'dimension');
     }
-  })), /*#__PURE__*/React.createElement("div", {
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u5206\u6790\u6A21\u578B",
+    name: "analysisModel",
+    className: "panel-form-interval-item"
+  }, /*#__PURE__*/React.createElement(Radio.Group, null, /*#__PURE__*/React.createElement(Radio, {
+    value: AnalysisMode.common
+  }, "\u5E38\u89C4\u95F4\u9694\u5206\u6790"), /*#__PURE__*/React.createElement(Radio, {
+    value: AnalysisMode.firstAndLast
+  }, "\u9996\u672B\u6B21\u95F4\u9694\u5206\u6790"))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-form-botton-box")
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: resetting

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

@@ -1,5 +1,4 @@
-@import '../../../assets/icons/iconfont.css';
-@import '../../../assets/business/iconfont.css';
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
 
 .top-panel-interval {
   &-form-botton-box {
@@ -18,6 +17,28 @@
 }
 
 .panel-form-interval {
+  &-item {
+    .ant-form-item-label {
+      padding-left: 24px;
+      font-weight: 500;
+    }
+    .ant-form-item-control-input-content {
+      height: 40px;
+      padding: 0 24px;
+      line-height: 40px;
+      .biz-select-handle {
+        display: inline-block;
+        width: 208px;
+      }
+      span.ant-radio + * {
+        padding-right: 40px;
+        padding-left: 12px;
+      }
+      &:hover {
+        background-color: #e8efff;
+      }
+    }
+  }
   .interval-item {
     margin-top: -2px;
     .ant-space-vertical {

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

@@ -1,5 +1,9 @@
 import { AttrConditionTypes } from '@zgfe/business-lib';
 import { bizAttributeSelectorValueProp, SearchValue } from '../../types';
+export declare enum AnalysisMode {
+    common = "commonInterval",
+    firstAndLast = "firstLastInterval"
+}
 export interface start {
     eventId?: number;
     id?: number;

package/dist/esm/modules/topPanel/types.js

@@ -1 +1,5 @@
-export {};
+export var AnalysisMode = /*#__PURE__*/function (AnalysisMode) {
+  AnalysisMode["common"] = "commonInterval";
+  AnalysisMode["firstAndLast"] = "firstLastInterval";
+  return AnalysisMode;
+}({});

package/dist/esm/utils/formData.js

@@ -68,8 +68,8 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     key: 'Q1',
     dataIndex: 'Q1',
     sorter: function sorter(a, b) {
-      var _a$min2, _b$min2;
-      return ((_a$min2 = a === null || a === void 0 ? void 0 : a.min) !== null && _a$min2 !== void 0 ? _a$min2 : 0) - ((_b$min2 = b === null || b === void 0 ? void 0 : b.min) !== null && _b$min2 !== void 0 ? _b$min2 : 0);
+      var _a$Q, _b$Q;
+      return ((_a$Q = a === null || a === void 0 ? void 0 : a.Q1) !== null && _a$Q !== void 0 ? _a$Q : 0) - ((_b$Q = b === null || b === void 0 ? void 0 : b.Q1) !== null && _b$Q !== void 0 ? _b$Q : 0);
     },
     className: "".concat(classPrefix, "-table-td"),
     render: function render(text, record) {
@@ -82,8 +82,8 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     align: 'right',
     dataIndex: 'median',
     sorter: function sorter(a, b) {
-      var _a$min3, _b$min3;
-      return ((_a$min3 = a === null || a === void 0 ? void 0 : a.min) !== null && _a$min3 !== void 0 ? _a$min3 : 0) - ((_b$min3 = b === null || b === void 0 ? void 0 : b.min) !== null && _b$min3 !== void 0 ? _b$min3 : 0);
+      var _a$median, _b$median;
+      return ((_a$median = a === null || a === void 0 ? void 0 : a.median) !== null && _a$median !== void 0 ? _a$median : 0) - ((_b$median = b === null || b === void 0 ? void 0 : b.median) !== null && _b$median !== void 0 ? _b$median : 0);
     },
     key: 'median',
     className: "".concat(classPrefix, "-table-td"),
@@ -97,8 +97,8 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     align: 'right',
     dataIndex: 'Q3',
     sorter: function sorter(a, b) {
-      var _a$min4, _b$min4;
-      return ((_a$min4 = a === null || a === void 0 ? void 0 : a.min) !== null && _a$min4 !== void 0 ? _a$min4 : 0) - ((_b$min4 = b === null || b === void 0 ? void 0 : b.min) !== null && _b$min4 !== void 0 ? _b$min4 : 0);
+      var _a$Q2, _b$Q2;
+      return ((_a$Q2 = a === null || a === void 0 ? void 0 : a.Q3) !== null && _a$Q2 !== void 0 ? _a$Q2 : 0) - ((_b$Q2 = b === null || b === void 0 ? void 0 : b.Q3) !== null && _b$Q2 !== void 0 ? _b$Q2 : 0);
     },
     key: 'Q3',
     className: "".concat(classPrefix, "-table-td"),
@@ -112,8 +112,8 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     align: 'right',
     key: 'max',
     sorter: function sorter(a, b) {
-      var _a$min5, _b$min5;
-      return ((_a$min5 = a === null || a === void 0 ? void 0 : a.min) !== null && _a$min5 !== void 0 ? _a$min5 : 0) - ((_b$min5 = b === null || b === void 0 ? void 0 : b.min) !== null && _b$min5 !== void 0 ? _b$min5 : 0);
+      var _a$max, _b$max;
+      return ((_a$max = a === null || a === void 0 ? void 0 : a.max) !== null && _a$max !== void 0 ? _a$max : 0) - ((_b$max = b === null || b === void 0 ? void 0 : b.max) !== null && _b$max !== void 0 ? _b$max : 0);
     },
     dataIndex: 'max',
     className: "".concat(classPrefix, "-table-td"),
@@ -127,8 +127,8 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     align: 'right',
     dataIndex: 'perValue',
     sorter: function sorter(a, b) {
-      var _a$min6, _b$min6;
-      return ((_a$min6 = a === null || a === void 0 ? void 0 : a.min) !== null && _a$min6 !== void 0 ? _a$min6 : 0) - ((_b$min6 = b === null || b === void 0 ? void 0 : b.min) !== null && _b$min6 !== void 0 ? _b$min6 : 0);
+      var _a$perValue, _b$perValue;
+      return ((_a$perValue = a === null || a === void 0 ? void 0 : a.perValue) !== null && _a$perValue !== void 0 ? _a$perValue : 0) - ((_b$perValue = b === null || b === void 0 ? void 0 : b.perValue) !== null && _b$perValue !== void 0 ? _b$perValue : 0);
     },
     key: 'perValue',
     className: "".concat(classPrefix, "-table-td"),
@@ -142,8 +142,8 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     align: 'right',
     dataIndex: 'peopleNum',
     sorter: function sorter(a, b) {
-      var _a$min7, _b$min7;
-      return ((_a$min7 = a === null || a === void 0 ? void 0 : a.min) !== null && _a$min7 !== void 0 ? _a$min7 : 0) - ((_b$min7 = b === null || b === void 0 ? void 0 : b.min) !== null && _b$min7 !== void 0 ? _b$min7 : 0);
+      var _a$peopleNum, _b$peopleNum;
+      return ((_a$peopleNum = a === null || a === void 0 ? void 0 : a.peopleNum) !== null && _a$peopleNum !== void 0 ? _a$peopleNum : 0) - ((_b$peopleNum = b === null || b === void 0 ? void 0 : b.peopleNum) !== null && _b$peopleNum !== void 0 ? _b$peopleNum : 0);
     },
     key: 'peopleNum',
     className: "".concat(classPrefix, "-table-td"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.1",
+  "version": "1.0.3-alpha.0",
   "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.84-panel.6",
+    "@zgfe/business-lib": "^1.1.88",
     "@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": "728b3ca2a91011150266aed6e52bcae3ec9962de"
 }