@zgfe/modules-event 0.1.5-event.5 → 0.1.5-event.51

package/es/modules/topPanel/index.js

@@ -1,39 +1,43 @@
+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 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(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+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 React, { useState, useEffect } from 'react';
 import { Form, Button } from 'antd';
-import { BizUserGroupHeader, BizSelect } from '@zgfe/business-lib';
+import { BizUserGroupHeader, BizSelect, useSubject } from '@zgfe/business-lib';
 import EventFilter from '../../components/eventFilter';
 import './styles/index.less';
+import _ from 'lodash';
 var classPrefix = 'top-panel';
 var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var value = props.value,
-    ajaxFlag = props.ajaxFlag,
-    finalSearchData = props.finalSearchData,
-    fetchRequest = props.fetchRequest,
     setIsCity = props.setIsCity,
     setEnableSelectChart = props.setEnableSelectChart,
-    allSubjectList = props.allSubjectList,
-    subDisplay = props.subDisplay;
+    subDisplay = props.subDisplay,
+    loading = props.loading;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
-    searchDisabled = _useState2[0],
-    setSearchDisabled = _useState2[1];
-  var _useState3 = useState(false),
+    marginStyle = _useState2[0],
+    setmarginStyle = _useState2[1];
+  var _useState3 = useState('user'),
     _useState4 = _slicedToArray(_useState3, 2),
-    marginStyle = _useState4[0],
-    setmarginStyle = _useState4[1];
-  var _useState5 = useState({
-      value: 'user',
-      label: '用户'
-    }),
+    analysisType = _useState4[0],
+    setAnalysisType = _useState4[1];
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    analysisSubjectType = _useState6[0],
-    setAnalysisSubjectType = _useState6[1];
+    inited = _useState6[0],
+    setInited = _useState6[1];
+  var _useSubject = useSubject(),
+    subjectList = _useSubject.subjectList,
+    subjectLoading = _useSubject.loading;
   var countChange = function countChange(count) {
     setmarginStyle(count > 0 ? true : false);
   };
@@ -41,135 +45,171 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var userGroup = value.userGroup;
-  var onValuesChange = function onValuesChange(data, allData) {
-    var _data = {};
-    if (allData.filterConditions) {
-      if (allData.filterConditions.id !== -100) {
-        _data = allData.filterConditions;
-      }
-      _data.eventGroupId = allData.filterConditions.eventGroupId;
-    }
-    if (allData.userGroup) {
-      _data.userGroup = allData.userGroup.filter(function (item) {
-        return item !== undefined;
-      });
-      if (_data.userGroup.length <= 0 || _data.userGroup.length === 1 && _data.userGroup[0].length <= 0) {
-        _data.userGroup = [0];
-      }
-    }
-    if (data.filterConditions) {
-      if (finalSearchData && finalSearchData.id && data.filterConditions.id === finalSearchData.id && data.filterConditions.eventGroupId === finalSearchData.eventGroupId) {
-        ajaxFlag = false;
-      } else {
-        ajaxFlag = true;
-      }
-    }
-    if (data.analysisSubject && data.analysisSubject.subjectId) {
-      _data.analysisSubject = {
-        subjectId: data.analysisSubject.subjectId,
+  function onSearch(data) {
+    var _data$filterCondition, _data$filterCondition2, _data$filterCondition3;
+    var searchData = _objectSpread(_objectSpread({
+      analysisSubject: data.analysisSubject ? {
+        subjectId: data.analysisSubject.id || data.analysisSubject.subjectId,
         subjectName: data.analysisSubject.subjectName,
         subjectAlias: data.analysisSubject.subjectAlias,
         unit: data.analysisSubject.unit
-      };
-    }
-    props.onChange(_data, ajaxFlag);
-  };
+      } : undefined
+    }, _.isArray(data.filterConditions) ? {} : data.filterConditions), {}, {
+      eventIds: _.isArray(data.filterConditions) ? data.filterConditions : undefined,
+      eventGroupId: (_data$filterCondition = data.filterConditions) === null || _data$filterCondition === void 0 ? void 0 : _data$filterCondition.eventGroupId,
+      userGroup: data.userGroup || [0],
+      id: ((_data$filterCondition2 = data.filterConditions) === null || _data$filterCondition2 === void 0 ? void 0 : _data$filterCondition2.id) >= 0 ? (_data$filterCondition3 = data.filterConditions) === null || _data$filterCondition3 === void 0 ? void 0 : _data$filterCondition3.id : undefined
+    });
+    props.onChange(searchData, true);
+  }
   var resetting = function resetting() {
     form.resetFields();
     form.setFieldsValue({
       userGroup: [0],
-      filterConditions: null,
-      analysisSubject: null
+      filterConditions: null
     });
     props.onChange({
       userGroup: [0],
-      analysisSubject: undefined,
       id: undefined,
       name: undefined,
       filters: undefined,
-      dimension: undefined
+      dimension: undefined,
+      analysisAttr: undefined,
+      chartType: 'line'
     }, true);
   };
+  useEffect(function () {
+    if (!value) {
+      setInited(true);
+      return;
+    }
+    setInited(false);
+    if (value.analysisSubject) {
+      setAnalysisType('eventProp');
+      props.onChangeSubjectType('eventProp');
+    } else {
+      setAnalysisType('user');
+      props.onChangeSubjectType('user');
+    }
+    setInited(true);
+  }, []);
+  if (!inited) return null;
   return /*#__PURE__*/React.createElement(Form, {
     form: form,
     component: "div",
     colon: false,
     layout: "vertical",
+    className: "".concat(classPrefix, "-form"),
     initialValues: {
       userGroup: userGroup ? userGroup : [0],
-      filterConditions: {
+      filterConditions: (value === null || value === void 0 ? void 0 : value.eventIds) || {
         id: value === null || value === void 0 ? void 0 : value.id,
         name: value === null || value === void 0 ? void 0 : value.name,
         dimension: value === null || value === void 0 ? void 0 : value.dimension,
         filters: value === null || value === void 0 ? void 0 : value.filters,
         eventGroupId: value === null || value === void 0 ? void 0 : value.eventGroupId
       },
-      analysisSubject: {
-        subjectId: 0,
-        subjectName: '',
-        subjectAlias: '',
-        unit: ''
-      }
+      analysisSubject: value === null || value === void 0 ? void 0 : value.analysisSubject
     },
     scrollToFirstError: true,
-    onValuesChange: onValuesChange
+    onFinish: onSearch
   }, !subDisplay ? null : /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5206\u6790\u4E3B\u4F53",
-    className: "".concat(classPrefix, "-form-event")
+    className: "".concat(classPrefix, "-form-event hoverable-form-item")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-form-event-select"),
     options: [{
-      value: 'user',
-      label: '用户'
+      label: '用户',
+      value: 'user'
     }, {
-      value: 'event',
-      label: '事件属性'
+      label: '事件属性',
+      value: 'eventProp'
     }],
     overlayWidth: 208,
-    labelField: "label",
     keyField: "value",
-    value: analysisSubjectType,
-    onChange: function onChange(seleted) {
-      props.onChangeSubjectType(seleted.value);
-      setAnalysisSubjectType(seleted);
+    defaultValue: {
+      value: analysisType
+    },
+    onChange: function onChange(val) {
+      props.onChangeSubjectType(val.value);
+      setAnalysisType(val.value);
+      setEnableSelectChart && setEnableSelectChart(false);
+      setIsCity && setIsCity(false);
       resetting();
     }
-  })), analysisSubjectType.value === 'user' ? /*#__PURE__*/React.createElement(Form.Item, {
+  })), analysisType === 'user' ? /*#__PURE__*/React.createElement(Form.Item, {
     label: "",
-    name: "userGroup"
+    name: "userGroup",
+    className: "hoverable-form-item"
   }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
     max: 3,
     enableTags: true
   })) : /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u4E3B\u4F53\u540D\u79F0",
     name: "analysisSubject",
-    className: "".concat(classPrefix, "-form-event")
+    className: "".concat(classPrefix, "-form-event hoverable-form-item"),
+    rules: [{
+      validator: function validator(_rule, value) {
+        if (value && (value.id || value.subjectId)) {
+          return Promise.resolve();
+        } else {
+          return Promise.reject('请选择分析主体');
+        }
+      }
+    }]
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-form-event-select"),
-    options: allSubjectList || [],
-    labelField: "name",
+    options: subjectList,
+    aliasField: "subjectAlias",
+    labelField: "subjectName",
     keyField: "id"
   })), /*#__PURE__*/React.createElement("div", {
     ref: ref
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u4E8B\u4EF6",
     name: "filterConditions",
-    className: "".concat(classPrefix, "-form-event")
+    className: "".concat(classPrefix, "-form-event event---1"),
+    rules: [{
+      validator: function validator(_rule, value) {
+        var _value$filters, _value$filters$condit;
+        if (_.isArray(value)) {
+          if (!value.length) {
+            return Promise.reject('请选择事件');
+          } else {
+            return Promise.resolve();
+          }
+        }
+        if (!value || !value.id) {
+          return Promise.reject('请选择事件');
+        }
+        var conditionValIsNull = false;
+        value === null || value === void 0 ? void 0 : (_value$filters = value.filters) === null || _value$filters === void 0 ? void 0 : (_value$filters$condit = _value$filters.conditions) === null || _value$filters$condit === void 0 ? void 0 : _value$filters$condit.forEach(function (item) {
+          var _item$values;
+          if (!/null/.test(item.operator || '') && !((_item$values = item.values) === null || _item$values === void 0 ? void 0 : _item$values.length)) {
+            conditionValIsNull = true;
+          }
+        });
+        if (conditionValIsNull) {
+          return Promise.reject('请填写完整的条件');
+        }
+        return Promise.resolve();
+      },
+      validateTrigger: 'onBlur'
+    }]
   }, /*#__PURE__*/React.createElement(EventFilter, {
-    setSearchDisabled: setSearchDisabled,
     countChange: countChange,
     setIsCity: setIsCity,
     setEnableSelectChart: setEnableSelectChart,
-    analysisSubjectType: analysisSubjectType.value
+    analysisType: analysisType
   })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-form-botton-box ").concat(marginStyle ? 'margin-style' : '')
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: resetting
   }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
-    disabled: ajaxFlag || searchDisabled,
+    loading: subjectLoading || loading,
     type: "primary",
     onClick: function onClick() {
-      fetchRequest(true);
+      form.submit();
     }
   }, "\u67E5\u8BE2"))));
 });

package/es/modules/topPanel/styles/index.less

@@ -1,23 +1,28 @@
 .top-panel {
   &-form-event {
     margin-bottom: 0;
-    .ant-form-item-label {
+    & .ant-form-item-label {
       padding-left: 24px;
       font-weight: 500;
     }
     &-select {
       width: 208px;
-      margin-bottom: 24px;
       margin-left: 24px;
       .biz-select-handle-input {
         padding-left: 12px;
       }
     }
+    .ant-form-item-row .ant-form-item-control {
+      margin-bottom: 24px;
+      padding: 4px 0;
+    }
+    .ant-form-item-explain-error {
+      padding-left: 24px;
+    }
   }
   &-form-botton-box {
     display: flex;
     justify-content: flex-end;
-    margin-top: 12px;
     margin-right: 24px;
     > :nth-child(1) {
       margin-right: 16px;
@@ -26,8 +31,19 @@
       border-color: #29bd52;
     }
   }
-
-  &-form-botton-box.margin-style {
-    margin-top: 20px;
+  &-form {
+    .ant-form-item-has-error .biz-event-select {
+      border: 1px solid @error-color !important;
+    }
   }
 }
+.hoverable-form-item {
+  .ant-form-item-control {
+    &:hover {
+      background: #e8efff !important;
+    }
+  }
+}
+.event---1 .ant-form-item-label {
+  padding-bottom: 4px !important;
+}

package/es/modules/topPanel/types.d.ts

@@ -8,14 +8,16 @@ interface filterConditions {
     dimension?: bizAttributeSelectorValueProp;
 }
 interface analysisSubject {
+    id?: number;
     subjectId?: number;
     name?: string;
     unit?: string;
     subjectAlias?: string;
     subjectName?: string;
+    analysisSubjectType?: string;
 }
 interface analysisSubjectType {
-    value?: number;
+    value?: string;
     user?: string;
 }
 export interface FormDataProps {
@@ -29,17 +31,18 @@ export interface FormHandelDataProps extends filterConditions {
     userGroup?: any[];
     chartType?: EventChartTypes | undefined;
     analysisSubject?: analysisSubject;
+    eventIds?: number[];
 }
 export interface TopPanelProps {
     value?: SearchValue;
     onChange: (data: SearchValue, flag: boolean) => void;
+    loading?: boolean;
     ajaxFlag: boolean;
     subDisplay?: boolean;
     finalSearchData?: SearchValue;
     fetchRequest: (flag?: boolean) => void;
     setIsCity?: Function;
     setEnableSelectChart?: Function;
-    allSubjectList?: any[];
     analysisSubjectType?: analysisSubjectType;
     onChangeSubjectType: (type: string) => void;
 }

package/es/types.d.ts

@@ -15,6 +15,7 @@ export interface AnalysisSubject {
     unit?: string;
     subjectAlias?: string;
     subjectName?: string;
+    analysisSubjectType?: string;
 }
 export interface eventProps {
     id?: number;
@@ -25,6 +26,7 @@ export interface eventProps {
 }
 export interface SearchValue {
     id?: number;
+    eventIds?: number[];
     eventGroupId?: number;
     name?: string;
     platform?: number;

package/es/utils/formData.js

@@ -36,7 +36,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
       }));
     }
   }];
-  if (userGroup.length > 1 || userGroup[0] !== 0) {
+  if (!(searchData === null || searchData === void 0 ? void 0 : searchData.analysisSubject) && (userGroup.length > 1 || userGroup[0] !== 0)) {
     data.push({
       title: '用户群',
       width: 150,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/modules-event",
-    "version": "0.1.5-event.5",
+    "version": "0.1.5-event.51",
     "scripts": {
         "start": "dumi dev",
         "docs:build": "dumi build",
@@ -36,7 +36,7 @@
         "@types/lodash": "^4.14.191",
         "@umijs/fabric": "^2.8.1",
         "@umijs/test": "^3.0.5",
-        "@zgfe/business-lib": "1.1.89-qirui.3",
+        "@zgfe/business-lib": "1.1.89-qirui.19",
         "antd": "^4.22.6",
         "dumi": "^1.1.0",
         "echarts": "^5.3.2",
@@ -49,7 +49,7 @@
         "react": "^16.12.0 || ^17.0.0",
         "yorkie": "^2.0.0"
     },
-    "gitHead": "ac609e4c3e8d783016cac54006054c6f91521bf8",
+    "gitHead": "ac3983bc489976f9307f66288430d73a14f29049",
     "dependencies": {
         "react-copy-to-clipboard": "^5.1.0",
         "react-highlight": "^0.15.0"