@zgfe/business-lib 1.2.57 → 1.2.58-ljy.0

package/es/hooks/useBizStore.d.ts

@@ -1,15 +1,13 @@
 import { UserTagsSelectorTypes } from '../userTagsSelector/types';
 import { UserGroupTypes } from '../userGroup/types';
-import { AppInfoProps } from '../context';
-declare function useBizStore({ currentApp }: {
-    currentApp: AppInfoProps;
-}): {
+declare function useBizStore(appId: any): {
     eventGroupList?: import("../attributeSelector/types").EventGroup[] | undefined;
     userPropList?: import("../attributeSelector/types").UserProp[] | undefined;
     envPropList?: import("../attributeSelector/types").EnvProp[] | undefined;
     eventNameMap?: Record<string, import("../attributeSelector/types").AnalysisEvent> | undefined;
     eventIdMap?: Record<number, import("../attributeSelector/types").AnalysisEvent> | undefined;
     useBizStoreLoading: boolean;
+    setUseBizStoreLoading: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     groupLoading: boolean;
     userGroupList: UserGroupTypes.Group[];
     tagList: UserTagsSelectorTypes.Tag[];

package/es/hooks/useBizStore.js

@@ -14,8 +14,7 @@ import { useEffect, useState, useCallback } from 'react';
 import { ajax } from '../utils';
 import Apis from '../constants/apis';
 import convertAttributeData from '../attributeSelector/util';
-function useBizStore(_ref) {
-  var currentApp = _ref.currentApp;
+function useBizStore(appId) {
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     userGroupList = _useState2[0],
@@ -63,7 +62,7 @@ function useBizStore(_ref) {
     _useState24 = _slicedToArray(_useState23, 2),
     store = _useState24[0],
     setStore = _useState24[1];
-  var _useState25 = useState(false),
+  var _useState25 = useState(true),
     _useState26 = _slicedToArray(_useState25, 2),
     useBizStoreLoading = _useState26[0],
     setUseBizStoreLoading = _useState26[1];
@@ -72,7 +71,7 @@ function useBizStore(_ref) {
     ajax(Apis.queryUserGroup, {
       method: 'post',
       data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        appId: appId,
         platform: 0,
         includeDefault: true,
         includeToday: true
@@ -83,13 +82,13 @@ function useBizStore(_ref) {
     }).finally(function () {
       setGroupLoading(false);
     });
-  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
+  }, [appId]);
   var queryTags = useCallback(function () {
     setTagLoading(true);
     ajax(Apis.queryAllTags, {
       method: 'post',
       data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        appId: appId,
         platform: 0
       }
     }).then(function (res) {
@@ -98,13 +97,13 @@ function useBizStore(_ref) {
     }).finally(function () {
       setTagLoading(false);
     });
-  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
+  }, [appId]);
   var loadEvents = useCallback(function () {
     setLoadEvent(true);
     ajax('/zg/web/v2/data/queryEventMetasOfGroup', {
       method: 'post',
       data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        appId: appId,
         platform: 0,
         isAll: true
       }
@@ -112,33 +111,33 @@ function useBizStore(_ref) {
       setEventGroups(res.data);
       setLoadEvent(false);
     });
-  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
+  }, [appId]);
   var loadUserProps = useCallback(function () {
     setLoadUsers(true);
     ajax('/zg/web/v2/appusergroup/getUserPropMeta', {
       method: 'post',
       data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        appId: appId,
         platform: 0
       }
     }).then(function (res) {
       setUserProps(res.data);
       setLoadUsers(false);
     });
-  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
+  }, [appId]);
   var loadEnvList = useCallback(function () {
     setLoadEnv(true);
     ajax('/zg/web/v2/appusergroup/getEventEnvData', {
       method: 'post',
       data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        appId: appId,
         platform: 0
       }
     }).then(function (res) {
       setEnvList(res.data.eventEnv);
       setLoadEnv(false);
     });
-  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
+  }, [appId]);
   useEffect(function () {
     if (loadEnv || loadEvent || loadUsers) return;
     setStore(convertAttributeData({
@@ -152,13 +151,12 @@ function useBizStore(_ref) {
     setUseBizStoreLoading(false);
   }, [loadEvent, loadEnv, loadUsers, groupLoading, tagLoading]);
   useEffect(function () {
-    if (!currentApp || !currentApp.appId) return;
+    if (!appId) return;
     setTimer(function (pre) {
       if (pre) {
         clearTimeout(pre);
       }
       return setTimeout(function () {
-        setUseBizStoreLoading(true);
         queryGroups();
         queryTags();
         loadUserProps();
@@ -166,9 +164,10 @@ function useBizStore(_ref) {
         loadEnvList();
       }, 300);
     });
-  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
+  }, [appId]);
   return _objectSpread({
     useBizStoreLoading: useBizStoreLoading,
+    setUseBizStoreLoading: setUseBizStoreLoading,
     groupLoading: groupLoading,
     userGroupList: userGroupList,
     tagList: tagList,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.2.57",
+  "version": "1.2.58-ljy.0",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -55,7 +55,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "4fdc32d7c56bb2d3fea8c75f75b937434c89234f",
+  "gitHead": "9e631587e01af190d42323d48d2158f04149afca",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }