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

package/es/modules/searchPanel/utils.js

@@ -1,87 +1,16 @@
-import _ from 'lodash';
-export function removeEmptyValue(source) {
-  var data = _.cloneDeep(source);
-  var getValue = function getValue(formData) {
-    if (!formData) return formData;
-    var newData = [];
-    formData.forEach(function (item) {
-      if (item) {
-        if (item.filters) {
-          var conditions = getConditionList(item.filters.conditions);
-          if (conditions) {
-            item.filters.conditions = conditions;
-          } else {
-            item.filters = undefined;
-          }
-        }
-        newData.push(item);
-      }
-    });
-    if (newData.length) return newData.length ? newData : undefined;
-  };
-  data.targetFilters = getValue(data.targetFilters)[0];
-  data.sourceFilters = getValue(data.sourceFilters);
-  if (data.globalFilters) {
-    var conditions = getConditionList(data.globalFilters.conditions);
-    if (conditions) {
-      data.globalFilters.conditions = conditions;
-    } else {
-      data.globalFilters = undefined;
-    }
-  }
-  return data;
-}
-export function verifyHandle(data) {
-  console.log('判断表单校验是否通过', data);
-  var targetFilters = data.targetFilters,
-    sourceFilters = data.sourceFilters;
-  var _verify = true;
-  targetFilters.map(function (item) {
-    if (item.eventId === -100 || item === undefined) _verify = false;
-  });
-  sourceFilters.map(function (item) {
-    if (item.eventId === -100 || item === undefined) _verify = false;
-  });
-  return _verify;
-}
-var OperateTypes;
-(function (OperateTypes) {
-  OperateTypes["IsNull"] = "is null";
-  OperateTypes["IsNotNull"] = "is not null";
-})(OperateTypes || (OperateTypes = {}));
-function getConditionList(condition) {
-  if (!condition) return;
-  var conditionList = [];
-  condition.forEach(function (item) {
-    if (!item.attrId && !item.attrName) return;
-    if (!item.values || !item.values.length) {
-      if (item.operator === OperateTypes.IsNotNull || item.operator === OperateTypes.IsNull) {
-        conditionList.push(item);
-      }
-    } else {
-      conditionList.push(item);
-    }
-  });
-  return conditionList.length ? conditionList : undefined;
-}
 export function targetChangeCallback(data, eList, eventGroupList) {
   if (eList[0] === -100) {
     data.globalFilters = undefined;
   } else {
     if (data.globalFilters && data.globalFilters.conditions) {
-      var newFilters = [],
-        flag = true;
+      var flag = true;
       data.globalFilters.conditions.forEach(function (condition) {
         if (condition) {
           if (condition.propCategory === 'eventProp' && condition.attrId) {
             var hasExit = judgeAttrInEvents(eList, condition.attrId, eventGroupList);
-            if (hasExit) {
-              newFilters.push(condition);
-            } else {
+            if (!hasExit) {
               flag = false;
             }
-          } else {
-            newFilters.push(condition);
           }
         }
       });
@@ -92,6 +21,30 @@ export function targetChangeCallback(data, eList, eventGroupList) {
   }
   return data;
 }
+var judgeAttrInEvents = function judgeAttrInEvents(elds, attrId, eventGroupList) {
+  var flag = false;
+  if (!eventGroupList) return false;
+  eventGroupList.forEach(function (group) {
+    group.eventList.forEach(function (event) {
+      if (elds.includes(event.id)) {
+        event.attrList.forEach(function (attr) {
+          if (attr.id === attrId) {
+            flag = true;
+            return;
+          }
+        });
+      }
+    });
+  });
+  return flag;
+};
+export function submitButtonDisableHandle(data, attrSourceCount, attrTargetCount, mincePropCount) {
+  var flag = false;
+  data.attributionType === undefined ? flag = true : null;
+  buttonDisable(data, 'sourceFilters', attrSourceCount, mincePropCount) ? flag = true : null;
+  buttonDisable(data, 'targetFilters', attrTargetCount) ? flag = true : null;
+  return flag;
+}
 var buttonDisable = function buttonDisable(data, type, count, mincePropCount) {
   var flag = false;
   data[type].map(function (item) {
@@ -118,36 +71,10 @@ var buttonDisable = function buttonDisable(data, type, count, mincePropCount) {
           ((_item$filters3 = item.filters) === null || _item$filters3 === void 0 ? void 0 : _item$filters3.conditions.length) != count ? flag = true : null;
         } else {
           var _item$filters4;
-          console.log('问题排查', item, count);
           ((_item$filters4 = item.filters) === null || _item$filters4 === void 0 ? void 0 : _item$filters4.conditions.length) != count[item.eventId] ? flag = true : null;
         }
       }
     }
   });
   return flag;
-};
-export function submitButtonDisableHandle(data, attrSourceCount, attrTargetCount, mincePropCount) {
-  var flag = false;
-  data.attributionType === undefined ? flag = true : null;
-  buttonDisable(data, 'sourceFilters', attrSourceCount, mincePropCount) ? flag = true : null;
-  buttonDisable(data, 'targetFilters', attrTargetCount) ? flag = true : null;
-  console.log('判断提交按钮是否可点击', mincePropCount, flag, data);
-  return flag;
-}
-var judgeAttrInEvents = function judgeAttrInEvents(elds, attrId, eventGroupList) {
-  var flag = false;
-  if (!eventGroupList) return false;
-  eventGroupList.forEach(function (group) {
-    group.eventList.forEach(function (event) {
-      if (elds.includes(event.id)) {
-        event.attrList.forEach(function (attr) {
-          if (attr.id === attrId) {
-            flag = true;
-            return;
-          }
-        });
-      }
-    });
-  });
-  return flag;
 };

package/es/types.d.ts

@@ -1,45 +1,31 @@
-import { TargetConditionTypes, AttrConditionTypes } from '@zgfe/business-lib';
+/// <reference types="react" />
+import { AttrConditionTypes } from '@zgfe/business-lib';
 import { DatePickerTypes } from '@zgfe/business-lib/es/datePicker/types';
-import { ReactNode } from 'react';
-export interface SearchValue {
-    targetFilters?: Array<TargetConditionTypes.Value>;
-    sourceFilters?: Array<TargetConditionTypes.Value>;
+export interface SearchValueProps {
+    targetFilters: Array<FiltersProps>;
+    sourceFilters: Array<FiltersProps>;
     globalFilters?: AttrConditionTypes.GroupValue;
     globalDimensions?: Array<AttrConditionTypes.ItemValue>;
     time?: DatePickerTypes.Value;
     otherEvent?: boolean;
-}
-export interface SearchData {
-    targetFilters: Array<TargetConditionTypes.Value>;
-    sourceFilters: Array<TargetConditionTypes.Value>;
-    globalFilters?: AttrConditionTypes.GroupValue;
-    time?: DatePickerTypes.Value;
+    windowCnt?: number;
+    windowType?: 'hour' | 'day';
     attributionType?: number;
-    otherEvent?: boolean;
 }
-export interface ChartItemProp {
-    label?: string;
-    value: 'line' | 'bar' | 'map';
-    icon?: ReactNode;
-    disabled?: boolean;
-}
-export interface ResponseDataProps {
-    x_axis?: string[];
-    series: SeriesProps[];
-    tongbi?: number[];
-    huanbi?: number[];
-    total?: number[];
-    yesterDay?: string[];
-}
-export interface SeriesProps {
-    names?: string[];
-    values: number[];
-    index?: string;
-    duration?: TableChildrenProps[];
-}
-export interface TableChildrenProps {
-    name: string;
-    values: number[];
+export interface FiltersProps {
+    eventId: number;
+    eventName: string;
+    filters?: AttrConditionTypes.GroupValue | undefined;
+    propfilters?: PropfiltersProps | undefined;
+}
+export interface PropfiltersProps {
+    attrId: number | undefined;
+    propCategory: string | undefined;
+    type: string | undefined;
+    id?: number | undefined;
+    name?: string | undefined;
+    category?: string | undefined;
+    attrName?: string | undefined;
 }
 export interface TableDataHandleProps {
     xAxis: string[];
@@ -47,6 +33,10 @@ export interface TableDataHandleProps {
         values: string[];
     }[];
 }
+export interface TableDataProps {
+    columns?: ColumnsProps[];
+    dataSource?: DataSourceProps[];
+}
 export interface DataSourceProps {
     [x: string]: string;
 }
@@ -55,8 +45,4 @@ export interface ColumnsProps {
     title: string;
     dataIndex: string;
 }
-export interface TableDataProps {
-    columns?: ColumnsProps[];
-    dataSource?: DataSourceProps[];
-}
 export declare const AttributableContext: import("react").Context<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-attribution",
-  "version": "1.0.1-alpha.14",
+  "version": "1.0.1-alpha.17",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -50,5 +50,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "65f99ba3bab78650e8384684a93a6d1ca0230741"
+  "gitHead": "42736ac302cd121803ec35470562312ca4b452fe"
 }

package/es/constants/chart.d.ts

@@ -1,2 +0,0 @@
-import { ChartItemProp } from '../types';
-export declare const chartTypeOptions: ChartItemProp[];

package/es/constants/chart.js

@@ -1,24 +0,0 @@
-import { IconFont } from '@zgfe/business-lib';
-import React from 'react';
-export var chartTypeOptions = [{
-  label: '趋势图',
-  value: 'line',
-  icon: /*#__PURE__*/React.createElement(IconFont, {
-    type: "qushitu1",
-    size: 16
-  })
-}, {
-  label: '汇总图',
-  value: 'bar',
-  icon: /*#__PURE__*/React.createElement(IconFont, {
-    type: "huizongtu",
-    size: 16
-  })
-}, {
-  label: '地图',
-  value: 'map',
-  icon: /*#__PURE__*/React.createElement(IconFont, {
-    type: "ditu",
-    size: 16
-  })
-}];

package/es/constants/color.d.ts

@@ -1 +0,0 @@
-export declare const chartColors: string[];

package/es/constants/color.js

@@ -1 +0,0 @@
-export var chartColors = ['#165DFF', '#80E1D9', '#65789B', '#F8BC3B', '#6F66ED', '#66AFED', '#9661BC', '#FF7557', '#4DB273', '#F08BB4', '#CDDBFD', '#CDF3F0', '#CED4DE', '#FCE7B9', '#D1CEFD', '#D3E7F9', '#DFCFEA', '#FFD1C7', '#BBDEC8', '#FFE0ED'];

package/es/modules/searchPanel/demo/index.d.ts

@@ -1,2 +0,0 @@
-declare const _default: () => JSX.Element;
-export default _default;

package/es/modules/searchPanel/demo/index.js

@@ -1,28 +0,0 @@
-import { DemoWrapper } from '@zgfe/business-lib';
-import React from 'react';
-import SearchPanel from '..';
-var defaultValue = {
-  targets: [{
-    type: 'event',
-    alias: '事件概览',
-    eventId: -100,
-    eventName: '事件概览',
-    eventGroupId: 0,
-    analysisDimension: {
-      analysisIndex: 'number'
-    }
-  }],
-  userGroup: [0]
-};
-export default (function () {
-  var onChange = function onChange(data) {
-    console.log(data);
-  };
-  return /*#__PURE__*/React.createElement(DemoWrapper, {
-    needMeta: true,
-    defaultApp: 177
-  }, /*#__PURE__*/React.createElement(SearchPanel, {
-    defaultValue: defaultValue,
-    onChange: onChange
-  }));
-});

package/es/utils/transfer.d.ts

@@ -1,65 +0,0 @@
-import { EnvProp, EventGroup, UserProp } from '@zgfe/business-lib/es/attributeSelector/types';
-interface OldSearchData {
-    app_id: number;
-    platform: number;
-    analysis_index: string;
-    module: 'event';
-    chartType: 'string';
-    event_attr?: string;
-    user_attr?: string;
-    event?: number;
-    time: {
-        dimension_date: string;
-        begin_date: string | number;
-        end_date: string | number;
-    } | string;
-    event_group_id?: number;
-    user_group: string;
-    analysis_attr?: string;
-    dimension_sub?: string;
-    filter_condition?: {
-        eventCondition?: {
-            eventSingleConditions?: [
-                {
-                    attrConditions: OldEventCondition[];
-                    environmentConditions: OldCondition[];
-                    eventId: number;
-                    eventName: string;
-                    extra?: string;
-                    happenTime?: {
-                        name: string;
-                        operator: string;
-                        params: any[];
-                        type: number;
-                    };
-                    isNew?: boolean;
-                }
-            ];
-            operator: 'and';
-        };
-        userCondition: {
-            userSingleConditions: OldUserCondition[];
-            operator: 'and';
-        };
-    } | string;
-}
-interface OldCondition {
-    attrId: number;
-    name: string;
-    type: number;
-    category: 'fixed' | 'custom';
-    operator: string;
-    text: string;
-    params: any[];
-}
-interface OldUserCondition extends OldCondition {
-    isUserProp: boolean;
-    subtype?: number;
-}
-interface OldEventCondition extends OldCondition {
-    isEventProp: boolean;
-    eventId: number;
-    eventName: string;
-}
-export declare function transferEventSearchData(params: OldSearchData, userPropList?: UserProp[], eventGroupList?: EventGroup[], eventEnvList?: EnvProp[]): any;
-export {};

package/es/utils/transfer.js

@@ -1,173 +0,0 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-import moment from 'moment';
-import util from './util';
-export function transferEventSearchData(params) {
-  var userPropList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  var eventGroupList = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
-  var eventEnvList = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
-  var result = {
-    userGroup: params.user_group.split(','),
-    targets: [],
-    chartType: params.chartType
-  };
-  var timeData = params.time;
-  if (util.isString(timeData)) {
-    timeData = JSON.parse(timeData);
-  }
-  var time = timeData.dimension_date.split(',');
-  var unit = time[0];
-  var begin = timeData.begin_date;
-  var end = timeData.end_date;
-  if (time.includes('total') || begin.indexOf('-') < 0) {
-    result.time = {
-      unit: unit,
-      relative: [begin, end],
-      begin: moment().subtract(begin, unit).format('YYYY-MM-DD'),
-      end: moment().subtract(end, 'days').format('YYYY-MM-DD')
-    };
-  } else {
-    result.time = {
-      unit: unit,
-      begin: begin,
-      end: end
-    };
-  }
-  if (params.platform) {
-    var envData;
-    eventEnvList.forEach(function (env) {
-      if (env.name === 'platform') {
-        envData = env;
-      }
-    });
-    if (envData) {
-      var platforms = ['android', 'ios', 'js'];
-      result.globalFilters = {
-        relation: 'and',
-        conditions: [{
-          attrId: envData.id,
-          attrName: 'platform',
-          dimensionSub: 'platform',
-          label: envData.label,
-          category: envData.category,
-          type: envData.type,
-          operator: 'equal',
-          propCategory: 'envProp',
-          values: [platforms[params.platform - 1]]
-        }]
-      };
-    }
-  }
-  if (params.dimension_sub && params.event) {
-    var data = transferDimension(userPropList, eventGroupList, eventEnvList, params.dimension_sub, params.event, params.event_attr, params.user_attr);
-    if (data) {
-      result.globalDimensions = [data];
-    }
-  }
-  var targets = {
-    type: params.module,
-    alias: '',
-    eventGroupId: params.event_group_id || 0,
-    eventId: params.event || -100,
-    analysisDimension: {
-      analysisIndex: params.analysis_index,
-      analysisAttr: params.event_attr
-    }
-  };
-  if (params.filter_condition) {
-    var conditions = [];
-    var filterCondition = params.filter_condition;
-    if (util.isString(filterCondition)) {
-      filterCondition = JSON.parse(filterCondition);
-    }
-    var _filterCondition = filterCondition,
-      eventCondition = _filterCondition.eventCondition,
-      userCondition = _filterCondition.userCondition;
-    if (eventCondition && eventCondition.eventSingleConditions) {
-      eventCondition.eventSingleConditions.forEach(function (e) {
-        if (e.happenTime && e.happenTime.params.length) {
-          if (e.happenTime.params[0] === 'relative') {
-            result.time.relative = [e.happenTime.params[1], e.happenTime.params[2]];
-          }
-        }
-        if (e.eventName) {
-          targets.eventName = e.eventName;
-        }
-        if (e.attrConditions) {
-          conditions = conditions.concat(transferCondition(e.attrConditions));
-        }
-        if (e.environmentConditions) {
-          conditions = conditions.concat(transferCondition(e.environmentConditions));
-        }
-      });
-    }
-    if (userCondition && userCondition.userSingleConditions) {
-      conditions = conditions.concat(transferCondition(userCondition.userSingleConditions));
-    }
-    targets.filters = {
-      conditions: conditions,
-      relation: 'and'
-    };
-  }
-  result.targets = [targets];
-  return result;
-}
-function transferDimension(userPropList, eventGroupList, eventEnvList, dimensionSub, eventId, eventAttr, userAttr) {
-  var data;
-  if (eventAttr) {
-    eventGroupList.forEach(function (group) {
-      group.eventList.forEach(function (event) {
-        if (event.id === eventId) {
-          event.attrList.forEach(function (attr) {
-            if (attr.label === eventAttr && !data) {
-              data = {
-                attrId: attr.id,
-                attrName: attr.label,
-                propCategory: 'eventProp',
-                type: attr.type
-              };
-            }
-          });
-        }
-      });
-    });
-  } else if (userAttr) {
-    userPropList.forEach(function (user) {
-      if (user.name === userAttr) {
-        data = _objectSpread({
-          attrId: user.id,
-          attrName: user.name
-        }, user);
-      }
-    });
-  } else {
-    eventEnvList.forEach(function (env) {
-      if (env.name === dimensionSub) {
-        data = _objectSpread({
-          attrId: env.id,
-          attrName: env.name
-        }, env);
-      }
-    });
-  }
-  return data;
-}
-function transferCondition(conditions) {
-  var result = [];
-  conditions.forEach(function (attr) {
-    result.push({
-      subtype: attr.subtype,
-      attrId: attr.attrId,
-      attrName: attr.name,
-      label: attr.text,
-      type: attr.type,
-      propCategory: attr.isEventProp ? 'eventProp' : attr.isUserProp ? 'userProp' : 'envProp',
-      category: attr.category,
-      dimensionSub: attr.category,
-      operator: attr.operator,
-      values: attr.params
-    });
-  });
-  return result;
-}