@zgfe/modules-settings 1.2.2-node.0 → 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

@@ -39,16 +39,12 @@ var AppMember = function AppMember() {
     setLeftMenus = _useState10[1];
   var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    isMarsUi = _useState12[0],
-    setIsMarsUi = _useState12[1];
-  var _useState13 = useState(false),
+    isModalOpen = _useState12[0],
+    setIsModalOpen = _useState12[1];
+  var _useState13 = useState({}),
     _useState14 = _slicedToArray(_useState13, 2),
-    isModalOpen = _useState14[0],
-    setIsModalOpen = _useState14[1];
-  var _useState15 = useState({}),
-    _useState16 = _slicedToArray(_useState15, 2),
-    modalData = _useState16[0],
-    setModalData = _useState16[1];
+    modalData = _useState14[0],
+    setModalData = _useState14[1];
   var setingModalhandle = function setingModalhandle(data, dealArr) {
     setModalData({
       data: data,
@@ -129,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, {
@@ -196,7 +193,6 @@ var AppMember = function AppMember() {
     setIsModalOpen: setIsModalOpen,
     companyAppList: companyAppList,
     leftMenus: leftMenus,
-    isMarsUi: isMarsUi,
     data: modalData.data,
     dealArr: modalData.dealArr
   }));

package/es/modules/appSettings/member/modal.d.ts

@@ -7,7 +7,6 @@ declare const SetingModal: React.FC<{
     data: any;
     companyAppList: AppListItem[];
     leftMenus: LeftMenusItem[];
-    isMarsUi: boolean;
     dealArr: any;
 }>;
 export default SetingModal;

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

@@ -11,7 +11,6 @@ var SetingModal = function SetingModal(props) {
     data = props.data,
     companyAppList = props.companyAppList,
     leftMenus = props.leftMenus,
-    isMarsUi = props.isMarsUi,
     dealArr = props.dealArr;
   return /*#__PURE__*/React.createElement(Modal, {
     className: "seting-modal-box",
@@ -30,7 +29,6 @@ var SetingModal = function SetingModal(props) {
     authConfig: data.authConfig.defaultAuth,
     companyAppList: companyAppList,
     leftMenus: leftMenus,
-    isMarsUi: isMarsUi,
     id: data.id,
     type: 1,
     serviceType: currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType
@@ -44,7 +42,6 @@ var SetingModal = function SetingModal(props) {
       key: item.id,
       authConfig: item.authConfig,
       leftMenus: leftMenus,
-      isMarsUi: isMarsUi,
       companyAppList: companyAppList,
       name: item === null || item === void 0 ? void 0 : item.groupName,
       groupId: item.id,
@@ -57,7 +54,6 @@ var SetingModal = function SetingModal(props) {
       funAuth: []
     },
     leftMenus: leftMenus,
-    isMarsUi: isMarsUi,
     companyAppList: companyAppList,
     name: '',
     type: 2,

package/es/modules/companySetting/edit/authConfig.d.ts

@@ -4,7 +4,6 @@ import { AppListItem, Config, LeftMenusItem } from '../../../types';
 declare const Info: React.FC<{
     config: Config;
     appList: Array<AppListItem>;
-    isMarsUi: boolean;
     leftMenus: LeftMenusItem[];
     ref: any;
 }>;

package/es/modules/companySetting/edit/authConfig.js

@@ -12,7 +12,6 @@ import AuthGroup from './authGroup';
 var Info = /*#__PURE__*/forwardRef(function (props, ref) {
   var config = props.config,
     appList = props.appList,
-    isMarsUi = props.isMarsUi,
     leftMenus = props.leftMenus;
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
@@ -59,7 +58,7 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
         console.log('functionalPermissions');
         if (functionalPermissions.checked) {
           funAuth.push({
-            resource: funPermissions[isMarsUi ? 'mars' : 'standard'].all.key,
+            resource: funPermissions['standard'].all.key,
             opts: [constants.functionOpts.all]
           });
           functionalPermissions.children && functionalPermissions.children.forEach(function (item) {
@@ -201,7 +200,7 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
     console.log(map);
     // 顶部菜单功能权限
     var loopFormatTopMenu = function loopFormatTopMenu(topMenu, checkAll) {
-      var menuFunPerConstants = funPermissions[isMarsUi ? 'mars' : 'standard'][topMenu.name];
+      var menuFunPerConstants = funPermissions['standard'][topMenu.name];
       // 菜单不在权限配置中
       if (!menuFunPerConstants) {
         return null;
@@ -259,7 +258,7 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
       return formatMenu;
     };
     var menuFun = [];
-    var isAll = !!map[funPermissions[isMarsUi ? 'mars' : 'standard'].all.key];
+    var isAll = !!map[funPermissions['standard'].all.key];
     console.log('dskfhk', leftMenus);
     leftMenus.forEach(function (menu) {
       var topMenuFun = loopFormatTopMenu(menu, isAll);
@@ -270,29 +269,29 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
         menuFun.push(topMenuFun);
       }
     });
-    var settingIsAll = !!map[funPermissions[isMarsUi ? 'mars' : 'standard'].setting.default.key];
+    var settingIsAll = !!map[funPermissions['standard'].setting.default.key];
     menuFun.push({
-      describe: funPermissions[isMarsUi ? 'mars' : 'standard'].setting.default.describe,
-      key: funPermissions[isMarsUi ? 'mars' : 'standard'].setting.default.key,
-      checked: isAll || !!map[funPermissions[isMarsUi ? 'mars' : 'standard'].setting.default.key],
+      describe: funPermissions['standard'].setting.default.describe,
+      key: funPermissions['standard'].setting.default.key,
+      checked: isAll || !!map[funPermissions['standard'].setting.default.key],
       indeterminate: false,
       disable: false,
       supportVirtualApp: true,
       children: [{
-        // ...funPermissions[isMarsUi ? 'mars' : 'standard'].setting.company,
-        describe: funPermissions[isMarsUi ? 'mars' : 'standard'].setting.company.describe,
-        key: funPermissions[isMarsUi ? 'mars' : 'standard'].setting.company.key,
+        // ...funPermissions['standard'].setting.company,
+        describe: funPermissions['standard'].setting.company.describe,
+        key: funPermissions['standard'].setting.company.key,
         disable: false,
         supportVirtualApp: true,
-        checked: isAll || settingIsAll || !!map[funPermissions[isMarsUi ? 'mars' : 'standard'].setting.company.key],
+        checked: isAll || settingIsAll || !!map[funPermissions['standard'].setting.company.key],
         children: []
       }, {
-        // ...funPermissions[isMarsUi ? 'mars' : 'standard'].setting.app,
-        describe: funPermissions[isMarsUi ? 'mars' : 'standard'].setting.app.describe,
-        key: funPermissions[isMarsUi ? 'mars' : 'standard'].setting.app.key,
+        // ...funPermissions['standard'].setting.app,
+        describe: funPermissions['standard'].setting.app.describe,
+        key: funPermissions['standard'].setting.app.key,
         disable: false,
         supportVirtualApp: true,
-        checked: isAll || settingIsAll || !!map[funPermissions[isMarsUi ? 'mars' : 'standard'].setting.app.key],
+        checked: isAll || settingIsAll || !!map[funPermissions['standard'].setting.app.key],
         children: []
       }]
     });
@@ -305,8 +304,8 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
     console.log(menuFun);
     setFunctionalPermissions({
       describe: '功能权限',
-      key: funPermissions[isMarsUi ? 'mars' : 'standard'].all.key,
-      // checked: !!map[funPermissions[isMarsUi ? 'mars' : 'standard'].all.key],
+      key: funPermissions['standard'].all.key,
+      // checked: !!map[funPermissions['standard'].all.key],
       checked: checkedArr.length === menuFun.length,
       disable: false,
       supportVirtualApp: true,

package/es/modules/companySetting/edit/authConfigCEP.d.ts

@@ -2,7 +2,6 @@ import React from 'react';
 import './styles/authConfig.less';
 import { CheckAll, DataListItem } from '../../../types';
 declare const AuthConfigCEP: React.FC<{
-    isMarsUi: boolean;
     CEPData: [Array<DataListItem>, Array<DataListItem>, CheckAll];
     ref: any;
 }>;

package/es/modules/companySetting/edit/authConfigCEP.js

@@ -16,8 +16,7 @@ import constants from './../../../utils/constants';
 import funPermissions from './../../../utils/functionalPermissions';
 import AuthGroup from './authGroup';
 var AuthConfigCEP = /*#__PURE__*/forwardRef(function (props, ref) {
-  var isMarsUi = props.isMarsUi,
-    CEPData = props.CEPData;
+  var CEPData = props.CEPData;
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     dataPermissions = _useState2[0],
@@ -169,8 +168,8 @@ var AuthConfigCEP = /*#__PURE__*/forwardRef(function (props, ref) {
     });
     setFunctionalPermissions({
       describe: '功能权限',
-      key: funPermissions[isMarsUi ? 'mars' : 'standard'].all.key,
-      // checked: !!map[funPermissions[isMarsUi ? 'mars' : 'standard'].all.key],
+      key: funPermissions['standard'].all.key,
+      // checked: !!map[funPermissions['standard'].all.key],
       checked: checkedFunArr.length === dealFunConfigList.length,
       disable: false,
       supportVirtualApp: true,
@@ -187,7 +186,7 @@ var AuthConfigCEP = /*#__PURE__*/forwardRef(function (props, ref) {
     setDataPermissions({
       key: 1,
       describe: '数据权限',
-      // checked: !!map[funPermissions[isMarsUi ? 'mars' : 'standard'].all.key],
+      // checked: !!map[funPermissions['standard'].all.key],
       checked: checkedAppArr.length === dealAppConfigList.length,
       indeterminate: !(checkedAppArr.length === dealAppConfigList.length || !checkedAppArr.length && !indeterminateAppArr.length),
       children: dealAppConfigList

package/es/modules/companySetting/edit/user.d.ts

@@ -6,7 +6,6 @@ declare const Info: React.FC<{
     data: AllMembersItem;
     allGroupInfos: Array<AllGroupInfosItem>;
     companyAppList: AppListItem[];
-    isMarsUi: boolean;
     leftMenus: LeftMenusItem[];
     serviceType: number;
     onCancel: () => void;

package/es/modules/companySetting/edit/user.js

@@ -23,7 +23,6 @@ var Info = function Info(props) {
     data = props.data,
     allGroupInfos = props.allGroupInfos,
     companyAppList = props.companyAppList,
-    isMarsUi = props.isMarsUi,
     leftMenus = props.leftMenus,
     serviceType = props.serviceType,
     onCancel = props.onCancel,
@@ -277,15 +276,13 @@ var Info = function Info(props) {
     ref: refAuthConfig,
     config: data.authConfig ? data.authConfig.defaultAuth : {},
     appList: companyAppList,
-    isMarsUi: isMarsUi,
     leftMenus: leftMenus
   })) : null, !serviceType || serviceType === 2 ? /*#__PURE__*/React.createElement(Tabs.TabPane, {
     tab: "CEP",
     key: "cep"
   }, /*#__PURE__*/React.createElement(AuthConfigCEP, {
     ref: refAuthCEPConfig,
-    CEPData: CEPData,
-    isMarsUi: isMarsUi
+    CEPData: CEPData
   })) : null), /*#__PURE__*/React.createElement("div", {
     className: "company-setting-footer"
   }, /*#__PURE__*/React.createElement(Button, {

package/es/modules/companySetting/edit/userGroup.d.ts

@@ -6,7 +6,6 @@ declare const CompanySettingUserGroup: React.FC<{
     data: AllGroupInfosItem | undefined;
     allGroupInfos: Array<AllGroupInfosItem>;
     companyAppList: AppListItem[];
-    isMarsUi: boolean;
     leftMenus: LeftMenusItem[];
     isAdmin: boolean;
     serviceType: number;

package/es/modules/companySetting/edit/userGroup.js

@@ -24,7 +24,6 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
     data = props.data,
     allGroupInfos = props.allGroupInfos,
     companyAppList = props.companyAppList,
-    isMarsUi = props.isMarsUi,
     leftMenus = props.leftMenus,
     isAdmin = props.isAdmin,
     serviceType = props.serviceType,
@@ -353,17 +352,13 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
     ref: refAuthConfig,
     config: data && data.authConfig || {},
     appList: companyAppList,
-    isMarsUi: isMarsUi,
     leftMenus: leftMenus
   })) : null, !serviceType || serviceType === 2 ? /*#__PURE__*/React.createElement(Tabs.TabPane, {
     tab: "CEP",
     key: "cep"
   }, /*#__PURE__*/React.createElement(AuthConfigCEP, {
     ref: refAuthCEPConfig,
-    CEPData: CEPData,
-    // config={data.authConfig}
-    // appList={companyAppList}
-    isMarsUi: isMarsUi
+    CEPData: CEPData
   })) : null), /*#__PURE__*/React.createElement("div", {
     className: "company-setting-footer"
   }, /*#__PURE__*/React.createElement(Button, {

package/es/modules/companySetting/index.js

@@ -36,7 +36,6 @@ var CompanySetting = function CompanySetting(props) {
     envs = _useContext.envs;
   var _ref = envs || {},
     zgText = _ref.zgText,
-    isMarsUi = _ref.isMarsUi,
     showVirtualApp = _ref.showVirtualApp,
     showDataDaily = _ref.showDataDaily,
     ENVIRONMENT = _ref.ENVIRONMENT;
@@ -162,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';
@@ -180,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);
               }
@@ -197,7 +197,7 @@ var CompanySetting = function CompanySetting(props) {
             setAppList(result);
           }
         } else {
-          setAppList(res && res.applist || []);
+          setAppList(res && res.data.appList || []);
         }
         apisOkNum += 1;
         setPageReady(apisOkNum);
@@ -640,7 +640,7 @@ var CompanySetting = function CompanySetting(props) {
       companyName: companyName,
       changeCompanyNameCallback: changeCompanyNameCallback
     }),
-    hidden: isMarsUi
+    hidden: false
   }, {
     key: 'userGroup',
     label: '用户组',
@@ -649,13 +649,12 @@ var CompanySetting = function CompanySetting(props) {
       companyAppList: companyAppList,
       allGroupInfos: allGroupInfos,
       leftMenus: leftMenus,
-      isMarsUi: isMarsUi,
       isAdmin: isAdmin,
       delGroupCallback: delGroupCallback,
       updateGroupAuthCallback: updateGroupAuthCallback,
       serviceType: serviceType
     }),
-    hidden: isMarsUi
+    hidden: false
   }, {
     key: 'user',
     label: '用户',
@@ -667,7 +666,6 @@ var CompanySetting = function CompanySetting(props) {
       companyAppList: companyAppList,
       allGroupInfos: allGroupInfos,
       leftMenus: leftMenus,
-      isMarsUi: isMarsUi,
       removeUserCallback: removeUserCallback,
       changeUserAuthCallback: changeUserAuthCallback,
       createMembersCallback: createMembersCallback,
@@ -675,7 +673,7 @@ var CompanySetting = function CompanySetting(props) {
       isAdmin: isAdmin,
       serviceType: serviceType
     }),
-    hidden: isMarsUi
+    hidden: false
   }, {
     key: 'appList',
     label: '应用',
@@ -696,7 +694,7 @@ var CompanySetting = function CompanySetting(props) {
       gotoAppPanel: gotoAppPanel,
       closeCreateCallback: closeCreateCallback
     }),
-    hidden: isMarsUi
+    hidden: false
   }, {
     key: 'virtualApp',
     label: '虚拟应用',
@@ -709,7 +707,7 @@ var CompanySetting = function CompanySetting(props) {
       delVirtualAppCallback: delVirtualAppCallback,
       editVirtualAppCallback: editVirtualAppCallback
     }),
-    hidden: !showVirtualApp || isMarsUi
+    hidden: !showVirtualApp
   }, {
     key: 'cost',
     label: '套餐',
@@ -718,7 +716,7 @@ var CompanySetting = function CompanySetting(props) {
       companyAppList: companyAppList,
       companyId: companyId
     }),
-    hidden: isMarsUi
+    hidden: false
   }, {
     key: 'weChatBinding',
     label: '微信账号绑定',

package/es/modules/companySetting/user/index.d.ts

@@ -10,7 +10,6 @@ declare const User: React.FC<{
     groupHashList: GroupHashList;
     companyAppList: AppListItem[];
     leftMenus: LeftMenusItem[];
-    isMarsUi: boolean;
     isAdmin: boolean;
     serviceType: number;
     removeUserCallback: (delIndex: number) => void;

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

@@ -28,7 +28,6 @@ var User = function User(props) {
     groupHashList = props.groupHashList,
     companyAppList = props.companyAppList,
     leftMenus = props.leftMenus,
-    isMarsUi = props.isMarsUi,
     isAdmin = props.isAdmin,
     serviceType = props.serviceType,
     removeUserCallback = props.removeUserCallback,
@@ -385,7 +384,6 @@ var User = function User(props) {
             authConfig: data.authConfig ? data.authConfig.defaultAuth : {},
             companyAppList: companyAppList,
             leftMenus: leftMenus,
-            isMarsUi: isMarsUi,
             id: data.id,
             type: 1,
             serviceType: serviceType
@@ -402,7 +400,6 @@ var User = function User(props) {
               key: item.id,
               authConfig: item.authConfig ? item.authConfig : {},
               leftMenus: leftMenus,
-              isMarsUi: isMarsUi,
               companyAppList: companyAppList,
               name: item.groupName,
               groupId: item.id,
@@ -415,7 +412,6 @@ var User = function User(props) {
               funAuth: []
             },
             leftMenus: leftMenus,
-            isMarsUi: isMarsUi,
             companyAppList: companyAppList,
             name: '',
             type: 2,
@@ -471,7 +467,6 @@ var User = function User(props) {
     onCancel: function onCancel() {
       return setUserEditAuthState(false);
     },
-    isMarsUi: isMarsUi,
     leftMenus: leftMenus,
     changeUserAuthCallback: function changeUserAuthCallback(id) {
       getMenbers();

package/es/modules/companySetting/userGroup/authConfigDetail.d.ts

@@ -6,7 +6,6 @@ declare const authConfigDetail: React.FC<{
     authConfig: Config;
     companyAppList: AppListItem[];
     leftMenus: LeftMenusItem[];
-    isMarsUi: boolean;
     id?: number;
     groupId?: number;
     type: number;

package/es/modules/companySetting/userGroup/authConfigDetail.js

@@ -24,7 +24,6 @@ var authConfigDetail = function authConfigDetail(props) {
     authConfig = props.authConfig,
     companyAppList = props.companyAppList,
     leftMenus = props.leftMenus,
-    isMarsUi = props.isMarsUi,
     id = props.id,
     groupId = props.groupId,
     type = props.type,
@@ -141,7 +140,7 @@ var authConfigDetail = function authConfigDetail(props) {
   };
   var loopFormatTopMenu = function loopFormatTopMenu(topMenu) {
     // 菜单不在权限配置中
-    if (!functionalPermissions[isMarsUi ? 'mars' : 'standard'][topMenu.name]) {
+    if (!functionalPermissions['standard'][topMenu.name]) {
       return null;
     }
     var childrenArr = [];
@@ -174,7 +173,7 @@ var authConfigDetail = function authConfigDetail(props) {
     var formatMenu = {
       name: {
         describe: topMenu.nametext,
-        key: functionalPermissions[isMarsUi ? 'mars' : 'standard'][topMenu.name].key
+        key: functionalPermissions['standard'][topMenu.name].key
       },
       show: false,
       children: childrenArr
@@ -184,21 +183,21 @@ var authConfigDetail = function authConfigDetail(props) {
   var checkFunPermission = function checkFunPermission(key) {
     // 检查功能模块权限配置，true为有权限，false无权限
     if (!key) return false;
-    if (key === functionalPermissions[isMarsUi ? 'mars' : 'standard'].default.key) return true;
+    if (key === functionalPermissions['standard'].default.key) return true;
     var funAuthConfig = authConfig.funAuth;
     var funAuthKeyArr = funAuthConfig ? funAuthConfig.map(function (item) {
       return item.resource;
     }) : [];
     // 智能触达：管理员、运营人员
     if (['mkt_admin', 'mkt_ops'].includes(key)) {
-      var mktKey = functionalPermissions[isMarsUi ? 'mars' : 'standard'].market.key;
+      var mktKey = functionalPermissions['standard'].market.key;
       var mktConfig = funAuthConfig && funAuthConfig.find(function (item) {
         return item.resource === mktKey;
       });
       if (!mktConfig) return false;
       return mktConfig.opts[0] === key;
     }
-    if (funAuthKeyArr.includes(functionalPermissions[isMarsUi ? 'mars' : 'standard'].all.key)) {
+    if (funAuthKeyArr.includes(functionalPermissions['standard'].all.key)) {
       // 功能权限：全选
       return true;
     }
@@ -235,14 +234,14 @@ var authConfigDetail = function authConfigDetail(props) {
     });
     // 设置菜单
     var setting = {
-      name: functionalPermissions[isMarsUi ? 'mars' : 'standard'].setting.default,
+      name: functionalPermissions['standard'].setting.default,
       show: false,
       children: [{
-        name: functionalPermissions[isMarsUi ? 'mars' : 'standard'].setting.company,
+        name: functionalPermissions['standard'].setting.company,
         show: false,
         children: []
       }, {
-        name: functionalPermissions[isMarsUi ? 'mars' : 'standard'].setting.app,
+        name: functionalPermissions['standard'].setting.app,
         show: false,
         children: []
       }]

package/es/modules/companySetting/userGroup/groupItem.d.ts

@@ -5,7 +5,6 @@ declare const GroupItem: React.FC<{
     groupData: AllGroupInfosItem;
     companyAppList: AppListItem[];
     leftMenus: LeftMenusItem[];
-    isMarsUi: boolean;
     serviceType: number;
     showGroupEditAuthEvent: (data: AllGroupInfosItem) => void;
     delGroupCallback: (id: number) => void;

package/es/modules/companySetting/userGroup/groupItem.js

@@ -19,7 +19,6 @@ var GroupItem = function GroupItem(props) {
   var groupData = props.groupData,
     companyAppList = props.companyAppList,
     leftMenus = props.leftMenus,
-    isMarsUi = props.isMarsUi,
     serviceType = props.serviceType,
     showGroupEditAuthEvent = props.showGroupEditAuthEvent,
     delGroupCallback = props.delGroupCallback;
@@ -93,7 +92,6 @@ var GroupItem = function GroupItem(props) {
         authConfig: groupData.authConfig || {},
         companyAppList: companyAppList,
         leftMenus: leftMenus,
-        isMarsUi: isMarsUi,
         groupId: groupData.id,
         type: 2,
         serviceType: serviceType

package/es/modules/companySetting/userGroup/index.d.ts

@@ -6,7 +6,6 @@ declare const UserGroup: React.FC<{
     allGroupInfos: AllGroupInfosItem[];
     companyAppList: AppListItem[];
     leftMenus: LeftMenusItem[];
-    isMarsUi: boolean;
     isAdmin: boolean;
     serviceType: number;
     delGroupCallback: (id: number) => void;

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

@@ -17,7 +17,6 @@ var UserGroup = function UserGroup(props) {
     allGroupInfos = props.allGroupInfos,
     companyAppList = props.companyAppList,
     leftMenus = props.leftMenus,
-    isMarsUi = props.isMarsUi,
     isAdmin = props.isAdmin,
     serviceType = props.serviceType,
     delGroupCallback = props.delGroupCallback,
@@ -100,7 +99,6 @@ var UserGroup = function UserGroup(props) {
     leftMenus: leftMenus,
     isAdmin: isAdmin,
     id: id,
-    isMarsUi: isMarsUi,
     onCancel: function onCancel() {
       return setGroupEditAuthState(false);
     },
@@ -137,7 +135,6 @@ var UserGroup = function UserGroup(props) {
       showGroupEditAuthEvent: showGroupEditAuthEvent,
       companyAppList: companyAppList,
       leftMenus: leftMenus,
-      isMarsUi: isMarsUi,
       delGroupCallback: delGroupCallback,
       serviceType: serviceType
     });

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/es/modules/systemSetting/notice/index.js

@@ -13,10 +13,9 @@ import React from 'react';
 import { useState } from 'react';
 import { useEffect } from 'react';
 import apis from '../../../constants/api';
-import request from '../../../utils/ajax';
+import request, { urlRequest } from '../../../utils/ajax';
 import ConfigItem from './configItem';
 import ItemEdit from './edit';
-import { ajax } from '@zgfe/business-lib';
 var Notice = function Notice() {
   var typeMap = new Map([[1, 'email']]);
   var _useState = useState(new Map().set('email', {
@@ -65,26 +64,27 @@ var Notice = function Notice() {
     var formData = new FormData();
     formData.set('type', editSetting.type);
     formData.set('config', JSON.stringify(values));
-    ajax(apis.setting.editNoticeConfig, {
+    urlRequest(apis.setting.editNoticeConfig, {
       method: 'post',
+      // data: formData,
       data: {
         type: editSetting.type === 'email' ? 1 : null,
         config: JSON.stringify(values)
       }
     }).then(function (res) {
-      if (!res) return;
-      notification.success({
-        message: '配置成功'
-      });
-      settingMap.get(editSetting.type).config = values;
-      var newSettingMap = new Map(_toConsumableArray(settingMap));
-      setSettingMap(newSettingMap);
-      setIsEdit(false);
-    }).catch(function (err) {
-      console.error('配置失败', err);
-      notification.error({
-        message: '配置失败'
-      });
+      if ((res === null || res === void 0 ? void 0 : res.status) === 200) {
+        notification.success({
+          message: '配置成功'
+        });
+        settingMap.get(editSetting.type).config = values;
+        var newSettingMap = new Map(_toConsumableArray(settingMap));
+        setSettingMap(newSettingMap);
+        setIsEdit(false);
+      } else {
+        notification.error({
+          message: '配置失败'
+        });
+      }
     });
   };
   return /*#__PURE__*/React.createElement("div", null, isEdit ? /*#__PURE__*/React.createElement(ItemEdit, {

package/es/utils/functionalPermissions.d.ts

@@ -1,5 +1,4 @@
 declare const _default: {
-    mars: any;
     standard: any;
 };
 export default _default;

package/es/utils/functionalPermissions.js

@@ -149,22 +149,19 @@ var standard = _objectSpread({
     key: '/diypage'
   },
   user: {
-    key: '/user'
+    key: '/analysis/user'
   },
-  // cep: {
-  //   key: '/cep',
-  // },
   userList: {
-    key: '/user/userList'
+    key: '/analysis/user/userList'
   },
   userGroup: {
-    key: '/user/userGroup'
+    key: '/analysis/user/userGroup'
   },
   userPortrait: {
-    key: '/user/userPortrait'
+    key: '/analysis/user/userPortrait'
   },
   userTags: {
-    key: '/user/userTags'
+    key: '/analysis/user/userTags'
   },
   // market: {
   //   key: '/market',
@@ -222,205 +219,6 @@ var standard = _objectSpread({
     key: '/cxp/userJourney'
   }
 } : {});
-var mars = {
-  default: {
-    key: 'default' // 默认权限
-  },
-
-  all: {
-    key: '/' // 功能权限
-  },
-
-  panel: {
-    key: '/panel'
-  },
-  dataPanel: {
-    key: '/panel/dataPanel'
-  },
-  dataview: {
-    key: '/panel/dataview'
-  },
-  analysis: {
-    key: '/analysis'
-  },
-  dataV: {
-    key: '/panel/dataV'
-  },
-  crossScreen: {
-    key: '/panel/crossScreen'
-  },
-  scene: {
-    key: '/scene'
-  },
-  customScene: {
-    key: '/scene/customScene'
-  },
-  userGrowth: {
-    key: '/scene/userGrowth'
-  },
-  basic: {
-    key: '/analysis/basic'
-  },
-  wholeAnalysis: {
-    key: '/analysis/basic/wholeAnalysis'
-  },
-  retention: {
-    key: '/analysis/basic/retention'
-  },
-  source: {
-    key: '/analysis/source'
-  },
-  channel: {
-    key: '/analysis/source/channel'
-  },
-  behavior: {
-    key: '/analysis/behavior'
-  },
-  eventAnalysis: {
-    key: '/analysis/behavior/eventAnalysis'
-  },
-  page: {
-    key: '/analysis/behavior/page'
-  },
-  zgSee: {
-    key: '/analysis/behavior/zgSee'
-  },
-  conversion: {
-    key: '/analysis/conversion'
-  },
-  funnel: {
-    key: '/analysis/conversion/funnel'
-  },
-  pathAnalysis: {
-    key: '/analysis/conversion/pathAnalysis'
-  },
-  revenue: {
-    key: '/analysis/conversion/revenue'
-  },
-  stickiness: {
-    key: '/analysis/conversion/stickiness'
-  },
-  user: {
-    key: '/analysis/user'
-  },
-  cep: {
-    key: '/analysis/cep'
-  },
-  userList: {
-    key: '/analysis/user/userList'
-  },
-  userGroup: {
-    key: '/analysis/user/userGroup'
-  },
-  userPortrait: {
-    key: '/analysis/user/userPortrait'
-  },
-  custom: {
-    key: '/analysis/custom'
-  },
-  diy: {
-    key: '/analysis/custom/diy'
-  },
-  sqlQuery: {
-    key: '/analysis/custom/sqlQuery'
-  },
-  advertisement: {
-    key: '/advertisement'
-  },
-  sem: {
-    key: '/advertisement/sem'
-  },
-  digital: {
-    key: '/advertisement/digital'
-  },
-  landing: {
-    key: '/advertisement/landing'
-  },
-  wechat: {
-    key: '/wechat'
-  },
-  wxWhole: {
-    key: '/wechat/wxWhole'
-  },
-  wxMini: {
-    key: '/wechat/wxMini'
-  },
-  wxMarketing: {
-    key: '/wechat/wxMarketing'
-  },
-  wxFlow: {
-    key: '/wechat/wxFlow'
-  },
-  market: {
-    key: '/market'
-  },
-  manage: {
-    key: '/manage'
-  },
-  dataAccess: {
-    key: '/manage/dataAccess'
-  },
-  guide: {
-    key: '/manage/dataAccess/guide'
-  },
-  adChannel: {
-    key: '/manage/dataAccess/adChannel'
-  },
-  eventTracking: {
-    key: '/manage/eventTracking'
-  },
-  iteration: {
-    key: '/manage/iteration'
-  },
-  debug: {
-    key: '/manage/iteration/debug'
-  },
-  crash: {
-    key: '/manage/iteration/crash'
-  },
-  version: {
-    key: '/manage/iteration/version'
-  },
-  // 开始：zhuge 模块
-  warning: {
-    key: '/manage/warning'
-  },
-  diypage: {
-    key: '/diypage'
-  },
-  // crossScreen: {
-  //   key: '/panel/crossScreen'
-  // },
-  // scene: {
-  //   key: '/scene'
-  // },
-  // userGrowth: {
-  //   key: '/scene/userGrowth'
-  // },
-  // 结束 ：zhuge 模块
-  config: {
-    key: '/manage/config'
-  },
-  setting: {
-    default: {
-      describe: '设置',
-      key: '/setting'
-    },
-    company: {
-      describe: '公司设置',
-      key: '/setting/company'
-    },
-    app: {
-      describe: '应用设置',
-      key: '/setting/app'
-    },
-    system: {
-      describe: '系统设置',
-      key: '/setting/system'
-    }
-  }
-};
 export default {
-  mars: mars,
   standard: standard
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.2-node.0",
+  "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": "791b7dce1b31a2c683d3225e84e0c51106b64b74",
+  "gitHead": "b445a1cbce82a1059bd87c069b813ea25452bbab",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }