From 77efd7d5c242ac1e0f944a6ae68e8c17057fdc13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E9=98=94?= <yukuo_ah@bonc.com.cn>
Date: Wed, 13 Nov 2024 11:09:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=87=E6=A0=87=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=A5=E7=9A=84=E4=BF=9D=E5=AD=98=E9=99=90=E5=88=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=87=E6=A0=87=E9=9B=86=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E5=92=8C=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ProcedureConfig.vue            | 25 +++++++++++++------
 src/views/IndexProcess/SqlRule/SqlRule.vue    | 18 +++++++++++--
 .../SqlRule/components/BasicInfo.vue          |  2 ++
 src/views/dataset/CodeRepItem/CodeRepItem.vue | 18 ++-----------
 .../dataset/RepSetRule/components/Write.vue   |  4 +--
 5 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/src/views/IndexProcess/ProcedureRule/components/ProcedureConfig.vue b/src/views/IndexProcess/ProcedureRule/components/ProcedureConfig.vue
index e8e919b..f6da175 100644
--- a/src/views/IndexProcess/ProcedureRule/components/ProcedureConfig.vue
+++ b/src/views/IndexProcess/ProcedureRule/components/ProcedureConfig.vue
@@ -1,5 +1,5 @@
 <script setup lang="tsx">
-import { ElCol,ElForm, ElFormItem, ElSelect, ElOption, ElInput } from 'element-plus';
+import { ElCol,ElForm, ElFormItem, ElSelect, ElOption, ElInput,FormRules,FormInstance,ElMessage } from 'element-plus';
 import { PropType,ref,reactive, watch,onMounted } from 'vue'
 import { useValidator } from '@/hooks/web/useValidator'
 import * as monaco from 'monaco-editor';
@@ -59,10 +59,7 @@ const props = defineProps({
 //   },
 // ])
 
-const rules = reactive({
-  dataSourceId: [required('请选择数据源')],
-  procedureName:[required('请输入存储过程名称')],
-})
+
 
 
 let sqlInfo = reactive({
@@ -126,11 +123,23 @@ const formatterSql = ()=>{
   }
 }
 
+const rules = reactive<FormRules>({
+  dataSourceId:[
+    { required: true, message: '请选择数据源信息', trigger: 'blur' },
+  ]
+})
 //提交当前界面的信息
-const submit = () =>{
+const submit = async () =>{
+  if(!sqlInfo.dataSourceId){
+     ElMessage.warning('请选择数据源信息');
+     return false; 
+  }
   const model = editorInstance.getModel();
+  if(!model.getValue()){
+    ElMessage.warning('请输入SQL语句');
+    return false;
+  }
   sqlInfo.ruleSql = model.getValue();
-  console.log(sqlInfo,"sqlInfo信息Submit");
   return sqlInfo
 }
 defineExpose({
@@ -142,7 +151,7 @@ defineExpose({
   <ElForm :model="sqlInfo" label-width="auto" :rules="rules">
     <ElRow>
       <ElCol :span="12">
-        <ElFormItem label="数据源" style="margin-left:20px;">
+        <ElFormItem label="数据源" style="margin-left:20px;" prop="dataSourceId">
           <ElSelect v-model="sqlInfo.dataSourceId" placeholder="请选择数据源" style="width:100%;">
             <el-option :label="item.dsname" :value="item.dscode" :key="item.dscode" v-for="item in sqlInfo.dataSourceList" />
           </ElSelect>
diff --git a/src/views/IndexProcess/SqlRule/SqlRule.vue b/src/views/IndexProcess/SqlRule/SqlRule.vue
index dc024d1..d9e3a50 100644
--- a/src/views/IndexProcess/SqlRule/SqlRule.vue
+++ b/src/views/IndexProcess/SqlRule/SqlRule.vue
@@ -16,6 +16,10 @@
         type:Object,
         default:()=>{}
       },
+      currentRow:{//当前选中的行(指标集信息)
+        type:Object,
+        default:()=>null
+      }
     })
 
     //保存sql规则信息
@@ -30,15 +34,25 @@
     const emit = defineEmits(['closeDialogVisible']);
     //保存SQL规则信息
     const saveSqlRule = async()=>{
-      loading.value = true;
       const procedureConfigSubmit = await procedureConfigRef.value?.submit();
       let setParamsSubmit = await setParamsRef.value?.submit();
       const basicInfoSubmit = await basicInfoRef.value?.submit();
+      console.log(props.currentRow,"props.currentRow");
+      if(!procedureConfigSubmit || !basicInfoSubmit){
+        return; 
+      }
+      loading.value = true;
       if (setParamsSubmit && procedureConfigSubmit) {
         setParamsSubmit.ruleJson.dataSourceId = procedureConfigSubmit.dataSourceId;
         setParamsSubmit.ruleJson = JSON.stringify(setParamsSubmit.ruleJson);
       }
-       saveRepSetRuleApi(Object.assign(basicInfoSubmit,setParamsSubmit,procedureConfigSubmit,{ruleClass:'SqlRule'})).then(res=>{
+      let paramsList = Object.assign(basicInfoSubmit,setParamsSubmit,procedureConfigSubmit,{ruleClass:'SqlRule'});
+      if(props.currentRow){
+        paramsList.itemId = props.currentRow.code;
+        paramsList.itemName = props.currentRow.itemName;
+      }
+      console.log(paramsList,props.currentRow);
+      saveRepSetRuleApi(paramsList).then(res=>{
         loading.value = false;
         if(res.head.code == '0'){
           ElMessage.success('保存成功');
diff --git a/src/views/IndexProcess/SqlRule/components/BasicInfo.vue b/src/views/IndexProcess/SqlRule/components/BasicInfo.vue
index fd06f7c..09b0bfc 100644
--- a/src/views/IndexProcess/SqlRule/components/BasicInfo.vue
+++ b/src/views/IndexProcess/SqlRule/components/BasicInfo.vue
@@ -119,6 +119,8 @@ const submit = async () => {
   if (valid) {
     const formData = await getFormData();
     return formData
+  }else{
+    return false;
   }
 }
 
diff --git a/src/views/dataset/CodeRepItem/CodeRepItem.vue b/src/views/dataset/CodeRepItem/CodeRepItem.vue
index 7a310c1..6971b82 100644
--- a/src/views/dataset/CodeRepItem/CodeRepItem.vue
+++ b/src/views/dataset/CodeRepItem/CodeRepItem.vue
@@ -234,7 +234,7 @@ const action = async (row: TableData, type: string) => {
     const data = res.body.result
     dialogTitle.value = type === 'edit' ? '编辑' : '规则配置'
     actionType.value = type
-    currentRow.value = data
+    currentRow.value = data;
     dialogVisible.value = true
   }
 }
@@ -254,28 +254,14 @@ const addRuleConfig = async () => {
   const rule = RULE_TYPE_LIST.filter(ruleItem=>{
     return ruleItem.value === formData.ruleType;
   })[0];
-  console.log(formData,"formData信息");
   if(formData){
     dialogVisible.value = false;
     RuleConfigInfo.dialogVisible = true;
+    RuleConfigInfo.currentRow = currentRow.value;
     RuleConfigInfo.dialogTitle = `配置${rule.label}`;
     RuleConfigInfo.RuleType = rule.name;
     RuleConfigInfo.actionType = 'add';
   }
-
-  // if (formData) {
-  //   saveLoading.value = true
-  //   const res = await saveRepDataProblemApi(formData)
-  //     .catch(() => {})
-  //     .finally(() => {
-  //       saveLoading.value = false
-  //     })
-  //   if (res) {
-  //     dialogVisible.value = false
-  //     currentPage.value = 1
-  //     getList()
-  //   }
-  // }
 }
 const AddAction = () => {
   dialogTitle.value = t('tableDemo.add')
diff --git a/src/views/dataset/RepSetRule/components/Write.vue b/src/views/dataset/RepSetRule/components/Write.vue
index 04049cf..83adf01 100644
--- a/src/views/dataset/RepSetRule/components/Write.vue
+++ b/src/views/dataset/RepSetRule/components/Write.vue
@@ -16,7 +16,7 @@ const props = defineProps({
   },
   ruleType:{
     type: String,
-    default: 'ProcedureRule'
+    default: 'SqlRule'
   }
 })
 const ruleType = props.ruleType;//当前界面中的规则类型
@@ -60,7 +60,7 @@ const closeDialogVisible = () => {
     <!-- 指标规则 -->
     <ProcedureRule v-if="ruleType=='ProcedureRule' && !loading" :ruleInfo="ruleInfo" :actionType="props.actionType" />
     <!-- SQL规则 -->
-    <SqlRule v-if="ruleType=='SqlRule' && !loading" :ruleInfo="ruleInfo" :actionType="props.actionType" @close-dialog-visible="closeDialogVisible" />
+    <SqlRule v-if="ruleType=='SqlRule' && !loading" :currentRow="props.currentRow" :ruleInfo="ruleInfo" :actionType="props.actionType" @close-dialog-visible="closeDialogVisible" />
     <!-- 存储过程规则 -->
     <PureSqlRule v-if="ruleType=='PureSqlRule' && !loading" :ruleInfo="ruleInfo" :actionType="props.actionType" />
   </div>