@zgfe/modules-settings 1.2.19 → 1.2.20

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,7 +6,7 @@ import util from '../../utils/util';
 import { CompanySetting } from '../..';
 export default (function () {
   return /*#__PURE__*/React.createElement(DemoWrapper, {
-    defaultApp: 348
+    defaultApp: 99844
   }, /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
     value: {
       funPermissions: funPermissions,

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

@@ -77,8 +77,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 +90,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 +106,10 @@ 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 _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -131,27 +132,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]);
   // 列表数据
@@ -254,6 +333,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 +341,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 {
@@ -350,7 +430,39 @@ var RoleList = function RoleList(props) {
     var arr = e.map(function (item) {
       return item.appVersion;
     });
-    if (arr.includes(1) && arr.includes(2)) {
+    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 +476,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 +557,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 +581,39 @@ var RoleList = function RoleList(props) {
         setMenuCodeMap({
           map1: [],
           map2: codeMap['2'] || codeMap.map2,
+          map3: [],
           settingList1: [],
-          settingList2: settingMenuList || []
+          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: [],
+          settingList3: settingMenuList || []
+        });
+        setVersionList([{
+          label: '证券',
+          id: 3
+        }]);
       }
     }
   };
@@ -420,22 +633,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 +668,10 @@ var RoleList = function RoleList(props) {
       setMenuCodeMap({
         map1: [],
         map2: [],
+        map3: [],
         settingList1: [],
-        settingList2: []
+        settingList2: [],
+        settingList3: []
       });
       // 通知数据刷新
       msg = !roleId ? '创建成功' : '编辑成功';
@@ -531,8 +752,10 @@ var RoleList = function RoleList(props) {
       setMenuCodeMap({
         map1: [],
         map2: [],
+        map3: [],
         settingList1: [],
-        settingList2: []
+        settingList2: [],
+        settingList3: []
       });
       setSystemVersionId(1);
     },
@@ -542,8 +765,10 @@ var RoleList = function RoleList(props) {
         setMenuCodeMap({
           map1: [],
           map2: [],
+          map3: [],
           settingList1: [],
-          settingList2: []
+          settingList2: [],
+          settingList3: []
         });
       }
     }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
@@ -641,8 +866,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, {

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",
   "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": "63405c164be35af509a55cb6e5444be77867fad3",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }