@zgfe/business-lib 1.0.24-userTag.0 → 1.0.24

package/es/datePicker/index.js

@@ -50,9 +50,21 @@ var BizDatePicker = function BizDatePicker(props) {
 
     if (data) {
       setCurrentType(function () {
-        return dateList.filter(function (item) {
+        var list = dateList.filter(function (item) {
           return item.value === data.unit;
         })[0] || dateList[0];
+
+        if (data.relative) {
+          var valueData = list.children.filter(function (item) {
+            return item.count === data.relative[0];
+          })[0];
+
+          if (valueData) {
+            setCurrentTime(valueData);
+          }
+        }
+
+        return list;
       });
       setDateRange(function () {
         return {
@@ -64,13 +76,19 @@ var BizDatePicker = function BizDatePicker(props) {
 
     setReady(false);
   }, []);
+  useEffect(function () {
+    if (props.onChange && dateRange) props.onChange(_objectSpread({
+      unit: currentType.value,
+      relative: currentTime ? [currentTime === null || currentTime === void 0 ? void 0 : currentTime.count, props.includeToday && currentType.value === 'day' ? 0 : 1] : undefined
+    }, dateRange));
+  }, [currentType, currentTime, dateRange]);
 
   var onChangeDateType = function onChangeDateType(data) {
     setCurrentType(data);
     setCurrentTime(data.children[0]);
   };
 
-  var _onClick = function onClick(value) {
+  var onClickShortcut = function onClickShortcut(value) {
     setCurrentTime(value);
   };
 
@@ -80,10 +98,6 @@ var BizDatePicker = function BizDatePicker(props) {
     if (!changed) {
       setCurrentTime(undefined);
     }
-
-    if (props.onChange) props.onChange(_objectSpread({
-      unit: currentType.value
-    }, value));
   };
 
   return /*#__PURE__*/React.createElement("div", {
@@ -109,7 +123,7 @@ var BizDatePicker = function BizDatePicker(props) {
       key: index,
       className: "".concat(classPrefix, "-item ").concat(currentTime && currentTime.value === item.value ? 'active' : ''),
       onClick: function onClick() {
-        return _onClick(item);
+        return onClickShortcut(item);
       }
     }, item.value);
   })), /*#__PURE__*/React.createElement(BizDate, {

package/es/datePicker/styles/index.less

@@ -45,7 +45,7 @@
 
     &.active {
       color: @primary-color;
-      background: color(~`colorPalette('@{primary-color}', 0.1) `);
+      background: @primary-color-hover;
       border: 1px solid @primary-color;
     }
   }

package/es/datePicker/types.d.ts

@@ -5,12 +5,13 @@ export declare namespace DatePickerTypes {
     }
     interface Value extends Range {
         unit: 'hour' | 'day' | 'week' | 'month';
+        relative?: [number, number];
     }
     interface Props {
         defaultValue?: Value;
         value?: Value;
         includeToday?: boolean;
-        onChange?: (data: object) => void;
+        onChange?: (data: Value) => void;
     }
     interface Option {
         label: string;

package/es/dnd/demo/data.js

@@ -68,8 +68,9 @@ export default (function () {
         key: data.id
       }, data.label);
     },
-    onChange: function onChange(list) {
-      console.log('排序后数据', list);
+    onChange: function onChange(array) {
+      console.log('排序后数据', array);
+      setList(array);
     }
   }));
 });

package/es/dnd/demo/styles/index.less

@@ -6,7 +6,7 @@
 }
 .item {
   display: inline-block;
-  width: 300px;
+  width: 10%;
   height: 150px;
   margin: @margin-md;
   line-height: 150px;

package/es/dnd/index.js

@@ -91,7 +91,9 @@ var BizDnd = function BizDnd(props) {
           res.push(item);
         }
 
-        if (props.onChange) props.onChange(res);
+        setTimeout(function () {
+          if (props.onChange) props.onChange(res);
+        });
         return res;
       });
       return target;

package/es/dnd/item.js

@@ -47,24 +47,30 @@ var BizDndItem = function BizDndItem(props) {
     if (ref.current) {
       var computedStyle = window.getComputedStyle(ref.current);
       style = {
-        position: 'fixed',
+        position: '',
         pointerEvents: 'inherit',
         top: top - Number(computedStyle.marginTop.replace('px', '')),
-        left: left - Number(computedStyle.marginLeft.replace('px', ''))
+        left: left - Number(computedStyle.marginLeft.replace('px', '')),
+        width: computedStyle.width,
+        height: computedStyle.height
       };
+      setStyle();
       preMouse = {
         x: e.clientX,
         y: e.clientY
       };
+      setIsDragging(true);
     }
   }
 
   function onMouseMove(e) {
-    setIsDragging(true);
+    var computedStyle = window.getComputedStyle(ref.current);
     style.position = 'fixed';
     style.top += e.clientY - (preMouse.y || 0);
     style.left += e.clientX - (preMouse.x || 0);
     style.pointerEvents = 'none';
+    style.width = computedStyle.width;
+    style.height = computedStyle.height;
     setStyle();
     preMouse = {
       x: e.clientX,
@@ -81,7 +87,9 @@ var BizDndItem = function BizDndItem(props) {
       position: 'inherit',
       pointerEvents: 'inherit',
       top: 0,
-      left: 0
+      left: 0,
+      width: '',
+      height: ''
     };
     setStyle();
     if (props.onDropEnd) props.onDropEnd(data);
@@ -93,6 +101,7 @@ var BizDndItem = function BizDndItem(props) {
       ref.current.style.top = "".concat(style.top, "px");
       ref.current.style.left = "".concat(style.left, "px");
       ref.current.style.pointerEvents = style.pointerEvents;
+      ref.current.style.width = style.width;
     }
   }
 

package/es/eventSelector/listPanel.js

@@ -40,7 +40,7 @@ var EventListPanel = function EventListPanel(props) {
   var _useContext = useContext(BizGlobalDataContext),
       eventGroupList = _useContext.eventGroupList;
 
-  var _useState3 = useState(eventGroupList),
+  var _useState3 = useState(eventGroupList || []),
       _useState4 = _slicedToArray(_useState3, 2),
       groupList = _useState4[0],
       setGroupList = _useState4[1];
@@ -55,15 +55,10 @@ var EventListPanel = function EventListPanel(props) {
       searchEventList = _useState8[0],
       setSearchEventList = _useState8[1];
 
-  var _useState9 = useState([]),
+  var _useState9 = useState(),
       _useState10 = _slicedToArray(_useState9, 2),
-      showList = _useState10[0],
-      setShowList = _useState10[1];
-
-  var _useState11 = useState(),
-      _useState12 = _slicedToArray(_useState11, 2),
-      currentValue = _useState12[0],
-      setCurrentValue = _useState12[1];
+      currentValue = _useState10[0],
+      setCurrentValue = _useState10[1];
 
   var overviewData = {
     id: -100,
@@ -107,18 +102,8 @@ var EventListPanel = function EventListPanel(props) {
     setSearchEventList(function () {
       return list;
     });
-    setShowList(function () {
-      return list.slice(0, 10);
-    });
   }, [searchValue, currentGroup, showOverview]);
 
-  var loadMoreData = function loadMoreData() {
-    var moreData = searchEventList.slice(showList.length, showList.length + 10);
-    setShowList(function (list) {
-      return [].concat(_toConsumableArray(list), _toConsumableArray(moreData));
-    });
-  };
-
   function onClickEvent(e) {
     var resVal = _.cloneDeep(currentValue) || {};
     resVal.event = e;
@@ -172,7 +157,39 @@ var EventListPanel = function EventListPanel(props) {
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-list"),
     id: "scrollableDiv"
-  }, /*#__PURE__*/React.createElement(InfiniteScroll, {
+  }, /*#__PURE__*/React.createElement(InfiniteScrollList, {
+    searchEventList: searchEventList,
+    searchValue: searchValue,
+    currentGroup: currentGroup,
+    currentValue: currentValue,
+    onClick: onClickEvent
+  }))));
+};
+
+var InfiniteScrollList = function InfiniteScrollList(_ref) {
+  var searchEventList = _ref.searchEventList,
+      searchValue = _ref.searchValue,
+      currentGroup = _ref.currentGroup,
+      currentValue = _ref.currentValue,
+      onClick = _ref.onClick;
+
+  var _useState11 = useState([]),
+      _useState12 = _slicedToArray(_useState11, 2),
+      showList = _useState12[0],
+      setShowList = _useState12[1];
+
+  useEffect(function () {
+    setShowList(searchEventList.slice(0, 10));
+  }, [searchEventList]);
+
+  var loadMoreData = function loadMoreData() {
+    var moreData = searchEventList.slice(showList.length, showList.length + 10);
+    setShowList(function (list) {
+      return [].concat(_toConsumableArray(list), _toConsumableArray(moreData));
+    });
+  };
+
+  return /*#__PURE__*/React.createElement(InfiniteScroll, {
     dataLength: showList.length,
     hasMore: showList.length < searchEventList.length,
     loader: /*#__PURE__*/React.createElement(Skeleton, {
@@ -184,7 +201,7 @@ var EventListPanel = function EventListPanel(props) {
     next: loadMoreData,
     scrollableTarget: "scrollableDiv",
     key: Math.random()
-  }, showList === null || showList === void 0 ? void 0 : showList.map(function (e) {
+  }, showList.map(function (e) {
     var _currentValue$event;
 
     if (e.eventHidden === ShowStatus.hidden) return null;
@@ -197,9 +214,9 @@ var EventListPanel = function EventListPanel(props) {
         text: searchValue
       },
       data: e,
-      onClick: onClickEvent
+      onClick: onClick
     });
-  })))));
+  }));
 };
 
 export default EventListPanel;

package/es/eventSelector/option.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { AnalysisEvent, EventGroup } from '../attributeSelector/types';
 declare const EventListOption: React.FC<{
     showCount?: boolean;
     count?: number;
@@ -9,7 +10,7 @@ declare const EventListOption: React.FC<{
         text: string;
         color?: string;
     };
-    data?: any;
+    data?: EventGroup | AnalysisEvent;
     onClick?: (data: any) => void;
 }>;
 export default EventListOption;

package/es/eventSelector/option.js

@@ -1,6 +1,7 @@
 import { Badge } from 'antd';
 import React from 'react';
 import { classPrefix } from '.';
+import IconFont from '../icon/iconFont';
 import { util } from '../utils';
 
 var EventListOption = function EventListOption(props) {
@@ -36,7 +37,11 @@ var EventListOption = function EventListOption(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-option-label"),
     title: label
-  }, getLabel(label || '')), showCount && /*#__PURE__*/React.createElement(Badge, {
+  }, data.attrList && /*#__PURE__*/React.createElement("span", {
+    className: "".concat(classPrefix, "-like")
+  }, data.marked ? /*#__PURE__*/React.createElement(IconFont, {
+    type: "shoucang"
+  }) : null), getLabel(label || '')), showCount && /*#__PURE__*/React.createElement(Badge, {
     count: count
   }));
 };

package/es/eventSelector/styles/index.less

@@ -49,6 +49,12 @@
     .__select-nodata();
   }
 
+  &-like {
+    display: inline-block;
+    width: @font-size-base;
+    margin-right: @margin-xss;
+    color: @warning-color;
+  }
   &-option {
     .__select-option();
     display: flex;

package/es/eventSelector/types.d.ts

@@ -16,7 +16,7 @@ export declare namespace EventSelectTypes {
     }
     interface Props {
         defaultValue?: Value | SimpleValue;
-        value?: Value | SimpleValue;
+        value?: Value;
         groupId?: number;
         alias?: string;
         placeholder?: string;

package/es/icon/iconFont.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { IconFontProps } from '@ant-design/icons/lib/components/IconFont';
+import '../assets/iconfont/iconfont.css';
 interface Props extends IconFontProps {
     family?: string;
     size?: number;

package/es/icon/iconFont.js

@@ -11,6 +11,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 import React, { useMemo } from 'react';
+import '../assets/iconfont/iconfont.css';
 
 var IconFont = function IconFont(props) {
   var className = props.className,

package/es/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference path="../typings.d.ts" />
-import BizAnalysisLayout from './analysisLayout';
+import BizAnalysisLayout from './layout/analysisLayout';
 import BizUserGroup from './userGroup';
 import BizTargetSelector from './targetSelector';
 import BizEventSelector from './eventSelector/index';
@@ -25,7 +25,8 @@ import BizAddToPanel from './addToPanel';
 import setGlobalConfig from './config';
 import BizCycleTime from './cycleTime';
 import BizDnd from './dnd';
-export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, };
+import BizDetailLayout from './layout/detail';
+export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizDetailLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, };
 export type { UserGroupTypes } from './userGroup/types';
 export type { BizSelectTypes } from './select/types';
 export type { AttributeSelect } from './attributeSelector/types';

package/es/index.js

@@ -1,4 +1,4 @@
-import BizAnalysisLayout from './analysisLayout';
+import BizAnalysisLayout from './layout/analysisLayout';
 import BizUserGroup from './userGroup';
 import BizTargetSelector from './targetSelector';
 import BizEventSelector from './eventSelector/index';
@@ -24,4 +24,5 @@ import BizAddToPanel from './addToPanel';
 import setGlobalConfig from './config';
 import BizCycleTime from './cycleTime';
 import BizDnd from './dnd';
-export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig };
+import BizDetailLayout from './layout/detail';
+export { BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizDetailLayout, BizUserGroup, IconFont, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig };

package/es/{analysisLayout → layout/analysisLayout}/index.js

@@ -11,7 +11,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useEffect, useState } from 'react';
-import IconFont from '../icon/iconFont';
+import IconFont from '../../icon/iconFont';
 import './index.less';
 import { Tooltip } from 'antd';
 

package/es/{analysisLayout → layout/analysisLayout}/index.less

@@ -1,4 +1,4 @@
-@import '../commonStyle/icon.less';
+@import '../../assets/styles/inner.less';
 
 .biz-layout-container {
   position: relative;
@@ -33,7 +33,7 @@
       box-sizing: border-box;
       width: 100%;
       height: calc(100% - 30px);
-      padding: @searchPadding;
+      padding: @padding-lg;
       overflow: auto;
       .biz-left-content {
         min-height: 600px;
@@ -50,10 +50,10 @@
       line-height: 30px;
       text-align: center;
       background-color: #fff;
-      border-top: @boxBorder;
+      border-top: 1px solid @border-color-base;
 
       .biz-layout-expand {
-        color: @fontColor;
+        color: @text-color;
         font-size: 16px;
         cursor: pointer;
 
@@ -66,7 +66,7 @@
 
   .biz-layout-right {
     box-sizing: border-box;
-    padding: @contentPadding;
+    padding: @padding-lg;
     overflow: auto;
     background-color: #fff;
 
@@ -91,22 +91,22 @@
   font-size: 24px;
   text-align: center;
   background: #ffffff;
-  border: @boxBorder;
+  border: 1px solid @border-color-split;
   border-top-right-radius: 20px;
   border-bottom-right-radius: 20px;
   cursor: pointer;
 
   .biz-layout-pickup-icon {
-    color: @layoutIconColor;
+    color: @icon-color;
     font-size: 24px;
   }
 
   &:hover {
-    color: @hoverColor;
-    background-color: @hoverBgColor;
+    color: @primary-color;
+    background-color: @primary-color-hover;
 
     .biz-layout-pickup-icon {
-      color: @hoverColor;
+      color: @primary-color;
     }
   }
 }
@@ -115,10 +115,10 @@
   position: absolute;
   bottom: 20px;
   left: 16px;
-  color: @layoutIconColor;
+  color: @icon-color;
   font-size: 24px;
   cursor: pointer;
   &:hover {
-    color: @hoverColor;
+    color: @primary-color;
   }
 }

package/es/layout/detail/demo/index.d.ts

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

package/es/layout/detail/demo/index.js

@@ -0,0 +1,12 @@
+import React from 'react';
+import { BizDetailLayout } from '@zgfe/business-lib';
+export default (function () {
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      background: '#FAFAFB',
+      padding: '24px'
+    }
+  }, /*#__PURE__*/React.createElement(BizDetailLayout, {
+    extra: /*#__PURE__*/React.createElement(React.Fragment, null, "\u9875\u9762extra")
+  }, "\u9875\u9762\u5185\u5BB9"));
+});

package/es/layout/detail/index.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import './index.less';
+declare const BizDetailLayout: React.FC<{
+    width?: number;
+    onBack?: () => void;
+    extra?: React.ReactNode;
+    children?: React.ReactNode;
+}>;
+export default BizDetailLayout;

package/es/layout/detail/index.js

@@ -0,0 +1,24 @@
+import React from 'react';
+import { IconFont } from '../..';
+import './index.less';
+
+var BizDetailLayout = function BizDetailLayout(props) {
+  var width = props.width;
+  var classPrefix = 'biz-detail';
+  return /*#__PURE__*/React.createElement("div", {
+    className: classPrefix,
+    style: {
+      width: width ? "".concat(width, "px") : undefined
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-menu")
+  }, /*#__PURE__*/React.createElement("a", {
+    onClick: props.onBack
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "fanhuiicon"
+  }), "\u8FD4\u56DE"), props.extra), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-content")
+  }, props.children));
+};
+
+export default BizDetailLayout;

package/es/layout/detail/index.less

@@ -0,0 +1,28 @@
+@import '../../assets/styles/inner.less';
+.biz-detail {
+  display: flex;
+  flex-direction: column;
+  width: 1376px;
+  height: 100%;
+  margin: 0 auto;
+  &-menu {
+    flex: none;
+    padding-top: @padding-md;
+    padding-bottom: @padding-md - 2;
+    color: @text-color-secondary;
+    a {
+      margin-right: @margin-md;
+      color: @text-color-secondary;
+      &:hover {
+        color: @primary-color;
+      }
+    }
+  }
+  &-content {
+    flex: 1;
+    padding: @padding-sm @padding-lg @padding-lg @padding-lg;
+    overflow-y: auto;
+    background-color: @white;
+    border-radius: @border-radius-normal;
+  }
+}

package/es/mock/event.js

@@ -695,6 +695,43 @@ export default [{
   groupId: 4160,
   groupName: '小程序转化',
   eventList: [{
+    plats: [1, 2, 3],
+    click_analysis: false,
+    mark_type: null,
+    event_id: 7086289,
+    event_name: '付款成功',
+    event_hidden: 0,
+    event_type: 0,
+    is_stop: 0,
+    is_delete: 0,
+    alias_name: '',
+    event_attrs: [{
+      hidden: 0,
+      dimension_sub: 'event_attr',
+      encryption_type: 0,
+      alias_name: '',
+      value_dict: false,
+      attr_id: 5461056,
+      attr_name: '支付方式',
+      event_id: 7086289,
+      prop_type: 1,
+      is_stop: 0
+    }, {
+      hidden: 0,
+      dimension_sub: 'event_attr',
+      encryption_type: 0,
+      alias_name: '',
+      value_dict: false,
+      attr_id: 5461057,
+      attr_name: '金额',
+      event_id: 7086289,
+      prop_type: 2,
+      is_stop: 0
+    }],
+    stop_date_time: null,
+    insert_time: '2016-01-01 00:00:00',
+    owner: 'zg'
+  }, {
     plats: [3],
     click_analysis: false,
     mark_type: 1,

package/es/select/index.js

@@ -164,7 +164,7 @@ var BizSelect = function BizSelect(props) {
       width: overlayWidth || width
     },
     trigger: ['click'],
-    getPopupContainer: props.popupContainer || props.multiple ? function () {
+    getPopupContainer: props.popupContainer ? function () {
       return document.getElementById(selectId);
     } : undefined,
     visible: visible,

package/es/select/styles/index.less

@@ -67,7 +67,7 @@
     &.biz-select-option-multiple {
       &:hover:not(.disabled) {
         color: @primary-color;
-        background-color: color(~`colorPalette('@{primary-color}', 0.1) `);
+        background-color: @primary-color-hover;
       }
 
       &.active:not(.disabled) {

package/es/targetConditionGroup/components/targetDimension.js

@@ -76,11 +76,13 @@ var BizTargetDimension = function BizTargetDimension(props) {
 
   var getAttrOption = function getAttrOption(eventId) {
     var attrData = [];
+    var attrMap = {};
     eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
       group.eventList.forEach(function (event) {
         if (event.id === eventId) {
           event.attrList.forEach(function (attr) {
-            if (attr.type === 2 && !attr.isHidden && attr.label) {
+            if (attr.type === 2 && !attr.isHidden && attr.label && !attrMap[String(attr.id)]) {
+              attrMap[String(attr.id)] = true;
               attrData.push({
                 label: attr.label,
                 value: String(attr.id),

package/es/targetConditionGroup/demo/index.js

@@ -18,8 +18,8 @@ import userData from '../../mock/user';
 var defaultValue = {
   type: 'event',
   alias: 'alias',
-  eventId: 24143017,
-  eventGroupId: 4201,
+  eventId: 7086289,
+  eventGroupId: 4160,
   analysisIndex: 'times',
   filters: {
     relation: 'or',