@zgfe/modules-settings 1.2.16-role.1 → 1.2.16-role.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/es/modules/companySetting/demo.js +1 -1
  2. package/es/modules/companySetting/role/index.js +17 -8
  3. package/es/requests/role.d.ts +2 -0
  4. package/package.json +3 -3
package/es/modules/companySetting/demo.js CHANGED
@@ -6,7 +6,7 @@ import util from '../../utils/util';
6
6
  import { CompanySetting } from '../..';
7
7
  export default (function () {
8
8
  return /*#__PURE__*/React.createElement(DemoWrapper, {
9
- defaultApp: 348
9
+ defaultApp: 99677
10
10
  }, /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
11
11
  value: {
12
12
  funPermissions: funPermissions,
package/es/modules/companySetting/role/index.js CHANGED
@@ -249,7 +249,7 @@ var RoleList = function RoleList(props) {
249
249
  var queryRoleDetailsList = function queryRoleDetailsList(params) {
250
250
  queryRoleDetails(params).then(function (res) {
251
251
  if (res === null || res === void 0 ? void 0 : res.data) {
252
- var _res$data5, _res$data6;
252
+ var _res$data5, _res$data7, _res$data8;
253
253
  var usListArr = usList === null || usList === void 0 ? void 0 : usList.filter(function (item1) {
254
254
  var _res$data3;
255
255
  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) {
@@ -262,10 +262,14 @@ var RoleList = function RoleList(props) {
262
262
  return item2 === (item1 === null || item1 === void 0 ? void 0 : item1.id);
263
263
  });
264
264
  });
265
- // if (res && res.data && res.data.json) {
266
- // setCondition(res?.data?.json);
267
- // }
268
- 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);
265
+ if (res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.roleAuthStatus) {
266
+ var _res$data6, _arr$, _arr$2;
267
+ var arr = [res === null || res === void 0 ? void 0 : (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.authGroupList];
268
+ setCondition(arr.length ? JSON.parse((_arr$ = arr[0]) === null || _arr$ === void 0 ? void 0 : _arr$.json) : []);
269
+ console.log('detail arr ==', arr.length ? JSON.parse((_arr$2 = arr[0]) === null || _arr$2 === void 0 ? void 0 : _arr$2.json) : []);
270
+ setIsRoleAuthStatus(true);
271
+ }
272
+ onChangeAppIds(usListArr, params === null || params === void 0 ? void 0 : params.id, res === null || res === void 0 ? void 0 : (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.menuCodeMap, res === null || res === void 0 ? void 0 : (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : _res$data8.settingMenuList);
269
273
  form.setFieldsValue(_objectSpread(_objectSpread({}, res === null || res === void 0 ? void 0 : res.data), {}, {
270
274
  appIds: usListArr === null || usListArr === void 0 ? void 0 : usListArr.map(function (item) {
271
275
  return {
@@ -294,9 +298,9 @@ var RoleList = function RoleList(props) {
294
298
  systemVersion: systemVersion
295
299
  }).then(function (res) {
296
300
  if (res === null || res === void 0 ? void 0 : res.data) {
297
- var _arr$;
301
+ var _arr$3;
298
302
  var arr = util.menuTreeData([res === null || res === void 0 ? void 0 : res.data]);
299
- setFunctionList(((_arr$ = arr[0]) === null || _arr$ === void 0 ? void 0 : _arr$.children) ? arr : []);
303
+ setFunctionList(((_arr$3 = arr[0]) === null || _arr$3 === void 0 ? void 0 : _arr$3.children) ? arr : []);
300
304
  }
301
305
  }).catch(function (err) {
302
306
  setFunctionList([]);
@@ -446,7 +450,12 @@ var RoleList = function RoleList(props) {
446
450
  systemVersion: appVersionFl ? 0 : 1,
447
451
  authInfoParam: {
448
452
  platform: 0,
449
- data: condition
453
+ data: JSON.stringify({
454
+ color: '#8db3e2',
455
+ name: 0,
456
+ groupType: 0,
457
+ json: condition
458
+ })
450
459
  },
451
460
  userIds: value === null || value === void 0 ? void 0 : (_value$userIds = value.userIds) === null || _value$userIds === void 0 ? void 0 : _value$userIds.map(function (item) {
452
461
  return item === null || item === void 0 ? void 0 : item.id;
package/es/requests/role.d.ts CHANGED
@@ -9,6 +9,8 @@ export declare const queryRolePage: (data: {
9
9
  userIds: number[];
10
10
  menuCodeMap: {};
11
11
  settingMenuList: [];
12
+ authGroupList: [];
13
+ roleAuthStatus: number;
12
14
  }> | null>, queryRoleDataConfig: (data: {
13
15
  id: number | null;
14
16
  }) => Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>, queryRoleMenuTree: (data: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-settings",
3
- "version": "1.2.16-role.1",
3
+ "version": "1.2.16-role.12",
4
4
  "module": "es/index.js",
5
5
  "typings": "es/index.d.ts",
6
6
  "files": [
@@ -38,7 +38,7 @@
38
38
  "@types/lodash": "^4.14.182",
39
39
  "@umijs/fabric": "^2.8.1",
40
40
  "@umijs/test": "^3.0.5",
41
- "@zgfe/business-lib": "1.2.9-heyh.1",
41
+ "@zgfe/business-lib": "1.1.95",
42
42
  "@zgfe/modules-demo-manage": "^1.0.1",
43
43
  "antd": "^4.22.6",
44
44
  "dumi": "^1.1.0",
@@ -51,7 +51,7 @@
51
51
  "umi-request": "^1.4.0",
52
52
  "yorkie": "^2.0.0"
53
53
  },
54
- "gitHead": "8bf9dd198a6be9384eb769f6cacf55046c1c236c",
54
+ "gitHead": "a81739f256bc474efc2a3c23ef50bbcbc89b4fc2",
55
55
  "gitHooks": {
56
56
  "pre-commit": "lint-staged"
57
57
  }