简柏林 / thingskit-front · Commits

Commit 3560bf9702164a52a9ad59cf61ac1253ca64ec54

Authored by xp.Huang
2 parents 55d59692 d0de646d

Merge branch 'local_devbranch_byft' into 'main_dev' 

perf: 优化消息配置表单部分密码框处理

See merge request yunteng/thingskit-front!1093
Inline Side-by-side
Showing 3 changed files with 21 additions and 10 deletions
@@ -146,7 +146,7 @@ export const formSchema: FormSchema[] = [ @@ -146,7 +146,7 @@ export const formSchema: FormSchema[] = [
146 field: 'appId', 146 field: 'appId',
147 label: 'appId', 147 label: 'appId',
148 required: true, 148 required: true,
149 - component: 'Input', 149 + component: 'InputPassword',
150 componentProps: { 150 componentProps: {
151 maxLength: 36, 151 maxLength: 36,
152 placeholder: '请输入appId', 152 placeholder: '请输入appId',
@@ -157,7 +157,7 @@ export const formSchema: FormSchema[] = [ @@ -157,7 +157,7 @@ export const formSchema: FormSchema[] = [
157 field: 'secretId', 157 field: 'secretId',
158 label: 'secretId', 158 label: 'secretId',
159 required: true, 159 required: true,
160 - component: 'Input', 160 + component: 'InputPassword',
161 helpMessage: ['腾讯云：API密钥参考地址: https://console.cloud.tencent.com/cam/capi'], 161 helpMessage: ['腾讯云：API密钥参考地址: https://console.cloud.tencent.com/cam/capi'],
162 componentProps: { 162 componentProps: {
163 maxLength: 36, 163 maxLength: 36,
@@ -173,14 +173,14 @@ export const formSchema: FormSchema[] = [ @@ -173,14 +173,14 @@ export const formSchema: FormSchema[] = [
173 placeholder: '请输入secretKey', 173 placeholder: '请输入secretKey',
174 }, 174 },
175 175
176 - component: 'Input', 176 + component: 'InputPassword',
177 ifShow: ({ values }) => messageTypeIsTencentCloud(Reflect.get(values, 'platformType')), 177 ifShow: ({ values }) => messageTypeIsTencentCloud(Reflect.get(values, 'platformType')),
178 }, 178 },
179 { 179 {
180 field: 'accessKeyId', 180 field: 'accessKeyId',
181 label: 'accessKeyId', 181 label: 'accessKeyId',
182 required: true, 182 required: true,
183 - component: 'Input', 183 + component: 'InputPassword',
184 helpMessage: ['阿里云：API密钥参考地址：https://ram.console.aliyun.com/manage/ak'], 184 helpMessage: ['阿里云：API密钥参考地址：https://ram.console.aliyun.com/manage/ak'],
185 componentProps: { 185 componentProps: {
186 maxLength: 36, 186 maxLength: 36,
@@ -199,7 +199,7 @@ export const formSchema: FormSchema[] = [ @@ -199,7 +199,7 @@ export const formSchema: FormSchema[] = [
199 placeholder: '请输入accessKeySecret', 199 placeholder: '请输入accessKeySecret',
200 }, 200 },
201 201
202 - component: 'Input', 202 + component: 'InputPassword',
203 ifShow: ({ values }) => 203 ifShow: ({ values }) =>
204 isMessage(Reflect.get(values, 'messageType')) && 204 isMessage(Reflect.get(values, 'messageType')) &&
205 !messageTypeIsTencentCloud(Reflect.get(values, 'platformType')), 205 !messageTypeIsTencentCloud(Reflect.get(values, 'platformType')),
@@ -271,7 +271,7 @@ export const formSchema: FormSchema[] = [ @@ -271,7 +271,7 @@ export const formSchema: FormSchema[] = [
271 { 271 {
272 field: 'agentId', 272 field: 'agentId',
273 label: 'agentId', 273 label: 'agentId',
274 - component: 'Input', 274 + component: 'InputPassword',
275 required: true, 275 required: true,
276 ifShow: ({ values }) => isDingtalk(Reflect.get(values, 'messageType')), 276 ifShow: ({ values }) => isDingtalk(Reflect.get(values, 'messageType')),
277 componentProps: { 277 componentProps: {
@@ -282,7 +282,7 @@ export const formSchema: FormSchema[] = [ @@ -282,7 +282,7 @@ export const formSchema: FormSchema[] = [
282 { 282 {
283 field: 'clientId', 283 field: 'clientId',
284 label: 'clientId', 284 label: 'clientId',
285 - component: 'Input', 285 + component: 'InputPassword',
286 required: true, 286 required: true,
287 ifShow: ({ values }) => isDingtalk(Reflect.get(values, 'messageType')), 287 ifShow: ({ values }) => isDingtalk(Reflect.get(values, 'messageType')),
288 componentProps: { 288 componentProps: {
@@ -293,7 +293,7 @@ export const formSchema: FormSchema[] = [ @@ -293,7 +293,7 @@ export const formSchema: FormSchema[] = [
293 { 293 {
294 field: 'clientSecret', 294 field: 'clientSecret',
295 label: 'clientSecret', 295 label: 'clientSecret',
296 - component: 'Input', 296 + component: 'InputPassword',
297 ifShow: ({ values }) => isDingtalk(Reflect.get(values, 'messageType')), 297 ifShow: ({ values }) => isDingtalk(Reflect.get(values, 'messageType')),
298 required: true, 298 required: true,
299 componentProps: { 299 componentProps: {
@@ -201,14 +201,25 @@ @@ -201,14 +201,25 @@
201 * username和password 存在则是邮件配置 201 * username和password 存在则是邮件配置
202 * secretId和secretKey 存在则是腾讯云配置信息 202 * secretId和secretKey 存在则是腾讯云配置信息
203 * accessKeyId和accessKeySecret 存在则是阿里云配置信息 203 * accessKeyId和accessKeySecret 存在则是阿里云配置信息
  204 + * clientId和clientSecret 存在则是钉钉配置信息
204 */ 205 */
205 - const { username, password, secretId, secretKey, accessKeyId, accessKeySecret } = e; 206 + const {
  207 + username,
  208 + password,
  209 + secretId,
  210 + secretKey,
  211 + accessKeyId,
  212 + accessKeySecret,
  213 + clientId,
  214 + clientSecret,
  215 + } = e;
206 return JSON.parse( 216 return JSON.parse(
207 JSON.stringify({ 217 JSON.stringify({
208 ...e, 218 ...e,
209 ...handleStandardLength('username', 'password', username, password), 219 ...handleStandardLength('username', 'password', username, password),
210 ...handleStandardLength('secretId', 'secretKey', secretId, secretKey), 220 ...handleStandardLength('secretId', 'secretKey', secretId, secretKey),
211 ...handleStandardLength('accessKeyId', 'accessKeySecret', accessKeyId, accessKeySecret), 221 ...handleStandardLength('accessKeyId', 'accessKeySecret', accessKeyId, accessKeySecret),
  222 + ...handleStandardLength('clientId', 'clientSecret', clientId, clientSecret),
212 }) 223 })
213 ); 224 );
214 }; 225 };
@@ -13,7 +13,7 @@ export enum PermissionDataFlowEnum { @@ -13,7 +13,7 @@ export enum PermissionDataFlowEnum {
13 13
14 //业务文字描述配置枚举 14 //业务文字描述配置枚举
15 export enum BusinessDataFlowTextEnum { 15 export enum BusinessDataFlowTextEnum {
16 - BUSINESS_ADD_TEXT = '添加流转', 16 + BUSINESS_ADD_TEXT = '新增流转',
17 BUSINESS_DELETE_TEXT = '批量删除', 17 BUSINESS_DELETE_TEXT = '批量删除',
18 BUSINESS_ENABLE_TEXT = '批量启用', 18 BUSINESS_ENABLE_TEXT = '批量启用',
19 BUSINESS_UPDATE_TEXT = '编辑', 19 BUSINESS_UPDATE_TEXT = '编辑',