@zgfe/modules-settings 1.2.16 → 1.2.20-role.10

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/cost/index.js

@@ -81,7 +81,7 @@ var Cost = function Cost(props) {
     }
   }, []);
   useEffect(function () {
-    var data = packageInfo.overview || {};
+    var data = packageInfo || {};
     setOverview([data.billingCycle, appCount, data.ratedAppCount, data.licenseEvnetCount, data.ratedEventCount, data.eventCount]);
   }, [packageInfo, appCount]);
   useEffect(function () {

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

@@ -19,8 +19,9 @@ 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, BizGlobalDataContext } from '@zgfe/business-lib';
+import { BizDialog, BizSelect, IconFont, BizGlobalDataContext, BizUserCondition } 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,42 @@ 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),
+    selectAppId = _useState38[0],
+    setSelectAppId = _useState38[1];
+  var _useState39 = useState([]),
+    _useState40 = _slicedToArray(_useState39, 2),
+    appList = _useState40[0],
+    setAppList = _useState40[1];
+  var _useState41 = useState(false),
+    _useState42 = _slicedToArray(_useState41, 2),
+    isModalOpen = _useState42[0],
+    setIsModalOpen = _useState42[1];
+  var _useState43 = useState(''),
+    _useState44 = _slicedToArray(_useState43, 2),
+    dataRangeDialogTitle = _useState44[0],
+    setDataRangeDialogTitle = _useState44[1];
+  var _useState45 = useState(0),
+    _useState46 = _slicedToArray(_useState45, 2),
+    currentAppId = _useState46[0],
+    setCurrentAppId = _useState46[1];
+  var _useState47 = useState([]),
+    _useState48 = _slicedToArray(_useState47, 2),
+    appCondition = _useState48[0],
+    setAPPCondition = _useState48[1];
+  var _useState49 = useState(0),
+    _useState50 = _slicedToArray(_useState49, 2),
+    isRoleAuthStatus = _useState50[0],
+    setIsRoleAuthStatus = _useState50[1];
+  var _useState51 = useState([]),
+    _useState52 = _slicedToArray(_useState51, 2),
+    currentJson = _useState52[0],
+    setCurrentJson = _useState52[1];
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -131,27 +165,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]);
   // 列表数据
@@ -214,7 +326,6 @@ var RoleList = function RoleList(props) {
     }).then(function (res) {
       if (res && (res === null || res === void 0 ? void 0 : res.data) && res.code === '101000') {
         var _res$data, _res$data$list, _res$data2;
-        // const app = util.convertData(res?.data as DepartmentItem[], name);
         setLoading(false);
         var arr = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$list = _res$data.list) === null || _res$data$list === void 0 ? void 0 : _res$data$list.map(function (item) {
           var _item$userSimpleInfos;
@@ -240,7 +351,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$data8;
         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 +365,18 @@ 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 _res$data7 = res.data,
+          _menuCodeMap = _res$data7.menuCodeMap,
+          authGroupList = _res$data7.authGroupList;
+        authGroupList.forEach(function (item) {
+          item.data = JSON.stringify({
+            color: item.color || '#8db3e2',
+            name: item.name || '0',
+            groupType: item.groupType || 0,
+            json: JSON.parse(item.json)
+          });
+        });
+        setAPPCondition(authGroupList);
         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 +384,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 +392,7 @@ var RoleList = function RoleList(props) {
             };
           })
         }));
+        setAppList((res === null || res === void 0 ? void 0 : (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : _res$data8.appIds) || []);
         setCreatedAppPanel(true);
       }
     }).catch(function (err) {
@@ -346,11 +470,47 @@ var RoleList = function RoleList(props) {
     });
   };
   var onChangeAppIds = function onChangeAppIds(e, roleId, codeMap, settingMenuList) {
+    handleDelAppJson(e); // 删除应用的同时删除赋值的数据范围条件
     setAppVersionFl(false);
     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 +524,75 @@ var RoleList = function RoleList(props) {
       setMenuCodeMap({
         map1: codeMap['1'] || codeMap.map1,
         map2: codeMap['2'] || codeMap.map2,
+        map3: [],
+        settingList1: 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: 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 +605,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,12 +629,76 @@ 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
+        }]);
       }
     }
   };
+  function handleDelAppJson(e) {
+    // 删除应用的同时删除赋值的数据范围条件
+    var appIdsList = e.map(function (item) {
+      return item === null || item === void 0 ? void 0 : item.id;
+    });
+    setSelectAppId(appIdsList);
+    var delAppId = filterData(selectAppId, appIdsList);
+    var newAppCondition = appCondition;
+    var indexToRemove = newAppCondition.findIndex(function (item) {
+      return item.appId === delAppId[0];
+    });
+    if (indexToRemove !== -1) {
+      newAppCondition.splice(indexToRemove, 1);
+    }
+    setAPPCondition(newAppCondition);
+  }
+  function filterData(array, array2) {
+    var result = [];
+    for (var key in array) {
+      var stra = array[key];
+      var count = 0;
+      for (var j = 0; j < array2.length; j++) {
+        var strb = array2[j];
+        if (stra == strb) {
+          count++;
+        }
+      }
+      if (count === 0) {
+        //表示数组1的这个值没有重复的，放到arr3列表中
+        result.push(stra);
+      }
+    }
+    return result;
+  }
   var onSystemVersion = function onSystemVersion(e, roleId) {
     setSystemVersionId(e.id);
     queryRoleMenuTreeList(roleId, e.id);
@@ -420,22 +715,30 @@ 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;
-      })
+      }),
+      roleAuthStatus: isRoleAuthStatus,
+      authInfoParams: appCondition || []
     });
+    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 +752,10 @@ var RoleList = function RoleList(props) {
       setMenuCodeMap({
         map1: [],
         map2: [],
+        map3: [],
         settingList1: [],
-        settingList2: []
+        settingList2: [],
+        settingList3: []
       });
       // 通知数据刷新
       msg = !roleId ? '创建成功' : '编辑成功';
@@ -465,6 +770,70 @@ 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);
+        var currentJson = appCondition.filter(function (item) {
+          return item.appId === option.app_id;
+        });
+        if (currentJson.length) {
+          var _currentJson$;
+          setCurrentJson(currentJson[0].data ? JSON.parse((_currentJson$ = currentJson[0]) === null || _currentJson$ === void 0 ? void 0 : _currentJson$.data).json : JSON.parse(currentJson[0].json));
+          setIsRoleAuthStatus(1);
+        } else {
+          setCurrentJson([]);
+          setIsRoleAuthStatus(0);
+        }
+        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"
+    }))));
+  }
+  function setConditionFn(appId, condition) {
+    var authInfoParam = {
+      appId: appId,
+      platform: 0,
+      data: JSON.stringify({
+        color: '#8db3e2',
+        name: 0,
+        groupType: 0,
+        json: condition
+      })
+    };
+    var newAppCondition = appCondition;
+    var indexToRemove = newAppCondition.findIndex(function (item) {
+      return item.appId === appId;
+    });
+    if (indexToRemove !== -1) {
+      newAppCondition.splice(indexToRemove, 1, authInfoParam);
+    } else {
+      newAppCondition.push(authInfoParam);
+    }
+    setAPPCondition(newAppCondition);
+  }
   return /*#__PURE__*/React.createElement(Spin, {
     spinning: loading
   }, /*#__PURE__*/React.createElement("div", {
@@ -496,7 +865,8 @@ var RoleList = function RoleList(props) {
       setRoleId(null);
       form.resetFields();
       form.setFieldsValue({
-        isEncryption: 0
+        isEncryption: 0,
+        roleAuthStatus: 0
       });
       queryRoleDataConfigList(null);
       queryRoleUserList(null);
@@ -527,23 +897,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 +979,24 @@ var RoleList = function RoleList(props) {
     },
     placeholder: '请选择应用权限',
     labelField: "app_name",
-    keyField: "id"
+    keyField: "id",
+    overlayClassName: isModalOpen ? 'label-group-overlay' : '',
+    customLabel: renderLabel
+  }), /*#__PURE__*/React.createElement(BizUserCondition, {
+    openCdpCondition: true,
+    openBusinessDataCondition: true,
+    openOrderDataCondition: true,
+    openTagCondition: true,
+    userTagsData: [],
+    defaultValue: currentJson,
+    onChange: function onChange(e) {
+      console.log(e);
+    },
+    orConditionNum: 3,
+    andConditionNum: 8,
+    eventAttrNum: 3,
+    isRealTime: true,
+    key: currentAppId
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u529F\u80FD\u6743\u9650",
     className: "menuCode-map"
@@ -641,8 +1034,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 +1082,17 @@ 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,
+    setConditionFn: setConditionFn,
+    isRoleAuthStatus: isRoleAuthStatus,
+    setIsRoleAuthStatus: setIsRoleAuthStatus,
+    currentJson: currentJson,
+    setCurrentJson: setCurrentJson
+  }), /*#__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,14 @@
+import React, { ReactNode } from 'react';
+import './index.less';
+declare const SetDataRangeDialog: React.FC<{
+    isModalOpen: boolean;
+    setIsModalOpen: Function;
+    dataRangeDialogTitle: ReactNode;
+    currentAppId: number;
+    setConditionFn: Function;
+    currentJson: any[];
+    setCurrentJson: Function;
+    isRoleAuthStatus: number;
+    setIsRoleAuthStatus: Function;
+}>;
+export default SetDataRangeDialog;

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

@@ -0,0 +1,73 @@
+import React from 'react';
+import { Radio, message } from 'antd';
+import { BizDialog, DemoWrapper, BizUserCondition } from '@zgfe/business-lib';
+import './index.less';
+import util from '../../../../utils/util';
+var SetDataRangeDialog = function SetDataRangeDialog(props) {
+  var isModalOpen = props.isModalOpen,
+    setIsModalOpen = props.setIsModalOpen,
+    dataRangeDialogTitle = props.dataRangeDialogTitle,
+    currentAppId = props.currentAppId,
+    setConditionFn = props.setConditionFn,
+    currentJson = props.currentJson,
+    setCurrentJson = props.setCurrentJson,
+    isRoleAuthStatus = props.isRoleAuthStatus,
+    setIsRoleAuthStatus = props.setIsRoleAuthStatus;
+  function onChangeCondition(data) {
+    setCurrentJson(data);
+  }
+  function onConfirm() {
+    if (!currentJson) return;
+    var res = util.validateUserCondition(currentJson);
+    if (res) return message.error(res);
+    setConditionFn(currentAppId, currentJson);
+    setIsModalOpen(false);
+  }
+  return /*#__PURE__*/React.createElement(BizDialog, {
+    className: "set-data-dialog",
+    title: dataRangeDialogTitle,
+    open: isModalOpen,
+    closable: true,
+    style: {
+      minWidth: isRoleAuthStatus ? '80%' : '520px'
+    },
+    onCancel: function onCancel() {
+      setIsModalOpen(false);
+    },
+    onOk: function onOk() {
+      return onConfirm();
+    }
+  }, /*#__PURE__*/React.createElement(Radio.Group, {
+    buttonStyle: "outline",
+    value: isRoleAuthStatus,
+    onChange: function onChange(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")), 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: currentJson,
+    onChange: onChangeCondition,
+    orConditionNum: 3,
+    andConditionNum: 8,
+    eventAttrNum: 3,
+    isRealTime: true,
+    key: currentAppId
+  }))) : 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/es/utils/util.d.ts

@@ -231,5 +231,6 @@ declare const util: {
         disabled: boolean | number;
         children: object[] | undefined;
     }[];
+    validateUserCondition(conditions: any[]): "" | "用户定义不能为空" | "事件不能为空" | "用户标签不能为空" | "明细数据不能为空" | "明细表不能为空" | "字段不能为空" | "筛选规则不能为空" | "筛选条件不能为空" | "值类型不能为空" | "用户属性不能为空" | "属性值不能为空" | "时间不能为空" | "次数不能为空" | "事件属性不能为空";
 };
 export default util;

package/es/utils/util.js

@@ -721,6 +721,110 @@ var util = {
       newItem.children = (newItem === null || newItem === void 0 ? void 0 : newItem.children) && (newItem === null || newItem === void 0 ? void 0 : newItem.children.length) > 0 ? util.menuTreeData(newItem === null || newItem === void 0 ? void 0 : newItem.children) : undefined;
       return newItem;
     });
+  },
+  validateUserCondition: function validateUserCondition(conditions) {
+    if (!conditions.length) return '用户定义不能为空';
+    var _iterator2 = _createForOfIteratorHelper(conditions),
+      _step2;
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var orConditions = _step2.value;
+        if (!orConditions.length) return '用户定义不能为空';
+        var _iterator3 = _createForOfIteratorHelper(orConditions),
+          _step3;
+        try {
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            var orCondition = _step3.value;
+            if (orCondition.eventId === 0) return '事件不能为空';
+            if (orCondition.eventId === undefined) {
+              if (orCondition.labels) {
+                var _orCondition$labels$v;
+                if (((_orCondition$labels$v = orCondition.labels.values) === null || _orCondition$labels$v === void 0 ? void 0 : _orCondition$labels$v.length) === 0) return '用户标签不能为空';
+              } else if (orCondition.dataset) {
+                if (!orCondition.dataset.length) return '明细数据不能为空';
+                var _iterator4 = _createForOfIteratorHelper(orCondition.dataset),
+                  _step4;
+                try {
+                  for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                    var item = _step4.value;
+                    if (!item || !item.datasetTable) return '明细表不能为空';
+                    if (!item.fieldName) return '字段不能为空';
+                    if (!item.operator) return '筛选规则不能为空';
+                    if (!/^is null$|^is not null$/.test(item.operator) && !item.params.length) {
+                      return '筛选条件不能为空';
+                    }
+                  }
+                } catch (err) {
+                  _iterator4.e(err);
+                } finally {
+                  _iterator4.f();
+                }
+              } else if (orCondition.data_set_csh) {
+                if (!orCondition.data_set_csh.length) return '明细数据不能为空';
+                var _iterator5 = _createForOfIteratorHelper(orCondition.data_set_csh),
+                  _step5;
+                try {
+                  for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                    var _item = _step5.value;
+                    if (!_item || !_item.datasetTable) return '明细表不能为空';
+                    if (!_item.fieldName) return '字段不能为空';
+                    if (!_item.operator) return '筛选规则不能为空';
+                    if (_item.subCondition) {
+                      if (!_item.subCondition.datasetTable) return '明细表不能为空';
+                      if (!_item.subCondition.fieldName) return '字段不能为空';
+                      if (!_item.subCondition.operator) return '筛选规则不能为空';
+                      if (!_item.subCondition.calculate) return '值类型不能为空';
+                    }
+                    if (!/^is null$|^is not null$/.test(_item.operator) && !(_item.params || _item.between && _item.between[0] && _item.between[1])) {
+                      return '筛选条件不能为空';
+                    }
+                  }
+                } catch (err) {
+                  _iterator5.e(err);
+                } finally {
+                  _iterator5.f();
+                }
+              } else if (!orCondition.attrs.length || !orCondition.attrs[0].attrName) {
+                return '用户属性不能为空';
+              } else if (!/^is null$|^is not null$/.test(orCondition.attrs[0].operator) && !orCondition.attrs[0].params.length) {
+                return '属性值不能为空';
+              }
+            } else {
+              if (orCondition.runPeriod && orCondition.runPeriod.values && (!orCondition.runPeriod.values[0] || !orCondition.runPeriod.values[1])) {
+                return '时间不能为空';
+              }
+              if (orCondition.runTimes && !orCondition.runTimes.values[0]) {
+                return '次数不能为空';
+              }
+              if (orCondition.attrs) {
+                var _iterator6 = _createForOfIteratorHelper(orCondition.attrs),
+                  _step6;
+                try {
+                  for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+                    var attr = _step6.value;
+                    if (!attr.attrId && !attr.attrName) return '事件属性不能为空';
+                    if (!attr.params.length && !/^is null$|^is not null$/.test(attr.operator)) return '属性值不能为空';
+                  }
+                } catch (err) {
+                  _iterator6.e(err);
+                } finally {
+                  _iterator6.f();
+                }
+              }
+            }
+          }
+        } catch (err) {
+          _iterator3.e(err);
+        } finally {
+          _iterator3.f();
+        }
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+    return '';
   }
 };
 export default util;

package/package.json

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