diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index 2d6a975..1fb829f 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -523,7 +523,9 @@ const local: App.I18n.Schema = { groupPartition: 'Please select Group partition', initScene: 'Initialized scene', collapseCommon: 'Common config', - collapseRetry: 'Retry config' + collapseRetry: 'Retry config', + groupNameRule: + 'Group name: Must be between 1 and 64 characters in length. Format: numbers, letters, underscores, or hyphens.' }, idMode: { idWorker: 'Id Workder', @@ -876,7 +878,7 @@ const local: App.I18n.Schema = { deadlineRequest: 'Please enter Call chain timeout(ms)', routeKey: 'Please enter Routing strategy', backOff: 'Please enter Backoff strategy', - sceneName2: 'Scene name: 1~64 characters. allowing: digit, letters and underscore.' + sceneName2: 'Scene name: 1~64 characters. allowing: digit, letters, underscore or hyphens..' }, addScene: 'Add Scenes', editScene: 'Add Scenes', diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index 55f29d2..1f29627 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -531,7 +531,8 @@ const local: App.I18n.Schema = { groupPartition: '分区', initScene: '初始化场景', collapseCommon: '通用配置', - collapseRetry: '重试配置' + collapseRetry: '重试配置', + groupNameRule: '组名称: 仅支持长度为:1~64位字符.格式为:数字、字母、下划线、短横线。' }, idMode: { idWorker: '雪花算法', @@ -884,7 +885,7 @@ const local: App.I18n.Schema = { deadlineRequest: '请输入调用链超时时间(毫秒)', routeKey: '请输入路由策略', backOff: '请输入退避策略', - sceneName2: '场景名称: 仅支持长度为:1~64位字符.格式为:数字、字母、下划线。' + sceneName2: '场景名称: 仅支持长度为:1~64位字符.格式为:数字、字母、下划线和中横线。' }, addScene: '新增场景', editScene: '编辑场景', diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts index 136a479..97adfe1 100644 --- a/src/typings/app.d.ts +++ b/src/typings/app.d.ts @@ -671,6 +671,7 @@ declare namespace App { initScene: string; collapseCommon: string; collapseRetry: string; + groupNameRule: string; }; idMode: { idWorker: string; diff --git a/src/views/group/modules/group-operate-drawer.vue b/src/views/group/modules/group-operate-drawer.vue index 14db595..56fff7c 100644 --- a/src/views/group/modules/group-operate-drawer.vue +++ b/src/views/group/modules/group-operate-drawer.vue @@ -66,14 +66,31 @@ type RuleKey = Extract< 'groupName' | 'token' | 'groupStatus' | 'idGeneratorMode' | 'initScene' | 'groupPartition' >; -const rules: Record = { - groupName: defaultRequiredRule, - token: defaultRequiredRule, - groupStatus: defaultRequiredRule, - idGeneratorMode: defaultRequiredRule, - initScene: defaultRequiredRule, - groupPartition: defaultRequiredRule -}; +// const rules: Record = { +// groupName: defaultRequiredRule, +// token: defaultRequiredRule, +// groupStatus: defaultRequiredRule, +// idGeneratorMode: defaultRequiredRule, +// initScene: defaultRequiredRule, +// groupPartition: defaultRequiredRule +// }; + +const rules = { + groupName: [ + defaultRequiredRule, + { + required: true, + pattern: /^[A-Za-z0-9_-]{1,64}$/, + trigger: 'change', + message: $t('page.groupConfig.form.groupNameRule') + } + ], + token: [defaultRequiredRule], + groupStatus: [defaultRequiredRule], + idGeneratorMode: [defaultRequiredRule], + initScene: [defaultRequiredRule], + groupPartition: [defaultRequiredRule] +} satisfies Record; function handleUpdateModelWhenEdit() { if (props.operateType === 'add') { diff --git a/src/views/retry/scene/modules/scene-operate-drawer.vue b/src/views/retry/scene/modules/scene-operate-drawer.vue index 5a9e51b..669fdc2 100644 --- a/src/views/retry/scene/modules/scene-operate-drawer.vue +++ b/src/views/retry/scene/modules/scene-operate-drawer.vue @@ -107,7 +107,7 @@ const rules = { defaultRequiredRule, { required: true, - pattern: /^[A-Za-z0-9_]{1,64}$/, + pattern: /^[A-Za-z0-9_-]{1,64}$/, trigger: 'change', message: $t('page.retryScene.form.sceneName2') }