Merge pull request #258 from qianmoQ/1.22.0-SNAPSHOT

1.22.0 snapshot

Author: qianmoQ

src/renderer/app/pages/management/datasource/datasource.component.html

@@ -11,7 +11,7 @@
     </ng-template>
   </nz-empty>
   <ng-template #notHasValues>
-    <nz-table #basicTable [nzData]="tableDetails">
+    <nz-table #basicTable [nzData]="tableDetails" nzTableLayout="fixed">
       <thead>
       <tr>
         <th>{{'common.alias' | translate}}</th>
@@ -31,13 +31,15 @@
       </thead>
       <tbody>
       <tr *ngFor="let data of basicTable.data" style="{{!data.status ? 'color: #F50;': ''}}">
-        <td>{{data.alias}}</td>
-        <td>{{data.name ? data.name : '-'}}</td>
-        <td>{{data.host}}</td>
-        <td>{{data.protocol}}</td>
-        <td>{{data.type}}</td>
-        <td>{{data.username ? data.username : '-'}}</td>
-        <td>{{data.version ? data.version : '-'}}</td>
+        <td nzEllipsis>{{data.alias}}</td>
+        <td nzEllipsis>{{data.name ? data.name : '-'}}</td>
+        <td nzEllipsis>{{data.host}}</td>
+        <td nzEllipsis>{{data.protocol}}</td>
+        <td>
+          <nz-avatar nzIcon="user" nzSrc="/renderer/assets/icon/source/{{data.type}}.svg"></nz-avatar>
+        </td>
+        <td nzEllipsis>{{data.username ? data.username : '-'}}</td>
+        <td nzEllipsis>{{data.version ? data.version : '-'}}</td>
         <td>
           <button nz-button nzShape="circle" nzSize="small" nzType="primary"
                   nz-tooltip nzTooltipTitle="{{'common.edit' | translate}}">

src/renderer/app/pages/query/beta/query.beta.component.html

@@ -44,6 +44,20 @@
               <i nz-icon nzType="close-circle" nzTheme="outline"></i>
               {{'common.cancel'|translate}}
             </button>
+            <div *ngIf="applyResult.headers.length > 0 && applyResult?.statistics" style="float: right;">
+              <nz-tag [nzColor]="'#87d068'" nz-tooltip nzTooltipTitle="{{'tooltip.rows'|translate}}">
+                <i class="fa fa-columns"></i> {{applyResult.columns.length}}
+              </nz-tag>
+              <nz-tag [nzColor]="'#87d068'" nz-tooltip nzTooltipTitle="{{'tooltip.elapsed'|translate}}">
+                <i class="fa fa-clock-o"></i> {{applyResult.statistics.elapsed}}
+              </nz-tag>
+              <nz-tag [nzColor]="'#87d068'" nz-tooltip nzTooltipTitle="{{'tooltip.rowsRead'|translate}}">
+                <i class="fa fa-columns"></i> {{applyResult.statistics.rows_read}}
+              </nz-tag>
+              <nz-tag [nzColor]="'#87d068'" nz-tooltip nzTooltipTitle="{{'tooltip.bytesRead'|translate}}">
+                <i class="fa fa-braille"></i> {{applyResult.statistics.bytes_read}}
+              </nz-tag>
+            </div>
           </ng-template>
         </div>
         <div nz-col class="gutter-row" [nzSpan]="24">

src/renderer/app/pages/query/beta/query.beta.component.ts

@@ -62,6 +62,7 @@ export class QueryBetaComponent implements AfterViewInit, AfterViewChecked {
     configuration: {...DefaultConfig},
     headers: [],
     columns: [],
+    statistics: null,
     message: null,
     status: false,
     height: 0,
@@ -231,6 +232,7 @@ export class QueryBetaComponent implements AfterViewInit, AfterViewChecked {
                   this.applyResult.headers.push({key: column.name, title: column.name});
                 });
                 this.applyResult.columns = response.data.columns;
+                this.applyResult.statistics = response.data.statistics;
                 if (this.applyResult.headers.length > 0) {
                   this.applyResult.columns = response.data.columns;
                   if (this.applyResult.columns.length > 0) {

src/renderer/components/datasource/clickhouse/datasource.clickhouse.component.html

@@ -23,6 +23,7 @@
         <nz-form-control nzErrorTip="{{'placeholder.protocol'|translate}}">
           <nz-radio-group formControlName="protocol" [(ngModel)]="configure.protocol">
             <label nz-radio nzValue="HTTP">HTTP</label>
+            <label nz-radio nzValue="HTTPS">HTTPS</label>
             <label nz-radio nzValue="SSH">SSH</label>
           </nz-radio-group>
         </nz-form-control>

src/renderer/config/plugin/mysql.config.ts

@@ -3,10 +3,9 @@ import { BaseConfig } from "@renderer/config/base.config";
 export class MySQLConfig implements BaseConfig {
   columnDiskUsedRatio = `SELECT '{0}' AS db, '{1}' AS name`;
   columnItems = `
-SELECT
-  TABLE_SCHEMA AS "database", TABLE_NAME AS tableName, COLUMN_NAME AS name,
+SELECT TABLE_SCHEMA AS "database", TABLE_NAME AS tableName, COLUMN_NAME AS name
   -- DATA_TYPE AS type
-  concat(DATA_TYPE, '(', CHARACTER_MAXIMUM_LENGTH, ')') AS type
+--   concat(DATA_TYPE, '(', CHARACTER_MAXIMUM_LENGTH, ')') AS type
 FROM information_schema.columns
 WHERE table_schema = '{0}' AND table_name = '{1}'
 GROUP BY COLUMN_NAME
@@ -87,9 +86,7 @@ FROM information_schema.tables
 WHERE table_schema = '{0}'
   `;
   tableItems = `
-SELECT
-  table_schema AS "database", TABLE_NAME AS name,
-  ENGINE AS value, MAX_DATA_LENGTH AS total_rows
+SELECT table_schema AS "database", TABLE_NAME AS name
 FROM information_schema.tables
 WHERE table_schema = '{0}'
 GROUP BY TABLE_NAME

src/renderer/plugin/clickhouse.plugin.ts

@@ -14,8 +14,9 @@ import { UrlUtils } from "@renderer/utils/url.utils";
 export class ClickHousePlugin implements PluginInterface {
 
   constructor(private httpService: HttpService,
-    private sshService: SshService,
-    private basicService: BasicService) { }
+              private sshService: SshService,
+              private basicService: BasicService) {
+  }
 
   getName(): DatabaseEnum {
     return DatabaseEnum.clickhosue;
@@ -29,6 +30,7 @@ export class ClickHousePlugin implements PluginInterface {
     const configure = request.config;
     switch (configure.protocol) {
       case 'HTTP':
+      case 'HTTPS':
         return this.httpService.post(UrlUtils.formatUrl(request), sql);
       case 'SSH':
         const basicConfig = this.getConfig();
@@ -49,4 +51,4 @@ export class ClickHousePlugin implements PluginInterface {
         return Promise.reject(new Error('Unsupported protocol'));
     }
   }
-}
+}

src/renderer/services/forward.service.ts

@@ -36,6 +36,7 @@ export class ForwardService {
     const configure = request.config;
     switch (configure.protocol) {
       case 'HTTP':
+      case 'HTTPS':
         let response;
         switch (configure.type) {
           case DatabaseEnum.clickhosue: