@zgfe/modules-attribution 1.0.1-alpha.1 → 1.0.1-alpha.14

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;
@@ -50,6 +52,7 @@ var OptionGroup = /*#__PURE__*/React.forwardRef(function (props, ref) {
           },
           name: panelName ? panelName + '(1)' : '归因分析'
         };
+        console.log('另存为', item);
         setPanelValue(item);
         setShowPanelDialog(true);
       },
@@ -60,13 +63,18 @@ var OptionGroup = /*#__PURE__*/React.forwardRef(function (props, ref) {
           },
           name: panelName
         };
+        console.log('保存', item);
         setPanelValue(item);
         setShowPanelDialog(true);
         setPanelType('edit');
+      },
+      onGetSearchData: function onGetSearchData() {
+        _onGetSearchData && _onGetSearchData();
       }
     };
   });
   var _onOk = function onOk(type, val) {
+    console.log('保存', val);
     if (type === 'panel') {
       setPanelType(undefined);
       setShowPanelDialog(false);
@@ -86,7 +94,7 @@ 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"
@@ -95,13 +103,14 @@ var OptionGroup = /*#__PURE__*/React.forwardRef(function (props, ref) {
       return 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({
@@ -127,7 +136,8 @@ var OptionGroup = /*#__PURE__*/React.forwardRef(function (props, ref) {
       return _onCancel('panel');
     },
     onOk: function onOk(data) {
-      return _onOk('panel', data);
+      console.log('保存？', data);
+      _onOk('panel', data);
     }
   }));
 });

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

@@ -5,4 +5,5 @@ export interface OptionGroupProps {
     result?: any;
     enableSelectChart?: boolean;
     onClickGenerateReport?: (value: any) => void;
+    onGetSearchData?: Function;
 }

package/es/components/searchTime/index.js

@@ -13,7 +13,7 @@ var classPrefix = 'search-panel';
 var SearchTime = function SearchTime(props) {
   var _useContext = useContext(AttributableContext),
     includeToday = _useContext.includeToday;
-  console.log('当前时间段', getInitDate(includeToday));
+  console.log('当前时间段', getInitDate(includeToday), props.time);
   var _useState = useState(props.time || getInitDate(includeToday)),
     _useState2 = _slicedToArray(_useState, 2),
     time = _useState2[0],
@@ -23,6 +23,7 @@ var SearchTime = function SearchTime(props) {
     timer = _useState4[0],
     setTimer = _useState4[1];
   var onChangeTime = function onChangeTime(val) {
+    console.log(333, val);
     if (timer) clearTimeout(timer);
     setTimer(setTimeout(function () {
       setTime(val);

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"
       }),
@@ -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/modules/content/index.js

@@ -9,13 +9,14 @@ 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';
 import { Apis } from '../../constants';
 import { handleTableData } from './utils';
 import { TableList, OptionGroup, SearchTime } from '../../components';
+import util from '../../utils/util';
 var CancelToken = Request.CancelToken;
 var cancel;
 var classPrefix = 'attribution-content';
@@ -34,11 +35,17 @@ 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 () {
+    console.log('fetchRequest', searchData);
+    if (searchData.sourceFilters && searchData.sourceFilters[0].eventId === -100) return;
     if (timer) clearTimeout(timer);
     var flag = true;
     setTimer(setTimeout(function () {
@@ -54,17 +61,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;
+    if (util.isArray(searchData.targetFilters) && searchData.targetFilters) {
+      _searchData = _objectSpread(_objectSpread({}, searchData), {}, {
+        targetFilters: searchData.targetFilters[0]
+      });
+    } else {
+      _searchData = searchData;
+    }
+    console.log('请求表格数据：', _searchData);
     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;
       })
@@ -82,8 +102,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
@@ -91,20 +111,28 @@ var InsightContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
     });
   };
   var onChangeContent = function onChangeContent(data) {
+    console.log('改变时间和图表类型', data);
     setTime(data);
     setSearchData(function (value) {
       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,11 +140,12 @@ 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

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;

package/es/modules/content/utils.js

@@ -2,169 +2,6 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 import { nanoid } from 'nanoid';
-export function getSortData(data, userGroup) {
-  if (!data) {
-    return undefined;
-  }
-  if (userGroup && userGroup.length === 1 && userGroup[0] === 0) {
-    data.series.forEach(function (item) {
-      item.names.splice(item.names.length - 2, 1);
-    });
-  }
-  var seriesData = (data.series || []).map(function (item) {
-    var names = item.names,
-      values = item.values;
-    var len = names.length - 1;
-    if (names[len] === '平均使用时长') {
-      names[len] += '（s）';
-      values = values.map(function (data) {
-        return Math.round(data / 10) / 100;
-      });
-    } else {
-      names[len] += item.index ? "\uFF08".concat(item.index, "\uFF09") : '';
-    }
-    return _objectSpread(_objectSpread({}, item), {}, {
-      names: names,
-      values: values
-    });
-  });
-  var hasUserGroup = userGroup && userGroup.length > 1;
-  var series = sortData(seriesData, hasUserGroup);
-  return {
-    x_axis: data.xAxis || [],
-    series: series
-  };
-}
-export var sortData = function sortData(data, hasUserGroup) {
-  if (!data.length) return data;
-  var len = data[0].names.length;
-  var compare = function compare(a, b) {
-    var flag = 0;
-    var aNames = a.names;
-    var bNames = b.names;
-    for (var i = 0; i < len; i++) {
-      var k = i;
-      if (hasUserGroup) {
-        if (i === len - 2) {
-          k = len - 1;
-        } else if (i === len - 1) {
-          k = len - 2;
-        }
-      }
-      var aName = aNames[k];
-      var bName = bNames[k];
-      if (aName !== bName) {
-        flag = sortDevName(aName, bName);
-        break;
-      }
-    }
-    return flag;
-  };
-  data.sort(compare);
-  return data;
-};
-function sortDevName(str1, str2) {
-  str1 = String(str1);
-  str2 = String(str2);
-  var res = 0;
-  for (var i = 0;; i++) {
-    if (!str1[i] || !str2[i]) {
-      res = str1.length - str2.length;
-      break;
-    }
-    var char1 = str1[i];
-    var char1Type = getCharType(char1);
-    var char2 = str2[i];
-    var char2Type = getCharType(char2);
-    if (char1Type[0] === char2Type[0]) {
-      if (char1 === char2) {
-        continue;
-      } else {
-        if (char1Type[0] === 'zh') {
-          res = char1.localeCompare(char2);
-        } else if (char1Type[0] === 'en') {
-          res = char2.charCodeAt(0) - char1.charCodeAt(0);
-        } else {
-          res = parseInt(char1) - parseInt(char2);
-        }
-        break;
-      }
-    } else {
-      res = char1Type[1] - char2Type[1];
-      break;
-    }
-  }
-  return res;
-}
-function getCharType(char) {
-  if (/^[\u4e00-\u9fa5]$/.test(char)) {
-    return ['zh', 300];
-  }
-  if (/^[a-zA-Z]$/.test(char)) {
-    return ['en', 200];
-  }
-  if (/^[0-9]$/.test(char)) {
-    return ['number', 100];
-  }
-  return ['others', 999];
-}
-export function getChartTypes(type) {
-  var result = [{
-    label: '趋势图',
-    value: 'line',
-    icon: 'qushitu1'
-  }, {
-    label: '汇总图',
-    value: 'bar',
-    icon: 'huizongtu'
-  }];
-  var gridChildren = [{
-    label: '',
-    value: 'line',
-    icon: 'qushitu1'
-  }, {
-    label: '',
-    value: 'bar',
-    icon: 'huizongtu'
-  }];
-  if (type === 'whole' || type === 'revenue') {
-    result.push({
-      label: '占比图',
-      icon: 'pie',
-      value: 'pie'
-    });
-    gridChildren.push({
-      value: 'pie',
-      icon: 'pie',
-      label: ''
-    });
-  }
-  if (type === 'event' || type === 'whole' || type === 'revenue') {
-    gridChildren.push({
-      value: 'map',
-      icon: 'ditu',
-      label: ''
-    });
-    result.push({
-      label: '地图',
-      icon: 'ditu',
-      value: 'map'
-    });
-  }
-  result.push({
-    label: '表格',
-    icon: 'biaoge',
-    value: 'grid',
-    children: gridChildren
-  });
-  result.push({
-    label: '数值',
-    icon: 'fenshu',
-    disable: true,
-    value: 'number'
-  });
-  return result;
-}
 export var handleTableData = function handleTableData(data) {
   var tableData = {};
   var dataSource = [],

package/es/modules/home/demo/create.js

@@ -40,7 +40,7 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 3
+    defaultApp: 21
   }, isDetail ? /*#__PURE__*/React.createElement("div", null, JSON.stringify(detailParams), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       return setIsDetail(false);