From 26c12b490617384d819badce06b3523b762aa485 Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Fri, 13 Mar 2026 14:16:43 +0800 Subject: [PATCH] fix(system variables): Both data sources and system variables now include icons displaying field types. --- frontend/src/assets/svg/field_text.svg | 1 + frontend/src/assets/svg/field_time.svg | 1 + frontend/src/assets/svg/field_value.svg | 1 + frontend/src/style.less | 10 +++++ frontend/src/views/ds/DataTable.vue | 31 +++++++++++++- .../permission/auth-tree/FilterFiled.vue | 16 ++++++++ frontend/src/views/system/user/User.vue | 21 ++++++++++ frontend/src/views/system/variables/index.vue | 40 +++++++++++++++++-- 8 files changed, 117 insertions(+), 4 deletions(-) create mode 100644 frontend/src/assets/svg/field_text.svg create mode 100644 frontend/src/assets/svg/field_time.svg create mode 100644 frontend/src/assets/svg/field_value.svg diff --git a/frontend/src/assets/svg/field_text.svg b/frontend/src/assets/svg/field_text.svg new file mode 100644 index 000000000..16fa77815 --- /dev/null +++ b/frontend/src/assets/svg/field_text.svg @@ -0,0 +1 @@ + diff --git a/frontend/src/assets/svg/field_time.svg b/frontend/src/assets/svg/field_time.svg new file mode 100644 index 000000000..b5c0c4e47 --- /dev/null +++ b/frontend/src/assets/svg/field_time.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/svg/field_value.svg b/frontend/src/assets/svg/field_value.svg new file mode 100644 index 000000000..b907e4f6d --- /dev/null +++ b/frontend/src/assets/svg/field_value.svg @@ -0,0 +1 @@ + diff --git a/frontend/src/style.less b/frontend/src/style.less index 05e5b8b8c..3798d8be9 100644 --- a/frontend/src/style.less +++ b/frontend/src/style.less @@ -419,3 +419,13 @@ strong { margin-top: -7px; } } + +.text-variables.text-variables { + color: #3370ff; +} +.number-variables.number-variables { + color: #04b49c; +} +.datetime-variables.datetime-variables { + color: #3370ff; +} diff --git a/frontend/src/views/ds/DataTable.vue b/frontend/src/views/ds/DataTable.vue index 9af6d14a7..1458ae4ad 100644 --- a/frontend/src/views/ds/DataTable.vue +++ b/frontend/src/views/ds/DataTable.vue @@ -190,6 +190,15 @@ const editTable = () => { tableComment.value = currentTable.value.custom_comment tableDialog.value = true } +const changeChecked = () => { + datasourceApi.saveTable(currentTable.value).then(() => { + ElMessage({ + message: t('common.save_success'), + type: 'success', + showClose: true, + }) + }) +} const saveTable = () => { currentTable.value.custom_comment = tableComment.value datasourceApi.saveTable(currentTable.value).then(() => { @@ -473,7 +482,27 @@ const btnSelectClick = (val: any) => { class="info-table" >
-
{{ currentTable.table_name }}
+
+ {{ currentTable.table_name }} +
+ + + {{ currentTable.checked ? t('user.disable') : t('user.enable') }} +
+
{{ $t('about.remark') }}: {{ diff --git a/frontend/src/views/system/permission/auth-tree/FilterFiled.vue b/frontend/src/views/system/permission/auth-tree/FilterFiled.vue index 1b335eb89..a03da1f7c 100644 --- a/frontend/src/views/system/permission/auth-tree/FilterFiled.vue +++ b/frontend/src/views/system/permission/auth-tree/FilterFiled.vue @@ -4,6 +4,10 @@ import { ref, inject, computed, onBeforeMount, toRefs, type Ref, shallowRef } fr import { variablesApi } from '@/api/variables' import { useI18n } from 'vue-i18n' import { allOptions } from '../options' +import field_text from '@/assets/svg/field_text.svg' +import field_time from '@/assets/svg/field_time.svg' +import field_value from '@/assets/svg/field_value.svg' + export interface Item { term: string field_id: string @@ -118,6 +122,12 @@ const initEnumOptions = () => { console.info('initEnumOptions') } +const iconMap = { + text: field_text, + number: field_value, + datetime: field_time, +} + const selectItem = ({ field_name, id }: any) => { Object.assign(item.value, { field_id: id, @@ -248,6 +258,12 @@ const emits = defineEmits(['update:item', 'del']) :placeholder="t('datasource.Please_select')" > +
+ + + + {{ ele.name }} +
diff --git a/frontend/src/views/system/user/User.vue b/frontend/src/views/system/user/User.vue index 2773be9dd..cf7b44191 100644 --- a/frontend/src/views/system/user/User.vue +++ b/frontend/src/views/system/user/User.vue @@ -393,6 +393,18 @@ :label="item.name" :value="item.id" > +
+ + + + {{ item.name }} +
([ { type: 'enum', diff --git a/frontend/src/views/system/variables/index.vue b/frontend/src/views/system/variables/index.vue index 6f92b191a..94461dc96 100644 --- a/frontend/src/views/system/variables/index.vue +++ b/frontend/src/views/system/variables/index.vue @@ -7,6 +7,9 @@ import IconOpeDelete from '@/assets/svg/icon_delete.svg' import icon_searchOutline_outlined from '@/assets/svg/icon_search-outline_outlined.svg' import EmptyBackground from '@/views/dashboard/common/EmptyBackground.vue' import { useI18n } from 'vue-i18n' +import field_text from '@/assets/svg/field_text.svg' +import field_time from '@/assets/svg/field_time.svg' +import field_value from '@/assets/svg/field_value.svg' import { cloneDeep } from 'lodash-es' interface Form { @@ -21,6 +24,11 @@ const multipleSelectionAll = ref([]) const keywords = ref('') const oldKeywords = ref('') const searchLoading = ref(false) +const iconMap = { + text: field_text, + number: field_value, + datetime: field_time, +} const selectable = (row: any) => { return ![1, 2, 3].includes(row.id) @@ -322,7 +330,30 @@ const handleCurrentChange = (val: number) => {