@zgfe/modules-settings 1.2.19 → 1.2.20-role.2

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

@@ -343,7 +343,9 @@ var appList = function appList(props) {
     value: AppVersion.common
   }, "\u901A\u7528\u7248\u672C"), /*#__PURE__*/React.createElement(Radio, {
     value: AppVersion.bank
-  }, "\u57CE\u5546\u884C\u573A\u666F\u7248\u672C")))), /*#__PURE__*/React.createElement(Form.Item, {
+  }, "\u57CE\u5546\u884C\u573A\u666F\u7248\u672C"), /*#__PURE__*/React.createElement(Radio, {
+    value: AppVersion.finance
+  }, "\u8BC1\u5238\u7248\u672C")))), /*#__PURE__*/React.createElement(Form.Item, {
     name: 'appNameVal',
     className: "app-list-form-item"
   }, /*#__PURE__*/React.createElement(Input, {

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

@@ -102,6 +102,10 @@
 
   &-create-app .ant-modal-header {
     padding-bottom: 0 !important;
+
+    .ant-modal-title {
+      margin-bottom: 24px;
+    }
   }
 
   &-form-item.ant-form-item {

package/es/modules/companySetting/demo.js

@@ -6,13 +6,13 @@ import util from '../../utils/util';
 import { CompanySetting } from '../..';
 export default (function () {
   return /*#__PURE__*/React.createElement(DemoWrapper, {
-    defaultApp: 348
+    defaultApp: 99677
   }, /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
     value: {
       funPermissions: funPermissions,
       menusName: constants.menusName,
       getMenuRouterByName: util.getMenuRouterByName,
-      authority: sessionStorage.getItem('authorityList') ? JSON.parse(sessionStorage.getItem('authorityList')) : {}
+      authority: localStorage.getItem('authorityList') ? JSON.parse(localStorage.getItem('authorityList')) : {}
     }
   }, /*#__PURE__*/React.createElement(CompanySetting, {
     action: ''

package/es/modules/companySetting/index.js

@@ -537,6 +537,7 @@ var CompanySetting = function CompanySetting(props) {
     className: "company-setting-tabs",
     destroyInactiveTabPane: true,
     activeKey: activeKey,
+    // activeKey={'userGroup'}
     onChange: changeTab,
     items: items.filter(function (item) {
       return item.hidden !== true;

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

@@ -21,6 +21,7 @@ import { Button, Drawer, Form, Input, Radio, Spin, Table, Tooltip, Tree, notific
 import moment from 'moment';
 import { BizDialog, BizSelect, IconFont, BizGlobalDataContext } from '@zgfe/business-lib';
 import { addRole, queryRoleDataConfig, queryRoleDetails, queryRoleMenuTree, queryRolePage, queryCompanyUser, updateRole, deleteRole } from '../../../requests/role';
+import SetDataRangeDialog from './setDataRangeDialog';
 var RoleList = function RoleList(props) {
   // 弹窗
   var _useState = useState(false),
@@ -77,8 +78,10 @@ var RoleList = function RoleList(props) {
   var _useState23 = useState({
       map1: [],
       map2: [],
+      map3: [],
       settingList1: [],
-      settingList2: []
+      settingList2: [],
+      settingList3: []
     }),
     _useState24 = _slicedToArray(_useState23, 2),
     menuCodeMap = _useState24[0],
@@ -88,15 +91,10 @@ var RoleList = function RoleList(props) {
     _useState26 = _slicedToArray(_useState25, 2),
     roleList = _useState26[0],
     setRoleList = _useState26[1];
-  var _useState27 = useState([{
-      label: '通用版本',
-      id: 1
-    }, {
-      label: '城商行',
-      id: 2
-    }]),
-    _useState28 = _slicedToArray(_useState27, 1),
-    versionList = _useState28[0];
+  var _useState27 = useState([]),
+    _useState28 = _slicedToArray(_useState27, 2),
+    versionList = _useState28[0],
+    setVersionList = _useState28[1];
   var _useState29 = useState({}),
     _useState30 = _slicedToArray(_useState29, 2),
     functionList = _useState30[0],
@@ -109,6 +107,26 @@ var RoleList = function RoleList(props) {
     _useState34 = _slicedToArray(_useState33, 2),
     usList = _useState34[0],
     setUsList = _useState34[1];
+  var _useState35 = useState([]),
+    _useState36 = _slicedToArray(_useState35, 2),
+    selectArr = _useState36[0],
+    setSelectArr = _useState36[1];
+  var _useState37 = useState([]),
+    _useState38 = _slicedToArray(_useState37, 2),
+    appList = _useState38[0],
+    setAppList = _useState38[1];
+  var _useState39 = useState(false),
+    _useState40 = _slicedToArray(_useState39, 2),
+    isModalOpen = _useState40[0],
+    setIsModalOpen = _useState40[1];
+  var _useState41 = useState(''),
+    _useState42 = _slicedToArray(_useState41, 2),
+    dataRangeDialogTitle = _useState42[0],
+    setDataRangeDialogTitle = _useState42[1];
+  var _useState43 = useState(0),
+    _useState44 = _slicedToArray(_useState43, 2),
+    currentAppId = _useState44[0],
+    setCurrentAppId = _useState44[1];
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -131,27 +149,105 @@ var RoleList = function RoleList(props) {
   }, [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
-        });
+      // selectArr
+      if (selectArr.includes(1) && selectArr.includes(2) && selectArr.includes(3)) {
+        var _menuCodeMap$map, _menuCodeMap$map2, _menuCodeMap$map3;
+        // 通用、城商行、证券
+        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
+          });
+        }
+        if ((menuCodeMap === null || menuCodeMap === void 0 ? void 0 : (_menuCodeMap$map3 = menuCodeMap.map3) === null || _menuCodeMap$map3 === void 0 ? void 0 : _menuCodeMap$map3.length) === 0) {
+          setAppVersionFlTest('请选择证券版本功能权限');
+          return;
+        } else {
+          form.setFieldsValue({
+            menuCodeMap: menuCodeMap.map3
+          });
+        }
+      } else if (selectArr.includes(1) && selectArr.includes(2)) {
+        var _menuCodeMap$map4, _menuCodeMap$map5;
+        // 通用城商行
+        if ((menuCodeMap === null || menuCodeMap === void 0 ? void 0 : (_menuCodeMap$map4 = menuCodeMap.map1) === null || _menuCodeMap$map4 === void 0 ? void 0 : _menuCodeMap$map4.length) === 0) {
+          setAppVersionFlTest('请选择通用版本功能权限');
+          return;
+        }
+        if ((menuCodeMap === null || menuCodeMap === void 0 ? void 0 : (_menuCodeMap$map5 = menuCodeMap.map2) === null || _menuCodeMap$map5 === void 0 ? void 0 : _menuCodeMap$map5.length) === 0) {
+          setAppVersionFlTest('请选择城商行功能权限');
+          return;
+        } else {
+          form.setFieldsValue({
+            menuCodeMap: menuCodeMap.map2
+          });
+        }
+      } else if (selectArr.includes(1) && selectArr.includes(3)) {
+        var _menuCodeMap$map6, _menuCodeMap$map7;
+        // 通用证券
+        if ((menuCodeMap === null || menuCodeMap === void 0 ? void 0 : (_menuCodeMap$map6 = menuCodeMap.map1) === null || _menuCodeMap$map6 === void 0 ? void 0 : _menuCodeMap$map6.length) === 0) {
+          setAppVersionFlTest('请选择通用版本功能权限');
+          return;
+        }
+        if ((menuCodeMap === null || menuCodeMap === void 0 ? void 0 : (_menuCodeMap$map7 = menuCodeMap.map3) === null || _menuCodeMap$map7 === void 0 ? void 0 : _menuCodeMap$map7.length) === 0) {
+          setAppVersionFlTest('请选择证券版功能权限');
+          return;
+        } else {
+          form.setFieldsValue({
+            menuCodeMap: menuCodeMap.map3
+          });
+        }
+      } else if (selectArr.includes(2) && selectArr.includes(3)) {
+        var _menuCodeMap$map8, _menuCodeMap$map9;
+        // 城商行证券
+        if ((menuCodeMap === null || menuCodeMap === void 0 ? void 0 : (_menuCodeMap$map8 = menuCodeMap.map2) === null || _menuCodeMap$map8 === void 0 ? void 0 : _menuCodeMap$map8.length) === 0) {
+          setAppVersionFlTest('请选择城商行功能权限');
+          return;
+        } else {
+          form.setFieldsValue({
+            menuCodeMap: menuCodeMap.map2
+          });
+        }
+        if ((menuCodeMap === null || menuCodeMap === void 0 ? void 0 : (_menuCodeMap$map9 = menuCodeMap.map3) === null || _menuCodeMap$map9 === void 0 ? void 0 : _menuCodeMap$map9.length) === 0) {
+          setAppVersionFlTest('请选择证券版功能权限');
+          return;
+        } else {
+          form.setFieldsValue({
+            menuCodeMap: menuCodeMap.map3
+          });
+        }
       }
     } else {
-      form.setFieldsValue({
-        menuCodeMap: systemVersionId === 1 ? menuCodeMap.map1 : menuCodeMap.map2
-      });
-      setAppVersionFlTest(systemVersionId === 1 ? '请选择通用版本功能权限' : '请选择通城商行功能权限');
+      // 单独存在的
+      switch (systemVersionId) {
+        case 1:
+          form.setFieldsValue({
+            menuCodeMap: menuCodeMap.map1
+          });
+          setAppVersionFlTest('请选择通用版本功能权');
+          break;
+        case 2:
+          form.setFieldsValue({
+            menuCodeMap: menuCodeMap.map2
+          });
+          setAppVersionFlTest('请选择城商行功能权限');
+          break;
+        case 3:
+          form.setFieldsValue({
+            menuCodeMap: menuCodeMap.map3
+          });
+          setAppVersionFlTest('请选择证券版本功能权限');
+          break;
+      }
     }
   }, [menuCodeMap, appVersionFl]);
   // 列表数据
@@ -240,7 +336,7 @@ 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$data5, _res$data6;
+        var _res$data5, _res$data6, _res$data7;
         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) {
@@ -254,6 +350,7 @@ var RoleList = function RoleList(props) {
           });
         });
         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);
+        var _menuCodeMap = res.data.menuCodeMap;
         form.setFieldsValue(_objectSpread(_objectSpread({}, res === null || res === void 0 ? void 0 : res.data), {}, {
           appIds: usListArr === null || usListArr === void 0 ? void 0 : usListArr.map(function (item) {
             return {
@@ -261,7 +358,7 @@ var RoleList = function RoleList(props) {
             };
           }),
           systemVersion: {
-            id: 1
+            id: !_menuCodeMap[Object.keys(_menuCodeMap)[0]].length ? 2 : 1
           },
           userIds: userListArr === null || userListArr === void 0 ? void 0 : userListArr.map(function (item) {
             return {
@@ -269,6 +366,7 @@ var RoleList = function RoleList(props) {
             };
           })
         }));
+        setAppList((res === null || res === void 0 ? void 0 : (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.appIds) || []);
         setCreatedAppPanel(true);
       }
     }).catch(function (err) {
@@ -350,7 +448,42 @@ var RoleList = function RoleList(props) {
     var arr = e.map(function (item) {
       return item.appVersion;
     });
-    if (arr.includes(1) && arr.includes(2)) {
+    setAppList(e.map(function (item) {
+      return item.app_id;
+    }) || []);
+    setSelectArr(arr);
+    if (arr.includes(1) && arr.includes(2) && arr.includes(3)) {
+      // 三种应用都存在
+      setAppVersionFl(arr.includes(1) && arr.includes(2) && arr.includes(3));
+      onSystemVersion({
+        label: '通用版本',
+        id: 1
+      }, roleId);
+      form.setFieldsValue({
+        systemVersion: {
+          id: 1
+        }
+      });
+      setMenuCodeMap({
+        map1: codeMap['1'] || codeMap.map1,
+        map2: codeMap['2'] || codeMap.map2,
+        map3: codeMap['3'] || codeMap.map3,
+        settingList1: settingMenuList || [],
+        settingList2: settingMenuList || [],
+        settingList3: settingMenuList || []
+      });
+      setVersionList([{
+        label: '通用版本',
+        id: 1
+      }, {
+        label: '城商行',
+        id: 2
+      }, {
+        label: '证券',
+        id: 3
+      }]);
+    } else if (arr.includes(1) && arr.includes(2)) {
+      // 通用和城商行存在
       setAppVersionFl(arr.includes(1) && arr.includes(2));
       onSystemVersion({
         label: '通用版本',
@@ -364,11 +497,75 @@ var RoleList = function RoleList(props) {
       setMenuCodeMap({
         map1: codeMap['1'] || codeMap.map1,
         map2: codeMap['2'] || codeMap.map2,
+        map3: [],
         settingList1: settingMenuList || [],
-        settingList2: settingMenuList || []
+        settingList2: settingMenuList || [],
+        settingList3: []
+      });
+      setVersionList([{
+        label: '通用版本',
+        id: 1
+      }, {
+        label: '城商行',
+        id: 2
+      }]);
+    } else if (arr.includes(1) && arr.includes(3)) {
+      // 通用和证券存在
+      setAppVersionFl(arr.includes(1) && arr.includes(3));
+      onSystemVersion({
+        label: '通用版本',
+        id: 1
+      }, roleId);
+      form.setFieldsValue({
+        systemVersion: {
+          id: 1
+        }
       });
+      setMenuCodeMap({
+        map1: codeMap['1'] || codeMap.map1,
+        map2: [],
+        map3: codeMap['3'] || codeMap.map3,
+        settingList1: settingMenuList || [],
+        settingList2: [],
+        settingList3: settingMenuList || []
+      });
+      setVersionList([{
+        label: '通用版本',
+        id: 1
+      }, {
+        label: '证券',
+        id: 3
+      }]);
+    } else if (arr.includes(2) && arr.includes(3)) {
+      // 城商行和证券存在
+      setAppVersionFl(arr.includes(2) && arr.includes(3));
+      onSystemVersion({
+        label: '城商行',
+        id: 2
+      }, roleId);
+      form.setFieldsValue({
+        systemVersion: {
+          id: 2
+        }
+      });
+      setMenuCodeMap({
+        map1: [],
+        map2: codeMap['2'] || codeMap.map2,
+        map3: codeMap['3'] || codeMap.map3,
+        settingList1: [],
+        settingList2: settingMenuList || [],
+        settingList3: settingMenuList || []
+      });
+      setVersionList([{
+        label: '城商行',
+        id: 2
+      }, {
+        label: '证券',
+        id: 3
+      }]);
     } else {
       if (arr.length === 0 || arr.includes(1)) {
+        // 只有通用
         onSystemVersion({
           label: '通用版本',
           id: 1
@@ -381,11 +578,18 @@ var RoleList = function RoleList(props) {
         setMenuCodeMap({
           map1: codeMap['1'] || codeMap.map1,
           map2: [],
+          map3: [],
           settingList1: settingMenuList || [],
-          settingList2: []
+          settingList2: [],
+          settingList3: []
         });
+        setVersionList([{
+          label: '通用版本',
+          id: 1
+        }]);
       }
       if (arr.includes(2)) {
+        // 只有城商行
         onSystemVersion({
           label: '城商行',
           id: 2
@@ -398,9 +602,39 @@ var RoleList = function RoleList(props) {
         setMenuCodeMap({
           map1: [],
           map2: codeMap['2'] || codeMap.map2,
+          map3: [],
+          settingList1: [],
+          settingList2: settingMenuList || [],
+          settingList3: []
+        });
+        setVersionList([{
+          label: '城商行',
+          id: 2
+        }]);
+      }
+      if (arr.includes(3)) {
+        // 只有证券
+        onSystemVersion({
+          label: '证券',
+          id: 3
+        }, roleId);
+        form.setFieldsValue({
+          systemVersion: {
+            id: 3
+          }
+        });
+        setMenuCodeMap({
+          map1: [],
+          map2: [],
+          map3: codeMap['3'] || codeMap.map3,
           settingList1: [],
-          settingList2: settingMenuList || []
+          settingList2: [],
+          settingList3: settingMenuList || []
         });
+        setVersionList([{
+          label: '证券',
+          id: 3
+        }]);
       }
     }
   };
@@ -420,22 +654,28 @@ var RoleList = function RoleList(props) {
   };
   // 编辑||创建
   var onFinish = function onFinish(value) {
-    var _value$appIds, _menuCodeMap, _value$appIds2, _value$userIds;
+    var _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 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), _toConsumableArray(menuCodeMap === null || menuCodeMap === void 0 ? void 0 : menuCodeMap.settingList3))));
     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, _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;
       })
     });
+    if (menuCodeMap.map2.length && menuCodeMap.map3.length && !menuCodeMap.map1.length) {
+      var _params$menuCodeMap;
+      params.menuCodeMap = (_params$menuCodeMap = {}, _defineProperty(_params$menuCodeMap, 1, _toConsumableArray(new Set(_toConsumableArray(menuCodeMap.map1)))), _defineProperty(_params$menuCodeMap, 2, _toConsumableArray(new Set([].concat(_toConsumableArray(menuCodeMap.map2), _toConsumableArray(unionArray))))), _defineProperty(_params$menuCodeMap, 3, _toConsumableArray(new Set([].concat(_toConsumableArray(menuCodeMap.map3), _toConsumableArray(unionArray))))), _params$menuCodeMap);
+    } else {
+      var _params$menuCodeMap2;
+      params.menuCodeMap = (_params$menuCodeMap2 = {}, _defineProperty(_params$menuCodeMap2, 1, _toConsumableArray(new Set([].concat(_toConsumableArray(menuCodeMap.map1), _toConsumableArray(unionArray))))), _defineProperty(_params$menuCodeMap2, 2, _toConsumableArray(new Set([].concat(_toConsumableArray(menuCodeMap.map2), _toConsumableArray(unionArray))))), _defineProperty(_params$menuCodeMap2, 3, _toConsumableArray(new Set([].concat(_toConsumableArray(menuCodeMap.map3), _toConsumableArray(unionArray))))), _params$menuCodeMap2);
+    }
     (!roleId ? addRole : updateRole)(params).then(function (res) {
       if ((res === null || res === void 0 ? void 0 : res.code) !== '101000') {
         setTimeout(function () {
@@ -449,8 +689,10 @@ var RoleList = function RoleList(props) {
       setMenuCodeMap({
         map1: [],
         map2: [],
+        map3: [],
         settingList1: [],
-        settingList2: []
+        settingList2: [],
+        settingList3: []
       });
       // 通知数据刷新
       msg = !roleId ? '创建成功' : '编辑成功';
@@ -465,6 +707,37 @@ var RoleList = function RoleList(props) {
       });
     });
   };
+  function renderLabel(node, option) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "custom-item"
+    }, node, !appList.includes(option.app_id) ? null : /*#__PURE__*/React.createElement("div", {
+      onClick: function onClick(e) {
+        setCurrentAppId(option.app_id);
+        setDataRangeDialogTitle(node);
+        setIsModalOpen(true);
+        e.stopPropagation();
+      },
+      className: "custom-item-right"
+    }, "\u8BBE\u7F6E\u6570\u636E\u8303\u56F4", /*#__PURE__*/React.createElement(Tooltip, {
+      overlayStyle: {
+        maxWidth: 396
+      },
+      overlayInnerStyle: {
+        color: '#FFF',
+        fontSize: 14,
+        fontWeight: 400,
+        letterSpacing: 0.56
+      },
+      placement: "top",
+      title: '您可以设定当前角色可以查看应用下的哪些数据'
+    }, /*#__PURE__*/React.createElement("i", {
+      style: {
+        fontSize: 16,
+        marginLeft: '8px'
+      },
+      className: "bsicon tishi"
+    }))));
+  }
   return /*#__PURE__*/React.createElement(Spin, {
     spinning: loading
   }, /*#__PURE__*/React.createElement("div", {
@@ -496,7 +769,8 @@ var RoleList = function RoleList(props) {
       setRoleId(null);
       form.resetFields();
       form.setFieldsValue({
-        isEncryption: 0
+        isEncryption: 0,
+        roleAuthStatus: 0
       });
       queryRoleDataConfigList(null);
       queryRoleUserList(null);
@@ -527,23 +801,29 @@ var RoleList = function RoleList(props) {
       borderTop: '1px solid #F2F3F4'
     },
     onClose: function onClose() {
+      setAppList([]);
       setCreatedAppPanel(false);
       setMenuCodeMap({
         map1: [],
         map2: [],
+        map3: [],
         settingList1: [],
-        settingList2: []
+        settingList2: [],
+        settingList3: []
       });
       setSystemVersionId(1);
     },
     footer: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
       onClick: function onClick() {
+        setAppList([]);
         setCreatedAppPanel(false);
         setMenuCodeMap({
           map1: [],
           map2: [],
+          map3: [],
           settingList1: [],
-          settingList2: []
+          settingList2: [],
+          settingList3: []
         });
       }
     }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
@@ -603,7 +883,9 @@ var RoleList = function RoleList(props) {
     },
     placeholder: '请选择应用权限',
     labelField: "app_name",
-    keyField: "id"
+    keyField: "id",
+    overlayClassName: isModalOpen ? 'label-group-overlay' : '',
+    customLabel: renderLabel
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u529F\u80FD\u6743\u9650",
     className: "menuCode-map"
@@ -641,8 +923,8 @@ var RoleList = function RoleList(props) {
       title: 'name',
       key: 'menuCode'
     },
-    checkedKeys: systemVersionId === 1 ? menuCodeMap.map1 : menuCodeMap.map2,
-    defaultExpandedKeys: !roleId ? [0] : systemVersionId === 1 ? menuCodeMap.map1 : menuCodeMap.map2,
+    checkedKeys: systemVersionId === 1 ? menuCodeMap.map1 : systemVersionId === 2 ? menuCodeMap.map2 : menuCodeMap.map3,
+    defaultExpandedKeys: !roleId ? [0] : systemVersionId === 1 ? menuCodeMap.map1 : systemVersionId === 2 ? menuCodeMap.map2 : menuCodeMap.map3,
     autoExpandParent: true,
     treeData: functionList
   }))), /*#__PURE__*/React.createElement(Form.Item, {
@@ -689,7 +971,12 @@ var RoleList = function RoleList(props) {
     onCancel: function onCancel() {
       setDelPanelState(false);
     }
-  }, "\u786E\u8BA4\u8981\u5220\u9664\u5F53\u524D\u89D2\u8272\u5417?"), /*#__PURE__*/React.createElement("div", {
+  }, "\u786E\u8BA4\u8981\u5220\u9664\u5F53\u524D\u89D2\u8272\u5417?"), /*#__PURE__*/React.createElement(SetDataRangeDialog, {
+    isModalOpen: isModalOpen,
+    setIsModalOpen: setIsModalOpen,
+    dataRangeDialogTitle: dataRangeDialogTitle,
+    currentAppId: currentAppId
+  }), /*#__PURE__*/React.createElement("div", {
     className: "role-list-content"
   }, /*#__PURE__*/React.createElement(Table, {
     rowKey: "roleId",

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

@@ -101,7 +101,34 @@
   }
 }
 
+.custom-item {
+  display: flex;
+  justify-content: space-between;
+
+  .tishi {
+    color: #9aa1a9;
+  }
+}
+
 .role-dialog-content {
+  .group-config {
+    display: flex;
+    margin-bottom: 24px;
+    padding-left: 120px;
+
+    .config-name {
+      margin-right: 12px;
+      color: #5f6085;
+      font-size: 14px;
+      line-height: 30px;
+      white-space: nowrap;
+    }
+
+    .biz-user-condition-type-label {
+      margin-left: -7px;
+    }
+  }
+
   .ant-form-item {
     .ant-form-item-control-input {
       width: 484px;
@@ -218,3 +245,15 @@
     }
   }
 }
+
+.ant-tooltip {
+  z-index: 9999;
+}
+
+.label-group-overlay {
+  display: none;
+}
+
+.set-data-dialog {
+  width: 2000px;
+}

package/es/modules/companySetting/role/setDataRangeDialog/index.d.ts

@@ -0,0 +1,9 @@
+import React, { ReactNode } from 'react';
+import './index.less';
+declare const SetDataRangeDialog: React.FC<{
+    isModalOpen: boolean;
+    setIsModalOpen: Function;
+    dataRangeDialogTitle: ReactNode;
+    currentAppId: number;
+}>;
+export default SetDataRangeDialog;

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

@@ -0,0 +1,76 @@
+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); }
+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, { useState } from 'react';
+import { Radio } from 'antd';
+import { BizDialog, DemoWrapper, BizUserCondition } from '@zgfe/business-lib';
+import './index.less';
+var SetDataRangeDialog = function SetDataRangeDialog(props) {
+  // authInfoParam: {
+  //   platform: 0,
+  //   data: JSON.stringify({ color: '#8db3e2', name: 0, groupType: 0, json: condition }),
+  // },
+  var isModalOpen = props.isModalOpen,
+    setIsModalOpen = props.setIsModalOpen,
+    dataRangeDialogTitle = props.dataRangeDialogTitle,
+    currentAppId = props.currentAppId;
+  var _useState = useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    isRoleAuthStatus = _useState2[0],
+    setIsRoleAuthStatus = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    condition = _useState4[0],
+    setCondition = _useState4[1];
+  function onChangeCondition(condition) {
+    console.log('condition', condition);
+    setCondition(condition);
+  }
+  return /*#__PURE__*/React.createElement(BizDialog, {
+    className: "set-data-dialog",
+    title: dataRangeDialogTitle,
+    open: isModalOpen,
+    closable: true,
+    style: {
+      minWidth: isRoleAuthStatus ? '1200px' : '520px'
+    },
+    onCancel: function onCancel() {
+      return setIsModalOpen(false);
+    }
+  }, /*#__PURE__*/React.createElement(Radio.Group, {
+    buttonStyle: "outline",
+    defaultValue: isRoleAuthStatus,
+    onChange: function onChange(value) {
+      console.log(value.target.value);
+      setIsRoleAuthStatus(value.target.value);
+    }
+  }, /*#__PURE__*/React.createElement(Radio, {
+    value: 0
+  }, "\u5168\u90E8\u6570\u636E"), /*#__PURE__*/React.createElement(Radio, {
+    value: 1
+  }, "\u7B5B\u9009\u7528\u6237\uFF08", currentAppId, "\uFF09")), isRoleAuthStatus ? /*#__PURE__*/React.createElement("li", {
+    className: "group-config condition"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "config-name"
+  }, "\u5B9A\u4E49"), /*#__PURE__*/React.createElement("div", {
+    className: "config-value"
+  }), /*#__PURE__*/React.createElement(DemoWrapper, {
+    defaultApp: currentAppId
+  }, /*#__PURE__*/React.createElement(BizUserCondition, {
+    openCdpCondition: true,
+    openBusinessDataCondition: true,
+    openOrderDataCondition: true,
+    openTagCondition: true,
+    userTagsData: [],
+    defaultValue: condition,
+    onChange: onChangeCondition,
+    orConditionNum: 3,
+    andConditionNum: 8,
+    eventAttrNum: 3,
+    isRealTime: true
+  }))) : null);
+};
+export default SetDataRangeDialog;

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

@@ -0,0 +1,30 @@
+.set-data-dialog {
+  .ant-card-head-title {
+    display: none;
+  }
+
+  .group-config {
+    display: flex;
+    margin-top: 26px;
+
+    .config-name {
+      margin-right: 20px;
+      color: #5f6085;
+      font-size: 14px;
+      white-space: nowrap;
+    }
+
+    .ant-card {
+      width: 100%;
+      border: none;
+
+      .ant-card-head {
+        display: none;
+      }
+
+      .biz-user-condition {
+        background-color: #fff;
+      }
+    }
+  }
+}

package/es/requests/role.d.ts

@@ -9,6 +9,8 @@ export declare const queryRolePage: (data: {
     userIds: number[];
     menuCodeMap: {};
     settingMenuList: [];
+    authGroupList: [];
+    roleAuthStatus: number;
 }> | null>, queryRoleDataConfig: (data: {
     id: number | null;
 }) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>, queryRoleMenuTree: (data: {

package/es/types/app.d.ts

@@ -129,5 +129,9 @@ export declare enum AppVersion {
     /**
      * 城商行版本: 2
      */
-    bank = 2
+    bank = 2,
+    /**
+     * 证券版本: 3
+     */
+    finance = 3
 }

package/es/types/app.js

@@ -8,4 +8,8 @@ export var AppVersion;
    * 城商行版本: 2
    */
   AppVersion[AppVersion["bank"] = 2] = "bank";
+  /**
+   * 证券版本: 3
+   */
+  AppVersion[AppVersion["finance"] = 3] = "finance";
 })(AppVersion || (AppVersion = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.19",
+  "version": "1.2.20-role.2",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -51,7 +51,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "e2342a6780fd38651ee47a767b2a7d3f20d38752",
+  "gitHead": "76fd8d8f6c36af2c323af5f6ab8df1944c00ac05",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }