@zgfe/modules-settings 1.0.1-a.8 → 1.1.0

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 (180) hide show
  1. package/{dist/esm → es}/components/pageLoading/index.d.ts +1 -0
  2. package/{dist/esm → es}/components/pageLoading/index.js +2 -2
  3. package/es/components/pageLoading/index.less +7 -0
  4. package/es/components/settingTabs/demo/index.d.ts +3 -0
  5. package/es/components/settingTabs/demo/index.js +20 -0
  6. package/{dist/esm → es}/components/settingTabs/index.d.ts +4 -5
  7. package/{dist/esm → es}/components/settingTabs/index.js +61 -10
  8. package/{dist/esm → es}/components/settingTabs/index.less +16 -7
  9. package/es/components/settingTabs/types.d.ts +7 -0
  10. package/es/components/settingTabs/types.js +1 -0
  11. package/{dist/esm → es}/constants/api.d.ts +3 -0
  12. package/{dist/esm → es}/constants/api.js +4 -3
  13. package/{dist/esm → es}/constants/icons/iconfont.js +0 -0
  14. package/es/index.js +4 -0
  15. package/{dist/esm → es}/modules/appSettings/appInfo/index.js +41 -23
  16. package/{dist/esm → es}/modules/appSettings/dataAccessFilter/index.js +8 -9
  17. package/{dist/esm/modules/personalSetting → es/modules/appSettings}/index.d.ts +0 -1
  18. package/es/modules/appSettings/index.js +52 -0
  19. package/{dist/esm → es}/modules/appSettings/member/index.js +44 -54
  20. package/{dist/esm → es}/modules/appSettings/virtualSource/index.js +30 -36
  21. package/{dist/esm → es}/modules/appSettings/virtualSource/styles/table.less +1 -1
  22. package/es/modules/companySetting/appList/index.d.ts +21 -0
  23. package/{dist/esm → es}/modules/companySetting/appList/index.js +40 -31
  24. package/{dist/esm → es}/modules/companySetting/appList/index.less +1 -8
  25. package/es/modules/companySetting/cost/index.d.ts +9 -0
  26. package/{dist/esm → es}/modules/companySetting/cost/index.js +6 -6
  27. package/{dist/esm → es}/modules/companySetting/cost/index.less +1 -1
  28. package/es/modules/companySetting/cost/types.d.ts +63 -0
  29. package/es/modules/companySetting/cost/types.js +1 -0
  30. package/es/modules/companySetting/edit/authConfig.d.ts +11 -0
  31. package/{dist/esm → es}/modules/companySetting/edit/authConfig.js +15 -14
  32. package/{dist/esm → es}/modules/companySetting/edit/authConfigCEP.d.ts +3 -5
  33. package/{dist/esm → es}/modules/companySetting/edit/authConfigCEP.js +18 -68
  34. package/{dist/esm → es}/modules/companySetting/edit/authGroup.d.ts +2 -1
  35. package/{dist/esm → es}/modules/companySetting/edit/authGroup.js +9 -10
  36. package/es/modules/companySetting/edit/authModule.d.ts +8 -0
  37. package/{dist/esm → es}/modules/companySetting/edit/authModule.js +12 -18
  38. package/{dist/esm → es}/modules/companySetting/edit/multiAuthModule.d.ts +3 -2
  39. package/{dist/esm → es}/modules/companySetting/edit/multiAuthModule.js +9 -17
  40. package/es/modules/companySetting/edit/user.d.ts +15 -0
  41. package/{dist/esm → es}/modules/companySetting/edit/user.js +60 -53
  42. package/es/modules/companySetting/edit/userGroup.d.ts +16 -0
  43. package/{dist/esm → es}/modules/companySetting/edit/userGroup.js +78 -73
  44. package/es/modules/companySetting/index.d.ts +11 -0
  45. package/es/modules/companySetting/index.js +740 -0
  46. package/{dist/esm → es}/modules/companySetting/info/index.d.ts +3 -3
  47. package/{dist/esm → es}/modules/companySetting/info/index.js +8 -5
  48. package/{dist/esm → es}/modules/companySetting/info/index.less +1 -1
  49. package/{dist/esm → es}/modules/companySetting/style/common.less +3 -3
  50. package/es/modules/companySetting/style/reset.less +117 -0
  51. package/es/modules/companySetting/user/index.d.ts +21 -0
  52. package/{dist/esm → es}/modules/companySetting/user/index.js +62 -64
  53. package/{dist/esm → es}/modules/companySetting/user/index.less +8 -8
  54. package/es/modules/companySetting/user/invite.d.ts +15 -0
  55. package/{dist/esm → es}/modules/companySetting/user/invite.js +8 -12
  56. package/es/modules/companySetting/userGroup/authConfigDetail.d.ts +15 -0
  57. package/{dist/esm → es}/modules/companySetting/userGroup/authConfigDetail.js +62 -82
  58. package/es/modules/companySetting/userGroup/groupItem.d.ts +13 -0
  59. package/{dist/esm → es}/modules/companySetting/userGroup/groupItem.js +11 -11
  60. package/es/modules/companySetting/userGroup/index.d.ts +15 -0
  61. package/{dist/esm → es}/modules/companySetting/userGroup/index.js +9 -8
  62. package/{dist/esm → es}/modules/companySetting/userGroup/style/index.less +1 -1
  63. package/es/modules/companySetting/virtualApp/config.d.ts +12 -0
  64. package/{dist/esm → es}/modules/companySetting/virtualApp/config.js +7 -7
  65. package/es/modules/companySetting/virtualApp/index.d.ts +15 -0
  66. package/{dist/esm → es}/modules/companySetting/virtualApp/index.js +12 -14
  67. package/es/modules/companySetting/virtualApp/panels/list.d.ts +15 -0
  68. package/{dist/esm → es}/modules/companySetting/virtualApp/panels/list.js +10 -10
  69. package/es/modules/companySetting/virtualApp/panels/sourceItem.d.ts +10 -0
  70. package/{dist/esm → es}/modules/companySetting/virtualApp/panels/sourceItem.js +4 -6
  71. package/{dist/esm → es}/modules/companySetting/virtualApp/styles/config.less +2 -1
  72. package/{dist/esm → es}/modules/companySetting/virtualApp/styles/index.less +1 -1
  73. package/{dist/esm → es}/modules/companySetting/virtualApp/styles/table.less +1 -1
  74. package/{dist/esm → es}/modules/companySetting/wechatBinding/index.js +11 -11
  75. package/{dist/esm → es}/modules/companySetting/wechatBinding/index.less +1 -1
  76. package/es/modules/personalSetting/images/banner.png +0 -0
  77. package/es/modules/personalSetting/images/unbinding.png +0 -0
  78. package/{dist/esm/modules/appSettings → es/modules/personalSetting}/index.d.ts +0 -1
  79. package/es/modules/personalSetting/index.js +40 -0
  80. package/{dist/esm → es}/modules/personalSetting/info/index.js +10 -10
  81. package/{dist/esm → es}/modules/personalSetting/reset/index.js +39 -39
  82. package/es/modules/personalSetting/styles/unbinding.less +73 -0
  83. package/es/modules/personalSetting/unbinding/index.d.ts +4 -0
  84. package/es/modules/personalSetting/unbinding/index.js +104 -0
  85. package/{dist/esm → es}/modules/systemSetting/index.d.ts +0 -1
  86. package/{dist/esm → es}/modules/systemSetting/index.js +8 -4
  87. package/es/modules/systemSetting/notice/configItem/index.d.ts +8 -0
  88. package/{dist/esm → es}/modules/systemSetting/notice/configItem/index.js +5 -5
  89. package/{dist/esm → es}/modules/systemSetting/notice/edit/index.d.ts +2 -8
  90. package/{dist/esm → es}/modules/systemSetting/notice/edit/index.js +29 -22
  91. package/es/modules/systemSetting/notice/index.d.ts +9 -0
  92. package/{dist/esm → es}/modules/systemSetting/notice/index.js +12 -11
  93. package/es/types/app.d.ts +140 -0
  94. package/es/types/app.js +1 -0
  95. package/es/types/companySetting.d.ts +199 -0
  96. package/es/types/companySetting.js +1 -0
  97. package/es/types/index.d.ts +4 -0
  98. package/es/types/index.js +4 -0
  99. package/es/types/personal.d.ts +21 -0
  100. package/es/types/personal.js +1 -0
  101. package/es/types/system.d.ts +38 -0
  102. package/es/types/system.js +1 -0
  103. package/{dist/esm → es}/utils/constants.js +0 -64
  104. package/{dist/esm → es}/utils/functionalPermissions.js +0 -1
  105. package/package.json +7 -7
  106. package/dist/esm/components/pageLoading/index.less +0 -11
  107. package/dist/esm/constants/styles/base.sass +0 -9
  108. package/dist/esm/constants/styles/cleverUI.css +0 -7
  109. package/dist/esm/constants/styles/constants.sass +0 -60
  110. package/dist/esm/constants/styles/customUITheme.sass +0 -54
  111. package/dist/esm/constants/styles/reset.sass +0 -61
  112. package/dist/esm/index.js +0 -4
  113. package/dist/esm/modules/appSettings/demo/index.d.ts +0 -3
  114. package/dist/esm/modules/appSettings/demo/index.js +0 -6
  115. package/dist/esm/modules/appSettings/index.js +0 -88
  116. package/dist/esm/modules/appSettings/index.less +0 -21
  117. package/dist/esm/modules/companySetting/appList/index.d.ts +0 -21
  118. package/dist/esm/modules/companySetting/cost/index.d.ts +0 -8
  119. package/dist/esm/modules/companySetting/edit/authConfig.d.ts +0 -10
  120. package/dist/esm/modules/companySetting/edit/authModule.d.ts +0 -7
  121. package/dist/esm/modules/companySetting/edit/user.d.ts +0 -14
  122. package/dist/esm/modules/companySetting/edit/userGroup.d.ts +0 -15
  123. package/dist/esm/modules/companySetting/index.d.ts +0 -14
  124. package/dist/esm/modules/companySetting/index.js +0 -718
  125. package/dist/esm/modules/companySetting/user/index.d.ts +0 -19
  126. package/dist/esm/modules/companySetting/user/invite.d.ts +0 -10
  127. package/dist/esm/modules/companySetting/userGroup/authConfigDetail.d.ts +0 -16
  128. package/dist/esm/modules/companySetting/userGroup/groupItem.d.ts +0 -11
  129. package/dist/esm/modules/companySetting/userGroup/index.d.ts +0 -14
  130. package/dist/esm/modules/companySetting/virtualApp/config.d.ts +0 -11
  131. package/dist/esm/modules/companySetting/virtualApp/index.d.ts +0 -12
  132. package/dist/esm/modules/companySetting/virtualApp/panels/list.d.ts +0 -12
  133. package/dist/esm/modules/companySetting/virtualApp/panels/sourceItem.d.ts +0 -10
  134. package/dist/esm/modules/personalSetting/index.js +0 -62
  135. package/dist/esm/modules/personalSetting/index.less +0 -2
  136. package/dist/esm/modules/systemSetting/index.less +0 -2
  137. package/dist/esm/modules/systemSetting/notice/configItem/index.d.ts +0 -7
  138. package/dist/esm/modules/systemSetting/notice/index.d.ts +0 -3
  139. /package/{dist/esm → es}/components/demo.d.ts +0 -0
  140. /package/{dist/esm → es}/components/demo.js +0 -0
  141. /package/{dist/esm → es}/constants/icons/demo.css +0 -0
  142. /package/{dist/esm → es}/constants/icons/demo_index.html +0 -0
  143. /package/{dist/esm → es}/constants/icons/iconfont.css +0 -0
  144. /package/{dist/esm → es}/constants/icons/iconfont.json +0 -0
  145. /package/{dist/esm → es}/constants/icons/iconfont.ttf +0 -0
  146. /package/{dist/esm → es}/constants/icons/iconfont.woff +0 -0
  147. /package/{dist/esm → es}/constants/icons/iconfont.woff2 +0 -0
  148. /package/{dist/esm → es}/global.d.ts +0 -0
  149. /package/{dist/esm → es}/index.d.ts +0 -0
  150. /package/{dist/esm → es}/modules/appSettings/appInfo/index.d.ts +0 -0
  151. /package/{dist/esm → es}/modules/appSettings/dataAccessFilter/index.d.ts +0 -0
  152. /package/{dist/esm → es}/modules/appSettings/dataAccessFilter/index.less +0 -0
  153. /package/{dist/esm → es}/modules/appSettings/member/index.d.ts +0 -0
  154. /package/{dist/esm → es}/modules/appSettings/secretKey/index.d.ts +0 -0
  155. /package/{dist/esm → es}/modules/appSettings/secretKey/index.js +0 -0
  156. /package/{dist/esm → es}/modules/appSettings/virtualSource/index.d.ts +0 -0
  157. /package/{dist/esm → es}/modules/appSettings/virtualSource/styles/index.less +0 -0
  158. /package/{dist/esm → es}/modules/companySetting/edit/styles/authConfig.less +0 -0
  159. /package/{dist/esm → es}/modules/companySetting/edit/styles/authGroup.less +0 -0
  160. /package/{dist/esm → es}/modules/companySetting/edit/styles/authModule.less +0 -0
  161. /package/{dist/esm → es}/modules/companySetting/edit/styles/user.less +0 -0
  162. /package/{dist/esm → es}/modules/companySetting/edit/styles/userGroup.less +0 -0
  163. /package/{dist/esm → es}/modules/companySetting/index.less +0 -0
  164. /package/{dist/esm → es}/modules/companySetting/userGroup/index.less +0 -0
  165. /package/{dist/esm → es}/modules/companySetting/userGroup/style/authConfigDetail.less +0 -0
  166. /package/{dist/esm → es}/modules/companySetting/virtualApp/styles/list.less +0 -0
  167. /package/{dist/esm → es}/modules/companySetting/virtualApp/styles/sourceItem.less +0 -0
  168. /package/{dist/esm → es}/modules/companySetting/wechatBinding/index.d.ts +0 -0
  169. /package/{dist/esm → es}/modules/personalSetting/info/index.d.ts +0 -0
  170. /package/{dist/esm → es}/modules/personalSetting/reset/index.d.ts +0 -0
  171. /package/{dist/esm → es}/modules/systemSetting/notice/configItem/index.less +0 -0
  172. /package/{dist/esm → es}/modules/systemSetting/notice/edit/index.less +0 -0
  173. /package/{dist/esm → es}/utils/ajax.d.ts +0 -0
  174. /package/{dist/esm → es}/utils/ajax.js +0 -0
  175. /package/{dist/esm → es}/utils/base64.d.ts +0 -0
  176. /package/{dist/esm → es}/utils/base64.js +0 -0
  177. /package/{dist/esm → es}/utils/constants.d.ts +0 -0
  178. /package/{dist/esm → es}/utils/functionalPermissions.d.ts +0 -0
  179. /package/{dist/esm → es}/utils/util.d.ts +0 -0
  180. /package/{dist/esm → es}/utils/util.js +0 -0
@@ -1,9 +1,9 @@
1
1
  import React from 'react';
2
2
  import './index.less';
3
3
  declare const Info: React.FC<{
4
- ENVIRONMENT: String;
5
- companyId: any;
6
- companyName: String;
4
+ ENVIRONMENT: string;
5
+ companyId: number;
6
+ companyName: string;
7
7
  changeCompanyNameCallback?: () => void;
8
8
  }>;
9
9
  export default Info;
@@ -5,10 +5,10 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
5
5
  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; } }
6
6
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
7
7
  import React, { useState } from 'react';
8
- import "./index.less";
8
+ import './index.less';
9
9
  import { Button, Form, Input, notification } from 'antd';
10
- import request from "./../../../utils/ajax";
11
- import api from "./../../../constants/api";
10
+ import request from './../../../utils/ajax';
11
+ import api from './../../../constants/api';
12
12
  var TextArea = Input.TextArea;
13
13
  var Info = function Info(props) {
14
14
  var ENVIRONMENT = props.ENVIRONMENT,
@@ -60,7 +60,7 @@ var Info = function Info(props) {
60
60
  companyName: companyNameVal
61
61
  }
62
62
  }).then(function (res) {
63
- if (res.flag === 101) {
63
+ if ((res === null || res === void 0 ? void 0 : res.flag) === 101) {
64
64
  if (changeCompanyNameCallback) changeCompanyNameCallback();
65
65
  notification.success({
66
66
  message: '名称修改成功'
@@ -86,7 +86,10 @@ var Info = function Info(props) {
86
86
  license: ''
87
87
  },
88
88
  onFinish: saveClick,
89
- layout: "vertical"
89
+ layout: "vertical",
90
+ wrapperCol: {
91
+ span: 8
92
+ }
90
93
  }, /*#__PURE__*/React.createElement(Form.Item, {
91
94
  label: '公司名称',
92
95
  name: 'companyNameVal',
@@ -1,7 +1,7 @@
1
1
  @import '~@zgfe/business-lib/es/assets/styles/inner.less';
2
2
  @import './../style/common.less';
3
3
  .company-setting-info {
4
- padding: 40px 50px;
4
+ padding: 0;
5
5
  > p {
6
6
  margin-bottom: 13px;
7
7
  color: #565656;
@@ -1,4 +1,4 @@
1
- @import './../../../constants/styles/cleverUI.css';
1
+ @import './reset.less';
2
2
  .setting {
3
3
  height: 100%;
4
4
  overflow-y: hidden;
@@ -12,11 +12,11 @@
12
12
  }
13
13
 
14
14
  .setting-content {
15
- padding: 20px;
15
+ padding: 0px;
16
16
  .setting-title {
17
17
  display: flex;
18
18
  align-items: center;
19
- margin-bottom: 20px;
19
+ margin-bottom: 0px;
20
20
  .icon-set,
21
21
  .icon-company {
22
22
  margin-right: 10px;
@@ -0,0 +1,117 @@
1
+ // @import constants
2
+
3
+ * {
4
+ box-sizing: border-box;
5
+ font-family: 'PingFang SC', Arial, 'Microsoft YaHei', sans-serif;
6
+ -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
7
+ }
8
+
9
+ *:before,
10
+ *:after {
11
+ box-sizing: border-box;
12
+ }
13
+
14
+ // HTML & Body reset
15
+ html,
16
+ body {
17
+ width: 100%;
18
+ height: 100%;
19
+ margin: 0;
20
+ padding: 0;
21
+ overflow-x: hidden;
22
+ }
23
+
24
+ // unify the setting of elements's margin and padding for browsers
25
+ body,
26
+ div,
27
+ dl,
28
+ dt,
29
+ dd,
30
+ ul,
31
+ ol,
32
+ li,
33
+ h1,
34
+ h2,
35
+ h3,
36
+ h4,
37
+ h5,
38
+ h6,
39
+ pre,
40
+ code,
41
+ form,
42
+ fieldset,
43
+ legend,
44
+ input,
45
+ textarea,
46
+ p,
47
+ blockquote,
48
+ th,
49
+ td,
50
+ hr,
51
+ button,
52
+ article,
53
+ aside,
54
+ details,
55
+ figcaption,
56
+ figure,
57
+ footer,
58
+ header,
59
+ hgroup,
60
+ menu,
61
+ nav,
62
+ section {
63
+ box-sizing: border-box;
64
+ margin: 0;
65
+ padding: 0;
66
+ }
67
+
68
+ // Reset fonts for relevant elements
69
+ button,
70
+ input,
71
+ select,
72
+ textarea {
73
+ color: inherit;
74
+ font-size: inherit;
75
+ line-height: inherit;
76
+ outline: none;
77
+ }
78
+
79
+ ul,
80
+ li,
81
+ ol {
82
+ list-style: none;
83
+ }
84
+
85
+ // Remove the clear button of a text input control in IE10+
86
+ input::-ms-clear,
87
+ input::-ms-reveal {
88
+ display: none;
89
+ }
90
+
91
+ // Links
92
+ a {
93
+ text-decoration: none;
94
+ background: transparent;
95
+ outline: none;
96
+ cursor: pointer;
97
+ transition: color 0.3s ease;
98
+
99
+ &:focus {
100
+ text-decoration: underline;
101
+ text-decoration-skip-ink: auto;
102
+ }
103
+ }
104
+
105
+ .company-setting [class^='icon-'],
106
+ .company-setting [class*=' icon-'] {
107
+ font-family: 'zhuge' !important;
108
+ font-style: normal;
109
+ -webkit-font-smoothing: antialiased;
110
+ -moz-osx-font-smoothing: grayscale;
111
+ }
112
+
113
+ .ant-dropdown-hidden,
114
+ .ant-picker-dropdown-hidden,
115
+ ant-dropdown-menu-submenu-hidden {
116
+ display: none;
117
+ }
@@ -0,0 +1,21 @@
1
+ import React from 'react';
2
+ import './index.less';
3
+ import { BizSelectTypes } from '@zgfe/business-lib';
4
+ import { AllGroupInfosItem, AllMembersItem, ApiResult, AppListItem, GroupHashList, LeftMenusItem, SettingCurrentUser } from '../../../types';
5
+ declare const User: React.FC<{
6
+ ENVIRONMENT: string;
7
+ settingCurrentUser: SettingCurrentUser | undefined;
8
+ id: number;
9
+ allGroupInfos: AllGroupInfosItem[];
10
+ groupHashList: GroupHashList;
11
+ companyAppList: AppListItem[];
12
+ leftMenus: LeftMenusItem[];
13
+ isMarsUi: boolean;
14
+ isAdmin: boolean;
15
+ serviceType: number;
16
+ removeUserCallback: (delIndex: number) => void;
17
+ changeUserAuthCallback: (id: number) => void;
18
+ createMembersCallback: (res: ApiResult<void>, userConfig?: AllMembersItem | false) => void;
19
+ changeAdminCallback: (res: BizSelectTypes.Option) => void;
20
+ }>;
21
+ export default User;
@@ -6,13 +6,13 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
6
6
  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; } }
7
7
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
8
8
  import React, { useEffect, useState } from 'react';
9
- import "./index.less";
9
+ import './index.less';
10
10
  import { Button, Input, notification, Popover, Tabs } from 'antd';
11
- import request from "./../../../utils/ajax";
12
- import api from "./../../../constants/api";
13
- import AuthConfigDetail from "./../userGroup/authConfigDetail";
14
- import CompanySettingUser from "./../edit/user";
15
- import Invite from "./invite";
11
+ import request from './../../../utils/ajax';
12
+ import api from './../../../constants/api';
13
+ import AuthConfigDetail from './../userGroup/authConfigDetail';
14
+ import CompanySettingUser from './../edit/user';
15
+ import Invite from './invite';
16
16
  import { BizTable, BizDialog, BizSelect } from '@zgfe/business-lib';
17
17
  var TextArea = Input.TextArea,
18
18
  Search = Input.Search;
@@ -97,14 +97,12 @@ var User = function User(props) {
97
97
  _useState30 = _slicedToArray(_useState29, 2),
98
98
  showMembers = _useState30[0],
99
99
  setShowMembers = _useState30[1];
100
-
101
100
  // useEffect(() => {
102
101
  // let groupHashList = {}
103
102
  // for (let item of allGroupInfos) {
104
103
  // groupHashList[item.id] = { groupName: item.groupName }
105
104
  // }
106
105
  // }, [allGroupInfos]);
107
-
108
106
  useEffect(function () {
109
107
  getMenbers();
110
108
  }, []);
@@ -112,10 +110,10 @@ var User = function User(props) {
112
110
  request(api.setting.getGroupMembers, {
113
111
  method: 'get'
114
112
  }).then(function (res) {
115
- if (res.flag === 101) {
113
+ if (res && res.flag === 101 && res.company_members) {
116
114
  setAllMembers(res.company_members);
117
115
  setShowMembers(res.company_members.filter(function (member) {
118
- if (!filter || new RegExp(filter.trim().toLowerCase()).test(member.email.toLowerCase()) || new RegExp(filter.trim().toLowerCase()).test(member.username.toLowerCase())) return true;
116
+ if (!filter || new RegExp(filter.trim().toLowerCase()).test((member.email || '').toLowerCase()) || new RegExp(filter.trim().toLowerCase()).test((member.username || '').toLowerCase())) return true;
119
117
  return false;
120
118
  }));
121
119
  setAdminOptionList(res.company_members.filter(function (item) {
@@ -129,25 +127,27 @@ var User = function User(props) {
129
127
  };
130
128
  useEffect(function () {
131
129
  setShowMembers(allMembers.filter(function (member) {
132
- if (!filter || new RegExp(filter.trim().toLowerCase()).test(member.email.toLowerCase()) || new RegExp(filter.trim().toLowerCase()).test(member.username.toLowerCase())) return true;
130
+ if (!filter || new RegExp(filter.trim().toLowerCase()).test((member.email || '').toLowerCase()) || new RegExp(filter.trim().toLowerCase()).test((member.username || '').toLowerCase())) return true;
133
131
  return false;
134
132
  }));
135
133
  }, [filter]);
136
134
  var reworkGroups = function reworkGroups(data) {
137
135
  var names = [];
138
- var _iterator = _createForOfIteratorHelper(data.authConfig.groupIds),
139
- _step;
140
- try {
141
- for (_iterator.s(); !(_step = _iterator.n()).done;) {
142
- var _id = _step.value;
143
- if (groupHashList[_id]) {
144
- names.push(groupHashList[_id].groupName);
136
+ if (data.authConfig && data.authConfig.groupIds) {
137
+ var _iterator = _createForOfIteratorHelper(data.authConfig.groupIds),
138
+ _step;
139
+ try {
140
+ for (_iterator.s(); !(_step = _iterator.n()).done;) {
141
+ var _id = _step.value;
142
+ if (groupHashList[_id]) {
143
+ names.push(groupHashList[_id].groupName);
144
+ }
145
145
  }
146
+ } catch (err) {
147
+ _iterator.e(err);
148
+ } finally {
149
+ _iterator.f();
146
150
  }
147
- } catch (err) {
148
- _iterator.e(err);
149
- } finally {
150
- _iterator.f();
151
151
  }
152
152
  return names.length ? splitString(names.join(',')) : '-';
153
153
  };
@@ -175,10 +175,10 @@ var User = function User(props) {
175
175
  });
176
176
  };
177
177
  var showUserEditAuthEvent = function showUserEditAuthEvent(userData) {
178
+ console.log('userData', userData);
178
179
  setUserEditAuthState(true);
179
180
  setUserEditAuthData(userData);
180
181
  };
181
-
182
182
  // const showMembers = () => {
183
183
  // return allMembers.filter(member => {
184
184
  // if (
@@ -194,7 +194,6 @@ var User = function User(props) {
194
194
  // return false
195
195
  // })
196
196
  // }
197
-
198
197
  var removeUser = function removeUser(userData) {
199
198
  setShowPasswordPanel(false);
200
199
  setShowDialog(true);
@@ -211,7 +210,7 @@ var User = function User(props) {
211
210
  method: 'post',
212
211
  params: params
213
212
  }).then(function (res) {
214
- if (res.flag === 101) {
213
+ if (res && res.flag === 101) {
215
214
  notification.success({
216
215
  message: '移除成功!'
217
216
  });
@@ -247,12 +246,12 @@ var User = function User(props) {
247
246
  email: userData.email
248
247
  }
249
248
  }).then(function (res) {
250
- if (res.flag === 101) {
249
+ if (res && res.flag === 101) {
251
250
  showPasswordPanelEvent({
252
- account: res.email,
253
- pwd: res.password
251
+ account: res.email || '',
252
+ pwd: res.password || ''
254
253
  });
255
- } else if (res.flag === -102) {
254
+ } else if (res && res.flag === -102) {
256
255
  notification.error({
257
256
  message: '重置密码失败,此已注册用户还未接受您的邀请!'
258
257
  });
@@ -270,7 +269,7 @@ var User = function User(props) {
270
269
  setShowPasswordPanel(true);
271
270
  setPwdPanelAccount(userInfo.account);
272
271
  setPwdPanelPassword(userInfo.pwd);
273
- setPwdPanelUserConfig(userInfo.userConfig);
272
+ setPwdPanelUserConfig(userInfo && userInfo.userConfig ? userInfo.userConfig : {});
274
273
  };
275
274
  var closePwdPanel = function closePwdPanel() {
276
275
  setShowPasswordPanel(false);
@@ -301,6 +300,7 @@ var User = function User(props) {
301
300
  return function () {};
302
301
  });
303
302
  };
303
+ // BizSelectTypes.Option
304
304
  var changeAdmin = function changeAdmin(e) {
305
305
  setAdminOptionValue(e);
306
306
  setShowDialog(true);
@@ -314,7 +314,7 @@ var User = function User(props) {
314
314
  user_id: e.id
315
315
  }
316
316
  }).then(function (res) {
317
- if (res.flag === 101) {
317
+ if (res && res.flag === 101) {
318
318
  setShowDialog(false);
319
319
  notification.success({
320
320
  message: "\u5DF2\u7ECF\u79FB\u4EA4\u6743\u9650\u7ED9\u300C".concat(e.email, "\u300D,\u8BF7\u91CD\u65B0\u767B\u5F55")
@@ -334,31 +334,30 @@ var User = function User(props) {
334
334
  var columns = [{
335
335
  title: '账号',
336
336
  dataIndex: 'email',
337
- render: function render() {
338
- var data = arguments.length <= 1 ? undefined : arguments[1];
337
+ render: function render(email) {
338
+ // const data = res[1];
339
339
  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
340
- title: data.email
341
- }, splitString(data.email, 20)));
340
+ title: email
341
+ }, splitString(email, 20)));
342
342
  }
343
343
  }, {
344
344
  title: '姓名',
345
- dataIndex: 'username',
346
- render: function render() {
347
- var data = arguments.length <= 1 ? undefined : arguments[1];
345
+ // dataIndex: 'username',
346
+ render: function render(data) {
347
+ // const data = res[1];
348
348
  return /*#__PURE__*/React.createElement("div", null, data.inv_status !== 1 ? /*#__PURE__*/React.createElement("span", null, "-") : /*#__PURE__*/React.createElement("span", {
349
349
  title: data.username || data.email
350
- }, splitString(data.username || data.email), data.id === id ? /*#__PURE__*/React.createElement("span", null, "\uFF08\u6211\uFF09") : null, data.is_admin ? /*#__PURE__*/React.createElement("span", {
350
+ }, splitString(data.username || data.email || ''), data.id === id ? /*#__PURE__*/React.createElement("span", null, "\uFF08\u6211\uFF09") : null, data.is_admin ? /*#__PURE__*/React.createElement("span", {
351
351
  className: "super-admin"
352
352
  }, "\u8D85\u7EA7\u7BA1\u7406\u5458") : null));
353
353
  }
354
354
  }, {
355
355
  title: '用户组',
356
- dataIndex: 'groups',
357
- render: function render() {
358
- var data = arguments.length <= 1 ? undefined : arguments[1];
356
+ render: function render(data) {
357
+ // const data = res[1];
359
358
  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Popover, {
360
359
  content: function content() {
361
- return /*#__PURE__*/React.createElement("span", null, getGroupNameById(data.authConfig.groupIds));
360
+ return /*#__PURE__*/React.createElement("span", null, data.authConfig && data.authConfig.groupIds ? getGroupNameById(data.authConfig.groupIds) : '');
362
361
  },
363
362
  style: {
364
363
  width: 255
@@ -368,9 +367,8 @@ var User = function User(props) {
368
367
  }
369
368
  }, {
370
369
  title: '权限',
371
- dataIndex: 'name',
372
- render: function render() {
373
- var data = arguments.length <= 1 ? undefined : arguments[1];
370
+ render: function render(data) {
371
+ // const data = res[1];
374
372
  return /*#__PURE__*/React.createElement("div", {
375
373
  className: "operating"
376
374
  }, /*#__PURE__*/React.createElement(Popover, {
@@ -384,12 +382,13 @@ var User = function User(props) {
384
382
  width: 300
385
383
  }
386
384
  }, /*#__PURE__*/React.createElement(AuthConfigDetail, {
387
- authConfig: data.authConfig.defaultAuth,
385
+ authConfig: data.authConfig ? data.authConfig.defaultAuth : {},
388
386
  companyAppList: companyAppList,
389
387
  leftMenus: leftMenus,
390
388
  isMarsUi: isMarsUi,
391
389
  id: data.id,
392
- type: 1
390
+ type: 1,
391
+ serviceType: serviceType
393
392
  })), /*#__PURE__*/React.createElement(Tabs.TabPane, {
394
393
  tab: "\u6240\u5C5E\u7528\u6237\u7EC4\u6743\u9650",
395
394
  key: "2",
@@ -398,16 +397,17 @@ var User = function User(props) {
398
397
  }
399
398
  }, /*#__PURE__*/React.createElement("div", {
400
399
  className: "group-auth-list"
401
- }, groupAuthConfig(data.authConfig.groupIds).length ? /*#__PURE__*/React.createElement("div", null, groupAuthConfig(data.authConfig.groupIds).map(function (item) {
400
+ }, data.authConfig && data.authConfig.groupIds && groupAuthConfig(data.authConfig.groupIds).length ? /*#__PURE__*/React.createElement("div", null, groupAuthConfig(data.authConfig.groupIds).map(function (item) {
402
401
  return /*#__PURE__*/React.createElement(AuthConfigDetail, {
403
402
  key: item.id,
404
- authConfig: item.authConfig,
403
+ authConfig: item.authConfig ? item.authConfig : {},
405
404
  leftMenus: leftMenus,
406
405
  isMarsUi: isMarsUi,
407
406
  companyAppList: companyAppList,
408
407
  name: item.groupName,
409
408
  groupId: item.id,
410
- type: 2
409
+ type: 2,
410
+ serviceType: serviceType
411
411
  });
412
412
  })) : /*#__PURE__*/React.createElement(AuthConfigDetail, {
413
413
  authConfig: {
@@ -418,7 +418,8 @@ var User = function User(props) {
418
418
  isMarsUi: isMarsUi,
419
419
  companyAppList: companyAppList,
420
420
  name: '',
421
- type: 2
421
+ type: 2,
422
+ serviceType: serviceType
422
423
  }))));
423
424
  },
424
425
  style: {
@@ -431,9 +432,8 @@ var User = function User(props) {
431
432
  }
432
433
  }, {
433
434
  title: '操作',
434
- dataIndex: 'groups',
435
- render: function render() {
436
- var data = arguments.length <= 1 ? undefined : arguments[1];
435
+ render: function render(data) {
436
+ // const data = res[1];
437
437
  return /*#__PURE__*/React.createElement("div", {
438
438
  className: "operate"
439
439
  }, /*#__PURE__*/React.createElement("span", {
@@ -463,7 +463,7 @@ var User = function User(props) {
463
463
  }];
464
464
  return /*#__PURE__*/React.createElement("div", {
465
465
  className: "company-user"
466
- }, userEditAuthState ? /*#__PURE__*/React.createElement(CompanySettingUser, {
466
+ }, userEditAuthState && userEditAuthData ? /*#__PURE__*/React.createElement(CompanySettingUser, {
467
467
  ENVIRONMENT: ENVIRONMENT,
468
468
  data: userEditAuthData,
469
469
  allGroupInfos: allGroupInfos,
@@ -473,21 +473,20 @@ var User = function User(props) {
473
473
  },
474
474
  isMarsUi: isMarsUi,
475
475
  leftMenus: leftMenus,
476
- changeUserAuthCallback: function changeUserAuthCallback() {
476
+ changeUserAuthCallback: function changeUserAuthCallback(id) {
477
477
  getMenbers();
478
- _changeUserAuthCallback && _changeUserAuthCallback();
478
+ _changeUserAuthCallback && _changeUserAuthCallback(id);
479
479
  },
480
480
  serviceType: serviceType
481
481
  }) : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Invite, {
482
482
  ENVIRONMENT: ENVIRONMENT,
483
483
  showPwdPanel: showPasswordPanelEvent,
484
- isSso: settingCurrentUser.ssoType > 0
484
+ isSso: !!(settingCurrentUser && settingCurrentUser.ssoType > 0),
485
485
  // ref="inviteRef"
486
- ,
487
486
  allGroupInfos: allGroupInfos,
488
- createMembersCallback: function createMembersCallback() {
487
+ createMembersCallback: function createMembersCallback(res, userConfig) {
489
488
  getMenbers();
490
- _createMembersCallback();
489
+ _createMembersCallback(res, userConfig);
491
490
  }
492
491
  }), /*#__PURE__*/React.createElement("div", {
493
492
  className: "user-list"
@@ -521,9 +520,8 @@ var User = function User(props) {
521
520
  options: adminOptionList,
522
521
  value: adminOptionValue,
523
522
  labelField: "email",
524
- keyField: "id"
523
+ keyField: "id",
525
524
  // maxTagCount={'responsive'}
526
- ,
527
525
  onChange: changeAdmin
528
526
  })) : null)), /*#__PURE__*/React.createElement(BizDialog, {
529
527
  title: dialogTitle,
@@ -1,7 +1,7 @@
1
1
  @import './../../../constants/icons/iconfont.css';
2
2
  .company-user {
3
3
  height: 100%;
4
- padding: 20px;
4
+ padding: 0;
5
5
  overflow: auto;
6
6
  color: #2f3f57;
7
7
  font-size: 14px;
@@ -152,10 +152,10 @@
152
152
  margin-left: 10px;
153
153
  }
154
154
  }
155
- [class^='icon-'],
156
- [class*=' icon-'] {
157
- font-family: 'zhuge' !important;
158
- font-style: normal;
159
- -webkit-font-smoothing: antialiased;
160
- -moz-osx-font-smoothing: grayscale;
161
- }
155
+ // [class^='icon-'],
156
+ // [class*=' icon-'] {
157
+ // font-family: 'zhuge' !important;
158
+ // font-style: normal;
159
+ // -webkit-font-smoothing: antialiased;
160
+ // -moz-osx-font-smoothing: grayscale;
161
+ // }
@@ -0,0 +1,15 @@
1
+ import React from 'react';
2
+ import './index.less';
3
+ import { AllGroupInfosItem, AllMembersItem, ApiResult } from '../../../types';
4
+ declare const UserGroup: React.FC<{
5
+ ENVIRONMENT: string;
6
+ allGroupInfos: AllGroupInfosItem[];
7
+ isSso: boolean;
8
+ showPwdPanel: (userInfo: {
9
+ account: string;
10
+ pwd: string;
11
+ userConfig?: AllMembersItem;
12
+ }) => void;
13
+ createMembersCallback: (res: ApiResult<void>, userConfig: AllMembersItem | false) => void;
14
+ }>;
15
+ export default UserGroup;
@@ -11,15 +11,11 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
11
11
  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
12
12
  function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
13
13
  import React, { useState } from 'react';
14
- import "./index.less";
15
- import constants from "./../../../utils/constants";
14
+ import './index.less';
15
+ import constants from './../../../utils/constants';
16
16
  import { Button, Input, notification, Select } from 'antd';
17
- import request from "./../../../utils/ajax";
18
- import apis from "./../../../constants/api";
19
-
20
- // import companySettingUserGroup from '../edit/userGroup'
21
- // import groupItem from './groupItem.vue'
22
-
17
+ import request from './../../../utils/ajax';
18
+ import apis from './../../../constants/api';
23
19
  var TextArea = Input.TextArea;
24
20
  var UserGroup = function UserGroup(props) {
25
21
  var ENVIRONMENT = props.ENVIRONMENT,
@@ -90,7 +86,7 @@ var UserGroup = function UserGroup(props) {
90
86
  method: 'post',
91
87
  params: params
92
88
  }).then(function (res) {
93
- if (res.flag === 101) {
89
+ if (res && res.flag === 101) {
94
90
  if (res.popup) {
95
91
  var userConfig = {
96
92
  id: res.userId,
@@ -109,8 +105,8 @@ var UserGroup = function UserGroup(props) {
109
105
  is_admin: false
110
106
  };
111
107
  showPwdPanel({
112
- account: res.email,
113
- pwd: res.password,
108
+ account: res.email || '',
109
+ pwd: res.password || '',
114
110
  userConfig: userConfig
115
111
  });
116
112
  createMembersCallback && createMembersCallback(res, userConfig);
@@ -120,7 +116,7 @@ var UserGroup = function UserGroup(props) {
120
116
  setInviteVal('');
121
117
  setTargetGroup([]);
122
118
  } else {
123
- switch (res.flag) {
119
+ switch (res && res.flag) {
124
120
  case -101:
125
121
  notification.error({
126
122
  message: '成员创建失败,无权限'
@@ -0,0 +1,15 @@
1
+ import React from 'react';
2
+ import './style/authConfigDetail.less';
3
+ import { AppListItem, Config, LeftMenusItem } from '../../../types';
4
+ declare const authConfigDetail: React.FC<{
5
+ name?: string;
6
+ authConfig: Config;
7
+ companyAppList: AppListItem[];
8
+ leftMenus: LeftMenusItem[];
9
+ isMarsUi: boolean;
10
+ id?: number;
11
+ groupId?: number;
12
+ type: number;
13
+ serviceType: number;
14
+ }>;
15
+ export default authConfigDetail;