diff --git a/dbm-ui/frontend/src/components/time-zone-picker/index.vue b/dbm-ui/frontend/src/components/time-zone-picker/index.vue index 3d4347e69b..e71ba23713 100644 --- a/dbm-ui/frontend/src/components/time-zone-picker/index.vue +++ b/dbm-ui/frontend/src/components/time-zone-picker/index.vue @@ -7,7 +7,6 @@ :model-value="localValue" :no-match-text="t('无匹配数据')" :placeholder="t('请输入搜索(国家,城市,简称)')" - :popover-options="{ 'ext-cls': '__bk-date-picker-popover__' }" :search-placeholder="t('请输入搜索(国家,城市,简称)')" @change="handleChange"> + diff --git a/dbm-ui/frontend/src/views/sqlserver-manage/common/RenderCluster.vue b/dbm-ui/frontend/src/views/sqlserver-manage/common/RenderCluster.vue index 8e1462ed09..6660030ea5 100644 --- a/dbm-ui/frontend/src/views/sqlserver-manage/common/RenderCluster.vue +++ b/dbm-ui/frontend/src/views/sqlserver-manage/common/RenderCluster.vue @@ -127,8 +127,10 @@ cloudId: data[0].bk_cloud_id, domain: data[0].master_domain, }; + clusterIdMemo[props.name][instanceKey] = data[0].id; return true; } + clusterIdMemo[props.name][instanceKey] = 0; modelValue.value = undefined; return false; }), diff --git a/dbm-ui/frontend/src/views/sqlserver-manage/common/render-mode/Index.vue b/dbm-ui/frontend/src/views/sqlserver-manage/common/render-mode/Index.vue index ac1fbb1abb..48b077eda3 100644 --- a/dbm-ui/frontend/src/views/sqlserver-manage/common/render-mode/Index.vue +++ b/dbm-ui/frontend/src/views/sqlserver-manage/common/render-mode/Index.vue @@ -71,7 +71,7 @@ const disableDate = (date: Date) => date && date.valueOf() > Date.now(); const { t } = useI18n(); - const formatDateToUTC = useTimeZoneFormat(); + const { format: formatDateToUTC } = useTimeZoneFormat(); const timerRules = [ { diff --git a/dbm-ui/frontend/src/views/sqlserver-manage/common/render-mode/RecordSelector.vue b/dbm-ui/frontend/src/views/sqlserver-manage/common/render-mode/RecordSelector.vue index f2ebe2ad6b..f6f8a22cb7 100644 --- a/dbm-ui/frontend/src/views/sqlserver-manage/common/render-mode/RecordSelector.vue +++ b/dbm-ui/frontend/src/views/sqlserver-manage/common/render-mode/RecordSelector.vue @@ -78,7 +78,43 @@ active: item.value === modelValue?.backup_id, }" @click="handleLogListSelect(item)"> - {{ item.label }} + +
{{ item.label }}
+ +
@@ -107,7 +143,6 @@ + + diff --git a/dbm-ui/frontend/src/views/sqlserver-manage/rollback/pages/page1/components/other-cluster/components/Row.vue b/dbm-ui/frontend/src/views/sqlserver-manage/rollback/pages/page1/components/other-cluster/components/Row.vue index a308908ecf..10930eb3c7 100644 --- a/dbm-ui/frontend/src/views/sqlserver-manage/rollback/pages/page1/components/other-cluster/components/Row.vue +++ b/dbm-ui/frontend/src/views/sqlserver-manage/rollback/pages/page1/components/other-cluster/components/Row.vue @@ -15,16 +15,17 @@ - - + name="dstCluster" + :src-cluster-data="localSrcClusterData" /> (); - const srcClusterRef = ref>(); - const dstClusterRef = ref>(); + const srcClusterRef = ref>(); + const dstClusterRef = ref>(); const modeRef = ref>(); const dbNameRef = ref>(); const ignoreDbNameRef = ref>(); diff --git a/dbm-ui/frontend/src/views/sqlserver-manage/rollback/pages/page1/components/other-cluster/components/SrcCluster.vue b/dbm-ui/frontend/src/views/sqlserver-manage/rollback/pages/page1/components/other-cluster/components/SrcCluster.vue new file mode 100644 index 0000000000..a9f9bdfaa3 --- /dev/null +++ b/dbm-ui/frontend/src/views/sqlserver-manage/rollback/pages/page1/components/other-cluster/components/SrcCluster.vue @@ -0,0 +1,209 @@ + + + + + + diff --git a/dbm-ui/frontend/src/views/sqlserver-manage/slave-rebuild/pages/page1/components/new-host/components/RenderData/RenderNewSlave.vue b/dbm-ui/frontend/src/views/sqlserver-manage/slave-rebuild/pages/page1/components/new-host/components/RenderData/RenderNewSlave.vue index be53d8d5af..f92bf6b250 100644 --- a/dbm-ui/frontend/src/views/sqlserver-manage/slave-rebuild/pages/page1/components/new-host/components/RenderData/RenderNewSlave.vue +++ b/dbm-ui/frontend/src/views/sqlserver-manage/slave-rebuild/pages/page1/components/new-host/components/RenderData/RenderNewSlave.vue @@ -48,6 +48,7 @@ @change="handleHostChange" />