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

package/es/modules/searchPanel/index.js

@@ -7,24 +7,25 @@ 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 = 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, { useContext, useEffect, useState } from 'react';
+import React, { useContext, useEffect, useState, useImperativeHandle } from 'react';
 import { IconFont, BizGlobalDataContext } from '@zgfe/business-lib';
 import { Button, Form, Skeleton, Tooltip, Checkbox, Select, InputNumber } from 'antd';
 import SearchContent from './components/index';
 import GlobalAttribute from './components/globalAttribute';
 import './styles/index.less';
 import _ from 'lodash';
-import { targetChangeCallback, submitButtonDisableHandle, removeEmptyValue, verifyHandle } from './utils';
-import { initTarget } from '../../constants/initData';
+import { targetChangeCallback, submitButtonDisableHandle } from './utils';
 import { searchFields } from '../../constants/fields';
 import { AttributableContext } from '../../types';
 export var classPrefix = 'mi-left-form';
-var SearchPanel = function SearchPanel(props) {
+var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var defaultValue = props.defaultValue;
+  console.log('SearchPanel', defaultValue);
   var _useContext = useContext(AttributableContext),
     buttonDisable = _useContext.buttonDisable,
     setButtonDisable = _useContext.setButtonDisable;
-  console.log('defaultValue', defaultValue);
+  var _useContext2 = useContext(BizGlobalDataContext),
+    eventGroupList = _useContext2.eventGroupList;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -40,102 +41,118 @@ var SearchPanel = function SearchPanel(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     formData = _useState6[0],
     setFormData = _useState6[1];
-  var _useState7 = useState([-100]),
+  var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
     eventIdList = _useState8[0],
     setEventIdList = _useState8[1];
-  var _useContext2 = useContext(BizGlobalDataContext),
-    eventGroupList = _useContext2.eventGroupList;
-  var _useState9 = useState(1),
+  var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    windowCnt = _useState10[0],
-    setWindowCnt = _useState10[1];
-  var _useState11 = useState('day'),
+    selectList = _useState10[0],
+    setSelectList = _useState10[1];
+  useEffect(function () {
+    if (formData) {
+      var targetData = targetChangeCallback(formData, eventIdList, eventGroupList);
+      form.setFieldsValue(targetData);
+    }
+  }, [eventIdList, formData]);
+  var _useState11 = useState(-1),
     _useState12 = _slicedToArray(_useState11, 2),
-    windowTypeUnit = _useState12[0],
-    setwindowTypeUnit = _useState12[1];
-  var _useState13 = useState(0),
+    windowCnt = _useState12[0],
+    setWindowCnt = _useState12[1];
+  var _useState13 = useState('day'),
     _useState14 = _slicedToArray(_useState13, 2),
-    attrTargetCount = _useState14[0],
-    setAttrTargetCount = _useState14[1];
+    windowTypeUnit = _useState14[0],
+    setwindowTypeUnit = _useState14[1];
   var _useState15 = useState(0),
     _useState16 = _slicedToArray(_useState15, 2),
-    attrSourceCount = _useState16[0],
-    setAttrSourceCount = _useState16[1];
+    attrTargetCount = _useState16[0],
+    setAttrTargetCount = _useState16[1];
+  var _useState17 = useState({}),
+    _useState18 = _slicedToArray(_useState17, 2),
+    attrSourceCount = _useState18[0],
+    setAttrSourceCount = _useState18[1];
+  var _useState19 = useState({}),
+    _useState20 = _slicedToArray(_useState19, 2),
+    mincePropCount = _useState20[0],
+    setMincePropCount = _useState20[1];
+  var getSelectEventIdList = function getSelectEventIdList(data, type, eList) {
+    if (data[type]) {
+      data[type].forEach(function (target) {
+        if (target && target.eventId && target.eventId !== -100) {
+          eList.push(target.eventId);
+        }
+      });
+    }
+    return eList;
+  };
+  var setSelectEventIdList = function setSelectEventIdList(data) {
+    var eList = [];
+    var _eList = _.cloneDeep(getSelectEventIdList(data, 'targetFilters', eList));
+    getSelectEventIdList(data, 'sourceFilters', eList);
+    setEventIdList(_eList);
+    setSelectList(eList);
+  };
   useEffect(function () {
     if (defaultValue) {
       var data = defaultValue;
-      console.log('初始化', data);
       setFormData(data);
-      var eList = [];
-      defaultValue.targetFilters.forEach(function (target) {
-        if (target && target.eventId) {
-          eList.push(target.eventId);
+      setSelectEventIdList(defaultValue);
+      if (defaultValue.windowType !== undefined) {
+        setOtherEvent(defaultValue.otherEvent);
+        setWindowCnt(defaultValue.windowCnt);
+        setwindowTypeUnit(defaultValue.windowType);
+        defaultValue.windowCnt == -1 ? setWindowType(1) : setWindowType(2);
+      }
+      var _attrCount = {};
+      var _sourceCount = {};
+      data.sourceFilters.map(function (item) {
+        if (item.attributionSubdivision != undefined) {
+          _attrCount[item.eventId] = 1;
+        }
+        if (item.filters != undefined) {
+          _sourceCount[item.eventId] = item.filters.conditions.length;
         }
       });
-      setEventIdList(eList);
+      setMincePropCount(_attrCount);
+      setAttrSourceCount(_sourceCount);
     }
     setLoading(false);
   }, []);
   var onChange = function onChange(_changedValues, allValues) {
-    console.log(666, allValues);
-    var data = _.cloneDeep(allValues);
-    if (_changedValues.targetFilters) {
-      var eList = [];
-      if (allValues.targetFilters.length) {
-        allValues.targetFilters.forEach(function (target) {
-          if (target && target.eventId) {
-            eList.push(target.eventId);
-          }
-        });
-      } else {
-        data.targetFilters = initTarget;
-        eList = [-100];
-      }
-      console.log('999', eList);
-      setEventIdList(eList);
-      var targetData = targetChangeCallback(data, eList, eventGroupList);
-      form.setFieldsValue(targetData);
-    }
-    setButtonDisable(submitButtonDisableHandle(allValues, attrSourceCount, attrTargetCount));
+    console.log('筛选值发生改变', _changedValues, allValues);
+    setFormData(allValues);
+    setSelectEventIdList(_.cloneDeep(allValues));
+    setButtonDisable(submitButtonDisableHandle(allValues, attrSourceCount, attrTargetCount, mincePropCount));
   };
-  var attrChange = function attrChange(e) {
-    var reason = form.getFieldValue('reason');
-    console.log('细分属性变化：', e, reason);
-  };
-  var _useState17 = useState(false),
-    _useState18 = _slicedToArray(_useState17, 2),
-    verify = _useState18[0],
-    setVerify = _useState18[1];
-  var onFinish = function onFinish() {
-    setVerify(true);
+  var onFinish = function onFinish(isFetchRequest) {
     form.validateFields().then(function (res) {
-      if (verifyHandle(res)) {
-        console.log('表单检验通过', res);
-        res.otherEvent = otherEvent;
-        res.windowCnt = windowCnt;
-        res.windowType = windowType === 1 ? 'day' : windowTypeUnit;
-        var finalData = removeEmptyValue(res);
-        console.log(123123, finalData);
-        props.onChange(finalData);
-      }
+      res.otherEvent = otherEvent;
+      res.windowCnt = windowCnt;
+      res.windowType = windowType === 1 ? 'day' : windowTypeUnit;
+      props.onChange(res, isFetchRequest);
     }).catch(function (e) {
       console.log('表单检验失败', e);
     });
   };
+  useImperativeHandle(ref, function () {
+    return {
+      onGetSearchData: function onGetSearchData() {
+        onFinish(false);
+      }
+    };
+  });
   var otherEventChange = function otherEventChange(e) {
     setOtherEvent(e.target.checked);
   };
   var onReset = function onReset() {
     setButtonDisable(true);
     form.resetFields();
-    setVerify(false);
     setWindowType(1);
   };
-  var _useState19 = useState(1),
-    _useState20 = _slicedToArray(_useState19, 2),
-    windowType = _useState20[0],
-    setWindowType = _useState20[1];
+  var _useState21 = useState(1),
+    _useState22 = _slicedToArray(_useState21, 2),
+    windowType = _useState22[0],
+    setWindowType = _useState22[1];
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement(Skeleton, {
@@ -189,16 +206,17 @@ var SearchPanel = function SearchPanel(props) {
         }), /*#__PURE__*/React.createElement(SearchContent, {
           type: item.type,
           key: field.key,
-          attrChange: attrChange,
-          enableDelete: fields.length > 1,
           eventIdList: eventIdList,
-          allValues: formData,
-          verify: verify,
           onDelete: function onDelete() {
             return remove(index);
           },
           setAttrTargetCount: setAttrTargetCount,
-          setAttrSourceCount: setAttrSourceCount
+          setAttrSourceCount: setAttrSourceCount,
+          setMincePropCount: setMincePropCount,
+          attrSourceCount: attrSourceCount,
+          mincePropCount: mincePropCount,
+          formData: formData,
+          selectList: selectList
         }));
       }), fields.length < item.max && /*#__PURE__*/React.createElement("div", {
         className: "".concat(classPrefix, "-add"),
@@ -213,6 +231,7 @@ var SearchPanel = function SearchPanel(props) {
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-otherEvent")
   }, /*#__PURE__*/React.createElement(Checkbox, {
+    checked: otherEvent,
     onChange: otherEventChange
   }, "\u4E5F\u8BA1\u7B97\u5176\u4ED6\u8F6C\u5316\u4E8B\u4EF6"), /*#__PURE__*/React.createElement(Tooltip, {
     placement: "right",
@@ -268,7 +287,8 @@ var SearchPanel = function SearchPanel(props) {
       width: 208
     },
     onChange: function onChange(e) {
-      return setWindowType(e);
+      setWindowType(e);
+      e === 1 ? setWindowCnt(-1) : setWindowCnt(1);
     },
     options: [{
       value: 1,
@@ -282,12 +302,13 @@ var SearchPanel = function SearchPanel(props) {
     style: {
       width: 80
     },
-    defaultValue: 1,
+    value: windowCnt,
     onChange: function onChange(e) {
-      return setWindowCnt(e);
+      if (e !== null && e <= 0) return;
+      setWindowCnt(e);
     }
   }), /*#__PURE__*/React.createElement(Select, {
-    defaultValue: "day",
+    value: windowTypeUnit,
     style: {
       width: 80
     },
@@ -310,7 +331,9 @@ var SearchPanel = function SearchPanel(props) {
     className: "".concat(buttonDisable ? 'disable' : ''),
     disabled: buttonDisable,
     type: "primary",
-    onClick: onFinish
+    onClick: function onClick() {
+      return onFinish(true);
+    }
   }, "\u63D0\u4EA4")))));
-};
+});
 export default SearchPanel;

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

@@ -1,7 +1,8 @@
+import { SearchValueProps, FiltersProps } from '../../types';
 export declare namespace SearchPanelTypes {
     interface Props {
-        defaultValue?: any;
-        onChange: (values: any) => void;
+        defaultValue?: SearchValueProps;
+        onChange: (values: SearchValueProps, isFetchRequest: boolean) => void;
     }
     interface FieldProp {
         key: string;
@@ -10,22 +11,36 @@ export declare namespace SearchPanelTypes {
         label: string;
         max: number;
         addLabel: string;
-        options?: any[];
         tips?: string;
         required?: boolean;
     }
     interface PanelProp {
         type: string;
-        value?: any;
-        allValues?: any;
-        enableDelete: boolean;
+        value?: FiltersProps;
         eventIdList?: number[];
-        showOverview?: boolean;
-        onChange?: (data: any) => void;
-        onDelete?: () => void;
-        attrChange?: (data: any) => void;
-        verify: boolean;
+        onChange?: (data: FiltersProps) => void;
+        onDelete: () => void;
+        formData: SearchValueProps;
         setAttrTargetCount: Function;
         setAttrSourceCount: Function;
+        attrSourceCount: {
+            [x: number]: number;
+        };
+        setMincePropCount: Function;
+        mincePropCount: {
+            [x: number]: number;
+        };
+        selectList?: number[];
+    }
+    interface bizAttributeSelectorValueProp {
+        id?: number;
+        propCategory?: string;
+    }
+    interface targetDataProp {
+        event?: {
+            id: number;
+            name: string;
+            alias?: string;
+        };
     }
 }

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

@@ -1,5 +1,8 @@
-import { SearchData } from '../../types';
-export declare function removeEmptyValue(source: SearchData): any;
-export declare function verifyHandle(data: SearchData): boolean;
-export declare function targetChangeCallback(data: SearchData, eList: number[], eventGroupList: any): SearchData;
-export declare function submitButtonDisableHandle(data: SearchData, attrSourceCount: number, attrTargetCount: number): boolean;
+import { SearchValueProps } from '../../types';
+import { EventSelectTypes } from '@zgfe/business-lib/es/eventSelector/types';
+export declare function targetChangeCallback(data: SearchValueProps, eList: number[], eventGroupList: EventSelectTypes.Value[]): SearchValueProps;
+export declare function submitButtonDisableHandle(data: SearchValueProps, attrSourceCount: {
+    [x: number]: number;
+}, attrTargetCount: number, mincePropCount: {
+    [x: number]: number;
+}): boolean;

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) {
+  if (eList.length <= 0) {
     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,48 +21,62 @@ export function targetChangeCallback(data, eList, eventGroupList) {
   }
   return data;
 }
-var buttonDisable = function buttonDisable(data, type, count) {
+var judgeAttrInEvents = function judgeAttrInEvents(elds, attrId, eventGroupList) {
   var flag = false;
-  data[type].map(function (item) {
-    item === undefined ? flag = true : null;
-    if (item !== undefined) {
-      var _item$filters;
-      (item === null || item === void 0 ? void 0 : item.eventId) === -100 ? flag = true : null;
-      item.filters === undefined && count != 0 ? flag = true : null;
-      if ((item === null || item === void 0 ? void 0 : item.filters) && ((_item$filters = item.filters) === null || _item$filters === void 0 ? void 0 : _item$filters.conditions.length) > 0) {
-        var _item$filters2, _item$filters3;
-        (_item$filters2 = item.filters) === null || _item$filters2 === void 0 ? void 0 : _item$filters2.conditions.map(function (_item) {
-          var _item$values;
-          _item.values && ((_item$values = _item.values) === null || _item$values === void 0 ? void 0 : _item$values.length) <= 0 ? flag = true : null;
+  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;
+          }
         });
-        ((_item$filters3 = item.filters) === null || _item$filters3 === void 0 ? void 0 : _item$filters3.conditions.length) != count ? flag = true : null;
       }
-    }
+    });
   });
   return flag;
 };
-export function submitButtonDisableHandle(data, attrSourceCount, attrTargetCount) {
+export function submitButtonDisableHandle(data, attrSourceCount, attrTargetCount, mincePropCount) {
   var flag = false;
   data.attributionType === undefined ? flag = true : null;
-  buttonDisable(data, 'sourceFilters', attrSourceCount) ? flag = true : null;
+  buttonDisable(data, 'sourceFilters', attrSourceCount, mincePropCount) ? flag = true : null;
   buttonDisable(data, 'targetFilters', attrTargetCount) ? flag = true : null;
-  console.log('判断提交按钮是否可点击', attrSourceCount, flag, data);
   return flag;
 }
-var judgeAttrInEvents = function judgeAttrInEvents(elds, attrId, eventGroupList) {
+var buttonDisable = function buttonDisable(data, type, count, mincePropCount) {
   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;
+  data[type].map(function (item) {
+    item === undefined ? flag = true : null;
+    if (item !== undefined) {
+      var _item$filters;
+      (item === null || item === void 0 ? void 0 : item.eventId) === -100 ? flag = true : null;
+      if (type === 'targetFilters') {
+        item.filters === undefined && count != 0 ? flag = true : null;
+      } else {
+        item.filters === undefined && Object.keys(count).length > 0 && count[item.eventId] !== undefined ? flag = true : null;
+        if (mincePropCount != undefined) {
+          item.attributionSubdivision === undefined && Object.keys(mincePropCount).length > 0 && mincePropCount[item.eventId] !== undefined ? flag = true : null;
+        }
+      }
+      if ((item === null || item === void 0 ? void 0 : item.filters) && ((_item$filters = item.filters) === null || _item$filters === void 0 ? void 0 : _item$filters.conditions.length) > 0) {
+        var _item$filters2;
+        (_item$filters2 = item.filters) === null || _item$filters2 === void 0 ? void 0 : _item$filters2.conditions.map(function (_item) {
+          if (_item.operator !== 'is null' && _item.operator !== 'is not null') {
+            var _item$values;
+            _item.values && ((_item$values = _item.values) === null || _item$values === void 0 ? void 0 : _item$values.length) <= 0 ? flag = true : null;
           }
         });
+        if (type === 'targetFilters') {
+          var _item$filters3;
+          ((_item$filters3 = item.filters) === null || _item$filters3 === void 0 ? void 0 : _item$filters3.conditions.length) != count ? flag = true : null;
+        } else {
+          var _item$filters4;
+          ((_item$filters4 = item.filters) === null || _item$filters4 === void 0 ? void 0 : _item$filters4.conditions.length) != count[item.eventId] ? flag = true : null;
+        }
       }
-    });
+    }
   });
   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;
+    attributionSubdivision?: 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.2",
+  "version": "1.0.1-alpha.21",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -37,7 +37,7 @@
     "@types/lodash": "^4.14.191",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.41-attribution.2",
+    "@zgfe/business-lib": "1.1.41-attribution.4",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "echarts": "^5.3.2",
@@ -50,5 +50,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "90fb90084383b65fa367f296a3f1a6f5c00c16f3"
+  "gitHead": "996f95a27a25d2365836ab5a3533ee33fb8a14b6"
 }

package/es/constants/chart.d.ts

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