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

package/es/components/option/index.js

@@ -52,7 +52,6 @@ var OptionGroup = /*#__PURE__*/React.forwardRef(function (props, ref) {
           },
           name: panelName ? panelName + '(1)' : '归因分析'
         };
-        console.log('另存为', item);
         setPanelValue(item);
         setShowPanelDialog(true);
       },
@@ -63,7 +62,6 @@ var OptionGroup = /*#__PURE__*/React.forwardRef(function (props, ref) {
           },
           name: panelName
         };
-        console.log('保存', item);
         setPanelValue(item);
         setShowPanelDialog(true);
         setPanelType('edit');
@@ -74,7 +72,6 @@ var OptionGroup = /*#__PURE__*/React.forwardRef(function (props, ref) {
     };
   });
   var _onOk = function onOk(type, val) {
-    console.log('保存', val);
     if (type === 'panel') {
       setPanelType(undefined);
       setShowPanelDialog(false);
@@ -136,8 +133,7 @@ var OptionGroup = /*#__PURE__*/React.forwardRef(function (props, ref) {
       return _onCancel('panel');
     },
     onOk: function onOk(data) {
-      console.log('保存？', data);
-      _onOk('panel', data);
+      return _onOk('panel', data);
     }
   }));
 });

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

@@ -1,9 +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), props.time);
   var _useState = useState(props.time || getInitDate(includeToday)),
     _useState2 = _slicedToArray(_useState, 2),
     time = _useState2[0],
@@ -23,7 +22,6 @@ 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.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/title/index.js

@@ -66,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 {

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>>;
+declare const InsightContent: React.ForwardRefExoticComponent<attributionContentProps.Props & React.RefAttributes<any>>;
 export default InsightContent;

package/es/modules/content/index.js

@@ -16,7 +16,6 @@ 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';
@@ -44,7 +43,6 @@ var InsightContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
     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;
@@ -73,15 +71,9 @@ var InsightContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
     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);
+    var _searchData = _objectSpread(_objectSpread({}, searchData), {}, {
+      targetFilters: searchData.targetFilters[0]
+    });
     request(Apis.getAnalyseData, {
       method: 'post',
       data: _objectSpread(_objectSpread(_objectSpread({}, currentApp), _searchData), time),
@@ -89,9 +81,8 @@ var InsightContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
         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);
       }
@@ -111,7 +102,6 @@ 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);

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/home/demo/create.js

@@ -1,53 +1,23 @@
-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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 import { DemoWrapper, setGlobalConfig } from '@zgfe/business-lib';
 import { AttributionHome } from '@zgfe/modules-attribution';
 import { requestConfig } from '../../../utils/ajaxConfig';
-import { Button } from 'antd';
 var defaultValue = {
   panelId: 438,
   panelType: 'add'
 };
 export default (function () {
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    isDetail = _useState2[0],
-    setIsDetail = _useState2[1];
-  var _useState3 = useState(),
-    _useState4 = _slicedToArray(_useState3, 2),
-    detailParams = _useState4[0],
-    setDetailParams = _useState4[1];
-  var _useState5 = useState(defaultValue),
-    _useState6 = _slicedToArray(_useState5, 2),
-    searchParams = _useState6[0],
-    setSearchParams = _useState6[1];
   useEffect(function () {
     setGlobalConfig(requestConfig);
   }, []);
   var afterEditTarget = function afterEditTarget(type, data) {
     console.log("".concat(type, "\u56DE\u8C03"), data);
   };
-  var onUserDrill = function onUserDrill(data, searchData) {
-    console.log('onUserDrill:', data, searchData);
-    setIsDetail(true);
-    setSearchParams(searchData);
-    setDetailParams(data);
-  };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
     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);
-    }
-  }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(AttributionHome, {
-    defaultValue: searchParams,
-    afterEditTarget: afterEditTarget,
-    onUserDrill: onUserDrill
+  }, /*#__PURE__*/React.createElement(AttributionHome, {
+    defaultValue: defaultValue,
+    afterEditTarget: afterEditTarget
   }));
 });

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

@@ -1,14 +1,7 @@
-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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 import { DemoWrapper, setGlobalConfig } from '@zgfe/business-lib';
 import { AttributionHome } from '@zgfe/modules-attribution';
 import { requestConfig } from '../../../utils/ajaxConfig';
-import { Button } from 'antd';
 var defaultValue = {
   id: 1426,
   name: '999',
@@ -19,7 +12,7 @@ var defaultValue = {
   data: {
     "app_id": 21,
     "module": "attribution",
-    "targetFilters": {
+    "targetFilters": [{
       "eventId": 6078,
       "eventName": "埋点事件-11",
       "filters": {
@@ -44,7 +37,7 @@ var defaultValue = {
           "attrName": "机身宽度"
         }]
       }
-    },
+    }],
     "sourceFilters": [{
       "eventId": 6090,
       "eventName": "间隔事件-01",
@@ -134,40 +127,17 @@ var defaultValue = {
   chosen_data: []
 };
 export default (function () {
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    isDetail = _useState2[0],
-    setIsDetail = _useState2[1];
-  var _useState3 = useState(),
-    _useState4 = _slicedToArray(_useState3, 2),
-    detailParams = _useState4[0],
-    setDetailParams = _useState4[1];
-  var _useState5 = useState(defaultValue),
-    _useState6 = _slicedToArray(_useState5, 2),
-    searchParams = _useState6[0],
-    setSearchParams = _useState6[1];
   useEffect(function () {
     setGlobalConfig(requestConfig);
   }, []);
   var afterEditTarget = function afterEditTarget(type, data) {
     console.log("".concat(type, "\u56DE\u8C03"), data);
   };
-  var onUserDrill = function onUserDrill(data, searchData) {
-    console.log('onUserDrill:', data, searchData);
-    setIsDetail(true);
-    setSearchParams(searchData);
-    setDetailParams(data);
-  };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
     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);
-    }
-  }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(AttributionHome, {
-    defaultValue: searchParams,
-    afterEditTarget: afterEditTarget,
-    onUserDrill: onUserDrill
+  }, /*#__PURE__*/React.createElement(AttributionHome, {
+    defaultValue: defaultValue,
+    afterEditTarget: afterEditTarget
   }));
 });