Merge remote-tracking branch 'origin/master'

src/views/dataIntegration/dataLoading/dataEntryLake/databaseOfflineLoading.vue

@@ -32,11 +32,26 @@
             >跳转运维</a-button
           >
           <a-button :disabled="isEdit !== 'true'" type="primary" @click="handleSave">保存</a-button>
-          <a-button :disabled="isEdit !== 'true'" type="primary" @click="handleDebug"
+          <a-button
+            :disabled="isEdit !== 'true'"
+            v-if="isEdit !== 'debug'"
+            type="primary"
+            @click="handleDebug"
             >调试</a-button
           >
-          <a-button :disabled="isEdit !== 'true'" type="primary" @click="handleRun">运行</a-button>
-          <a-button :disabled="isEdit !== 'true'" type="primary" @click="handlePublish"
+          <a-button v-if="isEdit === 'debug'" type="primary" @click="handleExitDebug"
+            >退出调试</a-button
+          >
+          <a-button
+            :disabled="isRun === 'false' || isEdit !== 'true'"
+            type="primary"
+            @click="handleRun"
+            >运行</a-button
+          >
+          <a-button
+            :disabled="isSave === 'false' || isEdit !== 'true'"
+            type="primary"
+            @click="handlePublish"
             >发布</a-button
           >
           <a-button type="primary" @click="handleGobalDeply">全局配置</a-button>
@@ -464,7 +479,7 @@
     <AddDataConversionRuleModal @register="registerAddRuleModal" />
     <DataOptionsModal @register="registerDataOptionsModal" />
     <GlobalOptionsModal @register="registerGlobalOptionsModal" />
-    <SaveModal @register="registerSaveModal" />
+    <SaveModal @register="registerSaveModal" @success="handleSaveSuccess" />
     <VersionManageModal @register="registerVersionManageModal" />
     <RunOptionsModal @register="registerRunOptionsModal" />
     <PartitionedDataProcessingModal @register="registerPartitionedDataProcessingModal" />
@@ -568,6 +583,8 @@
   let isAutomaticTableConstructionFlag = ref(false);
   let isParsingSQL = ref(false);
   let isClearTargetTable = ref(false);
+  const isSave = ref('false');
+  const isRun = ref('false');
   let loadType = ref('全量数据加载');
   let configurationModeFlag = ref('');
   let selectAdvancedConfiguration = ref();
@@ -1731,6 +1748,10 @@
     });
   }
 
+  function handleExitDebug() {
+    router.back();
+  }
+
   async function handleSave() {
     try {
       const isValid = await validateSourceSideConfigurationForm();
@@ -1740,7 +1761,7 @@
       }
       await submitSourceSideConfiguration();
       createMessage.success('保存成功');
-      router.back();
+      isSave.value = 'true';
     } catch (error) {
       console.error('保存失败:', error);
       createMessage.error('表单校验未通过，请检查输入');
@@ -1752,7 +1773,9 @@
       title: '发布新版本',
     });
   }
-
+  function handleSaveSuccess() {
+    isRun.value = 'true';
+  }
   function handleDeplys() {
     console.log('myCheckedKeys', myCheckedKeys.value);
     openDeplysModal(true, {

src/views/dataIntegration/dataLoading/dataEntryLake/runOptionsModal.vue

@@ -57,7 +57,7 @@
 
   async function handleSubmit() {
     closeModal();
-    createMessage.success('提交成功');
+    createMessage.success('运行成功');
   }
   onMounted(() => {
     tableData.value = runOptionsData;

src/views/dataIntegration/dataLoading/dataEntryLake/saveModal.vue

@@ -41,7 +41,8 @@
 
   async function handleSubmit() {
     closeModal();
-    createMessage.success('提交成功');
+    emit('success');
+    createMessage.success('发布成功');
     await resetFields();
   }
 </script>