diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index d604ad2..664decb 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -502,7 +502,9 @@ const local: App.I18n.Schema = { form: { name: 'Please enter name', keyword: 'Please enter name/uniqueId', - uniqueId: 'Please enter Unique ID' + uniqueId: 'Please enter Unique ID', + uniqueIdRule: + 'Must be between 1 and 64 characters in length. Format: numbers, letters, underscores, or hyphens.' }, addNamespace: 'Add Namespace', editNamespace: 'Edit Namespace' diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index ea532ae..3172b0c 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -510,7 +510,8 @@ const local: App.I18n.Schema = { form: { name: '请输入空间名称', keyword: '请输入空间名称/唯一标识', - uniqueId: '请输入唯一标识' + uniqueId: '请输入唯一标识', + uniqueIdRule: '仅支持长度为:1~64位字符.格式为:数字、字母、下划线、短横线。' }, addNamespace: '新增命名空间', editNamespace: '编辑命名空间' diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts index 13a4942..a6dae71 100644 --- a/src/typings/app.d.ts +++ b/src/typings/app.d.ts @@ -649,6 +649,7 @@ declare namespace App { name: string; keyword: string; uniqueId: string; + uniqueIdRule: string; }; addNamespace: string; editNamespace: string; diff --git a/src/views/group/index.vue b/src/views/group/index.vue index b59a7dc..32f35f5 100644 --- a/src/views/group/index.vue +++ b/src/views/group/index.vue @@ -27,7 +27,8 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP apiParams: { page: 1, size: 10, - groupName: null + groupName: null, + groupStatus: null }, columns: () => [ { diff --git a/src/views/group/modules/group-search.vue b/src/views/group/modules/group-search.vue index 0b12033..66406b0 100644 --- a/src/views/group/modules/group-search.vue +++ b/src/views/group/modules/group-search.vue @@ -35,6 +35,7 @@ function search() { v-model:value="model.groupStatus" :placeholder="$t('page.groupConfig.form.groupStatus')" :options="translateOptions(groupConfigStatusOptions)" + clearable /> diff --git a/src/views/namespace/index.vue b/src/views/namespace/index.vue index 3124484..f11a0be 100644 --- a/src/views/namespace/index.vue +++ b/src/views/namespace/index.vue @@ -14,15 +14,15 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP apiParams: { page: 1, size: 10, - keyword: undefined + keyword: null }, columns: () => [ - { - key: 'index', - title: $t('common.index'), - align: 'center', - width: 64 - }, + // { + // key: 'index', + // title: $t('common.index'), + // align: 'center', + // width: 64 + // }, { key: 'name', title: $t('page.namespace.name'), diff --git a/src/views/namespace/modules/namespace-operate-drawer.vue b/src/views/namespace/modules/namespace-operate-drawer.vue index ee446f7..ff233c7 100644 --- a/src/views/namespace/modules/namespace-operate-drawer.vue +++ b/src/views/namespace/modules/namespace-operate-drawer.vue @@ -49,10 +49,16 @@ function createDefaultModel(): Model { }; } -type RuleKey = Extract; +type RuleKey = Extract; const rules: Record = { - name: defaultRequiredRule + name: defaultRequiredRule, + uniqueId: { + required: false, + pattern: /^[A-Za-z0-9_-]{1,64}$/, + trigger: 'change', + message: $t('page.namespace.form.uniqueIdRule') + } }; function handleUpdateModelWhenEdit() { diff --git a/src/views/retry/scene/modules/scene-search.vue b/src/views/retry/scene/modules/scene-search.vue index d86f057..f553dc7 100644 --- a/src/views/retry/scene/modules/scene-search.vue +++ b/src/views/retry/scene/modules/scene-search.vue @@ -39,6 +39,7 @@ function search() { v-model:value="model.sceneStatus" :placeholder="$t('page.jobTask.form.jobStatus')" :options="translateOptions(enableStatusNumberOptions)" + clearable /> diff --git a/src/views/user/manager/index.vue b/src/views/user/manager/index.vue index fd0a8c5..b25e04e 100644 --- a/src/views/user/manager/index.vue +++ b/src/views/user/manager/index.vue @@ -110,7 +110,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP edit(row.id!)}> {$t('common.edit')} - {row.id === '1' ? ( + {(row.id as any) !== 1 ? ( <> handleDelete(row.id!)}>