From 42507aa47ea050143b3176c252f47bf234bfe2cb Mon Sep 17 00:00:00 2001
From: zhangkai <98162099@163.com>
Date: Wed, 12 Jul 2023 16:56:08 +0800
Subject: [PATCH] support tdengine server 3.0+

---
 main.js                  |  2 +
 renderer/index.html      | 68 ++++++++++++++++----------------
 renderer/index.js        | 83 ++++++++++++++++++++--------------------
 renderer/taosrestful_.js | 27 +++++++++----
 4 files changed, 98 insertions(+), 82 deletions(-)

diff --git a/main.js b/main.js
index f885e58..0347634 100644
--- a/main.js
+++ b/main.js
@@ -10,6 +10,8 @@ function createWindow () {
   })
 
   win.loadFile('./renderer/index.html')
+
+  // win.webContents.openDevTools()
 }
 
 app.whenReady().then(createWindow)
diff --git a/renderer/index.html b/renderer/index.html
index a445f8a..bf07aa6 100644
--- a/renderer/index.html
+++ b/renderer/index.html
@@ -19,7 +19,7 @@
         <div v-loading="loadingLinks">
           <el-row>
             <el-button class="linkBtn" @click="addLinkDialog = true" size="small" type="primary" plain>新建连接</el-button>
-          </el-row>   
+          </el-row>
           <el-menu class="menu"  @open="freshDB" :unique-opened="true">
             <el-submenu :index="String(index)" :key="index" v-for="(link, index) in links">
               <template slot="title">
@@ -37,10 +37,10 @@
                 <img class="icon111" @click.stop="deleteDB(link, db.name, index)"  src="./img/delete.png">
               </el-menu-item>
             </el-submenu>
-            
+
           </el-menu>
         </div>
-        
+
       </el-drawer>
       <!-- 新建连接的弹窗 -->
 
@@ -115,7 +115,7 @@
           <el-button type="primary" @click="postaddDB" size="medium">确 定</el-button>
         </div>
       </el-dialog>
-      
+
       <el-container class="main">
         <el-container class="mainContent">
           <el-tabs v-model="activeTab" type="border-card" class="mainTab"  @tab-click="handleSwichTab">
@@ -133,7 +133,7 @@
                     <el-table-column
                       label="超级表名"
                       width="180">
-                      <template slot="header" slot-scope="scope">   
+                      <template slot="header" slot-scope="scope">
                         <span>超级表名</span>
                         <div class="iconWrapper">
                           <div class="iconWrapper_" @click.stop="SuperTdialog=true">
@@ -148,13 +148,13 @@
                       </template>
                       <template slot-scope="scope">
                         <img class="icon1" src="./img/file.png">
-                        <span class="surperTables">{{ scope.row.name }}</span>
+                        <span class="surperTables">{{ scope.row.name || scope.row.stable_name}}</span>
                         <div class="iconWrapper2">
                           <!-- <img class="icon1" @click="editSurperT(scope.row.name)" src="./img/edit.png"> -->
-                          <img class="icon1" @click.stop="deleteSurperT(scope.row.name)" src="./img/delete.png">
+                          <img class="icon1" @click.stop="deleteSurperT(scope.row)" src="./img/delete.png">
                         </div>
                       </template>
-                      
+
                     </el-table-column>
                     </el-table>
                     <el-dialog
@@ -179,7 +179,7 @@
                     <el-dialog :close-on-click-modal="false" :before-close="concelSurperTableFilter" title="筛选条件" :visible.sync="surperTableFilterDialog">
                       <el-form  :model="surperTableFilter" label-width="80px">
                           <el-form-item label="数据项" >
-                            <el-checkbox-group 
+                            <el-checkbox-group
                               v-model="surperTableFilter.fields">
                               <el-row class="btnGroup">
                                 <el-button-group>
@@ -212,7 +212,7 @@
                             inactive-text="时间倒序">
                           </el-switch>
 
-                        </el-form>  
+                        </el-form>
                         <span slot="footer" class="dialog-footer">
                           <el-button @click="concelSurperTableFilter" size="small">取消</el-button>
                           <el-button @click="postSurperTableFilter" size="small">设置</el-button>
@@ -255,7 +255,7 @@
                         <el-button @click="selectSurperData(false, false)" size="small" style="width: 100%" icon="el-icon-refresh">数据刷新</el-button>
                       </el-col>
                     </el-row>
-                    
+
                     <el-table
                       size="mini"
                       :data="surperTableData"
@@ -288,7 +288,7 @@
                         :total="totalSurperTable">
                       </el-pagination>
                     </div>
-                  </div>         
+                  </div>
                 </el-main>
               </el-container>
             </el-tab-pane>
@@ -306,9 +306,9 @@
                       <el-table-column
                         label="表名"
                         width="180">
-                        <template slot="header" slot-scope="scope">   
+                        <template slot="header" slot-scope="scope">
                           <span>表名</span>
-                          <div class="iconWrapper"> 
+                          <div class="iconWrapper">
                             <div class="iconWrapper_ " @click="Tdialog=true">
                               <img class="icon1" v-if="searchIcon" @mouseenter="searchIcon = false" src="./img/search_.png">
                               <img class="icon1" v-else src="./img/search.png" @mouseleave="searchIcon = true">
@@ -321,13 +321,13 @@
                         </template>
                         <template slot-scope="scope">
                           <img class="icon1" src="./img/file.png">
-                          <span  class="surperTables">{{ scope.row.table_name }}</span>
+                          <span  class="surperTables">{{ scope.row.table_name || scope.row.name}}</span>
                           <div class="iconWrapper2">
                             <!-- <img class="icon1" @click="editT" src="./img/edit.png"> -->
-                            <img class="icon1" @click.stop="deleteT(scope.row.table_name)" src="./img/delete.png">
+                            <img class="icon1" @click.stop="deleteT(scope.row)" src="./img/delete.png">
                           </div>
                         </template>
-                        
+
                       </el-table-column>
                     </el-table>
                     <el-dialog
@@ -346,12 +346,12 @@
                     </el-dialog>
                   </div>
                 </el-aside>
-                <el-main>      
+                <el-main>
                   <div v-loading="loadingTable">
                     <el-dialog :close-on-click-modal="false" :before-close="concelTableFilter"	title="筛选条件" :visible.sync="tableFilterDialog">
                       <el-form  :model="tableFilter" label-width="80px">
                           <el-form-item label="数据项" >
-                            <el-checkbox-group 
+                            <el-checkbox-group
                               v-model="tableFilter.fields">
                               <el-row class="btnGroup">
                                 <el-button-group>
@@ -367,7 +367,7 @@
                             </el-checkbox-group>
                           </el-form-item>
                           <el-form-item label="每页数目">
-                            
+
                             <el-radio-group v-model="eachPageTable">
                               <el-row class="checkboxGroup2">
                                 <el-radio :label="10">10</el-radio>
@@ -384,7 +384,7 @@
                           active-text="时间倒序"
                           inactive-text="时间正序">
                         </el-switch>
-                        </el-form>  
+                        </el-form>
                         <span slot="footer" class="dialog-footer">
                           <el-button @click="concelTableFilter" size="small">取消</el-button>
                           <el-button @click="postTableFilter" size="small">设置</el-button>
@@ -474,26 +474,26 @@
             </el-tab-pane>
             <el-tab-pane label="当前数据库属性" name="4"><p v-html='dbInfo'></p></el-tab-pane>
           </el-tabs>
-          
+
         </el-container>
-         <el-footer> 
-          
+         <el-footer>
+
            <el-button class="switchBtn" @click="drawer = true" type="text" size="small">
              <img class="icon" src="./img/switch.png" />
             切换</el-button>
             <div class="footTextWrapper">
 
             </div>
-            <div class="footText">当前连接:</div> 
-            <div class="footText greyText">{{theLink.name}}</div> 
-            <div class="footText">主机:</div> 
-            <div class="footText greyText">{{theLink.host}}</div> 
-            <div class="footText">端口:</div> 
-            <div class="footText greyText">{{theLink.port}}</div> 
-            <div class="footText">用户名:</div> 
-            <div class="footText greyText">{{theLink.user}}</div> 
-            <div class="footText">数据库:</div> 
-            <div class="footText greyText">{{theDB}}</div> 
+            <div class="footText">当前连接:</div>
+            <div class="footText greyText">{{theLink.name}}</div>
+            <div class="footText">主机:</div>
+            <div class="footText greyText">{{theLink.host}}</div>
+            <div class="footText">端口:</div>
+            <div class="footText greyText">{{theLink.port}}</div>
+            <div class="footText">用户名:</div>
+            <div class="footText greyText">{{theLink.user}}</div>
+            <div class="footText">数据库:</div>
+            <div class="footText greyText">{{theDB}}</div>
         </el-footer>
       </el-container>
 
diff --git a/renderer/index.js b/renderer/index.js
index 43a9f3a..854ce98 100644
--- a/renderer/index.js
+++ b/renderer/index.js
@@ -15,13 +15,13 @@ new Vue({
         }
         TaosRestful.getVersion(payload).then(data => {
           links[i].version = data
-          this.$data.links =links 
+          this.$data.links =links
         })
       }
-        
+
     },
     data: function() {
-      return { 
+      return {
         dbInfo:'',
         consoleResult:'',
         loadingLinks: false,
@@ -37,15 +37,15 @@ new Vue({
         activeTab:"1",
 
         surperTableFilterCopy:{},
-        
+
         surperTableFilter:{
           fields:[],
           surperDateRange:[],
           surperTSearchText: "",
           surperTSearchColumn: "",
         },
-        
-        tableFilterCopy:{}, 
+
+        tableFilterCopy:{},
         tableFilter:{
           fields:[],
           dateRange:[],
@@ -57,7 +57,7 @@ new Vue({
 
         tableFilterDialog:false,
         surperTableFilterDialog:false,
-        
+
         surperTables: [], //超级表list
         surperTableData: [],
         surperTableName: "",
@@ -135,7 +135,7 @@ new Vue({
           password:""
         }
       },
-      confirmAddLink(event) {    
+      confirmAddLink(event) {
         //新建连接，先连接，如果成功，将payload+name记入本地
         //var tr = new TaosRestful("121.36.56.117","6041","root","msl110918")
         let payload = {
@@ -151,10 +151,10 @@ new Vue({
               TaosRestful.getVersion(payload).then(_data => {
                 //连接成功，保存到本地
                 storage.AddALink({
-                  name: this.linkForm.name, 
-                  host: this.linkForm.host, 
-                  port: this.linkForm.port, 
-                  user: this.linkForm.user, 
+                  name: this.linkForm.name,
+                  host: this.linkForm.host,
+                  port: this.linkForm.port,
+                  user: this.linkForm.user,
                   password: this.linkForm.password,
                   version: _data
                 })
@@ -172,7 +172,7 @@ new Vue({
                 //更新连接列表
                 this.links = storage.getLinks()
               })
-             
+
             } else {
               //连接失败
               this.$message({
@@ -181,10 +181,10 @@ new Vue({
                 duration:1000
               });
             }
-            
+
         }
         )
-       
+
       },
       deleteLink(key, linkName){
         this.$confirm('确认删除连接' + linkName + "吗？")
@@ -282,7 +282,7 @@ new Vue({
                 type: 'error',
                 duration:1000
               });
-              return 
+              return
             }
           }
           TaosRestful.createDatabase(this.addDBname, payload,safe=true,keep= this.addDBkeep,update=this.addDBupdate,comp=this.addDBcomp, replica=this.addDBreplica,quorum=this.addDBquorum,blocks=this.addDBblocks).then(data => {
@@ -378,14 +378,14 @@ new Vue({
         })
         return info
       },
-      alartDB(link,dbName){        
+      alartDB(link,dbName){
         //切换数据库前先清空表
         this.dbInfo=this.makeDbInfo(link.dbs,dbName)
-        this.surperTables = []  
+        this.surperTables = []
         this.clearSurperTable()
         this.tables = []
         this.clearTable()
-      
+
         //记录进入的数据库
         this.theLink = link
         this.theDB = dbName
@@ -397,7 +397,7 @@ new Vue({
       },
       searchSurperTList(){
         this.SuperTdialog = false
-        this.surperTables = []  
+        this.surperTables = []
         this.clearSurperTable()
         let payload = {
           ip:this.theLink.host,
@@ -425,11 +425,11 @@ new Vue({
           }
           this.SuperTdialogText = ""
           this.loadingSurperList = false
-        }) 
+        })
 
       },
       freshSurperTList(){
-        this.surperTables = []  
+        this.surperTables = []
         this.clearSurperTable()
         this.freshSurperTables()
       },
@@ -498,10 +498,10 @@ new Vue({
       },
       freshSurperTables(){
         //清理超级表列表
-        this.surperTables = []  
+        this.surperTables = []
         //清理选中的超级表和具体数据
         this.clearSurperTable()
-        
+
         let payload = {
           ip:this.theLink.host,
           port:this.theLink.port,
@@ -526,7 +526,7 @@ new Vue({
             });
           }
           this.loadingSurperList = false
-        }) 
+        })
       },
       freshTables(){
         //清理表列表
@@ -576,7 +576,7 @@ new Vue({
           case "4":
             //数据库属性
             break;
-     } 
+     }
       },
       openSurperTableFilterD(){
         this.surperTableFilterDialog = true
@@ -622,7 +622,7 @@ new Vue({
           } else {
             this.surperWhere =this.surperTableFilter.surperTSearchColumn + " = '" + surperTSearchText +"'"
           }
-          
+
           this.selectSurperData(false)
         } else {
           this.surperWhere = ""
@@ -643,7 +643,7 @@ new Vue({
           } else {
             this.tableWhere =this.tableFilter.tableSearchColumn + " = '" + tableSearchText +"'"
           }
-          
+
           this.selectTData(false)
         } else {
           this.tableWhere = ""
@@ -792,14 +792,14 @@ new Vue({
       handleClickSurperT(val) {
         if(val){
           this.clearSurperTable()
-          this.surperTableName = val.name
+          this.surperTableName = val.name ? val.name : val.stable_name
           this.selectSurperData(true)
         }
-      },   
+      },
       handleClickT(val) {
         if(val){
           this.clearTable()
-          this.tableName = val.table_name   
+          this.tableName = val.name ? val.name : val.table_name
           this.selectTData(true)
         }
       },
@@ -813,7 +813,8 @@ new Vue({
         console.log(val)
       },
       deleteSurperT(val) {
-        this.$confirm('确认删除超级表' + val + "吗？")
+        let tableName = val.name ? val.name : val.stable_name
+        this.$confirm('确认删除超级表' + tableName + "吗？")
         .then(_ => {
           let payload = {
             ip:this.theLink.host,
@@ -824,7 +825,7 @@ new Vue({
           this.loadingSurperList = true
 
           //TODO没测试过
-          TaosRestful.dropTable(val, this.theDB, payload).then(data => {
+          TaosRestful.dropTable(tableName, this.theDB, payload).then(data => {
 
             if(data.res){
               //成功
@@ -843,7 +844,7 @@ new Vue({
             this.loadingSurperList = false
             this.freshSurperTables()
           })
-          
+
         })
         .catch(_ => {
           this.$message({
@@ -857,7 +858,8 @@ new Vue({
         console.log(val)
       },
       deleteT(val) {
-        this.$confirm('确认删除表' + val + "吗？")
+        let tableName = val.name ? val.name : val.table_name
+        this.$confirm('确认删除表' + tableName + "吗？")
         .then(_ => {
           let payload = {
             ip:this.theLink.host,
@@ -868,7 +870,7 @@ new Vue({
           this.loadingTableList = true
 
           //TODO没测试过
-          TaosRestful.dropTable(val, this.theDB, payload).then(data => {
+          TaosRestful.dropTable(tableName, this.theDB, payload).then(data => {
 
             if(data.res){
               //成功
@@ -887,7 +889,7 @@ new Vue({
             this.loadingTableList = false
             this.freshTables()
           })
-          
+
         })
         .catch(_ => {
           this.$message({
@@ -924,7 +926,7 @@ new Vue({
               duration:1000
             });
           }
-          
+
         })
       },
       closeSuperTdialog(){
@@ -952,10 +954,9 @@ new Vue({
             return this.tableLabelItems.fields? this.tableLabelItems.fields.indexOf(item) == -1: false;
         })
         this.tableFilter.fields = newFields
-      }  
-   
+      }
+
     }
   })
 
 
-  
\ No newline at end of file
diff --git a/renderer/taosrestful_.js b/renderer/taosrestful_.js
index c0faa42..f6d649e 100644
--- a/renderer/taosrestful_.js
+++ b/renderer/taosrestful_.js
@@ -3,7 +3,7 @@ const axios = require('axios')
 module.exports = {
    async sendRequest(sqlStr, payload){
     // console.log(sqlStr)
-    try {   
+    try {
         let res = await axios.post(`http://${payload.ip}:${payload.port}/rest/sql`, sqlStr, {
             auth: {
             username: payload.user,
@@ -12,12 +12,25 @@ module.exports = {
             timeout: payload.timeout
         })
         if (res.data.status == 'succ'){
-            // console.log(res.data.data)
-            // console.log(res.data.rows)
-            // console.log(res.data.head)
+            // tdengine server version 2.4+
             let head  = res.data.head
             let resData = res.data.data.map(item => Object.fromEntries(head.map((a,b)=>[a,item[b]])))
             return  {'res':true,'count':res.data.rows,'data':resData}
+        }else if (res.data.code == 0){
+            // tdengine server version 3.0+
+            let columnMeta = res.data.column_meta;
+            let resData = new Array()
+            for (let i = 0; i < res.data.data.length; i++) {
+                let curData = res.data.data[i]
+                let obj = new Object()
+                for (let j = 0; j < columnMeta.length; j++) {
+                    let fieldName = columnMeta[j][0]
+                    let fieldValue = curData[j];
+                    obj[fieldName] = fieldValue
+                }
+                resData.push(obj)
+            }
+            return  {'res':true,'count':res.data.rows,'data':resData}
         }else{
             return {'res':false,'msg':res.data.desc,'code':res.data.code}
         }
@@ -27,7 +40,7 @@ module.exports = {
         }else{
             return {'res':false,'msg':'连接错误','code':-1}
         }
-        
+
     }
 
    },
@@ -46,7 +59,7 @@ module.exports = {
         )
    },
    getVersion(payload){
-        //获取服务器版本    
+        //获取服务器版本
         return this.sendRequest('SELECT SERVER_VERSION()', payload).then(a =>
             {
                 if (a.res === false){
@@ -226,7 +239,7 @@ module.exports = {
                 return new Promise((resolve, reject)=>{resolve(0)})
             }
         })
-    },  
+    },
    rawSql(sqlStr,payload){
         return this.sendRequest(sqlStr,payload)
    },