@zgfe/modules-settings 2.1.0-zhongyuan.21 → 2.1.0-zhongyuan.23

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 (7) hide show
  1. package/es/modules/companySetting/application/applicationForm.d.ts +1 -0
  2. package/es/modules/companySetting/application/applicationForm.js +32 -3
  3. package/es/modules/companySetting/user/invite.js +25 -84
  4. package/es/modules/createDemand/demo/selectPoint.js +1 -1
  5. package/es/modules/dealDemand/demo/selectPoint.js +1 -1
  6. package/es/modules/pointMap/tree.js +1 -1
  7. package/package.json +2 -2
package/es/modules/companySetting/application/applicationForm.d.ts CHANGED
@@ -19,5 +19,6 @@ declare const _default: React.ForwardRefExoticComponent<{
19
19
  name?: string | undefined;
20
20
  appVersion?: number | undefined;
21
21
  currentUser?: any;
22
+ appType?: string | undefined;
22
23
  } & React.RefAttributes<React.FC<{}>>>;
23
24
  export default _default;
package/es/modules/companySetting/application/applicationForm.js CHANGED
@@ -5,7 +5,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
5
5
  function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
6
6
  function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
7
7
  import React, { useEffect, forwardRef, useState, useImperativeHandle } from 'react';
8
- import { Form, Input, Alert, Radio } from 'antd';
8
+ import { Form, Input, Alert, Radio, Select } from 'antd';
9
9
  import './index.less';
10
10
  import { classPrefix } from './index';
11
11
  export var AppVersion;
@@ -25,7 +25,8 @@ export var AppVersion;
25
25
  })(AppVersion || (AppVersion = {}));
26
26
  var ApplicationForm = function ApplicationForm(props, ref) {
27
27
  var name = props.name,
28
- currentUser = props.currentUser;
28
+ currentUser = props.currentUser,
29
+ appType = props.appType;
29
30
  var _useState = useState(true),
30
31
  _useState2 = _slicedToArray(_useState, 2),
31
32
  showChunk = _useState2[0],
@@ -55,9 +56,13 @@ var ApplicationForm = function ApplicationForm(props, ref) {
55
56
  name: 'name',
56
57
  value: name
57
58
  }]);
59
+ form.setFields([{
60
+ name: 'appType',
61
+ value: appType
62
+ }]);
58
63
  setShowchunk(false);
59
64
  }
60
- }, [name]);
65
+ }, [name, appType]);
61
66
  return /*#__PURE__*/React.createElement(Form, {
62
67
  form: form,
63
68
  labelCol: {
@@ -97,6 +102,30 @@ var ApplicationForm = function ApplicationForm(props, ref) {
97
102
  placeholder: "\u8BF7\u8F93\u5165\u5E94\u7528\u540D\u79F0",
98
103
  showCount: true,
99
104
  maxLength: 20
105
+ })), /*#__PURE__*/React.createElement(Form.Item, {
106
+ name: 'appType',
107
+ className: "app-list-form-item"
108
+ }, /*#__PURE__*/React.createElement(Select, {
109
+ defaultValue: "1",
110
+ options: [{
111
+ value: '1',
112
+ label: '零售'
113
+ }, {
114
+ value: '2',
115
+ label: '公司'
116
+ }, {
117
+ value: '3',
118
+ label: '同业'
119
+ }, {
120
+ value: '4',
121
+ label: '风险'
122
+ }, {
123
+ value: '5',
124
+ label: '内部管理'
125
+ }, {
126
+ value: '6',
127
+ label: '其他'
128
+ }]
100
129
  })), showChunk && (/*#__PURE__*/React.createElement(Form.Item, {
101
130
  style: {
102
131
  color: '#9AA1A9'
package/es/modules/companySetting/user/invite.js CHANGED
@@ -33,29 +33,18 @@ var UserGroup = function UserGroup(props) {
33
33
  _useState4 = _slicedToArray(_useState3, 2),
34
34
  userList = _useState4[0],
35
35
  setUserList = _useState4[1];
36
- var _useState5 = useState([]),
36
+ var _useState5 = useState(false),
37
37
  _useState6 = _slicedToArray(_useState5, 2),
38
- departmentList = _useState6[0],
39
- setDepartmentList = _useState6[1];
38
+ isAdmin = _useState6[0],
39
+ setIsAdmin = _useState6[1];
40
40
  var _useState7 = useState(false),
41
41
  _useState8 = _slicedToArray(_useState7, 2),
42
- isAdmin = _useState8[0],
43
- setIsAdmin = _useState8[1];
44
- var _useState9 = useState({
45
- rule: /^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9~!@#$%^&*]{8,20}$/,
46
- description: '请输入8-20个字符,可包括大小写字母和数字 特殊字符(!@#$%^&*)'
47
- }),
42
+ createAppLoading = _useState8[0],
43
+ setCreateAppLoading = _useState8[1];
44
+ var _useState9 = useState(false),
48
45
  _useState10 = _slicedToArray(_useState9, 2),
49
- passwordRule = _useState10[0],
50
- setPasswordRule = _useState10[1];
51
- var _useState11 = useState(false),
52
- _useState12 = _slicedToArray(_useState11, 2),
53
- createAppLoading = _useState12[0],
54
- setCreateAppLoading = _useState12[1];
55
- var _useState13 = useState(false),
56
- _useState14 = _slicedToArray(_useState13, 2),
57
- createdAppPanel = _useState14[0],
58
- setCreatedAppPanel = _useState14[1];
46
+ createdAppPanel = _useState10[0],
47
+ setCreatedAppPanel = _useState10[1];
59
48
  useEffect(function () {
60
49
  if (userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id) {
61
50
  setCreatedAppPanel(true);
@@ -70,8 +59,6 @@ var UserGroup = function UserGroup(props) {
70
59
  queryPanel(_objectSpread({}, queryParams));
71
60
  }, [queryParams]);
72
61
  useEffect(function () {
73
- // 密码正则
74
- companyId !== undefined && getPasswordRuleList(companyId);
75
62
  // 角色下拉数据
76
63
  queryRoleListByUserIdList(null);
77
64
  // 部门下拉数据
@@ -86,7 +73,7 @@ var UserGroup = function UserGroup(props) {
86
73
  }
87
74
  }).then(function (res) {
88
75
  if (res && (res === null || res === void 0 ? void 0 : res.data) && res.code === '101000') {
89
- var _res$data, _res$data$deptIds, _res$data2, _res$data2$roleIds, _res$data3;
76
+ var _res$data, _res$data$roleIds, _res$data2;
90
77
  var flattenArray = function flattenArray(array) {
91
78
  var flatArray = [];
92
79
  array.forEach(function (item) {
@@ -98,31 +85,22 @@ var UserGroup = function UserGroup(props) {
98
85
  });
99
86
  return flatArray;
100
87
  };
101
- var deptIdsList = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$deptIds = _res$data.deptIds) === null || _res$data$deptIds === void 0 ? void 0 : _res$data$deptIds.map(function (item) {
102
- var _flattenArray, _app$;
103
- var app = (_flattenArray = flattenArray(departmentList)) === null || _flattenArray === void 0 ? void 0 : _flattenArray.filter(function (v) {
104
- return v.id === item;
105
- });
106
- return (_app$ = app[0]) === null || _app$ === void 0 ? void 0 : _app$.id;
107
- });
108
- var roleIdsList = res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : (_res$data2$roleIds = _res$data2.roleIds) === null || _res$data2$roleIds === void 0 ? void 0 : _res$data2$roleIds.map(function (item) {
109
- var _app$2;
88
+ var roleIdsList = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$roleIds = _res$data.roleIds) === null || _res$data$roleIds === void 0 ? void 0 : _res$data$roleIds.map(function (item) {
89
+ var _app$;
110
90
  var app = userList === null || userList === void 0 ? void 0 : userList.filter(function (v) {
111
91
  return v.id === item;
112
92
  });
113
93
  return {
114
- id: (_app$2 = app[0]) === null || _app$2 === void 0 ? void 0 : _app$2.id
94
+ id: (_app$ = app[0]) === null || _app$ === void 0 ? void 0 : _app$.id
115
95
  };
116
96
  });
117
97
  form.setFieldsValue(_objectSpread(_objectSpread({}, res.data), {}, {
118
- deptIds: deptIdsList.filter(function (v) {
119
- return v !== undefined;
120
- }),
98
+ // deptIds: deptIdsList.filter((v: undefined) => v !== undefined),
121
99
  roleIds: roleIdsList.filter(function (v) {
122
100
  return v.id !== undefined;
123
101
  })
124
102
  }));
125
- setIsAdmin(res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.isAdmin);
103
+ setIsAdmin(res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.isAdmin);
126
104
  }
127
105
  }).catch(function (error) {
128
106
  console.log(error);
@@ -144,40 +122,15 @@ var UserGroup = function UserGroup(props) {
144
122
  console.log(error);
145
123
  });
146
124
  };
147
- var queryDeptListByUserIdList = function queryDeptListByUserIdList(id) {
148
- request(apis.setting.queryDeptListByUserId, {
149
- method: 'post',
150
- data: {
151
- id: id
152
- }
153
- }).then(function (res) {
154
- if (res && (res === null || res === void 0 ? void 0 : res.data) && res.code === '101000') {
155
- setDepartmentList(res === null || res === void 0 ? void 0 : res.data);
156
- } else {
157
- setDepartmentList([]);
158
- }
159
- }).catch(function (error) {
160
- console.log(error);
161
- });
162
- };
163
- var getPasswordRuleList = function getPasswordRuleList(id) {
164
- request(apis.setting.getPasswordRule, {
165
- method: 'get',
166
- params: {
167
- companyId: id
168
- }
169
- }).then(function (res) {
170
- if (res && (res === null || res === void 0 ? void 0 : res.data) && res.code === '101000') {
171
- setPasswordRule(res === null || res === void 0 ? void 0 : res.data);
172
- } else {
173
- setPasswordRule({
174
- rule: /^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9~!@#$%^&*]{8,20}$/,
175
- description: '请输入8-20个字符,可包括大小写字母和数字 特殊字符(!@#$%^&*)'
176
- });
177
- }
178
- }).catch(function (error) {
179
- console.log(error);
180
- });
125
+ //获取当前年月日
126
+ var getDate = function getDate() {
127
+ // 创建当前日期对象
128
+ var now = new Date();
129
+ // 获取年月日
130
+ var year = now.getFullYear();
131
+ var month = now.getMonth() + 1; // 月份从0开始，所以要+1
132
+ var date = now.getDate();
133
+ return "".concat(year).concat(month).concat(date);
181
134
  };
182
135
  // 编辑||创建
183
136
  var onFinish = function onFinish(value) {
@@ -185,6 +138,7 @@ var UserGroup = function UserGroup(props) {
185
138
  setCreateAppLoading(true);
186
139
  var msg = '';
187
140
  var params = _objectSpread(_objectSpread({}, value), {}, {
141
+ password: "ZG_".concat(value.email).concat(getDate()),
188
142
  id: userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id,
189
143
  roleIds: value === null || value === void 0 ? void 0 : (_value$roleIds = value.roleIds) === null || _value$roleIds === void 0 ? void 0 : _value$roleIds.map(function (item) {
190
144
  return item.id;
@@ -362,19 +316,6 @@ var UserGroup = function UserGroup(props) {
362
316
  value: 1
363
317
  }, "\u6B63\u5E38"), /*#__PURE__*/React.createElement(Radio, {
364
318
  value: 2
365
- }, "\u505C\u7528")))), !(userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id) && (/*#__PURE__*/React.createElement(Form.Item, {
366
- name: 'password',
367
- label: "\u5BC6\u7801",
368
- rules: [{
369
- required: true,
370
- message: '请输入密码'
371
- }, {
372
- pattern: new RegExp(passwordRule === null || passwordRule === void 0 ? void 0 : passwordRule.rule, 'g'),
373
- message: passwordRule === null || passwordRule === void 0 ? void 0 : passwordRule.description
374
- }]
375
- }, /*#__PURE__*/React.createElement(Input.Password, {
376
- maxLength: 50,
377
- placeholder: '请输入密码'
378
- })))))));
319
+ }, "\u505C\u7528"))))))));
379
320
  };
380
321
  export default UserGroup;
package/es/modules/createDemand/demo/selectPoint.js CHANGED
@@ -72,7 +72,7 @@ export default (function (props) {
72
72
  className: "".concat(classPrefix, "-header-back")
73
73
  }, /*#__PURE__*/React.createElement(IconFont, {
74
74
  type: "fanhuiicon"
75
- }), "\u8FD4\u56DE"), "\u57CB\u70B9\u5730\u56FE"), /*#__PURE__*/React.createElement("div", {
75
+ }), "\u8FD4\u56DE"), "\u81EA\u5B9A\u4E49\u57CB\u70B9\u5730\u56FE"), /*#__PURE__*/React.createElement("div", {
76
76
  className: "".concat(classPrefix, "-header-right")
77
77
  }, /*#__PURE__*/React.createElement(Button, {
78
78
  onClick: function onClick() {
package/es/modules/dealDemand/demo/selectPoint.js CHANGED
@@ -63,7 +63,7 @@ export default (function (props) {
63
63
  className: "".concat(classPrefix, "-header-back")
64
64
  }, /*#__PURE__*/React.createElement(IconFont, {
65
65
  type: "fanhuiicon"
66
- }), "\u8FD4\u56DE"), "\u57CB\u70B9\u5730\u56FE"), /*#__PURE__*/React.createElement("div", {
66
+ }), "\u8FD4\u56DE"), "\u81EA\u5B9A\u4E49\u57CB\u70B9\u5730\u56FE"), /*#__PURE__*/React.createElement("div", {
67
67
  className: "".concat(classPrefix, "-header-right")
68
68
  }, /*#__PURE__*/React.createElement(Button, {
69
69
  onClick: function onClick() {
package/es/modules/pointMap/tree.js CHANGED
@@ -743,7 +743,7 @@ var pointMap = function pointMap(props) {
743
743
  open: qrCodeShareShow,
744
744
  content: /*#__PURE__*/React.createElement("div", {
745
745
  className: "".concat(qrCodeLoading ? 'loading' : '', " qrcode-img")
746
- }, /*#__PURE__*/React.createElement("div", null, "\u624B\u673A\u626B\u7801\u67E5\u770B\u57CB\u70B9\u5730\u56FE"), /*#__PURE__*/React.createElement(Spin, {
746
+ }, /*#__PURE__*/React.createElement("div", null, "\u624B\u673A\u626B\u7801\u67E5\u770B\u81EA\u5B9A\u4E49\u57CB\u70B9\u5730\u56FE"), /*#__PURE__*/React.createElement(Spin, {
747
747
  spinning: qrCodeLoading
748
748
  }, qrCodeShare && /*#__PURE__*/React.createElement("img", {
749
749
  src: qrCodeShare
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-settings",
3
- "version": "2.1.0-zhongyuan.21",
3
+ "version": "2.1.0-zhongyuan.23",
4
4
  "private": false,
5
5
  "module": "es/index.js",
6
6
  "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
67
67
  "publishConfig": {
68
68
  "access": "public"
69
69
  },
70
- "gitHead": "aa46d7fb05bf927eef75e3aa99d526f45daba984",
70
+ "gitHead": "12c1d4ab5b6ebbeb66299e23aa8f9726672d02d8",
71
71
  "gitHooks": {
72
72
  "pre-commit": "lint-staged"
73
73
  }