@zgfe/business-lib 1.0.14 → 1.0.15-user.1

package/es/assets/styles/chunks.less

@@ -50,15 +50,14 @@
     .__default-hover();
   }
 
-  &.active {
+  &.active:not(.biz-select-option-multiple) {
     color: #fff;
     background: @primary-color;
   }
 
-  &:not(.active).disabled {
+  &.disabled {
     color: @disabled-color;
     cursor: not-allowed;
-
     &:hover {
       background: none;
     }
@@ -87,7 +86,7 @@
   cursor: not-allowed;
 
   &:hover {
-    background-color: none;
+    background-color: unset;
   }
 }
 

package/es/assets/styles/resetAntd.less

@@ -297,9 +297,14 @@
   }
 
   .ant-modal-body {
+    max-height: 400px;
+    // &:not(:last-child) {
+    //   padding-bottom: 0;
+    // }
     max-height: 400px !important;
     padding-top: @padding-xs !important;
     padding-bottom: 0 !important;
+    overflow: auto;
     overflow: auto !important;
   }
 }
@@ -389,7 +394,7 @@
 
       &.ant-table-cell-fix-left {
         &.ant-table-cell-fix-left-last {
-          border-right: 1px solid @border-color-base!important;
+          // border-right: 1px solid @border-color-base;
         }
       }
     }
@@ -399,8 +404,33 @@
   .ant-table-tbody > tr > td.ant-table-cell-row-hover {
     background: color(~`colorPalette('@{primary-color}', 0.1) `) !important;
   }
+  .ant-table-thead {
+    .ant-table-cell {
+      &.ant-table-column-has-sorters {
+        .ant-table-column-sorters {
+          justify-content: flex-start;
+          .ant-table-column-title {
+            flex: none;
+          }
+          .ant-table-column-sorter {
+            margin-left: @margin-xs;
+          }
+        }
+      }
+    }
+  }
+}
+
+//气泡弹框
+.ant-popover-inner {
+  border-radius: @border-radius-small;
 }
 
+//tooltip
+.ant-tooltip-inner {
+  padding: @margin-sm @margin-md;
+  border-radius: @border-radius-normal;
+}
 /* 提示框 */
 .ant-tooltip-inner {
   padding: @padding-sm @padding-md!important;
@@ -441,3 +471,8 @@
 .ant-form-item-explain-error {
   color: @error-color!important;
 }
+
+//dropdown
+.ant-dropdown {
+  z-index: 6666 !important;
+}

package/es/attrConditions/components/operateList.d.ts

@@ -4,5 +4,6 @@ declare const BizOperateList: React.FC<{
     attr?: AttributeSelect.Value;
     defaultValue?: string;
     onChange?: (value: string) => void;
+    theme: string;
 }>;
 export default BizOperateList;

package/es/attrConditions/components/operateList.js

@@ -67,7 +67,7 @@ var BizOperateList = function BizOperateList(props) {
   if (!props.attr || !current || !options.length) {
     return /*#__PURE__*/React.createElement(BizSelect, {
       className: "".concat(classPrefix, "-single-select"),
-      theme: "secondary",
+      theme: props.theme,
       disable: true,
       options: []
     });
@@ -79,7 +79,7 @@ var BizOperateList = function BizOperateList(props) {
     value: current,
     labelField: "name",
     keyField: "value",
-    theme: "secondary",
+    theme: props.theme,
     options: options,
     onChange: onChange
   });

package/es/attrConditions/components/stringList.d.ts

@@ -5,5 +5,6 @@ declare const StringList: React.FC<{
     operate: string;
     value?: string[];
     onChange?: (value: string[]) => void;
+    theme: string;
 }>;
 export default StringList;

package/es/attrConditions/components/stringList.js

@@ -143,7 +143,7 @@ var StringList = function StringList(props) {
     return /*#__PURE__*/React.createElement(BizSelect, {
       multiple: true,
       enableCreate: true,
-      theme: "secondary",
+      theme: props.theme,
       size: "base",
       className: "".concat(classPrefix, "-multi-select"),
       options: [],
@@ -156,7 +156,7 @@ var StringList = function StringList(props) {
     value: current,
     multiple: true,
     enableCreate: true,
-    theme: "secondary",
+    theme: props.theme,
     size: "base",
     disable: props.operate === OperateTypes.IsNull || props.operate === OperateTypes.IsNotNull,
     labelField: "name",

package/es/attrConditions/components/valuesList.d.ts

@@ -6,5 +6,6 @@ declare const ValuesList: React.FC<{
     defaultValue?: string[];
     includeToday?: boolean;
     onChange?: (value: string[]) => void;
+    theme: string;
 }>;
 export default ValuesList;

package/es/attrConditions/components/valuesList.js

@@ -27,7 +27,8 @@ var ValuesList = function ValuesList(props) {
   var attr = props.attr,
       defaultValue = props.defaultValue,
       operate = props.operate,
-      includeToday = props.includeToday;
+      includeToday = props.includeToday,
+      theme = props.theme;
   var initValue = [moment().subtract(1, 'weeks').format('YYYY-MM-DD'), moment().subtract(includeToday ? 0 : 1, 'days').format('YYYY-MM-DD')];
 
   var _useState = useState(),
@@ -119,14 +120,14 @@ var ValuesList = function ValuesList(props) {
     return /*#__PURE__*/React.createElement(BizSelect, {
       disable: true,
       className: "".concat(classPrefix, "-multi-select"),
-      theme: "secondary",
-      size: "base",
+      theme: theme,
       options: []
     });
   }
 
   if (attr.type === PropType.STRING) {
     return /*#__PURE__*/React.createElement(StringList, {
+      theme: theme,
       attr: attr,
       operate: operate,
       value: current,
@@ -139,7 +140,7 @@ var ValuesList = function ValuesList(props) {
       },
       keyField: "value",
       labelField: "label",
-      theme: "secondary",
+      theme: props.theme,
       className: "".concat(classPrefix, "-input-select"),
       onChange: onChangeUnit,
       options: propSubtype

package/es/attrConditions/demo/index.js

@@ -23,14 +23,13 @@ export default (function () {
 
   var _useState = useState({
     condition: {
-      propCategory: 'userProp',
-      type: 2,
-      operator: 'lt',
-      values: ['25200', '1'],
-      subtype: 2,
-      attrName: 'duration',
-      attrId: 0,
-      category: 'fixed'
+      attrId: 30183431,
+      propCategory: 'eventProp',
+      type: 1,
+      operator: 'equal',
+      values: ['Microsoft Edge', 'Safari', 'Apple WebKit'],
+      dimensionSub: 'event_attr',
+      attrName: '用户open_id'
     }
   }),
       _useState2 = _slicedToArray(_useState, 2),

package/es/attrConditions/index.js

@@ -28,7 +28,9 @@ var BizConditionItem = function BizConditionItem(props) {
       enableEventProp = props.enableEventProp,
       enableUserProp = props.enableUserProp,
       enableEnvProp = props.enableEnvProp,
-      disableItemList = props.disableItemList;
+      disableItemList = props.disableItemList,
+      border = props.border,
+      theme = props.theme;
 
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -132,7 +134,7 @@ var BizConditionItem = function BizConditionItem(props) {
   };
 
   return /*#__PURE__*/React.createElement("div", {
-    className: classPrefix
+    className: [classPrefix, border ? 'border' : ''].join(' ')
   }, /*#__PURE__*/React.createElement(Skeleton, {
     loading: ready,
     active: true,
@@ -148,10 +150,13 @@ var BizConditionItem = function BizConditionItem(props) {
     enableEnvProp: enableEnvProp,
     disableItemList: disableItemList,
     onChange: onChangeAttr,
-    onDelete: onDelete
+    onDelete: onDelete,
+    theme: theme,
+    destroyPopupOnHide: props.destroyPopupOnHide
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-panel")
   }, /*#__PURE__*/React.createElement(BizOperateList, {
+    theme: theme,
     attr: attr,
     defaultValue: operate,
     onChange: onChangeOperate
@@ -159,8 +164,13 @@ var BizConditionItem = function BizConditionItem(props) {
     attr: attr,
     operate: operate,
     defaultValue: values,
-    onChange: onChangeValues
+    onChange: onChangeValues,
+    theme: theme
   }))));
 };
 
+BizConditionItem.defaultProps = {
+  border: true,
+  theme: 'secondary'
+};
 export default BizConditionItem;

package/es/attrConditions/styles/index.less

@@ -2,8 +2,9 @@
 
 /* 筛选条件 */
 .biz-condition-item {
-  .__select-handle();
-
+  &.border {
+    .__select-handle();
+  }
   &-panel {
     display: flex;
     width: 100%;

package/es/attrConditions/types.d.ts

@@ -6,6 +6,7 @@ interface BasicAttrTypes {
     enableUserProp?: boolean;
     enableEnvProp?: boolean;
     disableItemList?: (EventProp | UserProp | EnvProp)[];
+    theme?: string;
 }
 export declare namespace AttrConditionTypes {
     interface ItemValue {
@@ -28,6 +29,8 @@ export declare namespace AttrConditionTypes {
         value?: ItemValue;
         onChange?: (value: ItemValue) => void;
         onDelete?: (value?: ItemValue) => void;
+        border?: boolean;
+        destroyPopupOnHide?: boolean;
     }
     interface GroupProp extends BasicAttrTypes {
         defaultValue?: GroupValue;

package/es/attrConditions/utils/operates.js

@@ -39,10 +39,10 @@ export var numberOperate = [{
   name: '<',
   value: 'lt'
 }, {
-  name: '>=',
+  name: '≥',
   value: 'ge'
 }, {
-  name: '<=',
+  name: '≤',
   value: 'le'
 }, {
   name: '≠',

package/es/attributeSelector/index.js

@@ -26,7 +26,8 @@ import SelectHandle from '../select/handle';
 
 var BizAttributeSelector = function BizAttributeSelector(props) {
   var enableDelete = props.enableDelete,
-      placeholder = props.placeholder;
+      placeholder = props.placeholder,
+      theme = props.theme;
 
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -120,14 +121,15 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       width: width
     },
     visible: visible,
-    onVisibleChange: onVisibleChange
+    onVisibleChange: onVisibleChange,
+    destroyPopupOnHide: props.destroyPopupOnHide
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       width: '100%'
     }
   }, /*#__PURE__*/React.createElement(SelectHandle, {
     ref: boxRef,
-    theme: "secondary",
+    theme: theme,
     border: false,
     label: currentAttr === null || currentAttr === void 0 ? void 0 : currentAttr.label,
     placeholder: placeholder
@@ -145,7 +147,9 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
 BizAttributeSelector.defaultProps = {
   enableDelete: false,
   placeholder: '请选择',
+  theme: 'secondary',
   propSymbol: '*',
-  optionsHeaderTip: '带＊的属性每日凌晨更新'
+  optionsHeaderTip: '带＊的属性每日凌晨更新',
+  destroyPopupOnHide: false
 };
 export default BizAttributeSelector;

package/es/attributeSelector/listPanel.js

@@ -1,3 +1,11 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 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."); }
@@ -11,7 +19,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { Anchor, Button } from 'antd';
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext, useEffect, useMemo, useState } from 'react';
 import { BizGlobalDataContext } from '..';
 import BizSearchInput from '../searchInput';
 import Option from './option';
@@ -46,6 +54,17 @@ var AttrListPanel = function AttrListPanel(props) {
       currentAttr = _useState6[0],
       setCurrentAttr = _useState6[1];
 
+  var eventIdMap = useMemo(function () {
+    var eventIdMap = {};
+    var eventList = (eventGroupList || []).reduce(function (pre, group) {
+      return [].concat(_toConsumableArray(pre), _toConsumableArray(group.eventList));
+    }, []);
+    eventList.forEach(function (event) {
+      if (eventIdMap[event.id]) return;
+      eventIdMap[event.id] = event;
+    });
+    return eventIdMap;
+  }, [eventGroupList]);
   var disableItemlist = (_props$disableItemLis = props.disableItemList) === null || _props$disableItemLis === void 0 ? void 0 : _props$disableItemLis.map(function (item) {
     if (item.propCategory === 'envProp') {
       item.key = "envProp-".concat(item.name);
@@ -69,23 +88,17 @@ var AttrListPanel = function AttrListPanel(props) {
 
     if (enableEventProp) {
       var hasAnchor = false;
-      eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
-        group.eventList.forEach(function (event) {
-          if (event.isDelete || event.isStop) return;
-          if (eventIdList && eventIdList.length && !eventIdList.includes(event.id)) return;
-          var group = {
-            isEvent: true,
-            groupName: event.alias || event.name,
-            anchor: hasAnchor ? String(Math.random()) : anchor.event,
-            key: "event-".concat(event.id),
-            children: []
-          };
-          hasAnchor = true;
-          event.attrList.forEach(function (attr) {
-            group.children.push(attr);
-          });
-          list.push(group);
-        });
+      eventIdList === null || eventIdList === void 0 ? void 0 : eventIdList.forEach(function (id) {
+        var event = eventIdMap[id];
+        if (!event) return;
+        var group = {
+          isEvent: true,
+          groupName: event.alias || event.name,
+          anchor: hasAnchor ? String(Math.random()) : anchor.event,
+          key: "event-".concat(event.id),
+          children: event.attrList.slice()
+        };
+        list.push(group);
       });
     }
 
@@ -110,7 +123,7 @@ var AttrListPanel = function AttrListPanel(props) {
     }
 
     setOptionList(list);
-  }, [eventGroupList, userPropList, eventEnvList, eventIdList]);
+  }, [eventIdMap, userPropList, eventEnvList, eventIdList]);
   useEffect(function () {
     setCurrentAttr(props.value);
   }, [props.value]);

package/es/attributeSelector/styles/index.less

@@ -5,7 +5,9 @@
     flex-direction: row;
     .__select-handle();
     &:hover .biz-attr-select-del-icon {
-      display: inline-block;
+      display: flex;
+      align-items: center;
+      justify-content: center;
     }
   }
   &-del-icon {
@@ -13,8 +15,6 @@
     flex: none;
     width: @icon-width;
     color: @text-color-secondary;
-    line-height: 2em;
-    text-align: center;
     border-radius: @border-radius-small;
 
     &:hover {

package/es/attributeSelector/types.d.ts

@@ -9,6 +9,10 @@ export declare enum PropCategory {
     UserProp = "userProp",
     EnvProp = "envProp"
 }
+export declare enum ShowStatus {
+    show = 0,
+    hidden = 1
+}
 export interface AnalysisEvent {
     id: number;
     name: string;
@@ -17,6 +21,7 @@ export interface AnalysisEvent {
     isDelete?: boolean;
     isStop?: boolean;
     isOverview?: boolean;
+    eventHidden?: ShowStatus;
 }
 export interface EventGroup {
     id: number;
@@ -72,6 +77,8 @@ export declare namespace AttributeSelect {
         optionsHeaderTip?: string;
         onChange?: (value: Value) => void;
         onDelete?: (value?: Value) => void;
+        theme?: string;
+        destroyPopupOnHide?: boolean;
     }
     interface Option {
         groupName: string;

package/es/attributeSelector/types.js

@@ -12,4 +12,11 @@ export var PropCategory;
   PropCategory["EventProp"] = "eventProp";
   PropCategory["UserProp"] = "userProp";
   PropCategory["EnvProp"] = "envProp";
-})(PropCategory || (PropCategory = {}));
+})(PropCategory || (PropCategory = {}));
+
+export var ShowStatus;
+
+(function (ShowStatus) {
+  ShowStatus[ShowStatus["show"] = 0] = "show";
+  ShowStatus[ShowStatus["hidden"] = 1] = "hidden";
+})(ShowStatus || (ShowStatus = {}));

package/es/attributeSelector/util.js

@@ -15,7 +15,7 @@ export default function convertAttributeData(store) {
       eventList: []
     };
     group_.eventList.forEach(function (e) {
-      if (e.is_delete || e.is_stop) return;
+      if (e.is_delete) return;
       var event = {
         alias: e.alias_name,
         attrList: e.event_attrs.map(function (item) {
@@ -35,7 +35,8 @@ export default function convertAttributeData(store) {
         id: e.event_id,
         isDelete: e.is_delete,
         isStop: e.is_stop,
-        name: e.event_name
+        name: e.event_name,
+        eventHidden: e.event_hidden
       };
       group.eventList.push(event);
     });

package/es/eventSelector/demo/index.js

@@ -35,7 +35,16 @@ var EventDemo = function EventDemo() {
     setValue(data);
   };
 
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u9009\u62E9\u7684\u4E8B\u4EF6\u662F\uFF1A", JSON.stringify(value)), /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      height: '500px',
+      overflow: 'auto'
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      height: '700px'
+    }
+  }, /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
     value: {
       eventGroupList: store.eventGroupList
     }
@@ -43,7 +52,7 @@ var EventDemo = function EventDemo() {
     defaultValue: value,
     alias: "\u522B\u540D",
     onChange: onChange
-  })));
+  })), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u9009\u62E9\u7684\u4E8B\u4EF6\u662F\uFF1A", JSON.stringify(value))));
 };
 
 export default (function () {

package/es/eventSelector/index.js

@@ -21,16 +21,25 @@ export var classPrefix = 'biz-event-select';
 var BizEventSelector = function BizEventSelector(props) {
   var alias = props.alias,
       placeholder = props.placeholder,
-      showAllEvent = props.showAllEvent;
+      showAllEvent = props.showAllEvent,
+      border = props.border,
+      theme = props.theme,
+      defaultSelectAble = props.defaultSelectAble;
 
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
       currentValue = _useState2[0],
       setCurrentValue = _useState2[1];
 
+  var _useState3 = useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      visible = _useState4[0],
+      setVisible = _useState4[1];
+
   var _useContext = useContext(BizGlobalDataContext),
       eventGroupList = _useContext.eventGroupList;
 
+  var selectId = (Math.random() + 10).toString();
   useEffect(function () {
     if (!props.defaultValue) return;
     var data = getValue(props.defaultValue);
@@ -103,31 +112,55 @@ var BizEventSelector = function BizEventSelector(props) {
   };
 
   var onChange = function onChange(value) {
+    if (!defaultSelectAble) {
+      setVisible(false);
+    }
+
     setCurrentValue(value);
     props.onChange && props.onChange(value);
   };
 
+  var onVisibleChange = function onVisibleChange(flag) {
+    setVisible(flag);
+  };
+
   return /*#__PURE__*/React.createElement("div", {
-    className: classPrefix
+    className: [classPrefix, border ? 'border' : ''].join(' ')
   }, /*#__PURE__*/React.createElement(Dropdown, {
     overlay: /*#__PURE__*/React.createElement(EventListPanel, {
       value: currentValue,
       onChange: onChange,
-      showOverview: showAllEvent
+      showOverview: showAllEvent,
+      defaultSelectAble: defaultSelectAble
     }),
     trigger: ['click'],
     overlayStyle: {
-      minWidth: 0
+      minWidth: 0,
+      paddingLeft: 8
     },
-    onVisibleChange: props.onVisibleChange
+    visible: visible,
+    onVisibleChange: onVisibleChange,
+    getPopupContainer: props.popupContainer ? function () {
+      return document.getElementById(selectId);
+    } : undefined,
+    destroyPopupOnHide: props.defaultSelectAble
   }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-handle")
+    className: "".concat(classPrefix, "-handle"),
+    id: selectId
   }, /*#__PURE__*/React.createElement(SelectHandle, {
-    theme: "secondary",
+    theme: theme,
     border: false,
     label: getLabel(),
     placeholder: placeholder
   }))));
 };
 
+BizEventSelector.defaultProps = {
+  showAllEvent: true,
+  defaultSelectAble: true,
+  popupContainer: true,
+  border: true,
+  theme: 'secondary',
+  destroyPopupOnHide: false
+};
 export default BizEventSelector;