@zgfe/modules-settings 1.2.10-role1 → 1.2.10-role2

package/es/modules/companySetting/index.js

@@ -532,7 +532,10 @@ var CompanySetting = function CompanySetting(props) {
   }];
   return /*#__PURE__*/React.createElement("div", {
     className: "setting setting-content company-setting"
-  }, pageReady >= 3 ? /*#__PURE__*/React.createElement(Tabs, {
+  }, /*#__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,

package/es/modules/companySetting/index.less

@@ -2,17 +2,33 @@
 @import './style/common.less';
 
 .ant-card-body {
-  padding: 16px;
-  background-color: #fafafb;
+  padding: 0;
 }
 
 .company-setting {
-  background: #fff;
   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;
   }

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

@@ -26,6 +26,7 @@ var splitString = function splitString(str) {
 var User = function User(props) {
   var id = props.id,
     allGroupInfos = props.allGroupInfos,
+    isAdmin = props.isAdmin,
     removeUserCallback = props.removeUserCallback,
     _createMembersCallback = props.createMembersCallback,
     changeAdminCallback = props.changeAdminCallback;
@@ -33,8 +34,9 @@ var User = function User(props) {
     _useState2 = _slicedToArray(_useState, 1),
     allMembers = _useState2[0];
   var _useState3 = useState([]),
-    _useState4 = _slicedToArray(_useState3, 1),
-    adminOptionList = _useState4[0];
+    _useState4 = _slicedToArray(_useState3, 2),
+    adminOptionList = _useState4[0],
+    setAdminOptionList = _useState4[1];
   var _useState5 = useState({}),
     _useState6 = _slicedToArray(_useState5, 2),
     adminOptionValue = _useState6[0],
@@ -84,12 +86,6 @@ var User = function User(props) {
     _useState28 = _slicedToArray(_useState27, 2),
     showMembers = _useState28[0],
     setShowMembers = _useState28[1];
-  // useEffect(() => {
-  // let groupHashList = {}
-  // for (let item of allGroupInfos) {
-  //   groupHashList[item.id] = { groupName: item.groupName }
-  // }
-  // }, [allGroupInfos]);
   useEffect(function () {
     getMenbers();
   }, []);
@@ -101,11 +97,14 @@ var User = function User(props) {
         pageSize: 10
       })
     }).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);
       }
-      //  ????
+      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);
     });
@@ -292,7 +291,7 @@ var User = function User(props) {
     render: function render(data) {
       return /*#__PURE__*/React.createElement("div", 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, data.is_admin ? /*#__PURE__*/React.createElement("span", {
+      }, 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", {
         className: "super-admin"
       }, "\u8D85\u7EA7\u7BA1\u7406\u5458") : null));
     }
@@ -371,14 +370,14 @@ var User = function User(props) {
       }, "\u7F16\u8F91"), /*#__PURE__*/React.createElement("a", {
         title: "\u79FB\u51FA\u516C\u53F8",
         style: {
-          visibility: data.id !== id && !data.is_admin ? 'visible' : 'hidden'
+          visibility: data.id !== id && !data.isAdmin ? 'visible' : 'hidden'
         },
         onClick: function onClick() {
           return removeUser(data);
         }
       }, "\u5220\u9664"), /*#__PURE__*/React.createElement("a", {
         style: {
-          visibility: data.id !== id && !data.is_admin ? 'visible' : 'hidden'
+          visibility: data.id !== id && !data.isAdmin ? 'visible' : 'hidden'
         },
         onClick: function onClick() {
           return resetpwd(data);
@@ -407,7 +406,7 @@ var User = function User(props) {
       x: 1000,
       y: 550
     }
-  }), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement("div", null, isAdmin ? /*#__PURE__*/React.createElement("div", {
     style: {
       top: !showMembers.length ? 6 : -34
     },
@@ -419,7 +418,7 @@ var User = function User(props) {
     labelField: "email",
     keyField: "id",
     onChange: changeAdmin
-  })))), /*#__PURE__*/React.createElement(BizDialog, {
+  })) : null)), /*#__PURE__*/React.createElement(BizDialog, {
     title: dialogTitle,
     open: showDialog,
     closable: true,

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

@@ -284,7 +284,7 @@ var UserGroup = function UserGroup(props) {
       required: true,
       message: '请输入密码'
     }]
-  }, /*#__PURE__*/React.createElement(Input, {
+  }, /*#__PURE__*/React.createElement(Input.Password, {
     maxLength: 50,
     placeholder: '请输入密码'
   }))))));

package/es/types/companySetting.d.ts

@@ -155,7 +155,7 @@ export interface AllMembersItem {
     accountStatus?: number;
     label?: string;
     inv_status?: number;
-    is_admin?: boolean;
+    isAdmin?: boolean;
     authConfig?: AuthConfig;
     groupName?: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.10-role1",
+  "version": "1.2.10-role2",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [