@zgfe/modules-settings 1.2.2 → 1.2.3-alpha.1

package/es/constants/api.js

@@ -2,13 +2,13 @@ var apiPrefix = '/analysis/api'; // node服务api接口前缀
 var apis = {
   // new
   user: {
-    getCurrentUser: apiPrefix + '/common/proxy/company/currentUser.jsp'
+    getCurrentUser: '/zg/web/v2/company/currentUser'
   },
   app: {
     queryLeftMenus: apiPrefix + '/common/proxy/index/getLeftMenusByAppId.jsp',
     deleteApp: apiPrefix + '/common/proxy/user/deleteApp.jsp',
     createApp: apiPrefix + '/system/createApp',
-    queryAppList: apiPrefix + '/common/proxy/data/v2ajaxGetDataByApp.jsp',
+    queryAppList: '/zg/web/v2/data/v2ajaxGetDataByApp',
     queryPackageInfo: apiPrefix + '/system/packageInfo',
     queryVirtualApps: apiPrefix + '/common/proxy/user/sourceApp.jsp',
     getCompanyAppList: apiPrefix + '/common/proxy/user/getCompanyAppList.jsp',
@@ -47,7 +47,7 @@ var apis = {
     editNoticeConfig: apiPrefix + '/systemSettings/setNoticeSettings'
   },
   eventMeta: {
-    queryEventMeta: apiPrefix + '/common/proxy/data/queryEventMetasOfGroup.jsp'
+    queryEventMeta: '/zg/web/v2/data/queryEventMetasOfGroup'
   },
   // 多因子认证
   mfa: {

package/es/modules/appSettings/member/index.js

@@ -125,7 +125,8 @@ var AppMember = function AppMember() {
     request(apis.app.queryAppList, {
       method: 'get'
     }).then(function (res) {
-      setCompanyAppList((res === null || res === void 0 ? void 0 : res.applist) || []);
+      var _res$data;
+      setCompanyAppList((res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.appList) || []);
     });
     // 请求左侧菜单
     request(apis.app.queryLeftMenus, {

package/es/modules/companySetting/index.js

@@ -161,7 +161,8 @@ var CompanySetting = function CompanySetting(props) {
     request(api.user.getCurrentUser, {
       method: 'get'
     }).then(function (res) {
-      var data = (res || {}).user;
+      var _res$data;
+      var data = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.user;
       if (!data) return;
       data.isCreator = data.id === data.userId;
       data.isDemoAccount = data.email === 'demo@zhugeio.com';
@@ -179,16 +180,16 @@ var CompanySetting = function CompanySetting(props) {
       request(api.app.queryAppList, {
         method: 'get'
       }).then(function (res) {
-        setCompanyAppList(res && res.applist || []);
+        setCompanyAppList(res && res.data.appList || []);
         if (settingCurrentUser && authConfig && authConfig.dataAuth) {
           var appIds = authConfig.dataAuth.map(function (item) {
             return item.appId;
           });
           if (appIds.includes(0) || isAdmin) {
-            setAppList(res && res.applist || []);
+            setAppList(res && res.data.appList || []);
           } else {
             var result = [];
-            res && res.applist && res.applist.forEach(function (item) {
+            res && res.data.appList && res.data.appList.forEach(function (item) {
               if (appIds.includes(item.id)) {
                 result.push(item);
               }
@@ -196,7 +197,7 @@ var CompanySetting = function CompanySetting(props) {
             setAppList(result);
           }
         } else {
-          setAppList(res && res.applist || []);
+          setAppList(res && res.data.appList || []);
         }
         apisOkNum += 1;
         setPageReady(apisOkNum);

package/es/modules/companySetting/virtualApp/index.js

@@ -87,10 +87,6 @@ var VirtualApp = function VirtualApp(props) {
       setVirtualAppList(list);
       setVirtualAppsIdMap(idMap);
       setReady(true);
-      // context.commit(mutations.virtualApp.updateVirtualApps, {
-      //   list,
-      //   idMap
-      // })
     }).catch(function (err) {
       notification.error({
         message: '查询虚拟应用失败'

package/es/modules/companySetting/virtualApp/panels/sourceItem.js

@@ -52,7 +52,7 @@ var VirtualApp = function VirtualApp(props) {
       selfRequest(api.eventMeta.queryEventMeta, {
         method: 'post',
         data: {
-          app_id: sourceAppId,
+          appId: sourceAppId,
           plat: 0
         }
       }).then(function (res) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.2",
+  "version": "1.2.3-alpha.1",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -51,7 +51,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "a648c5ef08952efbed317ca5b82d8baf87a8e7b2",
+  "gitHead": "b445a1cbce82a1059bd87c069b813ea25452bbab",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }