diff --git a/frontend/src/components/pure/ms-advance-filter/type.ts b/frontend/src/components/pure/ms-advance-filter/type.ts index e0dfdcddb2..e12b384f1c 100644 --- a/frontend/src/components/pure/ms-advance-filter/type.ts +++ b/frontend/src/components/pure/ms-advance-filter/type.ts @@ -30,6 +30,7 @@ export enum BackEndEnum { STRING = 'string', ARRAY = 'array', TIME = 'time', + NUMBER = 'number', } export enum FilterType { diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue index 094e52a2b6..2f1ad32eb7 100644 --- a/frontend/src/components/pure/ms-table/base-table.vue +++ b/frontend/src/components/pure/ms-table/base-table.vue @@ -205,6 +205,7 @@ { - const currentId = ref(ALL_PARAM); - const getCurrentId = computed(() => currentId.value); - function setCurrentId(id: string | number) { - currentId.value = id; +const useProjectEnvStore = defineStore( + 'projectEnv', + () => { + const currentId = ref(1); + const httpNoWarning = ref(true); + const getCurrentId = computed(() => currentId.value); + const getHttpNoWarning = computed(() => httpNoWarning.value); + function setCurrentId(id: string | number) { + currentId.value = id; + } + function setHttpNoWarning(noWarning: boolean) { + httpNoWarning.value = noWarning; + } + return { getCurrentId, currentId, httpNoWarning, setCurrentId, setHttpNoWarning, getHttpNoWarning }; + }, + { + persist: { + key: 'projectEnv', + paths: ['httpNoWarning'], + }, } - return { currentId, getCurrentId, setCurrentId }; -}); +); export default useProjectEnvStore; diff --git a/frontend/src/views/bug-management/index.vue b/frontend/src/views/bug-management/index.vue index d3222a0929..34b07858a8 100644 --- a/frontend/src/views/bug-management/index.vue +++ b/frontend/src/views/bug-management/index.vue @@ -123,7 +123,7 @@ import { Message, TableData } from '@arco-design/web-vue'; import { MsAdvanceFilter, timeSelectOptions } from '@/components/pure/ms-advance-filter'; - import { FilterFormItem, FilterResult, FilterType } from '@/components/pure/ms-advance-filter/type'; + import { BackEndEnum, FilterFormItem, FilterResult, FilterType } from '@/components/pure/ms-advance-filter/type'; import MsButton from '@/components/pure/ms-button/index.vue'; import MsCard from '@/components/pure/ms-card/index.vue'; import MsExportDrawer from '@/components/pure/ms-export-drawer/index.vue'; @@ -206,6 +206,7 @@ title: 'bugManagement.ID', dataIndex: 'num', type: FilterType.INPUT, + backendType: BackEndEnum.NUMBER, }, { title: 'bugManagement.bugName', @@ -213,6 +214,16 @@ type: FilterType.SELECT, selectProps: { mode: 'static', + options: [ + { + label: 'title', + value: 'title', + }, + { + label: 'name', + value: 'name', + }, + ], }, }, { diff --git a/frontend/src/views/project-management/environmental/components/AllParamBox.vue b/frontend/src/views/project-management/environmental/components/AllParamBox.vue index 40cc3ac1ff..374e947cea 100644 --- a/frontend/src/views/project-management/environmental/components/AllParamBox.vue +++ b/frontend/src/views/project-management/environmental/components/AllParamBox.vue @@ -11,7 +11,7 @@ - - diff --git a/frontend/src/views/project-management/environmental/components/allParams/AllParamsTable.vue b/frontend/src/views/project-management/environmental/components/allParams/AllParamsTable.vue index a9f14e83ea..361bbe4d1d 100644 --- a/frontend/src/views/project-management/environmental/components/allParams/AllParamsTable.vue +++ b/frontend/src/views/project-management/environmental/components/allParams/AllParamsTable.vue @@ -42,18 +42,20 @@ />