@zgfe/modules-interval 1.0.0-interval.2 → 1.0.0-interval.21

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

@@ -22,10 +22,9 @@ import { ContentPanel, SearchPanel } from "../../components";
 import TopPanel from "../topPanel";
 import { message } from 'antd';
 var timer = 0;
-var ajaxFlag = true;
 var CancelToken = Request.CancelToken;
 var cancel;
-var classPrefix = 'event-content';
+var classPrefix = 'interval-content';
 var EventContent = function EventContent(props) {
   // console.log('EventContent', props);
   // 最后的查询数据（防止图表在还没查询时就改变了类型）
@@ -58,10 +57,14 @@ var EventContent = function EventContent(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     isCity = _useState12[0],
     setIsCity = _useState12[1];
-  var _useState13 = useState(-1),
+  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    eventId = _useState14[0],
-    setEventId = _useState14[1];
+    ajaxFlag = _useState14[0],
+    setAjaxFlag = _useState14[1];
+  var _useState15 = useState(-1),
+    _useState16 = _slicedToArray(_useState15, 2),
+    eventId = _useState16[0],
+    setEventId = _useState16[1];
   var _useContext2 = useContext(EventContext),
     searchData = _useContext2.searchData,
     setSearchData = _useContext2.setSearchData,
@@ -90,7 +93,7 @@ var EventContent = function EventContent(props) {
     var flag = true;
     timer = setTimeout(function () {
       if (flag) {
-        fetchRequest();
+        fetchRequest(false);
       }
     }, 500);
     return function () {
@@ -102,11 +105,20 @@ var EventContent = function EventContent(props) {
   useEffect(function () {
     handleSearch && handleSearch(loading);
   }, [loading]);
+  useEffect(function () {
+    if (ajaxFlag) {
+      fetchRequest(true);
+    }
+  }, [ajaxFlag]);
   // 查询
   var fetchRequest = function fetchRequest(flag) {
-    var _searchData$associate, _searchData$associate2, _searchData$associate3;
-    if (flag !== undefined) ajaxFlag = flag;
+    var _searchData$start, _searchData$end, _searchData$associate, _searchData$associate2, _searchData$associate3;
+    if (flag !== undefined) setAjaxFlag(flag);
     if (!ajaxFlag) return;
+    if ((searchData === null || searchData === void 0 ? void 0 : (_searchData$start = searchData.start) === null || _searchData$start === void 0 ? void 0 : _searchData$start.id) === null || (searchData === null || searchData === void 0 ? void 0 : (_searchData$end = searchData.end) === null || _searchData$end === void 0 ? void 0 : _searchData$end.id) === null) {
+      setLoading(false);
+      return;
+    }
     setLoading(true);
     setEventData(undefined);
     // 取消上次未完成的请求
@@ -117,14 +129,12 @@ var EventContent = function EventContent(props) {
       return message.error('您查询的属性不一致，暂不支持查询');
     }
     var params = searchDataParams(searchData);
-    // const params = {"app_id":177,"platform":0,"user_group":"0","time":{"dimension_date":"week","begin_date":"2023-08-07","end_date":"2023-09-04"},"start":{"operator":"and","event_id":16530,"event_name":"查看商品A"},"end":{"operator":"and","event_id":16530,"event_name":"查看商品A"},"dimension":{"sub":"user_attr","category":"fixed","user_attr":"name"}}
-    // console.log(666666, searchData, params);
     props.onChange && props.onChange(searchData);
+    // console.log(77771111, searchData, params);
     ajax(Apis.dataList, {
       method: 'post',
       data: _objectSpread({
-        app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
       }, params),
       cancelToken: new CancelToken(function executor(c) {
         cancel = c;
@@ -147,7 +157,7 @@ var EventContent = function EventContent(props) {
 
   // 改变时间和图表类型
   var onChangeContent = function onChangeContent(data) {
-    ajaxFlag = true;
+    setAjaxFlag(true);
     setSearchData(function (value) {
       return _objectSpread(_objectSpread({}, value), data);
     });
@@ -160,7 +170,7 @@ var EventContent = function EventContent(props) {
 
   // 平台变更
   var platformChange = function platformChange(data) {
-    ajaxFlag = true;
+    setAjaxFlag(true);
     setSearchData(function (_searchData) {
       return _objectSpread(_objectSpread({}, _searchData), {}, {
         platform: data
@@ -170,7 +180,7 @@ var EventContent = function EventContent(props) {
 
   // TopPanel组件数值变更
   var onChangeSearch = function onChangeSearch(data, flag) {
-    ajaxFlag = flag;
+    setAjaxFlag(false);
     data.id ? setEventId(data.id) : setEventId(-1);
     setSearchData(function (_searchData) {
       return _objectSpread(_objectSpread({}, _searchData), data);
@@ -178,20 +188,24 @@ var EventContent = function EventContent(props) {
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TopBar, {
     searchData: searchData,
-    platformChange: platformChange
+    loading: loading,
+    eventData: eventData,
+    platformChange: platformChange,
+    onUserDrill: props.onUserDrill
   }), /*#__PURE__*/React.createElement(BizLayout, {
     showTitle: false,
     hasCollapse: true,
+    className: "interval-layout",
     collapseRef: collapseRef,
-    topPanel: /*#__PURE__*/React.createElement("div", {
-      ref: collapseRef
-    }, /*#__PURE__*/React.createElement(TopPanel, {
+    topPanel: /*#__PURE__*/React.createElement(TopPanel, {
+      collapseRef: collapseRef,
       onChange: onChangeSearch,
       defaultValue: searchData,
       ajaxFlag: ajaxFlag,
+      loading: loading,
       finalSearchData: finalSearchData,
       fetchRequest: fetchRequest
-    }))
+    })
   }, /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement(SearchPanel, {

package/dist/esm/modules/content/styles/index.less

@@ -1,4 +1,4 @@
-.event-content {
+.interval-content {
   &-options {
     display: flex;
     justify-content: flex-end;

package/dist/esm/modules/content/types.d.ts

@@ -1,4 +1,4 @@
-import { SearchValue } from '../../types';
+import { SearchValue, UserDrillParamsProp } from '../../types';
 export declare namespace EventContentProps {
     interface Props {
         /**
@@ -17,6 +17,7 @@ export declare namespace EventContentProps {
          * 是否查询中
          */
         onSearching?: (flag: boolean) => void;
+        onUserDrill: (data: UserDrillParamsProp, searchData: SearchValue) => void;
         /**
          * 查询条件回调
          */

package/dist/esm/modules/content/utils.d.ts

@@ -21,37 +21,35 @@ export declare const judgeIsArea: (name: string | undefined) => boolean;
 export declare const getValue: (param: bizAttributeSelectorValueProp, eventGroupList: EventGroup[] | undefined, eventEnvList: EnvProp[] | undefined, userPropList: UserProp[] | undefined) => AttributeSelect.Value | undefined;
 export declare function searchCondition(params: any): {
     operator: any;
-    event_id: any;
-    event_name: any;
+    eventId: any;
+    eventName: any;
     condition: any;
 };
 export declare function searchDataParams(params: any): {
-    time: {
-        dimension_date: any;
-        begin_date: any;
-        end_date: any;
-    };
-    user_group: any;
+    time: any;
+    platform: any;
+    userGroup: any;
     start: {
         operator: any;
-        event_id: any;
-        event_name: any;
+        eventId: any;
+        eventName: any;
         condition: any;
     };
     end: {
         operator: any;
-        event_id: any;
-        event_name: any;
+        eventId: any;
+        eventName: any;
         condition: any;
     };
     dimension: {
         sub: any;
         category: any;
-        attr_id: any;
-        user_attr: any;
-        event_attr: any;
+        attrId: any;
+        userAttr: any;
+        eventAttr: any;
         event: any;
-    };
-    associated_pre_attr: any;
-    associated_next_attr: any;
+    } | null;
+    associatedPreAttr: any;
+    associatedNextAttr: any;
 };
+export declare function transformData(data: any[][]): string[];

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

@@ -1,3 +1,9 @@
+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); }
 /**
  * 判断当前细分属性是否为”城市“
  * @param name 属性名称
@@ -58,14 +64,14 @@ export function searchCondition(params) {
   };
   return {
     operator: (params === null || params === void 0 ? void 0 : (_params$filters = params.filters) === null || _params$filters === void 0 ? void 0 : _params$filters.relation) || 'and',
-    event_id: params === null || params === void 0 ? void 0 : params.id,
-    event_name: params === null || params === void 0 ? void 0 : params.name,
+    eventId: params === null || params === void 0 ? void 0 : params.id,
+    eventName: params === null || params === void 0 ? void 0 : params.name,
     condition: params === null || params === void 0 ? void 0 : (_params$filters2 = params.filters) === null || _params$filters2 === void 0 ? void 0 : _params$filters2.conditions.map(function (item) {
       return {
         name: item === null || item === void 0 ? void 0 : item.attrName,
         attrId: item === null || item === void 0 ? void 0 : item.attrId,
         params: item === null || item === void 0 ? void 0 : item.values,
-        attr_sub: (item === null || item === void 0 ? void 0 : item.propCategory) === 'userProp' ? 'user_attr' : (item === null || item === void 0 ? void 0 : item.propCategory) === 'eventProp' ? 'event_attr' : item === null || item === void 0 ? void 0 : item.attrName,
+        attrSub: (item === null || item === void 0 ? void 0 : item.propCategory) === 'userProp' ? 'user_attr' : (item === null || item === void 0 ? void 0 : item.propCategory) === 'eventProp' ? 'event_attr' : item === null || item === void 0 ? void 0 : item.attrName,
         category: (item === null || item === void 0 ? void 0 : item.category) || 'custom',
         attrType: numAttrTypeMap[item === null || item === void 0 ? void 0 : item.type],
         operator: item === null || item === void 0 ? void 0 : item.operator
@@ -74,25 +80,30 @@ export function searchCondition(params) {
   };
 }
 export function searchDataParams(params) {
-  var _params$time, _params$time2, _params$time3, _params$userGroup$, _params$dimension, _params$dimension2, _params$dimension3, _params$dimension4, _params$dimension5, _params$dimension6, _params$dimension7, _params$dimension8, _params$dimension9, _params$dimension10, _params$dimension11, _params$associatedPre, _params$associatedNex;
+  var _params$dimension, _params$dimension2, _params$dimension3, _params$dimension4, _params$dimension5, _params$dimension6, _params$dimension7, _params$dimension8, _params$dimension9, _params$dimension10, _params$dimension11, _params$dimension12, _params$associatedPre, _params$associatedNex;
   return {
-    time: {
-      dimension_date: params === null || params === void 0 ? void 0 : (_params$time = params.time) === null || _params$time === void 0 ? void 0 : _params$time.unit,
-      begin_date: params === null || params === void 0 ? void 0 : (_params$time2 = params.time) === null || _params$time2 === void 0 ? void 0 : _params$time2.begin,
-      end_date: params === null || params === void 0 ? void 0 : (_params$time3 = params.time) === null || _params$time3 === void 0 ? void 0 : _params$time3.end
-    },
-    user_group: (_params$userGroup$ = params.userGroup[0]) === null || _params$userGroup$ === void 0 ? void 0 : _params$userGroup$.id,
+    time: _objectSpread({}, params === null || params === void 0 ? void 0 : params.time),
+    platform: (params === null || params === void 0 ? void 0 : params.platform) || 0,
+    userGroup: params.userGroup,
     start: searchCondition(params === null || params === void 0 ? void 0 : params.start),
     end: searchCondition(params === null || params === void 0 ? void 0 : params.end),
-    dimension: {
-      sub: (params === null || params === void 0 ? void 0 : (_params$dimension = params.dimension) === null || _params$dimension === void 0 ? void 0 : _params$dimension.propCategory) === 'userProp' ? 'user_attr' : (params === null || params === void 0 ? void 0 : (_params$dimension2 = params.dimension) === null || _params$dimension2 === void 0 ? void 0 : _params$dimension2.propCategory) === 'eventProp' ? 'event_attr' : params === null || params === void 0 ? void 0 : (_params$dimension3 = params.dimension) === null || _params$dimension3 === void 0 ? void 0 : _params$dimension3.name,
-      category: (params === null || params === void 0 ? void 0 : (_params$dimension4 = params.dimension) === null || _params$dimension4 === void 0 ? void 0 : _params$dimension4.category) || 'custom',
-      attr_id: params === null || params === void 0 ? void 0 : (_params$dimension5 = params.dimension) === null || _params$dimension5 === void 0 ? void 0 : _params$dimension5.id,
-      user_attr: (params === null || params === void 0 ? void 0 : (_params$dimension6 = params.dimension) === null || _params$dimension6 === void 0 ? void 0 : _params$dimension6.propCategory) === 'userProp' ? params === null || params === void 0 ? void 0 : (_params$dimension7 = params.dimension) === null || _params$dimension7 === void 0 ? void 0 : _params$dimension7.dimensionSub : null,
-      event_attr: (params === null || params === void 0 ? void 0 : (_params$dimension8 = params.dimension) === null || _params$dimension8 === void 0 ? void 0 : _params$dimension8.propCategory) === 'eventProp' ? params === null || params === void 0 ? void 0 : (_params$dimension9 = params.dimension) === null || _params$dimension9 === void 0 ? void 0 : _params$dimension9.label : null,
-      event: (params === null || params === void 0 ? void 0 : (_params$dimension10 = params.dimension) === null || _params$dimension10 === void 0 ? void 0 : _params$dimension10.propCategory) !== 'envProp' ? params === null || params === void 0 ? void 0 : (_params$dimension11 = params.dimension) === null || _params$dimension11 === void 0 ? void 0 : _params$dimension11.eventId : null
-    },
-    associated_pre_attr: params === null || params === void 0 ? void 0 : (_params$associatedPre = params.associatedPreAttr) === null || _params$associatedPre === void 0 ? void 0 : _params$associatedPre.id,
-    associated_next_attr: params === null || params === void 0 ? void 0 : (_params$associatedNex = params.associatedNextAttr) === null || _params$associatedNex === void 0 ? void 0 : _params$associatedNex.id
+    dimension: params !== null && params !== void 0 && (_params$dimension = params.dimension) !== null && _params$dimension !== void 0 && _params$dimension.propCategory ? {
+      sub: (params === null || params === void 0 ? void 0 : (_params$dimension2 = params.dimension) === null || _params$dimension2 === void 0 ? void 0 : _params$dimension2.propCategory) === 'userProp' ? 'user_attr' : (params === null || params === void 0 ? void 0 : (_params$dimension3 = params.dimension) === null || _params$dimension3 === void 0 ? void 0 : _params$dimension3.propCategory) === 'eventProp' ? 'event_attr' : params === null || params === void 0 ? void 0 : (_params$dimension4 = params.dimension) === null || _params$dimension4 === void 0 ? void 0 : _params$dimension4.name,
+      category: (params === null || params === void 0 ? void 0 : (_params$dimension5 = params.dimension) === null || _params$dimension5 === void 0 ? void 0 : _params$dimension5.category) || 'custom',
+      attrId: params === null || params === void 0 ? void 0 : (_params$dimension6 = params.dimension) === null || _params$dimension6 === void 0 ? void 0 : _params$dimension6.id,
+      userAttr: (params === null || params === void 0 ? void 0 : (_params$dimension7 = params.dimension) === null || _params$dimension7 === void 0 ? void 0 : _params$dimension7.propCategory) === 'userProp' ? params === null || params === void 0 ? void 0 : (_params$dimension8 = params.dimension) === null || _params$dimension8 === void 0 ? void 0 : _params$dimension8.dimensionSub : null,
+      eventAttr: (params === null || params === void 0 ? void 0 : (_params$dimension9 = params.dimension) === null || _params$dimension9 === void 0 ? void 0 : _params$dimension9.propCategory) === 'eventProp' ? params === null || params === void 0 ? void 0 : (_params$dimension10 = params.dimension) === null || _params$dimension10 === void 0 ? void 0 : _params$dimension10.label : null,
+      event: (params === null || params === void 0 ? void 0 : (_params$dimension11 = params.dimension) === null || _params$dimension11 === void 0 ? void 0 : _params$dimension11.propCategory) !== 'envProp' ? params === null || params === void 0 ? void 0 : (_params$dimension12 = params.dimension) === null || _params$dimension12 === void 0 ? void 0 : _params$dimension12.eventId : null
+    } : null,
+    associatedPreAttr: params === null || params === void 0 ? void 0 : (_params$associatedPre = params.associatedPreAttr) === null || _params$associatedPre === void 0 ? void 0 : _params$associatedPre.id,
+    associatedNextAttr: params === null || params === void 0 ? void 0 : (_params$associatedNex = params.associatedNextAttr) === null || _params$associatedNex === void 0 ? void 0 : _params$associatedNex.id
   };
+}
+export function transformData(data) {
+  return data[0].map(function (group) {
+    var _group$, _group$2;
+    var labelGroup = (_group$ = group[1]) === null || _group$ === void 0 ? void 0 : _group$.id;
+    var labelId = (_group$2 = group[2]) === null || _group$2 === void 0 ? void 0 : _group$2.layerLabelId;
+    return "".concat(labelGroup, ":").concat(labelId);
+  });
 }

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

@@ -32,9 +32,6 @@ export default (function () {
   };
   var onUserDrill = function onUserDrill(data, searchData) {
     console.log('onUserDrill:', data, searchData);
-    setIsDetail(true);
-    setSearchParams(searchData);
-    setDetailParams(data);
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,

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

@@ -71,9 +71,6 @@ export default (function () {
   };
   var onUserDrill = function onUserDrill(data, searchData) {
     console.log('onUserDrill:', data, searchData);
-    setIsDetail(true);
-    setSearchParams(searchData);
-    setDetailParams(data);
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,

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

@@ -31,10 +31,7 @@ export default (function () {
     console.log("".concat(type, "\u56DE\u8C03"), data);
   };
   var onUserDrill = function onUserDrill(data, searchData) {
-    console.log('onUserDrill:', data, searchData);
-    setIsDetail(true);
-    setSearchParams(searchData);
-    setDetailParams(data);
+    console.log('onUserDrill:111', data, searchData);
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,

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

@@ -68,9 +68,6 @@ export default (function () {
   };
   var onUserDrill = function onUserDrill(data, searchData) {
     console.log('onUserDrill:', data, searchData);
-    setIsDetail(true);
-    setSearchParams(searchData);
-    setDetailParams(data);
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,

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

@@ -18,7 +18,7 @@ import { EventContext } from "../../types";
 import { getInitDate } from "../../constants/initData";
 import EventContent from "../content";
 import { chartTypes } from "../../constants";
-var classPrefix = 'event-container';
+var classPrefix = 'interval-module-container';
 var ModuleInterval = function ModuleInterval(props) {
   // 属性
   var _useContext = useContext(BizGlobalDataContext),
@@ -131,6 +131,7 @@ var ModuleInterval = function ModuleInterval(props) {
     defaultValue: props.defaultValue ? props.defaultValue.data : undefined,
     value: searchData,
     show: showList,
+    onUserDrill: props.onUserDrill,
     onChange: setSearchData,
     initSearch: initSearch
   })));

package/dist/esm/modules/home/styles/index.less

@@ -3,12 +3,16 @@
   padding: 0;
 }
 
-.event-container {
+.interval-module-container {
   width: 100%;
   min-width: 1000px;
   height: 100%;
   background: #fafafb;
-
+  .interval-layout {
+    .biz-layout-collapse-handle {
+      height: 24px;
+    }
+  }
   &-header-title {
     height: 48px;
     padding: 0px 24px;
@@ -32,7 +36,7 @@
 
   .ant-spin-container {
     width: 100%;
-    height: 100%;
+    height: auto;
   }
 
   .biz-select-option:not(.biz-select-option-multiple),