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

package/es/targetConditionGroup/index.js

@@ -10,13 +10,14 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useContext, useEffect, useRef, useState } from 'react';
 import BizTargetSelector from '../targetSelector';
 import BizTargetDimension from './components/targetDimension';
 import './styles/index.less';
 import BizConditionGroup from '../attrConditions/group';
 import { Skeleton } from 'antd';
 import _ from 'lodash';
+import BizGlobalDataContext from '../context';
 export var classPrefix = 'biz-target';
 
 var BizTargetCondition = function BizTargetCondition(props) {
@@ -29,6 +30,9 @@ var BizTargetCondition = function BizTargetCondition(props) {
       targetData = _useState2[0],
       setTargetData = _useState2[1];
 
+  var _useContext = useContext(BizGlobalDataContext),
+      eventGroupList = _useContext.eventGroupList;
+
   var _useState3 = useState({
     analysisIndex: 'number'
   }),
@@ -65,8 +69,8 @@ var BizTargetCondition = function BizTargetCondition(props) {
 
   var _useState15 = useState(true),
       _useState16 = _slicedToArray(_useState15, 2),
-      ready = _useState16[0],
-      setReady = _useState16[1];
+      loading = _useState16[0],
+      setLoading = _useState16[1];
 
   useEffect(function () {
     var value = props.defaultValue || props.value;
@@ -83,7 +87,7 @@ var BizTargetCondition = function BizTargetCondition(props) {
       }
     }
 
-    setReady(false);
+    setLoading(false);
   }, []);
   useEffect(function () {
     if (targetData === null || targetData === void 0 ? void 0 : targetData.value) {
@@ -125,17 +129,45 @@ var BizTargetCondition = function BizTargetCondition(props) {
 
     if (data.eventId) {
       target.value = {
-        event: {
-          id: data.eventId,
-          name: data.eventName
-        }
+        event: undefined,
+        group: undefined
       };
 
-      if (data.eventGroupId) {
+      if (!data.eventGroupId) {
         target.value.group = {
-          id: data.eventGroupId
+          id: 0,
+          name: '所有分组',
+          eventList: []
+        };
+      }
+
+      if (data.eventId === -100) {
+        target.value.event = {
+          id: -100,
+          name: '事件概览',
+          attrList: []
         };
       }
+
+      for (var i = 0; i < eventGroupList.length; i++) {
+        var group = eventGroupList[i];
+
+        if (data.eventId !== -100) {
+          for (var j = 0; j < group.eventList.length; j++) {
+            var event = group.eventList[j];
+
+            if (event.id === data.eventId) {
+              target.value.event = event;
+              break;
+            }
+          }
+        }
+
+        if (data.eventGroupId && data.eventGroupId === group.id) {
+          target.value.group = group;
+          break;
+        }
+      }
     }
 
     return target;
@@ -169,14 +201,14 @@ var BizTargetCondition = function BizTargetCondition(props) {
 
   var onChange = function onChange(analysisDimension, target, filterDatas) {
     if (props.onChange) {
-      var _target$value$event2, _target$value$event3, _target$value$event4, _target$value$event5, _target$value$group;
+      var _target$value$event2, _target$value$event3, _target$value$event4, _target$value$event5, _target$value$event6, _target$value$group;
 
       if (!target || !target.value || !((_target$value$event2 = target.value.event) === null || _target$value$event2 === void 0 ? void 0 : _target$value$event2.id)) return;
       var data = {
         type: 'event',
-        alias: (target === null || target === void 0 ? void 0 : target.alias) || ((_target$value$event3 = target.value.event) === null || _target$value$event3 === void 0 ? void 0 : _target$value$event3.name) || '',
+        alias: (target === null || target === void 0 ? void 0 : target.alias) || target.value.event.alias || ((_target$value$event3 = target.value.event) === null || _target$value$event3 === void 0 ? void 0 : _target$value$event3.name) || '',
         eventId: (_target$value$event4 = target.value.event) === null || _target$value$event4 === void 0 ? void 0 : _target$value$event4.id,
-        eventName: (_target$value$event5 = target.value.event) === null || _target$value$event5 === void 0 ? void 0 : _target$value$event5.name,
+        eventName: ((_target$value$event5 = target.value.event) === null || _target$value$event5 === void 0 ? void 0 : _target$value$event5.alias) || ((_target$value$event6 = target.value.event) === null || _target$value$event6 === void 0 ? void 0 : _target$value$event6.name),
         eventGroupId: (_target$value$group = target.value.group) === null || _target$value$group === void 0 ? void 0 : _target$value$group.id,
         analysisDimension: analysisDimension,
         filters: filterDatas
@@ -199,7 +231,7 @@ var BizTargetCondition = function BizTargetCondition(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement(Skeleton, {
-    loading: ready,
+    loading: loading,
     active: true,
     paragraph: {
       rows: 1

package/es/targetSelector/demo/index.js

@@ -57,7 +57,9 @@ var EventDemo = function EventDemo() {
     onChange: handleChange,
     onAdd: handleAdd,
     onDelete: handleDelete
-  }, /*#__PURE__*/React.createElement(BizEventSelector, null))), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u9009\u62E9\u7684\u6307\u6807\u4FE1\u606F\u662F\uFF1A", JSON.stringify(value)));
+  }, /*#__PURE__*/React.createElement(BizEventSelector, {
+    border: false
+  }))), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u9009\u62E9\u7684\u662F\uFF1A\u5206\u7EC4id: ", value.value.group.id, " \u4E8B\u4EF6\u540D\u79F0: ", value.value.event.name));
 };
 
 export default (function () {

package/es/targetSelector/styles/index.less

@@ -26,7 +26,7 @@
   }
 
   &-option-icon {
-    // display: none;
+    display: none;
     flex: none;
     width: @icon-width;
     color: @text-color-secondary;

package/es/targetSelector/types.d.ts

@@ -1,18 +1,8 @@
-import { ReactNode } from 'react';
+import React from 'react';
+import { TargetSelectTypes } from './types';
 import { EventSelectTypes } from '../eventSelector/types';
-export declare namespace TargetSelectTypes {
-    interface Value {
-        alias?: string;
-        value?: EventSelectTypes.Value | EventSelectTypes.SimpleValue;
-    }
-    interface Props {
-        defaultValue?: Value;
-        value?: Value;
-        enableAdd?: boolean;
-        enableDelete?: boolean;
-        children?: ReactNode;
-        onAdd?: (data?: Value) => void;
-        onDelete?: (data?: Value) => void;
-        onChange: (data: Value) => void;
-    }
-}
+export declare const Props: React.FC<TargetSelectTypes.Props>;
+export declare const Value: React.FC<TargetSelectTypes.Value>;
+export declare const EventTargetValue: React.FC<EventSelectTypes.Value>;
+export declare const EventGroup: React.FC<EventSelectTypes.Value['group']>;
+export declare const AnalysisEvent: React.FC<EventSelectTypes.Value['event']>;

package/es/targetSelector/types.js

@@ -1 +1,16 @@
-export {};
+import React from 'react';
+export var Props = function Props() {
+  return /*#__PURE__*/React.createElement(React.Fragment, null);
+};
+export var Value = function Value() {
+  return /*#__PURE__*/React.createElement(React.Fragment, null);
+};
+export var EventTargetValue = function EventTargetValue() {
+  return /*#__PURE__*/React.createElement(React.Fragment, null);
+};
+export var EventGroup = function EventGroup() {
+  return /*#__PURE__*/React.createElement(React.Fragment, null);
+};
+export var AnalysisEvent = function AnalysisEvent() {
+  return /*#__PURE__*/React.createElement(React.Fragment, null);
+};

package/es/userCondition/conditionTypeList.js

@@ -3,6 +3,7 @@ import { Space } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import './styles/conditionTypeList.less';
 import { BizUserConditionContext } from '.';
+import BizGlobalDataContext from '../context';
 
 var ConditionTypeList = function ConditionTypeList(props) {
   var onAdd = props.onAdd,
@@ -13,6 +14,9 @@ var ConditionTypeList = function ConditionTypeList(props) {
       textMode = _useContext.textMode,
       openTagCondition = _useContext.openTagCondition;
 
+  var _useContext2 = useContext(BizGlobalDataContext),
+      menuNameMap = _useContext2.menuNameMap;
+
   if (!show || textMode) return null;
   return /*#__PURE__*/React.createElement("div", {
     className: "biz-user-condition-type-list"
@@ -52,7 +56,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
     }
   }, /*#__PURE__*/React.createElement(Space, {
     key: "prop"
-  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u7528\u6237\u5C5E\u6027\u6EE1\u8DB3"))), openTagCondition ? /*#__PURE__*/React.createElement("li", {
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u7528\u6237\u5C5E\u6027\u6EE1\u8DB3"))), openTagCondition && (!menuNameMap || menuNameMap['userTags']) ? /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
     onClick: function onClick() {
       return onAdd('tag');

package/es/userCondition/styles/conditionTypeList.less

@@ -1,5 +1,4 @@
-@import '../../assets//styles//variable.less';
-@import '../../commonStyle//variable.less';
+@import '../../assets/styles/inner.less';
 .biz-user-condition-type-list {
   display: flex;
   align-items: center;
@@ -20,11 +19,11 @@
         margin-left: @margin-md;
       }
       &:hover {
-        color: @themeColor;
-        background-color: @hoverBgColor;
+        color: @primary-color;
+        background-color: @primary-color-hover;
       }
       &:active {
-        border-color: @themeColor;
+        border-color: @primary-color;
       }
     }
   }

package/es/userCondition/styles/conditionWrap.less

@@ -10,7 +10,6 @@
   .biz-user-condition-item-delete {
     display: flex;
     align-items: center;
-    height: 40px;
     margin-left: @margin-lg;
     cursor: pointer;
   }

package/es/utils/type.d.ts

@@ -31,6 +31,7 @@ export declare namespace OldSystem {
         is_delete: boolean;
         is_stop: boolean;
         plats: number[];
+        mark_type: 1 | null;
     }
     interface EventProp {
         alias_name?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.24-userTag.0",
+  "version": "1.0.24",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "5ed7cab8d6b63eef4f1f9bf59a945febafadb837"
+  "gitHead": "ac0ce337e692e43ec70d2ae2fadb4a4927904478"
 }

package/es/commonStyle/icon.less

@@ -1,194 +0,0 @@
-@import './variable.less';
-
-.biz-icon-add {
-  width: fit-content;
-  padding: 2px;
-  color: @fontColor3;
-  font-weight: 400;
-  font-size: 14px;
-  line-height: 20px;
-  cursor: pointer;
-
-  &:not(.biz-disabled):hover {
-    color: @hoverColor;
-    background: @hoverBgColor;
-    border-radius: 3px;
-
-    span {
-      color: @hoverColor;
-    }
-  }
-
-  .biz-icon-text {
-    margin-left: 6px;
-  }
-
-  &.biz-disabled {
-    color: @disableColor;
-    cursor: not-allowed;
-
-    span {
-      color: @disableColor;
-    }
-  }
-}
-
-.biz-icon {
-  color: @fontColor3;
-  font-size: 16px;
-}
-
-.biz-input-icon {
-  color: #5f6085;
-  font-size: 18px;
-}
-
-.biz-options {
-  display: flex;
-}
-
-.biz-option-icon {
-  display: none;
-  width: 24px;
-  height: 32px;
-  padding-right: 1px;
-  color: @iconColor;
-  font-size: 15px;
-  line-height: 32px;
-  text-align: center;
-  background-color: #fff;
-  border-radius: 4px;
-  cursor: pointer;
-
-  &:not(.biz-disabled):hover {
-    color: @hoverColor;
-    background-color: @hoverBgColor;
-  }
-
-  &.biz-option-icon-delete:not(.biz-disabled):hover {
-    color: @deleteHoverColor;
-    background-color: @deleteHoverBgColor;
-  }
-
-  &.biz-disabled {
-    color: @disableColor;
-    cursor: not-allowed;
-  }
-}
-
-// .biz-btn,
-// .ant-btn {
-//   height: auto;
-//   padding: 10px 24px;
-//   font-weight: 400;
-//   font-size: 14px;
-//   line-height: 20px;
-//   border-radius: 4px;
-//   cursor: pointer;
-
-//   .anticon {
-//     margin-right: 8px;
-//     font-size: 24px;
-//   }
-
-//   &.small {
-//     padding: 5px 12px;
-//   }
-// }
-
-// .biz-btn-primary,
-// .ant-btn-primary {
-//   color: #fff;
-//   background: @themeColor;
-//   border: none;
-
-//   &:hover,
-//   &:active {
-//     background: #85adfc;
-//   }
-
-//   &:focus {
-//     background: #1451db;
-//   }
-
-//   &:disabled {
-//     color: @disableColor;
-//     background: @grayColor;
-//   }
-// }
-
-// .biz-btn-default,
-// .ant-btn-default {
-//   color: #242541;
-//   background: #f6f6f6;
-//   border: none;
-
-//   &:hover,
-//   &:focus {
-//     color: #242541;
-//     background: #cacdd4;
-//   }
-
-//   &:active {
-//     color: #242541;
-//     background: #94a6ce;
-//   }
-
-//   &:disabled {
-//     color: #cacdd4;
-//     background: #f6f6f6;
-//   }
-// }
-
-// .biz-btn-text {
-//   color: #021429;
-
-//   &:hover {
-//     background: #f6f6f6;
-//   }
-
-//   &:active {
-//     background: #cacdd4;
-//   }
-
-//   &:disabled {
-//     color: #cacdd4;
-//   }
-// }
-
-// .biz-btn-line {
-//   box-sizing: border-box;
-//   color: #5f6085;
-//   background: #ffffff;
-//   border: 1px solid #ecedf0;
-//   border-radius: 4px;
-
-//   &:hover {
-//     color: #165dff;
-//     background: #e8efff;
-//     border-color: #165dff;
-//   }
-// }
-
-// .ant-tooltip {
-//   .ant-tooltip-inner {
-//     border-radius: @boxRadius2;
-//   }
-
-//   &.biz-tooltip {
-//     width: auto;
-
-//     .ant-tooltip-inner {
-//       padding: 4px;
-//       color: @fontColor;
-//       background-color: #fff;
-//       border-radius: 4px;
-//       box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1);
-//     }
-
-//     .ant-tooltip-arrow-content {
-//       background-color: #fff;
-//       --antd-arrow-background-color: #fff;
-//     }
-//   }
-// }

package/es/commonStyle/index.less

@@ -1,3 +0,0 @@
-@import './theme.less';
-@import './icon.less';
-@import './select.less';

package/es/commonStyle/select.less

@@ -1,92 +0,0 @@
-@import './variable.less';
-
-/*文本框样式*/
-.biz-select-cotainer {
-  position: relative;
-  display: flex;
-  flex: 1;
-  flex-wrap: wrap;
-  align-items: center;
-  box-sizing: border-box;
-  margin-bottom: 8px;
-  padding: 4px;
-  color: #021429;
-  border: @boxBorder;
-  border-radius: @boxRadius;
-
-  &:hover {
-    .biz-option-icon {
-      display: block;
-    }
-  }
-}
-
-/*下拉框的文本框样式*/
-
-.biz-select-content {
-  position: relative;
-  display: flex;
-  flex: 1;
-  height: 100%;
-  color: @fontColor;
-  border-radius: 4px;
-  cursor: pointer;
-
-  &:not(.biz-gray-select):hover {
-    color: @hoverColor;
-    background-color: @hoverBgColor;
-
-    .biz-select-zhankai {
-      display: block;
-    }
-
-    span {
-      color: @hoverColor;
-    }
-  }
-
-  .biz-input {
-    flex: 1;
-    box-sizing: border-box;
-    height: 32px;
-    padding: 6px 8px;
-    line-height: 20px;
-    border-radius: @boxRadius;
-    .boxBg();
-
-    &.biz-bg-gray {
-      background: @grayColor;
-    }
-  }
-}
-
-.biz-select-zhankai {
-  position: absolute;
-  top: 5px;
-  right: 10px;
-  display: none;
-  color: @iconColor;
-  font-size: @iconSize;
-}
-
-.biz-select-nodata {
-  position: absolute;
-  top: 42px;
-  left: -4px;
-  z-index: 9999;
-  box-sizing: border-box;
-  width: 268px;
-  min-width: 322px;
-  height: 48px;
-  padding-left: 16px;
-  color: @fontColor;
-  font-size: @fontSize;
-  line-height: 48px;
-  background: #ffffff;
-  border-radius: @boxRadius2;
-  box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1);
-}
-
-.ant-select-item-empty {
-  color: @fontColor;
-}