@zgfe/modules-settings 1.2.20-role.14 → 1.2.20-role.15
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.
|
@@ -44,14 +44,18 @@ var SetDataRangeDialog = function SetDataRangeDialog(props) {
|
|
|
44
44
|
_useState12 = _slicedToArray(_useState11, 2),
|
|
45
45
|
loadUsers = _useState12[0],
|
|
46
46
|
setLoadUsers = _useState12[1];
|
|
47
|
-
var _useState13 = useState(
|
|
47
|
+
var _useState13 = useState([]),
|
|
48
|
+
_useState14 = _slicedToArray(_useState13, 2),
|
|
49
|
+
tagsGroup = _useState14[0],
|
|
50
|
+
setTagsGroup = _useState14[1];
|
|
51
|
+
var _useState15 = useState({
|
|
48
52
|
eventGroupList: [],
|
|
49
53
|
userPropList: [],
|
|
50
54
|
eventEnvList: []
|
|
51
55
|
}),
|
|
52
|
-
|
|
53
|
-
newStore =
|
|
54
|
-
setStore =
|
|
56
|
+
_useState16 = _slicedToArray(_useState15, 2),
|
|
57
|
+
newStore = _useState16[0],
|
|
58
|
+
setStore = _useState16[1];
|
|
55
59
|
useEffect(function () {
|
|
56
60
|
// 请求下拉数据
|
|
57
61
|
initData();
|
|
@@ -60,6 +64,7 @@ var SetDataRangeDialog = function SetDataRangeDialog(props) {
|
|
|
60
64
|
loadUserProps(currentSelectAppInfo.app_id);
|
|
61
65
|
loadEvents(currentSelectAppInfo.app_id);
|
|
62
66
|
loadEnvList(currentSelectAppInfo.app_id);
|
|
67
|
+
queryGroupTags(currentSelectAppInfo);
|
|
63
68
|
};
|
|
64
69
|
function loadUserProps(appId) {
|
|
65
70
|
setLoadUsers(true);
|
|
@@ -107,6 +112,18 @@ var SetDataRangeDialog = function SetDataRangeDialog(props) {
|
|
|
107
112
|
setLoadEnv(false);
|
|
108
113
|
});
|
|
109
114
|
}
|
|
115
|
+
function queryGroupTags(appInfo) {
|
|
116
|
+
ajax('/zg/web/v2/v4/userGroup/label/list', {
|
|
117
|
+
method: 'post',
|
|
118
|
+
data: {
|
|
119
|
+
appId: appInfo === null || appInfo === void 0 ? void 0 : appInfo.app_id,
|
|
120
|
+
platform: (appInfo === null || appInfo === void 0 ? void 0 : appInfo.platform) || 0
|
|
121
|
+
}
|
|
122
|
+
}).then(function (res) {
|
|
123
|
+
if (!res) return;
|
|
124
|
+
setTagsGroup(res.data);
|
|
125
|
+
});
|
|
126
|
+
}
|
|
110
127
|
useEffect(function () {
|
|
111
128
|
if (loadEnv || loadEvent || loadUsers) return;
|
|
112
129
|
var newStore = convertAttributeData({
|
|
@@ -132,6 +149,7 @@ var SetDataRangeDialog = function SetDataRangeDialog(props) {
|
|
|
132
149
|
openBusinessDataCondition: true,
|
|
133
150
|
openOrderDataCondition: true,
|
|
134
151
|
openTagCondition: true,
|
|
152
|
+
userTagsData: tagsGroup,
|
|
135
153
|
defaultValue: currentJson,
|
|
136
154
|
onChange: onChangeCondition,
|
|
137
155
|
orConditionNum: 3,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/modules-settings",
|
|
3
|
-
"version": "1.2.20-role.
|
|
3
|
+
"version": "1.2.20-role.15",
|
|
4
4
|
"module": "es/index.js",
|
|
5
5
|
"typings": "es/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -27,6 +27,7 @@
|
|
|
27
27
|
]
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
+
"@zgfe/business-lib": "^1.1.95",
|
|
30
31
|
"father": "^4.1.7",
|
|
31
32
|
"react": "^16.12.0 || ^17.0.0",
|
|
32
33
|
"react-router-dom": "^6.8.2"
|
|
@@ -51,7 +52,7 @@
|
|
|
51
52
|
"umi-request": "^1.4.0",
|
|
52
53
|
"yorkie": "^2.0.0"
|
|
53
54
|
},
|
|
54
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "3fbe3982af15867d77167a38c7b8f152e8a579d6",
|
|
55
56
|
"gitHooks": {
|
|
56
57
|
"pre-commit": "lint-staged"
|
|
57
58
|
}
|