diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index 15361d6..f91559f 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -668,7 +668,8 @@ const local: App.I18n.Schema = { sceneStatus: 'Please enter State', deadlineRequest: 'Please enter Call chain timeout', routeKey: 'Please enter Routing strategy', - backOff: 'Please enter Backoff strategy' + backOff: 'Please enter Backoff strategy', + sceneName2: '场景名称: 仅支持长度为:1~64位字符.格式为:数字、字母、下划线。' }, addScene: 'Add Scenes', editScene: 'Add Scenes', diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index afc7a32..39fa839 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -664,7 +664,8 @@ const local: App.I18n.Schema = { sceneStatus: '请输入状态', deadlineRequest: '请输入调用链超时时间', routeKey: '请输入路由策略', - backOff: '请输入退避策略' + backOff: '请输入退避策略', + sceneName2: '场景名称: 仅支持长度为:1~64位字符.格式为:数字、字母、下划线。' }, addScene: '新增场景', editScene: '编辑场景', diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts index 55c7546..774cb1a 100644 --- a/src/typings/app.d.ts +++ b/src/typings/app.d.ts @@ -837,6 +837,7 @@ declare namespace App { deadlineRequest: string; routeKey: string; backOff: string; + sceneName2: string; }; addScene: string; editScene: string; diff --git a/src/views/retry/scene/index.vue b/src/views/retry/scene/index.vue index 35e317e..f109225 100644 --- a/src/views/retry/scene/index.vue +++ b/src/views/retry/scene/index.vue @@ -150,18 +150,10 @@ const { handleAdd, handleEdit, checkedRowKeys, - onBatchDeleted, onDeleted // closeDrawer } = useTableOperate(data, getData); -async function handleBatchDelete() { - // request - console.log(checkedRowKeys.value); - - onBatchDeleted(); -} - function handleDelete(id: string) { // request console.log(id); @@ -189,8 +181,8 @@ function edit(id: string) { v-model:columns="columnChecks" :disabled-delete="checkedRowKeys.length === 0" :loading="loading" + :show-delete="false" @add="handleAdd" - @delete="handleBatchDelete" @refresh="getData" /> diff --git a/src/views/retry/scene/modules/scene-operate-drawer.vue b/src/views/retry/scene/modules/scene-operate-drawer.vue index 6067a12..dcd0e4f 100644 --- a/src/views/retry/scene/modules/scene-operate-drawer.vue +++ b/src/views/retry/scene/modules/scene-operate-drawer.vue @@ -102,17 +102,25 @@ type RuleKey = Extract< | 'routeKey' >; -const rules: Record = { - groupName: defaultRequiredRule, - sceneName: defaultRequiredRule, - sceneStatus: defaultRequiredRule, - backOff: defaultRequiredRule, - maxRetryCount: defaultRequiredRule, - triggerInterval: defaultRequiredRule, - deadlineRequest: defaultRequiredRule, - executorTimeout: defaultRequiredRule, - routeKey: defaultRequiredRule -}; +const rules = { + groupName: [defaultRequiredRule], + sceneName: [ + defaultRequiredRule, + { + required: true, + pattern: /^[A-Za-z0-9_]{1,64}$/, + trigger: 'change', + message: $t('page.retryScene.form.sceneName2') + } + ], + sceneStatus: [defaultRequiredRule], + backOff: [defaultRequiredRule], + maxRetryCount: [defaultRequiredRule], + triggerInterval: [defaultRequiredRule], + deadlineRequest: [defaultRequiredRule], + executorTimeout: [defaultRequiredRule], + routeKey: [defaultRequiredRule] +} satisfies Record; function handleUpdateModelWhenEdit() { if (props.operateType === 'add') { @@ -204,7 +212,13 @@ watch(visible, () => { - + @@ -221,6 +235,7 @@ watch(visible, () => { { v-if="model.backOff === 2 || model.backOff === 4" v-model:value="model.triggerInterval as any" :placeholder="$t('page.retryScene.form.triggerInterval')" + clearable /> @@ -257,6 +273,7 @@ watch(visible, () => { :min="1" :max="model.backOff === 1 ? 26 : 9999999" :placeholder="$t('page.retryScene.form.maxRetryCount')" + clearable /> @@ -265,6 +282,7 @@ watch(visible, () => { :min="1" :max="3600" :placeholder="$t('page.retryScene.form.executorTimeout')" + clearable /> @@ -273,13 +291,17 @@ watch(visible, () => { :min="100" :max="60000" :placeholder="$t('page.retryScene.form.deadlineRequest')" + clearable /> diff --git a/src/views/retry/scene/modules/scene-search.vue b/src/views/retry/scene/modules/scene-search.vue index 03904ca..68f0e72 100644 --- a/src/views/retry/scene/modules/scene-search.vue +++ b/src/views/retry/scene/modules/scene-search.vue @@ -1,5 +1,8 @@