@zgfe/modules-settings 1.2.9 → 1.2.10-role1

package/es/modules/companySetting/index.js

@@ -15,16 +15,16 @@ import { BizGlobalDataContext } from '@zgfe/business-lib';
 import request from './../../utils/ajax';
 import api from './../../constants/api';
 import PageLoading from '../../components/pageLoading';
-import { notification } from 'antd';
-import SettingTabs from '../../components/settingTabs';
+import { Tabs, notification } from 'antd';
 import Info from './info';
-import UserGroup from './userGroup';
 import User from './user';
 import AppList from './appList';
 import VirtualApp from './virtualApp';
 import Cost from './cost';
 import WechatBinding from './wechatBinding';
 import OperationLog from './operationLog';
+import DepartmentList from './department';
+import RoleList from './role';
 var CompanySetting = function CompanySetting(props) {
   var showWeChatMenu = props.showWeChatMenu,
     showMarketMenu = props.showMarketMenu,
@@ -114,12 +114,17 @@ var CompanySetting = function CompanySetting(props) {
     _useState34 = _slicedToArray(_useState33, 2),
     isShowCreateApp = _useState34[0],
     setIsShowCreateApp = _useState34[1];
+  var _useState35 = useState('info'),
+    _useState36 = _slicedToArray(_useState35, 2),
+    activeKey = _useState36[0],
+    setActiveKey = _useState36[1]; // 默认值
   useEffect(function () {
     getSettingData();
     apisOkNum = 0;
   }, []);
   useEffect(function () {
     if (action == 'createApp') {
+      setActiveKey('appList');
       setIsShowCreateApp(true);
     } else {
       setIsShowCreateApp(false);
@@ -152,21 +157,21 @@ var CompanySetting = function CompanySetting(props) {
     request(api.user.getCurrentUser, {
       method: 'get'
     }).then(function (res) {
-      var _res$data;
+      var _res$data, _data$authConfig;
       var data = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.user;
       if (!data) return;
       data.isCreator = data.id === data.userId;
       data.isDemoAccount = data.email === 'demo@zhugeio.com';
       setSettingCurrentUser(data);
       // 给 应用页面 传递的数据
-      setDataAuth(data.authConfig.dataAuth || []);
-      setIsAdmin(data.isAdmin);
-      setIsDemoAccount(data.isDemoAccount);
-      setAuthConfig(data.authConfig);
-      setId(data.id);
-      setCompanyId(data.companyId);
-      setCompanyName(data.companyName);
-      setServiceType(data.serviceType);
+      setDataAuth(((_data$authConfig = data.authConfig) === null || _data$authConfig === void 0 ? void 0 : _data$authConfig.dataAuth) || []);
+      setIsAdmin(data === null || data === void 0 ? void 0 : data.isAdmin);
+      setIsDemoAccount(data === null || data === void 0 ? void 0 : data.isDemoAccount);
+      setAuthConfig(data === null || data === void 0 ? void 0 : data.authConfig);
+      setId(data === null || data === void 0 ? void 0 : data.id);
+      setCompanyId(data === null || data === void 0 ? void 0 : data.companyId);
+      setCompanyName(data === null || data === void 0 ? void 0 : data.companyName);
+      setServiceType(data === null || data === void 0 ? void 0 : data.serviceType);
       //
       request(api.app.queryAppList, {
         method: 'get'
@@ -194,7 +199,7 @@ var CompanySetting = function CompanySetting(props) {
         setPageReady(apisOkNum);
       }).catch(function () {
         notification.error({
-          message: '信息获取失败'
+          message: '信息获取失败1'
         });
       });
       request(api.app.queryLeftMenus, {
@@ -220,12 +225,12 @@ var CompanySetting = function CompanySetting(props) {
         setPageReady(apisOkNum);
       }).catch(function () {
         notification.error({
-          message: '信息获取失败'
+          message: '信息获取失败3'
         });
       });
     }).catch(function () {
       notification.error({
-        message: '信息获取失败'
+        message: '信息获取失败4'
       });
     });
     request(api.setting.groupInfos, {
@@ -238,7 +243,7 @@ var CompanySetting = function CompanySetting(props) {
       setPageReady(apisOkNum);
     }).catch(function () {
       notification.error({
-        message: '信息获取失败'
+        message: '信息获取失败2'
       });
     });
   };
@@ -269,15 +274,9 @@ var CompanySetting = function CompanySetting(props) {
     });
   };
   var changeCompanyNameCallback = function changeCompanyNameCallback() {
-    // 对外提供的api， 在设置模块-》公司设置-》公司信息，修改应用名称，成功修改时调用
-    // 用来处理同步主应用可能需要的刷新的逻辑， 可不传
-    // settingChangeCompanyNameCallback && settingChangeCompanyNameCallback();
     getSettingData();
     settingCallback && settingCallback('settingChangeCompanyNameCallback');
-    // 与主应用同步信息 下面为老代码逻辑
-    // this.$store.dispatch(actions.user.getCurrentUser)
   };
-
   var delAppCallback = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(formData, id) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -291,17 +290,6 @@ var CompanySetting = function CompanySetting(props) {
               formData: formData,
               id: id
             });
-            // 刷新setting模块内的数据
-            // 与主应用同步信息 下面为老代码逻辑
-            // await this.$store.dispatch(actions.setting.updateUserAuth, formData)
-            //   await this.$store.dispatch(actions.user.getCurrentUser)
-            //   if (appId) {
-            //     this.$router.push({ params: { appId: appId } })
-            //   }
-            //   await this.$store.dispatch(actions.app.queryAppList)
-            //   if (callback) {
-            //     callback()
-            //   }
           case 4:
           case "end":
             return _context.stop();
@@ -325,17 +313,6 @@ var CompanySetting = function CompanySetting(props) {
               formData: formData,
               id: id
             });
-            // 刷新setting模块内的数据
-            // 与主应用同步信息 下面为老代码逻辑
-            // await this.$store.dispatch(actions.setting.updateUserAuth, formData)
-            // await this.$store.dispatch(actions.user.getCurrentUser)
-            // if (appId) {
-            //   this.$router.push({ params: { appId: appId } })
-            // }
-            // await this.$store.dispatch(actions.app.queryAppList)
-            // if (callback) {
-            //   callback()
-            // }
           case 4:
           case "end":
             return _context2.stop();
@@ -347,141 +324,44 @@ var CompanySetting = function CompanySetting(props) {
     };
   }();
   var gotoAppSetting = function gotoAppSetting(id) {
-    // 对外提供的api， 在设置模块-》公司设置-》应用页面，应用设置，点击时调用
-    // 用来处理同步主应用可能需要的刷新的逻辑， 可不传
-    // settingGotoAppSetting && settingGotoAppSetting({id});
     settingCallback && settingCallback('settingGotoAppSetting', {
       id: id
     });
-    // 与主应用同步信息 下面为老代码逻辑
-    // this.$store.dispatch(actions.app.setCurrentApp, { appId: data.id })
-    // this.$router.push({
-    //   name: routes.setting.app.index
-    // })
   };
-
   var gotoAppPanel = function gotoAppPanel(id) {
-    // 对外提供的api， 在设置模块-》公司设置-》应用页面，应用名称，点击时调用
-    // 用来处理同步主应用可能需要的刷新的逻辑， 可不传
-    // settingGotoAppPanel && settingGotoAppPanel({id});
     settingCallback && settingCallback('settingGotoAppPanel', {
       id: id
     });
-    // 与主应用同步信息 下面为老代码逻辑
-    // this.$store
-    //   .dispatch(actions.app.setCurrentApp, { appId: data.id })
-    //   .then(() => {
-    //     this.$router.push({
-    //       name: 'home'
-    //     })
-    //   })
   };
-
   var removeUserCallback = function removeUserCallback(delIndex) {
-    // 对外提供的api， 在设置模块-》用户-》成员列表页面删除成员成功时调用
-    // 用来处理同步主应用可能需要的刷新的逻辑， 可不传
-    // settingRemoveUserCallback && settingRemoveUserCallback({id});
     settingCallback && settingCallback('settingRemoveUserCallback', {
       delIndex: delIndex
     });
     refreshGroupList();
-    // 与主应用同步信息 下面为老代码逻辑
-    // this.$store.commit(mutations.setting.delMember, delIndex)
-    // if (userData.authConfig.groupIds.length) {
-    //   // 如果成员有权限组 更新权限组接口
-    //   this.$store.dispatch(actions.setting.getGroupInfos, false)
-    // }
   };
-
   var changeUserAuthCallback = function changeUserAuthCallback(id) {
-    // 对外提供的api， 在设置模块-》用户-》成员列表页面编辑成员权限成功时调用
-    // 用来处理同步主应用可能需要的刷新的逻辑， 可不传
-    // settingChangeUserAuthCallback && settingChangeUserAuthCallback({id});
     settingCallback && settingCallback('settingChangeUserAuthCallback', {
       id: id
     });
     refreshGroupList();
-    // 与主应用同步信息 下面为老代码逻辑
-    // let arr = []
-    // if (this.data && this.data.id === this.currentUser.id) {
-    //   arr.push(
-    //     this.$store.dispatch(actions.user.getCurrentUser).then(() => {
-    //       this.$store.commit(mutations.app.updateAppList, {
-    //         appList: this.appList,
-    //         user: this.currentUser
-    //       })
-    //     })
-    //   )
-    // }
-    // Promise.all(arr).then(() => {
-    //   this.$message({
-    //     message: '保存成功',
-    //     type: 'success'
-    //   })
-    //   this.btnLoading = false
-    //   this.onCancel()
-    // })
   };
-
   var createMembersCallback = function createMembersCallback(res, userConfig) {
-    // 对外提供的api， 在设置模块-》用户-》成员列表页面 创建成员成功时调用
-    // 用来处理同步主应用可能需要的刷新的逻辑， 可不传
-    // settingCreateMembersCallback && settingCreateMembersCallback(res);
     settingCallback && settingCallback('settingCreateMembersCallback', {
       popup: res.popup,
       userConfig: userConfig
     });
     refreshGroupList();
-    // 与主应用同步信息 下面为老代码逻辑
-    // if (res.popup) {
-    //   this.$store.commit(mutations.setting.addInviteUser, userConfig)
-    // } else {
-    //   this.$store.dispatch(actions.setting.getGroupMembers, false)
-    // }
   };
-
   var changeAdminCallback = function changeAdminCallback(res) {
-    // 对外提供的api， 在设置模块-》用户-》成员列表页面 移交超级管理员成功时调用
-    // 用来处理同步主应用可能需要的刷新的逻辑， 可不传
-    // settingChangeAdminCallback && settingChangeAdminCallback(res);
     settingCallback && settingCallback('settingChangeAdminCallback', res);
-    // 与主应用同步信息 下面为老代码逻辑
-    // setTimeout(() => {
-    //   window.location.href = '/'
-    // }, 400)
-  };
-
-  var delGroupCallback = function delGroupCallback(id) {
-    // 对外提供的api， 在设置模块-》用户组-》用户组列表页面 删除用户成功时调用
-    // 用来处理同步主应用可能需要的刷新的逻辑， 可不传
-    // settingDelGroupCallback && settingDelGroupCallback({id});
-    settingCallback && settingCallback('settingDelGroupCallback', {
-      id: id
-    });
-    refreshGroupList();
-    // 与主应用同步信息 下面为老代码逻辑
-    // this.$store.commit(mutations.setting.delGroup, this.groupData.id)
-  };
-
-  var updateGroupAuthCallback = function updateGroupAuthCallback(isUser) {
-    // 对外提供的api， 在设置模块-》用户组-》用户组列表页面 更新用户组权限成功时调用
-    // 用来处理同步主应用可能需要的刷新的逻辑， 可不传
-    // settingUpdateGroupAuthCallback && settingUpdateGroupAuthCallback({isUser});
-    settingCallback && settingCallback('settingUpdateGroupAuthCallback', {
-      isUser: isUser
-    });
-    refreshGroupList();
-    // 与主应用同步信息 下面为老代码逻辑
-    // if (hasCurrentUser) {
-    //     this.$store.dispatch(actions.user.getCurrentUser).then(() => {
-    //       this.$store.commit(mutations.app.updateAppList, {
-    //         appList: this.appList,
-    //         user: this.currentUser
-    //       })
-    //     })
-    // }
   };
-
+  // const delGroupCallback = (id: number) => {
+  //   settingCallback && settingCallback('settingDelGroupCallback', { id });
+  // };
+  // const updateGroupAuthCallback = (isUser: boolean) => {
+  //   settingCallback && settingCallback('settingUpdateGroupAuthCallback', { isUser });
+  //   refreshGroupList();
+  // };
   var createVirtualAppCallback = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(res, formData) {
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
@@ -495,30 +375,6 @@ var CompanySetting = function CompanySetting(props) {
               res: res,
               formData: formData
             });
-            // 与主应用同步信息 下面为老代码逻辑
-            // this.$store.commit(mutations.virtualApp.addVirtualApp, res)
-            // // 添加数据权限
-            // let authConfig = util.clone(this.currentUser.authConfig)
-            // if (
-            //   !(
-            //     authConfig.dataAuth.length === 1 &&
-            //     authConfig.dataAuth[0].appId === 0
-            //   )
-            // ) {
-            //   authConfig.dataAuth.unshift({
-            //     appId: res.app_info.id,
-            //     plats: [0]
-            //   })
-            // }
-            // let formData = {
-            //   userId: this.currentUser.id,
-            //   authConfig: JSON.stringify(authConfig),
-            //   groupIds: this.userOfGroups.join(',')
-            // }
-            // this.$store.dispatch(actions.setting.updateUserAuth, formData)
-            // this.$store.dispatch(actions.user.getCurrentUser)
-            // // 更新应用列表数据
-            // this.$store.dispatch(actions.app.queryAppList)
           case 4:
           case "end":
             return _context3.stop();
@@ -539,43 +395,6 @@ var CompanySetting = function CompanySetting(props) {
           case 2:
             getSettingData();
             settingCallback && settingCallback('settingDelVirtualAppCallback', res);
-            // 与主应用同步信息 下面为老代码逻辑
-            // this.$store.commit(mutations.virtualApp.delVirtualApp, appId)
-            // // 更新数据权限
-            // let authConfig = util.clone(this.currentUser.authConfig)
-            // if (
-            //   !(
-            //     authConfig.dataAuth.length === 1 &&
-            //     authConfig.dataAuth[0].appId === 0
-            //   )
-            // ) {
-            //   let index = authConfig.dataAuth.findIndex(
-            //     item => item.appId === appId
-            //   )
-            //   if (index > -1) {
-            //     authConfig.dataAuth.splice(index, 1)
-            //   }
-            // }
-            // if (this.currentApp.id === appId) {
-            //   let hasAuthApplistToDelAfter = this.hasAuthApplist.filter(
-            //     item => item.id !== appId
-            //   )
-            //   let id = hasAuthApplistToDelAfter.length ? hasAuthApplistToDelAfter[0].id : 0
-            //   this.$router.push({
-            //     params: {
-            //       appId: id
-            //     }
-            //   })
-            // }
-            // let formData = {
-            //   userId: this.currentUser.userId,
-            //   authConfig: JSON.stringify(authConfig),
-            //   groupIds: this.userOfGroups.join(',')
-            // }
-            // this.$store.dispatch(actions.setting.updateUserAuth, formData)
-            // this.$store.dispatch(actions.user.getCurrentUser)
-            // // 更新应用列表数据
-            // this.$store.dispatch(actions.app.queryAppList)
           case 4:
           case "end":
             return _context4.stop();
@@ -587,65 +406,34 @@ var CompanySetting = function CompanySetting(props) {
     };
   }();
   var editVirtualAppCallback = function editVirtualAppCallback(id) {
-    // 对外提供的api， 在设置模块-》虚拟应用-》虚拟应用列表页面 删除成功时调用
-    // 用来处理同步主应用可能需要的刷新的逻辑， 可不传
-    // settingUpdateGroupAuthCallback && settingUpdateGroupAuthCallback({isUser});
     settingCallback && settingCallback('settingEditVirtualAppCallback', {
       id: id
     });
     getSettingData();
-    // 与主应用同步信息 下面为老代码逻辑
-    // if (this.currentApp && this.currentApp.id === params.app_id) {
-    //   this.$store.dispatch(actions.biz.sys.queryEventMeta, {
-    //     appId: this.appId,
-    //     platform: this.platform,
-    //     force: true
-    //   })
-    // }
   };
-
   var closeCreateCallback = function closeCreateCallback() {
     // 对外提供的api， 在设置模块-》应用-》创建应用关闭时调用
     // 用来处理同步主应用可能需要的刷新的逻辑， 可不传
     settingCallback && settingCallback('settingCloseCreateCallback');
   };
-  var changeTab = function changeTab() {
+  var changeTab = function changeTab(key) {
     // setCurrentTab(tab);
-    setIsShowCreateApp(false);
+    setActiveKey(key);
   };
-  var title = /*#__PURE__*/React.createElement("div", {
-    className: "setting-title"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "setting-icon icon-company"
-  }), /*#__PURE__*/React.createElement("label", null, "\u516C\u53F8\u8BBE\u7F6E"));
   var items = [{
     key: 'info',
     label: '公司信息',
-    content: /*#__PURE__*/React.createElement(Info, {
+    children: /*#__PURE__*/React.createElement(Info, {
       ENVIRONMENT: ENVIRONMENT,
       companyId: companyId,
       companyName: companyName,
       changeCompanyNameCallback: changeCompanyNameCallback
     }),
     hidden: false
-  }, {
-    key: 'userGroup',
-    label: '用户组',
-    content: /*#__PURE__*/React.createElement(UserGroup, {
-      id: id,
-      companyAppList: companyAppList,
-      allGroupInfos: allGroupInfos,
-      leftMenus: leftMenus,
-      isAdmin: isAdmin,
-      delGroupCallback: delGroupCallback,
-      updateGroupAuthCallback: updateGroupAuthCallback,
-      serviceType: serviceType
-    }),
-    hidden: false
   }, {
     key: 'user',
-    label: '用户',
-    content: /*#__PURE__*/React.createElement(User, {
+    label: '成员管理',
+    children: /*#__PURE__*/React.createElement(User, {
       ENVIRONMENT: ENVIRONMENT,
       settingCurrentUser: settingCurrentUser,
       id: id,
@@ -661,10 +449,37 @@ var CompanySetting = function CompanySetting(props) {
       serviceType: serviceType
     }),
     hidden: false
+  }, {
+    key: 'userGroup',
+    label: '角色管理',
+    children:
+    /*#__PURE__*/
+    // <UserGroup
+    //   id={id as number}
+    //   companyAppList={companyAppList}
+    //   allGroupInfos={allGroupInfos}
+    //   leftMenus={leftMenus}
+    //   isAdmin={isAdmin}
+    //   delGroupCallback={delGroupCallback}
+    //   updateGroupAuthCallback={updateGroupAuthCallback}
+    //   serviceType={serviceType}
+    // />
+    React.createElement(RoleList, {
+      companyId: companyId
+    }),
+    hidden: false
+  }, {
+    key: 'department',
+    label: '部门管理',
+    children: /*#__PURE__*/React.createElement(DepartmentList, {
+      companyId: companyId,
+      closeCreateCallback: closeCreateCallback
+    }),
+    hidden: false
   }, {
     key: 'appList',
     label: '应用',
-    content: /*#__PURE__*/React.createElement(AppList, {
+    children: /*#__PURE__*/React.createElement(AppList, {
       dataAuth: dataAuth,
       isAdmin: isAdmin,
       isDemoAccount: isDemoAccount,
@@ -685,7 +500,7 @@ var CompanySetting = function CompanySetting(props) {
   }, {
     key: 'virtualApp',
     label: '虚拟应用',
-    content: /*#__PURE__*/React.createElement(VirtualApp, {
+    children: /*#__PURE__*/React.createElement(VirtualApp, {
       companyId: companyId,
       authConfig: authConfig,
       id: id,
@@ -698,7 +513,7 @@ var CompanySetting = function CompanySetting(props) {
   }, {
     key: 'cost',
     label: '套餐',
-    content: /*#__PURE__*/React.createElement(Cost, {
+    children: /*#__PURE__*/React.createElement(Cost, {
       ENVIRONMENT: ENVIRONMENT,
       companyAppList: companyAppList,
       companyId: companyId
@@ -707,22 +522,23 @@ var CompanySetting = function CompanySetting(props) {
   }, {
     key: 'weChatBinding',
     label: '微信账号绑定',
-    content: /*#__PURE__*/React.createElement(WechatBinding, null),
+    children: /*#__PURE__*/React.createElement(WechatBinding, null),
     hidden: !(showWeChatMenu && showMarketMenu && showDataDaily && isAdmin)
   }, {
     key: 'operationLog',
     label: '操作日志',
-    content: /*#__PURE__*/React.createElement(OperationLog, null),
+    children: /*#__PURE__*/React.createElement(OperationLog, null),
     hidden: !isAdmin
   }];
   return /*#__PURE__*/React.createElement("div", {
     className: "setting setting-content company-setting"
-  }, pageReady >= 3 ? /*#__PURE__*/React.createElement(SettingTabs, {
-    typeName: "companySetting",
-    currentKey: action == 'createApp' ? 'appList' : '',
-    onClick: changeTab,
-    title: title,
-    items: items
+  }, pageReady >= 3 ? /*#__PURE__*/React.createElement(Tabs, {
+    destroyInactiveTabPane: true,
+    activeKey: activeKey,
+    onChange: changeTab,
+    items: items.filter(function (item) {
+      return item.hidden !== true;
+    })
   }) : /*#__PURE__*/React.createElement(PageLoading, {
     "v-else": true
   }));

package/es/modules/companySetting/index.less

@@ -1,12 +1,33 @@
 @import '~@zgfe/business-lib/es/assets/styles/inner.less';
 @import './style/common.less';
+
+.ant-card-body {
+  padding: 16px;
+  background-color: #fafafb;
+}
+
 .company-setting {
+  background: #fff;
+  border: 1px solid var(--unnamed, #ecedf0);
+  border-radius: 8px;
+  .hidden-tab {
+    display: none;
+  }
+  .ant-tabs-nav-wrap {
+    margin: 0 24px;
+  }
+
+  .ant-tabs-content {
+    padding: 8px 24px 24px 24px;
+  }
+
   .setting-tab {
     li:nth-child(1),
     li:nth-child(3),
     li:nth-child(6) {
       margin-bottom: 10px;
     }
+
     li {
       &:nth-child(2),
       &:nth-child(4) > a {
@@ -15,9 +36,11 @@
     }
   }
 }
+
 .setting-title {
   color: initial;
   font-size: 18px;
+
   label {
     font-weight: bold;
   }

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

@@ -0,0 +1,6 @@
+import React from 'react';
+import './index.less';
+declare const RoleList: React.FC<{
+    companyId: number;
+}>;
+export default RoleList;