@zgfe/modules-settings 1.2.2-alpha.0 → 1.2.2-alpha.3

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

@@ -10,13 +10,13 @@ import { BizGlobalDataContext } from '@zgfe/business-lib';
 import request from '../../../utils/ajax';
 import apis from '../../../constants/api';
 import { useState } from 'react';
+import util from '../../../utils/util';
 import { EyeOutlined } from '@ant-design/icons';
 import SetingModal from './modal';
 var AppMember = function AppMember() {
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
-    currentUser = _useContext.currentUser,
-    getMenuRouterByName = _useContext.getMenuRouterByName;
+    currentUser = _useContext.currentUser;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     memberList = _useState2[0],
@@ -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,
@@ -141,7 +137,7 @@ var AppMember = function AppMember() {
       var menus = (res === null || res === void 0 ? void 0 : res.leftMenus) || [];
       var formatMenus = function formatMenus(menus) {
         menus.forEach(function (item) {
-          item.routeName = getMenuRouterByName(item.name);
+          item.routeName = util.getMenuRouterByName(item.name);
           if (item.childrens) {
             formatMenus(item.childrens);
           }
@@ -196,7 +192,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

@@ -4,18 +4,15 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect, useState, forwardRef, useImperativeHandle, useContext } from 'react';
+import React, { useEffect, useState, forwardRef, useImperativeHandle } from 'react';
 import './styles/authConfig.less';
 import constants from './../../../utils/constants';
+import funPermissions from './../../../utils/functionalPermissions';
 import AuthGroup from './authGroup';
-import { BizGlobalDataContext } from '@zgfe/business-lib';
 var Info = /*#__PURE__*/forwardRef(function (props, ref) {
   var config = props.config,
     appList = props.appList,
     leftMenus = props.leftMenus;
-  var _useContext = useContext(BizGlobalDataContext),
-    menusName = _useContext.menusName,
-    funPermissions = _useContext.funPermissions;
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     dataPermissions = _useState2[0],
@@ -61,7 +58,7 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
         console.log('functionalPermissions');
         if (functionalPermissions.checked) {
           funAuth.push({
-            resource: funPermissions.all.key,
+            resource: funPermissions['standard'].all.key,
             opts: [constants.functionOpts.all]
           });
           functionalPermissions.children && functionalPermissions.children.forEach(function (item) {
@@ -203,7 +200,7 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
     console.log(map);
     // 顶部菜单功能权限
     var loopFormatTopMenu = function loopFormatTopMenu(topMenu, checkAll) {
-      var menuFunPerConstants = funPermissions[topMenu.name];
+      var menuFunPerConstants = funPermissions['standard'][topMenu.name];
       // 菜单不在权限配置中
       if (!menuFunPerConstants) {
         return null;
@@ -240,7 +237,7 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
         indeterminate: !(checkState || !childrenCheckArr.length && !indeterminateArr.length),
         children: childrens
       };
-      if (topMenu.name === (menusName === null || menusName === void 0 ? void 0 : menusName.market)) {
+      if (topMenu.name === constants.menusName.market) {
         formatMenu.radio = true;
         formatMenu.children = [{
           describe: '管理员角色',
@@ -261,7 +258,7 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
       return formatMenu;
     };
     var menuFun = [];
-    var isAll = !!map[funPermissions.all.key];
+    var isAll = !!map[funPermissions['standard'].all.key];
     console.log('dskfhk', leftMenus);
     leftMenus.forEach(function (menu) {
       var topMenuFun = loopFormatTopMenu(menu, isAll);
@@ -272,29 +269,29 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
         menuFun.push(topMenuFun);
       }
     });
-    var settingIsAll = !!map[funPermissions.setting.default.key];
+    var settingIsAll = !!map[funPermissions['standard'].setting.default.key];
     menuFun.push({
-      describe: funPermissions.setting.default.describe,
-      key: funPermissions.setting.default.key,
-      checked: isAll || !!map[funPermissions.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.setting.company,
-        describe: funPermissions.setting.company.describe,
-        key: funPermissions.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.setting.company.key],
+        checked: isAll || settingIsAll || !!map[funPermissions['standard'].setting.company.key],
         children: []
       }, {
-        // ...funPermissions.setting.app,
-        describe: funPermissions.setting.app.describe,
-        key: funPermissions.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.setting.app.key],
+        checked: isAll || settingIsAll || !!map[funPermissions['standard'].setting.app.key],
         children: []
       }]
     });
@@ -307,8 +304,8 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
     console.log(menuFun);
     setFunctionalPermissions({
       describe: '功能权限',
-      key: funPermissions.all.key,
-      // checked: !!map[funPermissions.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

@@ -10,16 +10,13 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect, useState, forwardRef, useImperativeHandle, useContext } from 'react';
+import React, { useEffect, useState, forwardRef, useImperativeHandle } from 'react';
 import './styles/authConfig.less';
 import constants from './../../../utils/constants';
+import funPermissions from './../../../utils/functionalPermissions';
 import AuthGroup from './authGroup';
-import { BizGlobalDataContext } from '@zgfe/business-lib';
 var AuthConfigCEP = /*#__PURE__*/forwardRef(function (props, ref) {
-  var isMarsUi = props.isMarsUi,
-    CEPData = props.CEPData;
-  var _useContext = useContext(BizGlobalDataContext),
-    funPermissions = _useContext.funPermissions;
+  var CEPData = props.CEPData;
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     dataPermissions = _useState2[0],
@@ -171,8 +168,8 @@ var AuthConfigCEP = /*#__PURE__*/forwardRef(function (props, ref) {
     });
     setFunctionalPermissions({
       describe: '功能权限',
-      key: funPermissions.all.key,
-      // checked: !!map[funPermissions.all.key],
+      key: funPermissions['standard'].all.key,
+      // checked: !!map[funPermissions['standard'].all.key],
       checked: checkedFunArr.length === dealFunConfigList.length,
       disable: false,
       supportVirtualApp: true,
@@ -189,7 +186,7 @@ var AuthConfigCEP = /*#__PURE__*/forwardRef(function (props, ref) {
     setDataPermissions({
       key: 1,
       describe: '数据权限',
-      // checked: !!map[funPermissions.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

@@ -13,6 +13,7 @@ import React, { useContext, useEffect, useState } from 'react';
 import './index.less';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
 import request from './../../utils/ajax';
+import util from './../../utils/util';
 import api from './../../constants/api';
 import PageLoading from '../../components/pageLoading';
 import { notification } from 'antd';
@@ -32,11 +33,9 @@ var CompanySetting = function CompanySetting(props) {
   // #todo 需要修改主应用传入参数和business-lib数据仓库
   var apisOkNum = 0;
   var _useContext = useContext(BizGlobalDataContext),
-    envs = _useContext.envs,
-    getMenuRouterByName = _useContext.getMenuRouterByName;
+    envs = _useContext.envs;
   var _ref = envs || {},
     zgText = _ref.zgText,
-    isMarsUi = _ref.isMarsUi,
     showVirtualApp = _ref.showVirtualApp,
     showDataDaily = _ref.showDataDaily,
     ENVIRONMENT = _ref.ENVIRONMENT;
@@ -216,7 +215,7 @@ var CompanySetting = function CompanySetting(props) {
         var menusNameMap = {};
         var formatMenus = function formatMenus(menus) {
           menus.forEach(function (item) {
-            item.routeName = getMenuRouterByName(item.name);
+            item.routeName = util.getMenuRouterByName(item.name);
             menusNameMap[item.name] = item;
             if (item.childrens) {
               formatMenus(item.childrens);
@@ -640,7 +639,7 @@ var CompanySetting = function CompanySetting(props) {
       companyName: companyName,
       changeCompanyNameCallback: changeCompanyNameCallback
     }),
-    hidden: isMarsUi
+    hidden: false
   }, {
     key: 'userGroup',
     label: '用户组',
@@ -649,13 +648,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 +665,6 @@ var CompanySetting = function CompanySetting(props) {
       companyAppList: companyAppList,
       allGroupInfos: allGroupInfos,
       leftMenus: leftMenus,
-      isMarsUi: isMarsUi,
       removeUserCallback: removeUserCallback,
       changeUserAuthCallback: changeUserAuthCallback,
       createMembersCallback: createMembersCallback,
@@ -675,7 +672,7 @@ var CompanySetting = function CompanySetting(props) {
       isAdmin: isAdmin,
       serviceType: serviceType
     }),
-    hidden: isMarsUi
+    hidden: false
   }, {
     key: 'appList',
     label: '应用',
@@ -696,7 +693,7 @@ var CompanySetting = function CompanySetting(props) {
       gotoAppPanel: gotoAppPanel,
       closeCreateCallback: closeCreateCallback
     }),
-    hidden: isMarsUi
+    hidden: false
   }, {
     key: 'virtualApp',
     label: '虚拟应用',
@@ -709,7 +706,7 @@ var CompanySetting = function CompanySetting(props) {
       delVirtualAppCallback: delVirtualAppCallback,
       editVirtualAppCallback: editVirtualAppCallback
     }),
-    hidden: !showVirtualApp || isMarsUi
+    hidden: !showVirtualApp
   }, {
     key: 'cost',
     label: '套餐',
@@ -718,7 +715,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

@@ -11,13 +11,14 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import './style/authConfigDetail.less';
 import constants from './../../../utils/constants';
+import functionalPermissions from './../../../utils/functionalPermissions';
 import { notification } from 'antd';
 import request from './../../../utils/ajax';
 import apis from './../../../constants/api';
-import { BizGlobalDataContext } from '@zgfe/business-lib';
+// const { TextArea } = Input;
 var authConfigDetail = function authConfigDetail(props) {
   var name = props.name,
     authConfig = props.authConfig,
@@ -27,9 +28,6 @@ var authConfigDetail = function authConfigDetail(props) {
     groupId = props.groupId,
     type = props.type,
     serviceType = props.serviceType;
-  var _useContext = useContext(BizGlobalDataContext),
-    menusName = _useContext.menusName,
-    funPermissions = _useContext.funPermissions;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     dataAuth = _useState2[0],
@@ -47,6 +45,7 @@ var authConfigDetail = function authConfigDetail(props) {
     cepFunConfig = _useState8[0],
     setCepFunConfig = _useState8[1];
   // #todo isAdmin 需要添加
+  // console.log('dsfdsfsdfdsfdsfdsf');
   useEffect(function () {
     reworkAppList();
     reworkFunAuth();
@@ -141,7 +140,7 @@ var authConfigDetail = function authConfigDetail(props) {
   };
   var loopFormatTopMenu = function loopFormatTopMenu(topMenu) {
     // 菜单不在权限配置中
-    if (!funPermissions[topMenu.name]) {
+    if (!functionalPermissions['standard'][topMenu.name]) {
       return null;
     }
     var childrenArr = [];
@@ -154,7 +153,7 @@ var authConfigDetail = function authConfigDetail(props) {
       });
     }
     // 智能触达
-    if (topMenu.name === (menusName === null || menusName === void 0 ? void 0 : menusName.market)) {
+    if (topMenu.name === constants.menusName.market) {
       childrenArr = [{
         name: {
           describe: '管理员角色',
@@ -174,7 +173,7 @@ var authConfigDetail = function authConfigDetail(props) {
     var formatMenu = {
       name: {
         describe: topMenu.nametext,
-        key: funPermissions[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 === funPermissions.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 = funPermissions.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(funPermissions.all.key)) {
+    if (funAuthKeyArr.includes(functionalPermissions['standard'].all.key)) {
       // 功能权限：全选
       return true;
     }
@@ -235,14 +234,14 @@ var authConfigDetail = function authConfigDetail(props) {
     });
     // 设置菜单
     var setting = {
-      name: funPermissions.setting.default,
+      name: functionalPermissions['standard'].setting.default,
       show: false,
       children: [{
-        name: funPermissions.setting.company,
+        name: functionalPermissions['standard'].setting.company,
         show: false,
         children: []
       }, {
-        name: funPermissions.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/utils/functionalPermissions.d.ts

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

package/es/utils/functionalPermissions.js

@@ -149,11 +149,8 @@ var standard = _objectSpread({
     key: '/diypage'
   },
   user: {
-    key: '/user'
+    key: '/analysis/user'
   },
-  // cep: {
-  //   key: '/cep',
-  // },
   userList: {
     key: '/user/userList'
   },
@@ -163,9 +160,6 @@ var standard = _objectSpread({
   userPortrait: {
     key: '/user/userPortrait'
   },
-  userJourney: {
-    key: '/cxp/userJourney'
-  },
   userTags: {
     key: '/user/userTags'
   },
@@ -225,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'
-  },
-  userJourney: {
-    key: '/cxp/userJourney'
-  },
-  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 standard;
+export default {
+  standard: standard
+};

package/es/utils/util.js

@@ -641,8 +641,7 @@ var util = {
       adChannel: 'router-dataAccess-advanced',
       debug: 'router-dataAccess-debug',
       dataset: 'router-cdp-dataset',
-      idmapping: 'router-idMapping-list',
-      userJourney: 'router-appUserJourney'
+      idmapping: 'router-idMapping-list'
     };
     return hash[name] ? hash[name] : 'router-' + name;
   }

package/package.json

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

package/es/modules/companySetting/demo.d.ts

@@ -1,3 +0,0 @@
-import React from 'react';
-declare const _default: () => React.JSX.Element;
-export default _default;

package/es/modules/companySetting/demo.js

@@ -1,21 +0,0 @@
-import { BizGlobalDataContext, DemoWrapper } from '@zgfe/business-lib';
-import React from 'react';
-import funPermissions from '../../utils/functionalPermissions';
-import constants from '../../utils/constants';
-import util from '../../utils/util';
-import { CompanySetting } from '../..';
-export default (function () {
-  return /*#__PURE__*/React.createElement(DemoWrapper, {
-    needMeta: true
-  }, /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
-    value: {
-      funPermissions: funPermissions,
-      menusName: constants.menusName,
-      getMenuRouterByName: util.getMenuRouterByName
-    }
-  }, /*#__PURE__*/React.createElement(CompanySetting, {
-    showWeChatMenu: true,
-    showMarketMenu: true,
-    action: ''
-  })));
-});