@zgfe/modules-settings 1.2.20-role.5 → 1.2.20-role.7

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

@@ -21,7 +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';
+import SetDataRangeDialog from './setDataRangeDialog';
 var RoleList = function RoleList(props) {
   // 弹窗
   var _useState = useState(false),
@@ -119,8 +119,14 @@ var RoleList = function RoleList(props) {
     _useState40 = _slicedToArray(_useState39, 2),
     isModalOpen = _useState40[0],
     setIsModalOpen = _useState40[1];
-  // const [dataRangeDialogTitle, setDataRangeDialogTitle] = useState<ReactNode>('');
-  // const [currentAppId, setCurrentAppId] = useState<number>(0);
+  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];
@@ -706,8 +712,8 @@ var RoleList = function RoleList(props) {
       className: "custom-item"
     }, node, !appList.includes(option.app_id) ? null : /*#__PURE__*/React.createElement("div", {
       onClick: function onClick(e) {
-        // setCurrentAppId(option.app_id);
-        // setDataRangeDialogTitle(node);
+        setCurrentAppId(option.app_id);
+        setDataRangeDialogTitle(node);
         setIsModalOpen(true);
         e.stopPropagation();
       },
@@ -965,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/setDataRangeDialog/index.js

@@ -12,8 +12,6 @@ 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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.20-role.5",
+  "version": "1.2.20-role.7",
   "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": "992339d3299803dbe67044d60a7192cce75aa469",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }