@zgfe/modules-settings 1.2.20-role.5 → 1.2.21-test.1

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: 99677
+    defaultApp: 99844
   }, /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
     value: {
       funPermissions: funPermissions,
       menusName: constants.menusName,
       getMenuRouterByName: util.getMenuRouterByName,
-      authority: localStorage.getItem('authorityList') ? JSON.parse(localStorage.getItem('authorityList')) : {}
+      authority: sessionStorage.getItem('authorityList') ? JSON.parse(sessionStorage.getItem('authorityList')) : {}
     }
   }, /*#__PURE__*/React.createElement(CompanySetting, {
     action: ''

package/es/modules/companySetting/index.js

@@ -537,7 +537,6 @@ 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,7 +21,6 @@ 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),
@@ -111,16 +110,6 @@ var RoleList = function RoleList(props) {
     _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];
-  // const [dataRangeDialogTitle, setDataRangeDialogTitle] = useState<ReactNode>('');
-  // const [currentAppId, setCurrentAppId] = useState<number>(0);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -330,7 +319,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, _res$data7;
+        var _res$data5, _res$data6;
         var usListArr = usList === null || usList === void 0 ? void 0 : usList.filter(function (item1) {
           var _res$data3;
           return res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.appIds.some(function (item2) {
@@ -360,7 +349,6 @@ 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) {
@@ -442,9 +430,6 @@ var RoleList = function RoleList(props) {
     var arr = e.map(function (item) {
       return item.appVersion;
     });
-    setAppList(e.map(function (item) {
-      return item.app_id;
-    }) || []);
     setSelectArr(arr);
     if (arr.includes(1) && arr.includes(2) && arr.includes(3)) {
       // 三种应用都存在
@@ -531,7 +516,7 @@ var RoleList = function RoleList(props) {
         id: 3
       }]);
     } else if (arr.includes(2) && arr.includes(3)) {
-      // 城商行和证券存在
+      // 城商行和证券同时存在
       setAppVersionFl(arr.includes(2) && arr.includes(3));
       onSystemVersion({
         label: '城商行',
@@ -701,37 +686,6 @@ 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", {
@@ -763,8 +717,7 @@ var RoleList = function RoleList(props) {
       setRoleId(null);
       form.resetFields();
       form.setFieldsValue({
-        isEncryption: 0,
-        roleAuthStatus: 0
+        isEncryption: 0
       });
       queryRoleDataConfigList(null);
       queryRoleUserList(null);
@@ -795,7 +748,6 @@ var RoleList = function RoleList(props) {
       borderTop: '1px solid #F2F3F4'
     },
     onClose: function onClose() {
-      setAppList([]);
       setCreatedAppPanel(false);
       setMenuCodeMap({
         map1: [],
@@ -809,7 +761,6 @@ var RoleList = function RoleList(props) {
     },
     footer: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
       onClick: function onClick() {
-        setAppList([]);
         setCreatedAppPanel(false);
         setMenuCodeMap({
           map1: [],
@@ -877,9 +828,7 @@ var RoleList = function RoleList(props) {
     },
     placeholder: '请选择应用权限',
     labelField: "app_name",
-    keyField: "id",
-    overlayClassName: isModalOpen ? 'label-group-overlay' : '',
-    customLabel: renderLabel
+    keyField: "id"
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u529F\u80FD\u6743\u9650",
     className: "menuCode-map"

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

@@ -101,34 +101,7 @@
   }
 }
 
-.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;
@@ -245,15 +218,3 @@
     }
   }
 }
-
-.ant-tooltip {
-  z-index: 9999;
-}
-
-.label-group-overlay {
-  display: none;
-}
-
-.set-data-dialog {
-  width: 2000px;
-}

package/es/requests/role.d.ts

@@ -9,8 +9,6 @@ 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.20-role.5",
+  "version": "1.2.21-test.1",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -51,7 +51,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "00b7841bbf9168780977877fcabe610a28407c82",
+  "gitHead": "e6c65fdb566ac620a33579c88a1143341d55dda1",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }

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

@@ -1,9 +0,0 @@
-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

@@ -1,77 +0,0 @@
-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

@@ -1,30 +0,0 @@
-.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;
-      }
-    }
-  }
-}