@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
@@ -4,12 +4,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
4
4
  function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
5
5
  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
6
6
  function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
7
- import React, { useMemo } from 'react';
7
+ import React, { useMemo, useContext } from 'react';
8
8
  import BizSelect from '../../select';
9
- import { Input, DatePicker, Checkbox } from 'antd';
9
+ import { DatePicker, Checkbox, InputNumber } from 'antd';
10
10
  import moment from 'moment';
11
11
  import './styles/periodCondition.less';
12
- import { classPrefix } from '..';
12
+ import { BizUserConditionContext, classPrefix } from '..';
13
13
  import { operatorMap } from './constants';
14
14
  var RangePicker = DatePicker.RangePicker;
15
15
  var PeriodCondition = function PeriodCondition(props) {
@@ -17,6 +17,8 @@ var PeriodCondition = function PeriodCondition(props) {
17
17
  label = props.label,
18
18
  isEvent = props.isEvent,
19
19
  runPeriod = props.runPeriod;
20
+ var _useContext = useContext(BizUserConditionContext),
21
+ realTimeTags = _useContext.realTimeTags;
20
22
  var options = [{
21
23
  text: '最近',
22
24
  value: 'relative'
@@ -33,6 +35,12 @@ var PeriodCondition = function PeriodCondition(props) {
33
35
  value: 'join_time'
34
36
  }]);
35
37
  }
38
+ if (realTimeTags) {
39
+ options = [{
40
+ text: '最近',
41
+ value: 'relative'
42
+ }];
43
+ }
36
44
  var unit = useMemo(function () {
37
45
  if (runPeriod.operator === 'absolute' || runPeriod.operator === 'unlimited_time') {
38
46
  return '';
@@ -72,9 +80,8 @@ var PeriodCondition = function PeriodCondition(props) {
72
80
  values: newValues
73
81
  }));
74
82
  } else if (runPeriod.operator === 'relative' || runPeriod.operator === 'join_time') {
75
- var newValue = newData.target.value;
76
83
  onChange(_objectSpread(_objectSpread({}, runPeriod), {}, {
77
- values: [newValue, runPeriod.values[1]]
84
+ values: [newData, runPeriod.values[1]]
78
85
  }));
79
86
  }
80
87
  }
@@ -91,9 +98,10 @@ var PeriodCondition = function PeriodCondition(props) {
91
98
  var operator = runPeriod.operator,
92
99
  values = runPeriod.values;
93
100
  if (operator === 'relative' || operator === 'join_time') {
94
- return /*#__PURE__*/React.createElement(Input, {
95
- size: "middle",
96
- value: values[0],
101
+ return /*#__PURE__*/React.createElement(InputNumber, {
102
+ max: realTimeTags ? 30 : undefined,
103
+ min: 1,
104
+ value: Number(values[0]),
97
105
  onChange: onDateChange,
98
106
  style: {
99
107
  width: 58
@@ -116,7 +124,7 @@ var PeriodCondition = function PeriodCondition(props) {
116
124
  }, label) : null, /*#__PURE__*/React.createElement("div", {
117
125
  className: "".concat(classPrefix, "-period-condition-operator")
118
126
  }, /*#__PURE__*/React.createElement(BizSelect, {
119
- dropdownExtra: isEvent ? /*#__PURE__*/React.createElement("div", {
127
+ dropdownExtra: isEvent && !realTimeTags ? /*#__PURE__*/React.createElement("div", {
120
128
  style: {
121
129
  lineHeight: '29px'
122
130
  }
@@ -135,12 +143,12 @@ var PeriodCondition = function PeriodCondition(props) {
135
143
  className: "".concat(classPrefix, "-period-condition-values")
136
144
  }, renderValues()), /*#__PURE__*/React.createElement("div", {
137
145
  className: "".concat(classPrefix, "-period-condition-unit")
138
- }, unit), props.isRealTime && runPeriod.operator === 'relative' ? /*#__PURE__*/React.createElement("div", {
146
+ }, unit), props.isRealTime && runPeriod.operator === 'relative' && !realTimeTags ? /*#__PURE__*/React.createElement("div", {
139
147
  className: "".concat(classPrefix, "-period-condition-today")
140
148
  }, /*#__PURE__*/React.createElement(Checkbox, {
141
149
  checked: runPeriod.values[1] === '1',
142
150
  onChange: onChangeToday
143
- }, "\u4E0D\u5305\u542B\u4ECA\u5929")) : null);
151
+ }, "\u4E0D\u5305\u542B\u4ECA\u5929")) : null, realTimeTags && /*#__PURE__*/React.createElement("div", null, "\uFF0C\u5305\u542B\u4ECA\u5929"));
144
152
  };
145
153
  PeriodCondition.defaultProps = {
146
154
  isEvent: false,
@@ -35,7 +35,8 @@ var attrNumTypeMap = {
35
35
  var PropCondition = function PropCondition(props) {
36
36
  var _useContext = useContext(BizUserConditionContext),
37
37
  envNameList = _useContext.envNameList,
38
- userPropsMap = _useContext.userPropsMap;
38
+ userPropsMap = _useContext.userPropsMap,
39
+ realTimeTags = _useContext.realTimeTags;
39
40
  var _useContext2 = useContext(BizUserConditionContext),
40
41
  eventAttrNum = _useContext2.eventAttrNum;
41
42
  var isEvent = props.isEvent,
@@ -160,14 +161,15 @@ var PropCondition = function PropCondition(props) {
160
161
  return _onChange(data, i);
161
162
  },
162
163
  enableUserProp: !isEvent,
163
- enableEnvProp: isEvent,
164
+ enableEnvProp: isEvent && !realTimeTags,
164
165
  enableEventProp: isEvent,
165
166
  onDelete: function onDelete() {
166
167
  return onRemoveAttr(i);
167
168
  },
168
169
  enableDelete: isEvent,
169
170
  border: false,
170
- destroyPopupOnHide: true
171
+ destroyPopupOnHide: true,
172
+ realTimeTags: realTimeTags
171
173
  }, props))));
172
174
  }
173
175
  return /*#__PURE__*/React.createElement("div", {
@@ -1,57 +1,71 @@
1
- @import '../../../assets/styles/variable.less';
2
- .biz-user-condition-event-condition {
3
- display: flex;
4
- &-left {
5
- display: flex;
6
- }
7
- &-right {
8
- flex: 1;
9
- }
10
- .biz-user-condition-event {
11
- width: 200px;
12
- .biz-event-select-handle {
13
- border-top-right-radius: 0;
14
- border-bottom-right-radius: 0;
15
- .biz-select-handle-input {
16
- background-color: @background-color-base;
17
- }
18
- }
19
- }
20
- &-times-period-wrap {
21
- display: flex;
22
- }
23
- &-expand-attr {
24
- display: flex;
25
- align-items: center;
26
- justify-content: center;
27
- width: 38px;
28
- height: @height-base;
29
- margin-right: @margin-xs;
30
- margin-left: @border-radius-small;
31
- background-color: @background-color-base;
32
- border-radius: @border-radius-small;
33
- cursor: pointer;
34
- }
35
- &-attrs {
36
- flex: 1;
37
- width: 100%;
38
- // margin-right: @margin-xs;
39
- margin-bottom: @margin-xs;
40
- }
41
- &-label {
42
- display: flex;
43
- align-items: center;
44
- min-width: 28px;
45
- height: 34px;
46
- margin-right: @margin-xs;
47
- }
48
- &-runtimes {
49
- margin-right: @margin-xs;
50
- }
51
- .del-log {
52
- margin-top: 4px;
53
- color: #fb5547;
54
- font-weight: 400;
55
- font-size: 14px;
56
- }
57
- }
1
+ @import '../../../assets/styles/variable.less';
2
+ .biz-user-condition-event-condition {
3
+ display: flex;
4
+ &-left {
5
+ display: flex;
6
+ }
7
+ &-right {
8
+ flex: 1;
9
+ }
10
+ .biz-user-condition-event {
11
+ width: 200px;
12
+ .biz-event-select-handle {
13
+ border-top-right-radius: 0;
14
+ border-bottom-right-radius: 0;
15
+ .biz-select-handle-input {
16
+ background-color: @background-color-base;
17
+ }
18
+ }
19
+ }
20
+ &-times-period-wrap {
21
+ display: flex;
22
+ }
23
+ &-expand-attr {
24
+ display: flex;
25
+ align-items: center;
26
+ justify-content: center;
27
+ width: 38px;
28
+ height: @height-base;
29
+ margin-right: @margin-xs;
30
+ margin-left: @border-radius-small;
31
+ background-color: @background-color-base;
32
+ border-radius: @border-radius-small;
33
+ cursor: pointer;
34
+ }
35
+ &-attrs {
36
+ flex: 1;
37
+ width: 100%;
38
+ // margin-right: @margin-xs;
39
+ margin-bottom: @margin-xs;
40
+ }
41
+ &-label {
42
+ display: flex;
43
+ align-items: center;
44
+ min-width: 28px;
45
+ height: 34px;
46
+ margin-right: @margin-xs;
47
+ }
48
+ &-runtimes {
49
+ margin-right: @margin-xs;
50
+ }
51
+ .del-log {
52
+ margin-top: 4px;
53
+ color: #fb5547;
54
+ font-weight: 400;
55
+ font-size: 14px;
56
+ }
57
+
58
+ &-time {
59
+ display: flex !important;
60
+ gap: 4px;
61
+ margin: 13px 0px 0px 38px;
62
+ padding: 4px 16px !important;
63
+ color: #116acc !important;
64
+ font-weight: 400;
65
+ font-size: 14px !important;
66
+ line-height: 14px;
67
+ background: #fff !important;
68
+ border: 1px dashed #116acc !important;
69
+ border-radius: 4px !important;
70
+ }
71
+ }
@@ -1,26 +1,32 @@
1
- @import '../../../assets/styles/variable.less';
2
- .biz-user-condition-period-condition {
3
- display: flex;
4
- align-items: center;
5
- &-label,
6
- &-operator,
7
- &-values,
8
- &-unit {
9
- margin-right: @margin-xs;
10
- > input {
11
- border: none !important;
12
- }
13
- }
14
- &-operator {
15
- width: 129px;
16
- }
17
- &-values {
18
- .ant-picker-range.ant-picker-larg {
19
- min-width: 255px;
20
- }
21
- }
22
- &-today {
23
- margin-left: @margin-xs;
24
- white-space: nowrap;
25
- }
26
- }
1
+ @import '../../../assets/styles/variable.less';
2
+ .biz-user-condition-period-condition {
3
+ display: flex;
4
+ align-items: center;
5
+ &-label,
6
+ &-operator,
7
+ &-values,
8
+ &-unit {
9
+ margin-right: @margin-xs;
10
+ text-wrap-mode: nowrap;
11
+ > input {
12
+ border: none !important;
13
+ }
14
+ }
15
+ &-operator {
16
+ width: 100px;
17
+ }
18
+ &-values {
19
+ .ant-picker-range.ant-picker-larg {
20
+ min-width: 255px;
21
+ }
22
+ }
23
+ &-today {
24
+ margin-left: @margin-xs;
25
+ white-space: nowrap;
26
+ }
27
+ .ant-input-number {
28
+ background-color: #fafafb;
29
+ border: 1px solid #fafafb;
30
+ border-radius: 4px;
31
+ }
32
+ }
@@ -1,17 +1,16 @@
1
- @import '../../../assets/styles/variable.less';
2
- .biz-user-condition {
3
- &-text-desc {
4
- color: @text-color-secondary;
5
- font-size: 14px;
6
- &-or {
7
- margin: 0 @margin-xs;
8
- }
9
- &-label {
10
- }
11
- &-operator {
12
- }
13
- &-value {
14
- color: @text-color;
15
- }
16
- }
17
- }
1
+ @import '../../../assets/styles/variable.less';
2
+ .biz-user-condition {
3
+ &-text-desc {
4
+ color: @text-color-secondary;
5
+ font-size: 14px;
6
+ &-or {
7
+ margin: 0 @margin-xs;
8
+ }
9
+ &-value {
10
+ color: @text-color;
11
+ }
12
+ &-error {
13
+ color: #fb5547;
14
+ }
15
+ }
16
+ }
@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
10
10
  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; }
11
11
  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; } }
12
12
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
13
- import React, { useContext, useState } from 'react';
13
+ import React, { useContext, useState, useEffect } from 'react';
14
14
  import { BizUserConditionContext, classPrefix } from '..';
15
15
  import BizSelect from '../../select';
16
16
  import { operatorMap } from './constants';
@@ -28,7 +28,8 @@ var options = [{
28
28
  }];
29
29
  var TagsCondition = function TagsCondition(props) {
30
30
  var _useContext = useContext(BizUserConditionContext),
31
- userTagsData = _useContext.userTagsData;
31
+ userTagsData = _useContext.userTagsData,
32
+ searchUserTagsData = _useContext.searchUserTagsData;
32
33
  var _useContext2 = useContext(BizGlobalDataContext),
33
34
  currentApp = _useContext2.currentApp;
34
35
  var labels = props.labels,
@@ -37,8 +38,14 @@ var TagsCondition = function TagsCondition(props) {
37
38
  var _useState = useState(function () {
38
39
  return buildDefaultValues();
39
40
  }),
40
- _useState2 = _slicedToArray(_useState, 1),
41
- defaultValue = _useState2[0];
41
+ _useState2 = _slicedToArray(_useState, 2),
42
+ defaultValue = _useState2[0],
43
+ setDefaultValue = _useState2[1];
44
+ useEffect(function () {
45
+ setDefaultValue(function () {
46
+ return buildDefaultValues();
47
+ });
48
+ }, [userTagsData]);
42
49
  function onOperatorChange(operator) {
43
50
  onChange(dataId, _objectSpread(_objectSpread({}, labels), {}, {
44
51
  operator: operator.value
@@ -54,7 +61,7 @@ var TagsCondition = function TagsCondition(props) {
54
61
  }
55
62
  function buildDefaultValues() {
56
63
  var values = [];
57
- var findTag = buildSelectLayer(userTagsData);
64
+ var findTag = buildSelectLayer(userTagsData.concat(searchUserTagsData || []));
58
65
  labels.values.forEach(function (value) {
59
66
  if (_.isNumber(value)) {
60
67
  return;
@@ -13,7 +13,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
13
13
  import _ from 'lodash';
14
14
  import React, { useContext, useMemo } from 'react';
15
15
  import { BizUserConditionContext, classPrefix } from '..';
16
- import { monthTimeOperatorType, monthValuesType, skyTimeOperatorType, timeDimensionType, timeValuesType, typeList, weekTimeOperatorType, weekValuesType, orderTypeList, computeTypeList, stringOperate } from '../../attrConditions/utils/operates';
16
+ import { monthTimeOperatorType, monthValuesType, skyTimeOperatorType, timeDimensionType, timeValuesType, typeList, weekTimeOperatorType, weekValuesType, orderTypeList, computeTypeList, stringOperate1 } from '../../attrConditions/utils/operates';
17
17
  import BizGlobalDataContext from '../../context';
18
18
  import { findEvent, findPropAndEnv, buildSelectLayer } from '../util';
19
19
  import { durationHandler, operatorMap } from './constants';
@@ -149,8 +149,8 @@ var Text = function Text(props) {
149
149
  var operateList = [];
150
150
  switch (item.attrType) {
151
151
  case 'cont-string':
152
- attrTypeList = typeList['cont-string'];
153
- operateList = stringOperate;
152
+ attrTypeList = stringOperate1;
153
+ operateList = stringOperate1;
154
154
  break;
155
155
  case 'cont-num':
156
156
  attrTypeList = computeTypeList;
@@ -299,7 +299,7 @@ var Text = function Text(props) {
299
299
  }, /*#__PURE__*/React.createElement("b", null, "\u7528\u6237\u6807\u7B7E")), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("b", null, operatorMap[labels.operator])), /*#__PURE__*/React.createElement("span", {
300
300
  className: "".concat(classPrefix, "-text-desc-value")
301
301
  }, /*#__PURE__*/React.createElement("span", null, "("), labels.values.map(function (value, index) {
302
- var _tag$;
302
+ var _tag$, _tag$2, _tag$3, _tag$4, _tag$5, _tag$6;
303
303
  if (_.isNumber(value)) {
304
304
  return null;
305
305
  }
@@ -313,7 +313,11 @@ var Text = function Text(props) {
313
313
  style: {
314
314
  margin: '0 4px'
315
315
  }
316
- }, "\u6216") : null, tag && (tag[1].labelCreateType === LabelCreateType.firstAndLastUpdate || tag[1].labelCreateType === LabelCreateType.fundingSource || tag[1].labelCreateType === LabelCreateType.eventPreference || tag[1].labelCreateType === LabelCreateType.sqlCreateTable) && /*#__PURE__*/React.createElement("span", null, tag && tag[1].labelName), tag && (tag[1].labelCreateType === LabelCreateType.autoUpdate || tag[1].labelCreateType === LabelCreateType.manualUpdate || tag[1].labelCreateType === LabelCreateType.recencyFrequencyMonetaryUpdate || tag[1].labelCreateType === LabelCreateType.labelOpenApi || tag[1].labelCreateType === LabelCreateType.lostUser || tag[1].labelCreateType === LabelCreateType.riskLevel || tag[1].labelCreateType === LabelCreateType.financeValue || tag[1].labelCreateType === LabelCreateType.financingRange || tag[1].labelCreateType === LabelCreateType.transferScale || tag[1].labelCreateType === LabelCreateType.assetLevel || tag[1].labelCreateType === LabelCreateType.aum) && /*#__PURE__*/React.createElement("span", null, tag && tag[1].labelName + ':' + ((_tag$ = tag[2]) === null || _tag$ === void 0 ? void 0 : _tag$.layerLabelName)));
316
+ }, "\u6216") : null, tag && (tag[1].labelCreateType === LabelCreateType.firstAndLastUpdate || tag[1].labelCreateType === LabelCreateType.fundingSource || tag[1].labelCreateType === LabelCreateType.eventPreference || tag[1].labelCreateType === LabelCreateType.sqlCreateTable) && /*#__PURE__*/React.createElement("span", {
317
+ className: "".concat(((_tag$ = tag[2]) === null || _tag$ === void 0 ? void 0 : _tag$.ancestryState) != 1 && ((_tag$2 = tag[2]) === null || _tag$2 === void 0 ? void 0 : _tag$2.ancestryState) !== null ? "".concat(classPrefix, "-text-desc-error") : '')
318
+ }, tag && tag[1].labelName), tag && (tag[1].labelCreateType === LabelCreateType.autoUpdate || tag[1].labelCreateType === LabelCreateType.manualUpdate || tag[1].labelCreateType === LabelCreateType.recencyFrequencyMonetaryUpdate || tag[1].labelCreateType === LabelCreateType.labelOpenApi || tag[1].labelCreateType === LabelCreateType.lostUser || tag[1].labelCreateType === LabelCreateType.riskLevel || tag[1].labelCreateType === LabelCreateType.financeValue || tag[1].labelCreateType === LabelCreateType.financingRange || tag[1].labelCreateType === LabelCreateType.transferScale || tag[1].labelCreateType === LabelCreateType.assetLevel || tag[1].labelCreateType === LabelCreateType.aum) && /*#__PURE__*/React.createElement("span", {
319
+ className: "".concat(((_tag$3 = tag[2]) === null || _tag$3 === void 0 ? void 0 : _tag$3.ancestryState) != 1 && ((_tag$4 = tag[2]) === null || _tag$4 === void 0 ? void 0 : _tag$4.ancestryState) !== null ? "".concat(classPrefix, "-text-desc-error") : '')
320
+ }, tag && (tag[1].id !== ((_tag$5 = tag[2]) === null || _tag$5 === void 0 ? void 0 : _tag$5.layerLabelId) ? tag[1].labelName + ':' + ((_tag$6 = tag[2]) === null || _tag$6 === void 0 ? void 0 : _tag$6.layerLabelName) : tag[1].labelName)));
317
321
  }), /*#__PURE__*/React.createElement("span", null, ")")));
318
322
  }
319
323
  function renderCdp(condition) {
@@ -19,9 +19,15 @@ export default (function () {
19
19
  }),
20
20
  _useState2 = _slicedToArray(_useState, 2),
21
21
  setStore = _useState2[1];
22
- var _useState3 = useState(tagList),
23
- _useState4 = _slicedToArray(_useState3, 1),
24
- userTagsData = _useState4[0];
22
+ var _useState3 = useState([]),
23
+ _useState4 = _slicedToArray(_useState3, 2),
24
+ userTagsData = _useState4[0],
25
+ setUserTagsData = _useState4[1];
26
+ useEffect(function () {
27
+ setTimeout(function () {
28
+ setUserTagsData(tagList);
29
+ }, 2000);
30
+ }, []);
25
31
  var newStore = convertAttributeData({
26
32
  eventList: eventData,
27
33
  userPropList: userData,
@@ -36,21 +42,21 @@ export default (function () {
36
42
  function onChange(value) {
37
43
  console.log('change:', JSON.parse(JSON.stringify(value)));
38
44
  }
39
- var descDom = /*#__PURE__*/React.createElement(BizUserCondition, {
40
- defaultValue: defaultValue,
41
- onChange: onChange,
42
- eventAttrNum: 3,
43
- openTagCondition: true,
44
- openCdpCondition: true,
45
- userTagsData: userTagsData,
46
- isRealTime: true
47
- });
48
45
  return /*#__PURE__*/React.createElement(DemoWrapper, {
49
46
  needMeta: true,
50
- defaultApp: 86284
47
+ defaultApp: 155
51
48
  }, /*#__PURE__*/React.createElement("div", {
52
49
  style: {
53
50
  display: 'inline-block'
54
51
  }
55
- }, descDom));
52
+ }, /*#__PURE__*/React.createElement(BizUserCondition, {
53
+ defaultValue: defaultValue,
54
+ onChange: onChange,
55
+ eventAttrNum: 3,
56
+ openTagCondition: true,
57
+ openCdpCondition: true,
58
+ userTagsData: userTagsData,
59
+ isRealTime: true,
60
+ realTimeTags: true
61
+ })));
56
62
  });
@@ -1,4 +1,18 @@
1
1
  export declare const tagList: ({
2
+ labelType: number;
3
+ dataStatus: number;
4
+ editStatus: number;
5
+ labelCreateType: number;
6
+ endProcessTime: string;
7
+ labelGroup: string;
8
+ startProcessTime: string;
9
+ layers: never[];
10
+ expireStatus: string;
11
+ id: number;
12
+ releaseState: number;
13
+ labelName: string;
14
+ labelRemark: string;
15
+ } | {
2
16
  labelGroup: string;
3
17
  startProcessTime: string;
4
18
  labelType: number;
@@ -6,6 +20,7 @@ export declare const tagList: ({
6
20
  sequence: number;
7
21
  layerLabelId: number;
8
22
  layerLabelName: string;
23
+ ancestryState: number;
9
24
  }[];
10
25
  dataStatus: number;
11
26
  editStatus: number;
@@ -15,6 +30,7 @@ export declare const tagList: ({
15
30
  endProcessTime: string;
16
31
  labelName: string;
17
32
  labelRemark: string;
33
+ releaseState?: undefined;
18
34
  } | {
19
35
  labelGroup: string;
20
36
  labelType: number;
@@ -30,107 +46,17 @@ export declare const tagList: ({
30
46
  id: number;
31
47
  labelName: string;
32
48
  labelRemark: string;
33
- startProcessTime?: undefined;
34
49
  endProcessTime?: undefined;
50
+ startProcessTime?: undefined;
51
+ releaseState?: undefined;
35
52
  })[];
36
- export declare const conditions: ({
53
+ export declare const conditions: {
37
54
  attrs: never[];
38
55
  labels: {
39
56
  values: string[];
40
57
  operator: string;
41
58
  };
42
- dataset?: undefined;
43
- data_set_csh?: undefined;
44
- } | {
45
- dataset: {
46
- datasetId: number;
47
- datasetTable: string;
48
- datasetName: string;
49
- fieldName: string;
50
- fieldType: string;
51
- webType: string;
52
- paramType: string;
53
- operator: string;
54
- params: string[];
55
- }[];
56
- attrs?: undefined;
57
- labels?: undefined;
58
- data_set_csh?: undefined;
59
- } | {
60
- data_set_csh: {
61
- datasetName: string;
62
- datasetTable: string;
63
- fieldName: string;
64
- fieldType: string;
65
- webType: string;
66
- paramType: string;
67
- calculate: string;
68
- operator: string;
69
- params: string;
70
- subCondition: {
71
- operator: string;
72
- datasetName: string;
73
- datasetTable: string;
74
- fieldName: string;
75
- calculate: string;
76
- };
77
- }[];
78
- attrs?: undefined;
79
- labels?: undefined;
80
- dataset?: undefined;
81
- } | {
82
- data_set_csh: {
83
- datasetName: string;
84
- datasetTable: string;
85
- fieldName: string;
86
- fieldType: string;
87
- webType: string;
88
- paramType: string;
89
- calculate: string;
90
- operator: string;
91
- between: number[];
92
- subCondition: {
93
- operator: string;
94
- datasetName: string;
95
- datasetTable: string;
96
- fieldName: string;
97
- calculate: string;
98
- };
99
- }[];
100
- attrs?: undefined;
101
- labels?: undefined;
102
- dataset?: undefined;
103
- } | {
104
- data_set_csh: {
105
- datasetName: string;
106
- datasetTable: string;
107
- fieldName: string;
108
- fieldType: string;
109
- webType: string;
110
- paramType: string;
111
- calculate: string;
112
- operator: string;
113
- params: string;
114
- }[];
115
- attrs?: undefined;
116
- labels?: undefined;
117
- dataset?: undefined;
118
- } | {
119
- data_set_csh: {
120
- datasetName: string;
121
- datasetTable: string;
122
- fieldName: string;
123
- fieldType: string;
124
- webType: string;
125
- paramType: string;
126
- calculate: string;
127
- operator: string;
128
- between: number[];
129
- }[];
130
- attrs?: undefined;
131
- labels?: undefined;
132
- dataset?: undefined;
133
- })[][];
59
+ }[][];
134
60
  export declare const datasetList: {
135
61
  id: number;
136
62
  datasetName: string;