@zgfe/modules-settings 1.2.6 → 1.2.7-config.1

package/es/constants/api.js

@@ -5,7 +5,7 @@ var apis = {
     getCurrentUser: '/zg/web/v2/company/currentUser'
   },
   app: {
-    queryLeftMenus: apiPrefix + '/common/proxy/index/getLeftMenusByAppId.jsp',
+    queryLeftMenus: '/zg/web/v2/index/menuList',
     deleteApp: apiPrefix + '/common/proxy/user/deleteApp.jsp',
     createApp: apiPrefix + '/system/createApp',
     queryAppList: '/zg/web/v2/data/v2ajaxGetDataByApp',

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;
+    currentUser = _useContext.currentUser,
+    getMenuRouterByName = _useContext.getMenuRouterByName;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     memberList = _useState2[0],
@@ -130,15 +130,15 @@ var AppMember = function AppMember() {
     });
     // 请求左侧菜单
     request(apis.app.queryLeftMenus, {
-      method: 'post',
-      data: {
-        app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+      method: 'get',
+      params: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
       }
     }).then(function (res) {
-      var menus = (res === null || res === void 0 ? void 0 : res.leftMenus) || [];
+      var menus = (res === null || res === void 0 ? void 0 : res.data) || [];
       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/demo.d.ts

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

package/es/modules/companySetting/demo.js

@@ -0,0 +1,21 @@
+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: ''
+  })));
+});

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

@@ -4,15 +4,18 @@ 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 AuthConfig = /*#__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],
@@ -57,7 +60,7 @@ var AuthConfig = /*#__PURE__*/forwardRef(function (props, ref) {
         }
         if (functionalPermissions.checked) {
           funAuth.push({
-            resource: funPermissions['standard'].all.key,
+            resource: funPermissions.all.key,
             opts: [constants.functionOpts.all]
           });
           functionalPermissions.children && functionalPermissions.children.forEach(function (item) {
@@ -198,7 +201,7 @@ var AuthConfig = /*#__PURE__*/forwardRef(function (props, ref) {
     });
     // 顶部菜单功能权限
     var loopFormatTopMenu = function loopFormatTopMenu(topMenu, checkAll) {
-      var menuFunPerConstants = funPermissions['standard'][topMenu.name];
+      var menuFunPerConstants = funPermissions[topMenu.name];
       // 菜单不在权限配置中
       if (!menuFunPerConstants) {
         return null;
@@ -235,7 +238,7 @@ var AuthConfig = /*#__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: '管理员角色',
@@ -256,7 +259,7 @@ var AuthConfig = /*#__PURE__*/forwardRef(function (props, ref) {
       return formatMenu;
     };
     var menuFun = [];
-    var isAll = !!map[funPermissions['standard'].all.key];
+    var isAll = !!map[funPermissions.all.key];
     leftMenus.forEach(function (menu) {
       var topMenuFun = loopFormatTopMenu(menu, isAll);
       if (topMenuFun) {
@@ -266,28 +269,28 @@ var AuthConfig = /*#__PURE__*/forwardRef(function (props, ref) {
         menuFun.push(topMenuFun);
       }
     });
-    var settingIsAll = !!map[funPermissions['standard'].setting.default.key];
+    var settingIsAll = !!map[funPermissions.setting.default.key];
     var settingChildren = [{
       // ...funPermissions['standard'].setting.company,
-      describe: funPermissions['standard'].setting.company.describe,
-      key: funPermissions['standard'].setting.company.key,
+      describe: funPermissions.setting.company.describe,
+      key: funPermissions.setting.company.key,
       disable: false,
       supportVirtualApp: true,
-      checked: isAll || settingIsAll || !!map[funPermissions['standard'].setting.company.key],
+      checked: isAll || settingIsAll || !!map[funPermissions.setting.company.key],
       children: []
     }, {
       // ...funPermissions['standard'].setting.app,
-      describe: funPermissions['standard'].setting.app.describe,
-      key: funPermissions['standard'].setting.app.key,
+      describe: funPermissions.setting.app.describe,
+      key: funPermissions.setting.app.key,
       disable: false,
       supportVirtualApp: true,
-      checked: isAll || settingIsAll || !!map[funPermissions['standard'].setting.app.key],
+      checked: isAll || settingIsAll || !!map[funPermissions.setting.app.key],
       children: []
     }];
     menuFun.push({
-      describe: funPermissions['standard'].setting.default.describe,
-      key: funPermissions['standard'].setting.default.key,
-      checked: isAll || !!map[funPermissions['standard'].setting.default.key],
+      describe: funPermissions.setting.default.describe,
+      key: funPermissions.setting.default.key,
+      checked: isAll || !!map[funPermissions.setting.default.key],
       indeterminate: settingChildren.some(function (item) {
         return item.checked;
       }),
@@ -303,8 +306,8 @@ var AuthConfig = /*#__PURE__*/forwardRef(function (props, ref) {
     });
     setFunctionalPermissions({
       describe: '功能权限',
-      key: funPermissions['standard'].all.key,
-      // checked: !!map[funPermissions['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,13 +10,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 } 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 CEPData = props.CEPData;
+  var _useContext = useContext(BizGlobalDataContext),
+    funPermissions = _useContext.funPermissions;
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     dataPermissions = _useState2[0],
@@ -164,8 +166,8 @@ var AuthConfigCEP = /*#__PURE__*/forwardRef(function (props, ref) {
     });
     setFunctionalPermissions({
       describe: '功能权限',
-      key: funPermissions['standard'].all.key,
-      // checked: !!map[funPermissions['standard'].all.key],
+      key: funPermissions.all.key,
+      // checked: !!map[funPermissions.all.key],
       checked: checkedFunArr.length === dealFunConfigList.length,
       disable: false,
       supportVirtualApp: true,
@@ -182,7 +184,7 @@ var AuthConfigCEP = /*#__PURE__*/forwardRef(function (props, ref) {
     setDataPermissions({
       key: 1,
       describe: '数据权限',
-      // checked: !!map[funPermissions['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';
@@ -34,7 +33,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,
     showVirtualApp = _ref.showVirtualApp,
@@ -208,16 +208,16 @@ var CompanySetting = function CompanySetting(props) {
         });
       });
       request(api.app.queryLeftMenus, {
-        method: 'post',
+        method: 'get',
         params: {
-          app_id: data.id
+          appId: data.id
         }
       }).then(function (res) {
-        var menus = res && res.leftMenus || [];
+        var menus = res && res.data || [];
         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,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, { 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';
-// const { TextArea } = Input;
+import { BizGlobalDataContext } from '@zgfe/business-lib';
 var authConfigDetail = function authConfigDetail(props) {
   var name = props.name,
     authConfig = props.authConfig,
@@ -28,6 +27,9 @@ 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],
@@ -137,7 +139,7 @@ var authConfigDetail = function authConfigDetail(props) {
   };
   var loopFormatTopMenu = function loopFormatTopMenu(topMenu) {
     // 菜单不在权限配置中
-    if (!functionalPermissions['standard'][topMenu.name]) {
+    if (!funPermissions[topMenu.name]) {
       return null;
     }
     var childrenArr = [];
@@ -150,7 +152,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: '管理员角色',
@@ -170,7 +172,7 @@ var authConfigDetail = function authConfigDetail(props) {
     var formatMenu = {
       name: {
         describe: topMenu.nametext,
-        key: functionalPermissions['standard'][topMenu.name].key
+        key: funPermissions[topMenu.name].key
       },
       show: false,
       children: childrenArr
@@ -180,21 +182,21 @@ var authConfigDetail = function authConfigDetail(props) {
   var checkFunPermission = function checkFunPermission(key) {
     // 检查功能模块权限配置，true为有权限，false无权限
     if (!key) return false;
-    if (key === functionalPermissions['standard'].default.key) return true;
+    if (key === funPermissions.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['standard'].market.key;
+      var mktKey = funPermissions.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['standard'].all.key)) {
+    if (funAuthKeyArr.includes(funPermissions.all.key)) {
       // 功能权限：全选
       return true;
     }
@@ -231,14 +233,14 @@ var authConfigDetail = function authConfigDetail(props) {
     });
     // 设置菜单
     var setting = {
-      name: functionalPermissions['standard'].setting.default,
+      name: funPermissions.setting.default,
       show: false,
       children: [{
-        name: functionalPermissions['standard'].setting.company,
+        name: funPermissions.setting.company,
         show: false,
         children: []
       }, {
-        name: functionalPermissions['standard'].setting.app,
+        name: funPermissions.setting.app,
         show: false,
         children: []
       }]

package/es/utils/functionalPermissions.d.ts

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

package/es/utils/functionalPermissions.js

@@ -160,6 +160,9 @@ var standard = _objectSpread({
   userPortrait: {
     key: '/analysis/user/userPortrait'
   },
+  userJourney: {
+    key: '/cxp/userJourney'
+  },
   userTags: {
     key: '/analysis/user/userTags'
   },
@@ -219,6 +222,4 @@ var standard = _objectSpread({
     key: '/cxp/userJourney'
   }
 } : {});
-export default {
-  standard: standard
-};
+export default standard;

package/es/utils/util.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.6",
+  "version": "1.2.7-config.1",
   "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.59",
+    "@zgfe/business-lib": "1.1.62-journey.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": "82477bee1bb8552b87abd40ff6c595e17d099ad6",
+  "gitHead": "ba8370be39823bca2360bf9bf446f787ce506d84",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }