@zgfe/modules-event 0.0.2-alpha.14 → 0.0.2-alpha.18

package/es/components/eventFilter/index.js

@@ -30,7 +30,7 @@ var EventFilter = function EventFilter(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     event = _useState6[0],
     setEvent = _useState6[1];
-  var _useState7 = useState(true),
+  var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
     eventOverview = _useState8[0],
     setEventOverview = _useState8[1];
@@ -45,10 +45,13 @@ var EventFilter = function EventFilter(props) {
   useEffect(function () {
     if (props.value) {
       var _data = props.value;
-      setEvent({
-        id: _data.id,
-        name: _data.name
-      });
+      if (_data && _data.id) {
+        setEvent({
+          id: _data.id,
+          name: _data.name
+        });
+        setEventOverview(true);
+      }
       if (_data.filters) {
         setFilter(_data.filters);
       }
@@ -57,7 +60,6 @@ var EventFilter = function EventFilter(props) {
           key: _data.dimension.propCategory === 'eventProp' ? _data.dimension.value : _data.dimension.propCategory + '-' + _data.dimension.value
         }));
       }
-      setEventOverview(false);
     }
   }, []);
   var onAdd = function onAdd() {
@@ -82,9 +84,9 @@ var EventFilter = function EventFilter(props) {
   };
   var onChangeEvent = function onChangeEvent(event) {
     if (event && event.event && event.event.id === -100) {
-      setEventOverview(true);
-    } else {
       setEventOverview(false);
+    } else {
+      setEventOverview(true);
     }
     if (event && event.event) {
       setEvent(event.event);
@@ -123,9 +125,6 @@ var EventFilter = function EventFilter(props) {
     }
     props.onChange && props.onChange(_event);
   }, [bizAttributeSelectorValue, filter, event]);
-  useEffect(function () {
-    console.log(666, bizAttributeSelectorValue);
-  }, [bizAttributeSelectorValue]);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizEventSelector, {
@@ -138,7 +137,7 @@ var EventFilter = function EventFilter(props) {
     },
     onChange: onChangeEvent,
     placeholder: "\u8BF7\u9009\u62E9\u4E8B\u4EF6"
-  }), !eventOverview && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(BizAttributeSelector, {
+  }), eventOverview && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(BizAttributeSelector, {
     enableEventProp: true,
     enableUserProp: true,
     enableEnvProp: true,

package/es/components/table/index.js

@@ -31,7 +31,9 @@ var EventTable = function EventTable(props) {
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     _useContext$eventGrou = _useContext.eventGroupList,
-    eventGroupList = _useContext$eventGrou === void 0 ? [] : _useContext$eventGrou;
+    eventGroupList = _useContext$eventGrou === void 0 ? [] : _useContext$eventGrou,
+    eventEnvList = _useContext.eventEnvList,
+    userPropList = _useContext.userPropList;
   var _useContext2 = useContext(EventContext),
     onUserDrill = _useContext2.onUserDrill,
     _useContext2$defaultS = _useContext2.defaultSearch,
@@ -101,7 +103,7 @@ var EventTable = function EventTable(props) {
           })
         },
         source: 'EVENT',
-        url: '/data/appEventBatch.jsp'
+        url: '/zg/web/v2/data/appEventBatch'
       }, _objectSpread(_objectSpread({
         source: 'EVENT'
       }, defaultSearch), {}, {
@@ -109,7 +111,7 @@ var EventTable = function EventTable(props) {
         data: searchData
       }));
     };
-    var _getColumns = getColumns(dataSource.xAxis || [], userGroup, searchData, showList, onShowClick, onClickToDetail);
+    var _getColumns = getColumns(eventGroupList, userPropList, eventEnvList, dataSource.xAxis || [], userGroup, searchData, showList, onShowClick, onClickToDetail);
     return _getColumns;
   }, [dataSource.xAxis, showList, sortTable, panelName]);
   var onChangeTable = function onChangeTable(pagination) {
@@ -136,7 +138,7 @@ var EventTable = function EventTable(props) {
       seriesNames.push(base64.encode('用户群'));
     }
     if (searchData.dimension) {
-      seriesNames.push(base64.encode(getValue(searchData.dimension).label));
+      seriesNames.push(base64.encode(getValue(searchData.dimension, eventGroupList, eventEnvList, userPropList).label));
     }
     if (searchData.id && !searchData.dimension || !searchData.id) {
       seriesNames.push(base64.encode('事件'));

package/es/modules/chart/index.js

@@ -35,7 +35,10 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
     dataSource = _useState8[0],
     setDataSource = _useState8[1];
   var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
+    currentApp = _useContext.currentApp,
+    eventGroupList = _useContext.eventGroupList,
+    eventEnvList = _useContext.eventEnvList,
+    userPropList = _useContext.userPropList;
   var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
     loading = _useState10[0],
@@ -74,7 +77,8 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (params.id) {
       var dimensions = params.dimension;
       if (type === 'map' && dimensions) {
-        setIsCity(judgeIsCity(getValue(dimensions).name));
+        var _getValue;
+        setIsCity(judgeIsCity((_getValue = getValue(dimensions, eventGroupList, eventEnvList, userPropList)) === null || _getValue === void 0 ? void 0 : _getValue.name));
       }
     }
   }, [params, props.type]);

package/es/modules/content/index.js

@@ -7,32 +7,29 @@ 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 { ajax, BizGlobalDataContext, BizLayout, BizTargetFromPanelContext, BizUserGroupHeader } from '@zgfe/business-lib';
+import { ajax, BizGlobalDataContext, BizLayout, BizTargetFromPanelContext } from '@zgfe/business-lib';
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import Request from 'umi-request';
 import TopBar from '../../components/topBar';
 import { EventContext } from '../../types';
 import './styles/index.less';
 import { Apis } from '../../constants';
-import { judgeIsCity, judgeIsArea } from './utils';
+import { judgeIsCity, judgeIsArea, getValue } from './utils';
 import { ContentPanel, SearchPanel } from '../../components';
 import { getDefaultShow } from '../../utils/formData';
-import { Form, Button } from 'antd';
-import EventFilter from '../../components/eventFilter';
+import TopPanel from '../topPanel';
 var timer = 0;
 var ajaxFlag = true;
 var CancelToken = Request.CancelToken;
 var cancel;
 var classPrefix = 'event-content';
 var EventContent = function EventContent(props) {
-  console.log('EventContent', props);
-  var _Form$useForm = Form.useForm(),
-    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-    form = _Form$useForm2[0];
   var _useState = useState(props.value),
     _useState2 = _slicedToArray(_useState, 2),
     finalSearchData = _useState2[0],
     setFinalSearchData = _useState2[1];
+  var _useContext = useContext(BizGlobalDataContext),
+    currentApp = _useContext.currentApp;
   var _useState3 = useState(),
     _useState4 = _slicedToArray(_useState3, 2),
     eventData = _useState4[0],
@@ -57,53 +54,29 @@ var EventContent = function EventContent(props) {
     _useState14 = _slicedToArray(_useState13, 2),
     eventId = _useState14[0],
     setEventId = _useState14[1];
-  var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
   var _useContext2 = useContext(EventContext),
     searchData = _useContext2.searchData,
-    setSearchData = _useContext2.setSearchData;
+    setSearchData = _useContext2.setSearchData,
+    eventGroupList = _useContext2.eventGroupList,
+    eventEnvList = _useContext2.eventEnvList,
+    userPropList = _useContext2.userPropList;
   var _useContext3 = useContext(BizTargetFromPanelContext),
     handleSearch = _useContext3.handleSearch;
   var chartRef = useRef();
   var collapseRef = useRef();
   useEffect(function () {
-    form.resetFields();
     if (props.defaultValue) {
       setEventId(props.defaultValue.id);
-      var _props$defaultValue = props.defaultValue,
-        id = _props$defaultValue.id,
-        name = _props$defaultValue.name,
-        dimension = _props$defaultValue.dimension,
-        filters = _props$defaultValue.filters,
-        userGroup = _props$defaultValue.userGroup;
-      form.setFieldsValue({
-        userGroup: userGroup ? userGroup.map(function (item) {
-          return {
-            id: item
-          };
-        }) : [{
-          id: 0
-        }],
-        filterConditions: {
-          id: id,
-          name: name,
-          dimension: dimension,
-          filters: filters
-        }
-      });
-    } else {
-      form.setFieldsValue({
-        userGroup: [{
-          id: 0
-        }]
-      });
     }
   }, [props.defaultValue]);
   useEffect(function () {
-    if (searchData && searchData.filterConditions && searchData.filterConditions[0].dimension) {
-      var _attrName = searchData.filterConditions[0].dimension.name;
-      setEnableSelectChart(judgeIsArea(_attrName));
-      setIsCity(judgeIsCity(_attrName));
+    if (searchData && searchData.dimension) {
+      var _getValue;
+      var _attrName = (_getValue = getValue(searchData.dimension, eventGroupList, eventEnvList, userPropList)) === null || _getValue === void 0 ? void 0 : _getValue.name;
+      if (_attrName) {
+        setEnableSelectChart(judgeIsArea(_attrName));
+        setIsCity(judgeIsCity(_attrName));
+      }
     }
     if (timer) clearTimeout(timer);
     var flag = true;
@@ -120,7 +93,8 @@ var EventContent = function EventContent(props) {
   useEffect(function () {
     handleSearch && handleSearch(loading);
   }, [loading]);
-  var fetchRequest = function fetchRequest() {
+  var fetchRequest = function fetchRequest(flag) {
+    if (flag !== undefined) ajaxFlag = flag;
     if (!ajaxFlag) return;
     setLoading(true);
     setEventData(undefined);
@@ -162,29 +136,6 @@ var EventContent = function EventContent(props) {
   var onChangeShow = function onChangeShow(data) {
     setShowList(data);
   };
-  var onValuesChange = function onValuesChange(data) {
-    var _data = {};
-    if (data.filterConditions) {
-      if (data.filterConditions.id !== -100) {
-        _data = data.filterConditions;
-        setEventId(data.filterConditions.id);
-      }
-      if (finalSearchData && finalSearchData.id && data.filterConditions.id === finalSearchData.id) {
-        ajaxFlag = false;
-      }
-    } else if (data.userGroup) {
-      _data.userGroup = [];
-      data.userGroup.map(function (item) {
-        _data.userGroup.push(item.id);
-      });
-      if (_data.userGroup.length <= 0) _data.userGroup = [0];
-    } else {
-      _data = _objectSpread({}, data);
-    }
-    setSearchData(function (_searchData) {
-      return _objectSpread(_objectSpread({}, _searchData), _data);
-    });
-  };
   var platformChange = function platformChange(data) {
     ajaxFlag = true;
     setSearchData(function (_searchData) {
@@ -193,46 +144,13 @@ var EventContent = function EventContent(props) {
       });
     });
   };
-  var resetting = function resetting() {
-    form.resetFields();
-    form.setFieldsValue({
-      userGroup: [{
-        id: 0
-      }],
-      filterConditions: null
+  var onChangeSearch = function onChangeSearch(data, flag) {
+    ajaxFlag = flag;
+    data.id ? setEventId(data.id) : setEventId(-1);
+    setSearchData(function (_searchData) {
+      return _objectSpread(_objectSpread({}, _searchData), data);
     });
-    props.initSearch && props.initSearch();
   };
-  var topPanel = /*#__PURE__*/React.createElement(Form, {
-    form: form,
-    component: "div",
-    colon: false,
-    layout: "vertical",
-    scrollToFirstError: true,
-    onValuesChange: onValuesChange
-  }, /*#__PURE__*/React.createElement(Form.Item, {
-    label: "",
-    name: "userGroup"
-  }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
-    max: 3
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    label: "\u4E8B\u4EF6",
-    name: "filterConditions",
-    style: {
-      paddingLeft: '24px'
-    }
-  }, /*#__PURE__*/React.createElement(EventFilter, null)), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-form-botton-box")
-  }, /*#__PURE__*/React.createElement(Button, {
-    onClick: resetting
-  }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
-    disabled: ajaxFlag,
-    type: "primary",
-    onClick: function onClick() {
-      ajaxFlag = true;
-      fetchRequest();
-    }
-  }, "\u67E5\u8BE2")));
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TopBar, {
     searchData: searchData,
     platformChange: platformChange
@@ -242,7 +160,13 @@ var EventContent = function EventContent(props) {
     collapseRef: collapseRef,
     topPanel: /*#__PURE__*/React.createElement("div", {
       ref: collapseRef
-    }, topPanel)
+    }, /*#__PURE__*/React.createElement(TopPanel, {
+      onChange: onChangeSearch,
+      defaultValue: searchData,
+      ajaxFlag: ajaxFlag,
+      finalSearchData: finalSearchData,
+      fetchRequest: fetchRequest
+    }))
   }, /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement(SearchPanel, {

package/es/modules/content/styles/index.less

@@ -4,16 +4,4 @@
     justify-content: flex-end;
     margin-bottom: 16px;
   }
-  &-form-botton-box {
-    display: flex;
-    justify-content: flex-end;
-    margin-top: 24px;
-    margin-right: 24px;
-    > :nth-child(1) {
-      margin-right: 16px;
-      color: #fff;
-      background-color: #29bd52;
-      border-color: #29bd52;
-    }
-  }
 }

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

@@ -1,5 +1,6 @@
 import { AttributeSelect } from '@zgfe/business-lib';
 import { bizAttributeSelectorValueProp } from '../../types';
+import { EventGroup, UserProp, EnvProp } from '@zgfe/business-lib/es/attributeSelector/types';
 export declare const judgeIsCity: (name: string | undefined) => boolean;
 export declare const judgeIsArea: (name: string | undefined) => boolean;
-export declare const getValue: (param: bizAttributeSelectorValueProp) => AttributeSelect.Value | undefined;
+export declare const getValue: (param: bizAttributeSelectorValueProp, eventGroupList: EventGroup[] | undefined, eventEnvList: EnvProp[] | undefined, userPropList: UserProp[] | undefined) => AttributeSelect.Value | undefined;

package/es/modules/content/utils.js

@@ -1,5 +1,3 @@
-import { BizGlobalDataContext } from '@zgfe/business-lib';
-import { useContext } from 'react';
 export var judgeIsCity = function judgeIsCity(name) {
   var areaData = ['current_city', 'city'];
   return name && areaData.indexOf(name) !== -1 ? true : false;
@@ -8,14 +6,9 @@ export var judgeIsArea = function judgeIsArea(name) {
   var areaData = ['current_area', 'current_city', 'area', 'city'];
   return name && areaData.indexOf(name) !== -1 ? true : false;
 };
-export var getValue = function getValue(param) {
-  var _useContext = useContext(BizGlobalDataContext),
-    eventGroupList = _useContext.eventGroupList,
-    eventEnvList = _useContext.eventEnvList,
-    userPropList = _useContext.userPropList;
+export var getValue = function getValue(param, eventGroupList, eventEnvList, userPropList) {
   var res = undefined;
   var key = param.propCategory === 'eventProp' ? param.value : param.propCategory + '-' + param.value;
-  console.log('数据key', key, eventGroupList);
   if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'envProp') {
     eventEnvList === null || eventEnvList === void 0 ? void 0 : eventEnvList.forEach(function (attr) {
       if (attr.key === key) res = attr;
@@ -33,5 +26,6 @@ export var getValue = function getValue(param) {
       if (attr.key === key) res = attr;
     });
   }
+  console.log('获取当前属性的全部数据', res);
   return res;
 };

package/es/modules/home/index.js

@@ -19,8 +19,12 @@ var classPrefix = 'event-container';
 var ModuleEvent = function ModuleEvent(props) {
   console.log('ModuleEvent-props', props);
   var _useContext = useContext(BizGlobalDataContext),
-    userGroupList = _useContext.userGroupList,
-    currentApp = _useContext.currentApp;
+    currentApp = _useContext.currentApp,
+    eventGroupList = _useContext.eventGroupList,
+    eventEnvList = _useContext.eventEnvList,
+    userPropList = _useContext.userPropList,
+    userGroupList = _useContext.userGroupList;
+  console.log('BizGlobalDataContext', eventGroupList, eventEnvList, userPropList);
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     searchData = _useState2[0],
@@ -101,6 +105,9 @@ var ModuleEvent = function ModuleEvent(props) {
     value: {
       panelId: panelId,
       elementId: elementId,
+      eventGroupList: eventGroupList,
+      eventEnvList: eventEnvList,
+      userPropList: userPropList,
       searchData: searchData,
       setSearchData: setSearchData,
       panelName: title,

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

@@ -0,0 +1,4 @@
+import React from 'react';
+import './styles/index.less';
+declare const TopPanel: React.ForwardRefExoticComponent<Pick<any, string | number | symbol> & React.RefAttributes<any>>;
+export default TopPanel;

package/es/modules/topPanel/index.js

@@ -0,0 +1,113 @@
+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 from 'react';
+import { Form, Button } from 'antd';
+import { BizUserGroupHeader } from '@zgfe/business-lib';
+import EventFilter from '../../components/eventFilter';
+import './styles/index.less';
+var classPrefix = 'top-panel';
+var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var defaultValue = props.defaultValue,
+    ajaxFlag = props.ajaxFlag,
+    finalSearchData = props.finalSearchData,
+    fetchRequest = props.fetchRequest;
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var id = defaultValue.id,
+    name = defaultValue.name,
+    dimension = defaultValue.dimension,
+    filters = defaultValue.filters,
+    userGroup = defaultValue.userGroup;
+  var onValuesChange = function onValuesChange(data, allData) {
+    var _data = {};
+    if (allData.filterConditions) {
+      if (allData.filterConditions.id !== -100) {
+        _data = allData.filterConditions;
+      }
+    }
+    if (allData.userGroup) {
+      _data.userGroup = [];
+      allData.userGroup.map(function (item) {
+        _data.userGroup && _data.userGroup.push(item.id);
+      });
+      if (_data.userGroup.length <= 0) _data.userGroup = [0];
+    }
+    if (data.filterConditions) {
+      if (finalSearchData && finalSearchData.id && data.filterConditions.id === finalSearchData.id) {
+        ajaxFlag = false;
+      } else {
+        ajaxFlag = true;
+      }
+    }
+    props.onChange(_data, ajaxFlag);
+  };
+  var resetting = function resetting() {
+    form.resetFields();
+    form.setFieldsValue({
+      userGroup: [{
+        id: 0
+      }],
+      filterConditions: null
+    });
+    props.onChange({
+      userGroup: [0],
+      id: undefined,
+      name: undefined,
+      filters: undefined,
+      dimension: undefined
+    }, true);
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    ref: ref
+  }, /*#__PURE__*/React.createElement(Form, {
+    ref: ref,
+    form: form,
+    component: "div",
+    colon: false,
+    layout: "vertical",
+    initialValues: {
+      userGroup: userGroup ? userGroup.map(function (item) {
+        return {
+          id: item
+        };
+      }) : [{
+        id: 0
+      }],
+      filterConditions: {
+        id: id,
+        name: name,
+        dimension: dimension,
+        filters: filters
+      }
+    },
+    scrollToFirstError: true,
+    onValuesChange: onValuesChange
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    label: "",
+    name: "userGroup"
+  }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
+    max: 3
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u4E8B\u4EF6",
+    name: "filterConditions",
+    style: {
+      paddingLeft: '24px'
+    }
+  }, /*#__PURE__*/React.createElement(EventFilter, null)), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-form-botton-box")
+  }, /*#__PURE__*/React.createElement(Button, {
+    onClick: resetting
+  }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
+    disabled: ajaxFlag,
+    type: "primary",
+    onClick: function onClick() {
+      fetchRequest(true);
+    }
+  }, "\u67E5\u8BE2"))));
+});
+export default TopPanel;

package/es/modules/topPanel/styles/index.less

@@ -0,0 +1,14 @@
+.top-panel {
+  &-form-botton-box {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 24px;
+    margin-right: 24px;
+    > :nth-child(1) {
+      margin-right: 16px;
+      color: #fff;
+      background-color: #29bd52;
+      border-color: #29bd52;
+    }
+  }
+}

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

@@ -0,0 +1,18 @@
+import { AttrConditionTypes } from '@zgfe/business-lib';
+import { bizAttributeSelectorValueProp } from '../../types';
+interface filterConditions {
+    id?: number;
+    name?: string;
+    filters?: AttrConditionTypes.GroupValue;
+    dimension?: bizAttributeSelectorValueProp;
+}
+export interface FormDataProps {
+    userGroup?: {
+        id: number;
+    }[];
+    filterConditions?: filterConditions;
+}
+export interface FormHandelDataProps extends filterConditions {
+    userGroup?: number[];
+}
+export {};

package/es/modules/topPanel/types.js

@@ -0,0 +1 @@
+export {};

package/es/utils/formData.d.ts

@@ -3,7 +3,7 @@ import type { ColumnsType } from 'antd/es/table';
 import { EventGroup, UserProp, EnvProp } from '@zgfe/business-lib/es/attributeSelector/types';
 import { ResponseDataProps, SearchValue } from '../types';
 import '../style/index.less';
-export declare function getColumns(columnData: string[], userGroup: number[], searchData: SearchValue, showList: string[], onShowCallback: Function, onClickToDetailCallback: Function): ColumnsType<any>;
+export declare function getColumns(eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined, columnData: string[], userGroup: number[], searchData: SearchValue, showList: string[], onShowCallback: Function, onClickToDetailCallback: Function): ColumnsType<any>;
 export declare function getAttrLabel(attrData: AttrConditionTypes.ItemValue, eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined): string | undefined;
 export declare function formTableData(originalData: ResponseDataProps, userGroups: number[], attrNum: number, eventGroupList: any[], showList?: string[]): any;
 export declare function getDefaultShow(source: ResponseDataProps): string[];

package/es/utils/formData.js

@@ -6,7 +6,7 @@ import { Tooltip } from 'antd';
 import '../style/index.less';
 import { getValue } from '../modules/content/utils';
 var classPrefix = 'event-form-data';
-export function getColumns(columnData, userGroup, searchData, showList, onShowCallback, onClickToDetailCallback) {
+export function getColumns(eventGroupList, userPropList, eventEnvList, columnData, userGroup, searchData, showList, onShowCallback, onClickToDetailCallback) {
   var data = [{
     title: '显示',
     width: 80,
@@ -46,9 +46,8 @@ export function getColumns(columnData, userGroup, searchData, showList, onShowCa
     });
   }
   if (searchData.dimension) {
-    console.log(111111, searchData.dimension, getValue(searchData.dimension));
     data.push({
-      title: getValue(searchData.dimension).label,
+      title: getValue(searchData.dimension, eventGroupList, eventEnvList, userPropList).label,
       width: 150,
       dataIndex: 'dimension',
       key: 'dimension',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "0.0.2-alpha.14",
+  "version": "0.0.2-alpha.18",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -49,7 +49,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "fdfc41eb5c7ed699c7da896f4235b62418e182a2",
+  "gitHead": "c357509dc24e222f7567955e203bef20b5d3d4ee",
   "dependencies": {
     "react-copy-to-clipboard": "^5.1.0",
     "react-highlight": "^0.15.0"