@zgfe/modules-event 0.1.5-event.26 → 0.1.5-event.27

package/es/components/searchPanel/index.js

@@ -20,7 +20,9 @@ var classPrefix = 'search-panel';
 var SearchPanel = function SearchPanel(props) {
   var _useContext = useContext(EventContext),
     includeToday = _useContext.includeToday;
-  var analysisSubjectType = props.analysisSubjectType;
+  var analysisSubjectType = props.analysisSubjectType,
+    dimension = props.dimension,
+    setDimension = props.setDimension;
   var _useState = useState(props.time || getInitDate(includeToday)),
     _useState2 = _slicedToArray(_useState, 2),
     time = _useState2[0],
@@ -37,12 +39,6 @@ var SearchPanel = function SearchPanel(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     timer = _useState8[0],
     setTimer = _useState8[1];
-  var _useState9 = useState({
-      analysisIndex: 'number'
-    }),
-    _useState10 = _slicedToArray(_useState9, 2),
-    dimension = _useState10[0],
-    setDimension = _useState10[1];
   var currentNormalOptions = useMemo(function () {
     setTimeFlag(false);
     setTimeout(function () {
@@ -73,7 +69,7 @@ var SearchPanel = function SearchPanel(props) {
     if (props.analysisAttr && !props.analysisSubject) {
       _dimension['analysisAttr'] = props.analysisAttr;
     }
-    setDimension(_objectSpread({}, _dimension));
+    setDimension && setDimension(_objectSpread({}, _dimension));
   }, []);
   useEffect(function () {
     if (!props.enableSelectChart && chart.value === 'map') {
@@ -101,7 +97,7 @@ var SearchPanel = function SearchPanel(props) {
   };
   var onDimensionChange = function onDimensionChange(data) {
     console.log('onDimensionChange data', data);
-    setDimension(data);
+    setDimension && setDimension(data);
     props.onChange && props.onChange(_objectSpread({
       time: time,
       chartType: chart.value

package/es/components/searchPanel/types.d.ts

@@ -1,6 +1,7 @@
 import { DatePickerTypes } from '@zgfe/business-lib/es/datePicker/types';
 import { EventChartTypes } from '../../types';
 import { ReactNode } from 'react';
+import { TargetConditionTypes } from '@zgfe/business-lib';
 export interface AnalysisSubject {
     subjectId?: number;
     id?: number;
@@ -22,4 +23,6 @@ export interface SearchPanelProps {
     setEnableSelectChart?: Function;
     analysisSubjectType?: string;
     analysisSubject?: AnalysisSubject;
+    dimension?: TargetConditionTypes.DimensionValue;
+    setDimension?: Function;
 }

package/es/modules/content/index.js

@@ -71,6 +71,12 @@ var EventContent = function EventContent(props) {
     _useState14 = _slicedToArray(_useState13, 2),
     subDisplay = _useState14[0],
     setSubDisplay = _useState14[1];
+  var _useState15 = useState({
+      analysisIndex: 'number'
+    }),
+    _useState16 = _slicedToArray(_useState15, 2),
+    dimension = _useState16[0],
+    setDimension = _useState16[1];
   useEffect(function () {
     if (timer) clearTimeout(timer);
     var flag = true;
@@ -134,7 +140,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 === 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);
@@ -164,6 +170,7 @@ var EventContent = function EventContent(props) {
     });
   };
   var onChangeSearch = function onChangeSearch(data, flag) {
+    console.log('TopPanel查询条件变更,==', data);
     ajaxFlag = flag;
     data.id ? setEventId(data.id) : setEventId(-1);
     setSearchData(function (_searchData) {
@@ -175,7 +182,11 @@ var EventContent = function EventContent(props) {
       }, data), {}, {
         userGroup: data.analysisSubject ? undefined : data.userGroup,
         analysisSubject: data.analysisSubject ? data.analysisSubject : undefined,
-        analysisAttr: undefined
+        analysisAttr: undefined,
+        analysisIndex: 'number'
+      });
+      setDimension({
+        analysisIndex: 'number'
       });
       return _objectSpread({}, _data);
     });
@@ -233,6 +244,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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/modules-event",
-    "version": "0.1.5-event.26",
+    "version": "0.1.5-event.27",
     "scripts": {
         "start": "dumi dev",
         "docs:build": "dumi build",
@@ -49,7 +49,7 @@
         "react": "^16.12.0 || ^17.0.0",
         "yorkie": "^2.0.0"
     },
-    "gitHead": "e9a3d81695a659152e0fdc3df2cff88cfc2f9ed3",
+    "gitHead": "f7b2c42e48a0be0e18a98309adc25c8453b54166",
     "dependencies": {
         "react-copy-to-clipboard": "^5.1.0",
         "react-highlight": "^0.15.0"