diff --git a/ui/src/layout/components/top-bar/avatar/ResetPassword.vue b/ui/src/layout/components/top-bar/avatar/ResetPassword.vue
index 4782f0b4c..02e332b67 100644
--- a/ui/src/layout/components/top-bar/avatar/ResetPassword.vue
+++ b/ui/src/layout/components/top-bar/avatar/ResetPassword.vue
@@ -6,10 +6,10 @@
:close-on-press-escape="false"
>
{{ $t('layout.topbar.avatar.dialog.newPassword') }}
@@ -32,6 +32,13 @@
>
+
+
{{ $t('layout.topbar.avatar.dialog.useEmail') }}
({
re_password: ''
})
-const resetPasswordFormRef = ref()
+const resetPasswordFormRef1 = ref()
+const resetPasswordFormRef2 = ref()
const loading = ref(false)
const isDisabled = ref(false)
const time = ref(60)
-const rules = ref>({
- // @ts-ignore
- code: [
- {
- required: true,
- message: t('layout.topbar.avatar.dialog.enterVerificationCode'),
- trigger: 'blur'
- }
- ],
+const rules1 = ref>({
password: [
{
required: true,
@@ -149,14 +149,26 @@ const rules = ref>({
}
]
})
+const rules2 = ref>({
+ // @ts-ignore
+ code: [
+ {
+ required: true,
+ message: t('layout.topbar.avatar.dialog.enterVerificationCode'),
+ trigger: 'blur'
+ }
+ ]
+})
/**
* 发送验证码
*/
const sendEmail = () => {
- UserApi.sendEmailToCurrent(loading).then(() => {
- MsgSuccess(t('layout.topbar.avatar.dialog.verificationCodeSentSuccess'))
- isDisabled.value = true
- handleTimeChange()
+ resetPasswordFormRef1.value?.validate().then(() => {
+ UserApi.sendEmailToCurrent(loading).then(() => {
+ MsgSuccess(t('layout.topbar.avatar.dialog.verificationCodeSentSuccess'))
+ isDisabled.value = true
+ handleTimeChange()
+ })
})
}
@@ -179,20 +191,23 @@ const open = () => {
re_password: ''
}
resetPasswordDialog.value = true
- resetPasswordFormRef.value?.resetFields()
+ resetPasswordFormRef1.value?.resetFields()
+ resetPasswordFormRef2.value?.resetFields()
}
const resetPassword = () => {
- resetPasswordFormRef.value
- ?.validate()
- .then(() => {
- return UserApi.resetCurrentUserPassword(resetPasswordForm.value)
- })
- .then(() => {
- return user.logout()
- })
- .then(() => {
- router.push({ name: 'login' })
- })
+ resetPasswordFormRef1.value?.validate().then(() => {
+ resetPasswordFormRef2.value
+ ?.validate()
+ .then(() => {
+ return UserApi.resetCurrentUserPassword(resetPasswordForm.value)
+ })
+ .then(() => {
+ return user.logout()
+ })
+ .then(() => {
+ router.push({ name: 'login' })
+ })
+ })
}
const close = () => {
resetPasswordDialog.value = false
diff --git a/ui/src/views/application-workflow/component/PublishHistory.vue b/ui/src/views/application-workflow/component/PublishHistory.vue
index 3f3f0cf57..d66d7fb94 100644
--- a/ui/src/views/application-workflow/component/PublishHistory.vue
+++ b/ui/src/views/application-workflow/component/PublishHistory.vue
@@ -1,7 +1,7 @@
发布历史
-
+
{
background: #ffffff;
height: calc(100vh - 57px);
z-index: 9;
+ .list-height {
+ height: calc(100vh - 120px);
+ }
}
diff --git a/ui/src/views/application-workflow/index.vue b/ui/src/views/application-workflow/index.vue
index d41fea3b4..4fd5e0203 100644
--- a/ui/src/views/application-workflow/index.vue
+++ b/ui/src/views/application-workflow/index.vue
@@ -180,7 +180,7 @@ function clickoutsideHistory() {
}
function refreshVersion(item?: any) {
- if (item) {
+ if (item) {
getHistortyDetail(item.id)
}
initInterval()
@@ -199,10 +199,12 @@ function getHistortyDetail(versionId: string) {
res.data?.work_flow['nodes'].map((v: any) => {
v['properties']['noRender'] = true
})
+ detail.value.work_flow = res.data.work_flow
detail.value.stt_model_id = res.data.stt_model
detail.value.tts_model_id = res.data.tts_model
detail.value.tts_type = res.data.tts_type
saveTime.value = res.data?.update_time
+ workflowRef.value?.renderGraphData()
})
}
diff --git a/ui/src/views/application/component/AddDatasetDialog.vue b/ui/src/views/application/component/AddDatasetDialog.vue
index 41cd2bea8..6313d7531 100644
--- a/ui/src/views/application/component/AddDatasetDialog.vue
+++ b/ui/src/views/application/component/AddDatasetDialog.vue
@@ -40,9 +40,9 @@
-
+
{{ item.name }}
-
+
diff --git a/ui/src/workflow/index.vue b/ui/src/workflow/index.vue
index 8a6a65727..0659e3209 100644
--- a/ui/src/workflow/index.vue
+++ b/ui/src/workflow/index.vue
@@ -49,6 +49,10 @@ const graphData = computed({
const lf = ref()
onMounted(() => {
+ renderGraphData()
+})
+
+const renderGraphData = () => {
const container: any = document.querySelector('#container')
if (container) {
lf.value = new LogicFlow({
@@ -94,7 +98,7 @@ onMounted(() => {
lf.value?.fitView()
}, 500)
}
-})
+}
const validate = () => {
return Promise.all(lf.value.graphModel.nodes.map((element: any) => element?.validate?.()))
}
@@ -137,7 +141,8 @@ defineExpose({
validate,
getGraphData,
addNode,
- clearGraphData
+ clearGraphData,
+ renderGraphData
})