@zgfe/business-lib 1.2.70-hxd.11 → 1.2.70-hxd.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (204) hide show
  1. package/es/AUMFormulaTarget/components/formula/index.js +6 -4
  2. package/es/AUMFormulaTarget/components/panel/cdpCshCondition.js +2 -2
  3. package/es/AUMFormulaTarget/components/panel/index.less +269 -269
  4. package/es/AUMFormulaTarget/demo/index.js +1 -1
  5. package/es/AUMFormulaTarget/index.d.ts +4 -1
  6. package/es/addToPanel/components/radioGroup.d.ts +4 -1
  7. package/es/addToPanel/components/styleList.d.ts +4 -1
  8. package/es/addToPanel/index.d.ts +4 -1
  9. package/es/addToPanel/index.js +1 -1
  10. package/es/addToScene/index.js +1 -1
  11. package/es/amountSelector/demo/index.d.ts +3 -0
  12. package/es/amountSelector/demo/index.js +9 -0
  13. package/es/amountSelector/index.d.ts +10 -0
  14. package/es/amountSelector/index.js +21 -0
  15. package/es/amountSelector/styles/index.less +27 -0
  16. package/es/amountSelector/types.d.ts +4 -0
  17. package/es/amountSelector/types.js +1 -0
  18. package/es/amountSelector/util.d.ts +3 -0
  19. package/es/amountSelector/util.js +18 -0
  20. package/es/assets/colorIcon/demo_index.html +1023 -492
  21. package/es/assets/colorIcon/iconfont.css +203 -110
  22. package/es/assets/colorIcon/iconfont.js +13 -14
  23. package/es/assets/colorIcon/iconfont.json +555 -394
  24. package/es/assets/colorIcon/iconfont.ttf +0 -0
  25. package/es/assets/colorIcon/iconfont.woff +0 -0
  26. package/es/assets/colorIcon/iconfont.woff2 +0 -0
  27. package/es/assets/iconfont/demo_index.html +203 -348
  28. package/es/assets/iconfont/iconfont.css +103 -63
  29. package/es/assets/iconfont/iconfont.js +1 -1
  30. package/es/assets/iconfont/iconfont.json +1584 -1689
  31. package/es/assets/styles/resetAntd.less +568 -564
  32. package/es/assets/styles/variable.less +21 -21
  33. package/es/assets/theme.js +1 -1
  34. package/es/attrCondition/demo/group.js +1 -1
  35. package/es/attrCondition/group.js +11 -6
  36. package/es/attrCondition/index.js +11 -6
  37. package/es/attrCondition/styles/index.less +101 -101
  38. package/es/attrCondition/useAttrCondition.js +4 -5
  39. package/es/attrConditions/components/operateList.js +6 -3
  40. package/es/attrConditions/index.d.ts +4 -1
  41. package/es/attrConditions/index.js +4 -2
  42. package/es/attrConditions/types.d.ts +3 -0
  43. package/es/attrConditions/utils/operates.d.ts +4 -0
  44. package/es/attrConditions/utils/operates.js +37 -0
  45. package/es/attributeSelector/index.d.ts +4 -1
  46. package/es/attributeSelector/index.js +4 -2
  47. package/es/attributeSelector/listPanel.d.ts +4 -1
  48. package/es/attributeSelector/listPanel.js +6 -3
  49. package/es/attributeSelector/types.d.ts +1 -0
  50. package/es/chart/demo/data/data5 copy.js +2 -2
  51. package/es/chart/demo/index.js +1 -1
  52. package/es/chart/demo/line_bar_stack.js +4 -4
  53. package/es/chart/demo/stack.js +1 -1
  54. package/es/chart/index.js +10 -12
  55. package/es/chart/styles/index.less +113 -113
  56. package/es/chart/util/color.js +1 -1
  57. package/es/colorIcon/index.js +2 -4
  58. package/es/constants/apis.d.ts +1 -0
  59. package/es/constants/apis.js +2 -1
  60. package/es/constants/common.d.ts +11 -0
  61. package/es/constants/common.js +31 -0
  62. package/es/context/index.d.ts +1 -0
  63. package/es/cycleTime/index.js +6 -8
  64. package/es/cycleTime/month.js +2 -5
  65. package/es/dataSetGroup/index.js +0 -1
  66. package/es/datePicker/index.d.ts +4 -1
  67. package/es/datePickerV2/demo/index.js +1 -1
  68. package/es/datePickerV2/index.d.ts +4 -1
  69. package/es/datePickerV2/index.js +13 -4
  70. package/es/datePickerV2/popoverContent.js +1 -1
  71. package/es/datePickerV2/shortcut.js +1 -1
  72. package/es/datePickerV2/styles/index.less +194 -194
  73. package/es/datePickerV2/types.d.ts +1 -0
  74. package/es/datePickerV2/utils.js +8 -2
  75. package/es/demoWrapper/content.js +6 -1
  76. package/es/demoWrapper/innerDemo.js +1 -1
  77. package/es/dialog/index.d.ts +4 -1
  78. package/es/dnd/demo/index.js +5 -1
  79. package/es/dnd/index.d.ts +4 -1
  80. package/es/dnd/item.js +14 -0
  81. package/es/eventSelector/index.d.ts +4 -1
  82. package/es/eventSelector/index.js +3 -2
  83. package/es/eventSelector/listPanel.js +9 -13
  84. package/es/eventSelector/option.d.ts +1 -0
  85. package/es/eventSelector/option.js +14 -3
  86. package/es/eventSelector/styles/index.less +127 -123
  87. package/es/eventSelector/types.d.ts +1 -0
  88. package/es/formulaTarget/components/formula/index.js +2 -1
  89. package/es/formulaTarget/components/formula/index.less +76 -76
  90. package/es/formulaTarget/components/formula/types.d.ts +1 -0
  91. package/es/formulaTarget/components/formulaItem/index.js +7 -2
  92. package/es/formulaTarget/components/formulaItem/types.d.ts +1 -0
  93. package/es/formulaTarget/components/panel/index.js +2 -1
  94. package/es/formulaTarget/components/panel/item.js +5 -1
  95. package/es/formulaTarget/components/panel/types.d.ts +2 -0
  96. package/es/formulaTarget/index.d.ts +4 -1
  97. package/es/formulaTarget/index.js +2 -1
  98. package/es/formulaTarget/types.d.ts +1 -0
  99. package/es/icon/iconFont.d.ts +4 -1
  100. package/es/index.d.ts +2 -1
  101. package/es/index.js +2 -1
  102. package/es/layout/analysisLayout/index.d.ts +4 -1
  103. package/es/layout/columnLayout/index.d.ts +4 -1
  104. package/es/layout/optionTitle/components/changePanelModal/styles/index.less +92 -92
  105. package/es/layout/optionTitle/components/title/index.d.ts +1 -2
  106. package/es/layout/optionTitle/components/title/index.js +10 -6
  107. package/es/layout/optionTitle/index.js +1 -1
  108. package/es/layout/optionTitle/styles/layout.less +90 -90
  109. package/es/platformSelector/styles/index.less +26 -26
  110. package/es/productCondition/conditionTypeList.d.ts +4 -1
  111. package/es/productCondition/conditions/cdpCshCondition.js +9 -6
  112. package/es/productCondition/conditions/constants.d.ts +2 -0
  113. package/es/productCondition/conditions/constants.js +2 -0
  114. package/es/productCondition/conditions/order/runPeriodCondition.js +2 -4
  115. package/es/productCondition/conditions/periodCondition.d.ts +4 -1
  116. package/es/productCondition/conditions/propCondition.d.ts +4 -1
  117. package/es/productCondition/conditions/styles/periodCondition.less +26 -26
  118. package/es/productCondition/index.d.ts +4 -1
  119. package/es/productCondition/styles/conditionTypeList.less +32 -30
  120. package/es/productCondition/styles/relationLabel.less +19 -19
  121. package/es/productCondition/types.d.ts +3 -1
  122. package/es/productCondition/util.d.ts +4 -0
  123. package/es/productCondition/util.js +4 -2
  124. package/es/quickDatePicker/demo/index.js +31 -11
  125. package/es/quickDatePicker/index.js +122 -23
  126. package/es/quickDatePicker/styles/index.less +141 -138
  127. package/es/quickDatePicker/types.d.ts +13 -0
  128. package/es/quickDatePicker/utils.d.ts +6 -0
  129. package/es/quickDatePicker/utils.js +54 -1
  130. package/es/select/demo/index.js +2 -1
  131. package/es/select/handle.js +2 -9
  132. package/es/select/index.d.ts +4 -1
  133. package/es/select/option.js +1 -1
  134. package/es/select/overlay.js +2 -2
  135. package/es/select/styles/handle.less +206 -193
  136. package/es/socket/demo/demo.js +2 -2
  137. package/es/subjectWrapper/index.js +3 -1
  138. package/es/table/demo/data/color.js +1 -1
  139. package/es/table/index.js +3 -30
  140. package/es/targetConditionGroup/components/targetDimension.d.ts +4 -1
  141. package/es/targetConditionGroup/demo/group.js +5 -18
  142. package/es/targetConditionGroup/index.d.ts +4 -1
  143. package/es/targetConditionGroup/index.js +6 -4
  144. package/es/targetConditionGroup/types.d.ts +1 -0
  145. package/es/targetSelector/editBox.d.ts +1 -0
  146. package/es/targetSelector/editBox.js +8 -3
  147. package/es/targetSelector/index.js +2 -1
  148. package/es/targetSelector/optionIcon.d.ts +4 -1
  149. package/es/targetSelector/optionIcon.js +3 -0
  150. package/es/targetSelector/styles/index.less +142 -110
  151. package/es/userCondition/conditionTypeList.d.ts +4 -1
  152. package/es/userCondition/conditionTypeList.js +5 -4
  153. package/es/userCondition/conditions/cdpCondition.js +9 -6
  154. package/es/userCondition/conditions/cdpCshCondition.js +9 -6
  155. package/es/userCondition/conditions/constants.d.ts +2 -0
  156. package/es/userCondition/conditions/constants.js +2 -0
  157. package/es/userCondition/conditions/dataAttribute.js +11 -7
  158. package/es/userCondition/conditions/eventCondition.js +16 -24
  159. package/es/userCondition/conditions/order/runPeriodCondition.d.ts +4 -1
  160. package/es/userCondition/conditions/periodCondition.d.ts +4 -1
  161. package/es/userCondition/conditions/periodCondition.js +19 -11
  162. package/es/userCondition/conditions/propCondition.js +5 -3
  163. package/es/userCondition/conditions/styles/eventCondition.less +71 -57
  164. package/es/userCondition/conditions/styles/periodCondition.less +32 -26
  165. package/es/userCondition/conditions/styles/textDesc.less +16 -17
  166. package/es/userCondition/conditions/tagsCondition.js +12 -5
  167. package/es/userCondition/conditions/textDesc.js +9 -5
  168. package/es/userCondition/demo/index.js +20 -14
  169. package/es/userCondition/demo/mockData.d.ts +20 -94
  170. package/es/userCondition/demo/mockData.js +31 -76
  171. package/es/userCondition/index.d.ts +5 -1
  172. package/es/userCondition/index.js +98 -20
  173. package/es/userCondition/styles/conditionTypeList.less +32 -30
  174. package/es/userCondition/styles/relationLabel.less +19 -19
  175. package/es/userCondition/types.d.ts +5 -2
  176. package/es/userCondition/util.d.ts +4 -0
  177. package/es/userCondition/util.js +4 -2
  178. package/es/userGroup/demo/index.js +2 -9
  179. package/es/userGroup/index.d.ts +4 -1
  180. package/es/userGroup/index.js +121 -16
  181. package/es/userGroup/overlay.js +17 -3
  182. package/es/userGroup/styles/index.less +199 -145
  183. package/es/userGroup/types.d.ts +2 -0
  184. package/es/userGroup/util.d.ts +2 -0
  185. package/es/userGroup/util.js +47 -0
  186. package/es/userGroupHeader/demo/index.js +1 -1
  187. package/es/userGroupHeader/index.d.ts +1 -0
  188. package/es/userGroupHeader/index.js +109 -6
  189. package/es/userGroupHeader/styles/index.less +50 -31
  190. package/es/userTagsSelector/cascaderOverlay.d.ts +4 -1
  191. package/es/userTagsSelector/cascaderOverlay.js +9 -2
  192. package/es/userTagsSelector/components/tagList/index.d.ts +4 -1
  193. package/es/userTagsSelector/groups/index.d.ts +4 -1
  194. package/es/userTagsSelector/index.d.ts +4 -1
  195. package/es/userTagsSelector/index.js +32 -2
  196. package/es/userTagsSelector/styles/index.less +20 -10
  197. package/es/userTagsSelector/types.d.ts +2 -0
  198. package/es/userTagsSelector/util.d.ts +1 -0
  199. package/es/userTagsSelector/util.js +20 -0
  200. package/es/utils/ajax.js +63 -26
  201. package/es/utils/util.d.ts +1 -0
  202. package/es/utils/util.js +18 -0
  203. package/package.json +2 -2
  204. package/es/assets/colorIcon/iconfont.svg +0 -129
@@ -1,21 +1,21 @@
1
- @import '~antd/es/style/themes/default.less';
2
-
3
- @border-radius-sx: 2px;
4
- @border-radius-small: 4px;
5
- @border-radius-normal: 8px;
6
- @border-radius-large: 20px;
7
- @option-height: @height-base;
8
- @background-color-gray: #f6f6f6;
9
- @background-color-table: #f2f3f4;
10
-
11
- @icon-width: 24px;
12
-
13
- @shadow-color-light: rgba(0, 0, 0, 0.1);
14
- @box-shadow-small: 0px 1px 2px @shadow-color-light;
15
- @primary-color-hover: color(~`colorPalette('@{primary-color}', 0.1) `);
16
- @box-shadow-form: 0 0 0 4px @primary-color-hover;
17
- @text-color-middle: #9aa1a9;
18
- @custom-background: #fafafb;
19
- @custom-focus: #f0f7ff;
20
- @primary-color: '#165dff';
21
- @input-placeholder-color: #9797af;
1
+ @import '~antd/es/style/themes/default.less';
2
+
3
+ @border-radius-sx: 2px;
4
+ @border-radius-small: 4px;
5
+ @border-radius-normal: 8px;
6
+ @border-radius-large: 20px;
7
+ @option-height: @height-base;
8
+ @background-color-gray: #f6f6f6;
9
+ @background-color-table: #f2f3f4;
10
+
11
+ @icon-width: 24px;
12
+
13
+ @shadow-color-light: rgba(0, 0, 0, 0.1);
14
+ @box-shadow-small: 0px 1px 2px @shadow-color-light;
15
+ @primary-color-hover: color(~`colorPalette('@{primary-color}', 0.1) `);
16
+ @box-shadow-form: 0 0 0 4px @primary-color-hover;
17
+ @text-color-middle: #9aa1a9;
18
+ @custom-background: #fafafb;
19
+ @custom-focus: #f0f7ff;
20
+ @primary-color: '#116ACC';
21
+ @input-placeholder-color: #9797af;
@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
5
5
  'use strict';
6
6
 
7
7
  exports.theme = {
8
- 'primary-color': '#165dff',
8
+ 'primary-color': '#116ACC',
9
9
  'border-color-base': '#ECEDF0',
10
10
  'background-color-base': '#fafafb',
11
11
  'text-color': '#021429',
@@ -6,7 +6,7 @@ var extraList = [{
6
6
  name: 'Session属性',
7
7
  attrList: [{
8
8
  id: 'sa_duration',
9
- label: 'Session时长',
9
+ label: 'Session时长 ',
10
10
  propCategory: 'sessionProp',
11
11
  key: 'sessionProp-sa_duration',
12
12
  type: 2,
@@ -2,6 +2,7 @@ import React from 'react';
2
2
  import useConditionGroup from './useConditionGroup';
3
3
  import { Skeleton } from 'antd';
4
4
  import BizAttrCondition from '.';
5
+ var BizAttrConditionGroupTimer = null;
5
6
  var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref) {
6
7
  var showHandle = props.showHandle,
7
8
  eventIdList = props.eventIdList,
@@ -12,7 +13,9 @@ var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref)
12
13
  disableItemList = props.disableItemList,
13
14
  overlayClassName = props.overlayClassName,
14
15
  extra = props.extra,
15
- relationConfig = props.relationConfig;
16
+ relationConfig = props.relationConfig,
17
+ realTimeTags = props.realTimeTags,
18
+ supportNPlace = props.supportNPlace;
16
19
  var _useConditionGroup = useConditionGroup(props, ref),
17
20
  loading = _useConditionGroup.loading,
18
21
  conditions = _useConditionGroup.conditions,
@@ -57,18 +60,20 @@ var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref)
57
60
  enableEnvProp: enableEnvProp,
58
61
  disableItemList: disableItemList,
59
62
  extra: extra,
63
+ supportNPlace: supportNPlace,
60
64
  onChange: function onChange(data) {
61
- return _onChange(data, index);
65
+ clearTimeout(BizAttrConditionGroupTimer);
66
+ BizAttrConditionGroupTimer = setTimeout(function () {
67
+ _onChange(data, index);
68
+ }, 20);
62
69
  },
63
70
  onDelete: function onDelete() {
64
71
  return _onDelete(index);
65
72
  },
66
73
  relationSup: index ? conditions[index - 1] : undefined,
67
- relationConfig: relationConfig
74
+ relationConfig: relationConfig,
75
+ realTimeTags: realTimeTags
68
76
  }));
69
77
  }))));
70
78
  });
71
- BizAttrConditionGroup.defaultProps = {
72
- showHandle: true
73
- };
74
79
  export default BizAttrConditionGroup;
@@ -1,9 +1,12 @@
1
+ var _excluded = ["border"];
1
2
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
2
3
  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."); }
3
4
  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); }
4
5
  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; }
5
6
  function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
6
7
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
8
+ function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
9
+ 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; }
7
10
  import { Skeleton, Space } from 'antd';
8
11
  import React, { useContext, useEffect, useState } from 'react';
9
12
  import BizAttributeSelector from '../attributeSelector';
@@ -15,7 +18,10 @@ import './styles/index.less';
15
18
  import IconFont from '../icon/iconFont';
16
19
  import { BizValidatorContext } from '../context';
17
20
  var classPrefix = 'biz-attr-condition';
18
- var BizAttrCondition = function BizAttrCondition(props) {
21
+ var BizAttrCondition = function BizAttrCondition(_ref) {
22
+ var _ref$border = _ref.border,
23
+ border = _ref$border === void 0 ? false : _ref$border,
24
+ props = _objectWithoutProperties(_ref, _excluded);
19
25
  var eventIdList = props.eventIdList,
20
26
  enableDelete = props.enableDelete,
21
27
  enableEventProp = props.enableEventProp,
@@ -25,7 +31,8 @@ var BizAttrCondition = function BizAttrCondition(props) {
25
31
  theme = props.theme,
26
32
  overlayClassName = props.overlayClassName,
27
33
  relationSup = props.relationSup,
28
- relationConfig = props.relationConfig;
34
+ relationConfig = props.relationConfig,
35
+ realTimeTags = props.realTimeTags;
29
36
  var _useAttrCondition = useAttrCondition(props),
30
37
  loading = _useAttrCondition.loading,
31
38
  attr = _useAttrCondition.attr,
@@ -70,7 +77,8 @@ var BizAttrCondition = function BizAttrCondition(props) {
70
77
  destroyPopupOnHide: props.destroyPopupOnHide,
71
78
  placeholder: "\u8BF7\u9009\u62E9\u5C5E\u6027",
72
79
  status: isAttrError ? 'error' : '',
73
- extra: props.extra
80
+ extra: props.extra,
81
+ realTimeTags: realTimeTags
74
82
  }), isAttrError ? /*#__PURE__*/React.createElement("div", {
75
83
  className: "".concat(classPrefix, "-error")
76
84
  }, "\u5C5E\u6027\u4E0D\u53EF\u4E3A\u7A7A") : null), /*#__PURE__*/React.createElement(BizOperateList, {
@@ -104,7 +112,4 @@ var BizAttrCondition = function BizAttrCondition(props) {
104
112
  active: true
105
113
  })));
106
114
  };
107
- BizAttrCondition.defaultProps = {
108
- border: false
109
- };
110
115
  export default BizAttrCondition;
@@ -1,101 +1,101 @@
1
- @import '../../assets/styles/inner.less';
2
- .biz-attr-condition {
3
- gap: 16px !important;
4
- align-items: flex-start !important;
5
- width: 100%;
6
- &-btn-del {
7
- color: #9aa1a9;
8
- font-size: 16px !important;
9
- line-height: 32px;
10
- &:hover {
11
- color: @error-color;
12
- cursor: pointer;
13
- }
14
- }
15
- .biz-attr-select-handle {
16
- width: 184px;
17
- padding: 0;
18
- }
19
- .ant-space-item:nth-of-type(3) {
20
- min-width: 184px;
21
- max-width: calc(100% - 320px);
22
- }
23
- &-group {
24
- display: flex;
25
- flex-direction: row;
26
- .ant-space-item:nth-of-type(3) {
27
- min-width: 184px;
28
- max-width: calc(100% - 380px);
29
- }
30
- &-container {
31
- display: flex;
32
- flex: 1;
33
- flex-direction: column;
34
- gap: 4px;
35
- width: 100%;
36
- max-width: calc(100% + 33px);
37
- margin-left: -33px;
38
- &-item {
39
- padding: 4px 0 4px 48px;
40
- &:hover {
41
- background: #e8efff;
42
- }
43
- }
44
- }
45
- &-handle {
46
- position: relative;
47
- width: 1px;
48
- margin-right: 0;
49
- margin-left: 32px;
50
- background: @border-color-base;
51
- }
52
- &-operate {
53
- position: absolute;
54
- top: 50%;
55
- left: 50%;
56
- width: 16px;
57
- transform: translate(-50%, -50%);
58
- }
59
- &-operate-text {
60
- width: 16px;
61
- height: 16px;
62
- span {
63
- display: flex;
64
- align-items: center;
65
- justify-content: center;
66
- width: 100%;
67
- height: 100%;
68
- font-size: 12px;
69
- *font-size: 10px;
70
- transform: scale(0.83, 0.83);
71
- }
72
-
73
- .__default-hover();
74
-
75
- &:first-child {
76
- border-top-left-radius: 3px;
77
- border-top-right-radius: 3px;
78
- }
79
-
80
- &:last-child {
81
- border-bottom-right-radius: 3px;
82
- border-bottom-left-radius: 3px;
83
- }
84
-
85
- &.active {
86
- color: #fff;
87
- background: @primary-color;
88
- }
89
- }
90
- }
91
-
92
- &-column {
93
- position: relative;
94
- display: flex;
95
- flex-direction: column;
96
- }
97
- &-error {
98
- padding-left: 4px;
99
- color: @error-color;
100
- }
101
- }
1
+ @import '../../assets/styles/inner.less';
2
+ .biz-attr-condition {
3
+ gap: 16px !important;
4
+ align-items: flex-start !important;
5
+ width: 100%;
6
+ &-btn-del {
7
+ color: #9aa1a9;
8
+ font-size: 16px !important;
9
+ line-height: 32px;
10
+ &:hover {
11
+ color: @error-color;
12
+ cursor: pointer;
13
+ }
14
+ }
15
+ .biz-attr-select-handle {
16
+ width: 184px;
17
+ padding: 0;
18
+ }
19
+ .ant-space-item:nth-of-type(3) {
20
+ min-width: 184px;
21
+ max-width: calc(100% - 320px);
22
+ }
23
+ &-group {
24
+ display: flex;
25
+ flex-direction: row;
26
+ .ant-space-item:nth-of-type(3) {
27
+ min-width: 184px;
28
+ max-width: calc(100% - 380px);
29
+ }
30
+ &-container {
31
+ display: flex;
32
+ flex: 1;
33
+ flex-direction: column;
34
+ gap: 4px;
35
+ width: 100%;
36
+ max-width: calc(100% + 33px);
37
+ margin-left: -33px;
38
+ &-item {
39
+ padding: 4px 0 4px 48px;
40
+ &:hover {
41
+ background: #e7f3fe;
42
+ }
43
+ }
44
+ }
45
+ &-handle {
46
+ position: relative;
47
+ width: 1px;
48
+ margin-right: 0;
49
+ margin-left: 32px;
50
+ background: @border-color-base;
51
+ }
52
+ &-operate {
53
+ position: absolute;
54
+ top: 50%;
55
+ left: 50%;
56
+ width: 16px;
57
+ transform: translate(-50%, -50%);
58
+ }
59
+ &-operate-text {
60
+ width: 16px;
61
+ height: 16px;
62
+ span {
63
+ display: flex;
64
+ align-items: center;
65
+ justify-content: center;
66
+ width: 100%;
67
+ height: 100%;
68
+ font-size: 12px;
69
+ *font-size: 10px;
70
+ transform: scale(0.83, 0.83);
71
+ }
72
+
73
+ .__default-hover();
74
+
75
+ &:first-child {
76
+ border-top-left-radius: 3px;
77
+ border-top-right-radius: 3px;
78
+ }
79
+
80
+ &:last-child {
81
+ border-bottom-right-radius: 3px;
82
+ border-bottom-left-radius: 3px;
83
+ }
84
+
85
+ &.active {
86
+ color: #fff;
87
+ background: @primary-color;
88
+ }
89
+ }
90
+ }
91
+
92
+ &-column {
93
+ position: relative;
94
+ display: flex;
95
+ flex-direction: column;
96
+ }
97
+ &-error {
98
+ padding-left: 4px;
99
+ color: @error-color;
100
+ }
101
+ }
@@ -40,7 +40,7 @@ var useAttrCondition = function useAttrCondition(props) {
40
40
  encryptionType: data.encryptionType,
41
41
  type: data.type,
42
42
  key: "".concat(data.propCategory, "-").concat(data.attrId),
43
- label: data.attrNameStr || data.label,
43
+ label: data.attrNameStr || data.label || data.attrName,
44
44
  dimensionSub: data.dimensionSub || 'event_attr'
45
45
  };
46
46
  }
@@ -52,11 +52,10 @@ var useAttrCondition = function useAttrCondition(props) {
52
52
  name: data.attrName,
53
53
  propCategory: data.propCategory,
54
54
  type: data.type,
55
- category: data.category,
56
- encryptionType: data.encryptionType,
55
+ category: data.category || (data.propCategory === PropCategory.UserProp ? 'fixed' : undefined),
57
56
  key: "".concat(data.propCategory, "-").concat(data.attrName, "-").concat(aId),
58
57
  subtype: data.subtype,
59
- label: data.attrNameStr || data.label,
58
+ label: data.attrNameStr || data.label || data.attrName,
60
59
  dimensionSub: data.dimensionSub || data.attrName
61
60
  };
62
61
  }
@@ -67,7 +66,7 @@ var useAttrCondition = function useAttrCondition(props) {
67
66
  propCategory: data.propCategory,
68
67
  type: data.type,
69
68
  key: "".concat(data.propCategory, "-").concat(data.attrId),
70
- label: data.attrNameStr || data.label,
69
+ label: data.attrNameStr || data.label || data.attrName,
71
70
  subtype: data.subtype,
72
71
  encryptionType: data.encryptionType
73
72
  };
@@ -8,15 +8,18 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
8
8
  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; }
9
9
  function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
10
10
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
11
- import React, { useEffect, useState } from 'react';
11
+ import React, { useContext, useEffect, useState } from 'react';
12
12
  import { InputNumber, Space, message } from 'antd';
13
13
  import { classPrefix } from '..';
14
14
  import { PropType } from '../../attributeSelector/types';
15
15
  import BizSelect from '../../select';
16
- import { dateOperate, numberOperate, stringOperate, specialOperate, stringBusinessOperate } from '../utils/operates';
16
+ import { dateOperate, numberOperate, stringOperate, specialOperate, stringBusinessOperate, stringOperate1 } from '../utils/operates';
17
17
  import { OperateTypes } from '../types';
18
+ import BizGlobalDataContext from '../../context';
18
19
  var BizOperateList = function BizOperateList(props) {
19
20
  var _props$attr4;
21
+ var _useContext = useContext(BizGlobalDataContext),
22
+ basicConfig = _useContext.basicConfig;
20
23
  var _useState = useState({
21
24
  value: ''
22
25
  }),
@@ -66,7 +69,7 @@ var BizOperateList = function BizOperateList(props) {
66
69
  } else if (specialOperateHandle((_props$attr3 = props.attr) === null || _props$attr3 === void 0 ? void 0 : _props$attr3.name)) {
67
70
  optionData = specialOperate;
68
71
  } else {
69
- optionData = stringOperate;
72
+ optionData = basicConfig && basicConfig.openRegexp ? stringOperate1 : stringOperate;
70
73
  if (props === null || props === void 0 ? void 0 : props.supportNPlace) {
71
74
  optionData = [].concat(_toConsumableArray(optionData), [{
72
75
  name: '第N位是',
@@ -4,5 +4,8 @@ import './styles/index.less';
4
4
  import { AttrConditionTypes, OperateTypes } from './types';
5
5
  export declare const classPrefix = "biz-condition-item";
6
6
  export declare function getCondition(attr: AttributeSelect.Value, operate: OperateTypes, values: string[]): AttrConditionTypes.ItemValue | undefined;
7
- declare const BizConditionItem: React.FC<AttrConditionTypes.ItemProp>;
7
+ type FCWithDefaultProps<P> = React.FC<P> & {
8
+ defaultProps?: Partial<P>;
9
+ };
10
+ declare const BizConditionItem: FCWithDefaultProps<AttrConditionTypes.ItemProp>;
8
11
  export default BizConditionItem;
@@ -48,7 +48,8 @@ var BizConditionItem = function BizConditionItem(props) {
48
48
  enableEnvProp = props.enableEnvProp,
49
49
  disableItemList = props.disableItemList,
50
50
  border = props.border,
51
- theme = props.theme;
51
+ theme = props.theme,
52
+ realTimeTags = props.realTimeTags;
52
53
  var _useAttrCondition = useAttrCondition(props),
53
54
  loading = _useAttrCondition.loading,
54
55
  attr = _useAttrCondition.attr,
@@ -82,7 +83,8 @@ var BizConditionItem = function BizConditionItem(props) {
82
83
  },
83
84
  theme: theme,
84
85
  destroyPopupOnHide: props.destroyPopupOnHide,
85
- extra: props.extra
86
+ extra: props.extra,
87
+ realTimeTags: realTimeTags
86
88
  }), /*#__PURE__*/React.createElement("div", {
87
89
  className: "".concat(classPrefix, "-panel")
88
90
  }, /*#__PURE__*/React.createElement(BizOperateList, {
@@ -48,6 +48,7 @@ export declare namespace AttrConditionTypes {
48
48
  eventAttrIdSub: number;
49
49
  eventAttrNameSub: string;
50
50
  }[];
51
+ realTimeTags?: Boolean;
51
52
  }
52
53
  interface GroupProp extends BasicAttrTypes {
53
54
  defaultValue?: GroupValue;
@@ -65,6 +66,8 @@ export declare namespace AttrConditionTypes {
65
66
  eventAttrIdSub: number;
66
67
  eventAttrNameSub: string;
67
68
  }[];
69
+ realTimeTags?: Boolean;
70
+ supportNPlace?: boolean;
68
71
  }
69
72
  interface Option {
70
73
  name: string;
@@ -10,6 +10,10 @@ export declare const stringOperate: {
10
10
  name: string;
11
11
  value: string;
12
12
  }[];
13
+ export declare const stringOperate1: {
14
+ name: string;
15
+ value: string;
16
+ }[];
13
17
  export declare const numberAUMOperate: {
14
18
  name: string;
15
19
  value: string;
@@ -44,6 +44,43 @@ export var stringOperate = [{
44
44
  name: '不是空值',
45
45
  value: 'is not null'
46
46
  }];
47
+ export var stringOperate1 = [{
48
+ name: '是',
49
+ value: 'equal'
50
+ }, {
51
+ name: '包含',
52
+ value: 'contains'
53
+ }, {
54
+ name: '不是',
55
+ value: 'not equal'
56
+ }, {
57
+ name: '不包含',
58
+ value: 'not contains'
59
+ }, {
60
+ name: '开头是',
61
+ value: 'begin with'
62
+ }, {
63
+ name: '结尾是',
64
+ value: 'end with'
65
+ }, {
66
+ name: '开头不是',
67
+ value: 'not begin with'
68
+ }, {
69
+ name: '结尾不是',
70
+ value: 'not end with'
71
+ }, {
72
+ name: '是空值',
73
+ value: 'is null'
74
+ }, {
75
+ name: '不是空值',
76
+ value: 'is not null'
77
+ }, {
78
+ name: '正则匹配',
79
+ value: 'regexp'
80
+ }, {
81
+ name: '正则不匹配',
82
+ value: 'not regexp'
83
+ }];
47
84
  export var numberAUMOperate = [{
48
85
  name: '>',
49
86
  value: 'gt'
@@ -1,5 +1,8 @@
1
1
  import React from 'react';
2
2
  import { AttributeSelect } from './types';
3
3
  import './styles/index.less';
4
- declare const BizAttributeSelector: React.FC<AttributeSelect.Props>;
4
+ type FCWithDefaultProps<P> = React.FC<P> & {
5
+ defaultProps?: Partial<P>;
6
+ };
7
+ declare const BizAttributeSelector: FCWithDefaultProps<AttributeSelect.Props>;
5
8
  export default BizAttributeSelector;
@@ -28,7 +28,8 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
28
28
  overlayClassName = props.overlayClassName,
29
29
  isStrNum = props.isStrNum,
30
30
  isString = props.isString,
31
- isHideYeWu = props.isHideYeWu;
31
+ isHideYeWu = props.isHideYeWu,
32
+ realTimeTags = props.realTimeTags;
32
33
  var _useState = useState(),
33
34
  _useState2 = _slicedToArray(_useState, 2),
34
35
  currentAttr = _useState2[0],
@@ -113,7 +114,8 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
113
114
  isNumber: isNumber,
114
115
  isStrNum: isStrNum,
115
116
  isString: isString,
116
- isHideYeWu: isHideYeWu
117
+ isHideYeWu: isHideYeWu,
118
+ realTimeTags: realTimeTags
117
119
  }));
118
120
  },
119
121
  trigger: ['click'],
@@ -1,4 +1,7 @@
1
1
  import React from 'react';
2
2
  import { AttributeSelect } from './types';
3
- declare const AttrListPanel: React.FC<AttributeSelect.Props>;
3
+ type FCWithDefaultProps<P> = React.FC<P> & {
4
+ defaultProps?: Partial<P>;
5
+ };
6
+ declare const AttrListPanel: FCWithDefaultProps<AttributeSelect.Props>;
4
7
  export default AttrListPanel;
@@ -28,7 +28,8 @@ var AttrListPanel = function AttrListPanel(props) {
28
28
  isNumber = props.isNumber,
29
29
  isStrNum = props.isStrNum,
30
30
  isString = props.isString,
31
- isHideYeWu = props.isHideYeWu;
31
+ isHideYeWu = props.isHideYeWu,
32
+ realTimeTags = props.realTimeTags;
32
33
  var _useState = useState(''),
33
34
  _useState2 = _slicedToArray(_useState, 2),
34
35
  searchValue = _useState2[0],
@@ -163,7 +164,7 @@ var AttrListPanel = function AttrListPanel(props) {
163
164
  anchor: hasAnchor ? String(Math.random()) : anchor.event,
164
165
  key: "event-".concat(event.id),
165
166
  children: event.attrList.slice().filter(function (item) {
166
- return isHideYeWu ? item.id != 31415926 : true;
167
+ return isHideYeWu || realTimeTags ? item.id != 31415926 : true;
167
168
  }).filter(function (item) {
168
169
  return isStrNum ? item.type === 2 || item.type === 1 : isNumber ? item.type === 2 : isString ? item.type === 1 : true;
169
170
  })
@@ -196,7 +197,9 @@ var AttrListPanel = function AttrListPanel(props) {
196
197
  groupName: "".concat((currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' ? '用户' : '主体', "\u5C5E\u6027"),
197
198
  key: 'userProps',
198
199
  anchor: anchor.user,
199
- children: (extraUser ? extraUser : []).concat(userPropList)
200
+ children: (extraUser ? extraUser : []).concat(userPropList.filter(function (item) {
201
+ return realTimeTags ? item.category === 'custom' : true;
202
+ }))
200
203
  });
201
204
  }
202
205
  if (enableEnvProp) {
@@ -102,6 +102,7 @@ export declare namespace AttributeSelect {
102
102
  isStrNum?: Boolean;
103
103
  isString?: Boolean;
104
104
  isHideYeWu?: Boolean;
105
+ realTimeTags?: Boolean;
105
106
  }
106
107
  interface AttributeExtra {
107
108
  type: string;
@@ -5,7 +5,7 @@ export default {
5
5
  type: 'bar',
6
6
  itemStyle: {
7
7
  normal: {
8
- color: '#457DFF'
8
+ color: '#4392E0'
9
9
  }
10
10
  },
11
11
  values: [490, 540, 490, 510, 570, 890, 930]
@@ -27,7 +27,7 @@ export default {
27
27
  stack: 'Ad',
28
28
  itemStyle: {
29
29
  normal: {
30
- color: '#457DFF'
30
+ color: '#4392E0'
31
31
  }
32
32
  },
33
33
  values: [220, 180, 190, 230, 290, 330, 310]
@@ -9,7 +9,7 @@ import { BizChart } from '@zgfe/business-lib';
9
9
  import chartData from './data/data';
10
10
  import { Button, Image } from 'antd';
11
11
  export default (function () {
12
- var chartRef = useRef();
12
+ var chartRef = useRef(null);
13
13
  var _useState = useState(),
14
14
  _useState2 = _slicedToArray(_useState, 2),
15
15
  chartImg = _useState2[0],