@zgfe/modules-attribution 1.0.1-alpha.2 → 1.0.1-alpha.21

package/es/components/option/index.js

@@ -15,7 +15,8 @@ import './styles/index.less';
 import { AttributableContext } from '../../types';
 var classPrefix = 'option-group';
 var OptionGroup = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var searchData = props.searchData;
+  var searchData = props.searchData,
+    _onGetSearchData = props.onGetSearchData;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     showPanelDialog = _useState2[0],
@@ -38,6 +39,7 @@ var OptionGroup = /*#__PURE__*/React.forwardRef(function (props, ref) {
     panelId = _useContext2.panelId,
     panelName = _useContext2.panelName,
     elementId = _useContext2.elementId,
+    buttonDisable = _useContext2.buttonDisable,
     searching = _useContext2.searching,
     enableAddScene = _useContext2.enableAddScene,
     afterEditTarget = _useContext2.afterEditTarget;
@@ -63,6 +65,9 @@ var OptionGroup = /*#__PURE__*/React.forwardRef(function (props, ref) {
         setPanelValue(item);
         setShowPanelDialog(true);
         setPanelType('edit');
+      },
+      onGetSearchData: function onGetSearchData() {
+        _onGetSearchData && _onGetSearchData();
       }
     };
   });
@@ -86,22 +91,24 @@ var OptionGroup = /*#__PURE__*/React.forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, !panelId && enableAddScene && /*#__PURE__*/React.createElement(Button, {
-    disabled: searching,
+    disabled: buttonDisable || searching,
     icon: /*#__PURE__*/React.createElement(IconFont, {
       className: "".concat(classPrefix, "-icon"),
       type: "tianjia2"
     }),
     onClick: function onClick() {
-      return setShowSceneDialog(true);
+      _onGetSearchData && _onGetSearchData();
+      setShowSceneDialog(true);
     }
   }, "\u6DFB\u52A0\u5230\u5E38\u7528\u573A\u666F"), !panelId && /*#__PURE__*/React.createElement(Button, {
-    disabled: searching,
+    disabled: buttonDisable || searching,
     icon: /*#__PURE__*/React.createElement(IconFont, {
       className: "".concat(classPrefix, "-icon"),
       type: "tianjia2"
     }),
     onClick: function onClick() {
-      return setShowPanelDialog(true);
+      _onGetSearchData && _onGetSearchData();
+      setShowPanelDialog(true);
     }
   }, "\u6DFB\u52A0\u5230\u770B\u677F"), showSceneDialog && /*#__PURE__*/React.createElement(BizAddToScene, {
     params: _objectSpread({

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

@@ -1,8 +1,5 @@
+import { SearchValueProps } from '../../types';
 export interface OptionGroupProps {
-    value?: any;
-    title?: string;
-    searchData: any;
-    result?: any;
-    enableSelectChart?: boolean;
-    onClickGenerateReport?: (value: any) => void;
+    searchData: SearchValueProps;
+    onGetSearchData?: Function;
 }

package/es/components/searchTime/index.js

@@ -13,7 +13,6 @@ var classPrefix = 'search-panel';
 var SearchTime = function SearchTime(props) {
   var _useContext = useContext(AttributableContext),
     includeToday = _useContext.includeToday;
-  console.log('当前时间段', getInitDate(includeToday));
   var _useState = useState(props.time || getInitDate(includeToday)),
     _useState2 = _slicedToArray(_useState, 2),
     time = _useState2[0],

package/es/components/tableList/index.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
 import './styles/index.less';
-import { TableDataHandleProps } from '../../types';
+import { TableDataProps } from '../../types';
 declare const TableList: React.FC<{
     total: number;
-    tableDataList: TableDataHandleProps;
+    tableDataList: TableDataProps;
 }>;
 export default TableList;

package/es/components/tableList/index.js

@@ -1,13 +1,18 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import { Table } from 'antd';
 import './styles/index.less';
+import { AttributableContext } from '../../types';
 var TableList = function TableList(props) {
   var classPrefix = 'table-list';
   var tableDataList = props.tableDataList,
     total = props.total;
+  var _useContext = useContext(AttributableContext),
+    searching = _useContext.searching;
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
-  }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Table, {
+  }, !tableDataList.dataSource && !searching && /*#__PURE__*/React.createElement("p", {
+    className: "".concat(classPrefix, "-empty-tips")
+  }, "\u8BF7\u9009\u62E9\u6761\u4EF6\u8FDB\u884C\u67E5\u8BE2"), (tableDataList.dataSource || searching) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Table, {
     dataSource: tableDataList.dataSource,
     columns: tableDataList.columns,
     rowKey: "key",
@@ -17,7 +22,8 @@ var TableList = function TableList(props) {
       },
       showQuickJumper: true,
       showSizeChanger: total > 10
-    }
+    },
+    loading: searching
   })));
 };
 export default TableList;

package/es/components/title/index.js

@@ -30,7 +30,8 @@ var EditTitle = function EditTitle(props) {
     panelName = _useContext.panelName,
     changeLoading = _useContext.changeLoading,
     afterEditTarget = _useContext.afterEditTarget,
-    searching = _useContext.searching;
+    searching = _useContext.searching,
+    buttonDisable = _useContext.buttonDisable;
   var inputRef = useRef(null);
   var menu = /*#__PURE__*/React.createElement(Menu, {
     items: [{
@@ -46,7 +47,7 @@ var EditTitle = function EditTitle(props) {
       }
     }, {
       key: '2',
-      label: '删除指标',
+      label: '删除归因',
       icon: /*#__PURE__*/React.createElement(IconFont, {
         type: "shanchu"
       }),
@@ -65,7 +66,7 @@ var EditTitle = function EditTitle(props) {
       }
     }).then(function (res) {
       changeLoading(false);
-      if (res.flag === 101) {
+      if ((res === null || res === void 0 ? void 0 : res.flag) === 101) {
         message.success('删除成功');
         callback('delete');
       } else {
@@ -157,12 +158,12 @@ var EditTitle = function EditTitle(props) {
     }
   }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
     className: "attribution-btn",
-    disabled: searching || !curTitle,
+    disabled: buttonDisable || searching || !curTitle,
     type: "primary",
     onClick: onSave
   }, "\u4FDD\u5B58"), /*#__PURE__*/React.createElement(Button, {
     className: "attribution-btn",
-    disabled: searching,
+    disabled: buttonDisable || searching,
     type: "primary",
     onClick: onSaveAs
   }, "\u53E6\u5B58\u4E3A")) : /*#__PURE__*/React.createElement("div", {
@@ -175,7 +176,7 @@ var EditTitle = function EditTitle(props) {
     }
   }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
     className: "attribution-btn",
-    disabled: searching || !curTitle,
+    disabled: buttonDisable || searching || !curTitle,
     type: "primary",
     onClick: onSaveAs
   }, "\u4FDD\u5B58")));

package/es/constants/apis.d.ts

@@ -1,10 +1,6 @@
 declare const Apis: {
     delPanelElement: string;
     updateElementName: string;
-    eventAnalytics: string;
-    download: string;
-    queryScenesOfGroup: string;
-    updateElemet: string;
     getAnalyseData: string;
 };
 export default Apis;

package/es/constants/apis.js

@@ -1,10 +1,6 @@
 var Apis = {
   delPanelElement: '/apppanel/delPanelElement.jsp',
   updateElementName: '/apppanel/updateElementName.jsp',
-  eventAnalytics: '/zg/web/v2/insight/analysis',
-  download: '/zg/web/v2/insight/download',
-  queryScenesOfGroup: '/scene/queryScenesOfGroup.jsp',
-  updateElemet: '/apppanel/updateElemet.jsp',
   getAnalyseData: '/zg/web/v2/attribution/getAnalyseData'
 };
 export default Apis;

package/es/constants/fields.d.ts

@@ -4,143 +4,4 @@ export declare const chartTypes: {
     icon: string;
     value: string;
 }[];
-export declare const addPanelFields: ({
-    label: string;
-    name: string;
-    extendName: string;
-    type: string;
-    options: never[];
-    children: string[];
-    fieldNames: {
-        label: string;
-        value: string;
-    };
-    rules: {
-        required: boolean;
-        message: string;
-    }[];
-    direction?: undefined;
-    dependenceFields?: undefined;
-} | {
-    label: string;
-    name: string;
-    type: string;
-    rules: {
-        required: boolean;
-        message: string;
-    }[];
-    extendName?: undefined;
-    options?: undefined;
-    children?: undefined;
-    fieldNames?: undefined;
-    direction?: undefined;
-    dependenceFields?: undefined;
-} | {
-    label: string;
-    name: string;
-    type: string;
-    options: {
-        label: string;
-        icon: string;
-        value: string;
-    }[];
-    rules: {
-        required: boolean;
-        message: string;
-    }[];
-    extendName?: undefined;
-    children?: undefined;
-    fieldNames?: undefined;
-    direction?: undefined;
-    dependenceFields?: undefined;
-} | {
-    label: string;
-    name: string;
-    type: string;
-    direction: string;
-    dependenceFields: {
-        chart: string;
-    };
-    options: {
-        label: string;
-        value: string;
-    }[];
-    rules: {
-        required: boolean;
-        message: string;
-    }[];
-    extendName?: undefined;
-    children?: undefined;
-    fieldNames?: undefined;
-})[];
-export declare const editPanelFields: ({
-    label: string;
-    name: string;
-    type: string;
-    options: {
-        label: string;
-        icon: string;
-        value: string;
-    }[];
-    rules: {
-        required: boolean;
-        message: string;
-    }[];
-    direction?: undefined;
-    dependenceFields?: undefined;
-} | {
-    label: string;
-    name: string;
-    type: string;
-    direction: string;
-    dependenceFields: {
-        chart: string;
-    };
-    options: {
-        label: string;
-        value: string;
-    }[];
-    rules: {
-        required: boolean;
-        message: string;
-    }[];
-})[];
-export declare const addSceneFields: ({
-    label: string;
-    name: string;
-    type: string;
-    options: never[];
-    fieldNames: {
-        label: string;
-        value: string;
-    };
-    rules: {
-        required: boolean;
-        message: string;
-    }[];
-} | {
-    label: string;
-    name: string;
-    type: string;
-    rules: {
-        required: boolean;
-        message: string;
-    }[];
-    options?: undefined;
-    fieldNames?: undefined;
-})[];
 export declare const searchFields: SearchPanelTypes.FieldProp[];
-export declare const indexObject: {
-    [key: string]: string;
-};
-export declare const BuiltinIndicators: {
-    id: number;
-    name: string;
-    eventList: {
-        name: string;
-        id: number;
-        type: string;
-        isBuiltIn: boolean;
-        attrList: never[];
-    }[];
-};

package/es/constants/fields.js

@@ -3,109 +3,6 @@ export var chartTypes = [{
   icon: 'biaoge',
   value: 'grid'
 }];
-export var addPanelFields = [{
-  label: '看板',
-  name: 'panel',
-  extendName: 'range',
-  type: 'selectToInput',
-  options: [],
-  children: ['range'],
-  fieldNames: {
-    label: 'name',
-    value: 'id'
-  },
-  rules: [{
-    required: true,
-    message: '请选择看板'
-  }]
-}, {
-  label: '名称',
-  name: 'name',
-  type: 'input',
-  rules: [{
-    required: true,
-    message: '请输入名称'
-  }]
-}, {
-  label: '样式',
-  name: 'chart',
-  type: 'tab',
-  options: chartTypes,
-  rules: [{
-    required: true,
-    message: '请选择图表'
-  }]
-}, {
-  label: '显示',
-  name: 'show',
-  type: 'radio',
-  direction: 'vertical',
-  dependenceFields: {
-    chart: 'line'
-  },
-  options: [{
-    label: '动态显示数据最多的10个分组',
-    value: 'dynamic'
-  }, {
-    label: '固定显示当前选择的分组',
-    value: 'fix'
-  }],
-  rules: [{
-    required: true,
-    message: '请选择'
-  }]
-}];
-export var editPanelFields = [{
-  label: '样式',
-  name: 'chart',
-  type: 'tab',
-  options: chartTypes,
-  rules: [{
-    required: true,
-    message: '请选择图表'
-  }]
-}, {
-  label: '显示',
-  name: 'show',
-  type: 'radio',
-  direction: 'vertical',
-  dependenceFields: {
-    chart: 'line'
-  },
-  options: [{
-    label: '动态显示数据最多的10个分组',
-    value: 'dynamic'
-  }, {
-    label: '固定显示当前选择的分组',
-    value: 'fix'
-  }],
-  rules: [{
-    required: true,
-    message: '请选择'
-  }]
-}];
-export var addSceneFields = [{
-  label: '场景分类',
-  name: 'class',
-  type: 'selectToInput',
-  options: [],
-  fieldNames: {
-    label: 'groupName',
-    value: 'groupId'
-  },
-  rules: [{
-    required: true,
-    message: '请选择场景分类'
-  }]
-}, {
-  label: '场景名称',
-  name: 'name',
-  type: 'input',
-  rules: [{
-    required: true,
-    message: '请输入场景名称'
-  }]
-}];
 export var searchFields = [{
   key: 'mi-targetFilters',
   type: 'targetFilters',
@@ -132,48 +29,4 @@ export var searchFields = [{
   max: 5,
   addLabel: '添加属性',
   required: false
-}];
-export var indexObject = {
-  number: '人数',
-  times: '次数',
-  per: '人均次数',
-  sum: '总和',
-  avg: '均值',
-  duration_times: '分布',
-  median: '中位数'
-};
-export var BuiltinIndicators = {
-  id: -2,
-  name: '整体',
-  eventList: [{
-    name: '新增用户',
-    id: -201,
-    type: 'add',
-    isBuiltIn: true,
-    attrList: []
-  }, {
-    name: '活跃用户',
-    id: -202,
-    type: 'active',
-    isBuiltIn: true,
-    attrList: []
-  }, {
-    name: '访问次数',
-    id: -203,
-    type: 'times',
-    isBuiltIn: true,
-    attrList: []
-  }, {
-    name: '平均使用时长',
-    id: -204,
-    type: 'duration_avg',
-    isBuiltIn: true,
-    attrList: []
-  }, {
-    name: '使用时长分布',
-    id: -205,
-    type: 'duration',
-    isBuiltIn: true,
-    attrList: []
-  }]
-};
+}];

package/es/constants/index.d.ts

@@ -1,6 +1,4 @@
 import Apis from './apis';
-import { chartTypeOptions } from './chart';
-import { chartColors } from './color';
-import { chartTypes, addPanelFields, editPanelFields, addSceneFields, searchFields } from './fields';
+import { chartTypes, searchFields } from './fields';
 import { initTarget, initEvent, getInitDate } from './initData';
-export { Apis, chartTypeOptions, chartColors, chartTypes, addPanelFields, editPanelFields, addSceneFields, searchFields, initTarget, initEvent, getInitDate, };
+export { Apis, chartTypes, searchFields, initTarget, initEvent, getInitDate, };

package/es/constants/index.js

@@ -1,6 +1,4 @@
 import Apis from './apis';
-import { chartTypeOptions } from './chart';
-import { chartColors } from './color';
-import { chartTypes, addPanelFields, editPanelFields, addSceneFields, searchFields } from './fields';
+import { chartTypes, searchFields } from './fields';
 import { initTarget, initEvent, getInitDate } from './initData';
-export { Apis, chartTypeOptions, chartColors, chartTypes, addPanelFields, editPanelFields, addSceneFields, searchFields, initTarget, initEvent, getInitDate };
+export { Apis, chartTypes, searchFields, initTarget, initEvent, getInitDate };

package/es/modules/content/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { InsightContentProps } from './types';
+import { attributionContentProps } from './types';
 import './styles/index.less';
-declare const InsightContent: React.ForwardRefExoticComponent<InsightContentProps.Props & React.RefAttributes<any>>;
-export default InsightContent;
+declare const AttributionContent: React.ForwardRefExoticComponent<attributionContentProps.Props & React.RefAttributes<any>>;
+export default AttributionContent;

package/es/modules/content/index.js

@@ -9,7 +9,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { BizGlobalDataContext } from '@zgfe/business-lib';
 import request from '../../utils/request';
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext, useEffect, useState, useRef } from 'react';
 import Request from 'umi-request';
 import SearchPanel from '../searchPanel';
 import './styles/index.less';
@@ -19,7 +19,7 @@ import { TableList, OptionGroup, SearchTime } from '../../components';
 var CancelToken = Request.CancelToken;
 var cancel;
 var classPrefix = 'attribution-content';
-var InsightContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
+var AttributionContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _useState = useState(props.value),
     _useState2 = _slicedToArray(_useState, 2),
     searchData = _useState2[0],
@@ -34,11 +34,16 @@ var InsightContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
     setTimer = _useState6[1];
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
-  var _useState7 = useState(null),
+  var _useState7 = useState(true),
     _useState8 = _slicedToArray(_useState7, 2),
-    time = _useState8[0],
-    setTime = _useState8[1];
+    isFetchRequest = _useState8[0],
+    setIsFetchRequest = _useState8[1];
+  var _useState9 = useState(null),
+    _useState10 = _slicedToArray(_useState9, 2),
+    time = _useState10[0],
+    setTime = _useState10[1];
   useEffect(function () {
+    if (searchData.sourceFilters && searchData.sourceFilters[0].eventId === -100) return;
     if (timer) clearTimeout(timer);
     var flag = true;
     setTimer(setTimeout(function () {
@@ -54,24 +59,30 @@ var InsightContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
   useEffect(function () {
     props.onSearching && props.onSearching(loading);
   }, [loading]);
-  var _useState9 = useState(100),
-    _useState10 = _slicedToArray(_useState9, 2),
-    total = _useState10[0],
-    setTotal = _useState10[1];
+  var _useState11 = useState(100),
+    _useState12 = _slicedToArray(_useState11, 2),
+    total = _useState12[0],
+    setTotal = _useState12[1];
   var fetchRequest = function fetchRequest() {
+    if (!isFetchRequest) {
+      return;
+    }
+    setLoading(true);
     if (typeof cancel === 'function') {
       cancel();
     }
+    var _searchData = _objectSpread(_objectSpread({}, searchData), {}, {
+      targetFilters: searchData.targetFilters[0]
+    });
     request(Apis.getAnalyseData, {
       method: 'post',
-      data: _objectSpread(_objectSpread(_objectSpread({}, currentApp), searchData), time),
+      data: _objectSpread(_objectSpread(_objectSpread({}, currentApp), _searchData), time),
       cancelToken: new CancelToken(function executor(c) {
         cancel = c;
       })
     }).then(function (res) {
-      if (res.data) {
-        var _data = handleTableData(res.data);
-        console.log('表格数据', _data);
+      if (res === null || res === void 0 ? void 0 : res.data) {
+        var _data = handleTableData(res === null || res === void 0 ? void 0 : res.data);
         setTableDataList(_data);
         setTotal(res.data.total);
       }
@@ -82,8 +93,8 @@ var InsightContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
       setLoading(false);
     });
   };
-  var onChangeSearch = function onChangeSearch(allData) {
-    console.log('查询条件：', allData);
+  var onChangeSearch = function onChangeSearch(allData, isFetchRequest) {
+    setIsFetchRequest(isFetchRequest);
     setSearchData(function (data) {
       return _objectSpread(_objectSpread({}, allData), {}, {
         time: data === null || data === void 0 ? void 0 : data.time
@@ -96,15 +107,22 @@ var InsightContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
       return _objectSpread(_objectSpread({}, value), data);
     });
   };
-  var _useState11 = useState({}),
-    _useState12 = _slicedToArray(_useState11, 2),
-    tableDataList = _useState12[0],
-    setTableDataList = _useState12[1];
+  var _useState13 = useState({}),
+    _useState14 = _slicedToArray(_useState13, 2),
+    tableDataList = _useState14[0],
+    setTableDataList = _useState14[1];
+  var SearchPanelRef = useRef(null);
+  var onGetSearchData = function onGetSearchData() {
+    if (SearchPanelRef) {
+      SearchPanelRef.current.onGetSearchData();
+    }
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-top-content-box")
   }, /*#__PURE__*/React.createElement(SearchPanel, {
+    ref: SearchPanelRef,
     defaultValue: searchData,
     onChange: onChangeSearch
   })), /*#__PURE__*/React.createElement("div", {
@@ -112,14 +130,15 @@ var InsightContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-bottom-content-box-times")
   }, /*#__PURE__*/React.createElement(SearchTime, {
-    time: time,
+    time: searchData === null || searchData === void 0 ? void 0 : searchData.time,
     onChange: onChangeContent
   }), searchData && /*#__PURE__*/React.createElement(OptionGroup, {
     ref: ref,
-    searchData: searchData
+    searchData: searchData,
+    onGetSearchData: onGetSearchData
   })), /*#__PURE__*/React.createElement(TableList, {
     total: total,
     tableDataList: tableDataList
   })));
 });
-export default InsightContent;
+export default AttributionContent;

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

@@ -1,7 +1,7 @@
-import { SearchValue } from '../../types';
-export declare namespace InsightContentProps {
+import { SearchValueProps } from '../../types';
+export declare namespace attributionContentProps {
     interface Props {
-        value: SearchValue;
+        value: SearchValueProps;
         show?: string[];
         onSearching?: (flag: boolean) => void;
     }

package/es/modules/content/utils.d.ts

@@ -1,8 +1,2 @@
 import { TableDataHandleProps, TableDataProps } from '../../types';
-export declare function getSortData(data: any, userGroup?: number[]): {
-    x_axis: any;
-    series: any[];
-} | undefined;
-export declare const sortData: (data: Array<any>, hasUserGroup?: boolean) => any[];
-export declare function getChartTypes(type: string): any;
 export declare const handleTableData: (data: TableDataHandleProps) => TableDataProps;