From 3de3bb49a5c89dc98160c1cda2883e6c65f81894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E9=98=94?= <yukuo_ah@bonc.com.cn>
Date: Mon, 11 Nov 2024 20:20:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=8C=E5=96=84=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E5=8A=A0=E5=B7=A5=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ProcedureConfig.vue            |  4 +-
 src/views/IndexProcess/SqlRule/SqlRule.vue    |  2 +-
 .../SqlRule/components/BasicInfo.vue          |  2 +-
 .../SqlRule/components/SetParams.vue          | 50 ++++++++++++++-----
 src/views/dataset/CodeRepItem/CodeRepItem.vue |  5 +-
 src/views/dataset/RepSetRule/RepSetRule.vue   |  4 +-
 6 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/src/views/IndexProcess/ProcedureRule/components/ProcedureConfig.vue b/src/views/IndexProcess/ProcedureRule/components/ProcedureConfig.vue
index f7304d0..e8e919b 100644
--- a/src/views/IndexProcess/ProcedureRule/components/ProcedureConfig.vue
+++ b/src/views/IndexProcess/ProcedureRule/components/ProcedureConfig.vue
@@ -143,12 +143,12 @@ defineExpose({
     <ElRow>
       <ElCol :span="12">
         <ElFormItem label="数据源" style="margin-left:20px;">
-          <ElSelect v-model="sqlInfo.dataSourceId" placeholder="请选择数据源">
+          <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>
         </ElFormItem>
       </ElCol>
-      <ElButton type="text" @click="formatterSql" style="margin-left:20px;"> 格式化SQL </ElButton>
+      <!-- <ElButton type="text" @click="formatterSql" style="margin-left:20px;"> 格式化SQL </ElButton> -->
     </ElRow>
     <ElRow>
       <ElCol :span="24">
diff --git a/src/views/IndexProcess/SqlRule/SqlRule.vue b/src/views/IndexProcess/SqlRule/SqlRule.vue
index 5794456..dc024d1 100644
--- a/src/views/IndexProcess/SqlRule/SqlRule.vue
+++ b/src/views/IndexProcess/SqlRule/SqlRule.vue
@@ -56,7 +56,7 @@
 </script>
 <template>
   <ContentWrap v-loading="loading">
-    <ElTabs tab-position="left" style="height: 100%;">
+    <ElTabs tab-position="left" style="height:400px;overflow: hidden;">
       <ElTabPane label="SQL">
         <ProcedureConfig ref="procedureConfig" rule-type="SqlRule" :rule-info="props.ruleInfo" />
       </ElTabPane>
diff --git a/src/views/IndexProcess/SqlRule/components/BasicInfo.vue b/src/views/IndexProcess/SqlRule/components/BasicInfo.vue
index e486ba5..00bcd82 100644
--- a/src/views/IndexProcess/SqlRule/components/BasicInfo.vue
+++ b/src/views/IndexProcess/SqlRule/components/BasicInfo.vue
@@ -146,7 +146,7 @@ defineExpose({
 </template>
 <style scoped>
  .sqlRuleForm{
-    width:800px;
+    width:600px;
     margin: 20px auto;
  }
  .operateSQLR{
diff --git a/src/views/IndexProcess/SqlRule/components/SetParams.vue b/src/views/IndexProcess/SqlRule/components/SetParams.vue
index aaacc9d..7ac410e 100644
--- a/src/views/IndexProcess/SqlRule/components/SetParams.vue
+++ b/src/views/IndexProcess/SqlRule/components/SetParams.vue
@@ -186,7 +186,9 @@ const filterTableList = ()=>{
   console.log(filterList);
   ColumnStatus.value = false;
 }
-
+const closeAside = ()=>{
+  ColumnStatus.value = false;
+}
 //提交当前参数信息界面的信息
 const submit = ()=>{
   return {ruleJson:{
@@ -200,13 +202,8 @@ defineExpose({
 
 </script>
 
-<template>
-  <ElContainer>
-    <ElContainer>
-      <ElHeader>
-        <ElButton type="success" @click="handleAddParams">添加参数</ElButton>
-        <ElButton type="danger" @click="deleteParamsList" :disabled="idsList.length==0">批量删除</ElButton>
-        <ElInput
+<!-- 
+<ElInput
           v-model="searchParam.searchText"
           placeholder="按参数名称或注释搜索"
           clearable
@@ -220,6 +217,13 @@ defineExpose({
             </el-select>
           </template>
         </ElInput>
+-->
+<template>
+  <ElContainer class="setParamsContainer">
+    <ElContainer>
+      <ElHeader style="height:40px;">
+        <ElButton type="success" @click="handleAddParams">添加参数</ElButton>
+        <ElButton type="danger" @click="deleteParamsList">批量删除</ElButton>
       </ElHeader>
       <ElMain>
         <!-- 参数配置字段信息的表格 -->
@@ -229,8 +233,6 @@ defineExpose({
           :data="filterList"
           @selection-change="onSelectionChange"
           @row-click="handleRowClick"
-          style="width:100%;"
-          height="calc(100% - 50px)"
           @current-change="handleCurrentChange"
         >
           <ElTableColumn fixed type="selection" width="40" />
@@ -247,11 +249,33 @@ defineExpose({
         </ElTable>
       </ElMain>
     </ElContainer>
-    <ElAside width="250px" style="border-left:1px solid #ddd;height:calc(100vh - 70px);">
-      <Form @register="formRegister" :schema="formSchema" labelPosition="top" v-show="ColumnStatus" />
+    <ElAside class="setParamsAside" v-show="ColumnStatus">
+      <div class="faClose cursor-pointer" @click="closeAside">
+        <i class="fa fa-close"></i>
+      </div>
+      <Form @register="formRegister" labelPosition="top" :schema="formSchema" />
     </ElAside>
   </ElContainer>
 </template>
 <style scoped>
-
+  .setParamsContainer{
+    position:relative;
+    height:400px;
+  }
+  .setParamsAside{
+    width:200px;
+    height:400px;
+    position:absolute;
+    right:0;
+    top:0;
+    background-color: #fff;
+    z-index:10000;
+    border-left:1px solid #ddd;
+  }
+  .faClose{
+    position:absolute;
+    right:0px;
+    top:0px;
+    z-index:10001;
+  }
 </style>
\ No newline at end of file
diff --git a/src/views/dataset/CodeRepItem/CodeRepItem.vue b/src/views/dataset/CodeRepItem/CodeRepItem.vue
index 46f9fe3..0747e94 100644
--- a/src/views/dataset/CodeRepItem/CodeRepItem.vue
+++ b/src/views/dataset/CodeRepItem/CodeRepItem.vue
@@ -355,10 +355,11 @@ const exportExcel = async () => {
       <ElButton @click="dialogVisible = false">{{ t('dialogDemo.close') }}</ElButton>
     </template>
   </Dialog>
-  <Dialog v-model="RuleConfigInfo.dialogVisible" :title="RuleConfigInfo.dialogTitle" :ISFullScreen="true" style="overflow: hidden;">
+  <Dialog v-model="RuleConfigInfo.dialogVisible" :title="RuleConfigInfo.dialogTitle" style="overflow: hidden;min-width:800px;">
     <RepSetRuleWrite 
       :current-row="RuleConfigInfo.currentRow"
       :action-type="RuleConfigInfo.actionType"
-      :rule-type="RuleConfigInfo.RuleType" />
+      :rule-type="RuleConfigInfo.RuleType"
+      @close-dialog="RuleConfigInfo.dialogVisible=false;" />
   </Dialog>
 </template>
\ No newline at end of file
diff --git a/src/views/dataset/RepSetRule/RepSetRule.vue b/src/views/dataset/RepSetRule/RepSetRule.vue
index 767fb9e..b91d988 100644
--- a/src/views/dataset/RepSetRule/RepSetRule.vue
+++ b/src/views/dataset/RepSetRule/RepSetRule.vue
@@ -336,8 +336,8 @@ const exportExcel = async () => {
       </template>
     </Table>
   </ContentWrap>
-
-  <Dialog v-model="dialogVisible" :title="dialogTitle" :ISFullScreen="true" style="overflow: hidden;">
+  <!--  :ISFullScreen="true" -->
+  <Dialog v-model="dialogVisible" :title="dialogTitle" style="overflow: hidden;min-width:800px;">
     <Write
       ref="writeRef"
       :current-row="currentRow"