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

package/es/components/eventFilter/index.js

@@ -185,7 +185,7 @@ var EventFilter = function EventFilter(props) {
     placeholder: "\u8BF7\u9009\u62E9\u4E8B\u4EF6"
   }), eventOverview && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(BizAttributeSelector, {
     enableEventProp: true,
-    enableUserProp: analysisSubjectType === 'user',
+    enableUserProp: analysisSubjectType === 'event' ? false : true,
     enableEnvProp: true,
     eventIdList: [event.id],
     value: bizAttributeSelectorValue,

package/es/constants/apis.d.ts

@@ -3,5 +3,6 @@ declare const Apis: {
     getEventDataSql: string;
     eventDownloadReport: string;
     queryAllSubjectApi: string;
+    querySubDisplayApi: string;
 };
 export default Apis;

package/es/constants/apis.js

@@ -2,6 +2,7 @@ var Apis = {
   dataList: '/zg/web/v2/data/eventDataList',
   getEventDataSql: '/zg/web/v2/dataSql/getEventDataSql',
   eventDownloadReport: '/zg/web/v2/data/eventDownloadReport',
-  queryAllSubjectApi: '/zg/web/v2/analysisSubject/queryAllSubject'
+  queryAllSubjectApi: '/zg/web/v2/analysisSubject/queryAllSubject',
+  querySubDisplayApi: '/zg/web/v2/analysisSubject/querySubDisplay'
 };
 export default Apis;

package/es/modules/content/index.js

@@ -71,6 +71,10 @@ var EventContent = function EventContent(props) {
     _useState14 = _slicedToArray(_useState13, 2),
     analysisSubjectType = _useState14[0],
     setAnalysisSubjectType = _useState14[1];
+  var _useState15 = useState(false),
+    _useState16 = _slicedToArray(_useState15, 2),
+    subDisplay = _useState16[0],
+    setSubDisplay = _useState16[1];
   useEffect(function () {
     if (timer) clearTimeout(timer);
     var flag = true;
@@ -88,8 +92,20 @@ var EventContent = function EventContent(props) {
     handleSearch && handleSearch(loading);
   }, [loading]);
   useEffect(function () {
-    queryAllSubject();
+    querySubDisplay();
   }, []);
+  function querySubDisplay() {
+    ajax(Apis.querySubDisplayApi, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+      }
+    }).then(function (res) {
+      if (!res) return;
+      setSubDisplay(res.data);
+      if (res.data) queryAllSubject();
+    });
+  }
   var queryAllSubject = function queryAllSubject() {
     ajax(Apis.queryAllSubjectApi, {
       method: 'post',
@@ -111,6 +127,7 @@ var EventContent = function EventContent(props) {
     }
     if (flag !== undefined) ajaxFlag = flag;
     if (!ajaxFlag) return;
+    if (analysisSubjectType === 'event' && !searchData.analysisSubject) return;
     setLoading(true);
     setEventData(undefined);
     if (typeof cancel === 'function') {
@@ -132,7 +149,7 @@ var EventContent = function EventContent(props) {
         return;
       }
       var result = res.data;
-      var _data = searchData.dimension ? result : getChartDataEventAliasName(result, eventGroupList || []);
+      var _data = searchData.dimension ? result : getChartDataEventAliasName(result, eventGroupList);
       setShowList(_data ? getDefaultShow(_data) : []);
       if (['bar', 'pie', 'map'].indexOf(searchData.chartType) !== -1) {
         _data = getSortData(_data);
@@ -216,6 +233,7 @@ var EventContent = function EventContent(props) {
       onChange: onChangeSearch,
       value: searchData,
       ajaxFlag: ajaxFlag,
+      subDisplay: subDisplay,
       setIsCity: setIsCity,
       allSubjectList: allSubjectList,
       setEnableSelectChart: setEnableSelectChart,

package/es/modules/topPanel/index.js

@@ -17,7 +17,8 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     fetchRequest = props.fetchRequest,
     setIsCity = props.setIsCity,
     setEnableSelectChart = props.setEnableSelectChart,
-    allSubjectList = props.allSubjectList;
+    allSubjectList = props.allSubjectList,
+    subDisplay = props.subDisplay;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     searchDisabled = _useState2[0],
@@ -112,7 +113,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     },
     scrollToFirstError: true,
     onValuesChange: onValuesChange
-  }, /*#__PURE__*/React.createElement(Form.Item, {
+  }, !subDisplay ? null : /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5206\u6790\u4E3B\u4F53",
     className: "".concat(classPrefix, "-form-event")
   }, /*#__PURE__*/React.createElement(BizSelect, {
@@ -158,7 +159,8 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     setSearchDisabled: setSearchDisabled,
     countChange: countChange,
     setIsCity: setIsCity,
-    setEnableSelectChart: setEnableSelectChart
+    setEnableSelectChart: setEnableSelectChart,
+    analysisSubjectType: analysisSubjectType.value
   })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-form-botton-box ").concat(marginStyle ? 'margin-style' : '')
   }, /*#__PURE__*/React.createElement(Button, {

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

@@ -34,6 +34,7 @@ export interface TopPanelProps {
     value?: SearchValue;
     onChange: (data: SearchValue, flag: boolean) => void;
     ajaxFlag: boolean;
+    subDisplay?: boolean;
     finalSearchData?: SearchValue;
     fetchRequest: (flag?: boolean) => void;
     setIsCity?: Function;

package/es/utils/formData.js

@@ -247,7 +247,8 @@ export function getWarningId(searchData, eventData, eventGroupList) {
       if (eventGroupList && eventGroupList.length > 0 && eventData) {
         eventGroupList.map(function (item) {
           item.eventList.map(function (_item) {
-            var _name = eventData.series[0].names[searchData.userGroup.length > 1 ? 1 : 0];
+            var _eventData$series$, _searchData$userGroup;
+            var _name = eventData === null || eventData === void 0 ? void 0 : (_eventData$series$ = eventData.series[0]) === null || _eventData$series$ === void 0 ? void 0 : _eventData$series$.names[(searchData === null || searchData === void 0 ? void 0 : (_searchData$userGroup = searchData.userGroup) === null || _searchData$userGroup === void 0 ? void 0 : _searchData$userGroup.length) > 1 ? 1 : 0];
             if (_item.name === _name || _item.alias === _name) {
               id = _item.id;
             }

package/package.json

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