@zgfe/modules-settings 1.2.11 → 1.2.13

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

@@ -1,4 +1,8 @@
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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; }
@@ -10,13 +14,13 @@ 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 util from './../../../utils/util';
 import { Button, Drawer, Form, Input, Radio, Spin, Table, Tooltip, Tree, notification } from 'antd';
 import moment from 'moment';
-import { BizDialog, BizSelect, IconFont } from '@zgfe/business-lib';
-import { addRole, queryRoleDataConfig, queryRoleDetails, queryRoleMenuTree, queryRolePage, queryRoleUser, updateRole, deleteRole } from '../../../requests/role';
+import { BizDialog, BizSelect, IconFont, BizGlobalDataContext } from '@zgfe/business-lib';
+import { addRole, queryRoleDataConfig, queryRoleDetails, queryRoleMenuTree, queryRolePage, queryCompanyUser, updateRole, deleteRole } from '../../../requests/role';
 var RoleList = function RoleList(props) {
   // 弹窗
   var _useState = useState(false),
@@ -46,6 +50,9 @@ var RoleList = function RoleList(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     pageData = _useState12[0],
     setPageData = _useState12[1];
+  var _useContext = useContext(BizGlobalDataContext),
+    authority = _useContext.authority,
+    currentApp = _useContext.currentApp;
   // 初始数据
   var _useState13 = useState(''),
     _useState14 = _slicedToArray(_useState13, 2),
@@ -55,47 +62,53 @@ var RoleList = function RoleList(props) {
     _useState16 = _slicedToArray(_useState15, 2),
     appVersionFl = _useState16[0],
     setAppVersionFl = _useState16[1];
-  var _useState17 = useState(1),
+  var _useState17 = useState('请选择通用版本功能权限'),
     _useState18 = _slicedToArray(_useState17, 2),
-    systemVersionId = _useState18[0],
-    setSystemVersionId = _useState18[1];
-  var _useState19 = useState(null),
+    appVersionFlTest = _useState18[0],
+    setAppVersionFlTest = _useState18[1];
+  var _useState19 = useState(1),
     _useState20 = _slicedToArray(_useState19, 2),
-    roleId = _useState20[0],
-    setRoleId = _useState20[1];
-  var _useState21 = useState({
+    systemVersionId = _useState20[0],
+    setSystemVersionId = _useState20[1];
+  var _useState21 = useState(null),
+    _useState22 = _slicedToArray(_useState21, 2),
+    roleId = _useState22[0],
+    setRoleId = _useState22[1];
+  var _useState23 = useState({
       map1: [],
-      map2: []
+      map2: [],
+      settingList1: [],
+      settingList2: []
     }),
-    _useState22 = _slicedToArray(_useState21, 2),
-    menuCodeMap = _useState22[0],
-    setMenuCodeMap = _useState22[1];
-  // 下拉数据
-  var _useState23 = useState([]),
     _useState24 = _slicedToArray(_useState23, 2),
-    roleList = _useState24[0],
-    setRoleList = _useState24[1];
-  var _useState25 = useState([{
+    menuCodeMap = _useState24[0],
+    setMenuCodeMap = _useState24[1];
+  // 下拉数据
+  var _useState25 = useState([]),
+    _useState26 = _slicedToArray(_useState25, 2),
+    roleList = _useState26[0],
+    setRoleList = _useState26[1];
+  var _useState27 = useState([{
       label: '通用版本',
       id: 1
     }, {
       label: '城商行',
       id: 2
     }]),
-    _useState26 = _slicedToArray(_useState25, 1),
-    versionList = _useState26[0];
-  var _useState27 = useState({}),
-    _useState28 = _slicedToArray(_useState27, 2),
-    functionList = _useState28[0],
-    setFunctionList = _useState28[1];
-  var _useState29 = useState([]),
+    _useState28 = _slicedToArray(_useState27, 1),
+    versionList = _useState28[0];
+  var _useState29 = useState({}),
     _useState30 = _slicedToArray(_useState29, 2),
-    userList = _useState30[0],
-    setUserList = _useState30[1];
+    functionList = _useState30[0],
+    setFunctionList = _useState30[1];
   var _useState31 = useState([]),
     _useState32 = _slicedToArray(_useState31, 2),
-    useList = _useState32[0],
-    setUseList = _useState32[1];
+    userList = _useState32[0],
+    setUserList = _useState32[1];
+  var _useState33 = useState([]),
+    _useState34 = _slicedToArray(_useState33, 2),
+    usList = _useState34[0],
+    setUsList = _useState34[1];
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -103,16 +116,49 @@ var RoleList = function RoleList(props) {
     // 请求下拉数据
     queryRoleDataConfigList(null);
     queryRoleUserList(null);
-    queryRoleMenuTreeList(null, 1);
+    queryRoleMenuTreeList(null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) ? currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion : 1);
   }, []);
   useEffect(function () {
     // 请求角色列表数据
     queryRolePageList();
   }, [name, pageData]);
+  useEffect(function () {
+    if (roleId && usList && userList) {
+      queryRoleDetailsList({
+        id: roleId
+      });
+    }
+  }, [userList]);
+  useEffect(function () {
+    if (appVersionFl) {
+      var _menuCodeMap$map, _menuCodeMap$map2;
+      form.setFieldsValue({
+        menuCodeMap: []
+      });
+      if ((menuCodeMap === null || menuCodeMap === void 0 ? void 0 : (_menuCodeMap$map = menuCodeMap.map1) === null || _menuCodeMap$map === void 0 ? void 0 : _menuCodeMap$map.length) === 0) {
+        setAppVersionFlTest('请选择通用版本功能权限');
+        return;
+      }
+      if ((menuCodeMap === null || menuCodeMap === void 0 ? void 0 : (_menuCodeMap$map2 = menuCodeMap.map2) === null || _menuCodeMap$map2 === void 0 ? void 0 : _menuCodeMap$map2.length) === 0) {
+        setAppVersionFlTest('请选择通城商行功能权限');
+        return;
+      } else {
+        form.setFieldsValue({
+          menuCodeMap: menuCodeMap.map2
+        });
+      }
+    } else {
+      form.setFieldsValue({
+        menuCodeMap: systemVersionId === 1 ? menuCodeMap.map1 : menuCodeMap.map2
+      });
+      setAppVersionFlTest(systemVersionId === 1 ? '请选择通用版本功能权限' : '请选择通城商行功能权限');
+    }
+  }, [menuCodeMap, appVersionFl]);
   // 列表数据
   var columns = [{
     title: '角色名称',
     dataIndex: 'roleName',
+    ellipsis: true,
     with: 334
   }, {
     title: '成员',
@@ -145,16 +191,13 @@ var RoleList = function RoleList(props) {
     render: function render(data) {
       return /*#__PURE__*/React.createElement("div", {
         className: "operating"
-      }, data.parentId !== 0 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("a", {
+      }, data.parentId !== 0 && /*#__PURE__*/React.createElement(React.Fragment, null, authority[10094] && /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
+          queryRoleDataConfigList(data === null || data === void 0 ? void 0 : data.roleId);
           setRoleId(data === null || data === void 0 ? void 0 : data.roleId);
-          queryRoleDetailsList({
-            id: data === null || data === void 0 ? void 0 : data.roleId
-          });
           queryRoleUserList(data === null || data === void 0 ? void 0 : data.roleId);
-          queryRoleDataConfigList(data === null || data === void 0 ? void 0 : data.roleId);
         }
-      }, "\u7F16\u8F91"), /*#__PURE__*/React.createElement("a", {
+      }, "\u7F16\u8F91"), authority[10095] && /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           setRoleId(data === null || data === void 0 ? void 0 : data.roleId);
           setDelPanelState(true);
@@ -197,38 +240,38 @@ var RoleList = function RoleList(props) {
   var queryRoleDetailsList = function queryRoleDetailsList(params) {
     queryRoleDetails(params).then(function (res) {
       if (res === null || res === void 0 ? void 0 : res.data) {
-        var _res$data4, _res$data4$appIds, _res$data5, _res$data5$userIds, _res$data6, _res$data7;
-        var arr = useList === null || useList === void 0 ? void 0 : useList.filter(function (item1) {
+        var _res$data5, _res$data6;
+        var usListArr = usList === null || usList === void 0 ? void 0 : usList.filter(function (item1) {
           var _res$data3;
           return res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.appIds.some(function (item2) {
             return item2 === (item1 === null || item1 === void 0 ? void 0 : item1.id);
           });
         });
-        onChangeAppIds(arr);
+        var userListArr = userList === null || userList === void 0 ? void 0 : userList.filter(function (item1) {
+          var _res$data4;
+          return res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.userIds.some(function (item2) {
+            return item2 === (item1 === null || item1 === void 0 ? void 0 : item1.id);
+          });
+        });
+        onChangeAppIds(usListArr, params === null || params === void 0 ? void 0 : params.id, res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.menuCodeMap, res === null || res === void 0 ? void 0 : (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.settingMenuList);
         form.setFieldsValue(_objectSpread(_objectSpread({}, res === null || res === void 0 ? void 0 : res.data), {}, {
-          appIds: res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : (_res$data4$appIds = _res$data4.appIds) === null || _res$data4$appIds === void 0 ? void 0 : _res$data4$appIds.map(function (item) {
+          appIds: usListArr === null || usListArr === void 0 ? void 0 : usListArr.map(function (item) {
             return {
-              id: item
+              id: item === null || item === void 0 ? void 0 : item.id
             };
           }),
           systemVersion: {
             id: 1
           },
-          userIds: res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : (_res$data5$userIds = _res$data5.userIds) === null || _res$data5$userIds === void 0 ? void 0 : _res$data5$userIds.map(function (item) {
+          userIds: userListArr === null || userListArr === void 0 ? void 0 : userListArr.map(function (item) {
             return {
-              id: item
+              id: item === null || item === void 0 ? void 0 : item.id
             };
           })
         }));
-        setMenuCodeMap({
-          map1: res === null || res === void 0 ? void 0 : (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.menuCodeMap['1'],
-          map2: res === null || res === void 0 ? void 0 : (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.menuCodeMap['2']
-        });
-        queryRoleMenuTreeList(roleId, 1);
         setCreatedAppPanel(true);
       }
     }).catch(function (err) {
-      setUseList([]);
       console.error(err);
     });
   };
@@ -239,24 +282,25 @@ var RoleList = function RoleList(props) {
       systemVersion: systemVersion
     }).then(function (res) {
       if (res === null || res === void 0 ? void 0 : res.data) {
+        var _arr$;
         var arr = util.menuTreeData([res === null || res === void 0 ? void 0 : res.data]);
-        setFunctionList(arr);
+        setFunctionList(((_arr$ = arr[0]) === null || _arr$ === void 0 ? void 0 : _arr$.children) ? arr : []);
       }
     }).catch(function (err) {
-      setUseList([]);
+      setFunctionList([]);
       console.error(err);
     });
   };
   // 成员下拉数据
   var queryRoleUserList = function queryRoleUserList(id) {
-    queryRoleUser({
-      id: null
+    queryCompanyUser({
+      id: id
     }).then(function (res) {
       if (res === null || res === void 0 ? void 0 : res.data) {
         setUserList(res === null || res === void 0 ? void 0 : res.data);
       }
     }).catch(function (err) {
-      setUseList([]);
+      setUserList([]);
       console.error(err);
     });
   };
@@ -266,10 +310,10 @@ var RoleList = function RoleList(props) {
       id: id
     }).then(function (res) {
       if (res === null || res === void 0 ? void 0 : res.data) {
-        setUseList(res === null || res === void 0 ? void 0 : res.data);
+        setUsList(res === null || res === void 0 ? void 0 : res.data);
       }
     }).catch(function (err) {
-      setUseList([]);
+      setUsList([]);
       console.error(err);
     });
   };
@@ -301,32 +345,113 @@ var RoleList = function RoleList(props) {
       console.error(err);
     });
   };
-  var onChangeAppIds = function onChangeAppIds(e) {
+  var onChangeAppIds = function onChangeAppIds(e, roleId, codeMap, settingMenuList) {
+    setAppVersionFl(false);
     var arr = e.map(function (item) {
       return item.appVersion;
     });
-    setAppVersionFl(arr.includes(1) && arr.includes(2));
+    if (arr.includes(1) && arr.includes(2)) {
+      setAppVersionFl(arr.includes(1) && arr.includes(2));
+      onSystemVersion({
+        label: '通用版本',
+        id: 1
+      }, roleId);
+      form.setFieldsValue({
+        systemVersion: {
+          id: 1
+        }
+      });
+      setMenuCodeMap({
+        map1: codeMap['1'] || codeMap.map1,
+        map2: codeMap['2'] || codeMap.map2,
+        settingList1: settingMenuList || [],
+        settingList2: settingMenuList || []
+      });
+    } else {
+      if (arr.length === 0 || arr.includes(1)) {
+        onSystemVersion({
+          label: '通用版本',
+          id: 1
+        }, roleId);
+        form.setFieldsValue({
+          systemVersion: {
+            id: 1
+          }
+        });
+        setMenuCodeMap({
+          map1: codeMap['1'] || codeMap.map1,
+          map2: [],
+          settingList1: settingMenuList || [],
+          settingList2: []
+        });
+      }
+      if (arr.includes(2)) {
+        onSystemVersion({
+          label: '城商行',
+          id: 2
+        }, roleId);
+        form.setFieldsValue({
+          systemVersion: {
+            id: 2
+          }
+        });
+        setMenuCodeMap({
+          map1: [],
+          map2: codeMap['2'] || codeMap.map2,
+          settingList1: [],
+          settingList2: settingMenuList || []
+        });
+      }
+    }
+  };
+  var onSystemVersion = function onSystemVersion(e, roleId) {
+    setSystemVersionId(e.id);
+    queryRoleMenuTreeList(roleId, e.id);
+  };
+  var onCheckedNodes = function onCheckedNodes(e, node) {
+    var _objectSpread2;
+    var regex = /^105($|,)/;
+    var settingList = node.checkedNodes.filter(function (item) {
+      return regex.test(item.path);
+    }).map(function (item) {
+      return item.menuCode;
+    });
+    setMenuCodeMap(_objectSpread(_objectSpread({}, menuCodeMap), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, 'map' + systemVersionId, e), _defineProperty(_objectSpread2, 'settingList' + systemVersionId, settingList), _objectSpread2)));
   };
   // 编辑||创建
   var onFinish = function onFinish(value) {
-    var _menuCodeMap, _value$appIds, _value$appIds2, _value$userIds;
-    setCreateAppLoading(true);
+    var _value$appIds, _menuCodeMap, _value$appIds2, _value$userIds;
+    // setCreateAppLoading(true);
     var msg = '';
+    var unionArray = _toConsumableArray(new Set([].concat(_toConsumableArray(menuCodeMap === null || menuCodeMap === void 0 ? void 0 : menuCodeMap.settingList1), _toConsumableArray(menuCodeMap === null || menuCodeMap === void 0 ? void 0 : menuCodeMap.settingList2))));
+    var appIdsList = value === null || value === void 0 ? void 0 : (_value$appIds = value.appIds) === null || _value$appIds === void 0 ? void 0 : _value$appIds.map(function (item) {
+      return item === null || item === void 0 ? void 0 : item.id;
+    });
     var params = _objectSpread(_objectSpread({}, value), {}, {
       id: roleId,
-      menuCodeMap: (_menuCodeMap = {}, _defineProperty(_menuCodeMap, 1, menuCodeMap.map1), _defineProperty(_menuCodeMap, 2, appVersionFl ? menuCodeMap.map2 : []), _menuCodeMap),
-      appIds: (useList === null || useList === void 0 ? void 0 : useList.length) === (value === null || value === void 0 ? void 0 : (_value$appIds = value.appIds) === null || _value$appIds === void 0 ? void 0 : _value$appIds.length) ? [0] : value === null || value === void 0 ? void 0 : (_value$appIds2 = value.appIds) === null || _value$appIds2 === void 0 ? void 0 : _value$appIds2.map(function (item) {
-        return item === null || item === void 0 ? void 0 : item.id;
-      }),
+      menuCodeMap: (_menuCodeMap = {}, _defineProperty(_menuCodeMap, 1, _toConsumableArray(new Set([].concat(_toConsumableArray(menuCodeMap.map1), _toConsumableArray(unionArray))))), _defineProperty(_menuCodeMap, 2, _toConsumableArray(new Set([].concat(_toConsumableArray(menuCodeMap.map2), _toConsumableArray(unionArray))))), _menuCodeMap),
+      appIds: (usList === null || usList === void 0 ? void 0 : usList.length) === (value === null || value === void 0 ? void 0 : (_value$appIds2 = value.appIds) === null || _value$appIds2 === void 0 ? void 0 : _value$appIds2.length) ? [0].concat(_toConsumableArray(appIdsList)) : appIdsList,
       systemVersion: appVersionFl ? 0 : 1,
       userIds: value === null || value === void 0 ? void 0 : (_value$userIds = value.userIds) === null || _value$userIds === void 0 ? void 0 : _value$userIds.map(function (item) {
         return item === null || item === void 0 ? void 0 : item.id;
       })
     });
     (!roleId ? addRole : updateRole)(params).then(function (res) {
-      if ((res === null || res === void 0 ? void 0 : res.code) !== '101000') return;
+      if ((res === null || res === void 0 ? void 0 : res.code) !== '101000') {
+        setTimeout(function () {
+          setCreateAppLoading(false);
+        }, 1000);
+        return;
+      }
       setCreatedAppPanel(false);
+      setCreateAppLoading(false);
       queryRolePageList();
+      setMenuCodeMap({
+        map1: [],
+        map2: [],
+        settingList1: [],
+        settingList2: []
+      });
       // 通知数据刷新
       msg = !roleId ? '创建成功' : '编辑成功';
       notification.success({
@@ -334,6 +459,7 @@ var RoleList = function RoleList(props) {
       });
     }).catch(function () {
       setCreateAppLoading(false);
+      setCreatedAppPanel(false);
       notification.error({
         message: !roleId ? '创建失败,请重试' : '编辑失败,请重试'
       });
@@ -343,7 +469,12 @@ var RoleList = function RoleList(props) {
     spinning: loading
   }, /*#__PURE__*/React.createElement("div", {
     className: "role-list"
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Input, {
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: '8px',
+      marginLeft: '2px'
+    }
+  }, /*#__PURE__*/React.createElement(Input, {
     prefix: /*#__PURE__*/React.createElement(IconFont, {
       type: "sousuo"
     }),
@@ -352,46 +483,67 @@ var RoleList = function RoleList(props) {
       setName(e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : (_e$target$value = _e$target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim());
     },
     style: {
-      width: '264px',
-      marginBottom: '24px'
+      width: '264px'
     },
     placeholder: '请输入角色名称'
-  })), /*#__PURE__*/React.createElement("div", {
+  }))), /*#__PURE__*/React.createElement("div", {
     className: "app-list-head"
   }, /*#__PURE__*/React.createElement("div", null, "\u89D2\u8272\u5217\u8868"), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
+    disabled: !authority[10093],
     onClick: function onClick() {
       setCreatedAppPanel(true);
       setRoleId(null);
       form.resetFields();
+      form.setFieldsValue({
+        isEncryption: 0
+      });
+      queryRoleDataConfigList(null);
+      queryRoleUserList(null);
+      queryRoleMenuTreeList(null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) ? currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion : 1);
+      setAppVersionFl(false);
     }
   }, "\u65B0\u589E\u89D2\u8272")), /*#__PURE__*/React.createElement(Drawer, {
     title: !roleId ? '新增角色' : '编辑角色',
     open: createdAppPanel,
     width: 1220,
+    className: "add-drawer",
     closable: true,
+    closeIcon: /*#__PURE__*/React.createElement("i", {
+      style: {
+        fontSize: 24,
+        marginRight: 0,
+        color: '#021429',
+        fontWeight: 'normal'
+      },
+      className: "bsicon qingchu"
+    }),
     footerStyle: {
       border: 'none',
       padding: '24px',
       display: 'flex',
       justifyContent: 'end',
-      gap: '16px'
+      gap: '16px',
+      borderTop: '1px solid #F2F3F4'
     },
     onClose: function onClose() {
       setCreatedAppPanel(false);
       setMenuCodeMap({
         map1: [],
-        map2: []
+        map2: [],
+        settingList1: [],
+        settingList2: []
       });
       setSystemVersionId(1);
-      setRoleId(null);
     },
     footer: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
       onClick: function onClick() {
         setCreatedAppPanel(false);
         setMenuCodeMap({
           map1: [],
-          map2: []
+          map2: [],
+          settingList1: [],
+          settingList2: []
         });
       }
     }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
@@ -416,6 +568,12 @@ var RoleList = function RoleList(props) {
       message: '请输入角色名称'
     }]
   }, /*#__PURE__*/React.createElement(Input, {
+    onBlur: function onBlur(event) {
+      var _event$target, _event$target$value;
+      form.setFieldsValue({
+        name: event === null || event === void 0 ? void 0 : (_event$target = event.target) === null || _event$target === void 0 ? void 0 : (_event$target$value = _event$target.value) === null || _event$target$value === void 0 ? void 0 : _event$target$value.replace(/ /g, '')
+      });
+    },
     maxLength: 50,
     placeholder: '请输入角色名称'
   })), /*#__PURE__*/React.createElement(Form.Item, {
@@ -437,13 +595,13 @@ var RoleList = function RoleList(props) {
     }]
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "label-group",
-    options: useList,
+    options: usList,
     multiple: true,
     enableSelectAll: true,
     onChange: function onChange(e) {
-      onChangeAppIds(e);
+      onChangeAppIds(e, roleId, menuCodeMap);
     },
-    placeholder: '请选择成员',
+    placeholder: '请选择应用权限',
     labelField: "app_name",
     keyField: "id"
   })), /*#__PURE__*/React.createElement(Form.Item, {
@@ -459,8 +617,7 @@ var RoleList = function RoleList(props) {
     className: "label-group",
     options: versionList,
     onChange: function onChange(e) {
-      setSystemVersionId(e.id);
-      queryRoleMenuTreeList(roleId, e.id);
+      onSystemVersion(e);
     },
     placeholder: '请选择版本',
     labelField: "label",
@@ -469,15 +626,12 @@ var RoleList = function RoleList(props) {
     name: 'menuCodeMap',
     rules: [{
       required: true,
-      message: '请选择功能权限'
+      message: appVersionFlTest
     }]
   }, /*#__PURE__*/React.createElement(Tree, {
     checkable: true,
-    onCheck: function onCheck(e) {
-      form.setFieldsValue({
-        menuCodeMap: e
-      });
-      setMenuCodeMap(_objectSpread(_objectSpread({}, menuCodeMap), {}, _defineProperty({}, 'map' + systemVersionId, e)));
+    onCheck: function onCheck(e, checkedNodes) {
+      onCheckedNodes(e, checkedNodes);
     },
     rootStyle: {
       maxHeight: '436px',
@@ -488,7 +642,8 @@ var RoleList = function RoleList(props) {
       key: 'menuCode'
     },
     checkedKeys: systemVersionId === 1 ? menuCodeMap.map1 : menuCodeMap.map2,
-    defaultExpandedKeys: systemVersionId === 1 ? menuCodeMap.map1 : menuCodeMap.map2,
+    defaultExpandedKeys: !roleId ? [0] : systemVersionId === 1 ? menuCodeMap.map1 : menuCodeMap.map2,
+    autoExpandParent: true,
     treeData: functionList
   }))), /*#__PURE__*/React.createElement(Form.Item, {
     name: 'isEncryption',
@@ -526,6 +681,7 @@ var RoleList = function RoleList(props) {
     title: "\u5220\u9664\u89D2\u8272",
     open: delPanelState,
     closable: true,
+    className: "setting-bizDialog",
     onOk: function onOk() {
       setDelPanelState(false);
       onDelConfirm();
@@ -539,7 +695,6 @@ var RoleList = function RoleList(props) {
     rowKey: "roleId",
     dataSource: roleList,
     columns: columns,
-    // pagination={pageData as boolean & (false | TablePaginationConfig)}
     pagination: total <= 10 ? false : {
       pageSize: pageData.pageSize,
       current: pageData.current,

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

@@ -32,6 +32,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
+    margin-top: 24px;
 
     > div {
       color: var(--io-n, #021429);
@@ -90,11 +91,21 @@
   }
 }
 
+.add-drawer {
+  .ant-drawer-header-title {
+    flex-direction: row-reverse;
+  }
+
+  .ant-drawer-close {
+    margin-right: 0 !important;
+  }
+}
+
 .role-dialog-content {
   .ant-form-item {
     .ant-form-item-control-input {
       width: 484px;
-      height: 32px;
+      min-height: 32px;
     }
   }
 
@@ -106,6 +117,55 @@
     }
   }
 
+  .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;
+    }
+  }
+
+  .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;
+  }
+
   color: #5f6085;
 
   .ant-form-item-label {
@@ -136,7 +196,7 @@
       }
 
       .ant-input {
-        border-color: @background-color-base !important;
+        border: 1px solid #fafafb;
 
         &:focus {
           border-color: @primary-color !important;