Merge pull request #109 from qianmoQ/1.12.0-SNAPSHOT

1.12.0 snapshot
devlive-community · Mar 17, 2022 · f7ac8f2 · f7ac8f2
2 parents 98a6b25 + 4ac4ea5
commit f7ac8f2
Show file tree

Hide file tree

Showing 8 changed files with 159 additions and 28 deletions.
diff --git a/docs/docs/release/1.12.0-20220318.md b/docs/docs/release/1.12.0-20220318.md
@@ -0,0 +1,51 @@
+---
+template: overrides/main.html
+---
+
+DBM Version for `1.12.0` is released!
+
+Release Time: `2022-03-18`
+
+#### Enhancement
+
+---
+
+- Support visual construction of data table and configuration of optional parameters
+- Add data source list to display service version information
+- Add editor execution status feedback
+- Add ancillary information such as execution result and time
+- SQL shortcut keys can be executed by Ctrl+Enter [#102](https://github.com/EdurtIO/dbm/issues/102)
+- Support for data source maxTotal configuration (experimental) [#102](https://github.com/EdurtIO/dbm/issues/102)
+- Add `SHOW PARTITIONS` quick query
+- The `EXPLAIN` command is supported
+- Metadata management delete data table supports quick input of table name
+
+#### Docs
+
+---
+
+- Add contributing software documentation guide
+
+#### Optimize
+
+----
+
+- Optimized the display of metadata management disk usage
+- Merge Query Select the query & query function
+
+#### Bug
+
+---
+
+- Fixed data source not paging problem in quick query
+- Fixed the problem that metadata information cannot be distinguished due to multiple selections
+- Fix top menu style exception
+- Fix the problem that the metadata operation node is not refreshed [#101](https://github.com/EdurtIO/dbm/issues/101)
+
+#### UI
+
+---
+
+- New data source window layout
+- Add nine editor themes
+- Execute button to add shortcut key prompt
diff --git a/docs/docs/release/1.12.0-20220318.zh.md b/docs/docs/release/1.12.0-20220318.zh.md
@@ -0,0 +1,50 @@
+---
+template: overrides/main.html
+---
+
+DBM `1.12.0` 版本发布!
+
+发布时间: `2022-03-18`
+
+#### 功能 (增强)
+---
+
+- 支持数据表的可视化构造和可选参数的配置
+- 添加数据源列表，显示服务版本信息
+- 添加编辑器执行状态反馈
+- 增加执行结果、时间等辅助信息
+- SQL快捷键可以通过Ctrl+Enter执行 [#102](https://github.com/EdurtIO/dbm/issues/102)
+- 支持数据源maxTotal配置（实验性） [#102](https://github.com/EdurtIO/dbm/issues/102)
+- 添加 `SHOW PARTITIONS` 快速查询
+- 支持 `EXPLAIN` 命令
+- 元数据管理删除数据表支持快速输入表名
+
+#### 文档
+
+---
+
+- 添加软件文档贡献指南
+
+#### 优化
+
+----
+
+- 优化了元数据管理磁盘使用情况的显示
+- 合并选择查询和查询功能
+
+#### Bug
+
+---
+
+- 修复了快速查询中数据源不分页的问题
+- 修复了由于多次选择而无法区分元数据信息的问题
+- 修复顶部菜单样式异常
+- 修复元数据操作节点未刷新的问题 [#101](https://github.com/EdurtIO/dbm/issues/101)
+
+#### UI
+
+---
+
+- 数据源窗口布局
+- 添加九个编辑器主题
+- 执行按钮添加快捷键提示
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
@@ -139,6 +139,7 @@ nav:
       - Monitor:
           - Processor: reference/Monitor-Processor.md
   - Release Note:
+      - 1.12.0: release/1.12.0-20220318.md
       - 1.11.0: release/1.11.0-20220222.md
       - 1.10.0: release/1.10.0-20220127.md
       - 1.9.0: release/1.9.0-20211130.md

diff --git a/electron-builder.yml b/electron-builder.yml
@@ -15,8 +15,9 @@ releaseInfo:
     - Add ancillary information such as execution result and time
     - SQL shortcut keys can be executed by Ctrl+Enter [#102](https://github.com/EdurtIO/dbm/issues/102)
     - Support for data source maxTotal configuration (experimental) [#102](https://github.com/EdurtIO/dbm/issues/102)
-    - Add SHOW PARTITIONS quick query
-    - The EXPLAIN command is supported
+    - Add `SHOW PARTITIONS` quick query
+    - The `EXPLAIN` command is supported
+    - Metadata management delete data table supports quick input of table name
 
     #### Docs
     ---

diff --git a/src/renderer/assets/i18n/en.json b/src/renderer/assets/i18n/en.json
@@ -125,7 +125,8 @@
     "threadPerConsumer": "Thread Per Consumer",
     "clickhouse": "ClickHouse",
     "advanced": "Advanced",
-    "maxTotal": "MaxTotal"
+    "maxTotal": "MaxTotal",
+    "quicklyEnter": "Quickly enter"
   },
   "language": {
     "english": "English",

diff --git a/src/renderer/assets/i18n/zh.json b/src/renderer/assets/i18n/zh.json
@@ -125,7 +125,8 @@
     "threadPerConsumer": "Thread Per Consumer",
     "clickhouse": "ClickHouse",
     "advanced": "高级",
-    "maxTotal": "最大总数"
+    "maxTotal": "最大总数",
+    "quicklyEnter": "快速输入"
   },
   "language": {
     "english": "英语",

diff --git a/src/renderer/components/table/delete/table.delete.component.html b/src/renderer/components/table/delete/table.delete.component.html
@@ -1,28 +1,49 @@
 <div>
-    <em>We don't recommend that you delete the data table
-        <nz-tag [nzColor]="'#2db7f5'">{{value}}</nz-tag>
-        ? This operation produces the following?
-    </em>
-    <ol>
-        <li>
-            <nz-tag [nzColor]="'#f50'">No rollback</nz-tag>
-            The metadata will be removed from the Clickhouse metadata
-        </li>
-        <li>
-            <nz-tag [nzColor]="'#f50'">No rollback</nz-tag>
-            All data files generated in this table will be removed from the relevant Clickhouse server file system
-        </li>
-        <li>If you want to confirm the deletion, enter the table name in the
-            <input nz-input [(ngModel)]="inputValue" (change)="handlerValidate()" />
-            and click the delete button below
-        </li>
-    </ol>
+  <form nz-form>
+    <nz-form-item>
+      <nz-form-control [nzSpan]="24">
+        <nz-alert nzBanner
+                  nzMessage="We don't recommend that you delete the data table? This operation produces the following?">
+        </nz-alert>
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-control [nzSpan]="24">
+        <nz-tag [nzColor]="'#f50'">No rollback</nz-tag>
+        The metadata will be removed from the Clickhouse metadata
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-control [nzSpan]="24">
+        <nz-tag [nzColor]="'#f50'">No rollback</nz-tag>
+        All data files generated in this table will be removed from the relevant Clickhouse server file system
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-control [nzSpan]="24">
+        To confirm the deletion, enter the table name and click the Delete button below
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-control [nzSpan]="24">
+        <nz-input-group [nzAddOnBefore]="addOnBefore" [nzAddOnAfter]="suffixButton">
+          <input type="text" name="inputValue" nz-input [(ngModel)]="inputValue" (change)="handlerValidate()"/>
+        </nz-input-group>
+        <ng-template #addOnBefore>
+          <button nz-button nzDanger nzType="link">{{value}}</button>
+        </ng-template>
+        <ng-template #suffixButton>
+          <button nz-button nzType="link" (click)="handlerQuicklyEnter()">{{'common.quicklyEnter'|translate}}</button>
+        </ng-template>
+      </nz-form-control>
+    </nz-form-item>
+  </form>
 </div>
 <div class="ant-modal-footer" style="padding: 10px;margin-bottom: -20px;margin-top: 20px;">
-    <div class="ng-star-inserted">
-        <button nz-button nzType="primary" nzDanger [disabled]="disabled.button" [nzLoading]="loading.button"
+  <div class="ng-star-inserted">
+    <button nz-button nzType="primary" nzDanger [disabled]="disabled.button" [nzLoading]="loading.button"
             (click)="handlerDelete()">
-            <span>{{'common.delete'|translate}}</span>
-        </button>
-    </div>
-</div>
+      <span>{{'common.delete'|translate}}</span>
+    </button>
+  </div>
+</div>
diff --git a/src/renderer/components/table/delete/table.delete.component.ts b/src/renderer/components/table/delete/table.delete.component.ts
@@ -54,4 +54,9 @@ export class DeleteTableComponent extends BaseComponent {
       this.loading.button = false;
     });
   }
+
+  handlerQuicklyEnter() {
+    this.inputValue = this.value;
+    this.handlerValidate();
+  }
 }