Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix: default value input not response for the 1st input value (#17762)
ecmadao8660b42e570d
diff --git a/frontend/src/components/SchemaEditorLite/Modals/ColumnDefaultValueExpressionModal.vue b/frontend/src/components/SchemaEditorLite/Modals/ColumnDefaultValueExpressionModal.vuedeleted file mode 100644index 58c3d7b7bb..0000000000--- a/frontend/src/components/SchemaEditorLite/Modals/ColumnDefaultValueExpressionModal.vue+++ /dev/null@@ -1,73 +0,0 @@-<template>- <BBModal- :title="$t('schema-editor.default.expression')"- class="shadow-inner outline outline-gray-200"- @close="dismissModal"- >- <div class="w-72">- <NInput- ref="inputRef"- v-model:value="state.expression"- class="my-2"- :autofocus="true"- />- </div>- <div class="w-full flex items-center justify-end mt-2 space-x-3">- <NButton @click="dismissModal">- {{ $t("common.cancel") }}- </NButton>- <NButton type="primary" @click="handleConfirmButtonClick">- {{ $t("common.save") }}- </NButton>- </div>- </BBModal>-</template>--<script lang="ts" setup>-import type { InputInst } from "naive-ui";-import { NButton, NInput } from "naive-ui";-import { onMounted, reactive, ref } from "vue";-import { BBModal } from "@/bbkit";-import { useNotificationStore } from "@/store";--interface LocalState {- expression: string;-}--const props = defineProps<{- expression?: string;-}>();--const emit = defineEmits<{- (event: "close"): void;- (event: "update:expression", value: string): void;-}>();--const inputRef = ref<InputInst>();-const notificationStore = useNotificationStore();-const state = reactive<LocalState>({- expression: props.expression || "",-});--const handleConfirmButtonClick = async () => {- if (!state.expression) {- notificationStore.pushNotification({- module: "bytebase",- style: "CRITICAL",- title: "Expression cannot be empty",- });- return;- }-- emit("update:expression", state.expression);- dismissModal();-};--const dismissModal = () => {- emit("close");-};--onMounted(() => {- inputRef.value?.focus();-});-</script>diff --git a/frontend/src/components/SchemaEditorLite/Panels/TableColumnEditor/TableColumnEditor.vue b/frontend/src/components/SchemaEditorLite/Panels/TableColumnEditor/TableColumnEditor.vueindex e7d0d2dba4..153fdef72b 100644--- a/frontend/src/components/SchemaEditorLite/Panels/TableColumnEditor/TableColumnEditor.vue+++ b/frontend/src/components/SchemaEditorLite/Panels/TableColumnEditor/TableColumnEditor.vue@@ -24,13 +24,6 @@/></div>- <ColumnDefaultValueExpressionModal- v-if="editColumnDefaultValueExpressionContext"- :expression="editColumnDefaultValueExpressionContext.default"- @close="editColumnDefaultValueExpressionContext = undefined"- @update:expression="handleSelectColumnDefaultValueExpression"- />-<SemanticTypesDrawerv-if="state.pendingUpdateColumn":show="state.showSemanticTypesDrawer"@@ -80,10 +73,9 @@ import type {} from "@/types/proto-es/v1/database_service_pb";import { Setting_SettingName } from "@/types/proto-es/v1/setting_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";-import ColumnDefaultValueExpressionModal from "../../Modals/ColumnDefaultValueExpressionModal.vue";import { useSchemaEditorContext } from "../../context";import type { EditStatus } from "../../types";-import type { DefaultValueOption } from "../../utils";+import type { DefaultValue } from "../../utils";import { markUUID } from "../common";import {DataTypeCell,@@ -201,7 +193,6 @@ const tableBodyHeight = computed(() => {const layoutReady = computed(() => tableHeaderHeight.value > 0);const { t } = useI18n();const settingStore = useSettingV1Store();-const editColumnDefaultValueExpressionContext = ref<ColumnMetadata>();const metadataForColumn = (column: ColumnMetadata) => {return {@@ -449,9 +440,7 @@ const columns = computed(() => {return h(DefaultValueCell, {column,disabled: props.readonly || props.disableAlterColumn(column),- engine: props.engine,- onInput: (value) => handleColumnDefaultInput(column, value),- onSelect: (option) => handleColumnDefaultSelect(column, option),+ onUpdate: (option) => handleColumnDefaultSelect(column, option),});},},@@ -635,48 +624,11 @@ const schemaTemplateColumnTypes = computed(() => {return [];});-const handleColumnDefaultInput = (column: ColumnMetadata, value: string) => {- if (!column.hasDefault) return;- if (column.default === "NULL") return;-- column.default = value;- markColumnStatus(column, "updated");-};-const handleColumnDefaultSelect = (column: ColumnMetadata,- option: DefaultValueOption+ defaultValue: DefaultValue) => {- const defaults = option.value;- if (!defaults.hasDefault) {- Object.assign(column, defaults);- markColumnStatus(column, "updated");- return;- }- if (defaults.default === "NULL") {- Object.assign(column, defaults);- markColumnStatus(column, "updated");- return;- }- if (typeof defaults.default === "string") {- Object.assign(column, {- ...defaults,- // copy current editing string to column.default- default: column.default ?? defaults.default ?? "",- });- markColumnStatus(column, "updated");- return;- }-};--const handleSelectColumnDefaultValueExpression = (expression: string) => {- const column = editColumnDefaultValueExpressionContext.value;- if (!column) {- return;- }- column.hasDefault = true;- column.default = expression;-+ Object.assign(column, defaultValue);markColumnStatus(column, "updated");};diff --git a/frontend/src/components/SchemaEditorLite/Panels/TableColumnEditor/components/DefaultValueCell.vue b/frontend/src/components/SchemaEditorLite/Panels/TableColumnEditor/components/DefaultValueCell.vueindex a08895d1ea..2a2dc87fe6 100644--- a/frontend/src/components/SchemaEditorLite/Panels/TableColumnEditor/components/DefaultValueCell.vue+++ b/frontend/src/components/SchemaEditorLite/Panels/TableColumnEditor/components/DefaultValueCell.vue@@ -1,177 +1,41 @@<template>- <!-- TODO: When all engines migrate to simplified input, replace NInput with InlineInput component --><NInput- v-if="useSimpleInput"ref="inputRef"- :value="simpleInputValue"- :placeholder="simpleInputPlaceholder"+ :value="column.default"+ :placeholder="$t('schema-editor.default.placeholder')":disabled="disabled":style="simpleInputStyle"@focus="focused = true"@blur="focused = false"@update:value="handleSimpleInput"/>-- <NDropdown- v-else- trigger="click"- placement="bottom-start"- :value="dropdownValue"- :options="options"- :consistent-menu-width="false"- :disabled="disabled"- class="bb-schema-editor--column-default-value-select"- style="max-height: 20rem; overflow-y: auto; overflow-x: hidden"- @select="handleSelect"- >- <NInput- ref="inputRef"- :value="inputValue"- :placeholder="placeholder"- :disabled="inputDisabled"- :style="inputStyle"- @focus="focused = true"- @blur="focused = false"- @update:value="handleInput"- >- <template #suffix>- <!-- use the same icon and style with NSelect -->- <NElement- v-if="!disabled"- tag="button"- class="absolute top-1/2 right-[3px] -translate-y-1/2"- :class="[- disabled- ? 'text-[var(--placeholder-color-disabled)] cursor-not-allowed'- : 'text-[var(--placeholder-color)] hover:text-[var(--primary-color-hover)] cursor-pointer',- ]"- >- <svg- viewBox="0 0 16 16"- fill="none"- xmlns="http://www.w3.org/2000/svg"- class="w-4 h-4"- >- <path- d="M3.14645 5.64645C3.34171 5.45118 3.65829 5.45118 3.85355 5.64645L8 9.79289L12.1464 5.64645C12.3417 5.45118 12.6583 5.45118 12.8536 5.64645C13.0488 5.84171 13.0488 6.15829 12.8536 6.35355L8.35355 10.8536C8.15829 11.0488 7.84171 11.0488 7.64645 10.8536L3.14645 6.35355C2.95118 6.15829 2.95118 5.84171 3.14645 5.64645Z"- fill="currentColor"- ></path>- </svg>- </NElement>- </template>- </NInput>- </NDropdown></template><script lang="ts" setup>-import {- type InputInst,- type SelectOption,- NDropdown,- NElement,- NInput,-} from "naive-ui";+import { type InputInst, NInput } from "naive-ui";import type { CSSProperties } from "vue";-import { computed, ref, watch } from "vue";-import { useI18n } from "vue-i18n";-import type { DefaultValueOption } from "@/components/SchemaEditorLite/utils";-import {- DEFAULT_EXPRESSION_OPTION,- DEFAULT_NULL_OPTION,- DEFAULT_STRING_OPTION,- NO_DEFAULT_OPTION,- getColumnDefaultDisplayString,- getColumnDefaultValuePlaceholder,-} from "@/components/SchemaEditorLite/utils";-import { Engine } from "@/types/proto-es/v1/common_pb";+import { computed, ref } from "vue";+import type { DefaultValue } from "@/components/SchemaEditorLite/utils";import type { ColumnMetadata } from "@/types/proto-es/v1/database_service_pb";-type DefaultValueSelectOption = SelectOption & {- value: string;- defaults: DefaultValueOption;-};+const props = withDefaults(+ defineProps<{+ column: ColumnMetadata;+ disabled?: boolean;+ border?: string;+ }>(),+ {+ border: "none",+ }+);-const props = defineProps<{- column: ColumnMetadata;- engine: Engine;- disabled?: boolean;-}>();const emit = defineEmits<{- (event: "input", value: string): void;- (event: "select", option: DefaultValueOption): void;+ (event: "update", option: DefaultValue): void;}>();-const { t } = useI18n();const focused = ref(false);const inputRef = ref<InputInst>();-const dropdownValue = computed(() => {- const { hasDefault, default: defaultString } = props.column;- if (!hasDefault) return "no-default";- if (defaultString === "NULL") return "null";- if (typeof defaultString === "string") return "string";- return null;-});--const inputValue = computed(() => {- return getColumnDefaultDisplayString(props.column) ?? null;-});--const placeholder = computed(() => {- return getColumnDefaultValuePlaceholder(props.column);-});--// Computed property for engines that use simple input (all migrated engines)-const useSimpleInput = computed(() => {- return (- props.engine === Engine.POSTGRES ||- props.engine === Engine.MYSQL ||- props.engine === Engine.MSSQL ||- props.engine === Engine.ORACLE ||- props.engine === Engine.TIDB ||- props.engine === Engine.MARIADB ||- props.engine === Engine.OCEANBASE ||- props.engine === Engine.SNOWFLAKE ||- props.engine === Engine.CLICKHOUSE ||- props.engine === Engine.COCKROACHDB ||- props.engine === Engine.SPANNER ||- props.engine === Engine.BIGQUERY ||- props.engine === Engine.REDSHIFT ||- props.engine === Engine.STARROCKS ||- props.engine === Engine.DORIS- );-});--const simpleInputValue = computed(() => {- // For all migrated engines, we use defaultString field which contains the properly formatted expression- if (- props.engine === Engine.POSTGRES ||- props.engine === Engine.MYSQL ||- props.engine === Engine.MSSQL ||- props.engine === Engine.ORACLE ||- props.engine === Engine.TIDB ||- props.engine === Engine.MARIADB ||- props.engine === Engine.OCEANBASE ||- props.engine === Engine.SNOWFLAKE ||- props.engine === Engine.CLICKHOUSE ||- props.engine === Engine.COCKROACHDB ||- props.engine === Engine.SPANNER ||- props.engine === Engine.BIGQUERY ||- props.engine === Engine.REDSHIFT ||- props.engine === Engine.STARROCKS ||- props.engine === Engine.DORIS- ) {- return props.column.default || "";- }- return "";-});--const simpleInputPlaceholder = computed(() => {- return t("schema-editor.default.placeholder");-});--// TODO: This styling mimics InlineInput component. When all engines use simplified input,-// replace NInput + simpleInputStyle with InlineInput component directlyconst simpleInputStyle = computed(() => {const style: CSSProperties = {cursor: "default",@@ -183,123 +47,18 @@ const simpleInputStyle = computed(() => {};const border = focused.value? "1px solid rgb(var(--color-control-border))"- : "none";+ : props.border;style["--n-border"] = border;style["--n-border-disabled"] = border;return style;});-const options = computed((): DefaultValueSelectOption[] => {- return [- {- key: NO_DEFAULT_OPTION.key,- value: NO_DEFAULT_OPTION.key,- label: t("schema-editor.default.no-default"),- defaults: NO_DEFAULT_OPTION,- },- {- key: DEFAULT_NULL_OPTION.key,- value: DEFAULT_NULL_OPTION.key,- label: t("schema-editor.default.null"),- defaults: DEFAULT_NULL_OPTION,- disabled: !props.column.nullable,- },- {- key: DEFAULT_STRING_OPTION.key,- value: DEFAULT_STRING_OPTION.key,- label: t("schema-editor.default.value"),- defaults: DEFAULT_STRING_OPTION,- },- {- key: DEFAULT_EXPRESSION_OPTION.key,- value: DEFAULT_EXPRESSION_OPTION.key,- label: t("schema-editor.default.expression"),- defaults: DEFAULT_EXPRESSION_OPTION,- },- ];-});--const inputDisabled = computed(() => {- return props.disabled;-});--const handleSelect = (value: string) => {- const option = options.value.find((opt) => opt.value === value);- if (!option) {- return;- }-- const { defaults } = option;- emit("select", defaults);-- if (typeof defaults.value.default === "string") {- requestAnimationFrame(() => {- inputRef.value?.focus();- });- }-};--const handleInput = (value: string) => {- if (dropdownValue.value === "no-default" || dropdownValue.value === "null") {- handleSelect("string");- }- emit("input", value);-};-const handleSimpleInput = (value: string) => {- // Emit the value for the input handler- emit("input", value);-- // Also emit a select event to maintain consistency with the existing API- const defaultOption = {- key: value.trim() ? "string" : "no-default",- value: {- hasDefault: !!value.trim(),- default: value.trim(), // Both PostgreSQL and MySQL use default for now- },+ const defaultValue = {+ hasDefault: !!value.trim(),+ default: value.trim(), // Both PostgreSQL and MySQL use default for now};- emit("select", defaultOption);+ emit("update", defaultValue);};--const inputStyle = computed(() => {- const style: CSSProperties = {- "--n-padding-left": "6px",- "--n-padding-right": "16px",- "--n-color": "transparent",- "--n-color-disabled": "transparent",- "--n-text-color-disabled": "rgb(var(--color-main))",- cursor: "default",- };- const border = focused.value- ? "1px solid rgb(var(--color-control-border))"- : "none";- style["--n-border"] = border;- style["--n-border-disabled"] = border;-- return style;-});--watch(- () => props.column.nullable,- (nullable) => {- if (!nullable && props.column.default === "NULL") {- handleSelect(NO_DEFAULT_OPTION.key);- }- }-);</script>--<style lang="postcss" scoped>-.bb-schema-editor--column-default-value-select :deep(.n-base-selection) {- --n-padding-single: 0 16px 0 6px !important;- --n-color: transparent !important;- --n-color-disabled: transparent !important;- --n-border: none !important;- --n-text-color-disabled: rgb(var(--color-main)) !important;-}-.bb-schema-editor--column-default-value-select- :deep(.n-base-selection .n-base-suffix) {- right: 4px;-}-</style>diff --git a/frontend/src/components/SchemaEditorLite/index.ts b/frontend/src/components/SchemaEditorLite/index.tsindex c7a9f6e412..492094686b 100644--- a/frontend/src/components/SchemaEditorLite/index.ts+++ b/frontend/src/components/SchemaEditorLite/index.ts@@ -1,5 +1,4 @@import ActionConfirmModal from "./Modals/ActionConfirmModal.vue";-import ColumnDefaultValueExpressionModal from "./Modals/ColumnDefaultValueExpressionModal.vue";import TableColumnEditor from "./Panels/TableColumnEditor";import SchemaEditorLite from "./SchemaEditorLite.vue";@@ -9,10 +8,6 @@ export * from "./spec";export * from "./utils";export * from "./context";export * from "./edit";-export {- ActionConfirmModal,- ColumnDefaultValueExpressionModal,- TableColumnEditor,-};+export { ActionConfirmModal, TableColumnEditor };export default SchemaEditorLite;diff --git a/frontend/src/components/SchemaEditorLite/utils/columnDefaultValue.ts b/frontend/src/components/SchemaEditorLite/utils/columnDefaultValue.tsindex 9efad4c80a..1424bc3e16 100644--- a/frontend/src/components/SchemaEditorLite/utils/columnDefaultValue.ts+++ b/frontend/src/components/SchemaEditorLite/utils/columnDefaultValue.ts@@ -1,175 +1,7 @@-import type { DropdownOption } from "naive-ui";-import { t } from "@/plugins/i18n";-import { Engine } from "@/types/proto-es/v1/common_pb";import type { ColumnMetadata } from "@/types/proto-es/v1/database_service_pb";import type { ColumnDefaultValue } from "@/types/v1/schemaEditor";-type DefaultValue = Pick<ColumnMetadata, "hasDefault" | "default">;--export interface DefaultValueOption {- key: string;- value: DefaultValue;-}--export const NO_DEFAULT_OPTION: DefaultValueOption = {- key: "no-default",- value: {- hasDefault: false,- default: "",- },-};--export const DEFAULT_NULL_OPTION: DefaultValueOption = {- key: "null",- value: {- hasDefault: true,- default: "NULL",- },-};--export const EMPTY_STRING_OPTION: DefaultValueOption = {- key: "empty-string",- value: {- hasDefault: true,- default: "",- },-};--export const DEFAULT_STRING_OPTION: DefaultValueOption = {- key: "string",- value: {- hasDefault: true,- default: "",- },-};--export const DEFAULT_EXPRESSION_OPTION: DefaultValueOption = {- key: "expression",- value: {- hasDefault: true,- default: "",- },-};--const INT_ZERO_OPTION: DefaultValueOption = {- key: "zero",- value: {- hasDefault: true,- default: "0",- },-};--const BOOLEAN_TRUE_OPTION: DefaultValueOption = {- key: "true",- value: {- hasDefault: true,- default: "true",- },-};--const BOOLEAN_FALSE_OPTION: DefaultValueOption = {- key: "false",- value: {- hasDefault: true,- default: "false",- },-};--export const isTextOfColumnType = (_: Engine, columnType: string) => {- const type = columnType.toUpperCase();- if (- type === "TEXT" ||- type.startsWith("VARCHAR") ||- type.startsWith("CHAR")- ) {- return true;- }- return false;-};--export const getColumnTypeDefaultValueOptions = (- engine: Engine,- columnType: string-): DefaultValueOption[] => {- const type = columnType.toUpperCase();- if (engine === Engine.MYSQL || engine === Engine.TIDB) {- if (- type === "TEXT" ||- type.startsWith("VARCHAR") ||- type.startsWith("CHAR")- ) {- return [- NO_DEFAULT_OPTION,- EMPTY_STRING_OPTION,- DEFAULT_EXPRESSION_OPTION,- ];- } else if (- type === "INTEGER" ||- type === "INT" ||- type === "SMALLINT" ||- type === "TINYINT" ||- type === "MEDIUMINT" ||- type === "BIGINT"- ) {- return [NO_DEFAULT_OPTION, INT_ZERO_OPTION, DEFAULT_EXPRESSION_OPTION];- } else if (type === "FLOAT" || type === "DOUBLE") {- return [NO_DEFAULT_OPTION, INT_ZERO_OPTION];- } else if (type === "BOOL" || type === "BOOLEAN") {- return [NO_DEFAULT_OPTION, BOOLEAN_TRUE_OPTION, BOOLEAN_FALSE_OPTION];- }- } else if (engine === Engine.POSTGRES) {- if (- type === "TEXT" ||- type.startsWith("VARCHAR") ||- type.startsWith("CHAR")- ) {- return [- NO_DEFAULT_OPTION,- EMPTY_STRING_OPTION,- DEFAULT_EXPRESSION_OPTION,- ];- } else if (- type === "SMALLINT" ||- type === "INTEGER" ||- type === "BIGINT" ||- type === "SERIAL" ||- type === "SMALLSERIAL" ||- type === "BIGSERIAL" ||- type === "INT2" ||- type === "INT4" ||- type === "INT8"- ) {- return [NO_DEFAULT_OPTION, INT_ZERO_OPTION, DEFAULT_EXPRESSION_OPTION];- } else if (type === "BOOLEAN") {- return [NO_DEFAULT_OPTION, BOOLEAN_TRUE_OPTION, BOOLEAN_FALSE_OPTION];- }- }-- // Default options.- return [NO_DEFAULT_OPTION, EMPTY_STRING_OPTION, DEFAULT_EXPRESSION_OPTION];-};--export const getDefaultValueByKey = (key: string) => {- const options = [- NO_DEFAULT_OPTION,- EMPTY_STRING_OPTION,- DEFAULT_EXPRESSION_OPTION,- INT_ZERO_OPTION,- BOOLEAN_TRUE_OPTION,- BOOLEAN_FALSE_OPTION,- ];- return options.find((option) => option.key === key)?.value;-};--export const getColumnDefaultDisplayString = (column: ColumnDefaultValue) => {- if (!column.hasDefault) {- return undefined;- }- if (column.default === "NULL") {- return undefined;- }- return column.default || "";-};+export type DefaultValue = Pick<ColumnMetadata, "hasDefault" | "default">;export const getColumnDefaultValuePlaceholder = (column: ColumnDefaultValue@@ -185,15 +17,3 @@ export const getColumnDefaultValuePlaceholder = (}return "";};--export const getColumnDefaultValueOptions = (- engine: Engine,- columnType: string-): (DefaultValueOption & DropdownOption)[] => {- return getColumnTypeDefaultValueOptions(engine, columnType).map((option) => {- return {- ...option,- label: t(`schema-editor.default.${option.key}`),- };- });-};diff --git a/frontend/src/components/SchemaTemplate/FieldTemplateForm.vue b/frontend/src/components/SchemaTemplate/FieldTemplateForm.vueindex fce7d06ae2..cc18f95398 100644--- a/frontend/src/components/SchemaTemplate/FieldTemplateForm.vue+++ b/frontend/src/components/SchemaTemplate/FieldTemplateForm.vue@@ -131,13 +131,11 @@{{ $t("schema-template.form.default-value") }}</label><div class="flex flex-row items-center relative">- <DropdownInput- :value="getColumnDefaultDisplayString(state.column!) || null"- :options="defaultValueOptions"+ <DefaultValueCell+ :column="state.column":disabled="readonly"- :allow-filter="true"- :placeholder="getColumnDefaultValuePlaceholder(state.column!)"- @update:value="handleColumnDefaultChange"+ border="1px solid rgb(224, 224, 230)"+ @update="handleColumnDefaultSelect"/></div></div>@@ -222,13 +220,6 @@@apply="onClassificationSelect"/>- <ColumnDefaultValueExpressionModal- v-if="state.showColumnDefaultValueExpressionModal"- :expression="state.column!.default"- @close="state.showColumnDefaultValueExpressionModal = false"- @update:expression="handleSelectedColumnDefaultValueExpressionChange"- />-<SemanticTypesDrawer:show="state.showSemanticTypesDrawer":semantic-type-list="semanticTypeList"@@ -247,13 +238,8 @@ import { computed, reactive, watch } from "vue";import { useI18n } from "vue-i18n";import { LabelListEditor } from "@/components/Label";import RequiredStar from "@/components/RequiredStar.vue";-import {- getColumnDefaultDisplayString,- getColumnDefaultValuePlaceholder,- getDefaultValueByKey,- getColumnDefaultValueOptions,-} from "@/components/SchemaEditorLite";-import { ColumnDefaultValueExpressionModal } from "@/components/SchemaEditorLite";+import { DefaultValueCell } from "@/components/SchemaEditorLite/Panels/TableColumnEditor/components";+import type { DefaultValue } from "@/components/SchemaEditorLite/utils";import SemanticTypesDrawer from "@/components/SensitiveData/components/SemanticTypesDrawer.vue";import {DrawerContent,@@ -263,7 +249,10 @@ import {} from "@/components/v2";import { useSettingV1Store, useNotificationStore } from "@/store";import { ColumnCatalogSchema } from "@/types/proto-es/v1/database_catalog_service_pb";-import { ColumnMetadataSchema } from "@/types/proto-es/v1/database_service_pb";+import {+ ColumnMetadataSchema,+ type ColumnMetadata,+} from "@/types/proto-es/v1/database_service_pb";import type { SchemaTemplateSetting_FieldTemplate } from "@/types/proto-es/v1/setting_service_pb";import {SchemaTemplateSetting_FieldTemplateSchema,@@ -291,8 +280,8 @@ const emit = defineEmits(["dismiss"]);interface LocalState extends SchemaTemplateSetting_FieldTemplate {showClassificationDrawer: boolean;showSemanticTypesDrawer: boolean;- showColumnDefaultValueExpressionModal: boolean;kvList: { key: string; value: string }[];+ column: ColumnMetadata;}const state = reactive<LocalState>({@@ -300,12 +289,11 @@ const state = reactive<LocalState>({id: props.template.id,engine: props.template.engine,category: props.template.category,- column: createProto(ColumnMetadataSchema, props.template.column ?? {}),catalog: createProto(ColumnCatalogSchema, props.template.catalog ?? {}),}),+ column: createProto(ColumnMetadataSchema, props.template.column ?? {}),showClassificationDrawer: false,showSemanticTypesDrawer: false,- showColumnDefaultValueExpressionModal: false,kvList: [],});const { t } = useI18n();@@ -374,18 +362,6 @@ const categoryOptions = computed(() => {}));});-const defaultValueOptions = computed(() => {- if (!state.column) return [];- return getColumnDefaultValueOptions(- state.engine,- state.column.type- ).map<SelectOption>((opt) => ({- value: opt.key,- label: opt.label as string,- defaultValue: opt.value,- }));-});-const schemaTemplateColumnTypes = computed(() => {const setting = settingStore.getSettingByName(Setting_SettingName.SCHEMA_TEMPLATE@@ -482,52 +458,9 @@ const onClassificationSelect = (id: string) => {state.catalog.classification = id;};-const handleColumnDefaultChange = (key: string) => {- const value = getDefaultValueByKey(key);- if (value) {- handleColumnDefaultSelect(key);- return;- }-- handleColumnDefaultInput(key);-};-const handleColumnDefaultInput = (value: string) => {- const { column } = state;- if (!column) return;-- column.hasDefault = true;- column.default = value;-};-const handleColumnDefaultSelect = (key: string) => {- const { column } = state;- if (!column) return;-- if (key === "expression") {- state.showColumnDefaultValueExpressionModal = true;- return;- }-- const defaultValue = getDefaultValueByKey(key);- if (!defaultValue || !state.column) {- return;- }-+const handleColumnDefaultSelect = (defaultValue: DefaultValue) => {state.column.hasDefault = defaultValue.hasDefault;state.column.default = defaultValue.default;- if (state.column.hasDefault && state.column.default === "NULL") {- state.column.nullable = true;- }-};--const handleSelectedColumnDefaultValueExpressionChange = (- expression: string-) => {- if (!state.column) {- return;- }- state.column.hasDefault = true;- state.column.default = expression;- state.showColumnDefaultValueExpressionModal = false;};const onSemanticTypeApply = async (semanticType: string) => {diff --git a/frontend/src/components/SensitiveData/components/SemanticTypesTable.vue b/frontend/src/components/SensitiveData/components/SemanticTypesTable.vueindex e573352119..bdb12fd13a 100644--- a/frontend/src/components/SensitiveData/components/SemanticTypesTable.vue+++ b/frontend/src/components/SensitiveData/components/SemanticTypesTable.vue@@ -34,7 +34,7 @@ import {Undo2Icon,InfoIcon,} from "lucide-vue-next";-import { NPopconfirm, NInput, NDataTable, NTooltip } from "naive-ui";+import { NPopconfirm, NInput, NDataTable, NTooltip, NEllipsis } from "naive-ui";import type { DataTableColumn } from "naive-ui";import { computed, reactive } from "vue";import { useI18n } from "vue-i18n";@@ -151,10 +151,10 @@ const columnList = computed(() => {{key: "id",title: "ID",- width: 350,+ ellipsis: true,resizable: true,render: (item) => {- return <h3 class="break-normal">{item.item.id}</h3>;+ return <NEllipsis class="break-normal">{item.item.id}</NEllipsis>;},},{diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.jsonindex 54e8b83a15..3bb650429a 100644--- a/frontend/src/locales/en-US.json+++ b/frontend/src/locales/en-US.json@@ -2182,10 +2182,6 @@"on-update": "On Update"},"default": {- "no-default": "No default",- "expression": "Expression",- "null": "NULL",- "value": "Value","placeholder": "Enter default value or leave empty for no default"},"message": {@@ -2385,8 +2381,7 @@"confirm-override-description": "Your rules will be overridden"}},- "rule": {- },+ "rule": {},"enabled-rules": "Enabled rules","rule-detail": "Rule detail","view-definition": "View definition",diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.jsonindex 16003ef0ba..4aa3987547 100644--- a/frontend/src/locales/es-ES.json+++ b/frontend/src/locales/es-ES.json@@ -2182,10 +2182,6 @@"on-update": "En actualización"},"default": {- "no-default": "Sin valor predeterminado",- "expression": "Expresión",- "null": "NULL",- "value": "Valor","placeholder": "Introduzca un valor predeterminado o déjelo vacío si no hay ningún valor predeterminado"},"message": {@@ -2385,8 +2381,7 @@"confirm-override-description": "Sus reglas serán anuladas"}},- "rule": {- },+ "rule": {},"enabled-rules": "Reglas habilitadas","rule-detail": "Detalle de la regla","view-definition": "Ver definición",diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.jsonindex 4b94e4ffc0..31525d695c 100644--- a/frontend/src/locales/ja-JP.json+++ b/frontend/src/locales/ja-JP.json@@ -2182,10 +2182,6 @@"on-update": "アップデート時"},"default": {- "no-default": "デフォルト値なし",- "expression": "式",- "null": "NULL",- "value": "値","placeholder": "デフォルト値を入力するか、デフォルト値がない場合は空白のままにします"},"message": {@@ -2385,8 +2381,7 @@"confirm-override-description": "以前のルールは上書きされます"}},- "rule": {- },+ "rule": {},"enabled-rules": "開かれたルールの数","rule-detail": "ルールの詳細","view-definition": "ビューの定義",diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.jsonindex 17ea35f25c..e735443a04 100644--- a/frontend/src/locales/vi-VN.json+++ b/frontend/src/locales/vi-VN.json@@ -2182,10 +2182,6 @@"on-update": "Khi cập nhật"},"default": {- "no-default": "Không mặc định",- "expression": "Biểu thức",- "null": "NULL",- "value": "Giá trị","placeholder": "Nhập giá trị mặc định hoặc để trống nếu không có giá trị mặc định"},"message": {@@ -2385,8 +2381,7 @@"confirm-override-description": "Quy tắc của bạn sẽ bị ghi đè"}},- "rule": {- },+ "rule": {},"enabled-rules": "Quy tắc được bật","rule-detail": "Chi tiết quy tắc","view-definition": "Xem định nghĩa",diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.jsonindex e9ab60af7a..9ea9ce4151 100644--- a/frontend/src/locales/zh-CN.json+++ b/frontend/src/locales/zh-CN.json@@ -2182,10 +2182,6 @@"on-update": "更新时"},"default": {- "no-default": "无默认值",- "expression": "表达式",- "null": "NULL",- "value": "值","placeholder": "输入默认值或留空以不使用默认值"},"message": {@@ -2385,8 +2381,7 @@"confirm-override-description": "之前的规则将会被覆盖"}},- "rule": {- },+ "rule": {},"enabled-rules": "开启的规则数","rule-detail": "规则详情","view-definition": "查看定义",diff --git a/frontend/src/utils/schemaEditor/index.ts b/frontend/src/utils/schemaEditor/index.tsindex e71921f701..9738f5b477 100644--- a/frontend/src/utils/schemaEditor/index.ts+++ b/frontend/src/utils/schemaEditor/index.ts@@ -4,13 +4,7 @@ import { Engine } from "@/types/proto-es/v1/common_pb";export * from "./filter";export const engineSupportsSchemaEditor = (engine: Engine) => {- if ([Engine.MYSQL, Engine.TIDB].includes(engine)) {- return true;- }- if ([Engine.POSTGRES].includes(engine)) {- return true;- }- return false;+ return [Engine.MYSQL, Engine.TIDB, Engine.POSTGRES].includes(engine);};export const allowUsingSchemaEditor = (diff --git a/frontend/src/views/DatabaseDetail/DatabaseDetail.vue b/frontend/src/views/DatabaseDetail/DatabaseDetail.vueindex 3352fb13d2..95e6ff7fc8 100644--- a/frontend/src/views/DatabaseDetail/DatabaseDetail.vue+++ b/frontend/src/views/DatabaseDetail/DatabaseDetail.vue@@ -233,7 +233,7 @@ import { State } from "@/types/proto-es/v1/common_pb";import {instanceV1HasAlterSchema,isDatabaseV1Queryable,- allowUsingSchemaEditor,+ engineSupportsSchemaEditor,extractProjectResourceName,} from "@/utils";@@ -352,7 +352,7 @@ const createMigration = async (if (type === "bb.issue.database.schema.update") {if (database.value.state === State.ACTIVE &&- allowUsingSchemaEditor([database.value])+ engineSupportsSchemaEditor(database.value.instanceResource.engine)) {state.showSchemaEditorModal = true;return;