@zgfe/modules-interval 1.0.0-interval.6 → 1.0.0-interval.8

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

@@ -31,8 +31,8 @@ var EventFilter = function EventFilter(props) {
   var conditionRef = useRef(null);
   // 当前选中的事件
   var _useState5 = useState({
-      id: -100,
-      name: '事件概览'
+      id: null,
+      name: ''
     }),
     _useState6 = _slicedToArray(_useState5, 2),
     event = _useState6[0],
@@ -92,7 +92,6 @@ var EventFilter = function EventFilter(props) {
     setIsAdd(true);
     setTimeout(function () {
       conditionRef.current.add();
-      console.log(333331111, conditionRef, conditionRef.current);
     }, 0);
   };
 
@@ -106,7 +105,7 @@ var EventFilter = function EventFilter(props) {
     }
   };
   var onChangeEvent = function onChangeEvent(event) {
-    if (event && event.event && event.event.id === -100) {
+    if (event && event.event && event.event.id === null) {
       setEventOverview(false);
     } else {
       setEventOverview(true);
@@ -143,7 +142,7 @@ var EventFilter = function EventFilter(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizEventSelector, {
-    showAllEvent: true,
+    showAllEvent: false,
     showBuiltInTarget: false,
     popupContainer: false,
     defaultSelectAble: false,

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

@@ -9,9 +9,9 @@ import React, { useEffect, useState } from 'react';
 import { MiNone, MiSpin } from '..';
 import "./styles/index.less";
 import EventChart from "../../modules/chart";
-var classPrefix = 'render-content';
+var classPrefix = 'render-content-interval';
 var ContentPanel = function ContentPanel(props) {
-  var _eventData$app_data, _eventData$app_data$s;
+  var _eventData$appData, _eventData$appData$se;
   var loading = props.loading,
     eventData = props.eventData,
     searchData = props.searchData;
@@ -41,7 +41,7 @@ var ContentPanel = function ContentPanel(props) {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-chart-container")
-  }, eventData && (_eventData$app_data = eventData.app_data) !== null && _eventData$app_data !== void 0 && (_eventData$app_data$s = _eventData$app_data.series) !== null && _eventData$app_data$s !== void 0 && _eventData$app_data$s.length ? /*#__PURE__*/React.createElement(EventChart, {
+  }, eventData && (_eventData$appData = eventData.appData) !== null && _eventData$appData !== void 0 && (_eventData$appData$se = _eventData$appData.series) !== null && _eventData$appData$se !== void 0 && _eventData$appData$se.length ? /*#__PURE__*/React.createElement(EventChart, {
     type: "grid",
     dataSource: eventData,
     params: searchData,

package/dist/esm/components/renderContent/styles/index.less

@@ -1,4 +1,4 @@
-.render-content {
+.render-content-interval {
   &-chart-container {
     display: flex;
     flex-direction: column;

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

@@ -106,8 +106,9 @@ var SearchPanel = function SearchPanel(props) {
     }
   }, /*#__PURE__*/React.createElement(BizDatePicker, {
     dateTypeList: ['day', 'week', 'month'],
-    defaultValue: time,
-    onChange: onChangeTime
+    value: time,
+    onChange: onChangeTime,
+    selectRange: 365
   }), /*#__PURE__*/React.createElement(BizSelect, {
     multiple: true,
     disable: displaySetupList.length === 0,

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

@@ -10,18 +10,17 @@ 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 { ajax, BizGlobalDataContext, BizTable, IconFont } from '@zgfe/business-lib';
+import { ajax, base64, BizGlobalDataContext, BizTable, IconFont } from '@zgfe/business-lib';
 import React, { useContext, useEffect, useMemo, useState } from 'react';
-import base64 from "../../utils/base64";
 import { Apis } from "../../constants";
 import { message } from 'antd';
 import { formTableData, getColumns } from "../../utils/formData";
 import "./styles/index.less";
-import { getValue, searchDataParams } from "../../modules/content/utils";
+import { searchDataParams } from "../../modules/content/utils";
 import { EventContext } from "../../types";
 var classPrefix = 'mi-interval-table';
 var EventTable = function EventTable(props) {
-  var _dataSource$app_data2;
+  var _dataSource$appData2;
   var dataSource = props.dataSource,
     searchData = props.searchData,
     showList = props.showList;
@@ -67,12 +66,12 @@ var EventTable = function EventTable(props) {
 
   // 表格column
   var columns = useMemo(function () {
-    var _dataSource$app_data;
+    var _dataSource$appData;
     var _searchData$userGroup = searchData.userGroup,
       userGroup = _searchData$userGroup === void 0 ? [0] : _searchData$userGroup;
-    var _getColumns = getColumns(eventGroupList, userPropList, eventEnvList, (dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$app_data = dataSource.app_data) === null || _dataSource$app_data === void 0 ? void 0 : _dataSource$app_data.x_axis) || [], dataSource, userGroup, searchData, showList);
+    var _getColumns = getColumns(eventGroupList, userPropList, eventEnvList, (dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$appData = dataSource.appData) === null || _dataSource$appData === void 0 ? void 0 : _dataSource$appData.x_axis) || [], dataSource, userGroup, searchData, showList);
     return _getColumns;
-  }, [dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$app_data2 = dataSource.app_data) === null || _dataSource$app_data2 === void 0 ? void 0 : _dataSource$app_data2.x_axis, showList, sortTable, panelName]);
+  }, [dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$appData2 = dataSource.appData) === null || _dataSource$appData2 === void 0 ? void 0 : _dataSource$appData2.x_axis, showList, sortTable, panelName]);
 
   // 监听分页变化，如果页码发生变化则调用合并行方法
   var onChangeTable = function onChangeTable(pagination) {
@@ -84,32 +83,17 @@ var EventTable = function EventTable(props) {
 
   // 下载数据
   var download = function download() {
-    var _searchData$userGroup2;
-    var seriesNames = [];
-    // 有用户群
-    if (searchData !== null && searchData !== void 0 && searchData.userGroup && (searchData === null || searchData === void 0 ? void 0 : (_searchData$userGroup2 = searchData.userGroup) === null || _searchData$userGroup2 === void 0 ? void 0 : _searchData$userGroup2.length) > 1) {
-      seriesNames.push(base64.encode('用户群'));
-    }
-    // 有细分属性
-    if (searchData !== null && searchData !== void 0 && searchData.dimension) {
-      seriesNames.push(base64.encode(getValue(searchData === null || searchData === void 0 ? void 0 : searchData.dimension, eventGroupList, eventEnvList, userPropList).label));
-    }
-    // 事件(有事件-无细分属性 || 事件概览)
-    if (searchData.id && !searchData.dimension || !searchData.id) {
-      seriesNames.push(base64.encode('事件'));
-    }
     var obj = searchDataParams(searchData);
     var params = _objectSpread(_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
     }, obj), {}, {
       down: {
-        fname: base64.encode('间隔分析')
+        fname: base64.encode('间隔分析', false)
       }
     });
     ajax(Apis.eventDownloadReport, {
-      method: 'get',
-      params: params,
+      method: 'post',
+      data: params,
       responseType: 'blob',
       fileName: '间隔分析',
       getResponse: true

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

@@ -18,7 +18,7 @@ import { EventContext } from "../../types";
 import { chartTypes, platformOption } from "../../constants/fields";
 var classPrefix = 'modules-interval-topbar';
 var TopBar = function TopBar(props) {
-  // console.log('TopBar', props);
+  var _props$eventData, _props$eventData$appD, _props$eventData$appD2;
   var _useContext = useContext(EventContext),
     panelId = _useContext.panelId,
     afterEditTarget = _useContext.afterEditTarget,
@@ -99,9 +99,10 @@ var TopBar = function TopBar(props) {
     onCancel: function onCancel() {
       return closeHandle('scene');
     }
-  })), /*#__PURE__*/React.createElement(Button, {
+  })), (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) === 2 ? /*#__PURE__*/React.createElement(Button, {
     className: "".concat(classPrefix, "-earlywarning"),
     type: "primary",
+    disabled: (props === null || props === void 0 ? void 0 : (_props$eventData = props.eventData) === null || _props$eventData === void 0 ? void 0 : (_props$eventData$appD = _props$eventData.appData) === null || _props$eventData$appD === void 0 ? void 0 : (_props$eventData$appD2 = _props$eventData$appD.series) === null || _props$eventData$appD2 === void 0 ? void 0 : _props$eventData$appD2.length) === 0,
     onClick: function onClick() {
       props.onUserDrill({
         appId: Number(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId),
@@ -112,7 +113,7 @@ var TopBar = function TopBar(props) {
         url: ''
       }, searchData);
     }
-  }, "\u8BBE\u7F6E\u6D41\u5931\u9884\u8B66"), /*#__PURE__*/React.createElement("div", {
+  }, "\u8BBE\u7F6E\u6D41\u5931\u9884\u8B66") : null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-platform")
   }, platformOption.map(function (item) {
     return /*#__PURE__*/React.createElement("div", {

package/dist/esm/components/topBar/types.d.ts

@@ -1,9 +1,10 @@
-import { SearchValue, UserDrillParamsProp } from '../../types';
+import { ResponseDataProps, SearchValue, UserDrillParamsProp } from '../../types';
 export interface TopBarProps {
     /**
      * @description   标题
      */
     searchData?: SearchValue;
+    eventData?: ResponseDataProps;
     onUserDrill: (data: UserDrillParamsProp, searchData: SearchValue) => void;
     platformChange: (data: number) => void;
 }

package/dist/esm/constants/apis.js

@@ -2,6 +2,6 @@ var Apis = {
   // dataList: '/zg/web/v2/data/eventDataList',
   dataList: '/zg/web/v2/interval/intervalData',
   getEventDataSql: '/zg/web/v2/dataSql/getEventDataSql',
-  eventDownloadReport: '/interval/downLoadintervalData.jsp'
+  eventDownloadReport: '/zg/web/v2/interval/downLoadintervalData'
 };
 export default Apis;

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

@@ -18,7 +18,7 @@ import { Apis } from "../../constants";
 import { Spin } from 'antd';
 import IntervalChart from "./intervalChart";
 var EventChart = function EventChart(props) {
-  var _dataSource$app_data;
+  var _dataSource$appData;
   var params = props.params;
   // 显示内容
   var _useState = useState(),
@@ -81,7 +81,7 @@ var EventChart = function EventChart(props) {
       className: "spin-container"
     });
   }
-  if (!dataSource || !(dataSource !== null && dataSource !== void 0 && (_dataSource$app_data = dataSource.app_data) !== null && _dataSource$app_data !== void 0 && _dataSource$app_data.series.length)) {
+  if (!dataSource || !(dataSource !== null && dataSource !== void 0 && (_dataSource$appData = dataSource.appData) !== null && _dataSource$appData !== void 0 && _dataSource$appData.series.length)) {
     return /*#__PURE__*/React.createElement(MiNone, {
       label: "\u6682\u65E0\u6570\u636E"
     });

package/dist/esm/modules/chart/intervalChart.js

@@ -19,7 +19,7 @@ var IntervalChart = function IntervalChart(props) {
     setOption = _useState2[1];
   useEffect(function () {
     var _props$showList, _seriesData$series;
-    var seriesData = props === null || props === void 0 ? void 0 : (_props$showList = props.showList) === null || _props$showList === void 0 ? void 0 : _props$showList.app_data;
+    var seriesData = props === null || props === void 0 ? void 0 : (_props$showList = props.showList) === null || _props$showList === void 0 ? void 0 : _props$showList.appData;
     var params = props === null || props === void 0 ? void 0 : props.params;
     var eCharts = {
       tooltip: {
@@ -43,7 +43,7 @@ var IntervalChart = function IntervalChart(props) {
         type: 'category',
         boundaryGap: true,
         nameGap: 30,
-        data: convertDateArray(params, seriesData === null || seriesData === void 0 ? void 0 : seriesData.x_axis),
+        data: convertDateArray(params, seriesData === null || seriesData === void 0 ? void 0 : seriesData.xAxis),
         splitArea: {
           show: false
         },

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

@@ -3,7 +3,7 @@ import { SearchValue } from '../../types';
 import { DisplaySetup } from '../../components/searchPanel/types';
 export declare namespace eventChartProps {
     interface ChartTypesProps extends ChartTypes.Value {
-        app_data: any;
+        appData: any;
         xAxis: [];
         x_axis: [];
     }

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

@@ -22,7 +22,6 @@ 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 = 'interval-content';
@@ -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,
@@ -102,10 +105,15 @@ 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;
+    if (flag !== undefined) setAjaxFlag(flag);
     if (!ajaxFlag) return;
     setLoading(true);
     setEventData(undefined);
@@ -117,15 +125,12 @@ var EventContent = function EventContent(props) {
       return message.error('您查询的属性不一致，暂不支持查询');
     }
     var params = searchDataParams(searchData);
-
-    // const params = {"app_id":501909,"platform":0,"user_group":0,"time":{"dimension_date":"day","begin_date":"2023-08-08","end_date":"2023-09-07"},"start":{"operator":"and","event_id":48618641,"event_name":"Webhook事件"},"end":{"operator":"and","event_id":48618641,"event_name":"Webhook事件"}}
     props.onChange && props.onChange(searchData);
-    console.log(77771111, searchData, params);
+    // 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;
@@ -148,7 +153,7 @@ var EventContent = function EventContent(props) {
 
   // 改变时间和图表类型
   var onChangeContent = function onChangeContent(data) {
-    ajaxFlag = true;
+    setAjaxFlag(true);
     setSearchData(function (value) {
       return _objectSpread(_objectSpread({}, value), data);
     });
@@ -161,7 +166,7 @@ var EventContent = function EventContent(props) {
 
   // 平台变更
   var platformChange = function platformChange(data) {
-    ajaxFlag = true;
+    setAjaxFlag(true);
     setSearchData(function (_searchData) {
       return _objectSpread(_objectSpread({}, _searchData), {}, {
         platform: data
@@ -171,7 +176,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);
@@ -179,21 +184,22 @@ var EventContent = function EventContent(props) {
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TopBar, {
     searchData: searchData,
+    eventData: eventData,
     platformChange: platformChange,
     onUserDrill: props.onUserDrill
   }), /*#__PURE__*/React.createElement(BizLayout, {
     showTitle: false,
     hasCollapse: true,
     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/utils.d.ts

@@ -21,37 +21,38 @@ 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;
+        dimensionDate: any;
+        beginDate: any;
+        endDate: any;
     };
-    user_group: 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;
 };

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

@@ -58,14 +58,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 +74,26 @@ 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$time, _params$time2, _params$time3, _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
+      dimensionDate: params === null || params === void 0 ? void 0 : (_params$time = params.time) === null || _params$time === void 0 ? void 0 : _params$time.unit,
+      beginDate: params === null || params === void 0 ? void 0 : (_params$time2 = params.time) === null || _params$time2 === void 0 ? void 0 : _params$time2.begin,
+      endDate: 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,
+    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
   };
 }

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

@@ -1,28 +1,30 @@
+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 _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(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, { useEffect, useState } from 'react';
 import { Form, Button } from 'antd';
 import { BizAttributeSelector, BizUserGroupHeader } from '@zgfe/business-lib';
 import EventFilter from "../../components/eventFilter";
 import "./styles/index.less";
-var classPrefix = 'top-panel';
+import _ from 'lodash';
+var classPrefix = 'top-panel-interval';
 var TopPanel = function TopPanel(props) {
   var defaultValue = props.defaultValue,
-    ajaxFlag = props.ajaxFlag,
-    finalSearchData = props.finalSearchData,
+    loading = props.loading,
+    collapseRef = props.collapseRef,
     fetchRequest = props.fetchRequest;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var _useState = useState(-100),
+  var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     startId = _useState2[0],
     setStartId = _useState2[1];
-  var _useState3 = useState(-100),
+  var _useState3 = useState(null),
     _useState4 = _slicedToArray(_useState3, 2),
     endId = _useState4[0],
     setEndId = _useState4[1];
@@ -47,50 +49,50 @@ var TopPanel = function TopPanel(props) {
   var onValuesChange = function onValuesChange(data, allData) {
     var _data = {};
     if (allData.start) {
-      if (allData.start.id !== -100) {
+      if (allData.start.id !== null) {
         _data = allData.start;
         setStartId(allData.start.id);
-        if (allData.start.relevancy !== undefined) {
-          // form.setFieldsValue({
-          //   associatedPreAttr: undefined,
-          //   associatedNextAttr: undefined,
-          // });
-        }
         setRelevancy(allData.start.relevancy);
       }
     }
     if (allData.end) {
-      if (allData.end.id !== -100) {
+      if (allData.end.id !== null) {
         _data = allData.end;
         setEndId(allData.end.id);
       }
     }
     if (allData.userGroup) {
       _data.userGroup = [];
-      allData.userGroup.map(function (item) {
-        _data.userGroup && _data.userGroup.push(item);
+      var app = allData.userGroup.map(function (item) {
+        if (_.isArray(item)) {
+          return item.map(function (_item) {
+            var _item2 = _slicedToArray(_item, 3),
+              label = _item2[1],
+              layer = _item2[2];
+            var result = [label.labelName];
+            if (layer !== null && layer !== void 0 && layer.layerLabelName) {
+              result.push(layer.layerLabelName);
+            }
+            return result.join(':');
+          });
+        } else if (_typeof(item) === 'object' && item !== null && 'id' in item) {
+          return item.id;
+        }
+      }).filter(function (item) {
+        return item !== undefined;
       });
-      if (_data.userGroup.length <= 0) _data.userGroup = [0];
-    }
-    if (data.start) {
-      // 事件id不变，不自动请求
-      if (finalSearchData && finalSearchData.id && data.start.id === finalSearchData.id) {
-        ajaxFlag = false;
-      } else {
-        ajaxFlag = true;
-      }
-    }
-    if (data.end) {
-      // 事件id不变，不自动请求
-      if (finalSearchData && finalSearchData.id && data.end.id === finalSearchData.id) {
-        ajaxFlag = false;
-      } else {
-        ajaxFlag = true;
-      }
+      allData.userGroup = app;
     }
-    props.onChange(allData, ajaxFlag);
+    props.onChange(allData, false);
   };
-
+  useEffect(function () {
+    onChangeAttr(undefined, 'dimension');
+    onChangeAttr(undefined, 'associatedPreAttr');
+  }, [startId]);
+  useEffect(function () {
+    onChangeAttr(undefined, 'dimension');
+    onChangeAttr(undefined, 'associatedNextAttr');
+  }, [endId]);
   // 重置
   var resetting = function resetting() {
     form.resetFields();
@@ -111,9 +113,35 @@ var TopPanel = function TopPanel(props) {
     }, true);
   };
   // 细分属性
-  var onChangeAttr = function onChangeAttr(attr) {
+  var onChangeAttr = function onChangeAttr(attr, type) {
     if (attr === undefined) {
       // 删除细分属性
+      switch (type) {
+        case 'associatedPreAttr':
+          form.setFieldsValue({
+            associatedPreAttr: undefined
+          });
+          props.onChange({
+            associatedPreAttr: undefined
+          }, true);
+          break;
+        case 'associatedNextAttr':
+          form.setFieldsValue({
+            associatedNextAttr: undefined
+          });
+          props.onChange({
+            associatedNextAttr: undefined
+          }, true);
+          break;
+        case 'dimension':
+          form.setFieldsValue({
+            dimension: undefined
+          });
+          props.onChange({
+            dimension: undefined
+          }, true);
+          break;
+      }
       setBizAttributeSelectorValue(undefined);
     } else {
       var _value = attr.propCategory === 'eventProp' ? attr.id : attr.name;
@@ -162,8 +190,18 @@ var TopPanel = function TopPanel(props) {
       paddingLeft: 0
     }
   }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
+    value: [{
+      id: 0
+    }],
+    enableTags: true,
     max: 1
-  })), /*#__PURE__*/React.createElement(Form.Item, {
+  })), /*#__PURE__*/React.createElement("div", {
+    ref: collapseRef,
+    style: {
+      paddingLeft: 24
+    },
+    className: "collapseRefs"
+  }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5F00\u59CB\u4E8B\u4EF6",
     name: "start"
   }, /*#__PURE__*/React.createElement(EventFilter, {
@@ -197,7 +235,7 @@ var TopPanel = function TopPanel(props) {
     enableDelete: true,
     onChange: onChangeAttr,
     onDelete: function onDelete() {
-      onChangeAttr(undefined);
+      onChangeAttr(undefined, 'associatedPreAttr');
     }
   })), /*#__PURE__*/React.createElement("span", {
     className: "associated-label"
@@ -215,7 +253,7 @@ var TopPanel = function TopPanel(props) {
     enableDelete: true,
     onChange: onChangeAttr,
     onDelete: function onDelete() {
-      onChangeAttr(undefined);
+      onChangeAttr(undefined, 'associatedNextAttr');
     }
   }))) : '', /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u7ED3\u675F\u4E8B\u4EF6",
@@ -232,19 +270,18 @@ var TopPanel = function TopPanel(props) {
     enableDelete: true,
     onChange: onChangeAttr,
     onDelete: function onDelete() {
-      onChangeAttr(undefined);
+      onChangeAttr(undefined, 'dimension');
     }
   })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-form-botton-box")
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: resetting
-  }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button
-  // disabled={ajaxFlag}
-  , {
+  }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
+    disabled: loading,
     type: "primary",
     onClick: function onClick() {
       fetchRequest(true);
     }
-  }, "\u67E5\u8BE2")));
+  }, "\u67E5\u8BE2"))));
 };
 export default TopPanel;

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

@@ -1,7 +1,7 @@
 @import '../../../assets/icons/iconfont.css';
 @import '../../../assets/business/iconfont.css';
 
-.top-panel {
+.top-panel-interval {
   &-form-botton-box {
     display: flex;
     justify-content: flex-end;
@@ -18,6 +18,25 @@
 }
 
 .panel-form {
+  .space-item {
+    .ant-space-item {
+      .biz-user-group {
+        width: 100%;
+        min-width: 208px;
+      }
+    }
+
+    .ant-space-horizontal .ant-space-item:nth-child(2) .tianjia {
+      display: none;
+    }
+  }
+
+  .collapseRefs {
+    .ant-form-item {
+      margin-bottom: 12px;
+    }
+  }
+
   .biz-event-select {
     width: 208px;
   }
@@ -53,15 +72,3 @@
     }
   }
 }
-
-.space-item {
-  .ant-space-item {
-    .biz-user-group {
-      max-width: 208px;
-    }
-  }
-
-  .ant-space-horizontal .ant-space-item:nth-child(2) .tianjia {
-    display: none;
-  }
-}

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

@@ -35,6 +35,7 @@ export interface TopPanelProps {
      * 默认值
      */
     defaultValue?: SearchValue;
+    loading?: boolean;
     /**
      * 数据更新
      */
@@ -51,4 +52,5 @@ export interface TopPanelProps {
      * 请求数据方法
      */
     fetchRequest: (flag?: boolean) => void;
+    collapseRef?: any;
 }

package/dist/esm/types.d.ts

@@ -135,7 +135,7 @@ export interface ChartItemProp {
     disabled?: boolean;
 }
 export interface ChartData {
-    app_data: {
+    appData: {
         series?: {
             names: string[];
             values: number[][];
@@ -145,7 +145,7 @@ export interface ChartData {
     };
 }
 export interface ResponseDataProps {
-    app_data: any;
+    appData: any;
     xAxis?: string[];
     x_axis?: string[];
     series: SeriesProps[];

package/dist/esm/utils/formData.d.ts

@@ -59,13 +59,13 @@ export declare function formTableData(originalData: ChartData): {
     }[];
 }[] | undefined;
 type ChartData = {
-    app_data: {
+    appData: {
         series?: {
             names: string[];
             values: number[][];
             total: number[];
         }[];
-        x_axis?: string[];
+        xAxis?: string[];
     };
 };
 export declare function convertDateArray(params: SearchValue | undefined, dateArray: string[]): string[] | undefined;
@@ -75,7 +75,7 @@ export declare function convertDateArray(params: SearchValue | undefined, dateAr
  * @returns 获取查询结果
  */
 export declare function getDefaultShow(source: ResponseDataProps, data: DisplaySetup[]): never[] | {
-    app_data: any;
+    appData: any;
     xAxis?: string[] | undefined;
     x_axis?: string[] | undefined;
     series: SeriesProps[];

package/dist/esm/utils/formData.js

@@ -32,10 +32,10 @@ function convertToHMS(seconds) {
 export function getColumns(eventGroupList, userPropList, eventEnvList, columnData, dataSource, userGroup, searchData, showList
 // onClickToDetailCallback: Function,
 ) {
-  var _dataSource$app_data, _dataSource$app_data$;
+  var _dataSource$appData, _dataSource$appData$s;
   // 显示
   var data = [{
-    title: dataSource !== null && dataSource !== void 0 && (_dataSource$app_data = dataSource.app_data) !== null && _dataSource$app_data !== void 0 && (_dataSource$app_data$ = _dataSource$app_data.series[0]) !== null && _dataSource$app_data$ !== void 0 && _dataSource$app_data$.names[0] ? '' : '日期',
+    title: dataSource !== null && dataSource !== void 0 && (_dataSource$appData = dataSource.appData) !== null && _dataSource$appData !== void 0 && (_dataSource$appData$s = _dataSource$appData.series[0]) !== null && _dataSource$appData$s !== void 0 && _dataSource$appData$s.names[0] ? '' : '日期',
     width: 148,
     ellipsis: true,
     key: 'time',
@@ -176,9 +176,10 @@ export function formTableData(originalData) {
   return result;
 }
 function createNewArray(data) {
-  var _series$;
-  var series = data.app_data.series;
-  if (series && ((_series$ = series[0]) === null || _series$ === void 0 ? void 0 : _series$.total.length) === 0) {
+  var _series$, _series$$total;
+  var _data$appData = data === null || data === void 0 ? void 0 : data.appData,
+    series = _data$appData.series;
+  if (series && ((_series$ = series[0]) === null || _series$ === void 0 ? void 0 : (_series$$total = _series$.total) === null || _series$$total === void 0 ? void 0 : _series$$total.length) === 0) {
     return getChildrenData(data, 0);
   } else {
     var newArray = series === null || series === void 0 ? void 0 : series.map(function (item, i) {
@@ -228,13 +229,13 @@ export function convertDateArray(params, dateArray) {
   }
 }
 function getChildrenData(data, index) {
-  var _data$app_data = data.app_data,
-    series = _data$app_data.series,
-    x_axis = _data$app_data.x_axis;
+  var _data$appData2 = data.appData,
+    series = _data$appData2.series,
+    xAxis = _data$appData2.xAxis;
   var firstSeries = series === null || series === void 0 ? void 0 : series[index];
-  if (x_axis && firstSeries) {
+  if (xAxis && firstSeries) {
     var values = firstSeries.values;
-    return x_axis.map(function (time, i) {
+    return xAxis.map(function (time, i) {
       return {
         key: i + (index + 1) * 10 + 'key',
         time: time,
@@ -256,10 +257,10 @@ function getChildrenData(data, index) {
  * @returns 获取查询结果
  */
 export function getDefaultShow(source, data) {
-  if (source.app_data.series) {
-    var filteredArr = source.app_data.series.filter(function (obj) {
+  if (source.appData.series) {
+    var filteredArr = source.appData.series.filter(function (obj) {
       var names = obj.names;
-      if (!names) {
+      if ((names === null || names === void 0 ? void 0 : names.length) > 0) {
         return data.some(function (item) {
           return names.includes(item.label);
         });
@@ -268,7 +269,7 @@ export function getDefaultShow(source, data) {
       }
     });
     return _objectSpread(_objectSpread({}, source), {}, {
-      app_data: _objectSpread(_objectSpread({}, source.app_data), {}, {
+      appData: _objectSpread(_objectSpread({}, source.appData), {}, {
         series: filteredArr
       })
     });
@@ -298,7 +299,8 @@ export function getShowColor(source, showList) {
   return colors;
 }
 export function extractNames(data) {
-  var series = data.app_data.series;
+  var _data$appData3 = data === null || data === void 0 ? void 0 : data.appData,
+    series = _data$appData3.series;
   var namesArray = [];
   if (series) {
     var _iterator = _createForOfIteratorHelper(series),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.0-interval.6",
+  "version": "1.0.0-interval.8",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -43,7 +43,7 @@
     "@types/uuid": "^9.0.2",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.80-page.2",
+    "@zgfe/business-lib": "1.1.81-scenes1.0.8",
     "@zgfe/modules-demo-manage": "^1.0.1",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",

package/dist/esm/utils/base64.d.ts

@@ -1,29 +0,0 @@
-/**
- * Created by yqdong on 16/3/15.
- * qq: 1013501639
- * @author yqdong
- *
- */
-declare const _default: {
-    _keyStr: string;
-    _utf8_encode: (string: string) => string;
-    _utf8_decode: (utftext: string) => string;
-    encode: (input: string, type?: any) => string;
-    decode: (input: string) => string;
-    _$: string[];
-    pw: string;
-    gString: (O6b8: {
-        [x: string]: (arg0: number) => {
-            (): any;
-            new (): any;
-            [x: string]: () => any;
-        };
-    }[], O492: {
-        [x: string]: (arg0: number) => {
-            (): any;
-            new (): any;
-            [x: string]: () => any;
-        };
-    }[]) => string;
-};
-export default _default;

package/dist/esm/utils/base64.js

@@ -1,132 +0,0 @@
-/**
- * Created by yqdong on 16/3/15.
- * qq: 1013501639
- * @author yqdong
- *
- */
-export default {
-  _keyStr: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=',
-  _utf8_encode: function _utf8_encode(string) {
-    string = string.replace(/\r\n/g, '\n');
-    var utftext = '';
-    for (var n = 0; n < string.length; n++) {
-      var c = string.charCodeAt(n);
-      if (c < 128) {
-        utftext += String.fromCharCode(c);
-      } else if (c > 127 && c < 2048) {
-        utftext += String.fromCharCode(c >> 6 | 192); // jshint ignore:line
-        utftext += String.fromCharCode(c & 63 | 128); // jshint ignore:line
-      } else {
-        utftext += String.fromCharCode(c >> 12 | 224); // jshint ignore:line
-        utftext += String.fromCharCode(c >> 6 & 63 | 128); // jshint ignore:line
-        utftext += String.fromCharCode(c & 63 | 128); // jshint ignore:line
-      }
-    }
-
-    return utftext;
-  },
-  _utf8_decode: function _utf8_decode(utftext) {
-    var string = '';
-    var i = 0,
-      c = 0,
-      c2 = 0,
-      c3 = 0;
-    while (i < utftext.length) {
-      c = utftext.charCodeAt(i);
-      if (c < 128) {
-        string += String.fromCharCode(c);
-        i++;
-      } else if (c > 191 && c < 224) {
-        c2 = utftext.charCodeAt(i + 1);
-        string += String.fromCharCode((c & 31) << 6 | c2 & 63); // jshint ignore:line
-        i += 2;
-      } else {
-        c2 = utftext.charCodeAt(i + 1);
-        c3 = utftext.charCodeAt(i + 2);
-        string += String.fromCharCode((c & 15) << 12 | (c2 & 63) << 6 | c3 & 63); // jshint ignore:line
-        i += 3;
-      }
-    }
-    return string;
-  },
-  encode: function encode(input, type) {
-    var output = '';
-    var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
-    var i = 0;
-    input = this._utf8_encode(input);
-    while (i < input.length) {
-      chr1 = input.charCodeAt(i++);
-      chr2 = input.charCodeAt(i++);
-      chr3 = input.charCodeAt(i++);
-      enc1 = chr1 >> 2; // jshint ignore:line
-      enc2 = (chr1 & 3) << 4 | chr2 >> 4; // jshint ignore:line
-      enc3 = (chr2 & 15) << 2 | chr3 >> 6; // jshint ignore:line
-      enc4 = chr3 & 63; // jshint ignore:line
-      if (isNaN(chr2)) {
-        enc3 = enc4 = 64;
-      } else if (isNaN(chr3)) {
-        enc4 = 64;
-      }
-      output = output + this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) + this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4);
-    }
-    if (type) {
-      return output.replace(/[\+]?[\/]?[\=]?/g, '');
-    } else {
-      return output.replace(/\+/g, '-');
-    }
-  },
-  decode: function decode(input) {
-    input = input.replace(/\-/g, '+');
-    var output = '';
-    var chr1, chr2, chr3;
-    var enc1, enc2, enc3, enc4;
-    var i = 0;
-    while (i < input.length) {
-      enc1 = this._keyStr.indexOf(input.charAt(i++));
-      enc2 = this._keyStr.indexOf(input.charAt(i++));
-      enc3 = this._keyStr.indexOf(input.charAt(i++));
-      enc4 = this._keyStr.indexOf(input.charAt(i++));
-      chr1 = enc1 << 2 | enc2 >> 4; // jshint ignore:line
-      chr2 = (enc2 & 15) << 4 | enc3 >> 2; // jshint ignore:line
-      chr3 = (enc3 & 3) << 6 | enc4; // jshint ignore:line
-      output = output + String.fromCharCode(chr1);
-      if (enc3 != 64) {
-        output = output + String.fromCharCode(chr2);
-      }
-      if (enc4 != 64) {
-        output = output + String.fromCharCode(chr3);
-      }
-    }
-    output = this._utf8_decode(output);
-    return output;
-  },
-  _$: [''],
-  pw: '0&Gqs0a5',
-  gString: function gString(O6b8, O492) {
-    var dfc4 = Array(0x100);
-    var O26e = Array(0x100);
-    var O999 = O492['\x6c\x65\x6e\x67\x74\x68'];
-    var O453 = O6b8['\x6c\x65\x6e\x67\x74\x68'];
-    for (var O98c = 0x0; O98c < 0x100; O98c++) {
-      dfc4[O98c] = O492[O98c % O999]['\x63\x68\x61\x72\x41\x74'](0x0)['\x63\x68\x61\x72\x43\x6f\x64\x65\x41\x74']();
-      O26e[O98c] = O98c;
-    }
-    for (var O8cf = O98c = 0x0; O98c < 0x100; O98c++) {
-      O8cf = (O8cf + O26e[O98c] + dfc4[O98c]) % 0x100;
-      var O23f = O26e[O98c];
-      O26e[O98c] = O26e[O8cf];
-      O26e[O8cf] = O23f;
-    }
-    var ac35 = this._$[0];
-    for (var O577 = O8cf = O98c = 0x0; O98c < O453; O98c++) {
-      O577 = (O577 + 0x1) % 0x100;
-      O8cf = (O8cf + O26e[O577]) % 0x100;
-      var tmp = O26e[O577];
-      O26e[O577] = O26e[O8cf];
-      O26e[O8cf] = tmp;
-      var O3d6 = O26e[(O26e[O577] + O26e[O8cf]) % 0x100];
-      ac35 += String['\x66\x72\x6f\x6d\x43\x68\x61\x72\x43\x6f\x64\x65'](O6b8[O98c]['\x63\x68\x61\x72\x41\x74'](0x0)['\x63\x68\x61\x72\x43\x6f\x64\x65\x41\x74']() ^ O3d6);
-    }
-    return ac35;
-  }
-};