@zgfe/modules-settings 1.2.10-lmy-role13 → 1.2.10-lmy-role15

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

@@ -165,13 +165,21 @@ var DepartmentList = function DepartmentList(props) {
   // 打开编辑弹窗
   var toAppSetting = function toAppSetting(data) {
     var _data$deptBoss$split;
+    var arr = (_data$deptBoss$split = data.deptBoss.split(',')) === null || _data$deptBoss$split === void 0 ? void 0 : _data$deptBoss$split.map(function (item) {
+      var _app$, _app$2;
+      var app = allMembers.filter(function (v) {
+        return v.email === item;
+      });
+      return {
+        email: (_app$ = app[0]) === null || _app$ === void 0 ? void 0 : _app$.email,
+        id: (_app$2 = app[0]) === null || _app$2 === void 0 ? void 0 : _app$2.id
+      };
+    });
+    console.log(999999991111, arr);
     form.setFieldsValue(_objectSpread(_objectSpread({}, data), {}, {
       parentId: data.parentId,
-      deptBoss: data.deptBoss ? (_data$deptBoss$split = data.deptBoss.split(',')) === null || _data$deptBoss$split === void 0 ? void 0 : _data$deptBoss$split.map(function (item) {
-        return {
-          label: item,
-          value: item
-        };
+      deptBoss: data.deptBoss ? arr.filter(function (v) {
+        return v.email !== undefined;
       }) : []
     }));
     setCreatedAppPanel(true);

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; }
@@ -71,7 +75,9 @@ var RoleList = function RoleList(props) {
     setRoleId = _useState22[1];
   var _useState23 = useState({
       map1: [],
-      map2: []
+      map2: [],
+      settingList1: [],
+      settingList2: []
     }),
     _useState24 = _slicedToArray(_useState23, 2),
     menuCodeMap = _useState24[0],
@@ -100,8 +106,8 @@ var RoleList = function RoleList(props) {
     setUserList = _useState32[1];
   var _useState33 = useState([]),
     _useState34 = _slicedToArray(_useState33, 2),
-    useList = _useState34[0],
-    setUseList = _useState34[1];
+    usList = _useState34[0],
+    setUsList = _useState34[1];
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -115,6 +121,13 @@ var RoleList = function RoleList(props) {
     // 请求角色列表数据
     queryRolePageList();
   }, [name, pageData]);
+  useEffect(function () {
+    if (roleId && usList && userList) {
+      queryRoleDetailsList({
+        id: roleId
+      });
+    }
+  }, [roleId, usList, userList]);
   useEffect(function () {
     if (appVersionFl) {
       form.setFieldsValue({
@@ -133,7 +146,6 @@ var RoleList = function RoleList(props) {
         });
       }
     } else {
-      console.log(999999999, menuCodeMap);
       form.setFieldsValue({
         menuCodeMap: systemVersionId === 1 ? menuCodeMap.map1 : menuCodeMap.map2
       });
@@ -179,12 +191,9 @@ var RoleList = function RoleList(props) {
         className: "operating"
       }, 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);
           queryRoleUserList(data === null || data === void 0 ? void 0 : data.roleId);
-          queryRoleDataConfigList(data === null || data === void 0 ? void 0 : data.roleId);
-          queryRoleDetailsList({
-            id: data === null || data === void 0 ? void 0 : data.roleId
-          });
         }
       }, "\u7F16\u8F91"), authority[10095] && /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
@@ -230,14 +239,14 @@ var RoleList = function RoleList(props) {
     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) {
+        console.log(55555, usList);
+        var arr = 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);
           });
         });
-        console.log(999999, arr);
-        onChangeAppIds(arr);
+        onChangeAppIds(arr, params === null || params === void 0 ? void 0 : params.id);
         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) {
             return {
@@ -255,13 +264,13 @@ var RoleList = function RoleList(props) {
         }));
         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']
+          map2: res === null || res === void 0 ? void 0 : (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.menuCodeMap['2'],
+          settingList1: [],
+          settingList2: []
         });
-        // queryRoleMenuTreeList(roleId, 1);
         setCreatedAppPanel(true);
       }
     }).catch(function (err) {
-      setUseList([]);
       console.error(err);
     });
   };
@@ -276,20 +285,20 @@ var RoleList = function RoleList(props) {
         setFunctionList(arr[0].children ? arr : []);
       }
     }).catch(function (err) {
-      setUseList([]);
+      setFunctionList([]);
       console.error(err);
     });
   };
   // 成员下拉数据
   var queryRoleUserList = function queryRoleUserList(id) {
     queryCompanyUser({
-      id: null
+      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);
     });
   };
@@ -299,10 +308,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);
     });
   };
@@ -334,8 +343,8 @@ var RoleList = function RoleList(props) {
       console.error(err);
     });
   };
-  var onChangeAppIds = function onChangeAppIds(e) {
-    setAppVersionFl(false);
+  var onChangeAppIds = function onChangeAppIds(e, roleId) {
+    // setAppVersionFl(false);
     var arr = e.map(function (item) {
       return item.appVersion;
     });
@@ -344,35 +353,50 @@ var RoleList = function RoleList(props) {
       onSystemVersion({
         label: '通用版本',
         id: 1
-      });
+      }, roleId);
     } else {
       if (arr.length === 0 || arr.includes(1)) {
         onSystemVersion({
           label: '通用版本',
           id: 1
-        });
+        }, roleId);
       }
       if (arr.includes(2)) {
         onSystemVersion({
           label: '城商行',
           id: 2
-        });
+        }, roleId);
       }
     }
   };
-  var onSystemVersion = function onSystemVersion(e) {
+  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;
+    });
+    // const noSettingList = node.checkedNodes.filter((item: { path: string }) => !regex.test(item.path))
+    //   .map((item: { path: string; menuCode: number; name: string; }) => {
+    //     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 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 params = _objectSpread(_objectSpread({}, value), {}, {
       id: roleId,
-      menuCodeMap: (_menuCodeMap = {}, _defineProperty(_menuCodeMap, 1, menuCodeMap.map1), _defineProperty(_menuCodeMap, 2, 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) {
+      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$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;
       }),
       systemVersion: appVersionFl ? 0 : 1,
@@ -392,7 +416,9 @@ var RoleList = function RoleList(props) {
       queryRolePageList();
       setMenuCodeMap({
         map1: [],
-        map2: []
+        map2: [],
+        settingList1: [],
+        settingList2: []
       });
       // 通知数据刷新
       msg = !roleId ? '创建成功' : '编辑成功';
@@ -436,6 +462,8 @@ var RoleList = function RoleList(props) {
       form.setFieldsValue({
         isEncryption: 0
       });
+      queryRoleDataConfigList(null);
+      queryRoleUserList(null);
       queryRoleMenuTreeList(null, 1);
       setAppVersionFl(false);
     }
@@ -455,17 +483,20 @@ var RoleList = function RoleList(props) {
       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, {
@@ -517,7 +548,7 @@ var RoleList = function RoleList(props) {
     }]
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "label-group",
-    options: useList,
+    options: usList,
     multiple: true,
     enableSelectAll: true,
     onChange: function onChange(e) {
@@ -552,8 +583,8 @@ var RoleList = function RoleList(props) {
     }]
   }, /*#__PURE__*/React.createElement(Tree, {
     checkable: true,
-    onCheck: function onCheck(e) {
-      setMenuCodeMap(_objectSpread(_objectSpread({}, menuCodeMap), {}, _defineProperty({}, 'map' + systemVersionId, e)));
+    onCheck: function onCheck(e, checkedNodes) {
+      onCheckedNodes(e, checkedNodes);
     },
     rootStyle: {
       maxHeight: '436px',

package/package.json

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