@zgfe/modules-settings 1.2.11 → 1.2.12

package/es/constants/api.d.ts

@@ -39,26 +39,6 @@ declare let apis: {
         queryFilter: string;
         queryNoticeConfig: string;
         editNoticeConfig: string;
-        queryDeptList: string;
-        addDept: string;
-        updateDept: string;
-        deleteDept: string;
-        queryRolePage: string;
-        queryRoleDetails: string;
-        queryRoleDataConfig: string;
-        queryRoleMenuTree: string;
-        queryRoleUser: string;
-        addRole: string;
-        updateRole: string;
-        deleteRole: string;
-        queryUserPage: string;
-        queryRoleListByUserId: string;
-        queryDeptListByUserId: string;
-        queryCompanyUserDetailsParam: string;
-        addCompanyUser: string;
-        updateCompanyUser: string;
-        delCompanyUser: string;
-        updateCompanyUserStatus: string;
     };
     eventMeta: {
         queryEventMeta: string;

package/es/constants/api.js

@@ -44,32 +44,8 @@ var apis = {
     queryFilter: '/user/queryFilter.jsp',
     //系统设置
     queryNoticeConfig: apiPrefix + '/systemSettings/queryNoticeSettings',
-    editNoticeConfig: apiPrefix + '/systemSettings/setNoticeSettings',
-    // 部门管理
-    queryDeptList: '/zg/web/v2/company/setting/queryDeptList',
-    addDept: '/zg/web/v2/company/setting/addDept',
-    updateDept: '/zg/web/v2/company/setting/updateDept',
-    deleteDept: '/zg/web/v2/company/setting/deleteDept',
-    // 角色管理
-    queryRolePage: '/zg/web/v2/company/setting/queryRolePage',
-    queryRoleDetails: '/zg/web/v2/company/setting/queryRoleDetails',
-    queryRoleDataConfig: '/zg/web/v2/company/setting/queryRoleDataConfig',
-    queryRoleMenuTree: '/zg/web/v2/company/setting/queryRoleMenuTree',
-    queryRoleUser: '/zg/web/v2/company/setting/queryRoleUser',
-    addRole: '/zg/web/v2/company/setting/addRole',
-    updateRole: '/zg/web/v2/company/setting/updateRole',
-    deleteRole: '/zg/web/v2/company/setting/deleteRole',
-    // 成员管理
-    queryUserPage: '/zg/web/v2/company/setting/queryUserPage',
-    queryRoleListByUserId: '/zg/web/v2/company/setting/queryRoleListByUserId',
-    queryDeptListByUserId: '/zg/web/v2/company/setting/queryDeptListByUserId',
-    queryCompanyUserDetailsParam: '/zg/web/v2/company/setting/queryCompanyUserDetailsParam',
-    addCompanyUser: '/zg/web/v2/company/setting/addCompanyUser',
-    updateCompanyUser: '/zg/web/v2/company/setting/updateCompanyUser',
-    delCompanyUser: '/zg/web/v2/company/setting/delCompanyUser',
-    updateCompanyUserStatus: '/zg/web/v2/company/setting/updateCompanyUserStatus' // 修改状态
+    editNoticeConfig: apiPrefix + '/systemSettings/setNoticeSettings'
   },
-
   eventMeta: {
     queryEventMeta: '/zg/web/v2/data/queryEventMetasOfGroup'
   },

package/es/modules/companySetting/appList/index.js

@@ -375,7 +375,7 @@ var appList = function appList(props) {
     className: "app-list-desc"
   }, /*#__PURE__*/React.createElement("li", null, "\u65E0\u9700\u4E3A\u4E00\u4E2A\u4EA7\u54C1\u7684\u4E0D\u540C\u5E73\u53F0\u521B\u5EFA\u591A\u4E2A\u5E94\u7528"), /*#__PURE__*/React.createElement("li", null, "\u63A8\u8350\u60A8\u4F7F\u7528\u4EA7\u54C1\u540D\u79F0\u547D\u540D\u5E94\u7528\u540D, \u5982\u3010", zgText, "\u3011\u800C\u975E\u3010", zgText, " IOS\u7248\u3011")))), /*#__PURE__*/React.createElement(BizDialog, {
     title: "\u5220\u9664\u5E94\u7528",
-    open: delPanelState,
+    visible: delPanelState,
     closable: true,
     onOk: function onOk() {
       setDelPanelState(false);

package/es/modules/companySetting/cost/index.js

@@ -139,9 +139,9 @@ var Cost = function Cost(props) {
   }, [accountEvents]);
   return /*#__PURE__*/React.createElement("div", {
     className: "company-setting-cost"
-  }, ready ? ENVIRONMENT != 'saas' ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("h5", null, "\u6982\u51B5"), /*#__PURE__*/React.createElement("table", null, /*#__PURE__*/React.createElement("thead", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("th", null, "\u5F53\u524D\u4F7F\u7528\u5468\u671F"), /*#__PURE__*/React.createElement("th", null, "\u5F53\u524D\u5E94\u7528\u6570"), /*#__PURE__*/React.createElement("th", null, "\u989D\u5B9A\u5E94\u7528\u6570"), /*#__PURE__*/React.createElement("th", null, "\u5F53\u524D\u4E8B\u4EF6\u91CF"), /*#__PURE__*/React.createElement("th", null, "\u989D\u5B9A\u4E8B\u4EF6\u603B\u91CF"), /*#__PURE__*/React.createElement("th", null, "\u5408\u540C\u671F\u5185\u4E8B\u4EF6\u91CF"))), /*#__PURE__*/React.createElement("tbody", null, /*#__PURE__*/React.createElement("tr", null, overview.length ? overview.map(function (item, index) {
+  }, ready ? ENVIRONMENT != 'saas' ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("h5", null, "\u6982\u51B5"), /*#__PURE__*/React.createElement("table", null, /*#__PURE__*/React.createElement("thead", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("th", null, "\u5F53\u524D\u4F7F\u7528\u5468\u671F"), /*#__PURE__*/React.createElement("th", null, "\u5F53\u524D\u5E94\u7528\u6570"), /*#__PURE__*/React.createElement("th", null, "\u989D\u5B9A\u5E94\u7528\u6570"), /*#__PURE__*/React.createElement("th", null, "\u5F53\u524D\u4E8B\u4EF6\u91CF"), /*#__PURE__*/React.createElement("th", null, "\u989D\u5B9A\u4E8B\u4EF6\u603B\u91CF"), /*#__PURE__*/React.createElement("th", null, "\u5408\u540C\u671F\u5185\u4E8B\u4EF6\u91CF"))), /*#__PURE__*/React.createElement("tbody", null, /*#__PURE__*/React.createElement("tr", null, overview.length ? overview.map(function (item) {
     return /*#__PURE__*/React.createElement("td", {
-      key: index
+      key: item
     }, item);
   }) : /*#__PURE__*/React.createElement("td", {
     colSpan: 6

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 { Tabs, notification } from 'antd';
+import { notification } from 'antd';
+import SettingTabs from '../../components/settingTabs';
 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,
@@ -115,17 +115,12 @@ 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);
@@ -158,21 +153,21 @@ var CompanySetting = function CompanySetting(props) {
     request(api.user.getCurrentUser, {
       method: 'get'
     }).then(function (res) {
-      var _res$data, _data$authConfig;
+      var _res$data;
       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 = 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);
+      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);
       //
       request(api.app.queryAppList, {
         method: 'get'
@@ -200,7 +195,7 @@ var CompanySetting = function CompanySetting(props) {
         setPageReady(apisOkNum);
       }).catch(function () {
         notification.error({
-          message: '信息获取失败1'
+          message: '信息获取失败'
         });
       });
       request(api.app.queryLeftMenus, {
@@ -226,12 +221,12 @@ var CompanySetting = function CompanySetting(props) {
         setPageReady(apisOkNum);
       }).catch(function () {
         notification.error({
-          message: '信息获取失败3'
+          message: '信息获取失败'
         });
       });
     }).catch(function () {
       notification.error({
-        message: '信息获取失败4'
+        message: '信息获取失败'
       });
     });
     request(api.setting.groupInfos, {
@@ -244,7 +239,7 @@ var CompanySetting = function CompanySetting(props) {
       setPageReady(apisOkNum);
     }).catch(function () {
       notification.error({
-        message: '信息获取失败2'
+        message: '信息获取失败'
       });
     });
   };
@@ -275,9 +270,15 @@ 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,6 +292,17 @@ 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();
@@ -314,6 +326,17 @@ 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();
@@ -325,44 +348,141 @@ 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) {
@@ -376,6 +496,30 @@ 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();
@@ -396,6 +540,43 @@ 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();
@@ -407,34 +588,65 @@ 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(key) {
+  var changeTab = function changeTab() {
     // setCurrentTab(tab);
-    setActiveKey(key);
+    setIsShowCreateApp(false);
   };
+  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: '公司信息',
-    children: /*#__PURE__*/React.createElement(Info, {
+    content: /*#__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: '成员管理',
-    children: /*#__PURE__*/React.createElement(User, {
+    label: '用户',
+    content: /*#__PURE__*/React.createElement(User, {
       ENVIRONMENT: ENVIRONMENT,
       settingCurrentUser: settingCurrentUser,
       id: id,
@@ -450,37 +662,10 @@ 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: '应用',
-    children: /*#__PURE__*/React.createElement(AppList, {
+    content: /*#__PURE__*/React.createElement(AppList, {
       dataAuth: dataAuth,
       isAdmin: isAdmin,
       isDemoAccount: isDemoAccount,
@@ -501,7 +686,7 @@ var CompanySetting = function CompanySetting(props) {
   }, {
     key: 'virtualApp',
     label: '虚拟应用',
-    children: /*#__PURE__*/React.createElement(VirtualApp, {
+    content: /*#__PURE__*/React.createElement(VirtualApp, {
       companyId: companyId,
       authConfig: authConfig,
       id: id,
@@ -514,7 +699,7 @@ var CompanySetting = function CompanySetting(props) {
   }, {
     key: 'cost',
     label: '套餐',
-    children: /*#__PURE__*/React.createElement(Cost, {
+    content: /*#__PURE__*/React.createElement(Cost, {
       ENVIRONMENT: ENVIRONMENT,
       companyAppList: companyAppList,
       companyId: companyId
@@ -523,26 +708,22 @@ var CompanySetting = function CompanySetting(props) {
   }, {
     key: 'weChatBinding',
     label: '微信账号绑定',
-    children: /*#__PURE__*/React.createElement(WechatBinding, null),
+    content: /*#__PURE__*/React.createElement(WechatBinding, null),
     hidden: !(showWeChatMenu && showMarketMenu && showDataDaily && isAdmin)
   }, {
     key: 'operationLog',
     label: '操作日志',
-    children: /*#__PURE__*/React.createElement(OperationLog, null),
+    content: /*#__PURE__*/React.createElement(OperationLog, null),
     hidden: !isAdmin
   }];
   return /*#__PURE__*/React.createElement("div", {
     className: "setting setting-content company-setting"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "company-setting-title"
-  }, "\u516C\u53F8\u8BBE\u7F6E"), pageReady >= 3 ? /*#__PURE__*/React.createElement(Tabs, {
-    className: "company-setting-tabs",
-    destroyInactiveTabPane: true,
-    activeKey: activeKey,
-    onChange: changeTab,
-    items: items.filter(function (item) {
-      return item.hidden !== true;
-    })
+  }, pageReady >= 3 ? /*#__PURE__*/React.createElement(SettingTabs, {
+    typeName: "companySetting",
+    currentKey: action == 'createApp' ? 'appList' : '',
+    onClick: changeTab,
+    title: title,
+    items: items
   }) : /*#__PURE__*/React.createElement(PageLoading, {
     "v-else": true
   }));