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