@zgfe/business-lib 1.2.70-hxd.9 → 1.2.71-hxd.1

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 (281) hide show
  1. package/README.md +12 -12
  2. package/config.js +41 -41
  3. package/es/AUMFormulaTarget/components/formula/index.js +6 -4
  4. package/es/AUMFormulaTarget/components/formula/index.less +86 -86
  5. package/es/AUMFormulaTarget/components/panel/cdpCshCondition.js +2 -2
  6. package/es/AUMFormulaTarget/components/panel/index.less +269 -269
  7. package/es/AUMFormulaTarget/components/symbol/index.less +49 -49
  8. package/es/AUMFormulaTarget/demo/index.js +1 -1
  9. package/es/AUMFormulaTarget/index.d.ts +4 -1
  10. package/es/AUMFormulaTarget/styles/index.less +74 -74
  11. package/es/addToPanel/components/radioGroup.d.ts +4 -1
  12. package/es/addToPanel/components/styleList.d.ts +4 -1
  13. package/es/addToPanel/index.d.ts +4 -1
  14. package/es/addToPanel/index.js +1 -1
  15. package/es/addToPanel/styles/addPanel.less +25 -25
  16. package/es/addToPanel/styles/index.less +17 -17
  17. package/es/addToPanel/styles/style.less +66 -66
  18. package/es/addToScene/index.js +3 -8
  19. package/es/addToScene/styles/index.less +30 -30
  20. package/es/amountSelector/demo/index.d.ts +3 -0
  21. package/es/amountSelector/demo/index.js +9 -0
  22. package/es/amountSelector/index.d.ts +10 -0
  23. package/es/amountSelector/index.js +21 -0
  24. package/es/amountSelector/styles/index.less +27 -0
  25. package/es/amountSelector/types.d.ts +4 -0
  26. package/es/amountSelector/types.js +1 -0
  27. package/es/amountSelector/util.d.ts +3 -0
  28. package/es/amountSelector/util.js +18 -0
  29. package/es/assets/colorIcon/demo.css +539 -539
  30. package/es/assets/colorIcon/demo_index.html +1985 -1454
  31. package/es/assets/colorIcon/iconfont.css +329 -236
  32. package/es/assets/colorIcon/iconfont.js +13 -14
  33. package/es/assets/colorIcon/iconfont.json +555 -394
  34. package/es/assets/colorIcon/iconfont.ttf +0 -0
  35. package/es/assets/colorIcon/iconfont.woff +0 -0
  36. package/es/assets/colorIcon/iconfont.woff2 +0 -0
  37. package/es/assets/iconfont/demo.css +539 -539
  38. package/es/assets/iconfont/demo_index.html +5563 -5708
  39. package/es/assets/iconfont/iconfont.css +1015 -975
  40. package/es/assets/iconfont/iconfont.js +1 -1
  41. package/es/assets/iconfont/iconfont.json +1584 -1689
  42. package/es/assets/styles/chunks.less +183 -183
  43. package/es/assets/styles/inner.less +3 -3
  44. package/es/assets/styles/resetAntd.less +568 -564
  45. package/es/assets/styles/variable.less +21 -21
  46. package/es/assets/theme.js +1 -1
  47. package/es/attrCondition/demo/group.js +1 -1
  48. package/es/attrCondition/group.js +11 -6
  49. package/es/attrCondition/index.js +11 -6
  50. package/es/attrCondition/styles/index.less +101 -101
  51. package/es/attrCondition/useAttrCondition.js +7 -5
  52. package/es/attrConditions/components/operateList.js +6 -3
  53. package/es/attrConditions/components/stringList.js +5 -9
  54. package/es/attrConditions/index.d.ts +4 -1
  55. package/es/attrConditions/index.js +4 -2
  56. package/es/attrConditions/styles/group.less +49 -49
  57. package/es/attrConditions/styles/index.less +151 -151
  58. package/es/attrConditions/types.d.ts +4 -0
  59. package/es/attrConditions/utils/operates.d.ts +4 -0
  60. package/es/attrConditions/utils/operates.js +37 -0
  61. package/es/attributeSelector/index.js +11 -11
  62. package/es/attributeSelector/listPanel.js +313 -101
  63. package/es/attributeSelector/styles/index.less +141 -141
  64. package/es/attributeSelector/types.d.ts +2 -0
  65. package/es/attributeSelector/util.js +3 -0
  66. package/es/chart/demo/data/data5 copy.js +2 -2
  67. package/es/chart/demo/index.js +1 -1
  68. package/es/chart/demo/line_bar_stack.js +4 -4
  69. package/es/chart/demo/stack.js +1 -1
  70. package/es/chart/index.js +10 -12
  71. package/es/chart/styles/index.less +113 -113
  72. package/es/chart/util/color.js +1 -1
  73. package/es/chart/util/data/china.js +17 -17
  74. package/es/colorIcon/index.js +2 -4
  75. package/es/constants/apis.d.ts +4 -0
  76. package/es/constants/apis.js +6 -2
  77. package/es/constants/common.d.ts +11 -0
  78. package/es/constants/common.js +31 -0
  79. package/es/context/index.d.ts +2 -0
  80. package/es/cycleTime/index.js +6 -8
  81. package/es/cycleTime/month.js +2 -5
  82. package/es/cycleTime/styles/index.less +24 -24
  83. package/es/cycleTime/styles/month.less +95 -95
  84. package/es/dataSetGroup/index.js +0 -1
  85. package/es/dataSetGroup/styles/index.less +146 -146
  86. package/es/datePicker/index.d.ts +4 -1
  87. package/es/datePicker/styles/index.less +53 -53
  88. package/es/datePickerV2/demo/index.js +1 -1
  89. package/es/datePickerV2/index.d.ts +4 -1
  90. package/es/datePickerV2/index.js +13 -4
  91. package/es/datePickerV2/popoverContent.js +1 -1
  92. package/es/datePickerV2/shortcut.js +1 -1
  93. package/es/datePickerV2/styles/index.less +194 -194
  94. package/es/datePickerV2/types.d.ts +1 -0
  95. package/es/datePickerV2/utils.js +8 -2
  96. package/es/demoWrapper/content.js +9 -10
  97. package/es/demoWrapper/index.less +3 -3
  98. package/es/demoWrapper/innerDemo.js +1 -1
  99. package/es/dialog/index.d.ts +4 -1
  100. package/es/dialog/styles/index.less +22 -22
  101. package/es/dnd/demo/index.js +5 -1
  102. package/es/dnd/demo/styles/index.less +34 -34
  103. package/es/dnd/index.d.ts +4 -1
  104. package/es/dnd/item.js +14 -0
  105. package/es/dnd/styles/index.less +19 -19
  106. package/es/eventSelector/index.d.ts +4 -1
  107. package/es/eventSelector/index.js +3 -2
  108. package/es/eventSelector/listPanel.js +9 -13
  109. package/es/eventSelector/option.d.ts +1 -0
  110. package/es/eventSelector/option.js +14 -3
  111. package/es/eventSelector/styles/index.less +127 -123
  112. package/es/eventSelector/types.d.ts +1 -0
  113. package/es/formulaTarget/components/formula/index.js +2 -1
  114. package/es/formulaTarget/components/formula/index.less +76 -76
  115. package/es/formulaTarget/components/formula/types.d.ts +1 -0
  116. package/es/formulaTarget/components/formulaItem/index.js +7 -2
  117. package/es/formulaTarget/components/formulaItem/types.d.ts +1 -0
  118. package/es/formulaTarget/components/panel/index.js +2 -1
  119. package/es/formulaTarget/components/panel/index.less +139 -139
  120. package/es/formulaTarget/components/panel/item.js +5 -1
  121. package/es/formulaTarget/components/panel/types.d.ts +2 -0
  122. package/es/formulaTarget/components/symbol/index.less +49 -49
  123. package/es/formulaTarget/index.d.ts +4 -1
  124. package/es/formulaTarget/index.js +2 -1
  125. package/es/formulaTarget/styles/index.less +74 -74
  126. package/es/formulaTarget/types.d.ts +1 -0
  127. package/es/hooks/types/subject.d.ts +14 -14
  128. package/es/hooks/useBizStore.js +3 -9
  129. package/es/icon/demo/list.less +32 -32
  130. package/es/icon/iconFont.d.ts +4 -1
  131. package/es/index.d.ts +2 -1
  132. package/es/index.js +2 -1
  133. package/es/layout/analysisLayout/demo/index.less +12 -12
  134. package/es/layout/analysisLayout/index.d.ts +4 -1
  135. package/es/layout/analysisLayout/index.less +118 -118
  136. package/es/layout/columnLayout/demo/index.less +15 -15
  137. package/es/layout/columnLayout/index.d.ts +4 -1
  138. package/es/layout/columnLayout/index.less +81 -81
  139. package/es/layout/detail/index.less +27 -27
  140. package/es/layout/optionTitle/components/btnMenu/index.less +18 -18
  141. package/es/layout/optionTitle/components/changePanelModal/styles/index.less +92 -92
  142. package/es/layout/optionTitle/components/title/index.d.ts +1 -2
  143. package/es/layout/optionTitle/components/title/index.js +10 -6
  144. package/es/layout/optionTitle/components/title/index.less +43 -43
  145. package/es/layout/optionTitle/demo/index.less +12 -12
  146. package/es/layout/optionTitle/index.js +1 -1
  147. package/es/layout/optionTitle/styles/index.less +30 -30
  148. package/es/layout/optionTitle/styles/layout.less +90 -90
  149. package/es/layout/optionTitle/styles/search.less +27 -27
  150. package/es/loading/styles/index.less +20 -20
  151. package/es/loginForm/index.less +7 -7
  152. package/es/platformSelector/styles/index.less +26 -26
  153. package/es/productCondition/conditionTypeList.d.ts +4 -1
  154. package/es/productCondition/conditions/cdpCshCondition.js +9 -6
  155. package/es/productCondition/conditions/constants.d.ts +2 -0
  156. package/es/productCondition/conditions/constants.js +2 -0
  157. package/es/productCondition/conditions/order/runPeriodCondition.js +2 -4
  158. package/es/productCondition/conditions/periodCondition.d.ts +4 -1
  159. package/es/productCondition/conditions/propCondition.d.ts +4 -1
  160. package/es/productCondition/conditions/styles/cdpCondition.less +31 -31
  161. package/es/productCondition/conditions/styles/cdpCshCondition.less +41 -41
  162. package/es/productCondition/conditions/styles/eventCondition.less +51 -51
  163. package/es/productCondition/conditions/styles/periodCondition.less +26 -26
  164. package/es/productCondition/conditions/styles/propCondition.less +43 -43
  165. package/es/productCondition/conditions/styles/runTimesCondition.less +19 -19
  166. package/es/productCondition/conditions/styles/tagsCondition.less +20 -20
  167. package/es/productCondition/conditions/styles/textDesc.less +17 -17
  168. package/es/productCondition/index.d.ts +4 -1
  169. package/es/productCondition/styles/conditionTypeList.less +32 -30
  170. package/es/productCondition/styles/conditionWrap.less +18 -18
  171. package/es/productCondition/styles/index.less +33 -33
  172. package/es/productCondition/styles/orConditions.less +34 -34
  173. package/es/productCondition/styles/relationLabel.less +19 -19
  174. package/es/productCondition/types.d.ts +3 -1
  175. package/es/productCondition/util.d.ts +4 -0
  176. package/es/productCondition/util.js +4 -2
  177. package/es/quickDatePicker/demo/index.js +31 -11
  178. package/es/quickDatePicker/index.js +122 -23
  179. package/es/quickDatePicker/styles/index.less +141 -138
  180. package/es/quickDatePicker/types.d.ts +13 -0
  181. package/es/quickDatePicker/utils.d.ts +6 -0
  182. package/es/quickDatePicker/utils.js +54 -1
  183. package/es/select/demo/index.js +2 -1
  184. package/es/select/handle.js +2 -9
  185. package/es/select/index.d.ts +4 -1
  186. package/es/select/option.js +1 -1
  187. package/es/select/overlay.js +2 -2
  188. package/es/select/styles/handle.less +206 -193
  189. package/es/select/styles/index.less +129 -129
  190. package/es/socket/demo/demo.js +2 -2
  191. package/es/socket/demo/index.less +27 -27
  192. package/es/subjectWrapper/index.js +3 -1
  193. package/es/subjectWrapper/index.less +12 -12
  194. package/es/table/demo/data/color.js +1 -1
  195. package/es/table/index.js +3 -30
  196. package/es/table/styles/index.less +5 -5
  197. package/es/targetConditionGroup/components/targetDimension.js +147 -53
  198. package/es/targetConditionGroup/demo/group.js +5 -18
  199. package/es/targetConditionGroup/demo/styles/index.less +29 -29
  200. package/es/targetConditionGroup/index.d.ts +4 -1
  201. package/es/targetConditionGroup/index.js +12 -10
  202. package/es/targetConditionGroup/styles/index.less +53 -53
  203. package/es/targetConditionGroup/types.d.ts +1 -0
  204. package/es/targetSelector/editBox.d.ts +1 -0
  205. package/es/targetSelector/editBox.js +8 -3
  206. package/es/targetSelector/index.js +2 -1
  207. package/es/targetSelector/optionIcon.d.ts +4 -1
  208. package/es/targetSelector/optionIcon.js +3 -0
  209. package/es/targetSelector/styles/index.less +142 -110
  210. package/es/userCondition/conditionTypeList.d.ts +4 -1
  211. package/es/userCondition/conditionTypeList.js +5 -4
  212. package/es/userCondition/conditions/cdpCondition.js +9 -6
  213. package/es/userCondition/conditions/cdpCshCondition.js +9 -6
  214. package/es/userCondition/conditions/constants.d.ts +2 -0
  215. package/es/userCondition/conditions/constants.js +2 -0
  216. package/es/userCondition/conditions/dataAttribute.js +11 -7
  217. package/es/userCondition/conditions/eventCondition.js +16 -24
  218. package/es/userCondition/conditions/order/runPeriodCondition.d.ts +4 -1
  219. package/es/userCondition/conditions/periodCondition.d.ts +4 -1
  220. package/es/userCondition/conditions/periodCondition.js +19 -11
  221. package/es/userCondition/conditions/propCondition.js +5 -3
  222. package/es/userCondition/conditions/styles/cdpCondition.less +37 -37
  223. package/es/userCondition/conditions/styles/cdpCshCondition.less +47 -47
  224. package/es/userCondition/conditions/styles/eventCondition.less +71 -57
  225. package/es/userCondition/conditions/styles/periodCondition.less +32 -26
  226. package/es/userCondition/conditions/styles/propCondition.less +43 -43
  227. package/es/userCondition/conditions/styles/runTimesCondition.less +19 -19
  228. package/es/userCondition/conditions/styles/tagsCondition.less +20 -20
  229. package/es/userCondition/conditions/styles/textDesc.less +16 -17
  230. package/es/userCondition/conditions/tagsCondition.js +12 -5
  231. package/es/userCondition/conditions/textDesc.js +9 -5
  232. package/es/userCondition/demo/index.js +20 -14
  233. package/es/userCondition/demo/mockData.d.ts +20 -94
  234. package/es/userCondition/demo/mockData.js +31 -76
  235. package/es/userCondition/index.d.ts +5 -1
  236. package/es/userCondition/index.js +37 -21
  237. package/es/userCondition/styles/conditionTypeList.less +32 -30
  238. package/es/userCondition/styles/conditionWrap.less +18 -18
  239. package/es/userCondition/styles/index.less +33 -33
  240. package/es/userCondition/styles/orConditions.less +34 -34
  241. package/es/userCondition/styles/relationLabel.less +19 -19
  242. package/es/userCondition/types.d.ts +5 -2
  243. package/es/userCondition/util.d.ts +4 -0
  244. package/es/userCondition/util.js +4 -2
  245. package/es/userGroup/demo/index.js +2 -9
  246. package/es/userGroup/index.d.ts +4 -1
  247. package/es/userGroup/index.js +63 -15
  248. package/es/userGroup/overlay.js +17 -3
  249. package/es/userGroup/styles/index.less +199 -145
  250. package/es/userGroup/types.d.ts +2 -0
  251. package/es/userGroup/util.d.ts +2 -0
  252. package/es/userGroup/util.js +47 -0
  253. package/es/userGroupHeader/demo/index.js +1 -1
  254. package/es/userGroupHeader/index.d.ts +1 -0
  255. package/es/userGroupHeader/index.js +53 -6
  256. package/es/userGroupHeader/styles/index.less +50 -31
  257. package/es/userTagsSelector/cascaderOverlay.d.ts +4 -1
  258. package/es/userTagsSelector/cascaderOverlay.js +9 -2
  259. package/es/userTagsSelector/components/search/index.less +6 -6
  260. package/es/userTagsSelector/components/tagList/index.d.ts +4 -1
  261. package/es/userTagsSelector/components/tagList/index.less +13 -13
  262. package/es/userTagsSelector/groups/index.d.ts +4 -1
  263. package/es/userTagsSelector/groups/styles/option.less +55 -55
  264. package/es/userTagsSelector/index.d.ts +4 -1
  265. package/es/userTagsSelector/index.js +32 -2
  266. package/es/userTagsSelector/multipleCheckPanel/styles/option.less +40 -40
  267. package/es/userTagsSelector/styles/cascaderOverlay.less +34 -34
  268. package/es/userTagsSelector/styles/index.less +20 -10
  269. package/es/userTagsSelector/types.d.ts +2 -0
  270. package/es/userTagsSelector/util.d.ts +1 -0
  271. package/es/userTagsSelector/util.js +20 -0
  272. package/es/utils/ajax.js +63 -26
  273. package/es/utils/eventApi.d.ts +14 -0
  274. package/es/utils/eventApi.js +128 -0
  275. package/es/utils/index.d.ts +2 -1
  276. package/es/utils/index.js +2 -1
  277. package/es/utils/type.d.ts +1 -0
  278. package/es/utils/util.d.ts +1 -0
  279. package/es/utils/util.js +18 -0
  280. package/package.json +2 -2
  281. package/es/assets/colorIcon/iconfont.svg +0 -129
@@ -1,110 +1,142 @@
1
- @import '../../assets/styles/inner.less';
2
-
3
- .biz-target-select {
4
- position: relative;
5
- display: flex;
6
- align-items: center;
7
- height: 32px;
8
- padding: 0;
9
- line-height: 32px;
10
- background-color: @background-color-base;
11
- border-color: @background-color-base;
12
- .__select-handle();
13
-
14
- &:hover {
15
- border-color: @primary-color;
16
- .biz-target-select-option-icon {
17
- display: inline-block;
18
- }
19
- }
20
- &:focus {
21
- background-color: #fff;
22
- .biz-select-handle-input {
23
- background-color: #fff;
24
- }
25
- }
26
-
27
- .biz-select-handle-input.middle {
28
- height: 30px;
29
- line-height: 30px;
30
- }
31
- .biz-event-select {
32
- flex: 1;
33
- }
34
-
35
- .biz-event-select-handle {
36
- flex: none;
37
- padding: 0;
38
- border: none;
39
- }
40
-
41
- &-option-icon {
42
- display: none;
43
- flex: none;
44
- width: 16px;
45
- height: @height-sm;
46
- margin-right: 4px;
47
- color: @text-color-secondary;
48
- line-height: @height-sm;
49
- text-align: center;
50
- border-radius: @border-radius-small;
51
-
52
- &:hover:not(.disabled) {
53
- .__default-hover;
54
- }
55
-
56
- &.disabled {
57
- .__default-disabled;
58
- }
59
- }
60
-
61
- &-del-icon:hover:not(.disabled) {
62
- .__error-hover();
63
- }
64
-
65
- &-menu {
66
- width: 200px;
67
- .__select-panel();
68
-
69
- &-item {
70
- .__select-option();
71
- span:first-child {
72
- margin-right: 15px;
73
- }
74
- }
75
- }
76
- &-divider {
77
- height: 0;
78
- margin: 8px;
79
- border-bottom: 1px solid @border-color-base;
80
- }
81
-
82
- &-modal {
83
- position: absolute;
84
- top: 45px;
85
- left: 0;
86
- z-index: 1000;
87
- width: 100%;
88
- min-width: 280px;
89
- .__select-panel();
90
- }
91
-
92
- &-tip {
93
- margin-top: 2px;
94
- margin-bottom: 12px;
95
- margin-left: 2px;
96
- font-size: 12px;
97
- }
98
-
99
- &-error {
100
- color: @error-color;
101
- }
102
-
103
- &-footer {
104
- text-align: right;
105
- }
106
-
107
- &-mr8 {
108
- margin-right: @margin-xs;
109
- }
110
- }
1
+ @import '../../assets/styles/inner.less';
2
+
3
+ .biz-target-select {
4
+ position: relative;
5
+ display: flex;
6
+ align-items: center;
7
+ height: 32px;
8
+ padding: 0;
9
+ line-height: 32px;
10
+ background-color: @background-color-base;
11
+ border-color: @background-color-base;
12
+ .__select-handle();
13
+
14
+ .biz-event-select {
15
+ border: none !important;
16
+ }
17
+ &.focus {
18
+ border: 1px solid rgba(255, 0, 0, 0);
19
+ box-shadow: 0 0 0 4px @custom-focus;
20
+ .biz-event-select {
21
+ // border: 1px solid #116acc !important;
22
+ }
23
+ }
24
+
25
+ &:hover {
26
+ .biz-event-select {
27
+ border-color: @primary-color;
28
+ }
29
+
30
+ border-color: @primary-color;
31
+ .biz-target-select-option-icon {
32
+ display: inline-block;
33
+ }
34
+ }
35
+ &:focus {
36
+ background-color: #fff;
37
+ .biz-select-handle-input {
38
+ background-color: #fff;
39
+ }
40
+ }
41
+
42
+ .biz-select-handle-input.middle {
43
+ height: 30px;
44
+ line-height: 30px;
45
+ }
46
+ .biz-event-select {
47
+ flex: 1;
48
+ }
49
+
50
+ .biz-event-select-handle {
51
+ flex: none;
52
+ padding: 0;
53
+ border: none;
54
+ &.focus {
55
+ box-shadow: none !important;
56
+ }
57
+ }
58
+
59
+ &-option-icon {
60
+ display: none;
61
+ flex: none;
62
+ width: 16px;
63
+ height: @height-sm;
64
+ margin-right: 4px;
65
+ color: @text-color-secondary;
66
+ line-height: @height-sm;
67
+ text-align: center;
68
+ border-radius: @border-radius-small;
69
+
70
+ &:hover:not(.disabled) {
71
+ .__default-hover;
72
+ }
73
+
74
+ &.disabled {
75
+ .__default-disabled;
76
+ }
77
+ }
78
+
79
+ &-del-icon:hover:not(.disabled) {
80
+ .__error-hover();
81
+ }
82
+
83
+ &-menu {
84
+ width: 200px;
85
+ .__select-panel();
86
+
87
+ &-item {
88
+ .__select-option();
89
+ span:first-child {
90
+ margin-right: 15px;
91
+ }
92
+ }
93
+ }
94
+ &-divider {
95
+ height: 0;
96
+ margin: 8px;
97
+ border-bottom: 1px solid @border-color-base;
98
+ }
99
+
100
+ &-modal {
101
+ position: absolute;
102
+ top: 45px;
103
+ left: 0;
104
+ z-index: 1000;
105
+ width: 100%;
106
+ min-width: 280px;
107
+ .__select-panel();
108
+ }
109
+
110
+ &-tip {
111
+ margin-left: 2px;
112
+ color: #9aa1a9;
113
+ font-size: 12px;
114
+ }
115
+
116
+ &-error {
117
+ color: @error-color;
118
+ }
119
+
120
+ &-footer {
121
+ display: flex;
122
+ justify-content: end;
123
+ &-left {
124
+ margin-right: auto;
125
+ margin-left: 2px;
126
+ color: #116acc;
127
+ font-weight: 400;
128
+ font-size: 12px;
129
+ cursor: pointer;
130
+ }
131
+ .ant-btn {
132
+ }
133
+ :nth-child(2) {
134
+ color: #021429;
135
+ background-color: #f2f3f4;
136
+ }
137
+ }
138
+
139
+ &-mr8 {
140
+ margin-right: @margin-xs;
141
+ }
142
+ }
@@ -6,5 +6,8 @@ export interface ConditionTypeListPropsI {
6
6
  label?: string | React.ReactNode;
7
7
  show?: boolean;
8
8
  }
9
- declare const ConditionTypeList: React.FC<ConditionTypeListPropsI>;
9
+ type FCWithDefaultProps<P> = React.FC<P> & {
10
+ defaultProps?: Partial<P>;
11
+ };
12
+ declare const ConditionTypeList: FCWithDefaultProps<ConditionTypeListPropsI>;
10
13
  export default ConditionTypeList;
@@ -15,7 +15,8 @@ var ConditionTypeList = function ConditionTypeList(props) {
15
15
  openCdpCondition = _useContext.openCdpCondition,
16
16
  openBusinessDataCondition = _useContext.openBusinessDataCondition,
17
17
  openCondition = _useContext.openCondition,
18
- cdpTip = _useContext.cdpTip;
18
+ cdpTip = _useContext.cdpTip,
19
+ realTimeTags = _useContext.realTimeTags;
19
20
  var _useContext2 = useContext(BizGlobalDataContext),
20
21
  currentUser = _useContext2.currentUser,
21
22
  currentApp = _useContext2.currentApp,
@@ -65,7 +66,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
65
66
  onClick: function onClick() {
66
67
  return onAdd('tag');
67
68
  }
68
- }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' ? '用户' : '主体', "\u6807\u7B7E"))) : null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) === 2 ? /*#__PURE__*/React.createElement("li", {
69
+ }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' ? '用户' : '主体', "\u6807\u7B7E"))) : null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) === 2 && !realTimeTags ? /*#__PURE__*/React.createElement("li", {
69
70
  className: "condition-type",
70
71
  onClick: function onClick() {
71
72
  return onAdd('cdp_csh');
@@ -74,7 +75,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
74
75
  title: cdpTip
75
76
  }, /*#__PURE__*/React.createElement(IconFont, {
76
77
  type: "tishiicon"
77
- })) : null)) : null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) !== 2 && openCdpCondition && authority[1006] ? /*#__PURE__*/React.createElement("li", {
78
+ })) : null)) : null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) !== 2 && openCdpCondition && authority[1006] && !realTimeTags ? /*#__PURE__*/React.createElement("li", {
78
79
  className: "condition-type",
79
80
  onClick: function onClick() {
80
81
  return onAdd('cdp');
@@ -83,7 +84,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
83
84
  title: cdpTip
84
85
  }, /*#__PURE__*/React.createElement(IconFont, {
85
86
  type: "tishiicon"
86
- })) : null)) : null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' && (openBusinessDataCondition || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 0 || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 2) ? /*#__PURE__*/React.createElement("li", {
87
+ })) : null)) : null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' && !realTimeTags && (openBusinessDataCondition || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 0 || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 2) ? /*#__PURE__*/React.createElement("li", {
87
88
  className: "condition-type",
88
89
  key: "business",
89
90
  onClick: function onClick() {
@@ -15,18 +15,21 @@ import BizSelect from '../../select';
15
15
  import { PropType } from '../types';
16
16
  import './styles/cdpCondition.less';
17
17
  import _ from 'lodash';
18
- import { dateOperate, numberOperate, stringOperate } from '../../attrConditions/utils/operates';
18
+ import { dateOperate, numberOperate, stringOperate, stringOperate1 } from '../../attrConditions/utils/operates';
19
19
  import { DatePicker, Input } from 'antd';
20
20
  import moment from 'moment';
21
21
  import { BizUserConditionContext } from '..';
22
22
  import request from '../../utils/ajax';
23
23
  import Apis from '../../constants/apis';
24
24
  import IconFont from '../../icon/iconFont';
25
+ import BizGlobalDataContext from '../../context';
25
26
  var classPrefix = 'biz-user-condition-cdp';
26
27
  var CdpConditionItem = function CdpConditionItem(props) {
27
- var _useContext = useContext(BizUserConditionContext),
28
- _useContext$datasetLi = _useContext.datasetList,
29
- datasetList = _useContext$datasetLi === void 0 ? [] : _useContext$datasetLi;
28
+ var _useContext = useContext(BizGlobalDataContext),
29
+ basicConfig = _useContext.basicConfig;
30
+ var _useContext2 = useContext(BizUserConditionContext),
31
+ _useContext2$datasetL = _useContext2.datasetList,
32
+ datasetList = _useContext2$datasetL === void 0 ? [] : _useContext2$datasetL;
30
33
  var _useState = useState(function () {
31
34
  if (props.value) {
32
35
  return _objectSpread(_objectSpread({}, props.value), {}, {
@@ -181,7 +184,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
181
184
  list = numberOperate;
182
185
  break;
183
186
  case PropType.STRING2:
184
- list = stringOperate;
187
+ list = basicConfig && basicConfig.openRegexp ? stringOperate1 : stringOperate;
185
188
  break;
186
189
  default:
187
190
  list = [];
@@ -198,7 +201,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
198
201
  options: optionList,
199
202
  labelField: "name",
200
203
  keyField: "value",
201
- overlayWidth: 96,
204
+ overlayWidth: 120,
202
205
  value: operator,
203
206
  onChange: onOperateChange
204
207
  }), function () {
@@ -15,18 +15,21 @@ import BizSelect from '../../select';
15
15
  import { PropType } from '../types';
16
16
  import './styles/cdpCshCondition.less';
17
17
  import _ from 'lodash';
18
- import { dateOperate, numberOperateCsh, numberTypeCsh, stringOperate, numberOperateCsh2 } from '../../attrConditions/utils/operates';
18
+ import { dateOperate, numberOperateCsh, numberTypeCsh, stringOperate, numberOperateCsh2, stringOperate1 } from '../../attrConditions/utils/operates';
19
19
  import { DatePicker, Input } from 'antd';
20
20
  import moment from 'moment';
21
21
  import { BizUserConditionContext } from '..';
22
22
  import request from '../../utils/ajax';
23
23
  import Apis from '../../constants/apis';
24
24
  import IconFont from '../../icon/iconFont';
25
+ import BizGlobalDataContext from '../../context';
25
26
  var classPrefix = 'biz-user-condition-cdp-csh';
26
27
  var CdpConditionItem = function CdpConditionItem(props) {
27
- var _useContext = useContext(BizUserConditionContext),
28
- _useContext$datasetLi = _useContext.datasetList,
29
- datasetList = _useContext$datasetLi === void 0 ? [] : _useContext$datasetLi;
28
+ var _useContext = useContext(BizGlobalDataContext),
29
+ basicConfig = _useContext.basicConfig;
30
+ var _useContext2 = useContext(BizUserConditionContext),
31
+ _useContext2$datasetL = _useContext2.datasetList,
32
+ datasetList = _useContext2$datasetL === void 0 ? [] : _useContext2$datasetL;
30
33
  var _useState = useState(function () {
31
34
  if (props.value) {
32
35
  return _objectSpread(_objectSpread({}, props.value), {}, {
@@ -289,7 +292,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
289
292
  list = numberOperateCsh;
290
293
  break;
291
294
  case PropType.STRING2:
292
- list = stringOperate;
295
+ list = basicConfig && basicConfig.openRegexp ? stringOperate1 : stringOperate;
293
296
  break;
294
297
  default:
295
298
  list = [];
@@ -314,7 +317,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
314
317
  options: optionList,
315
318
  labelField: "name",
316
319
  keyField: "value",
317
- overlayWidth: 96,
320
+ overlayWidth: 120,
318
321
  value: operator,
319
322
  onChange: onOperateChange
320
323
  }), function () {
@@ -13,6 +13,8 @@ export declare const operatorMap: {
13
13
  'not begin with': string;
14
14
  'end with': string;
15
15
  'not end with': string;
16
+ regexp: string;
17
+ 'not regexp': string;
16
18
  '=': string;
17
19
  '<': string;
18
20
  '>': string;
@@ -13,6 +13,8 @@ export var operatorMap = {
13
13
  'not begin with': '开头不是',
14
14
  'end with': '结尾是',
15
15
  'not end with': '结尾不是',
16
+ regexp: '正则匹配',
17
+ 'not regexp': '正则不匹配',
16
18
  '=': '=',
17
19
  '<': '<',
18
20
  '>': '>',
@@ -14,7 +14,7 @@ import React, { useContext, useEffect, useState } from 'react';
14
14
  import BizSelect from '../../select';
15
15
  import './styles/runTimesCondition.less';
16
16
  import { classPrefix } from '..';
17
- import { stringOperate, orderTypeList, typeList, computeTypeList } from '../../attrConditions/utils/operates';
17
+ import { stringOperate, orderTypeList, typeList, computeTypeList, stringOperate1 } from '../../attrConditions/utils/operates';
18
18
  import moment from 'moment';
19
19
  import request from '../../utils/ajax';
20
20
  import BizGlobalDataContext from '../../context';
@@ -22,6 +22,8 @@ import ParamsCondition from './business/paramsCondition';
22
22
  import OperatorCondition from './business/operatorCondition';
23
23
  import Apis from '../../constants/apis';
24
24
  var DataAttribute = function DataAttribute(props) {
25
+ var _useContext = useContext(BizGlobalDataContext),
26
+ basicConfig = _useContext.basicConfig;
25
27
  var condition = props.condition,
26
28
  index = props.index,
27
29
  onChange = props.onChange;
@@ -29,8 +31,8 @@ var DataAttribute = function DataAttribute(props) {
29
31
  var operateList = [];
30
32
  switch (condition.attrs[index].attrType) {
31
33
  case 'cont-string':
32
- list = typeList['cont-string'];
33
- operateList = stringOperate;
34
+ list = basicConfig && basicConfig.openRegexp ? stringOperate1 : typeList['cont-string'];
35
+ operateList = basicConfig && basicConfig.openRegexp ? stringOperate1 : stringOperate;
34
36
  break;
35
37
  case 'cont-num':
36
38
  list = computeTypeList;
@@ -57,8 +59,8 @@ var DataAttribute = function DataAttribute(props) {
57
59
  _useState8 = _slicedToArray(_useState7, 2),
58
60
  bizDataAttrList = _useState8[0],
59
61
  setBizDataAttrList = _useState8[1];
60
- var _useContext = useContext(BizGlobalDataContext),
61
- currentApp = _useContext.currentApp;
62
+ var _useContext2 = useContext(BizGlobalDataContext),
63
+ currentApp = _useContext2.currentApp;
62
64
  useEffect(function () {
63
65
  if (condition === null || condition === void 0 ? void 0 : condition.typeId) {
64
66
  queryBizDataAttrList(condition === null || condition === void 0 ? void 0 : condition.typeId);
@@ -123,7 +125,7 @@ var DataAttribute = function DataAttribute(props) {
123
125
  });
124
126
  switch (operate.propType) {
125
127
  case 1:
126
- setMasterList(typeList['cont-string']);
128
+ setMasterList(basicConfig && basicConfig.openRegexp ? stringOperate1 : typeList['cont-string']);
127
129
  condition.attrs[index].attrType = 'cont-string';
128
130
  setQueryValueObj({
129
131
  keyword: '',
@@ -152,7 +154,7 @@ var DataAttribute = function DataAttribute(props) {
152
154
  if (!(condition === null || condition === void 0 ? void 0 : condition.typeId)) {
153
155
  switch (operate.propType) {
154
156
  case 1:
155
- setStringOperateList(typeList['cont-string']);
157
+ setStringOperateList(basicConfig && basicConfig.openRegexp ? stringOperate1 : typeList['cont-string']);
156
158
  condition.attrs[index].attrType = 'cont-string';
157
159
  setQueryValueObj({
158
160
  keyword: '',
@@ -228,8 +230,10 @@ var DataAttribute = function DataAttribute(props) {
228
230
  },
229
231
  labelField: "name",
230
232
  keyField: "value",
233
+ overlayWidth: 120,
231
234
  onChange: onMasterListChange
232
235
  })), /*#__PURE__*/React.createElement(OperatorCondition, {
236
+ key: condition.typeId ? condition.attrs[index].attrType === 'cont-string' || condition.attrs[index].attrType === 'cont-date' ? condition.attrs[index].operator : condition.attrs[index].computeType : condition.attrs[index].attrId,
233
237
  queryValueObj: queryValueObj,
234
238
  stringOperateList: stringOperateList,
235
239
  index: index,
@@ -15,10 +15,9 @@ import BizEventSelector from '../../eventSelector';
15
15
  import RunTimesCondition from './runTimesCondition';
16
16
  import PeriodCondition from './periodCondition';
17
17
  import PropCondition from './propCondition';
18
- import { DownOutlined } from '@ant-design/icons';
19
18
  import './styles/eventCondition.less';
20
19
  import { BizUserConditionContext, classPrefix } from '..';
21
- import { Dropdown, notification, Space } from 'antd';
20
+ import { Button, notification } from 'antd';
22
21
  import TimeDimension from './timeDimension';
23
22
  import { Tooltip } from 'antd';
24
23
  import IconFont from '../../icon/iconFont';
@@ -28,7 +27,8 @@ import Apis from '../../constants/apis';
28
27
  var EventCondition = function EventCondition(props) {
29
28
  var _condition$timeDimens2, _condition$timeDimens3;
30
29
  var _useContext = useContext(BizUserConditionContext),
31
- isRealTime = _useContext.isRealTime;
30
+ isRealTime = _useContext.isRealTime,
31
+ realTimeTags = _useContext.realTimeTags;
32
32
  var _useContext2 = useContext(BizGlobalDataContext),
33
33
  currentUser = _useContext2.currentUser,
34
34
  currentApp = _useContext2.currentApp;
@@ -66,7 +66,7 @@ var EventCondition = function EventCondition(props) {
66
66
  }]
67
67
  }));
68
68
  }
69
- var onClick = function onClick(_ref) {
69
+ var _onClick = function onClick(_ref) {
70
70
  var key = _ref.key;
71
71
  if (key === 'time dimension') {
72
72
  var _condition$timeDimens;
@@ -87,10 +87,6 @@ var EventCondition = function EventCondition(props) {
87
87
  }
88
88
  onChange(_objectSpread({}, condition));
89
89
  };
90
- var items = [{
91
- label: '时间维度',
92
- key: 'time dimension'
93
- }];
94
90
  function onTimeDimensionChange(condition) {
95
91
  onChange(_objectSpread({}, condition));
96
92
  }
@@ -202,21 +198,17 @@ var EventCondition = function EventCondition(props) {
202
198
  }, /*#__PURE__*/React.createElement(IconFont, {
203
199
  type: "qingchu"
204
200
  }))));
205
- }), condition && !(eventRemovedList === null || eventRemovedList === void 0 ? void 0 : eventRemovedList.includes(condition.eventId)) && ((_condition$timeDimens3 = condition.timeDimensions) === null || _condition$timeDimens3 === void 0 ? void 0 : _condition$timeDimens3.length) < 3 && ((currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 0 || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 2) ? /*#__PURE__*/React.createElement("div", {
206
- style: {
207
- margin: '2px 0 0 38px',
208
- color: '#4075fd',
209
- fontSize: '12px'
210
- }
211
- }, /*#__PURE__*/React.createElement(Dropdown, {
212
- menu: {
213
- items: items,
214
- onClick: onClick
215
- }
216
- }, /*#__PURE__*/React.createElement("a", {
217
- onClick: function onClick(e) {
218
- return e.preventDefault();
219
- }
220
- }, /*#__PURE__*/React.createElement(Space, null, "\u9AD8\u7EA7\u7B5B\u9009", /*#__PURE__*/React.createElement(DownOutlined, null))))) : null);
201
+ }), condition && !(eventRemovedList === null || eventRemovedList === void 0 ? void 0 : eventRemovedList.includes(condition.eventId)) && ((_condition$timeDimens3 = condition.timeDimensions) === null || _condition$timeDimens3 === void 0 ? void 0 : _condition$timeDimens3.length) < 3 && ((currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 0 || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType) === 2) && realTimeTags !== true ? /*#__PURE__*/React.createElement(Button, {
202
+ className: "".concat(classPrefix, "-event-condition-time"),
203
+ type: "dashed",
204
+ onClick: function onClick() {
205
+ return _onClick({
206
+ key: 'time dimension'
207
+ });
208
+ },
209
+ icon: /*#__PURE__*/React.createElement(IconFont, {
210
+ type: "tianjia1"
211
+ })
212
+ }, "\u65F6\u95F4\u7EF4\u5EA6") : null);
221
213
  };
222
214
  export default EventCondition;
@@ -7,5 +7,8 @@ export interface RunPeriodConditionPropsI extends AllConditionBasePropsI<any> {
7
7
  dataId: number;
8
8
  condition: BizUserConditionT.BusinessCondition;
9
9
  }
10
- declare const RunPeriodCondition: React.FC<RunPeriodConditionPropsI>;
10
+ type FCWithDefaultProps<P> = React.FC<P> & {
11
+ defaultProps?: Partial<P>;
12
+ };
13
+ declare const RunPeriodCondition: FCWithDefaultProps<RunPeriodConditionPropsI>;
11
14
  export default RunPeriodCondition;
@@ -7,5 +7,8 @@ export interface PeriodConditionPropsI extends AllConditionBasePropsI<RunPeriodI
7
7
  runPeriod: RunPeriodI;
8
8
  isRealTime?: boolean;
9
9
  }
10
- declare const PeriodCondition: React.FC<PeriodConditionPropsI>;
10
+ type FCWithDefaultProps<P> = React.FC<P> & {
11
+ defaultProps?: Partial<P>;
12
+ };
13
+ declare const PeriodCondition: FCWithDefaultProps<PeriodConditionPropsI>;
11
14
  export default PeriodCondition;
@@ -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,