@zgfe/modules-settings 1.2.11 → 1.2.12

package/es/modules/companySetting/index.less

@@ -1,49 +1,12 @@
 @import '~@zgfe/business-lib/es/assets/styles/inner.less';
 @import './style/common.less';
-
-.ant-card-body {
-  padding: 0;
-}
-
 .company-setting {
-  border: 1px solid var(--unnamed, #ecedf0);
-  border-radius: 8px;
-
-  .company-setting-title {
-    display: flex;
-    flex-shrink: 0;
-    gap: 10px;
-    align-items: center;
-    width: 100%;
-    height: 48px;
-    padding: 0px 24px;
-    background: #fff;
-  }
-
-  .company-setting-tabs {
-    margin: 16px 24px 24px;
-    background: #fff !important;
-  }
-
-  .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 {
@@ -52,11 +15,9 @@
     }
   }
 }
-
 .setting-title {
   color: initial;
   font-size: 18px;
-
   label {
     font-weight: bold;
   }

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

@@ -1,9 +1,4 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -12,27 +7,35 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState } from 'react';
 import './index.less';
-import { Button, notification, Switch, Tooltip } from 'antd';
+import { Button, Input, notification, Popover, Tabs } from 'antd';
 import request from './../../../utils/ajax';
 import api from './../../../constants/api';
+import AuthConfigDetail from './../userGroup/authConfigDetail';
+import CompanySettingUser from './../edit/user';
 import Invite from './invite';
 import { BizTable, BizDialog, BizSelect } from '@zgfe/business-lib';
-import moment from 'moment';
-import apis from './../../../constants/api';
 var splitString = function splitString(str) {
   var len = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10;
   return str.length > len ? "".concat(str.substring(0, len), "...") : str;
 };
 var User = function User(props) {
-  var id = props.id,
+  var ENVIRONMENT = props.ENVIRONMENT,
+    settingCurrentUser = props.settingCurrentUser,
+    id = props.id,
     allGroupInfos = props.allGroupInfos,
+    groupHashList = props.groupHashList,
+    companyAppList = props.companyAppList,
+    leftMenus = props.leftMenus,
     isAdmin = props.isAdmin,
+    serviceType = props.serviceType,
     removeUserCallback = props.removeUserCallback,
+    _changeUserAuthCallback = props.changeUserAuthCallback,
     _createMembersCallback = props.createMembersCallback,
     changeAdminCallback = props.changeAdminCallback;
   var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 1),
-    allMembers = _useState2[0];
+    _useState2 = _slicedToArray(_useState, 2),
+    allMembers = _useState2[0],
+    setAllMembers = _useState2[1];
   var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
     adminOptionList = _useState4[0],
@@ -42,71 +45,81 @@ var User = function User(props) {
     adminOptionValue = _useState6[0],
     setAdminOptionValue = _useState6[1];
   var _useState7 = useState(''),
-    _useState8 = _slicedToArray(_useState7, 1),
-    filter = _useState8[0];
-  var _useState9 = useState({}),
+    _useState8 = _slicedToArray(_useState7, 2),
+    filter = _useState8[0],
+    setFilter = _useState8[1];
+  var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    userEditAuthData = _useState10[0],
-    setUserEditAuthData = _useState10[1];
-  var _useState11 = useState(false),
+    userEditAuthState = _useState10[0],
+    setUserEditAuthState = _useState10[1];
+  var _useState11 = useState({}),
     _useState12 = _slicedToArray(_useState11, 2),
-    showPasswordPanel = _useState12[0],
-    setShowPasswordPanel = _useState12[1];
+    userEditAuthData = _useState12[0],
+    setUserEditAuthData = _useState12[1];
   var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    showDialog = _useState14[0],
-    setShowDialog = _useState14[1];
-  var _useState15 = useState(''),
+    showPasswordPanel = _useState14[0],
+    setShowPasswordPanel = _useState14[1];
+  var _useState15 = useState(false),
     _useState16 = _slicedToArray(_useState15, 2),
-    dialogTitle = _useState16[0],
-    setDialogTitle = _useState16[1];
+    showDialog = _useState16[0],
+    setShowDialog = _useState16[1];
   var _useState17 = useState(''),
     _useState18 = _slicedToArray(_useState17, 2),
-    dialogContent = _useState18[0],
-    setDialogContent = _useState18[1];
-  var _useState19 = useState(function () {
+    dialogTitle = _useState18[0],
+    setDialogTitle = _useState18[1];
+  var _useState19 = useState(''),
+    _useState20 = _slicedToArray(_useState19, 2),
+    dialogContent = _useState20[0],
+    setDialogContent = _useState20[1];
+  var _useState21 = useState(function () {
       return function () {};
     }),
-    _useState20 = _slicedToArray(_useState19, 2),
-    dialogConfirmFunc = _useState20[0],
-    setDialogConfirmFunc = _useState20[1];
-  var _useState21 = useState(''),
     _useState22 = _slicedToArray(_useState21, 2),
-    pwdPanelAccount = _useState22[0],
-    setPwdPanelAccount = _useState22[1];
+    dialogConfirmFunc = _useState22[0],
+    setDialogConfirmFunc = _useState22[1];
   var _useState23 = useState(''),
     _useState24 = _slicedToArray(_useState23, 2),
-    pwdPanelPassword = _useState24[0],
-    setPwdPanelPassword = _useState24[1];
-  var _useState25 = useState({}),
+    pwdPanelAccount = _useState24[0],
+    setPwdPanelAccount = _useState24[1];
+  var _useState25 = useState(''),
     _useState26 = _slicedToArray(_useState25, 2),
-    pwdPanelUserConfig = _useState26[0],
-    setPwdPanelUserConfig = _useState26[1];
-  var _useState27 = useState([]),
+    pwdPanelPassword = _useState26[0],
+    setPwdPanelPassword = _useState26[1];
+  var _useState27 = useState({}),
     _useState28 = _slicedToArray(_useState27, 2),
-    showMembers = _useState28[0],
-    setShowMembers = _useState28[1];
+    pwdPanelUserConfig = _useState28[0],
+    setPwdPanelUserConfig = _useState28[1];
+  var _useState29 = useState([]),
+    _useState30 = _slicedToArray(_useState29, 2),
+    showMembers = _useState30[0],
+    setShowMembers = _useState30[1];
+  // useEffect(() => {
+  // let groupHashList = {}
+  // for (let item of allGroupInfos) {
+  //   groupHashList[item.id] = { groupName: item.groupName }
+  // }
+  // }, [allGroupInfos]);
   useEffect(function () {
     getMenbers();
   }, []);
-  var getMenbers = function getMenbers(params) {
-    request(api.setting.queryUserPage, {
-      method: 'post',
-      data: _objectSpread(_objectSpread({}, params), {}, {
-        pageNo: 1,
-        pageSize: 10
-      })
+  var getMenbers = function getMenbers() {
+    request(api.setting.getGroupMembers, {
+      method: 'get'
     }).then(function (res) {
-      var _res$data2;
-      if (res && res.code === '101000' && res.data) {
-        var _res$data;
-        setShowMembers(res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list);
+      if (res && res.flag === 101 && res.company_members) {
+        setAllMembers(res.company_members);
+        setShowMembers(res.company_members.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;
+          return false;
+        }));
+        setAdminOptionList(res.company_members.filter(function (item) {
+          return item.inv_status === 1 && item.id !== id;
+        }));
       }
-      setAdminOptionList(res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list.filter(function (item) {
-        return item.id !== id;
-      }));
+      //  ????
     }).catch(function (err) {
-      console.log(err);
+      // todo ????
     });
   };
   useEffect(function () {
@@ -115,9 +128,68 @@ var User = function User(props) {
       return false;
     }));
   }, [filter]);
+  var reworkGroups = function reworkGroups(data) {
+    var names = [];
+    if (data.authConfig && data.authConfig.groupIds) {
+      var _iterator = _createForOfIteratorHelper(data.authConfig.groupIds),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var _id = _step.value;
+          if (groupHashList[_id]) {
+            names.push(groupHashList[_id].groupName);
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    }
+    return names.length ? splitString(names.join('，')) : '-';
+  };
+  var getGroupNameById = function getGroupNameById(ids) {
+    var names = [];
+    var _iterator2 = _createForOfIteratorHelper(ids),
+      _step2;
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var _id2 = _step2.value;
+        if (groupHashList[_id2]) {
+          names.push(groupHashList[_id2].groupName);
+        }
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+    return names.join(',');
+  };
+  var groupAuthConfig = function groupAuthConfig(ids) {
+    return allGroupInfos.filter(function (item) {
+      return ids.includes(item.id);
+    });
+  };
   var showUserEditAuthEvent = function showUserEditAuthEvent(userData) {
+    setUserEditAuthState(true);
     setUserEditAuthData(userData);
   };
+  // const showMembers = () => {
+  //   return allMembers.filter(member => {
+  //     if (
+  //       !filter ||
+  //       new RegExp(filter.trim().toLowerCase()).test(
+  //         member.email.toLowerCase()
+  //       ) ||
+  //       new RegExp(filter.trim().toLowerCase()).test(
+  //         member.username.toLowerCase()
+  //       )
+  //     )
+  //       return true
+  //     return false
+  //   })
+  // }
   var removeUser = function removeUser(userData) {
     setShowPasswordPanel(false);
     setShowDialog(true);
@@ -126,13 +198,15 @@ var User = function User(props) {
     setDialogConfirmFunc(function () {
       return function () {
         var params = {
-          id: userData.id
+          user_id: userData.id,
+          isCancel: userData.inv_status !== 1,
+          invStatus: userData.inv_status
         };
-        request(api.setting.delCompanyUser, {
+        request(api.setting.removeMember, {
           method: 'post',
-          data: params
+          params: params
         }).then(function (res) {
-          if (res) {
+          if (res && res.flag === 101) {
             notification.success({
               message: '移除成功！'
             });
@@ -193,10 +267,6 @@ var User = function User(props) {
     setPwdPanelPassword(userInfo.pwd);
     setPwdPanelUserConfig(userInfo && userInfo.userConfig ? userInfo.userConfig : {});
   };
-  var queryPanel = function queryPanel(params) {
-    getMenbers(params);
-    setUserEditAuthData({});
-  };
   var closePwdPanel = function closePwdPanel() {
     setShowPasswordPanel(false);
     setPwdPanelAccount('');
@@ -257,139 +327,154 @@ var User = function User(props) {
       };
     });
   };
-  // 开启或暂停
-  var onSwitchChange = function onSwitchChange(checked, data) {
-    request(apis.setting.updateCompanyUserStatus, {
-      method: 'post',
-      data: {
-        id: data === null || data === void 0 ? void 0 : data.id,
-        accountStatus: checked ? 1 : 2
-      }
-    }).then(function (res) {
-      if (res) {
-        notification.success({
-          message: '修改成功'
-        });
-        getMenbers();
-      } else {
-        notification.success({
-          message: '修改失败'
-        });
-      }
-    }).catch(function (error) {
-      console.log(error);
-    });
-  };
   var columns = [{
     title: '账号',
     dataIndex: 'email',
     render: function render(email) {
-      return /*#__PURE__*/React.createElement("div", null, email);
+      // const data = res[1];
+      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
+        title: email
+      }, splitString(email, 20)));
     }
   }, {
     title: '姓名',
+    // dataIndex: 'username',
     render: function render(data) {
-      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
+      // const data = res[1];
+      return /*#__PURE__*/React.createElement("div", null, data.inv_status !== 1 ? /*#__PURE__*/React.createElement("span", null, "-") : /*#__PURE__*/React.createElement("span", {
         title: data.username || data.email
-      }, splitString(data.username || data.email || ''), data.id === id ? /*#__PURE__*/React.createElement("span", null, "\uFF08\u6211\uFF09") : null), /*#__PURE__*/React.createElement("div", null, data.isAdmin ? /*#__PURE__*/React.createElement("span", {
+      }, splitString(data.username || data.email || ''), data.id === id ? /*#__PURE__*/React.createElement("span", null, "\uFF08\u6211\uFF09") : null, data.is_admin ? /*#__PURE__*/React.createElement("span", {
         className: "super-admin"
       }, "\u8D85\u7EA7\u7BA1\u7406\u5458") : null));
     }
   }, {
-    title: '角色',
-    dataIndex: 'aclRoleList',
-    with: 195,
-    render: function render(aclRoleList) {
-      var _arr$join, _arr$join2;
-      var arr = aclRoleList === null || aclRoleList === void 0 ? void 0 : aclRoleList.map(function (item) {
-        return item === null || item === void 0 ? void 0 : item.roleName;
-      });
-      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Tooltip, {
-        overlayStyle: {
-          maxWidth: 396
+    title: '用户组',
+    render: function render(data) {
+      // const data = res[1];
+      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Popover, {
+        content: function content() {
+          return /*#__PURE__*/React.createElement("span", null, data.authConfig && data.authConfig.groupIds ? getGroupNameById(data.authConfig.groupIds) : '');
         },
-        overlayInnerStyle: {
-          color: '#FFF',
-          fontSize: 14,
-          fontWeight: 400,
-          letterSpacing: 0.56
+        style: {
+          width: 255
         },
-        placement: "top",
-        title: arr === null || arr === void 0 ? void 0 : (_arr$join = arr.join(',')) === null || _arr$join === void 0 ? void 0 : _arr$join.replace(/,/g, '、')
-      }, splitString(arr === null || arr === void 0 ? void 0 : (_arr$join2 = arr.join(',')) === null || _arr$join2 === void 0 ? void 0 : _arr$join2.replace(/,/g, '、'), 8)));
+        trigger: "hover"
+      }, /*#__PURE__*/React.createElement("span", null, reworkGroups(data))));
     }
   }, {
-    title: '部门',
-    with: 195,
-    dataIndex: 'aclDeptList',
-    render: function render(aclDeptList) {
-      var _arr$join3, _arr$join4;
-      var arr = aclDeptList === null || aclDeptList === void 0 ? void 0 : aclDeptList.map(function (item) {
-        return item === null || item === void 0 ? void 0 : item.name;
-      });
-      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Tooltip, {
-        overlayStyle: {
-          maxWidth: 396
+    title: '权限',
+    render: function render(data) {
+      // const data = res[1];
+      return /*#__PURE__*/React.createElement("div", {
+        className: "operating"
+      }, /*#__PURE__*/React.createElement(Popover, {
+        content: function content() {
+          return /*#__PURE__*/React.createElement(Tabs, {
+            defaultActiveKey: "1"
+          }, /*#__PURE__*/React.createElement(Tabs.TabPane, {
+            tab: "\u4E2A\u4EBA\u6743\u9650",
+            key: "1",
+            style: {
+              width: 300
+            }
+          }, /*#__PURE__*/React.createElement(AuthConfigDetail, {
+            authConfig: data.authConfig ? data.authConfig.defaultAuth : {},
+            companyAppList: companyAppList,
+            leftMenus: leftMenus,
+            id: data.id,
+            type: 1,
+            serviceType: serviceType
+          })), /*#__PURE__*/React.createElement(Tabs.TabPane, {
+            tab: "\u6240\u5C5E\u7528\u6237\u7EC4\u6743\u9650",
+            key: "2",
+            style: {
+              width: 300
+            }
+          }, /*#__PURE__*/React.createElement("div", {
+            className: "group-auth-list popover-group-auth-list"
+          }, data.authConfig && data.authConfig.groupIds && groupAuthConfig(data.authConfig.groupIds).length ? /*#__PURE__*/React.createElement("div", null, groupAuthConfig(data.authConfig.groupIds).map(function (item) {
+            return /*#__PURE__*/React.createElement(AuthConfigDetail, {
+              key: item.id,
+              authConfig: item.authConfig ? item.authConfig : {},
+              leftMenus: leftMenus,
+              companyAppList: companyAppList,
+              name: item.groupName,
+              groupId: item.id,
+              type: 2,
+              serviceType: serviceType
+            });
+          })) : /*#__PURE__*/React.createElement(AuthConfigDetail, {
+            authConfig: {
+              dataAuth: [],
+              funAuth: []
+            },
+            leftMenus: leftMenus,
+            companyAppList: companyAppList,
+            name: '',
+            type: 2,
+            serviceType: serviceType
+          }))));
         },
-        overlayInnerStyle: {
-          color: '#FFF',
-          fontSize: 14,
-          fontWeight: 400,
-          letterSpacing: 0.56
+        style: {
+          width: 255
         },
-        placement: "top",
-        title: arr === null || arr === void 0 ? void 0 : (_arr$join3 = arr.join(',')) === null || _arr$join3 === void 0 ? void 0 : _arr$join3.replace(/,/g, '、')
-      }, splitString(arr === null || arr === void 0 ? void 0 : (_arr$join4 = arr.join(',')) === null || _arr$join4 === void 0 ? void 0 : _arr$join4.replace(/,/g, '、'), 8)));
-    }
-  }, {
-    title: '状态',
-    render: function render(data) {
-      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Switch, {
-        size: "default",
-        checked: data.accountStatus === 1 ? true : false,
-        onChange: function onChange(checked) {
-          return onSwitchChange(checked, data);
-        }
-      }));
-    }
-  }, {
-    title: '创建时间',
-    dataIndex: 'createDateTime',
-    render: function render(createDateTime) {
-      return /*#__PURE__*/React.createElement("div", null, moment(createDateTime).format('YYYY-MM-DD HH:mm:ss'));
+        trigger: "click"
+      }, /*#__PURE__*/React.createElement("span", {
+        className: "icon-eye"
+      }, "\u67E5\u770B")));
     }
   }, {
     title: '操作',
     render: function render(data) {
+      // const data = res[1];
       return /*#__PURE__*/React.createElement("div", {
         className: "operate"
-      }, /*#__PURE__*/React.createElement("a", {
+      }, /*#__PURE__*/React.createElement("span", {
         onClick: function onClick() {
           return showUserEditAuthEvent(data);
-        }
-      }, "\u7F16\u8F91"), /*#__PURE__*/React.createElement("a", {
+        },
+        className: "icon-edit"
+      }), /*#__PURE__*/React.createElement("span", {
         title: "\u79FB\u51FA\u516C\u53F8",
         style: {
-          visibility: data.id !== id && !data.isAdmin ? 'visible' : 'hidden'
+          visibility: data.id !== id && !data.is_admin ? 'visible' : 'hidden'
         },
+        className: "icon-delete",
         onClick: function onClick() {
           return removeUser(data);
         }
-      }, "\u5220\u9664"), /*#__PURE__*/React.createElement("a", {
+      }), /*#__PURE__*/React.createElement("span", {
         style: {
-          visibility: data.id !== id && !data.isAdmin ? 'visible' : 'hidden'
+          visibility: data.id !== id && !data.is_admin ? 'visible' : 'hidden'
         },
         onClick: function onClick() {
           return resetpwd(data);
-        }
-      }, "\u91CD\u7F6E\u5BC6\u7801"));
+        },
+        className: "icon-reset-code"
+      }));
     }
   }];
   return /*#__PURE__*/React.createElement("div", {
     className: "company-user"
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Invite, {
-    queryPanel: queryPanel,
-    userEditAuthData: userEditAuthData,
+  }, userEditAuthState && userEditAuthData ? /*#__PURE__*/React.createElement(CompanySettingUser, {
+    ENVIRONMENT: ENVIRONMENT,
+    data: userEditAuthData,
+    allGroupInfos: allGroupInfos,
+    companyAppList: companyAppList,
+    onCancel: function onCancel() {
+      return setUserEditAuthState(false);
+    },
+    leftMenus: leftMenus,
+    changeUserAuthCallback: function changeUserAuthCallback(id) {
+      getMenbers();
+      _changeUserAuthCallback && _changeUserAuthCallback(id);
+    },
+    serviceType: serviceType
+  }) : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Invite, {
+    ENVIRONMENT: ENVIRONMENT,
+    showPwdPanel: showPasswordPanelEvent,
+    isSso: !!(settingCurrentUser && settingCurrentUser.ssoType > 0),
+    // ref="inviteRef"
     allGroupInfos: allGroupInfos,
     createMembersCallback: function createMembersCallback(res, userConfig) {
       getMenbers();
@@ -397,30 +482,42 @@ var User = function User(props) {
     }
   }), /*#__PURE__*/React.createElement("div", {
     className: "user-list"
-  }, /*#__PURE__*/React.createElement(BizTable, {
+  }, /*#__PURE__*/React.createElement("p", {
+    className: "user-list-head"
+  }, "\u6210\u5458\u5217\u8868", /*#__PURE__*/React.createElement(Input, {
+    placeholder: "\u8BF7\u8F93\u5165\u8D26\u53F7\u6216\u59D3\u540D",
+    prefix: /*#__PURE__*/React.createElement("i", {
+      className: "cicon-search"
+    }),
+    style: {
+      width: 200
+    },
+    className: "member-filter",
+    allowClear: true,
+    onChange: function onChange(e) {
+      setFilter(e.target.value);
+    }
+  })), /*#__PURE__*/React.createElement(BizTable, {
     dataSource: showMembers,
     columns: columns,
     total: showMembers.length,
-    rowKey: "id",
-    scroll: {
-      x: 1000,
-      y: 550
-    }
+    rowKey: "id"
   }), /*#__PURE__*/React.createElement("div", null, isAdmin ? /*#__PURE__*/React.createElement("div", {
     style: {
-      top: !showMembers.length ? 6 : -34
+      top: !showMembers.length ? -14 : -64
     },
     className: "over-hand"
-  }, /*#__PURE__*/React.createElement("span", null, "\u79FB\u4EA4\u8D85\u7EA7\u7BA1\u7406\u5458\u6743\u9650\u7ED9"), /*#__PURE__*/React.createElement(BizSelect, {
+  }, "\u79FB\u4EA4\u8D85\u7EA7\u7BA1\u7406\u5458\u6743\u9650\u7ED9", /*#__PURE__*/React.createElement(BizSelect, {
     overlayWidth: 200,
     options: adminOptionList,
     value: adminOptionValue,
     labelField: "email",
     keyField: "id",
+    // maxTagCount={'responsive'}
     onChange: changeAdmin
   })) : null)), /*#__PURE__*/React.createElement(BizDialog, {
     title: dialogTitle,
-    open: showDialog,
+    visible: showDialog,
     closable: true,
     onOk: function onOk() {
       dialogConfirmFunc && dialogConfirmFunc();
@@ -432,7 +529,7 @@ var User = function User(props) {
     }
   }, dialogContent)), /*#__PURE__*/React.createElement(BizDialog, {
     title: pwdPanelUserConfig && pwdPanelUserConfig.id ? '创建成功' : '密码已生成',
-    open: showPasswordPanel,
+    visible: showPasswordPanel,
     closable: true,
     onCancel: closePwdPanel,
     footer: [pwdPanelUserConfig && pwdPanelUserConfig.id ? /*#__PURE__*/React.createElement(Button, {