@zgfe/modules-event 0.1.5-event.4 → 0.1.5-event.42

package/es/modules/content/index.js

@@ -1,6 +1,6 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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); }
@@ -8,7 +8,7 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 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 { ajax, BizGlobalDataContext, BizLayout, BizTargetFromPanelContext } from '@zgfe/business-lib';
 import { message } from 'antd';
@@ -63,18 +63,20 @@ var EventContent = function EventContent(props) {
     handleSearch = _useContext3.handleSearch;
   var collapseRef = useRef();
   var chartRef = useRef();
-  var _useState11 = useState([]),
+  var _useState11 = useState('user'),
     _useState12 = _slicedToArray(_useState11, 2),
-    allSubjectList = _useState12[0],
-    setAllSubjectList = _useState12[1];
-  var _useState13 = useState('user'),
+    analysisSubjectType = _useState12[0],
+    setAnalysisSubjectType = _useState12[1];
+  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    analysisSubjectType = _useState14[0],
-    setAnalysisSubjectType = _useState14[1];
-  var _useState15 = useState(false),
+    subDisplay = _useState14[0],
+    setSubDisplay = _useState14[1];
+  var _useState15 = useState({
+      analysisIndex: 'number'
+    }),
     _useState16 = _slicedToArray(_useState15, 2),
-    subDisplay = _useState16[0],
-    setSubDisplay = _useState16[1];
+    dimension = _useState16[0],
+    setDimension = _useState16[1];
   useEffect(function () {
     if (timer) clearTimeout(timer);
     var flag = true;
@@ -103,31 +105,12 @@ var EventContent = function EventContent(props) {
     }).then(function (res) {
       if (!res) return;
       setSubDisplay(res.data);
-      if (res.data) queryAllSubject();
     });
   }
-  var queryAllSubject = function queryAllSubject() {
-    ajax(Apis.queryAllSubjectApi, {
-      method: 'post',
-      data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
-      }
-    }).then(function (res) {
-      if (!res) return;
-      res === null || res === void 0 ? void 0 : res.data.forEach(function (item) {
-        item.name = item.subjectAlias || item.subjectName;
-        item.subjectId = item.id;
-      });
-      setAllSubjectList(res.data);
-    });
-  };
   var fetchRequest = function fetchRequest(flag) {
-    if (JSON.stringify(searchData) === JSON.stringify(finalSearchData)) {
-      return;
-    }
     if (flag !== undefined) ajaxFlag = flag;
+    if (analysisSubjectType === 'eventProp' && !searchData.analysisSubject) return;
     if (!ajaxFlag) return;
-    if (analysisSubjectType === 'event' && !searchData.analysisSubject) return;
     setLoading(true);
     setEventData(undefined);
     if (typeof cancel === 'function') {
@@ -154,7 +137,7 @@ var EventContent = function EventContent(props) {
       if (['bar', 'pie', 'map'].indexOf(searchData.chartType) !== -1) {
         _data = getSortData(_data);
       }
-      if ((searchData === null || searchData === void 0 ? void 0 : (_searchData$userGroup = searchData.userGroup) === null || _searchData$userGroup === void 0 ? void 0 : _searchData$userGroup.length) > 1) {
+      if (searchData && (searchData === null || searchData === void 0 ? void 0 : searchData.userGroup) && (searchData === null || searchData === void 0 ? void 0 : (_searchData$userGroup = searchData.userGroup) === null || _searchData$userGroup === void 0 ? void 0 : _searchData$userGroup.length) > 1) {
         setEventData(getUserGroupsCompareData(_data));
       } else {
         setEventData(_data);
@@ -191,10 +174,16 @@ var EventContent = function EventContent(props) {
         dimension: data.dimension,
         filters: data.filters,
         id: data.id,
+        eventIds: data.eventIds,
         name: data.name
       }, data), {}, {
-        userGroup: data.analysisSubject ? undefined : data.userGroup,
-        analysisSubject: data.analysisSubject ? data.analysisSubject : undefined
+        userGroup: data.analysisSubject ? [] : data.userGroup,
+        analysisSubject: data.analysisSubject ? data.analysisSubject : undefined,
+        analysisAttr: undefined,
+        analysisIndex: 'number'
+      });
+      setDimension({
+        analysisIndex: 'number'
       });
       return _objectSpread({}, _data);
     });
@@ -231,11 +220,11 @@ var EventContent = function EventContent(props) {
     topPanel: /*#__PURE__*/React.createElement(TopPanel, {
       ref: collapseRef,
       onChange: onChangeSearch,
+      loading: loading,
       value: searchData,
       ajaxFlag: ajaxFlag,
       subDisplay: subDisplay,
       setIsCity: setIsCity,
-      allSubjectList: allSubjectList,
       setEnableSelectChart: setEnableSelectChart,
       finalSearchData: finalSearchData,
       fetchRequest: fetchRequest,
@@ -253,6 +242,8 @@ var EventContent = function EventContent(props) {
     eventId: eventId,
     enableSelectChart: enableSelectChart,
     onChange: onChangeContent,
+    dimension: dimension,
+    setDimension: setDimension,
     analysisSubjectType: analysisSubjectType
   }), /*#__PURE__*/React.createElement(ContentPanel, {
     ref: chartRef,

package/es/modules/content/utils.js

@@ -1,6 +1,6 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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); }
@@ -16,7 +16,7 @@ export var judgeFilterValue = function judgeFilterValue(data, count) {
     }
     data.conditions.map(function (item) {
       var _item$values;
-      if (item.values && (((_item$values = item.values) === null || _item$values === void 0 ? void 0 : _item$values.length) <= 0 || item.values[0] === '')) flag = false;
+      if (item.values && (((_item$values = item.values) === null || _item$values === void 0 ? void 0 : _item$values.length) <= 0 || item.values[0] === '') && !((item === null || item === void 0 ? void 0 : item.operator) && /^is null$|^is not null$/.test(item === null || item === void 0 ? void 0 : item.operator))) flag = false;
     });
   }
   return flag;

package/es/modules/home/demo/create.js

@@ -2,7 +2,7 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 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, { useEffect, useState } from 'react';
 import { DemoWrapper, setGlobalConfig } from '@zgfe/business-lib';

package/es/modules/home/demo/edit.js

@@ -2,7 +2,7 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 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, { useEffect, useState } from 'react';
 import { DemoWrapper, setGlobalConfig } from '@zgfe/business-lib';
@@ -11,9 +11,31 @@ import { requestConfig } from '../../../utils/ajaxConfig';
 import { Button } from 'antd';
 var defaultValue = {
   enlarged: 0,
-  id: 247162,
+  id: 247329,
   isPerfect: 1,
-  name: '008',
+  name: '事件分析-饼图和表格',
+  data: {
+    appId: 461,
+    platform: 0,
+    module: 'event',
+    userGroup: [0],
+    time: {
+      begin: '2023-10-13',
+      end: '2023-10-20',
+      relative: [7, 0],
+      unit: 'day'
+    },
+    chartType: 'pie,grid',
+    dimension: {
+      propCategory: 'userProp',
+      category: 'fixed',
+      value: 'current_area',
+      id: 0
+    },
+    id: 24292408,
+    name: '免费注册-点击选择职位',
+    analysisIndex: 'number'
+  },
   reqParam: {
     data: {
       appId: 461,
@@ -21,31 +43,23 @@ var defaultValue = {
       module: 'event',
       userGroup: [0],
       time: {
-        begin: '2023-10-05',
-        end: '2023-10-12',
+        begin: '2023-10-13',
+        end: '2023-10-20',
         relative: [7, 0],
         unit: 'day'
       },
-      chartType: 'line',
-      eventGroupId: 4339,
+      chartType: 'pie,grid',
+      dimension: {
+        propCategory: 'userProp',
+        category: 'fixed',
+        value: 'current_area',
+        id: 0
+      },
+      id: 24292408,
+      name: '免费注册-点击选择职位',
       analysisIndex: 'number'
     },
-    chosen_data: ['首页-点击即刻体验demo', '首页-点击免费试用', '智能辅助API调用事件']
-  },
-  data: {
-    appId: 461,
-    platform: 0,
-    module: 'event',
-    userGroup: [0],
-    time: {
-      begin: '2023-10-05',
-      end: '2023-10-12',
-      relative: [14, 0],
-      unit: 'day'
-    },
-    chartType: 'line',
-    eventGroupId: 4339,
-    analysisIndex: 'number'
+    chosen_data: []
   },
   type: 0,
   unExistEvent: ''

package/es/modules/home/demo/index.js

@@ -2,11 +2,11 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 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 { DemoWrapper, setGlobalConfig } from '@zgfe/business-lib';
 import React, { useEffect, useState } from 'react';
-import { ModuleEvent } from '../../../index';
+import { ModuleEvent } from '@zgfe/modules-event';
 import './styles/index.less';
 import { requestConfig } from '../../../utils/ajaxConfig';
 import { Button } from 'antd';
@@ -40,7 +40,7 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 303
+    defaultApp: 287
   }, isDetail ? /*#__PURE__*/React.createElement("div", null, JSON.stringify(detailParams), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       return setIsDetail(false);

package/es/modules/home/demo/scene.js

@@ -2,7 +2,7 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 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, { useEffect, useState } from 'react';
 import { DemoWrapper, setGlobalConfig } from '@zgfe/business-lib';

package/es/modules/home/index.js

@@ -1,6 +1,6 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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); }
@@ -8,7 +8,7 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 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, { useContext, useEffect, useState } from 'react';
 import { Spin } from 'antd';

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,55 +45,56 @@ 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;
+    console.log('查询参数', data);
+    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",
@@ -104,37 +109,35 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
         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")
   }, /*#__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"
   }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
@@ -143,33 +146,62 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   })) : /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u4E3B\u4F53\u540D\u79F0",
     name: "analysisSubject",
-    className: "".concat(classPrefix, "-form-event")
+    className: "".concat(classPrefix, "-form-event"),
+    rules: [{
+      validator: function validator(_rule, value) {
+        if (value && value.id) {
+          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"),
+    rules: [{
+      validator: function validator(_rule, value) {
+        var _value$filters, _value$filters$condit;
+        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"))));
 });