Merge 9f465d6 into a1d155e

.electron-vue/build.js

@@ -5,11 +5,9 @@ process.env.NODE_ENV = 'production'
 const { say } = require('cfonts')
 const chalk = require('chalk')
 const del = require('del')
-const { spawn } = require('child_process')
 const webpack = require('webpack')
 const Multispinner = require('multispinner')
 
-
 const mainConfig = require('./webpack.main.config')
 const rendererConfig = require('./webpack.renderer.config')
 const webConfig = require('./webpack.web.config')

.github/workflows/upload-to-release.yml

@@ -0,0 +1,47 @@
+name: Publish New Release
+
+on:
+  pull_request:
+    branch:
+      - 'master'
+
+jobs:
+  build-and-deploy:
+    runs-on: macos-latest
+    steps:
+
+    # Step 1: download the source code (pull the code from CI / CD to your local)
+    - name: Checkout
+      uses: actions/checkout@master
+
+    # Step 2: package and build
+    - name: Build
+      uses: actions/setup-node@master
+    - run: npm install yarn
+    - run: yarn install
+    - run: yarn run build
+    - run: tar -zcf dbm-mac.tar.gz ./build/mac/dbm.app
+
+    # Step 3: release
+    - name: Create Release
+      id: create_release
+      uses: actions/create-release@master
+      env:
+        GITHUB_TOKEN: ${{ secrets.TOKEN }}
+      with:
+        tag_name: 1.4.0
+        release_name: 1.4.0
+        draft: false
+        prerelease: false
+
+    # Step 4: upload the build result to release (upload the packaged tgz to release)
+    - name: Upload Release Asset
+      id: upload-release-asset
+      uses: actions/upload-release-asset@master
+      env:
+        GITHUB_TOKEN: ${{ secrets.TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./dbm-mac.tar.gz
+        asset_name: dbm-mac.tar.gz
+        asset_content_type: application/x-tg

.gitignore

@@ -11,3 +11,5 @@ thumbs.db
 !.gitkeep
 *.log
 yarn.lock
+
+.idea/

README.md

@@ -1,30 +1,70 @@
-# DBM(Incubator)
+<br />
+<p align="center">
+    <a href="https://github.com/EdurtIO/incubator-dbm">
+      <img src="static/images/logo.svg" alt="Logo" width="120px" height="120px">
+    </a>
+    <h2 align="center">DBM</h3>
+    <p align="center">
+    An awesome database management tool specified for <a href='https://clickhouse.tech'>ClickHouse</a>. For more information: <a href='https://dbm.incubator.edurt.io'>https://dbm.incubator.edurt.io</a>.
+    <br />
+  </p>
+</p>
 
-DabaBase Manager Tools!
-
-### Feature
 ---
 
-- Support query history (clear support)
-- Support quick query
-- Support table (metadata, delete, preview)
-- Support database (delete, create)
+## :rocket: Features
+
+- Support query history (pagination, clear all, etc.)
+- Support selected sql clauses query
+- Support terminating query
+- Support table management (metadata, delete, preview)
+- Support database management (delete, create)
 - Support custom query
-- Support mulitple data source
+- Support multiple data sources management(connection test, monitoring)
+- Support customized appearance
+- Support monitor (processor, connection, query)
 
-### How to build?
----
+## :gear: Installation
+
+macOS
+
+- Download zip from [here](/releases/download/1.3.0-SNAPSHOT/DBM-Incubator-mac.zip).
+- Unzip the archive, and install to macOS Applications.
+
+Other platforms
+
+- Unsupported temporarily. You can install the DBM by [building from source](#hammer_and_wrench-build-from-source).
+
+Install other versions?
+
+- Go ahead to [Github Release](/releases) for all releases.
+
+## :hammer_and_wrench: Build from source
 
-- Install dependencies
+1. Install dependencies
 
 ```bash
+npm install -g node-sass
+
 yarn install
 ```
 
-- Build electron app for production
+2. Build electron app for production
 
 ```bash
 yarn run build
 ```
 
-App: `./build/incubator-dbm-<VERSION>-<OS>.zip`
+3. Install from built zip: `./build/dbm-<VERSION>-<OS>.zip`
+
+4. Run dev mode
+
+```bash
+yarn run dev
+```
+
+or
+
+```bash
+npm start
+```

docs/_config.yml

@@ -1,7 +1,7 @@
-title: DBM(Incubator)
+title: DBM
 email: [email protected]
 description: >
-  DBM(Incubator) Websites.
+  DBM Websites.
 lang: en-US
 
 baseurl: "/"

docs/_data/docs.yml

@@ -1,6 +1,7 @@
 - title: Getting Started
   docs:
   - home
+  - datasource
 - title: Development
   docs:
   - contribution

docs/_docs/DataSource.md

@@ -0,0 +1,57 @@
+---
+title: DataSource
+permalink: /docs/datasource/
+redirect_from: /docs/index.html
+---
+
+The datasource is mainly used to manage the Clickhouse service data source and for later query monitoring.
+
+### Create DataSource
+
+---
+Open the DBM application and find the `DataSource` menu at the top. Click on the drop-down `DataSource submenu` and the following interface appears:
+
+![-w1280](http://downloads.edurt.io/images/20210813/16287936723069-16287936892327.jpg)
+
+---
+Click the `+` button(blue) to add the DataSource. The following pop-up box appears:
+
+![-w648](http://downloads.edurt.io/images/20210813/16287938888381-16287938950497.jpg)
+
+There are two types of data source parameters:
+
+##### Connection Setting
+
+- `Alias Name`: This field is only used to mark an alias of the current attribute, default `localhost`
+which is easy to remember and has no special meaning
+- `Protocol`: Connection Service Protocol, default `http`
+- `Host`: Enter the host name or IP address of the remote server here, default `localhost`
+- `Port`: Enter the host address of the remote server here, corresponding to the open port, default `8123`
+- `User Name`: Connection service user name, enter if set, default `default`
+- `Password`: Connection service user password, if set please enter
+
+##### Advanced Setting
+
+- `Prohibit DROP operation`: Forbids the DROP operation (only custom queries are supported) and is currently an experimental feature
+
+---
+The `Test Connection` button is used to Test whether the current configuration information can be connected
+
+The `OK` button is used to save and persist the current configuration
+
+After clicking `OK`, we will save the configuration information you wrote for your next use
+
+The configuration information can be saved in two states
+
+- `Stop`: Stop status, which indicates that the service is currently unavailable, marked with the stop icon
+- `Start`: Enabled, which indicates that the service is currently available for operations such as queries, and is marked with a play icon
+
+> The newly added data source is in the stopped state by default, and you need to manually refresh it. It takes effect for all data sources. Click the Refresh (green) button to take effect.
+
+### Edit DataSource
+
+In the data list Action, use an editor icon to indicate that the data source can be edited Click it.
+
+### Delete DataSource
+
+In the Action data list, use the recycle bin icon to indicate that the data source can be deleted. Click to modify.

docs/_posts/2021-06-01-index.md

@@ -7,6 +7,7 @@ author: qianmoQ
 #### Here are some of our historical releases
 ---
 
+- [1.4.0](/blog/2021/08/16/1.4.0-Release/)
 - [1.3.0-SNAPSHOT](/blog/2021/07/23/1.3.0-SNAPSHOT/)
 - [1.2.0-SNAPSHOT](/blog/2021/07/06/1.2.0-SNAPSHOT/)
 - [1.1.0-SNAPSHOT](/blog/2021/06/18/1.1.0-SNAPSHOT/)

docs/_posts/2021-07-23-1.3.0-SNAPSHOT.md

@@ -29,7 +29,7 @@ DBM Version for 1.3.0-SNAPSHOT is released!
 - Add top menu overload application shortcut function
 - Support general configuration of global editor
 - Support developer mode application icon display
-- Supoort sql format
+- Support sql format
 - Query history supports copying SQL
 - Replace debug mode prompt
 - Support users to authorize users to access Clickhouse

docs/_posts/2021-08-16-1.4.0-Release.md

@@ -0,0 +1,49 @@
+---
+layout: post
+title:  "1.4.0"
+date:   2021-08-16
+author: qianmoQ
+---
+
+DBM Version for 1.4.0 is released!
+
+#### UI
+---
+
+- Set the default maximized window
+
+#### Enhancement
+---
+
+- Support migrate data
+- Support for building Log engine tables
+- Support display Track DDL
+- Support the Track input box to obtain the focus display
+- Supports Windows system construction
+- Support track query execution thread
+- Support data source query times to be displayed on the dashboard
+- Add query link tracing visualization
+- Support multiple query windows [issues-12](https://github.com/EdurtIO/incubator-dbm/issues/12)
+- Supports obtaining the occupied space of columns throug… …
+- Supports data source modification
+- Support display table usage when the database is selected
+- Support service nodes to display database disk usage
+- Support service nodes to display disk usage
+- Support Data construction of left tree menu [issues-20](https://github.com/EdurtIO/incubator-dbm/issues/20)
+- Supports the monitoring of mutations operation
+
+#### Bugs
+---
+
+- Fix metadata selection library table causing data rendering errors
+
+#### Optimize
+---
+
+- Support the mutation consumption duration
+- Optimized README.md
+
+#### CI
+---
+
+- Add auto release version CI script

docs/index.html

@@ -4,7 +4,7 @@
 
 <div class="header-container jumbotron">
     <div class="container">
-        <h1>DBM(Incubator)</h1>
+        <h1>DBM</h1>
         <p>ClickHouse DabaBase Manager Tools!</p>
         <p><a class="btn btn-primary btn-lg" href="{{ "/docs/home/" | relative_url }}" role="button">Learn more</a></p>
     </div>

package.json

@@ -1,14 +1,15 @@
 {
-  "name": "DBM(Incubator)",
-  "version": "1.3.0-SNAPSHOT",
+  "name": "dbm",
+  "version": "1.4.0",
   "author": "qianmoQ <[email protected]>",
   "description": "Dababase Manager Tools",
   "credits": "EdurtIO",
   "github": "https://github.com/EdurtIO/incubator-dbm.git",
   "license": "Apache",
   "main": "./dist/electron/main.js",
   "scripts": {
-    "build": "node .electron-vue/build.js && electron-builder",
+    "build": "node .electron-vue/build.js && electron-builder --publish never",
+    "build:win": "node .electron-vue/build.js && electron-builder --publish never --win",
     "build:dir": "node .electron-vue/build.js && electron-builder --dir",
     "build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js",
     "build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js",
@@ -21,7 +22,7 @@
     "postinstall": "npm run lint:fix"
   },
   "build": {
-    "productName": "DBM(Incubator)",
+    "productName": "dbm",
     "appId": "io.edurt.incubator.dbm",
     "directories": {
       "output": "build"
@@ -56,15 +57,12 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome": "^1.1.8",
-    "@fortawesome/fontawesome-free-brands": "^5.0.13",
-    "@fortawesome/fontawesome-free-regular": "^5.0.13",
-    "@fortawesome/fontawesome-free-solid": "^5.0.13",
-    "@fortawesome/fontawesome-svg-core": "^1.2.35",
+    "@fortawesome/fontawesome-free": "^5.15.3",
+    "@fortawesome/free-brands-svg-icons": "^5.15.3",
     "@fortawesome/free-solid-svg-icons": "^5.15.3",
-    "@fortawesome/vue-fontawesome": "^2.0.2",
     "axios": "0.17.1",
     "echarts": "^5.1.2",
-    "element-ui": "^2.15.3",
+    "element-ui": "^2.15.5",
     "es6-promise": "4.2.8",
     "highcharts": "^9.1.2",
     "highcharts-vue": "^1.4.0",
@@ -75,6 +73,7 @@
     "vue": "^2.6.14",
     "vue-clipboard2": "^0.3.1",
     "vue-codemirror": "^4.0.6",
+    "vue-context-menu": "^2.0.6",
     "vue-electron": "^1.0.6",
     "vue-i18n": "^8.24.5",
     "vue-router": "3.0.1",
@@ -109,7 +108,7 @@
     "html-webpack-plugin": "^2.30.1",
     "multispinner": "^0.2.1",
     "node-loader": "^0.6.0",
-    "node-sass": "^4.7.2",
+    "node-sass": "^6.0.1",
     "sass-loader": "6.0.6",
     "style-loader": "^0.18.2",
     "svg-sprite-loader": "3.5.2",

src/index.ejs

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>DBM(Incubator)</title>
+    <title>DBM</title>
     <% if (htmlWebpackPlugin.options.nodeModules) { %>
       <!-- Add `node_modules/` to global paths so `require` works properly in development -->
       <script>

src/main/index.js

@@ -35,6 +35,9 @@ function createWindow() {
     }
   })
 
+  // Maximize window
+  mainWindow.maximize()
+
   // Support copy and paste on mac
   if (platform === 'darwin') {
     const template = [