feat: 版本升级&小问题修复

2025-11-03 16:00:25 +08:00 · 2022-03-15 22:27:39 +08:00
parent 9e4877240d
commit 713442aa1d
9 changed files with 59 additions and 51 deletions
--- a/mayfly_go_web/package.json
+++ b/mayfly_go_web/package.json
@@ -7,13 +7,13 @@
    "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
  },
  "dependencies": {
-    "axios": "^0.24.0",
-    "codemirror": "^5.61.0",
+    "axios": "^0.26.1",
+    "codemirror": "^5.65.2",
    "countup.js": "^2.0.7",
    "cropperjs": "^1.5.11",
    "echarts": "^5.1.1",
-    "element-plus": "^2.0.4",
-    "@element-plus/icons-vue": "^0.2.4",
+    "element-plus": "^2.1.3",
+    "@element-plus/icons-vue": "^1.1.1",
    "jsonlint": "^1.6.3",
    "lodash": "^4.17.21",
    "mitt": "^3.0.0",
@@ -25,7 +25,7 @@
    "vue": "^3.2.30",
    "vue-router": "^4.0.12",
    "vuex": "^4.0.2",
-    "xterm": "^4.16.0",
+    "xterm": "^4.18.0",
    "xterm-addon-fit": "^0.5.0"
  },
  "devDependencies": {
@@ -44,7 +44,7 @@
    "sass": "^1.45.1",
    "sass-loader": "^12.4.0",
    "typescript": "^4.2.4",
-    "vite": "^2.7.4",
+    "vite": "^2.8.6",
    "vue-eslint-parser": "^8.0.1"
  },
  "browserslist": [
--- a/mayfly_go_web/src/main.ts
+++ b/mayfly_go_web/src/main.ts
@@ -8,10 +8,10 @@ import { dateStrFormat } from '@/common/utils/date.ts'

 import ElementPlus from 'element-plus';
 import 'element-plus/dist/index.css';
+import zhCn from 'element-plus/es/locale/lang/zh-cn'
 import '@/theme/index.scss';
 import mitt from 'mitt';
 import { ElMessage } from 'element-plus';
-import locale from 'element-plus/lib/locale/lang/zh-cn'

 import * as svg from '@element-plus/icons-vue';
 import SvgIcon from '@/components/svgIcon/index.vue';
@@ -37,7 +37,7 @@ directive(app);

 app.use(router)
    .use(store, key)
-    .use(ElementPlus, { size: globalComponentSize, locale: locale })
+    .use(ElementPlus, { size: globalComponentSize, locale: zhCn})
    .mount('#app');


--- a/mayfly_go_web/src/views/ops/db/SqlExec.vue
+++ b/mayfly_go_web/src/views/ops/db/SqlExec.vue
@@ -34,14 +34,14 @@
        </div>

        <el-container id="data-exec" style="border: 1px solid #eee; margin-top: 1px">
-            <el-tabs @tab-remove="removeDataTab" @tab-click="onDataTabClick" style="width: 100%; margin-left: 10px" v-model="activeName">
+            <el-tabs @tab-remove="removeDataTab" @tab-click="onDataTabClick" style="width: 100%" v-model="activeName">
                <el-tab-pane :label="queryTab.label" :name="queryTab.name">
                    <div>
                        <div>
                            <div class="toolbar">
                                <div class="fl">
                                    <el-upload
-                                        style="display: inline-block; margin-left: 10px"
+                                        style="display: inline-block"
                                        :before-upload="beforeUpload"
                                        :on-success="execSqlFileSuccess"
                                        :headers="{ Authorization: token }"
@@ -56,7 +56,9 @@
                                    >
                                        <el-button type="success" icon="video-play" plain size="small">sql脚本执行</el-button>
                                    </el-upload>
-                                    <el-button @click="onCommit" class="ml5" type="success" icon="CircleCheck" plain size="small">commit</el-button>
+                                    <el-button @click="onCommit" class="ml5 mb5" type="success" icon="CircleCheck" plain size="small"
+                                        >commit</el-button
+                                    >
                                </div>

                                <div style="float: right" class="fl">
@@ -80,8 +82,9 @@
                            </div>
                        </div>

-                        <div class="mt10">
+                        <div class="mt5">
                            <codemirror
+                                style="border: 1px solid #ccc"
                                @mousemove="listenMouse"
                                @beforeChange="onBeforeChange"
                                height="300px"
@@ -97,14 +100,13 @@
                            </el-button-group>
                        </div>

-                        <div class="mt10">
+                        <div class="mt5">
                            <el-row v-if="queryTab.nowTableName">
                                <el-link @click="onDeleteData" class="ml5" type="danger" icon="delete" :underline="false"></el-link>
                            </el-row>
                            <el-table
                                @cell-dblclick="cellClick"
                                @selection-change="onDataSelectionChange"
-                                style="margin-top: 1px"
                                :data="queryTab.execRes.data"
                                v-loading="queryTab.loading"
                                element-loading-text="查询中..."
@@ -113,6 +115,7 @@
                                empty-text="tips: select *开头的单表查询或点击表名默认查询的数据,可双击数据在线修改"
                                stripe
                                border
+                                class="mt5"
                            >
                                <el-table-column
                                    v-if="queryTab.execRes.tableColumn.length > 0 && queryTab.nowTableName"
@@ -137,7 +140,7 @@

                <el-tab-pane closable v-for="dt in dataTabs" :key="dt.name" :label="dt.label" :name="dt.name">
                    <el-row v-if="dbId">
-                        <el-link @click="onRefresh(dt.name)" icon="refresh" :underline="false"></el-link>
+                        <el-link @click="onRefresh(dt.name)" icon="refresh" :underline="false" class="ml5"></el-link>
                        <el-link @click="addRow" class="ml5" type="primary" icon="plus" :underline="false"></el-link>
                        <el-link @click="onDeleteData" class="ml5" type="danger" icon="delete" :underline="false"></el-link>

@@ -145,7 +148,7 @@
                            <el-link @click="onCommit" class="ml5" type="success" icon="check" :underline="false"></el-link>
                        </el-tooltip>
                    </el-row>
-                    <el-row>
+                    <el-row class="mt5">
                        <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>
@@ -156,14 +159,15 @@
                        @cell-dblclick="cellClick"
                        @sort-change="onTableSortChange"
                        @selection-change="onDataSelectionChange"
-                        style="margin-top: 1px"
                        :data="dt.execRes.data"
                        size="small"
                        max-height="600"
                        v-loading="dt.loading"
                        element-loading-text="查询中..."
+                        empty-text="暂无数据"
                        stripe
                        border
+                        class="mt5"
                    >
                        <el-table-column v-if="dt.execRes.tableColumn.length > 0" type="selection" width="35" />
                        <el-table-column
@@ -934,7 +938,7 @@ export default defineComponent({
 });
 </script>

-<style scoped lang="scss">
+<style lang="scss">
 .codesql {
    font-size: 9pt;
    font-weight: 600;
@@ -946,5 +950,10 @@ export default defineComponent({

 #data-exec {
    min-height: calc(100vh - 155px);
+
+    .el-table__empty-text {
+        width: 100%;
+        margin-left: 50px;
+    }
 }
 </style>
--- a/mayfly_go_web/src/views/ops/machine/FileManage.vue
+++ b/mayfly_go_web/src/views/ops/machine/FileManage.vue
@@ -488,6 +488,7 @@ export default defineComponent({
                    headers: { 'Content-Type': 'multipart/form-data; boundary=----WebKitFormBoundaryF1uyUD0tWdqmJqpl' },
                    onUploadProgress: onUploadProgress,
                    baseURL: '',
+                    timeout: 60*60*1000,
                })
                .then(() => {
                    ElMessage.success('上传成功');
--- a/mayfly_go_web/src/views/ops/machine/MachineEdit.vue
+++ b/mayfly_go_web/src/views/ops/machine/MachineEdit.vue
@@ -14,7 +14,7 @@
                    <el-input v-model.trim="form.ip" placeholder="请输入主机ip" auto-complete="off"></el-input>
                </el-form-item>
                <el-form-item prop="port" label="port:" required>
-                    <el-input type="number" v-model.trim="form.port" placeholder="请输入端口"></el-input>
+                    <el-input type="number" v-model.number="form.port" placeholder="请输入端口"></el-input>
                </el-form-item>
                <el-form-item prop="username" label="用户名:" required>
                    <el-input v-model.trim="form.username" placeholder="请输入用户名"></el-input>
--- a/mayfly_go_web/src/views/ops/redis/RedisEdit.vue
+++ b/mayfly_go_web/src/views/ops/redis/RedisEdit.vue
@@ -26,7 +26,7 @@
                    ></el-input>
                </el-form-item>
                <el-form-item prop="db" label="库号:" required>
-                    <el-input v-model.trim="form.db" placeholder="请输入库号"></el-input>
+                    <el-input v-model.number="form.db" placeholder="请输入库号"></el-input>
                </el-form-item>
            </el-form>

--- a/mayfly_go_web/vite.config.ts
+++ b/mayfly_go_web/vite.config.ts
@@ -19,7 +19,7 @@ const viteConfig: UserConfig = {
 	resolve: { alias },
 	base: process.env.NODE_ENV === 'production' ? VITE_PUBLIC_PATH : './',
 	optimizeDeps: {
-		include: ['element-plus/lib/locale/lang/zh-cn'],
+		include: ['element-plus/es/locale/lang/zh-cn'],
 	},
 	server: {
 		host: '0.0.0.0',