@zgfe/modules-settings 1.2.11 → 1.2.13

package/es/modules/companySetting/style/common.less

@@ -1,9 +1,11 @@
 @import './reset.less';
+
 .setting {
   height: 100%;
-  overflow-y: hidden;
+  overflow-y: auto;
   font-size: 14px;
-  background: #eef0f3;
+  background: #fafafb;
+
   .disabled {
     background: #ccc !important;
     border-color: #ccc !important;
@@ -13,24 +15,30 @@
 
 .setting-content {
   padding: 0px;
+
   .setting-title {
     display: flex;
     align-items: center;
     margin-bottom: 0px;
+
     .icon-set,
     .icon-company {
       margin-right: 10px;
     }
+
     .app-name {
       margin-left: 3px;
       font-size: 14px;
     }
   }
+
   .setting-body {
     display: flex;
     align-items: flex-start;
+
     .setting-tab {
       border-top: 1px solid #dadada;
+
       li > a {
         z-index: 1;
         display: inline-block;
@@ -46,17 +54,20 @@
         border: 1px solid #dadada;
         border-top: none;
         cursor: pointer;
+
         &:hover {
           color: #000;
           font-weight: bold;
         }
       }
+
       .router-link-active {
         color: #000;
         font-weight: bold;
       }
     }
   }
+
   .setting-component {
     width: 914px;
     height: calc(100vh - 130px);

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

@@ -12,6 +12,7 @@ declare const User: React.FC<{
     leftMenus: LeftMenusItem[];
     isAdmin: boolean;
     serviceType: number;
+    companyId: number;
     removeUserCallback: (delIndex: number) => void;
     changeUserAuthCallback: (id: number) => void;
     createMembersCallback: (res: ApiResult<void>, userConfig?: AllMembersItem | false) => void;

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

@@ -10,15 +10,16 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useContext } from 'react';
 import './index.less';
 import { Button, notification, Switch, Tooltip } from 'antd';
 import request from './../../../utils/ajax';
 import api from './../../../constants/api';
 import Invite from './invite';
-import { BizTable, BizDialog, BizSelect } from '@zgfe/business-lib';
+import { BizTable, BizDialog, BizSelect, BizGlobalDataContext } from '@zgfe/business-lib';
 import moment from 'moment';
 import apis from './../../../constants/api';
+import { queryCompanyUser } from '../../../requests/role';
 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;
@@ -27,6 +28,7 @@ var User = function User(props) {
   var id = props.id,
     allGroupInfos = props.allGroupInfos,
     isAdmin = props.isAdmin,
+    companyId = props.companyId,
     removeUserCallback = props.removeUserCallback,
     _createMembersCallback = props.createMembersCallback,
     changeAdminCallback = props.changeAdminCallback;
@@ -41,6 +43,8 @@ var User = function User(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     adminOptionValue = _useState6[0],
     setAdminOptionValue = _useState6[1];
+  var _useContext = useContext(BizGlobalDataContext),
+    authority = _useContext.authority;
   var _useState7 = useState(''),
     _useState8 = _slicedToArray(_useState7, 1),
     filter = _useState8[0];
@@ -86,29 +90,54 @@ var User = function User(props) {
     _useState28 = _slicedToArray(_useState27, 2),
     showMembers = _useState28[0],
     setShowMembers = _useState28[1];
+  var _useState29 = useState(0),
+    _useState30 = _slicedToArray(_useState29, 2),
+    total = _useState30[0],
+    setTotal = _useState30[1];
+  var _useState31 = useState({
+      pageNo: 1,
+      pageSize: 10
+    }),
+    _useState32 = _slicedToArray(_useState31, 2),
+    pageData = _useState32[0],
+    setPageData = _useState32[1];
   useEffect(function () {
     getMenbers();
-  }, []);
+    queryRoleUserList(null);
+  }, [pageData]);
   var getMenbers = function getMenbers(params) {
     request(api.setting.queryUserPage, {
       method: 'post',
       data: _objectSpread(_objectSpread({}, params), {}, {
-        pageNo: 1,
-        pageSize: 10
+        pageNo: pageData.pageNo,
+        pageSize: pageData.pageSize
       })
     }).then(function (res) {
-      var _res$data2;
       if (res && res.code === '101000' && res.data) {
-        var _res$data;
+        var _res$data, _res$data2;
         setShowMembers(res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list);
+        setTotal(res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.total);
       }
-      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);
     });
   };
+  // 成员下拉数据
+  var queryRoleUserList = function queryRoleUserList(ids) {
+    queryCompanyUser({
+      id: ids
+    }).then(function (res) {
+      if (res === null || res === void 0 ? void 0 : res.data) {
+        var _res$data3;
+        setAdminOptionList(res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.filter(function (item) {
+          return item.id !== id;
+        }));
+      }
+    }).catch(function (err) {
+      setAdminOptionList([]);
+      console.error(err);
+    });
+  };
   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;
@@ -281,12 +310,14 @@ var User = function User(props) {
     });
   };
   var columns = [{
+    with: 334,
     title: '账号',
     dataIndex: 'email',
     render: function render(email) {
       return /*#__PURE__*/React.createElement("div", null, email);
     }
   }, {
+    with: 334,
     title: '姓名',
     render: function render(data) {
       return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
@@ -344,8 +375,9 @@ var User = function User(props) {
   }, {
     title: '状态',
     render: function render(data) {
-      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Switch, {
+      return /*#__PURE__*/React.createElement("div", null, !data.isAdmin && /*#__PURE__*/React.createElement(Switch, {
         size: "default",
+        disabled: !authority[10089],
         checked: data.accountStatus === 1 ? true : false,
         onChange: function onChange(checked) {
           return onSwitchChange(checked, data);
@@ -354,20 +386,22 @@ var User = function User(props) {
     }
   }, {
     title: '创建时间',
-    dataIndex: 'createDateTime',
-    render: function render(createDateTime) {
-      return /*#__PURE__*/React.createElement("div", null, moment(createDateTime).format('YYYY-MM-DD HH:mm:ss'));
+    ellipsis: true,
+    render: function render(data) {
+      return /*#__PURE__*/React.createElement("div", null, moment(data === null || data === void 0 ? void 0 : data.createDateTime).format('YYYY-MM-DD HH:mm:ss'));
     }
   }, {
     title: '操作',
+    with: 334,
+    fixed: 'right',
     render: function render(data) {
       return /*#__PURE__*/React.createElement("div", {
         className: "operate"
-      }, /*#__PURE__*/React.createElement("a", {
+      }, authority[10090] && /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           return showUserEditAuthEvent(data);
         }
-      }, "\u7F16\u8F91"), /*#__PURE__*/React.createElement("a", {
+      }, "\u7F16\u8F91"), authority[10091] && /*#__PURE__*/React.createElement("a", {
         title: "\u79FB\u51FA\u516C\u53F8",
         style: {
           visibility: data.id !== id && !data.isAdmin ? 'visible' : 'hidden'
@@ -375,7 +409,7 @@ var User = function User(props) {
         onClick: function onClick() {
           return removeUser(data);
         }
-      }, "\u5220\u9664"), /*#__PURE__*/React.createElement("a", {
+      }, "\u5220\u9664"), authority[10092] && /*#__PURE__*/React.createElement("a", {
         style: {
           visibility: data.id !== id && !data.isAdmin ? 'visible' : 'hidden'
         },
@@ -385,10 +419,18 @@ var User = function User(props) {
       }, "\u91CD\u7F6E\u5BC6\u7801"));
     }
   }];
+  // 监听分页变化，如果页码发生变化则调用合并行方法
+  var onChangeTable = function onChangeTable(pagination) {
+    setPageData({
+      pageSize: pagination === null || pagination === void 0 ? void 0 : pagination.pageSize,
+      pageNo: pagination === null || pagination === void 0 ? void 0 : pagination.current
+    });
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "company-user"
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Invite, {
     queryPanel: queryPanel,
+    companyId: companyId,
     userEditAuthData: userEditAuthData,
     allGroupInfos: allGroupInfos,
     createMembersCallback: function createMembersCallback(res, userConfig) {
@@ -400,40 +442,37 @@ var User = function User(props) {
   }, /*#__PURE__*/React.createElement(BizTable, {
     dataSource: showMembers,
     columns: columns,
-    total: showMembers.length,
+    total: total,
+    onChange: onChangeTable,
     rowKey: "id",
     scroll: {
-      x: 1000,
+      x: 1200,
       y: 550
     }
-  }), /*#__PURE__*/React.createElement("div", null, isAdmin ? /*#__PURE__*/React.createElement("div", {
-    style: {
-      top: !showMembers.length ? 6 : -34
-    },
+  }), isAdmin ? /*#__PURE__*/React.createElement("div", {
     className: "over-hand"
   }, /*#__PURE__*/React.createElement("span", null, "\u79FB\u4EA4\u8D85\u7EA7\u7BA1\u7406\u5458\u6743\u9650\u7ED9"), /*#__PURE__*/React.createElement(BizSelect, {
+    enableSearch: true,
     overlayWidth: 200,
     options: adminOptionList,
     value: adminOptionValue,
     labelField: "email",
     keyField: "id",
     onChange: changeAdmin
-  })) : null)), /*#__PURE__*/React.createElement(BizDialog, {
+  })) : null), /*#__PURE__*/React.createElement(BizDialog, {
     title: dialogTitle,
     open: showDialog,
     closable: true,
+    className: "setting-bizDialog",
     onOk: function onOk() {
       dialogConfirmFunc && dialogConfirmFunc();
     },
     onCancel: dialogCancelFunc || void 0
-  }, /*#__PURE__*/React.createElement("p", {
-    style: {
-      width: 400
-    }
-  }, dialogContent)), /*#__PURE__*/React.createElement(BizDialog, {
+  }, /*#__PURE__*/React.createElement("p", null, dialogContent)), /*#__PURE__*/React.createElement(BizDialog, {
     title: pwdPanelUserConfig && pwdPanelUserConfig.id ? '创建成功' : '密码已生成',
     open: showPasswordPanel,
     closable: true,
+    className: "setting-bizDialog",
     onCancel: closePwdPanel,
     footer: [pwdPanelUserConfig && pwdPanelUserConfig.id ? /*#__PURE__*/React.createElement(Button, {
       style: {
@@ -450,9 +489,13 @@ var User = function User(props) {
       onClick: copyTxt
     }, "\u590D\u5236")]
   }, /*#__PURE__*/React.createElement("ul", {
+    className: "setting-bizDialog-zh"
+  }, /*#__PURE__*/React.createElement("li", null, "\u8D26\u53F7\uFF1A", pwdPanelAccount), /*#__PURE__*/React.createElement("li", null, "\u5BC6\u7801\uFF1A", pwdPanelPassword), /*#__PURE__*/React.createElement("li", null, /*#__PURE__*/React.createElement("i", {
     style: {
-      width: 400
-    }
-  }, /*#__PURE__*/React.createElement("li", null, "\u8D26\u53F7\uFF1A", pwdPanelAccount), /*#__PURE__*/React.createElement("li", null, "\u5BC6\u7801\uFF1A", pwdPanelPassword), /*#__PURE__*/React.createElement("li", null, "\u8BF7\u5C06\u4FE1\u606F\u590D\u5236\u53D1\u9001\u7ED9\u76F8\u5E94\u6210\u5458")))));
+      fontSize: 16,
+      marginRight: '8px'
+    },
+    className: "bsicon tishi"
+  }), "\u8BF7\u5C06\u4FE1\u606F\u590D\u5236\u53D1\u9001\u7ED9\u76F8\u5E94\u6210\u5458")))));
 };
 export default User;

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

@@ -29,7 +29,6 @@
         font-family: PingFang SC;
         font-style: normal;
         line-height: 24px;
-        /* 150% */
       }
     }
   }
@@ -44,6 +43,7 @@
     gap: 24px;
     align-items: center;
     justify-content: flex-start;
+    margin-top: 8px;
 
     .biz-select-handle-input {
       width: 248px;
@@ -51,13 +51,17 @@
 
     .ant-input {
       width: 248px;
-      border-color: @background-color-base !important;
+      border: 1px solid #fafafb;
 
       &:focus {
         border-color: @primary-color !important;
       }
     }
 
+    .ant-select-selector {
+      border-color: @background-color-base !important;
+    }
+
     > div {
       display: flex;
       gap: 12px;
@@ -195,10 +199,11 @@
 
   .over-hand {
     position: relative;
+    bottom: 18px;
     display: flex;
     align-items: center;
     width: 300px;
-    // margin-top: 80px;
+    height: 0;
 
     > span {
       margin-right: 12px;
@@ -252,6 +257,24 @@
   }
 }
 
+.setting-bizDialog-zh {
+  display: grid;
+  gap: 16px;
+  width: 400px;
+
+  li {
+    height: 20px;
+  }
+
+  li:nth-child(3) {
+    display: flex;
+    align-items: center;
+    margin-top: 8px;
+    color: var(--unnamed, #fd9f41);
+    line-height: 20px;
+  }
+}
+
 .user-dialog-content {
   .ant-input {
     border-color: @background-color-base !important;
@@ -260,5 +283,69 @@
       border-color: @primary-color !important;
     }
   }
+
+  .ant-select-selector {
+    border-color: @background-color-base !important;
+  }
+
+  .biz-select-handle-input {
+    .ant-input {
+      border-color: @background-color-base !important;
+
+      &:focus {
+        border-color: @background-color-base !important;
+      }
+    }
+
+    &:focus {
+      border-color: @primary-color !important;
+    }
+  }
+
+  .ant-input-status-error {
+    border: 1px solid #fb5547 !important;
+
+    &:focus {
+      border-color: #fb5547 !important;
+    }
+  }
+
+  .account-status {
+    .ant-form-item-row {
+      height: 24px;
+    }
+  }
+
+  .ant-select-status-error {
+    border: none !important;
+
+    &:focus {
+      box-shadow: 0 0 0 2px rgba(251, 85, 71, 0.2) !important;
+    }
+  }
+
+  .biz-select-handle-status-error.active:not(.disable) {
+    box-shadow: 0 0 0 2px rgba(251, 85, 71, 0.2) !important;
+  }
+
+  .biz-select-handle-status-error {
+    .ant-input.ant-input-status-error:focus:not(.ant-input-disable):not(.ant-input-borderless),
+    .ant-input.ant-input-status-error-focused:not(.ant-input-disable):not(.ant-input-borderless) {
+      box-shadow: none !important;
+    }
+  }
+
+  .ant-form-item:last-of-type {
+    margin-bottom: 0;
+  }
+
+  .no-rules-label {
+    margin-bottom: 20px;
+
+    .ant-form-item-label {
+      width: 50px !important;
+    }
+  }
+
   color: #5f6085;
 }

package/es/modules/companySetting/user/invite.d.ts

@@ -5,6 +5,7 @@ declare const UserGroup: React.FC<{
     allGroupInfos: AllGroupInfosItem[];
     queryPanel: (params: queryPanelItem) => void;
     userEditAuthData: AllMembersItem;
+    companyId: number;
     createMembersCallback: (res: ApiResult<void>, userConfig: AllMembersItem | false) => void;
 }>;
 export default UserGroup;