@zgfe/modules-settings 1.1.8 → 1.1.9-alpha.0

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

@@ -11,12 +11,12 @@ import request from '../../../utils/ajax';
 import apis from '../../../constants/api';
 import { useState } from 'react';
 import AuthConfigDetail from '../../companySetting/userGroup/authConfigDetail';
-import util from '../../../utils/util';
 import { EyeOutlined } from '@ant-design/icons';
 var AppMember = function AppMember() {
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
-    currentUser = _useContext.currentUser;
+    currentUser = _useContext.currentUser,
+    getMenuRouterByName = _useContext.getMenuRouterByName;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     memberList = _useState2[0],
@@ -177,7 +177,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 = util.getMenuRouterByName(item.name);
+          item.routeName = getMenuRouterByName(item.name);
           if (item.childrens) {
             formatMenus(item.childrens);
           }

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

@@ -4,16 +4,19 @@ 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 } from 'react';
+import React, { useEffect, useState, forwardRef, useImperativeHandle, useContext } 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,
     isMarsUi = props.isMarsUi,
     leftMenus = props.leftMenus;
+  var _useContext = useContext(BizGlobalDataContext),
+    menusName = _useContext.menusName,
+    funPermissions = _useContext.funPermissions;
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     dataPermissions = _useState2[0],
@@ -59,7 +62,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.all.key,
             opts: [constants.functionOpts.all]
           });
           functionalPermissions.children && functionalPermissions.children.forEach(function (item) {
@@ -201,7 +204,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[topMenu.name];
       // 菜单不在权限配置中
       if (!menuFunPerConstants) {
         return null;
@@ -238,7 +241,7 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
         indeterminate: !(checkState || !childrenCheckArr.length && !indeterminateArr.length),
         children: childrens
       };
-      if (topMenu.name === constants.menusName.market) {
+      if (topMenu.name === (menusName === null || menusName === void 0 ? void 0 : menusName.market)) {
         formatMenu.radio = true;
         formatMenu.children = [{
           describe: '管理员角色',
@@ -259,7 +262,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.all.key];
     console.log('dskfhk', leftMenus);
     leftMenus.forEach(function (menu) {
       var topMenuFun = loopFormatTopMenu(menu, isAll);
@@ -270,29 +273,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.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.setting.default.describe,
+      key: funPermissions.setting.default.key,
+      checked: isAll || !!map[funPermissions.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.setting.company,
+        describe: funPermissions.setting.company.describe,
+        key: funPermissions.setting.company.key,
         disable: false,
         supportVirtualApp: true,
-        checked: isAll || settingIsAll || !!map[funPermissions[isMarsUi ? 'mars' : 'standard'].setting.company.key],
+        checked: isAll || settingIsAll || !!map[funPermissions.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.setting.app,
+        describe: funPermissions.setting.app.describe,
+        key: funPermissions.setting.app.key,
         disable: false,
         supportVirtualApp: true,
-        checked: isAll || settingIsAll || !!map[funPermissions[isMarsUi ? 'mars' : 'standard'].setting.app.key],
+        checked: isAll || settingIsAll || !!map[funPermissions.setting.app.key],
         children: []
       }]
     });
@@ -305,8 +308,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.all.key,
+      // checked: !!map[funPermissions.all.key],
       checked: checkedArr.length === menuFun.length,
       disable: false,
       supportVirtualApp: true,

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

@@ -10,14 +10,16 @@ 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 } from 'react';
+import React, { useEffect, useState, forwardRef, useImperativeHandle, useContext } 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 _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     dataPermissions = _useState2[0],
@@ -169,8 +171,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.all.key,
+      // checked: !!map[funPermissions.all.key],
       checked: checkedFunArr.length === dealFunConfigList.length,
       disable: false,
       supportVirtualApp: true,
@@ -187,7 +189,7 @@ var AuthConfigCEP = /*#__PURE__*/forwardRef(function (props, ref) {
     setDataPermissions({
       key: 1,
       describe: '数据权限',
-      // checked: !!map[funPermissions[isMarsUi ? 'mars' : 'standard'].all.key],
+      // checked: !!map[funPermissions.all.key],
       checked: checkedAppArr.length === dealAppConfigList.length,
       indeterminate: !(checkedAppArr.length === dealAppConfigList.length || !checkedAppArr.length && !indeterminateAppArr.length),
       children: dealAppConfigList

package/es/modules/companySetting/index.js

@@ -13,7 +13,6 @@ 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';
@@ -33,7 +32,8 @@ var CompanySetting = function CompanySetting(props) {
   // #todo 需要修改主应用传入参数和business-lib数据仓库
   var apisOkNum = 0;
   var _useContext = useContext(BizGlobalDataContext),
-    envs = _useContext.envs;
+    envs = _useContext.envs,
+    getMenuRouterByName = _useContext.getMenuRouterByName;
   var _ref = envs || {},
     zgText = _ref.zgText,
     isMarsUi = _ref.isMarsUi,
@@ -216,7 +216,7 @@ var CompanySetting = function CompanySetting(props) {
         var menusNameMap = {};
         var formatMenus = function formatMenus(menus) {
           menus.forEach(function (item) {
-            item.routeName = util.getMenuRouterByName(item.name);
+            item.routeName = getMenuRouterByName(item.name);
             menusNameMap[item.name] = item;
             if (item.childrens) {
               formatMenus(item.childrens);

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, { useEffect, useState } from 'react';
+import React, { useContext, 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,
@@ -29,6 +30,8 @@ var authConfigDetail = function authConfigDetail(props) {
     groupId = props.groupId,
     type = props.type,
     serviceType = props.serviceType;
+  var _useContext = useContext(BizGlobalDataContext),
+    menusName = _useContext.menusName;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     dataAuth = _useState2[0],
@@ -154,7 +157,7 @@ var authConfigDetail = function authConfigDetail(props) {
       });
     }
     // 智能触达
-    if (topMenu.name === constants.menusName.market) {
+    if (topMenu.name === (menusName === null || menusName === void 0 ? void 0 : menusName.market)) {
       childrenArr = [{
         name: {
           describe: '管理员角色',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.1.8",
+  "version": "1.1.9-alpha.0",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -38,7 +38,7 @@
     "@types/lodash": "^4.14.182",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.34-alpha.22",
+    "@zgfe/business-lib": "1.1.41-alpha.0",
     "@zgfe/modules-demo-manage": "^1.0.1",
     "antd": "4.22.6",
     "dumi": "^1.1.0",
@@ -51,7 +51,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "60ffa7f5bcd4f00f2c63e55e9226f55036f3baba",
+  "gitHead": "124f5f071cf1a65ef8aa1741762fadd67b34e614",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }