From 5cf72734516025406ee941d93d0cd6af6317f1a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E9=98=94?= <yukuo_ah@bonc.com.cn>
Date: Fri, 8 Nov 2024 09:56:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E5=8A=A0=E5=B7=A5=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PreViewFile/src/PreViewFile.vue           |   1 +
 .../ProcedureRule/ProcedureRule.vue           |  32 ++--
 .../components/ProcedureConfig.vue            | 171 ++++++++++--------
 .../IndexProcess/PureSqlRule/PureSqlRule.vue  |  36 ++--
 .../PureSqlRule/components/SQLRule.vue        | 105 -----------
 .../PureSqlRule/components/SetParams.vue      | 105 -----------
 src/views/IndexProcess/SqlRule/SqlRule.vue    |  37 ++--
 .../SqlRule/components/FieldInfo.vue          | 105 -----------
 .../SqlRule/components/ParamConfig.vue        | 105 -----------
 .../SqlRule/components/SearchStucter.vue      | 105 -----------
 .../SqlRule/components/SetParams.vue          |   5 +-
 .../SqlRule/components/TargetPeek.vue         | 105 -----------
 .../IndexSearchServiceMs.vue                  |   2 +-
 src/views/dataset/RepSetRule/RepSetRule.vue   |   1 -
 .../dataset/RepSetRule/components/Write.vue   |  18 +-
 15 files changed, 164 insertions(+), 769 deletions(-)
 delete mode 100644 src/views/IndexProcess/PureSqlRule/components/SQLRule.vue
 delete mode 100644 src/views/IndexProcess/PureSqlRule/components/SetParams.vue
 delete mode 100644 src/views/IndexProcess/SqlRule/components/FieldInfo.vue
 delete mode 100644 src/views/IndexProcess/SqlRule/components/ParamConfig.vue
 delete mode 100644 src/views/IndexProcess/SqlRule/components/SearchStucter.vue
 delete mode 100644 src/views/IndexProcess/SqlRule/components/TargetPeek.vue

diff --git a/src/components/PreViewFile/src/PreViewFile.vue b/src/components/PreViewFile/src/PreViewFile.vue
index dc170df..f901120 100644
--- a/src/components/PreViewFile/src/PreViewFile.vue
+++ b/src/components/PreViewFile/src/PreViewFile.vue
@@ -282,6 +282,7 @@ const downloadFile = (type) => {
     /* z-index:999; */
   }
   .download{
+    outline: none;
     position: fixed;
     color:#fff;
     font-size:1.3rem;
diff --git a/src/views/IndexProcess/ProcedureRule/ProcedureRule.vue b/src/views/IndexProcess/ProcedureRule/ProcedureRule.vue
index 2a4a8f6..a25c485 100644
--- a/src/views/IndexProcess/ProcedureRule/ProcedureRule.vue
+++ b/src/views/IndexProcess/ProcedureRule/ProcedureRule.vue
@@ -1,23 +1,21 @@
 <script setup lang="tsx">
-    import { ElTabs,ElTabPane } from 'element-plus';
-    import ProcedureConfig from './components/ProcedureConfig.vue';
-    import ParamConfig from './components/ParamConfig.vue';
-    import BasicInfo from './components/BasicInfo.vue';
+  import { ElTabs,ElTabPane } from 'element-plus';
+  import ProcedureConfig from './components/ProcedureConfig.vue';
+  import ParamConfig from './components/ParamConfig.vue';
+  import BasicInfo from './components/BasicInfo.vue';
 
 
 </script>
 <template>
-  <ContentWrap>
-    <ElTabs tab-position="left" style="height: 200px">
-      <ElTabPane label="存储过程">
-        <ProcedureConfig ref="procedureConfig" />
-      </ElTabPane>
-      <ElTabPane label="参数配置">
-        <ParamConfig ref="paramConfig" />
-      </ElTabPane>
-      <ElTabPane label="基本信息">
-        <BasicInfo ref="basicInfo" />
-      </ElTabPane>
-    </ElTabs>
-  </ContentWrap>
+  <ElTabs tab-position="left" style="height: 100%;">
+    <ElTabPane label="存储过程">
+      <ProcedureConfig ref="procedureConfig" rule-type="ProcedureRule" />
+    </ElTabPane>
+    <ElTabPane label="参数配置">
+      <ParamConfig ref="paramConfig" />
+    </ElTabPane>
+    <ElTabPane label="基本信息">
+      <BasicInfo ref="basicInfo" />
+    </ElTabPane>
+  </ElTabs>
 </template>
\ No newline at end of file
diff --git a/src/views/IndexProcess/ProcedureRule/components/ProcedureConfig.vue b/src/views/IndexProcess/ProcedureRule/components/ProcedureConfig.vue
index 65b13d9..d3e0962 100644
--- a/src/views/IndexProcess/ProcedureRule/components/ProcedureConfig.vue
+++ b/src/views/IndexProcess/ProcedureRule/components/ProcedureConfig.vue
@@ -1,105 +1,132 @@
 <script setup lang="tsx">
-import { Form, FormSchema } from '@/components/Form'
-import { useForm } from '@/hooks/web/useForm'
-import { PropType,ref,reactive, watch } from 'vue'
+import { ElCol,ElForm, ElFormItem, ElSelect, ElOption, ElInput } from 'element-plus';
+import { PropType,ref,reactive, watch,onMounted } from 'vue'
 import { useValidator } from '@/hooks/web/useValidator'
-import { ElDialog } from 'element-plus'ss
-import {vue3CronPlus} from '@/views/vue3-cron-plus/index'
-const { required } = useValidator()
+import * as monaco from 'monaco-editor';
 
+const { required } = useValidator()
 const props = defineProps({
   currentRow: {
     type: Object as PropType<any>,
     default: () => null
+  },
+  ruleType:{
+    type: String,
+    default: 'ProcedureRule'
   }
 })
-let showCron = ref(false);
-let NewCornData = "";//当前最新的corn语句的定义
 
-const formSchema = reactive<FormSchema[]>([
-  {
-    field: 'cron',
-    label: '定时器信息',
-    component: 'Input',
-    colProps: {
-      span: 24
-    },
-    componentProps:{
-      value:"",
-      on:{
-        click:()=>{
-          NewCornData = formSchema[0].value;
-          showCron.value = true;
-        }
-      }
-    }
-  },
 
-])
+// const formSchema = reactive<FormSchema[]>([
+//   {
+//     //数据源Id：dataSourceId
+//     field: 'schema',
+//     label: '数据源',
+//     component: 'Select',
+//     colProps: {
+//       span: 24
+//     },
+//     componentProps:{
+//     }
+//   },
+//   {
+//     field: 'procedureName',
+//     label: '存储过程名称',
+//     component: 'Input',
+//     colProps: {
+//       span: 24
+//     },
+//     hidden:props.ruleType == 'SqlRule'
+//   },
+//   {
+//     field: 'procedureContent',
+//     label: '存储过程',
+//     component: 'Input',
+//     colProps: {
+//       span: 24
+//     },
+//     value:'',
+//     componentProps:{
+//       type:'textarea',
+//       rows: 12,
+//       placeholder:'请输入存储过程'
+//     }
+//   },
+// ])
 
 const rules = reactive({
-  cron:[required()],
-})
+  schema: [required('请选择数据源')],
+  procedureName:[required('请输入存储过程名称')],
 
-const { formRegister, formMethods } = useForm()
-const { setValues,getFormData, getElFormExpose } = formMethods
-
-const submit = async () => {
-  const elForm = await getElFormExpose()
-  const valid = await elForm?.validate().catch((err) => {
-    console.log(err)
-  })
-  if (valid) {
-    const formData = await getFormData();
-    formData.cron = formSchema[0].value;
-    return formData
-  }
-}
+})
 
 watch(
   () => props.currentRow,
   (currentRow) => {
     if (!currentRow) return
-    setValues(currentRow)
   },
   {
     deep: true,
     immediate: true
   }
 )
-//修改定时器的信息
-const changeCron = (corn)=>{
-  formSchema[0].value = corn.toString();
-  formSchema[0].componentProps.value = corn.toString();
-  if(formSchema[0].value != '[object Event]'){
-    NewCornData = formSchema[0].value
-  }
+let sqlInfo = reactive({
+  schema:"",//数据源信息
+  dataSourceList:[],//数据源list
+  procedureName:"",//存储过程名称
+  procedureParams:"",//存储过程参数
+  pureSql:''//sql
+})
+
+const sqlEditor = ref(null);
+let editorInstance = null;
+
+const InitEditorInstance = () => {
+  editorInstance = monaco.editor.create(sqlEditor.value, {
+    value: sqlInfo.pureSql,
+    language: 'sql',
+    theme: 'vs',
+    automaticLayout: true,
+    fontSize:15,
+  });
+
+  editorInstance.onDidChangeModelContent(() => {
+    sqlInfo.pureSql = editorInstance.getValue();
+  });
 }
-const closeDialog = ()=>{
-  if(NewCornData != formSchema[0].value){
-    formSchema[0].value = NewCornData;
-    formSchema[0].componentProps.value = NewCornData;
-  }
-  showCron.value = false;
+onMounted(()=>{
+  {
+  InitEditorInstance();
 }
-defineExpose({
-  submit
-})
+}) 
+//格式化SQL
+const formatterSql = ()=>{
+
+}
+
 </script>
 
 <template>
-  <Form :rules="rules" @register="formRegister" :schema="formSchema" />
-  <ElDialog v-model="showCron">
-    <vue3CronPlus
-      i18n="cn"
-      @change="changeCron"
-      @close="closeDialog"
-      max-height="300px"
-    />
-  </ElDialog>
+  <ElForm :model="sqlInfo" label-width="auto" :rules="rules">
+    <ElRow>
+      <ElCol :span="12">
+        <ElFormItem label="数据源">
+          <ElSelect v-model="sqlInfo.schema" placeholder="请选择数据源">
+            <el-option :label="item.dsname" :value="item.dscode" :key="item.dscode" v-for="item in sqlInfo.dataSourceList" />
+          </ElSelect>
+        </ElFormItem>
+      </ElCol>
+      <ElButton type="text" @click="formatterSql" style="margin-left:20px;"> 格式化SQL </ElButton>
+    </ElRow>
+    <ElRow>
+      <ElCol :span="24">
+        <ElFormItem>
+          <div ref="sqlEditor" style="width:100%;height:500px;"></div>
+        </ElFormItem>
+      </ElCol>
+    </ElRow>
+  </ElForm>
+    
 </template>
 <style scoped>
-  .vue3-cron-plus-container>>>.language{
-    top:40px !important;
-  }
 </style>
\ No newline at end of file
diff --git a/src/views/IndexProcess/PureSqlRule/PureSqlRule.vue b/src/views/IndexProcess/PureSqlRule/PureSqlRule.vue
index 57a9864..502b924 100644
--- a/src/views/IndexProcess/PureSqlRule/PureSqlRule.vue
+++ b/src/views/IndexProcess/PureSqlRule/PureSqlRule.vue
@@ -1,23 +1,31 @@
 <script setup lang="tsx">
-    import { elTabs,elTabPane } from 'element-plus';
-    import SQLRule from './components/SQLRule.vue';
-    import SetParams from './components/SetParams.vue';
-    import BasicInfo from './components/BasicInfo.vue';
+  import { ElTabs,ElTabPane } from 'element-plus';
+  import SearchStucter from './components/SearchStucter.vue';
+  import ParamConfig from './components/ParamConfig.vue';
+  import FieldInfo from './components/FieldInfo.vue';
+  import TargetPeek from './components/TargetPeek.vue'
+  import BasicInfo from './components/BasicInfo.vue';
 
 
 </script>
 <template>
   <ContentWrap>
-    <elTabs tab-position="left" style="height: 200px">
-      <elTabPane label="SQL">
-        <SQLRule ref="sqlRule" />
-      </elTabPane>
-      <elTabPane label="参数配置">
-        <SetParams ref="setParams" />
-      </elTabPane>
-      <elTabPane label="基本信息">
+    <ElTabs tab-position="left" style="height: 100%;">
+      <ElTabPane label="查询结构">
+        <SearchStucter ref="searchStucter" />
+      </ElTabPane>
+      <ElTabPane label="参数配置">
+        <ParamConfig ref="paramConfig" />
+      </ElTabPane>
+      <ElTabPane label="字段信息">
+        <FieldInfo ref="fieldInfo" />
+      </ElTabPane>
+      <ElTabPane label="指标取数">
+        <TargetPeek ref="targetPeek" />
+      </ElTabPane>
+      <ElTabPane label="基本信息">
         <BasicInfo ref="basicInfo" />
-      </elTabPane>
-    </elTabs>
+      </ElTabPane>
+    </ElTabs>
   </ContentWrap>
 </template>
\ No newline at end of file
diff --git a/src/views/IndexProcess/PureSqlRule/components/SQLRule.vue b/src/views/IndexProcess/PureSqlRule/components/SQLRule.vue
deleted file mode 100644
index 65b13d9..0000000
--- a/src/views/IndexProcess/PureSqlRule/components/SQLRule.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script setup lang="tsx">
-import { Form, FormSchema } from '@/components/Form'
-import { useForm } from '@/hooks/web/useForm'
-import { PropType,ref,reactive, watch } from 'vue'
-import { useValidator } from '@/hooks/web/useValidator'
-import { ElDialog } from 'element-plus'ss
-import {vue3CronPlus} from '@/views/vue3-cron-plus/index'
-const { required } = useValidator()
-
-const props = defineProps({
-  currentRow: {
-    type: Object as PropType<any>,
-    default: () => null
-  }
-})
-let showCron = ref(false);
-let NewCornData = "";//当前最新的corn语句的定义
-
-const formSchema = reactive<FormSchema[]>([
-  {
-    field: 'cron',
-    label: '定时器信息',
-    component: 'Input',
-    colProps: {
-      span: 24
-    },
-    componentProps:{
-      value:"",
-      on:{
-        click:()=>{
-          NewCornData = formSchema[0].value;
-          showCron.value = true;
-        }
-      }
-    }
-  },
-
-])
-
-const rules = reactive({
-  cron:[required()],
-})
-
-const { formRegister, formMethods } = useForm()
-const { setValues,getFormData, getElFormExpose } = formMethods
-
-const submit = async () => {
-  const elForm = await getElFormExpose()
-  const valid = await elForm?.validate().catch((err) => {
-    console.log(err)
-  })
-  if (valid) {
-    const formData = await getFormData();
-    formData.cron = formSchema[0].value;
-    return formData
-  }
-}
-
-watch(
-  () => props.currentRow,
-  (currentRow) => {
-    if (!currentRow) return
-    setValues(currentRow)
-  },
-  {
-    deep: true,
-    immediate: true
-  }
-)
-//修改定时器的信息
-const changeCron = (corn)=>{
-  formSchema[0].value = corn.toString();
-  formSchema[0].componentProps.value = corn.toString();
-  if(formSchema[0].value != '[object Event]'){
-    NewCornData = formSchema[0].value
-  }
-}
-const closeDialog = ()=>{
-  if(NewCornData != formSchema[0].value){
-    formSchema[0].value = NewCornData;
-    formSchema[0].componentProps.value = NewCornData;
-  }
-  showCron.value = false;
-}
-defineExpose({
-  submit
-})
-</script>
-
-<template>
-  <Form :rules="rules" @register="formRegister" :schema="formSchema" />
-  <ElDialog v-model="showCron">
-    <vue3CronPlus
-      i18n="cn"
-      @change="changeCron"
-      @close="closeDialog"
-      max-height="300px"
-    />
-  </ElDialog>
-</template>
-<style scoped>
-  .vue3-cron-plus-container>>>.language{
-    top:40px !important;
-  }
-</style>
\ No newline at end of file
diff --git a/src/views/IndexProcess/PureSqlRule/components/SetParams.vue b/src/views/IndexProcess/PureSqlRule/components/SetParams.vue
deleted file mode 100644
index 65b13d9..0000000
--- a/src/views/IndexProcess/PureSqlRule/components/SetParams.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script setup lang="tsx">
-import { Form, FormSchema } from '@/components/Form'
-import { useForm } from '@/hooks/web/useForm'
-import { PropType,ref,reactive, watch } from 'vue'
-import { useValidator } from '@/hooks/web/useValidator'
-import { ElDialog } from 'element-plus'ss
-import {vue3CronPlus} from '@/views/vue3-cron-plus/index'
-const { required } = useValidator()
-
-const props = defineProps({
-  currentRow: {
-    type: Object as PropType<any>,
-    default: () => null
-  }
-})
-let showCron = ref(false);
-let NewCornData = "";//当前最新的corn语句的定义
-
-const formSchema = reactive<FormSchema[]>([
-  {
-    field: 'cron',
-    label: '定时器信息',
-    component: 'Input',
-    colProps: {
-      span: 24
-    },
-    componentProps:{
-      value:"",
-      on:{
-        click:()=>{
-          NewCornData = formSchema[0].value;
-          showCron.value = true;
-        }
-      }
-    }
-  },
-
-])
-
-const rules = reactive({
-  cron:[required()],
-})
-
-const { formRegister, formMethods } = useForm()
-const { setValues,getFormData, getElFormExpose } = formMethods
-
-const submit = async () => {
-  const elForm = await getElFormExpose()
-  const valid = await elForm?.validate().catch((err) => {
-    console.log(err)
-  })
-  if (valid) {
-    const formData = await getFormData();
-    formData.cron = formSchema[0].value;
-    return formData
-  }
-}
-
-watch(
-  () => props.currentRow,
-  (currentRow) => {
-    if (!currentRow) return
-    setValues(currentRow)
-  },
-  {
-    deep: true,
-    immediate: true
-  }
-)
-//修改定时器的信息
-const changeCron = (corn)=>{
-  formSchema[0].value = corn.toString();
-  formSchema[0].componentProps.value = corn.toString();
-  if(formSchema[0].value != '[object Event]'){
-    NewCornData = formSchema[0].value
-  }
-}
-const closeDialog = ()=>{
-  if(NewCornData != formSchema[0].value){
-    formSchema[0].value = NewCornData;
-    formSchema[0].componentProps.value = NewCornData;
-  }
-  showCron.value = false;
-}
-defineExpose({
-  submit
-})
-</script>
-
-<template>
-  <Form :rules="rules" @register="formRegister" :schema="formSchema" />
-  <ElDialog v-model="showCron">
-    <vue3CronPlus
-      i18n="cn"
-      @change="changeCron"
-      @close="closeDialog"
-      max-height="300px"
-    />
-  </ElDialog>
-</template>
-<style scoped>
-  .vue3-cron-plus-container>>>.language{
-    top:40px !important;
-  }
-</style>
\ No newline at end of file
diff --git a/src/views/IndexProcess/SqlRule/SqlRule.vue b/src/views/IndexProcess/SqlRule/SqlRule.vue
index e30f644..7142129 100644
--- a/src/views/IndexProcess/SqlRule/SqlRule.vue
+++ b/src/views/IndexProcess/SqlRule/SqlRule.vue
@@ -1,31 +1,22 @@
 <script setup lang="tsx">
-  import { elTabs,elTabPane } from 'element-plus';
-  import SearchStucter from './components/SearchStucter.vue';
-  import ParamConfig from './components/ParamConfig.vue';
-  import FieldInfo from './components/FieldInfo.vue';
-  import TargetPeek from './components/TargetPeek.vue'
-  import BasicInfo from './components/BasicInfo.vue';
-
+    import { ElTabs,ElTabPane } from 'element-plus';
+    import ProcedureConfig from '@/views/IndexProcess/ProcedureRule/components/ProcedureConfig.vue';
+    import SetParams from './components/SetParams.vue';
+    import BasicInfo from './components/BasicInfo.vue';
 
 </script>
 <template>
   <ContentWrap>
-    <elTabs tab-position="left" style="height: 200px">
-      <elTabPane label="查询结构">
-        <SearchStucter ref="searchStucter" />
-      </elTabPane>
-      <elTabPane label="参数配置">
-        <ParamConfig ref="paramConfig" />
-      </elTabPane>
-      <elTabPane label="字段信息">
-        <FieldInfo ref="fieldInfo" />
-      </elTabPane>
-      <elTabPane label="指标取数">
-        <TargetPeek ref="targetPeek" />
-      </elTabPane>
-      <elTabPane label="基本信息">
+    <ElTabs tab-position="left" style="height: 100%;">
+      <ElTabPane label="SQL">
+        <ProcedureConfig ref="procedureConfig" rule-type="SqlRule" />
+      </ElTabPane>
+      <ElTabPane label="参数配置">
+        <SetParams ref="setParams" />
+      </ElTabPane>
+      <ElTabPane label="基本信息">
         <BasicInfo ref="basicInfo" />
-      </elTabPane>
-    </elTabs>
+      </ElTabPane>
+    </ElTabs>
   </ContentWrap>
 </template>
\ No newline at end of file
diff --git a/src/views/IndexProcess/SqlRule/components/FieldInfo.vue b/src/views/IndexProcess/SqlRule/components/FieldInfo.vue
deleted file mode 100644
index 65b13d9..0000000
--- a/src/views/IndexProcess/SqlRule/components/FieldInfo.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script setup lang="tsx">
-import { Form, FormSchema } from '@/components/Form'
-import { useForm } from '@/hooks/web/useForm'
-import { PropType,ref,reactive, watch } from 'vue'
-import { useValidator } from '@/hooks/web/useValidator'
-import { ElDialog } from 'element-plus'ss
-import {vue3CronPlus} from '@/views/vue3-cron-plus/index'
-const { required } = useValidator()
-
-const props = defineProps({
-  currentRow: {
-    type: Object as PropType<any>,
-    default: () => null
-  }
-})
-let showCron = ref(false);
-let NewCornData = "";//当前最新的corn语句的定义
-
-const formSchema = reactive<FormSchema[]>([
-  {
-    field: 'cron',
-    label: '定时器信息',
-    component: 'Input',
-    colProps: {
-      span: 24
-    },
-    componentProps:{
-      value:"",
-      on:{
-        click:()=>{
-          NewCornData = formSchema[0].value;
-          showCron.value = true;
-        }
-      }
-    }
-  },
-
-])
-
-const rules = reactive({
-  cron:[required()],
-})
-
-const { formRegister, formMethods } = useForm()
-const { setValues,getFormData, getElFormExpose } = formMethods
-
-const submit = async () => {
-  const elForm = await getElFormExpose()
-  const valid = await elForm?.validate().catch((err) => {
-    console.log(err)
-  })
-  if (valid) {
-    const formData = await getFormData();
-    formData.cron = formSchema[0].value;
-    return formData
-  }
-}
-
-watch(
-  () => props.currentRow,
-  (currentRow) => {
-    if (!currentRow) return
-    setValues(currentRow)
-  },
-  {
-    deep: true,
-    immediate: true
-  }
-)
-//修改定时器的信息
-const changeCron = (corn)=>{
-  formSchema[0].value = corn.toString();
-  formSchema[0].componentProps.value = corn.toString();
-  if(formSchema[0].value != '[object Event]'){
-    NewCornData = formSchema[0].value
-  }
-}
-const closeDialog = ()=>{
-  if(NewCornData != formSchema[0].value){
-    formSchema[0].value = NewCornData;
-    formSchema[0].componentProps.value = NewCornData;
-  }
-  showCron.value = false;
-}
-defineExpose({
-  submit
-})
-</script>
-
-<template>
-  <Form :rules="rules" @register="formRegister" :schema="formSchema" />
-  <ElDialog v-model="showCron">
-    <vue3CronPlus
-      i18n="cn"
-      @change="changeCron"
-      @close="closeDialog"
-      max-height="300px"
-    />
-  </ElDialog>
-</template>
-<style scoped>
-  .vue3-cron-plus-container>>>.language{
-    top:40px !important;
-  }
-</style>
\ No newline at end of file
diff --git a/src/views/IndexProcess/SqlRule/components/ParamConfig.vue b/src/views/IndexProcess/SqlRule/components/ParamConfig.vue
deleted file mode 100644
index 65b13d9..0000000
--- a/src/views/IndexProcess/SqlRule/components/ParamConfig.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script setup lang="tsx">
-import { Form, FormSchema } from '@/components/Form'
-import { useForm } from '@/hooks/web/useForm'
-import { PropType,ref,reactive, watch } from 'vue'
-import { useValidator } from '@/hooks/web/useValidator'
-import { ElDialog } from 'element-plus'ss
-import {vue3CronPlus} from '@/views/vue3-cron-plus/index'
-const { required } = useValidator()
-
-const props = defineProps({
-  currentRow: {
-    type: Object as PropType<any>,
-    default: () => null
-  }
-})
-let showCron = ref(false);
-let NewCornData = "";//当前最新的corn语句的定义
-
-const formSchema = reactive<FormSchema[]>([
-  {
-    field: 'cron',
-    label: '定时器信息',
-    component: 'Input',
-    colProps: {
-      span: 24
-    },
-    componentProps:{
-      value:"",
-      on:{
-        click:()=>{
-          NewCornData = formSchema[0].value;
-          showCron.value = true;
-        }
-      }
-    }
-  },
-
-])
-
-const rules = reactive({
-  cron:[required()],
-})
-
-const { formRegister, formMethods } = useForm()
-const { setValues,getFormData, getElFormExpose } = formMethods
-
-const submit = async () => {
-  const elForm = await getElFormExpose()
-  const valid = await elForm?.validate().catch((err) => {
-    console.log(err)
-  })
-  if (valid) {
-    const formData = await getFormData();
-    formData.cron = formSchema[0].value;
-    return formData
-  }
-}
-
-watch(
-  () => props.currentRow,
-  (currentRow) => {
-    if (!currentRow) return
-    setValues(currentRow)
-  },
-  {
-    deep: true,
-    immediate: true
-  }
-)
-//修改定时器的信息
-const changeCron = (corn)=>{
-  formSchema[0].value = corn.toString();
-  formSchema[0].componentProps.value = corn.toString();
-  if(formSchema[0].value != '[object Event]'){
-    NewCornData = formSchema[0].value
-  }
-}
-const closeDialog = ()=>{
-  if(NewCornData != formSchema[0].value){
-    formSchema[0].value = NewCornData;
-    formSchema[0].componentProps.value = NewCornData;
-  }
-  showCron.value = false;
-}
-defineExpose({
-  submit
-})
-</script>
-
-<template>
-  <Form :rules="rules" @register="formRegister" :schema="formSchema" />
-  <ElDialog v-model="showCron">
-    <vue3CronPlus
-      i18n="cn"
-      @change="changeCron"
-      @close="closeDialog"
-      max-height="300px"
-    />
-  </ElDialog>
-</template>
-<style scoped>
-  .vue3-cron-plus-container>>>.language{
-    top:40px !important;
-  }
-</style>
\ No newline at end of file
diff --git a/src/views/IndexProcess/SqlRule/components/SearchStucter.vue b/src/views/IndexProcess/SqlRule/components/SearchStucter.vue
deleted file mode 100644
index 65b13d9..0000000
--- a/src/views/IndexProcess/SqlRule/components/SearchStucter.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script setup lang="tsx">
-import { Form, FormSchema } from '@/components/Form'
-import { useForm } from '@/hooks/web/useForm'
-import { PropType,ref,reactive, watch } from 'vue'
-import { useValidator } from '@/hooks/web/useValidator'
-import { ElDialog } from 'element-plus'ss
-import {vue3CronPlus} from '@/views/vue3-cron-plus/index'
-const { required } = useValidator()
-
-const props = defineProps({
-  currentRow: {
-    type: Object as PropType<any>,
-    default: () => null
-  }
-})
-let showCron = ref(false);
-let NewCornData = "";//当前最新的corn语句的定义
-
-const formSchema = reactive<FormSchema[]>([
-  {
-    field: 'cron',
-    label: '定时器信息',
-    component: 'Input',
-    colProps: {
-      span: 24
-    },
-    componentProps:{
-      value:"",
-      on:{
-        click:()=>{
-          NewCornData = formSchema[0].value;
-          showCron.value = true;
-        }
-      }
-    }
-  },
-
-])
-
-const rules = reactive({
-  cron:[required()],
-})
-
-const { formRegister, formMethods } = useForm()
-const { setValues,getFormData, getElFormExpose } = formMethods
-
-const submit = async () => {
-  const elForm = await getElFormExpose()
-  const valid = await elForm?.validate().catch((err) => {
-    console.log(err)
-  })
-  if (valid) {
-    const formData = await getFormData();
-    formData.cron = formSchema[0].value;
-    return formData
-  }
-}
-
-watch(
-  () => props.currentRow,
-  (currentRow) => {
-    if (!currentRow) return
-    setValues(currentRow)
-  },
-  {
-    deep: true,
-    immediate: true
-  }
-)
-//修改定时器的信息
-const changeCron = (corn)=>{
-  formSchema[0].value = corn.toString();
-  formSchema[0].componentProps.value = corn.toString();
-  if(formSchema[0].value != '[object Event]'){
-    NewCornData = formSchema[0].value
-  }
-}
-const closeDialog = ()=>{
-  if(NewCornData != formSchema[0].value){
-    formSchema[0].value = NewCornData;
-    formSchema[0].componentProps.value = NewCornData;
-  }
-  showCron.value = false;
-}
-defineExpose({
-  submit
-})
-</script>
-
-<template>
-  <Form :rules="rules" @register="formRegister" :schema="formSchema" />
-  <ElDialog v-model="showCron">
-    <vue3CronPlus
-      i18n="cn"
-      @change="changeCron"
-      @close="closeDialog"
-      max-height="300px"
-    />
-  </ElDialog>
-</template>
-<style scoped>
-  .vue3-cron-plus-container>>>.language{
-    top:40px !important;
-  }
-</style>
\ No newline at end of file
diff --git a/src/views/IndexProcess/SqlRule/components/SetParams.vue b/src/views/IndexProcess/SqlRule/components/SetParams.vue
index f7d141c..6e8ec87 100644
--- a/src/views/IndexProcess/SqlRule/components/SetParams.vue
+++ b/src/views/IndexProcess/SqlRule/components/SetParams.vue
@@ -70,7 +70,7 @@ watch(
 )
 
 let searchParam = reactive({
-  paramsType:"",//参数类型
+  paramsType:"code",//参数类型
   searchText:"",//参数名称
 })
 let filterList = reactive([]);//当前表格的列项
@@ -96,6 +96,7 @@ const handleAddParams = ()=>{
           v-model="searchParam.searchText"
           placeholder="按参数名称或注释搜索"
           clearable
+          style="margin-left:15px; width: 300px"
         >
           <template #prepend>
             <el-select v-model="searchParam.paramsType" placeholder="Select" style="width: 115px">
@@ -125,7 +126,7 @@ const handleAddParams = ()=>{
         </ElTable>
       </ElMain>
     </ElContainer>
-    <ElAside width="200px">
+    <ElAside width="10px">
       <Form :rules="rules" @register="formRegister" :schema="formSchema" />
     </ElAside>
   </ElContainer>
diff --git a/src/views/IndexProcess/SqlRule/components/TargetPeek.vue b/src/views/IndexProcess/SqlRule/components/TargetPeek.vue
deleted file mode 100644
index 65b13d9..0000000
--- a/src/views/IndexProcess/SqlRule/components/TargetPeek.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script setup lang="tsx">
-import { Form, FormSchema } from '@/components/Form'
-import { useForm } from '@/hooks/web/useForm'
-import { PropType,ref,reactive, watch } from 'vue'
-import { useValidator } from '@/hooks/web/useValidator'
-import { ElDialog } from 'element-plus'ss
-import {vue3CronPlus} from '@/views/vue3-cron-plus/index'
-const { required } = useValidator()
-
-const props = defineProps({
-  currentRow: {
-    type: Object as PropType<any>,
-    default: () => null
-  }
-})
-let showCron = ref(false);
-let NewCornData = "";//当前最新的corn语句的定义
-
-const formSchema = reactive<FormSchema[]>([
-  {
-    field: 'cron',
-    label: '定时器信息',
-    component: 'Input',
-    colProps: {
-      span: 24
-    },
-    componentProps:{
-      value:"",
-      on:{
-        click:()=>{
-          NewCornData = formSchema[0].value;
-          showCron.value = true;
-        }
-      }
-    }
-  },
-
-])
-
-const rules = reactive({
-  cron:[required()],
-})
-
-const { formRegister, formMethods } = useForm()
-const { setValues,getFormData, getElFormExpose } = formMethods
-
-const submit = async () => {
-  const elForm = await getElFormExpose()
-  const valid = await elForm?.validate().catch((err) => {
-    console.log(err)
-  })
-  if (valid) {
-    const formData = await getFormData();
-    formData.cron = formSchema[0].value;
-    return formData
-  }
-}
-
-watch(
-  () => props.currentRow,
-  (currentRow) => {
-    if (!currentRow) return
-    setValues(currentRow)
-  },
-  {
-    deep: true,
-    immediate: true
-  }
-)
-//修改定时器的信息
-const changeCron = (corn)=>{
-  formSchema[0].value = corn.toString();
-  formSchema[0].componentProps.value = corn.toString();
-  if(formSchema[0].value != '[object Event]'){
-    NewCornData = formSchema[0].value
-  }
-}
-const closeDialog = ()=>{
-  if(NewCornData != formSchema[0].value){
-    formSchema[0].value = NewCornData;
-    formSchema[0].componentProps.value = NewCornData;
-  }
-  showCron.value = false;
-}
-defineExpose({
-  submit
-})
-</script>
-
-<template>
-  <Form :rules="rules" @register="formRegister" :schema="formSchema" />
-  <ElDialog v-model="showCron">
-    <vue3CronPlus
-      i18n="cn"
-      @change="changeCron"
-      @close="closeDialog"
-      max-height="300px"
-    />
-  </ElDialog>
-</template>
-<style scoped>
-  .vue3-cron-plus-container>>>.language{
-    top:40px !important;
-  }
-</style>
\ No newline at end of file
diff --git a/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue b/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue
index 8de06a0..15e37a4 100644
--- a/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue
+++ b/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue
@@ -119,7 +119,7 @@ const tableColumns = reactive<TableColumn[]>([
                   {{
                     default:()=>{
                       return <div>
-                        <span>{data.row.tCategory}</span>
+                        <span class="canOperate">{data.row.tCategory}</span>
                       </div>
                     },
                     dropdown:()=>{
diff --git a/src/views/dataset/RepSetRule/RepSetRule.vue b/src/views/dataset/RepSetRule/RepSetRule.vue
index d0593e6..5b3482b 100644
--- a/src/views/dataset/RepSetRule/RepSetRule.vue
+++ b/src/views/dataset/RepSetRule/RepSetRule.vue
@@ -328,7 +328,6 @@ const exportExcel = async () => {
           </template>
         </ElDropdown>
 
-        
         <Upload :url="importExcelApiUrl" :callback="getList"> <ElButton type="primary">导入</ElButton> </Upload>
         <ElButton type="primary" @click="exportExcel()">导出</ElButton>
         <ElButton :loading="delLoading" type="primary" :disabled="disabled" @click="delDataBatch()">
diff --git a/src/views/dataset/RepSetRule/components/Write.vue b/src/views/dataset/RepSetRule/components/Write.vue
index 3781562..38bab0a 100644
--- a/src/views/dataset/RepSetRule/components/Write.vue
+++ b/src/views/dataset/RepSetRule/components/Write.vue
@@ -1,9 +1,8 @@
 <script setup lang="tsx">
-import { PropType, reactive, watch } from 'vue'
-import { elTabs,elTabPane } from 'element-plus';
+import { PropType,ref, reactive, watch } from 'vue'
 import ProcedureRule from '@/views/IndexProcess/ProcedureRule/ProcedureRule.vue';
 import SqlRule from '@/views/IndexProcess/SqlRule/SqlRule.vue';
-import PureSqlRule from '@/view/IndexProcess/PureSqlRule/PureSqlRule.vue'
+import PureSqlRule from '@/views/IndexProcess/PureSqlRule/PureSqlRule.vue'
 
 
 const props = defineProps({
@@ -20,15 +19,16 @@ const props = defineProps({
     default: 'ProcedureRule'
   }
 })
-
+const ruleType = props.ruleType;//当前界面中的规则类型
 
 </script>
 
 <template>
-  <ContentWrap>
-    <ProcedureRule />
-    <SqlRule />
-    <PureSqlRule />
-  </ContentWrap>
+  <!-- 指标规则 -->
+  <ProcedureRule v-show="ruleType=='ProcedureRule'" />
+  <!-- SQL规则 -->
+  <SqlRule v-show="ruleType=='SqlRule'" />
+  <!-- 存储过程规则 -->
+  <PureSqlRule v-show="ruleType=='PureSqlRule'" />
 </template>