Merge pull request #106 from qianmoQ/1.12.0-SNAPSHOT

1.12.0 snapshot
devlive-community · Mar 17, 2022 · 98a6b25 · 98a6b25
2 parents c38fcd7 + 6f60c77
commit 98a6b25
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 35 deletions.
diff --git a/electron-builder.yml b/electron-builder.yml
@@ -15,6 +15,8 @@ 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
 
     #### Docs
     ---
@@ -24,6 +26,9 @@ releaseInfo:
     #### Optimize
     ----
 
+    - Optimized the display of metadata management disk usage
+    - Merge Query Select the query & query function
+
     #### Bug
     ---
 
@@ -37,6 +42,7 @@ releaseInfo:
 
     - New data source window layout
     - Add nine editor themes
+    - Execute button to add shortcut key prompt
 
 directories:
   output: ./release

diff --git a/src/renderer/app/pages/management/metadata/metadata.component.html b/src/renderer/app/pages/management/metadata/metadata.component.html
@@ -27,8 +27,9 @@
             <app-component-antd-empty *ngIf="items.length <= 0; else hasLoadTemplate">
             </app-component-antd-empty>
             <ng-template #hasLoadTemplate>
-              <div nz-row nzJustify="space-around" [nzGutter]="[16, 16]">
-                <div *ngFor="let item of items; let i = index" nz-col nzSpan="6">
+              <nz-table nzPageSize="20" #progressItemsTable [nzData]="items">
+                <tbody nz-row nzJustify="space-around" [nzGutter]="[16, 16]">
+                <tr *ngFor="let item of progressItemsTable.data; let i = index" nz-col nzSpan="6">
                   <nz-card nzTitle="{{ (i + 1) + ': ' + item.name }}">
                     <nz-progress nz-popover [nzPopoverContent]="progressPopoverContent" nzType="circle"
                                  [nzPercent]="item.value"
@@ -42,8 +43,8 @@
                       </nz-descriptions>
                     </ng-template>
                   </nz-card>
-                </div>
-              </div>
+                </tr>
+              </nz-table>
             </ng-template>
           </ng-template>
         </nz-card>

diff --git a/src/renderer/app/pages/query/query/query.component.html b/src/renderer/app/pages/query/query/query.component.html
@@ -24,18 +24,21 @@
     <nz-option *ngFor="let detail of dataSources" [nzDisabled]="!detail.status"
                nzValue="{{detail.alias}}" nzLabel="{{detail.alias}}"></nz-option>
   </nz-select>
-  <button id="executeButton" nz-button nzType="primary" nzSize="small"
-          [disabled]="disabledButton.execute"
-          [nzLoading]="loading.button"
-          (click)="handlerExecute()">
-    <i class="fa fa-flash"></i>&nbsp;{{'common.execute'|translate}}
-  </button>
-  <button id="selectionExecuteButton" nz-button nzType="primary" nzSize="small"
-          [disabled]="disabledButton.execute"
-          [nzLoading]="loading.button"
-          (click)="handlerSelectionExecute()">
-    <i class="fa fa-flask"></i>&nbsp;{{'common.select'|translate}} {{'common.execute'|translate}}
-  </button>
+  <nz-button-group>
+    <button id="executeButton" nz-button nzType="primary" nzSize="small"
+            nzTooltipTitle="{{'tooltip.execute'|translate}}" nzTooltipPlacement="bottom" nz-tooltip
+            [disabled]="disabledButton.execute"
+            [nzLoading]="loading.button"
+            (click)="handlerExecute()">
+      <i class="fa fa-flash"></i>&nbsp;{{'common.execute'|translate}}
+    </button>
+    <button nz-button nz-dropdown nzType="primary" nzPlacement="bottomRight"
+            [disabled]="disabledButton.execute"
+            [nzDropdownMenu]="executeMenu"
+            style="margin-left: -10px;">
+      <i class="fa fa-ellipsis-h"></i>
+    </button>
+  </nz-button-group>
   <button nz-button nzType="dashed" nzSize="small"
           [disabled]="disabledButton.execute"
           (click)="handlerFormatter()">
@@ -52,6 +55,13 @@
   <button style="float: right;" nz-button nzType="primary" nzSize="small" (click)="handlerQuickQuery()">
     <i class="fa fa-modx"></i>&nbsp;{{'common.quick' | translate}} {{'common.query' | translate}}
   </button>
+  <nz-dropdown-menu #executeMenu="nzDropdownMenu">
+    <ul nz-menu>
+      <li nz-menu-item *ngFor="let command of executeCommands" (click)="handlerExecuteCommand(command)">
+        {{command.name}}
+      </li>
+    </ul>
+  </nz-dropdown-menu>
 </ng-template>
 <!-- Query result container -->
 <nz-card style="margin-top: 10px;" nzTitle="{{'common.result'|translate}}">

diff --git a/src/renderer/app/pages/query/query/query.component.ts b/src/renderer/app/pages/query/query/query.component.ts
@@ -14,6 +14,7 @@ import { StateEnum } from '@renderer/enum/state.enum';
 import { SqlUtils } from '@renderer/utils/sql.utils';
 import { ResponseDataModel } from '@renderer/model/response.model';
 import { SystemEditorModel } from '@renderer/model/system.model';
+import { CommandModel } from '@renderer/model/command.model';
 
 @Component({
   selector: 'app-query',
@@ -30,6 +31,7 @@ export class QueryComponent extends BaseComponent implements AfterViewInit {
     cancel: true
   };
   responseTableData: ResponseDataModel[] = new Array();
+  executeCommands: CommandModel[] = new Array();
   editorContainers = [];
   resultContainers = [];
   loadingContainers = [];
@@ -50,6 +52,7 @@ export class QueryComponent extends BaseComponent implements AfterViewInit {
     this.loadingContainers.push({loading: false});
     this.responseTableData.push(new ResponseDataModel());
     this.processorContainers.push({icon: 'tint', color: '#2db7f5'});
+    this.executeCommands.push(new CommandModel('EXPLAIN ...', 'EXPLAIN {0}'));
   }
 
   ngAfterViewInit(): void {
@@ -60,12 +63,7 @@ export class QueryComponent extends BaseComponent implements AfterViewInit {
         'Ctrl-Enter': function(cm) {
           // queryInstance.handlerExecute(null);
           // Call the click method with the fetch element tag
-          const selectionContext = cm.getSelection();
-          if (StringUtils.isNotEmpty(selectionContext)) {
-            document.getElementById('selectionExecuteButton').click();
-          } else {
-            document.getElementById('executeButton').click();
-          }
+          document.getElementById('executeButton').click();
         }
       });
     }, 0);
@@ -77,18 +75,25 @@ export class QueryComponent extends BaseComponent implements AfterViewInit {
     status === true ? this.disabledButton.execute = true : this.disabledButton.execute = false;
   }
 
-  handlerExecute(sql?: string) {
+  handlerExecute(command?: CommandModel) {
     this.disabledButton.execute = true;
     this.disabledButton.cancel = false;
     this.loading.button = true;
     this.loadingContainers[this.containerSelected].loading = true;
     const queryHistory = new QueryHistoryModel();
+    const codeMirror = this.codeEditors.get(this.containerSelected)['codeMirror'];
+    let sql = codeMirror.getValue();
+    if (StringUtils.isNotEmpty(codeMirror.getSelection())) {
+      sql = codeMirror.getSelection();
+    }
+    if (command?.name) {
+      sql = StringUtils.format(command.format, [sql]);
+    }
     queryHistory.id = Md5.hashStr(sql + new Date());
     queryHistory.startTime = Date.parse(new Date().toString());
     const request = new RequestModel();
     request.config = this.datasourceService.getAll(this.datasource)?.data?.columns[0];
     queryHistory.server = this.datasource;
-    sql = StringUtils.isEmpty(sql) ? this.codeEditors.get(this.containerSelected)['codeMirror'].getValue() : sql;
     queryHistory.query = sql;
     this.processorContainers[this.containerSelected].icon = 'spinner fa-spin';
     this.processorContainers[this.containerSelected].color = 'cyan';
@@ -119,11 +124,6 @@ export class QueryComponent extends BaseComponent implements AfterViewInit {
     });
   }
 
-  handlerSelectionExecute() {
-    const codeMirror = this.codeEditors.get(this.containerSelected)['codeMirror'];
-    this.handlerExecute(codeMirror.getSelection());
-  }
-
   handlerFormatter() {
     const codeMirror = this.codeEditors.get(this.containerSelected)['codeMirror'];
     codeMirror.setValue(SqlUtils.formatter(codeMirror.getValue(), this.editorConfig));
@@ -166,4 +166,8 @@ export class QueryComponent extends BaseComponent implements AfterViewInit {
     const codeMirror = this.codeEditors.get(this.containerSelected)['codeMirror'];
     codeMirror.setValue(sql);
   }
+
+  handlerExecuteCommand(command: CommandModel) {
+    this.handlerExecute(command);
+  }
 }
diff --git a/src/renderer/assets/i18n/en.json b/src/renderer/assets/i18n/en.json
@@ -165,6 +165,7 @@
     "elapsed": "Total Time (sec)",
     "rowsRead": "The total number of rows of data read",
     "bytesRead": "The total number of bytes of data read",
+    "execute": "Press Ctrl+Enter to execute the command",
     "editor": {
       "preview": "Real-time feedback on editor modification status",
       "activeLine": "Highlight the current selection row shown with the mouse",

diff --git a/src/renderer/assets/i18n/zh.json b/src/renderer/assets/i18n/zh.json
@@ -165,6 +165,7 @@
     "elapsed": "耗时总时长(秒)",
     "rowsRead": "读取数据的总行数",
     "bytesRead": "读取数据的总字节数",
+    "execute": "Press Ctrl+Enter to execute the command",
     "editor": {
       "preview": "实时反馈编辑器修改状态",
       "activeLine": "用鼠标高亮显示当前选择行",

diff --git a/src/renderer/components/query/quick/quick.query.component.ts b/src/renderer/components/query/quick/quick.query.component.ts
@@ -82,8 +82,7 @@ export class QuickQueryComponent extends BaseComponent {
   }
 
   handlerQuickCommand(command: { name: string, value: string }) {
-    const dt = StringUtils.format('{0}.{1}', [this.database, this.table]);
-    const sql = StringUtils.format(command.value, [dt]);
+    const sql = StringUtils.format(command.value, [this.database, this.table]);
     this.emitterValue.emit(sql);
     this.handlerCancel();
   }

diff --git a/src/renderer/model/command.model.ts b/src/renderer/model/command.model.ts
@@ -0,0 +1,9 @@
+export class CommandModel {
+  name: string;
+  format: string;
+
+  constructor(name: string, format: string) {
+    this.name = name;
+    this.format = format;
+  }
+}
diff --git a/src/renderer/services/query/query.quick.service.ts b/src/renderer/services/query/query.quick.service.ts
@@ -2,16 +2,19 @@ export class QueryQuickService {
   getQuickAll() {
     return [{
       name: 'DESCRIBE ...',
-      value: 'DESCRIBE {0}'
+      value: 'DESCRIBE `{0}`.`{1}`'
     }, {
       name: 'SHOW CREATE TABLE ...',
-      value: 'SHOW CREATE TABLE {0}'
+      value: 'SHOW CREATE TABLE `{0}`.`{1}`'
     }, {
       name: 'SELECT ... LIMIT 100',
-      value: 'SELECT * FROM {0} LIMIT 100'
+      value: 'SELECT * FROM `{0}`.`{1}` LIMIT 100'
     }, {
       name: 'SELECT COUNT FROM ...',
-      value: 'SELECT COUNT(1) FROM {0}'
+      value: 'SELECT COUNT(1) FROM `{0}`.`{1}`'
+    }, {
+      name: 'SHOW PARTITIONS FROM ...',
+      value: 'SELECT `partition` FROM `system`.parts WHERE `database` = \'{0}\' AND `table` = \'{1}\''
     }];
   }
 }
diff --git a/src/renderer/services/query/query.service.ts b/src/renderer/services/query/query.service.ts
@@ -23,6 +23,7 @@ export class QueryService implements BaseService {
           sql += '\nLIMIT ' + limit;
         }
       } catch (err) {
+        console.log(err);
         // The SQL tree fails to be parsed and no action is taken
       }
     }