@zgfe/modules-interval 1.0.3-alpha.8 → 1.0.3-alpha.9

package/dist/esm/components/eventFilter/index.js

@@ -12,7 +12,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Switch, Tooltip, message } from 'antd';
 import React, { useEffect, useRef, useState } from 'react';
-import { BizEventSelector, IconFont, BizAttrConditionGroup } from '@zgfe/business-lib';
+import { BizEventSelector, IconFont, BizAttrConditionGroup, useChanged } from '@zgfe/business-lib';
 import "./styles/index.less";
 import _ from 'lodash';
 var classPrefix = 'interval-box';
@@ -59,7 +59,7 @@ var EventFilter = function EventFilter(props) {
     setBizAttributeSelectorValue = _useState14[1];
 
   // 初始化
-  useEffect(function () {
+  useChanged(function () {
     if (props.value) {
       var _data = props.value;
       if (_data && _data.id) {
@@ -80,8 +80,17 @@ var EventFilter = function EventFilter(props) {
           key: _data.dimension.propCategory === 'eventProp' ? _data.dimension.value : _data.dimension.propCategory + '-' + _data.dimension.value
         }));
       }
+    } else {
+      setEvent({
+        id: null,
+        name: ''
+      });
+      setEventOverview(false);
+      setFilter(undefined);
+      setBizAttributeSelectorValue(undefined);
+      setRelevancy(false);
     }
-  }, []);
+  }, props.value);
 
   // 添加筛选
   var onAdd = function onAdd() {

package/dist/esm/constants/apis.js

@@ -9,7 +9,8 @@ var Apis = {
   /**
    * 主体下钻
    */
-  subjectDrill: '/interval/eventDrill'
+  subjectDrill: '/interval/eventDrill',
+  querySubjectDisplay: '/analysisSubject/querySubDisplay'
 };
 for (var key in Apis) {
   Apis[key] = "/zg/web/v2".concat(Apis[key]);

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

@@ -88,6 +88,7 @@ var EventContent = function EventContent(props) {
         setIsCity(judgeIsCity(_attrName));
       }
     }
+    if (!searchData || !searchData.analysisModel) return;
     if (timer) clearTimeout(timer);
     var flag = true;
     timer = setTimeout(function () {

package/dist/esm/modules/home/demo/index.js

@@ -39,7 +39,6 @@ export default (function () {
       return setIsDetail(false);
     }
   }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(ModuleInterval, {
-    defaultValue: searchParams,
     afterEditTarget: afterEditTarget,
     onUserDrill: onUserDrill,
     onJumpWarning: function onJumpWarning() {}

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

@@ -12,12 +12,12 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useState } from 'react';
 import { Spin } from 'antd';
-import { BizGlobalDataContext, BizTargetFromPanel } from '@zgfe/business-lib';
+import { BizGlobalDataContext, BizTargetFromPanel, ajax } from '@zgfe/business-lib';
 import "./styles/index.less";
 import { IntervalContext } from "../../types";
 import { getInitDate } from "../../constants/initData";
 import EventContent from "../content";
-import { chartTypes } from "../../constants";
+import { Apis, chartTypes } from "../../constants";
 var classPrefix = 'interval-module-container';
 var ModuleInterval = function ModuleInterval(props) {
   // 属性
@@ -36,43 +36,52 @@ var ModuleInterval = function ModuleInterval(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
-  var _useState5 = useState(true),
-    _useState6 = _slicedToArray(_useState5, 2),
-    pageLoading = _useState6[0],
-    setPageLoading = _useState6[1];
   // 指标标题
+  var _useState5 = useState(),
+    _useState6 = _slicedToArray(_useState5, 2),
+    title = _useState6[0],
+    setTitle = _useState6[1];
   var _useState7 = useState(),
     _useState8 = _slicedToArray(_useState7, 2),
-    title = _useState8[0],
-    setTitle = _useState8[1];
+    panelId = _useState8[0],
+    setPanelId = _useState8[1];
   var _useState9 = useState(),
     _useState10 = _slicedToArray(_useState9, 2),
-    panelId = _useState10[0],
-    setPanelId = _useState10[1];
+    elementId = _useState10[0],
+    setElementId = _useState10[1];
   var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    elementId = _useState12[0],
-    setElementId = _useState12[1];
-  var _useState13 = useState(),
+    showList = _useState12[0],
+    setShowList = _useState12[1];
+  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    showList = _useState14[0],
-    setShowList = _useState14[1];
+    subjectEnable = _useState14[0],
+    setSubjectEnable = _useState14[1];
   // 初始化
   useEffect(function () {
-    setPageLoading(true);
-    // 设置初始值
-    if (!props.defaultValue) {
-      initSearch();
-    } else {
-      setShowList(props.defaultValue.chosen_data);
-      setPanelId(props.defaultValue.panelId);
-      setElementId(props.defaultValue.id);
-      setTitle(props.defaultValue.name);
-      setSearchData(props.defaultValue.data);
-    }
-    setTimeout(function () {
-      setPageLoading(false);
-    }, 0);
+    setLoading(true);
+    ajax(Apis.querySubjectDisplay, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+      }
+    }).then(function (res) {
+      if (!res) return;
+      setSubjectEnable(res.data);
+      // 设置初始值
+      if (!props.defaultValue) {
+        initSearch();
+      } else {
+        setShowList(props.defaultValue.chosen_data);
+        setPanelId(props.defaultValue.panelId);
+        setElementId(props.defaultValue.id);
+        setTitle(props.defaultValue.name);
+        setSearchData(props.defaultValue.data);
+      }
+      setTimeout(function () {
+        setLoading(false);
+      });
+    });
   }, []);
 
   // 查询条件初始化
@@ -83,14 +92,6 @@ var ModuleInterval = function ModuleInterval(props) {
       chartType: 'line'
     });
   };
-
-  // 改变loading
-  var changeLoading = function changeLoading(flag) {
-    setLoading(flag);
-  };
-  if (pageLoading) {
-    return /*#__PURE__*/React.createElement(Spin, null);
-  }
   return /*#__PURE__*/React.createElement(Spin, {
     spinning: loading,
     wrapperClassName: classPrefix
@@ -121,10 +122,11 @@ var ModuleInterval = function ModuleInterval(props) {
       userPropList: userPropList,
       searchData: searchData,
       setSearchData: setSearchData,
+      subjectEnable: subjectEnable,
       panelName: title,
       includeToday: props.includeToday,
       enableAddScene: props.defaultValue && props.defaultValue.enableAddScene === false ? false : true,
-      changeLoading: changeLoading,
+      changeLoading: setLoading,
       afterEditTarget: props.afterEditTarget,
       onUserDrill: props.onUserDrill,
       onJumpWarning: props.onJumpWarning

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

@@ -10,12 +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 React, { useContext, useState } from 'react';
 import { Form, Button, Radio } from 'antd';
 import { BizAttributeSelector, BizSelect, BizUserGroupHeader, useSubject } from '@zgfe/business-lib';
 import EventFilter from "../../components/eventFilter";
 import "./styles/index.less";
 import { AnalysisMode } from "./types";
+import { IntervalContext } from "../../types";
 var classPrefix = 'top-panel-interval';
 var TopPanel = function TopPanel(props) {
   var _props$defaultValue, _props$defaultValue2, _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;
@@ -47,7 +48,9 @@ var TopPanel = function TopPanel(props) {
   var _useSubject = useSubject(),
     subjectList = _useSubject.subjectList,
     subjectLoading = _useSubject.loading;
-  var _ref = defaultValue,
+  var _useContext = useContext(IntervalContext),
+    subjectEnable = _useContext.subjectEnable;
+  var _ref = defaultValue || {},
     userGroup = _ref.userGroup;
   // 细分属性初始值
   var _useState9 = useState(),
@@ -200,7 +203,7 @@ var TopPanel = function TopPanel(props) {
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5206\u6790\u4E3B\u4F53",
     className: "panel-form-interval-item"
-  }, /*#__PURE__*/React.createElement(BizSelect, {
+  }, subjectEnable && /*#__PURE__*/React.createElement(BizSelect, {
     options: [{
       label: '用户',
       value: 'user'
@@ -251,7 +254,8 @@ var TopPanel = function TopPanel(props) {
   }, /*#__PURE__*/React.createElement(EventFilter, {
     subject: currentSubject,
     relevancyFl: relevancyFl,
-    relevancy: true
+    relevancy: true,
+    key: "begin"
   })), relevancy ? /*#__PURE__*/React.createElement(Form.Item, {
     className: "associated"
   }, /*#__PURE__*/React.createElement("span", {
@@ -315,7 +319,8 @@ var TopPanel = function TopPanel(props) {
     label: "\u7ED3\u675F\u4E8B\u4EF6",
     name: "end"
   }, /*#__PURE__*/React.createElement(EventFilter, {
-    subject: currentSubject
+    subject: currentSubject,
+    key: "end"
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u6309\u5C5E\u6027\u7EC6\u5206",
     name: "dimension",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.3-alpha.8",
+  "version": "1.0.3-alpha.9",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -62,5 +62,5 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "afc143a039748d6883dc2f158adf9e9616040658"
+  "gitHead": "325209c1f59d1221625901e25e3755aaba5465c9"
 }