@zgfe/modules-settings 1.0.1-a.0 → 1.0.1-a.1

package/dist/esm/constants/api.d.ts

@@ -10,6 +10,8 @@ declare let apis: {
         queryPackageInfo: string;
     };
     setting: {
+        updateCompanyName: string;
+        updateLicense: string;
         groupInfos: string;
         getGroupMembers: string;
         removeMember: string;

package/dist/esm/constants/api.js

@@ -12,6 +12,8 @@ var apis = {
     queryPackageInfo: apiPrefix + '/system/packageInfo'
   },
   setting: {
+    updateCompanyName: apiPrefix + '/common/proxy/company/v2updateInfo.jsp',
+    updateLicense: apiPrefix + '/system/license',
     groupInfos: apiPrefix + '/common/proxy/auth/groupInfos.jsp',
     getGroupMembers: apiPrefix + '/common/proxy/company/getGroupMembers.jsp',
     removeMember: apiPrefix + '/common/proxy/company/v2deleteUser.jsp',

package/dist/esm/modules/companySetting/appList/index.js

@@ -204,7 +204,7 @@ var appList = function appList(props) {
     }
     request(api.app.deleteApp, {
       method: 'post',
-      data: {
+      params: {
         app_id: delAppId
       }
     }).then(function (res) {
@@ -256,7 +256,7 @@ var appList = function appList(props) {
     var msg = '';
     request(api.app.createApp, {
       method: 'post',
-      data: {
+      params: {
         app_name: appNameVal,
         companyId: companyId
       }

package/dist/esm/modules/companySetting/cost/index.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import './index.less';
-declare const Info: React.FC<{
-    updateCurrentUser?: () => void;
+declare const Cost: React.FC<{
+    companyAppList: any;
+    companyId: Number;
 }>;
-export default Info;
+export default Cost;

package/dist/esm/modules/companySetting/cost/index.js

@@ -12,7 +12,9 @@ import request from "./../../../utils/ajax";
 import api from "./../../../constants/api";
 import PageLoading from "../../../components/pageLoading";
 var TextArea = Input.TextArea;
-var Info = function Info(props) {
+var Cost = function Cost(props) {
+  var companyAppList = props.companyAppList,
+    companyId = props.companyId;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     currentUser = _useContext.currentUser,
@@ -35,22 +37,15 @@ var Info = function Info(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     appCount = _useState8[0],
     setAppCount = _useState8[1];
+  useEffect(function () {
+    setAppCount((companyAppList || []).length);
+  }, [props.companyAppList]);
   useEffect(function () {
     setReady(false);
-    request(api.app.queryAppList, {
-      method: 'get'
-    }).then(function (res) {
-      if (!res) return;
-      setAppCount((res.applist || []).length);
-    }).catch(function (err) {
-      notification.error({
-        message: '费用信息获取失败'
-      });
-    });
     request(api.app.queryPackageInfo, {
       method: 'post',
-      data: {
-        companyId: currentUser === null || currentUser === void 0 ? void 0 : currentUser.companyId
+      params: {
+        companyId: companyId
       }
     }).then(function (res) {
       if (!res) return;
@@ -76,4 +71,4 @@ var Info = function Info(props) {
     colspan: "4"
   }, "\u6682\u65E0\u6570\u636E"))))) : /*#__PURE__*/React.createElement(PageLoading, null));
 };
-export default Info;
+export default Cost;

package/dist/esm/modules/companySetting/edit/user.d.ts

@@ -6,6 +6,7 @@ declare const Info: React.FC<{
     companyAppList: [];
     isMarsUi: Boolean;
     leftMenus: [];
+    serviceType: Number;
     onCancel: Function;
     changeUserAuthCallback: Function;
 }>;

package/dist/esm/modules/companySetting/edit/user.js

@@ -20,6 +20,7 @@ var Info = function Info(props) {
     companyAppList = props.companyAppList,
     isMarsUi = props.isMarsUi,
     leftMenus = props.leftMenus,
+    serviceType = props.serviceType,
     onCancel = props.onCancel,
     changeUserAuthCallback = props.changeUserAuthCallback;
   var _useContext = useContext(BizGlobalDataContext),
@@ -105,7 +106,7 @@ var Info = function Info(props) {
     setBtnLoading(true);
     request(apis.setting.updateUserAuth, {
       method: 'post',
-      data: formData
+      params: formData
     }).then(function () {
       changeUserAuthCallback && changeUserAuthCallback(data && data.id);
       notification.success({
@@ -187,7 +188,7 @@ var Info = function Info(props) {
     onChange: function onChange(e) {
       return setCurrentTab(e);
     }
-  }, /*#__PURE__*/React.createElement(Tabs.TabPane, {
+  }, !serviceType || serviceType === 1 ? /*#__PURE__*/React.createElement(Tabs.TabPane, {
     tab: "\u8BF8\u845Bio",
     key: "io"
   }, /*#__PURE__*/React.createElement(AuthConfig, {
@@ -196,7 +197,7 @@ var Info = function Info(props) {
     appList: companyAppList,
     isMarsUi: isMarsUi,
     leftMenus: leftMenus
-  })), /*#__PURE__*/React.createElement(Tabs.TabPane, {
+  })) : null, !serviceType || serviceType === 2 ? /*#__PURE__*/React.createElement(Tabs.TabPane, {
     tab: "CEP",
     key: "cep"
   }, /*#__PURE__*/React.createElement(AuthConfigCEP, {
@@ -206,7 +207,7 @@ var Info = function Info(props) {
     appList: companyAppList,
     isMarsUi: isMarsUi,
     leftMenus: leftMenus
-  }))), /*#__PURE__*/React.createElement("div", {
+  })) : null), /*#__PURE__*/React.createElement("div", {
     className: "company-setting-footer"
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: onCancelCallback

package/dist/esm/modules/companySetting/edit/userGroup.d.ts

@@ -8,7 +8,9 @@ declare const CompanySettingUserGroup: React.FC<{
     isMarsUi: Boolean;
     leftMenus: [];
     isAdmin: Boolean;
+    serviceType: Number;
     onCancel: Function;
     updateGroupAuthCallback: Function;
+    changeUserAuthCallback: Function;
 }>;
 export default CompanySettingUserGroup;

package/dist/esm/modules/companySetting/edit/userGroup.js

@@ -29,8 +29,10 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
     isMarsUi = props.isMarsUi,
     leftMenus = props.leftMenus,
     isAdmin = props.isAdmin,
+    serviceType = props.serviceType,
     onCancel = props.onCancel,
-    updateGroupAuthCallback = props.updateGroupAuthCallback;
+    updateGroupAuthCallback = props.updateGroupAuthCallback,
+    changeUserAuthCallback = props.changeUserAuthCallback;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     currentUser = _useContext.currentUser,
@@ -84,7 +86,7 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
         return res.data;
       }
       throw new Error('接口返回错误');
-    }), request(apis.setting.queryFunConfigByUserId, {
+    }), data.id && request(apis.setting.queryFunConfigByUserId, {
       method: 'post',
       data: {
         groupId: data.id,
@@ -168,7 +170,7 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
     };
     request(apis.setting.updateGroupAuth, {
       method: 'post',
-      data: formData
+      params: formData
     }).then(function () {
       // let arr = []
       var hasCurrentUser = user.concat(oldUser).map(function (item) {
@@ -190,9 +192,9 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
     if (currentTab === 'cep') {
       var _authConfig = refAuthCEPConfig.current.getFormData();
       console.log(_authConfig);
-      var groupIdArr = groups.map(function (item) {
-        return item.id;
-      });
+      // let groupIdArr = groups.map((item) => {
+      //   return item.id;
+      // });
       var _formData = {
         groupId: data.id,
         appIds: _authConfig.dataAuth.map(function (item) {
@@ -286,7 +288,7 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
     onChange: function onChange(e) {
       return setCurrentTab(e);
     }
-  }, /*#__PURE__*/React.createElement(Tabs.TabPane, {
+  }, !serviceType || serviceType === 1 ? /*#__PURE__*/React.createElement(Tabs.TabPane, {
     tab: "\u8BF8\u845Bio",
     key: "io"
   }, /*#__PURE__*/React.createElement(AuthConfig, {
@@ -295,7 +297,7 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
     appList: companyAppList,
     isMarsUi: isMarsUi,
     leftMenus: leftMenus
-  })), /*#__PURE__*/React.createElement(Tabs.TabPane, {
+  })) : null, !serviceType || serviceType === 2 ? /*#__PURE__*/React.createElement(Tabs.TabPane, {
     tab: "CEP",
     key: "cep"
   }, /*#__PURE__*/React.createElement(AuthConfigCEP, {
@@ -305,7 +307,7 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
     appList: companyAppList,
     isMarsUi: isMarsUi,
     leftMenus: leftMenus
-  }))), /*#__PURE__*/React.createElement("div", {
+  })) : null), /*#__PURE__*/React.createElement("div", {
     className: "company-setting-footer"
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: onCancelCallback

package/dist/esm/modules/companySetting/index.js

@@ -42,6 +42,7 @@ export default (function (_ref) {
   var showDataDaily = false;
   var showVirtualApp = false;
   var isAdminUser = false;
+  var apisOkNum = 0;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
   var _useState = useState('userGroup'),
@@ -73,45 +74,58 @@ export default (function (_ref) {
     _useState14 = _slicedToArray(_useState13, 2),
     id = _useState14[0],
     setId = _useState14[1];
-  var _useState15 = useState(Number),
+  var _useState15 = useState(''),
     _useState16 = _slicedToArray(_useState15, 2),
-    companyId = _useState16[0],
-    setCompanyId = _useState16[1];
-  // groupInfos
-  var _useState17 = useState([]),
+    companyName = _useState16[0],
+    setCompanyName = _useState16[1];
+  var _useState17 = useState(Number),
     _useState18 = _slicedToArray(_useState17, 2),
-    allGroupInfos = _useState18[0],
-    setAllGroupInfos = _useState18[1];
-  var _useState19 = useState({}),
+    companyId = _useState18[0],
+    setCompanyId = _useState18[1];
+  // groupInfos
+  var _useState19 = useState([]),
     _useState20 = _slicedToArray(_useState19, 2),
-    groupHashList = _useState20[0],
-    setGroupHashList = _useState20[1];
+    allGroupInfos = _useState20[0],
+    setAllGroupInfos = _useState20[1];
+  var _useState21 = useState({}),
+    _useState22 = _slicedToArray(_useState21, 2),
+    groupHashList = _useState22[0],
+    setGroupHashList = _useState22[1];
   // queryAppList
   // companyAppList：公司内所有应用，包括无权限的应用（普通应用、虚拟应用）
   // appList: 当前用户有权限的应用（普通应用、虚拟应用）
-  var _useState21 = useState([]),
-    _useState22 = _slicedToArray(_useState21, 2),
-    companyAppList = _useState22[0],
-    setCompanyAppList = _useState22[1];
   var _useState23 = useState([]),
     _useState24 = _slicedToArray(_useState23, 2),
-    appList = _useState24[0],
-    setAppList = _useState24[1];
+    companyAppList = _useState24[0],
+    setCompanyAppList = _useState24[1];
   var _useState25 = useState([]),
     _useState26 = _slicedToArray(_useState25, 2),
-    companyRealAppList = _useState26[0],
-    setCompanyRealAppList = _useState26[1];
-  // queryLeftMenus
+    appList = _useState26[0],
+    setAppList = _useState26[1];
   var _useState27 = useState([]),
     _useState28 = _slicedToArray(_useState27, 2),
-    leftMenus = _useState28[0],
-    setLeftMenus = _useState28[1];
-  var _useState29 = useState({}),
+    companyRealAppList = _useState28[0],
+    setCompanyRealAppList = _useState28[1];
+  // queryLeftMenus
+  var _useState29 = useState([]),
     _useState30 = _slicedToArray(_useState29, 2),
-    menusNameMap = _useState30[0],
-    setMenusNameMap = _useState30[1];
+    leftMenus = _useState30[0],
+    setLeftMenus = _useState30[1];
+  var _useState31 = useState({}),
+    _useState32 = _slicedToArray(_useState31, 2),
+    menusNameMap = _useState32[0],
+    setMenusNameMap = _useState32[1];
+  var _useState33 = useState(0),
+    _useState34 = _slicedToArray(_useState33, 2),
+    serviceType = _useState34[0],
+    setServiceType = _useState34[1];
+  var _useState35 = useState(0),
+    _useState36 = _slicedToArray(_useState35, 2),
+    pageReady = _useState36[0],
+    setPageReady = _useState36[1];
   useEffect(function () {
     getSettingData();
+    apisOkNum = 0;
   }, []);
   useEffect(function () {
     setCompanyRealAppList(companyAppList.filter(function (app) {
@@ -152,6 +166,8 @@ export default (function (_ref) {
       setAuthConfig(data.authConfig);
       setId(data.id);
       setCompanyId(data.companyId);
+      setCompanyName(data.companyName);
+      setServiceType(data.serviceType);
 
       //
       request(api.app.queryAppList, {
@@ -176,8 +192,39 @@ export default (function (_ref) {
         } else {
           setAppList(res.applist);
         }
+        apisOkNum += 1;
+        setPageReady(apisOkNum);
       }).catch(function (err) {
-        // todo ????
+        notification.error({
+          message: '信息获取失败'
+        });
+      });
+      request(api.app.queryLeftMenus, {
+        method: 'post',
+        params: {
+          app_id: data.id
+        }
+      }).then(function (res) {
+        var menus = res.leftMenus || [];
+        var menusNameMap = {};
+        var formatMenus = function formatMenus(menus) {
+          menus.forEach(function (item) {
+            item.routeName = util.getMenuRouterByName(item.name);
+            menusNameMap[item.name] = item;
+            if (item.childrens) {
+              formatMenus(item.childrens);
+            }
+          });
+        };
+        formatMenus(menus);
+        setLeftMenus(menus);
+        setMenusNameMap(menusNameMap);
+        apisOkNum += 1;
+        setPageReady(apisOkNum);
+      }).catch(function (err) {
+        notification.error({
+          message: '信息获取失败'
+        });
       });
     }).catch(function (err) {
       notification.error({
@@ -190,32 +237,25 @@ export default (function (_ref) {
       if (res.flag === 101) {
         setAllGroupInfos(res.infos.reverse());
       }
-      //  ????
+      apisOkNum += 1;
+      setPageReady(apisOkNum);
     }).catch(function (err) {
-      // todo ????
+      notification.error({
+        message: '信息获取失败'
+      });
     });
-    request(api.app.queryLeftMenus, {
-      method: 'post',
-      data: {
-        app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
-      }
+  };
+  var refreshGroupList = function refreshGroupList() {
+    request(api.setting.groupInfos, {
+      method: 'get'
     }).then(function (res) {
-      var menus = res.leftMenus || [];
-      var menusNameMap = {};
-      var formatMenus = function formatMenus(menus) {
-        menus.forEach(function (item) {
-          item.routeName = util.getMenuRouterByName(item.name);
-          menusNameMap[item.name] = item;
-          if (item.childrens) {
-            formatMenus(item.childrens);
-          }
-        });
-      };
-      formatMenus(menus);
-      setLeftMenus(menus);
-      setMenusNameMap(menusNameMap);
+      if (res.flag === 101) {
+        setAllGroupInfos(res.infos.reverse());
+      }
     }).catch(function (err) {
-      // todo ????
+      notification.error({
+        message: '信息获取失败'
+      });
     });
   };
   var delAppCallback = function delAppCallback(formData, id) {
@@ -352,15 +392,17 @@ export default (function (_ref) {
     // 对外提供的api， 在设置模块-》用户组-》用户组列表页面 删除用户成功时调用
     // 用来处理同步主应用可能需要的刷新的逻辑， 可不传
     settingDelGroupCallback && settingDelGroupCallback(id);
+    refreshGroupList();
 
     // 与主应用同步信息 下面为老代码逻辑
     // this.$store.commit(mutations.setting.delGroup, this.groupData.id)
   };
 
   var updateGroupAuthCallback = function updateGroupAuthCallback(isUser) {
-    // 对外提供的api， 在设置模块-》用户组-》用户组列表页面 删除用户成功时调用
+    // 对外提供的api， 在设置模块-》用户组-》用户组列表页面 更新用户组权限成功时调用
     // 用来处理同步主应用可能需要的刷新的逻辑， 可不传
     settingUpdateGroupAuthCallback && settingUpdateGroupAuthCallback(isUser);
+    refreshGroupList();
 
     // 与主应用同步信息 下面为老代码逻辑
     // if (hasCurrentUser) {
@@ -374,15 +416,12 @@ export default (function (_ref) {
   };
 
   return /*#__PURE__*/React.createElement("div", {
-    className: "setting setting-content company-setting",
-    style: {
-      width: 1200
-    }
+    className: "setting setting-content company-setting"
   }, /*#__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")), ready ? /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement("label", null, "\u516C\u53F8\u8BBE\u7F6E")), pageReady >= 3 ? /*#__PURE__*/React.createElement("div", {
     className: "setting-body"
   }, /*#__PURE__*/React.createElement("div", {
     className: "setting-nav",
@@ -448,6 +487,8 @@ export default (function (_ref) {
   }, "\u5FAE\u4FE1\u8D26\u53F7\u7ED1\u5B9A")) : null)), /*#__PURE__*/React.createElement("div", {
     className: "setting-component"
   }, currentTab == 'info' ? /*#__PURE__*/React.createElement(Info, {
+    companyId: companyId,
+    companyName: companyName,
     updateCurrentUser: updateCurrentUser
   }) : currentTab == 'userGroup' ? /*#__PURE__*/React.createElement(UserGroup, {
     id: id,
@@ -458,7 +499,8 @@ export default (function (_ref) {
     isMarsUi: isMarsUi,
     isAdmin: isAdmin,
     delGroupCallback: delGroupCallback,
-    updateGroupAuthCallback: updateGroupAuthCallback
+    updateGroupAuthCallback: updateGroupAuthCallback,
+    serviceType: serviceType
   }) : currentTab == 'user' ? /*#__PURE__*/React.createElement(User, {
     id: id,
     groupHashList: groupHashList,
@@ -470,7 +512,8 @@ export default (function (_ref) {
     changeUserAuthCallback: changeUserAuthCallback,
     createMembersCallback: createMembersCallback,
     changeAdminCallback: changeAdminCallback,
-    isAdmin: isAdmin
+    isAdmin: isAdmin,
+    serviceType: serviceType
   }) : currentTab == 'appList' ? /*#__PURE__*/React.createElement(AppList, {
     dataAuth: dataAuth,
     isAdmin: isAdmin,
@@ -486,7 +529,10 @@ export default (function (_ref) {
     createAppCallback: createAppCallback,
     gotoAppSetting: gotoAppSetting,
     gotoAppPanel: gotoAppPanel
-  }) : currentTab == 'cost' ? /*#__PURE__*/React.createElement(Cost, null) : null)) : /*#__PURE__*/React.createElement(PageLoading, {
+  }) : currentTab == 'cost' ? /*#__PURE__*/React.createElement(Cost, {
+    companyAppList: companyAppList,
+    companyId: companyId
+  }) : null)) : /*#__PURE__*/React.createElement(PageLoading, {
     "v-else": true
   }));
 });

package/dist/esm/modules/companySetting/info/index.d.ts

@@ -1,6 +1,8 @@
 import React from 'react';
 import './index.less';
 declare const Info: React.FC<{
+    companyId: Number;
+    companyName: String;
     updateCurrentUser?: () => void;
 }>;
 export default Info;

package/dist/esm/modules/companySetting/info/index.js

@@ -12,6 +12,9 @@ import request from "./../../../utils/ajax";
 import api from "./../../../constants/api";
 var TextArea = Input.TextArea;
 var Info = function Info(props) {
+  var companyId = props.companyId,
+    companyName = props.companyName,
+    updateCurrentUser = props.updateCurrentUser;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     currentUser = _useContext.currentUser,
@@ -21,16 +24,19 @@ var Info = function Info(props) {
     loading = _useState2[0],
     setLoading = _useState2[1];
   var updateLicense = function updateLicense(license) {
-    request(api.updateLicense, {
-      method: 'get',
-      data: {
+    request(api.setting.updateLicense, {
+      method: 'post',
+      params: {
         license: license
       }
     }).then(function (res) {
-      notification.success({
-        message: '授权码更新成功！'
-      });
+      if (res && res.flag === 101) {
+        notification.success({
+          message: '授权码更新成功！'
+        });
+      }
     }).catch(function (err) {
+      console.log(err);
       notification.error({
         message: '授权码更新失败！'
       });
@@ -39,7 +45,7 @@ var Info = function Info(props) {
   var saveClick = function saveClick(data) {
     var companyNameVal = data.companyNameVal,
       license = data.license;
-    if (companyNameVal !== (currentUser === null || currentUser === void 0 ? void 0 : currentUser.companyName)) {
+    if (companyNameVal !== companyName) {
       changeCompanyName(companyNameVal);
     }
     if (license.length > 0) {
@@ -48,16 +54,22 @@ var Info = function Info(props) {
   };
   var changeCompanyName = function changeCompanyName(companyNameVal) {
     setLoading(true);
-    request(api.updateCompanyName, {
+    request(api.setting.updateCompanyName, {
       method: 'post',
-      data: {
+      params: {
         companyName: companyNameVal
       }
     }).then(function (res) {
-      if (props.updateCurrentUser) props.updateCurrentUser();
-      notification.success({
-        message: '名称修改成功'
-      });
+      if (res.flag === 101) {
+        if (updateCurrentUser) updateCurrentUser();
+        notification.success({
+          message: '名称修改成功'
+        });
+      } else {
+        notification.error({
+          message: '名称修改异常,请重试'
+        });
+      }
     }).catch(function (err) {
       notification.error({
         message: '名称修改异常,请重试'
@@ -70,7 +82,7 @@ var Info = function Info(props) {
     className: "company-setting-info"
   }, /*#__PURE__*/React.createElement(Form, {
     initialValues: {
-      companyNameVal: (currentUser === null || currentUser === void 0 ? void 0 : currentUser.companyName) || '',
+      companyNameVal: companyName || '',
       license: ''
     },
     onFinish: saveClick,
@@ -100,6 +112,6 @@ var Info = function Info(props) {
     className: "btn-login",
     htmlType: "submit",
     loading: loading
-  }, "\u4FDD\u5B58"))), /*#__PURE__*/React.createElement("p", null, "\u516C\u53F8ID"), /*#__PURE__*/React.createElement("li", null, currentUser === null || currentUser === void 0 ? void 0 : currentUser.companyId));
+  }, "\u4FDD\u5B58"))), /*#__PURE__*/React.createElement("p", null, "\u516C\u53F8ID"), /*#__PURE__*/React.createElement("li", null, companyId));
 };
 export default Info;

package/dist/esm/modules/companySetting/user/index.d.ts

@@ -18,6 +18,7 @@ declare const User: React.FC<{
     companyRealAppList: [];
     zgText: String;
     companyId: number;
+    serviceType: number;
     delAppCallback: Function;
     gotoAppSetting: Function;
     gotoAppPanel: Function;

package/dist/esm/modules/companySetting/user/index.js

@@ -28,9 +28,10 @@ var User = function User(props) {
     leftMenus = props.leftMenus,
     isMarsUi = props.isMarsUi,
     isAdmin = props.isAdmin,
+    serviceType = props.serviceType,
     removeUserCallback = props.removeUserCallback,
     changeUserAuthCallback = props.changeUserAuthCallback,
-    createMembersCallback = props.createMembersCallback,
+    _createMembersCallback = props.createMembersCallback,
     changeAdminCallback = props.changeAdminCallback;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -103,6 +104,9 @@ var User = function User(props) {
   // }, [allGroupInfos]);
 
   useEffect(function () {
+    getMenbers();
+  }, []);
+  var getMenbers = function getMenbers() {
     request(api.setting.getGroupMembers, {
       method: 'get'
     }).then(function (res) {
@@ -120,7 +124,7 @@ var User = function User(props) {
     }).catch(function (err) {
       // todo ????
     });
-  }, []);
+  };
   useEffect(function () {
     setShowMembers(allMembers.filter(function (member) {
       if (!filter || new RegExp(filter.trim().toLowerCase()).test(member.email.toLowerCase()) || new RegExp(filter.trim().toLowerCase()).test(member.username.toLowerCase())) return true;
@@ -203,7 +207,7 @@ var User = function User(props) {
         };
         request(api.setting.removeMember, {
           method: 'post',
-          data: params
+          params: params
         }).then(function (res) {
           if (res.flag === 101) {
             notification.success({
@@ -213,6 +217,7 @@ var User = function User(props) {
               return item.id === userData.id;
             });
             removeUserCallback(delIndex);
+            getMenbers();
             setShowDialog(false);
           } else {
             notification.error({
@@ -236,7 +241,7 @@ var User = function User(props) {
       return function () {
         request(api.setting.resetpwd, {
           method: 'post',
-          data: {
+          params: {
             email: userData.email
           }
         }).then(function (res) {
@@ -302,7 +307,7 @@ var User = function User(props) {
       return function () {
         request(api.setting.updateCompanyAdmin, {
           method: 'post',
-          data: {
+          params: {
             user_id: adminOptionValue.id
           }
         }).then(function (res) {
@@ -465,13 +470,17 @@ var User = function User(props) {
     },
     isMarsUi: isMarsUi,
     leftMenus: leftMenus,
-    changeUserAuthCallback: changeUserAuthCallback
+    changeUserAuthCallback: changeUserAuthCallback,
+    serviceType: serviceType
   }) : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Invite, {
     showPwdPanel: showPasswordPanelEvent
     // ref="inviteRef"
     ,
     allGroupInfos: allGroupInfos,
-    createMembersCallback: createMembersCallback
+    createMembersCallback: function createMembersCallback() {
+      getMenbers();
+      _createMembersCallback();
+    }
   }), /*#__PURE__*/React.createElement("div", {
     className: "user-list"
   }, /*#__PURE__*/React.createElement("p", {
@@ -494,7 +503,7 @@ var User = function User(props) {
     columns: columns,
     total: showMembers.length,
     pageSize: showMembers.length / 10
-  }), /*#__PURE__*/React.createElement("div", null, !isAdmin ? /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement("div", null, isAdmin ? /*#__PURE__*/React.createElement("div", {
     style: {
       top: !showMembers.length ? -14 : -64
     },

package/dist/esm/modules/companySetting/user/invite.js

@@ -55,7 +55,7 @@ var UserGroup = function UserGroup(props) {
     setInviteBtnLoading(true);
     request(apis.setting.inviteUserByPhone, {
       method: 'post',
-      data: params
+      params: params
     }).then(function (res) {
       if (res.flag === 101) {
         if (res.popup) {

package/dist/esm/modules/companySetting/userGroup/authConfigDetail.js

@@ -82,9 +82,6 @@ var authConfigDetail = function authConfigDetail(props) {
       };
     }
     Promise.all([request(apis.setting.queryFunConfigList, {
-      headers: {
-        token: '55acd231f275e0a069123131324f970e'
-      },
       method: 'post'
     }).then(function (res) {
       if (res && res.code === 200) {
@@ -92,9 +89,6 @@ var authConfigDetail = function authConfigDetail(props) {
       }
       throw new Error('接口返回错误');
     }), request(apis.setting.queryFunConfigByUserId, {
-      headers: {
-        token: '55acd231f275e0a069123131324f970e'
-      },
       method: 'post',
       data: data
     }).then(function (res) {

package/dist/esm/modules/companySetting/userGroup/groupItem.js

@@ -38,7 +38,7 @@ var GroupItem = function GroupItem(props) {
   var deleteConfirm = function deleteConfirm() {
     request(apis.setting.deleteGroup, {
       method: 'post',
-      data: {
+      params: {
         groupId: groupData.id
       }
     }).then(function (res) {

package/dist/esm/modules/companySetting/userGroup/index.d.ts

@@ -7,7 +7,9 @@ declare const UserGroup: React.FC<{
     leftMenus: [];
     isMarsUi: Boolean;
     isAdmin: Boolean;
+    serviceType: Number;
     delGroupCallback: Function;
     updateGroupAuthCallback: Function;
+    changeUserAuthCallback: Function;
 }>;
 export default UserGroup;

package/dist/esm/modules/companySetting/userGroup/index.js

@@ -19,8 +19,10 @@ var UserGroup = function UserGroup(props) {
     leftMenus = props.leftMenus,
     isMarsUi = props.isMarsUi,
     isAdmin = props.isAdmin,
+    serviceType = props.serviceType,
     delGroupCallback = props.delGroupCallback,
-    updateGroupAuthCallback = props.updateGroupAuthCallback;
+    updateGroupAuthCallback = props.updateGroupAuthCallback,
+    changeUserAuthCallback = props.changeUserAuthCallback;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     currentUser = _useContext.currentUser,
@@ -103,7 +105,10 @@ var UserGroup = function UserGroup(props) {
     onCancel: function onCancel() {
       return setGroupEditAuthState(false);
     },
-    updateGroupAuthCallback: updateGroupAuthCallback
+    updateGroupAuthCallback: updateGroupAuthCallback,
+    allGroupInfos: allGroupInfos,
+    serviceType: serviceType,
+    changeUserAuthCallback: changeUserAuthCallback
   }) : /*#__PURE__*/React.createElement("div", {
     className: "group-model-content"
   }, /*#__PURE__*/React.createElement("div", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.0.1-a.0",
+  "version": "1.0.1-a.1",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [