From f469f31648acdd85b33d14c7e363ea23b87ee505 Mon Sep 17 00:00:00 2001
From: "meilin.huang" <954537473@qq.com>
Date: Wed, 9 Mar 2022 17:07:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20redis=E6=96=B0=E5=A2=9E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mayfly_go_web/src/views/ops/db/SqlExec.vue       | 16 ++++++++++------
 .../src/views/ops/machine/SshTerminal.vue        |  8 --------
 .../src/views/ops/machine/SshTerminalPage.vue    |  2 +-
 mayfly_go_web/src/views/ops/redis/DataEdit.vue   | 10 +++++-----
 .../src/views/system/resource/ResourceList.vue   |  1 -
 .../src/views/system/role/ShowResource.vue       |  2 +-
 6 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/mayfly_go_web/src/views/ops/db/SqlExec.vue b/mayfly_go_web/src/views/ops/db/SqlExec.vue
index a421fbe9..f0e390b0 100644
--- a/mayfly_go_web/src/views/ops/db/SqlExec.vue
+++ b/mayfly_go_web/src/views/ops/db/SqlExec.vue
@@ -145,7 +145,7 @@
                             <el-link @click="onCommit" class="ml5" type="success" icon="check" :underline="false"></el-link>
                         </el-tooltip>
                     </el-row>
-                    <el-row class="mt5">
+                    <el-row>
                         <el-input v-model="dt.condition" placeholder="若需条件过滤，输入WHERE之后查询条件点击查询按钮即可" clearable size="small">
                             <template #prepend>
                                 <el-button @click="selectByCondition(dt.name, dt.condition)" icon="search" size="small"></el-button>
@@ -568,10 +568,14 @@ export default defineComponent({
         const selectByCondition = async (tableName: string, condition: string) => {
             notEmpty(condition, '条件不能为空');
             state.dataTabs[tableName].loading = true;
-            const colAndData: any = await runSql(getDefaultSelectSql(tableName, condition));
-            state.dataTabs[tableName].execRes.tableColumn = colAndData.colNames;
-            state.dataTabs[tableName].execRes.data = colAndData.res;
-            state.dataTabs[tableName].loading = false;
+            try {
+                const colAndData: any = await runSql(getDefaultSelectSql(tableName, condition));
+                state.dataTabs[tableName].execRes.tableColumn = colAndData.colNames;
+                state.dataTabs[tableName].execRes.data = colAndData.res;
+                state.dataTabs[tableName].loading = false;
+            } catch (err) {
+                state.dataTabs[tableName].loading = false;
+            }
         };
 
         /**
@@ -605,7 +609,7 @@ export default defineComponent({
          * 提交事务，用于没有开启自动提交事务
          */
         const onCommit = () => {
-            notBlank(state.dbId, "请先选择数据库");
+            notBlank(state.dbId, '请先选择数据库');
             runSql('COMMIT;');
             ElMessage.success('COMMIT success');
         };
diff --git a/mayfly_go_web/src/views/ops/machine/SshTerminal.vue b/mayfly_go_web/src/views/ops/machine/SshTerminal.vue
index 8de01776..28c9fd6f 100644
--- a/mayfly_go_web/src/views/ops/machine/SshTerminal.vue
+++ b/mayfly_go_web/src/views/ops/machine/SshTerminal.vue
@@ -62,7 +62,6 @@ export default defineComponent({
                 // fontWeight: getThemeConfig.value.terminalFontWeight || 'normal',
                 fontFamily: 'JetBrainsMono, Consolas, Menlo, Monaco',
                 cursorBlink: true,
-                // letterSpacing: 1,
                 // cursorStyle: 'underline', //光标样式
                 disableStdin: false,
                 theme: {
@@ -78,13 +77,6 @@ export default defineComponent({
             term.focus();
             state.term = term;
 
-            // term.onResize((columns: number, rows: number) => {
-            //     send({
-            //         type: 'resize',
-            //         Cols: columns,
-            //         Rows: rows,
-            //     });
-            // });
             // 监听窗口resize
             window.addEventListener('resize', () => {
                 try {
diff --git a/mayfly_go_web/src/views/ops/machine/SshTerminalPage.vue b/mayfly_go_web/src/views/ops/machine/SshTerminalPage.vue
index 189e49b9..750739e8 100644
--- a/mayfly_go_web/src/views/ops/machine/SshTerminalPage.vue
+++ b/mayfly_go_web/src/views/ops/machine/SshTerminalPage.vue
@@ -25,7 +25,7 @@ export default defineComponent({
         });
 
         onMounted(() => {
-            state.height = window.innerHeight;
+            state.height = window.innerHeight + 5;
             state.machineId = Number.parseInt(route.query.id as string);
         });
 
diff --git a/mayfly_go_web/src/views/ops/redis/DataEdit.vue b/mayfly_go_web/src/views/ops/redis/DataEdit.vue
index dec3c1b0..5fca7e72 100644
--- a/mayfly_go_web/src/views/ops/redis/DataEdit.vue
+++ b/mayfly_go_web/src/views/ops/redis/DataEdit.vue
@@ -15,7 +15,7 @@
                 </el-select>
             </el-form-item>
 
-            <el-form-item v-if="keyInfo.type == 'string'" prop="value" label="内容:">
+            <el-form-item v-if="key.type == 'string'" prop="value" label="内容:">
                 <div id="string-value-text" style="width: 100%">
                     <el-input class="json-text" v-model="string.value" type="textarea" :autosize="{ minRows: 10, maxRows: 20 }"></el-input>
                     <el-select class="text-type-select" @change="onChangeTextType" v-model="string.type">
@@ -25,9 +25,9 @@
                 </div>
             </el-form-item>
 
-            <span v-if="keyInfo.type == 'hash'">
+            <span v-if="key.type == 'hash'">
                 <el-button @click="onAddHashValue" icon="plus" size="small" plain class="mt10">添加</el-button>
-                <el-table :data="hashValue" stripe style="width: 100%">
+                <el-table :data="hash.value" stripe style="width: 100%">
                     <el-table-column prop="key" label="key" width>
                         <template #default="scope">
                             <el-input v-model="scope.row.key" clearable size="small"></el-input>
@@ -52,9 +52,9 @@
                 </el-table>
             </span>
 
-            <span v-if="keyInfo.type == 'set'">
+            <span v-if="key.type == 'set'">
                 <el-button @click="onAddSetValue" icon="plus" size="small" plain class="mt10">添加</el-button>
-                <el-table :data="setValue" stripe style="width: 100%">
+                <el-table :data="set.value" stripe style="width: 100%">
                     <el-table-column prop="value" label="value" min-width="200">
                         <template #default="scope">
                             <el-input
diff --git a/mayfly_go_web/src/views/system/resource/ResourceList.vue b/mayfly_go_web/src/views/system/resource/ResourceList.vue
index 79521431..81b95a4c 100644
--- a/mayfly_go_web/src/views/system/resource/ResourceList.vue
+++ b/mayfly_go_web/src/views/system/resource/ResourceList.vue
@@ -142,7 +142,6 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import ResourceEdit from './ResourceEdit.vue';
 import enums from '../enums';
 import { resourceApi } from '../api';
-import SvgIcon from '@/components/svgIcon/index.vue';
 
 export default defineComponent({
     name: 'ResourceList',
diff --git a/mayfly_go_web/src/views/system/role/ShowResource.vue b/mayfly_go_web/src/views/system/role/ShowResource.vue
index 7534a06e..3b4074ec 100644
--- a/mayfly_go_web/src/views/system/role/ShowResource.vue
+++ b/mayfly_go_web/src/views/system/role/ShowResource.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <el-dialog @close="closeDialog" :title="title" :before-close="closeDialog" v-model="dialogVisible" width="400px">
-            <el-tree style="height: 50vh; overflow: auto" :data="resources" node-key="id" :props="defaultProps" :expand-on-click-node="false">
+            <el-tree style="height: 50vh; overflow: auto" :data="resources" node-key="id" :props="defaultProps">
                 <template #default="{ node, data }">
                     <span class="custom-tree-node">
                         <span v-if="data.type == enums.ResourceTypeEnum.MENU.value">{{ node.label }}</span>