@zgfe/modules-settings 1.1.9-alpha.1 → 1.2.0-alpha.2

package/es/components/demo.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import 'antd/dist/antd.less';
 import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
 import '@zgfe/business-lib/es/assets/iconfont/iconfont.css';
-declare const DemoWrapper: React.FC<{
+declare const DemoWrapper2: React.FC<{
     children?: any;
 }>;
-export default DemoWrapper;
+export default DemoWrapper2;

package/es/components/demo.js

@@ -2,10 +2,10 @@ import React from 'react';
 import 'antd/dist/antd.less';
 import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
 import '@zgfe/business-lib/es/assets/iconfont/iconfont.css';
-import { BizGlobalDataContext } from '@zgfe/business-lib';
+import { DemoWrapper } from '@zgfe/business-lib';
 import { ConfigProvider } from 'antd';
 import zhCN from 'antd/es/locale/zh_CN';
-var DemoWrapper = function DemoWrapper(props) {
+var DemoWrapper2 = function DemoWrapper2(props) {
   return /*#__PURE__*/React.createElement(ConfigProvider, {
     locale: zhCN
   }, /*#__PURE__*/React.createElement("div", {
@@ -14,12 +14,8 @@ var DemoWrapper = function DemoWrapper(props) {
       padding: '24px',
       height: 800
     }
-  }, /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
-    value: {
-      currentApp: {
-        appId: 184
-      }
-    }
+  }, /*#__PURE__*/React.createElement(DemoWrapper, {
+    needMeta: true
   }, props.children)));
 };
-export default DemoWrapper;
+export default DemoWrapper2;

package/es/components/settingTabs/index.less

@@ -38,3 +38,10 @@
     }
   }
 }
+
+.appSettings-Tabs {
+  .ant-tabs-content {
+    height: 532px;
+    overflow-y: scroll;
+  }
+}

package/es/modules/appSettings/demo/index.d.ts

@@ -0,0 +1 @@
+

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

@@ -0,0 +1,12 @@
+"use strict";
+
+// import React from 'react';
+// import { AppSettings } from '@zgfe/modules-settings';
+// import DemoWrapper from '../../../components/demo';
+// export default () => {
+//   return (
+//     <DemoWrapper>
+//       <AppSettings />
+//     </DemoWrapper>
+//   );
+// };

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

@@ -5,18 +5,18 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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, useContext } from 'react';
-import { Table, Popover, Tabs } from 'antd';
+import { Table, Popover } from 'antd';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
 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';
+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],
@@ -41,6 +41,21 @@ var AppMember = function AppMember() {
     _useState12 = _slicedToArray(_useState11, 2),
     isMarsUi = _useState12[0],
     setIsMarsUi = _useState12[1];
+  var _useState13 = useState(false),
+    _useState14 = _slicedToArray(_useState13, 2),
+    isModalOpen = _useState14[0],
+    setIsModalOpen = _useState14[1];
+  var _useState15 = useState({}),
+    _useState16 = _slicedToArray(_useState15, 2),
+    modalData = _useState16[0],
+    setModalData = _useState16[1];
+  var setingModalhandle = function setingModalhandle(data, dealArr) {
+    setModalData({
+      data: data,
+      dealArr: dealArr
+    });
+    setIsModalOpen(true);
+  };
   var columns = [{
     title: '账号',
     dataIndex: 'email'
@@ -68,61 +83,10 @@ var AppMember = function AppMember() {
       });
       return /*#__PURE__*/React.createElement("div", {
         className: "operating"
-      }, /*#__PURE__*/React.createElement(Popover, {
-        content: function content() {
-          return /*#__PURE__*/React.createElement(Tabs, {
-            defaultActiveKey: "1"
-          }, /*#__PURE__*/React.createElement(Tabs.TabPane, {
-            tab: "\u4E2A\u4EBA\u6743\u9650",
-            key: "1",
-            style: {
-              width: 300
-            }
-          }, /*#__PURE__*/React.createElement(AuthConfigDetail, {
-            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
-          })), /*#__PURE__*/React.createElement(Tabs.TabPane, {
-            tab: "\u6240\u5C5E\u7528\u6237\u7EC4\u6743\u9650",
-            key: "2",
-            style: {
-              width: 300
-            }
-          }, /*#__PURE__*/React.createElement("div", {
-            className: "group-auth-list"
-          }, dealArr.length ? /*#__PURE__*/React.createElement("div", null, dealArr.map(function (item) {
-            return /*#__PURE__*/React.createElement(AuthConfigDetail, {
-              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,
-              type: 2,
-              serviceType: currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType
-            });
-          })) : /*#__PURE__*/React.createElement(AuthConfigDetail, {
-            authConfig: {
-              dataAuth: [],
-              funAuth: []
-            },
-            leftMenus: leftMenus,
-            isMarsUi: isMarsUi,
-            companyAppList: companyAppList,
-            name: '',
-            type: 2,
-            serviceType: currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType
-          }))));
-        },
-        style: {
-          width: 255
-        },
-        trigger: "click"
+      }, /*#__PURE__*/React.createElement("p", {
+        onClick: function onClick() {
+          return setingModalhandle(data, dealArr);
+        }
       }, /*#__PURE__*/React.createElement(EyeOutlined, {
         style: {
           color: 'rgba(0, 0, 0, 0.85)'
@@ -177,7 +141,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);
           }
@@ -223,10 +187,18 @@ var AppMember = function AppMember() {
   // const groupAuthConfig = (ids: number[]) => {
   //   return groupInfoList.filter((item: IGroupInfo) => ids.includes(item.id));
   // };
-  return /*#__PURE__*/React.createElement(Table, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Table, {
     size: "middle",
     columns: columns,
     dataSource: memberList
-  });
+  }), isModalOpen && /*#__PURE__*/React.createElement(SetingModal, {
+    isModalOpen: isModalOpen,
+    setIsModalOpen: setIsModalOpen,
+    companyAppList: companyAppList,
+    leftMenus: leftMenus,
+    isMarsUi: isMarsUi,
+    data: modalData.data,
+    dealArr: modalData.dealArr
+  }));
 };
 export default AppMember;

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

@@ -0,0 +1,18 @@
+.seting-modal-box {
+  .ant-modal-header {
+    padding: 24px 24px 8px 24px !important;
+    font-size: 24px;
+  }
+  .ant-modal-body {
+    height: 620px;
+    padding: 0px 24px !important;
+  }
+  .ant-modal-footer {
+    display: none;
+  }
+  .ant-modal-close-x {
+    margin: 10px 10px 0 0;
+    color: #242541;
+    font-size: 20px;
+  }
+}

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

@@ -0,0 +1,13 @@
+import React from 'react';
+import './index.less';
+import { AppListItem, LeftMenusItem } from '../../../types';
+declare const SetingModal: React.FC<{
+    isModalOpen: boolean;
+    setIsModalOpen: Function;
+    data: any;
+    companyAppList: AppListItem[];
+    leftMenus: LeftMenusItem[];
+    isMarsUi: boolean;
+    dealArr: any;
+}>;
+export default SetingModal;

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

@@ -0,0 +1,67 @@
+import React, { useContext } from 'react';
+import { Tabs, Modal } from 'antd';
+import { BizGlobalDataContext } from '@zgfe/business-lib';
+import AuthConfigDetail from '../../companySetting/userGroup/authConfigDetail';
+import './index.less';
+var SetingModal = function SetingModal(props) {
+  var _useContext = useContext(BizGlobalDataContext),
+    currentUser = _useContext.currentUser;
+  var isModalOpen = props.isModalOpen,
+    setIsModalOpen = props.setIsModalOpen,
+    data = props.data,
+    companyAppList = props.companyAppList,
+    leftMenus = props.leftMenus,
+    isMarsUi = props.isMarsUi,
+    dealArr = props.dealArr;
+  return /*#__PURE__*/React.createElement(Modal, {
+    className: "seting-modal-box",
+    title: "\u6743\u9650\u4FE1\u606F",
+    visible: isModalOpen,
+    onCancel: function onCancel() {
+      return setIsModalOpen(false);
+    }
+  }, /*#__PURE__*/React.createElement(Tabs, {
+    defaultActiveKey: "1",
+    className: "appSettings-Tabs"
+  }, /*#__PURE__*/React.createElement(Tabs.TabPane, {
+    tab: "\u4E2A\u4EBA\u6743\u9650",
+    key: "1"
+  }, /*#__PURE__*/React.createElement(AuthConfigDetail, {
+    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
+  })), /*#__PURE__*/React.createElement(Tabs.TabPane, {
+    tab: "\u6240\u5C5E\u7528\u6237\u7EC4\u6743\u9650",
+    key: "2"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "group-auth-list"
+  }, dealArr.length ? /*#__PURE__*/React.createElement("div", null, dealArr.map(function (item) {
+    return /*#__PURE__*/React.createElement(AuthConfigDetail, {
+      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,
+      type: 2,
+      serviceType: currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType
+    });
+  })) : /*#__PURE__*/React.createElement(AuthConfigDetail, {
+    authConfig: {
+      dataAuth: [],
+      funAuth: []
+    },
+    leftMenus: leftMenus,
+    isMarsUi: isMarsUi,
+    companyAppList: companyAppList,
+    name: '',
+    type: 2,
+    serviceType: currentUser === null || currentUser === void 0 ? void 0 : currentUser.serviceType
+  })))));
+};
+export default SetingModal;

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

@@ -4,19 +4,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, 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,
     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],
@@ -62,7 +59,7 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
         console.log('functionalPermissions');
         if (functionalPermissions.checked) {
           funAuth.push({
-            resource: funPermissions.all.key,
+            resource: funPermissions[isMarsUi ? 'mars' : 'standard'].all.key,
             opts: [constants.functionOpts.all]
           });
           functionalPermissions.children && functionalPermissions.children.forEach(function (item) {
@@ -204,7 +201,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[isMarsUi ? 'mars' : 'standard'][topMenu.name];
       // 菜单不在权限配置中
       if (!menuFunPerConstants) {
         return null;
@@ -241,7 +238,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: '管理员角色',
@@ -262,7 +259,7 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
       return formatMenu;
     };
     var menuFun = [];
-    var isAll = !!map[funPermissions.all.key];
+    var isAll = !!map[funPermissions[isMarsUi ? 'mars' : 'standard'].all.key];
     console.log('dskfhk', leftMenus);
     leftMenus.forEach(function (menu) {
       var topMenuFun = loopFormatTopMenu(menu, isAll);
@@ -273,29 +270,29 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
         menuFun.push(topMenuFun);
       }
     });
-    var settingIsAll = !!map[funPermissions.setting.default.key];
+    var settingIsAll = !!map[funPermissions[isMarsUi ? 'mars' : '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[isMarsUi ? 'mars' : 'standard'].setting.default.describe,
+      key: funPermissions[isMarsUi ? 'mars' : 'standard'].setting.default.key,
+      checked: isAll || !!map[funPermissions[isMarsUi ? 'mars' : '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[isMarsUi ? 'mars' : 'standard'].setting.company,
+        describe: funPermissions[isMarsUi ? 'mars' : 'standard'].setting.company.describe,
+        key: funPermissions[isMarsUi ? 'mars' : 'standard'].setting.company.key,
         disable: false,
         supportVirtualApp: true,
-        checked: isAll || settingIsAll || !!map[funPermissions.setting.company.key],
+        checked: isAll || settingIsAll || !!map[funPermissions[isMarsUi ? 'mars' : 'standard'].setting.company.key],
         children: []
       }, {
-        // ...funPermissions.setting.app,
-        describe: funPermissions.setting.app.describe,
-        key: funPermissions.setting.app.key,
+        // ...funPermissions[isMarsUi ? 'mars' : 'standard'].setting.app,
+        describe: funPermissions[isMarsUi ? 'mars' : 'standard'].setting.app.describe,
+        key: funPermissions[isMarsUi ? 'mars' : 'standard'].setting.app.key,
         disable: false,
         supportVirtualApp: true,
-        checked: isAll || settingIsAll || !!map[funPermissions.setting.app.key],
+        checked: isAll || settingIsAll || !!map[funPermissions[isMarsUi ? 'mars' : 'standard'].setting.app.key],
         children: []
       }]
     });
@@ -308,8 +305,8 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
     console.log(menuFun);
     setFunctionalPermissions({
       describe: '功能权限',
-      key: funPermissions.all.key,
-      // checked: !!map[funPermissions.all.key],
+      key: funPermissions[isMarsUi ? 'mars' : 'standard'].all.key,
+      // checked: !!map[funPermissions[isMarsUi ? 'mars' : 'standard'].all.key],
       checked: checkedArr.length === menuFun.length,
       disable: false,
       supportVirtualApp: true,

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

@@ -10,16 +10,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, 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 _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     dataPermissions = _useState2[0],
@@ -171,8 +169,8 @@ var AuthConfigCEP = /*#__PURE__*/forwardRef(function (props, ref) {
     });
     setFunctionalPermissions({
       describe: '功能权限',
-      key: funPermissions.all.key,
-      // checked: !!map[funPermissions.all.key],
+      key: funPermissions[isMarsUi ? 'mars' : 'standard'].all.key,
+      // checked: !!map[funPermissions[isMarsUi ? 'mars' : 'standard'].all.key],
       checked: checkedFunArr.length === dealFunConfigList.length,
       disable: false,
       supportVirtualApp: true,
@@ -189,7 +187,7 @@ var AuthConfigCEP = /*#__PURE__*/forwardRef(function (props, ref) {
     setDataPermissions({
       key: 1,
       describe: '数据权限',
-      // checked: !!map[funPermissions.all.key],
+      // checked: !!map[funPermissions[isMarsUi ? 'mars' : 'standard'].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,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,8 +33,7 @@ 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,
@@ -216,7 +216,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);

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

@@ -132,8 +132,7 @@
   }
 }
 .group-auth-list {
-  max-height: 300px;
-  overflow: auto;
+  height: 532px;
   .auth-config-detail {
     max-height: none;
     border-bottom: 1px solid #dadada;

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

@@ -11,14 +11,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, { 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,
@@ -30,8 +29,6 @@ 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],
@@ -157,7 +154,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: '管理员角色',

package/es/utils/functionalPermissions.d.ts

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

package/es/utils/functionalPermissions.js

@@ -163,9 +163,6 @@ var standard = _objectSpread({
   userPortrait: {
     key: '/user/userPortrait'
   },
-  userJourney: {
-    key: '/cxp/userJourney'
-  },
   userTags: {
     key: '/user/userTags'
   },
@@ -322,9 +319,6 @@ var mars = {
   userPortrait: {
     key: '/analysis/user/userPortrait'
   },
-  userJourney: {
-    key: '/cxp/userJourney'
-  },
   custom: {
     key: '/analysis/custom'
   },
@@ -430,4 +424,7 @@ var mars = {
     }
   }
 };
-export default standard;
+export default {
+  mars: mars,
+  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.1.9-alpha.1",
+  "version": "1.2.0-alpha.2",
   "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.41-alpha.0",
+    "@zgfe/business-lib": "^1.1.40",
     "@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": "371298bb7b30a8107536cf513c4b2eaf9bd4b276",
+  "gitHead": "d769d11e21ed8a30ce32c030b2876440d99d10db",
   "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: ''
-  })));
-});