bug修复

src/assets/myStyle.scss

@@ -139,4 +139,17 @@
     background-color: #ef7b40 !important;
     border-color: #ef7b40 !important;
   }
+}
+.chart-edit {
+  max-height: 80% !important;
+  display: flex;
+  flex-direction: column;
+  .el-dialog__header {
+    flex: 0 0 56px;
+    margin: 0;
+  }
+  .el-dialog__body {
+    flex: 1;
+    overflow-y: auto;
+  }
 }

src/views/backup/list.vue

@@ -74,20 +74,20 @@
     ></el-pagination>
     <el-dialog
       title="自定义备份" v-model="setting.dialogShow" width="800px" :close-on-click-modal="false"
-      :close-on-press-escape="false"
+      :close-on-press-escape="false" class="backup-dialog"
     >
-      <div>
-        <el-form inline size="default">
-          <el-form-item label="表名称">
-            <el-input v-model="setting.sqlName" placeholder="输入表名称查询">
-              <template #append>
-                <el-button :icon="Search" @click="getSqlList"/>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-form>
+      <el-form inline size="default">
+        <el-form-item label="表名称">
+          <el-input v-model="setting.sqlName" placeholder="输入表名称查询">
+            <template #append>
+              <el-button :icon="Search" @click="getSqlList"/>
+            </template>
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <div style="height:calc(100% - 222px)">
         <el-table
-          v-loading="setting.loading" :data="setting.tableData" max-height="500" style="margin: 10px 0;"
+          v-loading="setting.loading" :data="setting.tableData" height="100%" style="margin: 10px 0;"
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="55"></el-table-column>
@@ -96,20 +96,20 @@
           <el-table-column prop="dataMb" label="表大小"></el-table-column>
           <el-table-column prop="tableRows" label="表行数"></el-table-column>
         </el-table>
-        <el-form size="default" label-width="70px">
-          <el-form-item label="备份方式">
-            <el-radio-group v-model="setting.backupsForm.backupType">
-              <el-radio :label="1">合并导出</el-radio>
-              <el-radio :label="2">分表导出</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="备注" required>
-            <el-input
-              type="textarea" :rows="3" v-model="setting.backupsForm.remark" maxlength="120" show-word-limit
-            ></el-input>
-          </el-form-item>
-        </el-form>
       </div>
+      <el-form size="default" label-width="70px">
+        <el-form-item label="备份方式">
+          <el-radio-group v-model="setting.backupsForm.backupType">
+            <el-radio :label="1">合并导出</el-radio>
+            <el-radio :label="2">分表导出</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" required>
+          <el-input
+            type="textarea" :rows="3" v-model="setting.backupsForm.remark" maxlength="120" show-word-limit
+          ></el-input>
+        </el-form-item>
+      </el-form>
       <div class="dialog-btns">
         <el-button @click="clearVal">取 消</el-button>
         <el-button
@@ -383,7 +383,7 @@ const uploadFile = () => {
   })
 }
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
 .backup-upload-dialog {
   .el-upload-list {
     display: none;
@@ -398,4 +398,14 @@ const uploadFile = () => {
     }
   }
 }
+.backup-dialog {
+  height: 80% !important;
+  .el-dialog__body {
+    height: calc(100% - 56px) !important;
+    overflow-y: auto;
+    .el-textarea__inner {
+      max-height: 73px;
+    }
+  }
+}
 </style>

src/views/charts/customCharts.vue

@@ -100,7 +100,10 @@
       background layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
       class="my-page" @current-change="tableGetData"
     ></el-pagination>
-    <el-dialog v-model="showEdit" append-to-body :title="editType + '组件'" width="600px">
+    <el-dialog
+      v-model="showEdit" append-to-body :title="editType + '组件'" width="600px"
+      class="chart-edit"
+    >
       <el-form :model="form" label-width="100px" size="small" :rules="chartRules" ref="edit">
         <el-form-item label="组件名称" prop="componentName">
           <el-input v-model="form.componentName" maxlength="20" show-word-limit></el-input>

src/views/charts/systemCharts.vue

@@ -72,7 +72,7 @@
       @current-change="tableGetData"
     ></el-pagination>
     <el-dialog
-      v-model="state.showEdit" append-to-body title="组件编辑" class="system-charts-edit-dialog"
+      v-model="state.showEdit" append-to-body title="组件编辑" class="chart-edit"
       width="600px"
     >
       <el-form label-width="90px" :model="state.chartForm" :rules="rules" ref="formRef" size="default">

src/views/ctrl/analyse.vue

@@ -65,15 +65,15 @@
             />
           </el-form-item>
           <el-form-item label="最小相响应时间" label-width="110px">
-            <el-input type="number" v-model="state.apiParams.time" style="width: 160px;">
+            <el-input type="number" v-model="state.apiParams.time" style="width: 150px;">
               <template #append>ms(毫秒)</template>
             </el-input>
           </el-form-item>
           <el-form-item label="请求接口" label-width="70px">
-            <el-input v-model="state.apiParams.requestUri" style="width: 160px;" placeholder="请输入"></el-input>
+            <el-input v-model="state.apiParams.requestUri" style="width: 150px;" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="服务id" label-width="70px">
-            <el-input v-model="state.apiParams.serviceId" style="width: 120px;" placeholder="请输入"></el-input>
+            <el-input v-model="state.apiParams.serviceId" style="width: 110px;" placeholder="请输入"></el-input>
           </el-form-item>
         </el-form>
         <el-button size="default" @click="getApiData">查询</el-button>
@@ -240,11 +240,13 @@ const apiCurrentChange = current => {
   getApiData()
 }
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
 .page-ctrl-analyse {
+  overflow-y: auto;
   .top, .bottom {
     height: calc((100% - 20px) / 2);
     overflow: hidden;
+    min-height: 345px;
   }
   .title-box {
     line-height: 40px;
@@ -258,5 +260,8 @@ const apiCurrentChange = current => {
     padding: 0 5px;
     background-color: #fff;
   }
+  .table-box {
+    min-height: 300px;
+  }
 }
 </style>

src/views/ctrl/dsDetail.vue

@@ -23,6 +23,7 @@
         </el-form-item>
       </el-form>
       <el-button @click="getData" size="default" style="margin-right: 10px;">查询</el-button>
+      <el-button @click="onReset" size="default">重置</el-button>
       <div style="flex: 1"></div>
       <el-button size="default" type="primary" @click="onExport">
         <el-icon>
@@ -136,6 +137,13 @@ const resetDate = () => {
   let start = moment(date).format('YYYY-MM-DD')
   params.date = [start, end]
 }
+const onReset = () => {
+  resetDate()
+  params.dsType = ''
+  params.dataSourceIp = ''
+  params.tenantId = ''
+  getData()
+}
 // 获取数据源调用记录
 const getData = () => {
   let [startTime, endTime] = params.date

src/views/temp/chartsTemp.vue

@@ -63,7 +63,15 @@
             <el-table-column label="所属租户" prop="tenantName"></el-table-column>
             <el-table-column label="模板地址">
               <template v-slot="{row}">
-                <div class="address">{{ `/newbi/chartTemp/preview/` + row.id }}</div>
+                <div style="display: flex;align-items: center">
+                  <el-tooltip effect="dark" :content="  row.url" placement="top-start">
+                    <div style="flex: 1" class="one-line">{{ row.url }}</div>
+                  </el-tooltip>
+                  <el-icon style="color: #eb5a10;cursor:pointer;" @click="onCopy(  row.url)"
+                           title="复制">
+                    <CopyDocument/>
+                  </el-icon>
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="创建人" prop="createUserName"></el-table-column>
@@ -279,6 +287,7 @@ import {getToken, hasAuth} from "@/utils/auth";
 import TenantSelect from "/@/components/TenantSelect/index.vue";
 import UserSelect from "/@/components/UserSelect/index.vue";
 import moment from "moment";
+import {copyContent} from "/@/utils";
 const state = reactive({
   list: [],
   showAudit: false,
@@ -304,6 +313,10 @@ onMounted(() => {
   resetDate()
   getData()
 })
+const onCopy = (str) => {
+  copyContent(str)
+  ElMessage({type: 'success', message: '已复制'})
+}
 // 重置日期筛选
 const resetDate = () => {
   let date = new Date()
@@ -460,6 +473,7 @@ const getData = () => {
     records.forEach((i, index) => {
       i.loading = false
       i.dataIndex = (current - 1) * size + index + 1
+      i.url = `/newbi/chartTemp/preview/` + i.id
     })
     state.list = records
     page.total = total

src/views/temp/components/ChartTempCategory.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="menu-wrapper">
     <div class="menu-btns">
-      <el-button type="primary" class="ghost" @click="state.showCategory=true" size="default" v-auth="'1823260326595047490'">
+      <el-button type="primary" class="ghost" @click="state.showCategory=true" size="small" v-auth="'1823260326595047490'">
         <el-icon>
           <EditPen/>
         </el-icon>
         编辑分类
       </el-button>
-      <el-button type="primary" @click="onEditCategory(null)" size="default" v-auth="'1823261034358681660'">
+      <el-button type="primary" @click="onEditCategory(null)" size="small" v-auth="'1823261034358681660'">
         <el-icon>
           <DocumentAdd/>
         </el-icon>

src/views/temp/components/VisualTempCategory.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="menu-wrapper">
     <div class="menu-btns">
-      <el-button type="primary" class="ghost" @click="state.showCategory=true" size="default"
+      <el-button type="primary" class="ghost" @click="state.showCategory=true" size="small"
                  v-auth="'1823251277417721912'">
         <el-icon>
           <EditPen/>
         </el-icon>
         编辑分类
       </el-button>
-      <el-button type="primary" @click="onEditCategory(null)" size="default" v-auth="'1823251299731419210'">
+      <el-button type="primary" @click="onEditCategory(null)" size="small" v-auth="'1823251299731419210'">
         <el-icon>
           <DocumentAdd/>
         </el-icon>

src/views/temp/components/category.scss

@@ -1,5 +1,5 @@
 .menu-wrapper {
-  flex: 0 0 260px;
+  flex: 0 0 200px;
   margin-right: 10px;
   padding-right: 10px;
   border-right: 1px solid #eee;

src/views/temp/visualTemp.vue

@@ -61,9 +61,17 @@
             <el-table-column label="模板名称" prop="name"></el-table-column>
             <el-table-column label="所属分类" prop="mcpCategoryName"></el-table-column>
             <el-table-column label="所属租户" prop="tenantName"></el-table-column>
-            <el-table-column label="模板地址">
+            <el-table-column show-overflow-tooltip label="模板地址">
               <template v-slot="{row}">
-                <div class="address">{{ `/newbi/template/preview/` + row.id }}</div>
+                <div style="display: flex;align-items: center">
+                  <el-tooltip effect="dark" :content="  row.url" placement="top-start">
+                    <div style="flex: 1" class="one-line">{{ row.url }}</div>
+                  </el-tooltip>
+                  <el-icon style="color: #eb5a10;cursor:pointer;" @click="onCopy(  row.url)"
+                           title="复制">
+                    <CopyDocument/>
+                  </el-icon>
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="创建人" prop="createUserName"></el-table-column>
@@ -265,6 +273,7 @@ import {getToken, hasAuth} from "@/utils/auth";
 import TenantSelect from '@/components/TenantSelect'
 import UserSelect from '@/components/UserSelect'
 import moment from "moment";
+import {copyContent} from "/@/utils";
 const tempStore = useTempStore()
 const params = reactive({
   name: '',
@@ -303,6 +312,10 @@ onMounted(() => {
   resetDate()
   getData()
 })
+const onCopy = (str) => {
+  copyContent(str)
+  ElMessage({type: 'success', message: '已复制'})
+}
 // 重置日期筛选
 const resetDate = () => {
   let date = new Date()
@@ -459,6 +472,7 @@ const getData = () => {
     records.forEach((i, index) => {
       i.loading = false
       i.dataIndex = (current - 1) * size + index + 1
+      i.url = `/newbi/template/preview/` + i.id
     })
     state.list = records
     page.total = total
@@ -474,7 +488,7 @@ const onSizeChange = size => {
   getData()
 }
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
 .page-temp {
   .main-container {
     display: flex;