@zgfe/modules-settings 1.2.16-role.0 → 1.2.16-role.11

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 +26 -12
  3. package/es/requests/role.d.ts +2 -0
  4. package/package.json +2 -2
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
@@ -112,8 +112,8 @@ var RoleList = function RoleList(props) {
112
112
  setUsList = _useState34[1];
113
113
  var _useState35 = useState(false),
114
114
  _useState36 = _slicedToArray(_useState35, 2),
115
- isDataRange = _useState36[0],
116
- setIsDataRange = _useState36[1];
115
+ isRoleAuthStatus = _useState36[0],
116
+ setIsRoleAuthStatus = _useState36[1];
117
117
  var _useState37 = useState([]),
118
118
  _useState38 = _slicedToArray(_useState37, 2),
119
119
  condition = _useState38[0],
@@ -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,7 +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
- 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, _arr$3, _arr$4;
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(util.isString((_arr$ = arr[0]) === null || _arr$ === void 0 ? void 0 : _arr$.json) ? JSON.parse((_arr$2 = arr[0]) === null || _arr$2 === void 0 ? void 0 : _arr$2.json) : []);
269
+ console.log('detail arr ==', util.isString((_arr$3 = arr[0]) === null || _arr$3 === void 0 ? void 0 : _arr$3.json) ? JSON.parse((_arr$4 = arr[0]) === null || _arr$4 === void 0 ? void 0 : _arr$4.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);
266
273
  form.setFieldsValue(_objectSpread(_objectSpread({}, res === null || res === void 0 ? void 0 : res.data), {}, {
267
274
  appIds: usListArr === null || usListArr === void 0 ? void 0 : usListArr.map(function (item) {
268
275
  return {
@@ -291,9 +298,9 @@ var RoleList = function RoleList(props) {
291
298
  systemVersion: systemVersion
292
299
  }).then(function (res) {
293
300
  if (res === null || res === void 0 ? void 0 : res.data) {
294
- var _arr$;
301
+ var _arr$5;
295
302
  var arr = util.menuTreeData([res === null || res === void 0 ? void 0 : res.data]);
296
- setFunctionList(((_arr$ = arr[0]) === null || _arr$ === void 0 ? void 0 : _arr$.children) ? arr : []);
303
+ setFunctionList(((_arr$5 = arr[0]) === null || _arr$5 === void 0 ? void 0 : _arr$5.children) ? arr : []);
297
304
  }
298
305
  }).catch(function (err) {
299
306
  setFunctionList([]);
@@ -441,6 +448,15 @@ var RoleList = function RoleList(props) {
441
448
  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),
442
449
  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,
443
450
  systemVersion: appVersionFl ? 0 : 1,
451
+ authInfoParam: {
452
+ platform: 0,
453
+ data: JSON.stringify({
454
+ color: '#8db3e2',
455
+ name: 0,
456
+ groupType: 0,
457
+ json: condition
458
+ })
459
+ },
444
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) {
445
461
  return item === null || item === void 0 ? void 0 : item.id;
446
462
  })
@@ -475,7 +491,6 @@ var RoleList = function RoleList(props) {
475
491
  });
476
492
  };
477
493
  function onChangeCondition(condition) {
478
- console.log('condition', condition);
479
494
  setCondition(condition);
480
495
  }
481
496
  return /*#__PURE__*/React.createElement(Spin, {
@@ -510,7 +525,7 @@ var RoleList = function RoleList(props) {
510
525
  form.resetFields();
511
526
  form.setFieldsValue({
512
527
  isEncryption: 0,
513
- dataRange: 0
528
+ roleAuthStatus: 0
514
529
  });
515
530
  queryRoleDataConfigList(null);
516
531
  queryRoleUserList(null);
@@ -660,7 +675,7 @@ var RoleList = function RoleList(props) {
660
675
  autoExpandParent: true,
661
676
  treeData: functionList
662
677
  }))), /*#__PURE__*/React.createElement(Form.Item, {
663
- name: 'dataRange',
678
+ name: 'roleAuthStatus',
664
679
  className: "is-encryption",
665
680
  label: /*#__PURE__*/React.createElement(React.Fragment, null, "\u6570\u636E\u8303\u56F4", /*#__PURE__*/React.createElement(Tooltip, {
666
681
  overlayStyle: {
@@ -688,20 +703,19 @@ var RoleList = function RoleList(props) {
688
703
  }, /*#__PURE__*/React.createElement(Radio.Group, {
689
704
  buttonStyle: "outline",
690
705
  onChange: function onChange(value) {
691
- setIsDataRange(!!value.target.value);
706
+ setIsRoleAuthStatus(!!value.target.value);
692
707
  }
693
708
  }, /*#__PURE__*/React.createElement(Radio, {
694
709
  value: 0
695
710
  }, "\u6240\u6709\u7528\u6237"), /*#__PURE__*/React.createElement(Radio, {
696
711
  value: 1
697
- }, "\u7B5B\u9009\u7528\u6237"))), isDataRange ? /*#__PURE__*/React.createElement("li", {
712
+ }, "\u7B5B\u9009\u7528\u6237"))), isRoleAuthStatus ? /*#__PURE__*/React.createElement("li", {
698
713
  className: "group-config condition"
699
714
  }, /*#__PURE__*/React.createElement("div", {
700
715
  className: "config-name"
701
716
  }, "\u5B9A\u4E49"), /*#__PURE__*/React.createElement("div", {
702
717
  className: "config-value"
703
718
  }), /*#__PURE__*/React.createElement(BizUserCondition, {
704
- key: -1,
705
719
  openCdpCondition: true,
706
720
  openBusinessDataCondition: true,
707
721
  openOrderDataCondition: true,
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.0",
3
+ "version": "1.2.16-role.11",
4
4
  "module": "es/index.js",
5
5
  "typings": "es/index.d.ts",
6
6
  "files": [
@@ -51,7 +51,7 @@
51
51
  "umi-request": "^1.4.0",
52
52
  "yorkie": "^2.0.0"
53
53
  },
54
- "gitHead": "bd4bc467d64f258aa110bf98a40f7644582bf1e9",
54
+ "gitHead": "a81739f256bc474efc2a3c23ef50bbcbc89b4fc2",
55
55
  "gitHooks": {
56
56
  "pre-commit": "lint-staged"
57
57
  }