version for 1.6.8

2025-09-10 05:59:09 +00:00 · 2022-04-16 22:14:13 +08:00
parent 9d04f16272
commit 748204bf40
51 changed files with 210 additions and 121 deletions
--- a/dbswitch-admin-ui/src/views/connection/list.vue
+++ b/dbswitch-admin-ui/src/views/connection/list.vue
@@ -386,7 +386,7 @@ export default {
        this.$http.delete(
          "/dbswitch/admin/api/v1/connection/delete/" + row.id
        ).then(res => {
-          console.log(res);
+          //console.log(res);
          if (0 === res.data.code) {
            this.loadData();
          } else {
@@ -403,7 +403,7 @@ export default {
      this.$http.get(
        "/dbswitch/admin/api/v1/connection/test/" + row.id
      ).then(res => {
-        console.log(res);
+        //console.log(res);
        if (0 === res.data.code) {
          alert("测试连接成功!");
        } else {
@@ -415,7 +415,7 @@ export default {
      let driverClass = "";
      if (this.databaseType.length > 0) {
        for (let i = 0; i < this.databaseType.length; i++) {
-          console.log(this.databaseType[i])
+          //console.log(this.databaseType[i])
          if (this.databaseType[i].type == this.createform.type) {
            driverClass = this.databaseType[i].driver;
            break;
@@ -462,7 +462,7 @@ export default {
      let driverClass = "";
      if (this.databaseType.length > 0) {
        for (let i = 0; i < this.databaseType.length; i++) {
-          console.log(this.databaseType[i])
+          //console.log(this.databaseType[i])
          if (this.databaseType[i].type == this.updateform.type) {
            driverClass = this.databaseType[i].driver;
            break;
--- a/dbswitch-admin-ui/src/views/dashboard/index.vue
+++ b/dbswitch-admin-ui/src/views/dashboard/index.vue
@@ -256,7 +256,9 @@ export default {
  },
  mounted () {
    window.addEventListener('resize', () => {
-      this.myChart.resize();
+      if (this.myChart && typeof this.myChart.resize == 'function') {
+        this.myChart.resize();
+      }
    });
  },
  updated () {
--- a/dbswitch-admin-ui/src/views/metadata/index.vue
+++ b/dbswitch-admin-ui/src/views/metadata/index.vue
@@ -3,16 +3,18 @@
    <el-card>
      <div class="flex-between">
        <div class="tree-container">
-          <el-tree class="el-scrollbar"
-                   :props="props"
-                   :load="loadNode"
-                   :expand-on-click-node="true"
-                   :highlight-current="true"
-                   :render-content="renderContent"
-                   @check-change="handleCheckChange"
-                   @node-click="handleNodeClick"
-                   lazy>
-          </el-tree>
+          <el-scrollbar style="height:100%">
+            <el-tree class="scroller"
+                     :props="props"
+                     :load="loadNode"
+                     :expand-on-click-node="true"
+                     :highlight-current="true"
+                     :render-content="renderContent"
+                     @check-change="handleCheckChange"
+                     @node-click="handleNodeClick"
+                     lazy>
+            </el-tree>
+          </el-scrollbar>
        </div>
        <div class="table-container">
          <span>当前表：{{currentNode.schemaName}} / {{currentNode.tableName}}</span>
@@ -27,13 +29,6 @@
                <el-descriptions-item label="表名称">{{tableMeta.tableName}}</el-descriptions-item>
                <el-descriptions-item label="表类型">{{tableMeta.type}}</el-descriptions-item>
                <el-descriptions-item label="模式名">{{tableMeta.schemaName}}</el-descriptions-item>
-                <el-descriptions-item label="建表DDL">
-                  <el-input type="textarea"
-                            :rows="16"
-                            v-model="tableMeta.createSql"
-                            auto-complete="off"
-                            :readonly=true></el-input>
-                </el-descriptions-item>
                <el-descriptions-item label="表注释">
                  <el-input type="textarea"
                            :rows="2"
@@ -41,6 +36,13 @@
                            auto-complete="off"
                            :readonly=true></el-input>
                </el-descriptions-item>
+                <el-descriptions-item label="建表DDL">
+                  <el-input type="textarea"
+                            :rows="16"
+                            v-model="tableMeta.createSql"
+                            auto-complete="off"
+                            :readonly=true></el-input>
+                </el-descriptions-item>
              </el-descriptions>
            </el-tab-pane>
            <el-tab-pane label="字段信息"
@@ -51,7 +53,7 @@
                        border
                        style="width: 100%">
                <template slot="empty">
-                  <span>单击左侧展开"数据源导航数"来查看表的元数据记录</span>
+                  <span>单击左侧展开"数据源导航树"来查看表的元数据记录</span>
                </template>
                <el-table-column prop="fieldName"
                                 min-width="20%"
@@ -104,7 +106,7 @@
                        :data="sampleData.rows"
                        border>
                <template slot="empty">
-                  <span>单击左侧展开"数据源导航数"来查看表的数据记录</span>
+                  <span>单击左侧展开"数据源导航树"来查看表的数据记录</span>
                </template>
                <el-table-column v-for="(item,index) in sampleData.columns"
                                 :prop="item"
@@ -380,7 +382,11 @@ export default {
 </script>

 <style scoped>
-.el-card,
+.el-card {
+  width: 100%;
+  height: 100%;
+}
+
 .el-message {
  width: 100%;
  height: 100%;
@@ -389,17 +395,15 @@ export default {
 .flex-between {
  display: flex;
 }
-.tree-container {
-  overflow: hidden;
-  background: #f1ecec;
-}
+.el-scrollbar .el-scrollbar__wrap {overflow-x: hidden;}
 .tree-container .el-tree {
  min-width: 350px;
-  max-width: 350px;
  position: relative;
  cursor: default;
  background: #f3f1f1;
-  color: #242425;
+}
+.scroller {
+  min-width: 100%;
 }
 .tree-container .tree {
  overflow: auto;
--- a/dbswitch-admin-ui/src/views/task/schedule.vue
+++ b/dbswitch-admin-ui/src/views/task/schedule.vue
@@ -9,11 +9,20 @@
          </div>
          <div class="navsBox">
            <ul>
-              <li v-for="(item,index) in allTaskAssignments"
+              <li v-for="(item,index) in pageTaskAssignments"
                  :key="index"
                  @click="handleChooseClick(item.id,index)"
                  :class="{active:index==isActive}">[{{item.id}}]{{item.name}}</li>
            </ul>
+            <el-pagination small
+                           layout="sizes, prev, pager, next"
+                           @current-change="handleLoadPageTaskAssignments"
+                           :current-page="currentTaskAssignmentPage"
+                           :page-sizes="[10, 15, 20]"
+                           @size-change="handleLoadPageTaskAssignmentsSizeChange"
+                           :page-size="currentTaskAssignmentPageSize"
+                           :total="pageTaskAssignmentsTotalCount">
+            </el-pagination>
          </div>
        </el-card>

@@ -23,7 +32,7 @@
                    size="small"
                    border>
            <template slot="empty">
-              <span>单击左侧任务列表记录来查看作业调度记录</span>
+              <span>记录为空，或者单击左侧任务列表记录来查看作业调度记录</span>
            </template>
            <el-table-column type="expand">
              <template slot-scope="props">
@@ -110,7 +119,10 @@ export default {
      currentPage: 1,
      pageSize: 10,
      totalCount: 0,
-      allTaskAssignments: [],
+      currentTaskAssignmentPage: 1,
+      currentTaskAssignmentPageSize: 10,
+      pageTaskAssignments: [],
+      pageTaskAssignmentsTotalCount: 0,
      taskId: '请选择一个任务安排',
      jobTableData: [],
      jobScheduleTime: '',
@@ -119,13 +131,14 @@ export default {
    };
  },
  methods: {
-    loadAllTaskAssignments: function () {
+    loadPageTaskAssignments: function () {
      this.$http({
        method: "GET",
-        url: "/dbswitch/admin/api/v1/assignment/list/1/10000"
+        url: "/dbswitch/admin/api/v1/assignment/list/" + this.currentTaskAssignmentPage + "/" + this.currentTaskAssignmentPageSize
      }).then(res => {
        if (0 === res.data.code) {
-          this.allTaskAssignments = res.data.data;
+          this.pageTaskAssignments = res.data.data;
+          this.pageTaskAssignmentsTotalCount = res.data.pagination.total;
        } else {
          if (res.data.message) {
            alert("初始化任务安排信息失败:" + res.data.message);
@@ -134,6 +147,14 @@ export default {
      }
      );
    },
+    handleLoadPageTaskAssignments: function (currentPage) {
+      this.currentTaskAssignmentPage = currentPage;
+      this.loadPageTaskAssignments();
+    },
+    handleLoadPageTaskAssignmentsSizeChange: function (pageSize) {
+      this.currentTaskAssignmentPageSize = pageSize;
+      this.loadPageTaskAssignments();
+    },
    handleClose: function () { },
    handleSizeChange: function (pageSize) {
      this.loading = true;
@@ -182,7 +203,7 @@ export default {
    }
  },
  created () {
-    this.loadAllTaskAssignments();
+    this.loadPageTaskAssignments();
  }
 };
 </script>
@@ -265,4 +286,5 @@ export default {
  padding: 10px;
  width: calc(100% - 250px);
 }
+
 </style>