feat:Execute the Record sql Add replication button

shanhexi · shanhexi · commit 164518d85c9b · 2023-12-25T16:19:52.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 3.1.16
+
+`2023-12-25`
+
+**Changelog**
+
+- ⭐【New Features】Execute the Record sql Add replication button
+- ⭐【New Features】Run record sql to open the console directly
+- ⭐【New Features】The SQL column on the right of execution record and save can be expanded and dragged
+- 🐞【Fixed】Some databases could not display the Database/Schema structure
+
 ## 3.1.15
 
 `2023-12-20`
@@ -58,9 +69,9 @@
 - 🔥🔥【Optimize】Optimized the tab switchover problem 
 - ⚡️ 【Optimize】All nodes are supported. The name of each node can be copied 
 - ⚡️【Optimize】The sql console input box supports switching databases, and will not change when the left database is switched 
-- ⭐ 【New function】Save records moved to the right toolbar, you can directly modify the name in the list 
-- ⭐【New feature】Support mongoDB 
-- ⭐【New function】Support for viewing all tables
+- ⭐ 【New Features】Save records moved to the right toolbar, you can directly modify the name in the list 
+- ⭐【New Features】Support mongoDB 
+- ⭐【New Features】Support for viewing all tables
 
 ## 3.0.14
 
diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md
@@ -1,3 +1,14 @@
+## 3.1.16
+
+`2023-12-25`
+
+**更新日志**
+
+- ⭐【新功能】执行记录sql添加复制按钮
+- ⭐【新功能】执行记录sql可直接打开控制台
+- ⭐【新功能】右侧执行记录、保存SQL栏展开大小可拖动
+- 🐞【修复】部分数据库无法显示数据库/Schema结构的问题
+
 ## 3.1.15
 
 `2023-12-20`
@@ -6,8 +17,6 @@
 
 - 🐞【修复】每次打开应用时，偶现无法选择数据库问题
 - 🐞【修复】兼容老数据类型无法显示删除问题
-- 🐞【修复】部分数据库无法显示数据库/Schema结构的问题
-
 
 ## 3.1.14
 
diff --git a/chat2db-client/src/components/Output/index.less b/chat2db-client/src/components/Output/index.less
@@ -36,12 +36,16 @@
         margin-right: 4px;
         font-weight: 500;
       }
-      .iconBox {
+      .timeBoxIcon {
         transform: rotate(90deg);
         margin-right: 4px;
         i {
           color: var(--color-success);
         }
+        &:hover {
+          cursor: default;
+          background-color: transparent;
+        }
       }
       .failureIconBox {
         i {
@@ -51,16 +55,26 @@
       > div {
         line-height: 22px;
       }
-      .sqlPlace {
-        color: var(--color-warning-text);
-      }
-      .sqlPlace,
-      .sqlBox {
-        padding-left: 18px;
-      }
       padding: 2px 0px;
     }
   }
-  .sqlBox {
+
+  .executedDatabaseBox,.sqlBox{
+    display: flex;
+    .iconBox{
+      margin-right: 4px;
+      flex-shrink: 0;
+    }
+  }
+
+  .executedDatabaseBox{
+    .executedDatabase {
+      color: var(--color-warning-text);
+      white-space: nowrap;
+    }
   }
+  // .sqlBox {
+  //   .sqlContent{
+  //   }
+  // }
 }
diff --git a/chat2db-client/src/components/Output/index.tsx b/chat2db-client/src/components/Output/index.tsx
@@ -6,6 +6,9 @@ import ScrollLoading from '@/components/ScrollLoading';
 import historyService, { IHistoryRecord } from '@/service/history';
 import * as monaco from 'monaco-editor';
 import i18n from '@/i18n';
+import { copy } from '@/utils';
+import { createConsole } from '@/pages/main/workspace/store/console';
+import { Popover } from 'antd';
 
 interface IProps {
   className?: string;
@@ -34,7 +37,8 @@ export default memo<IProps>((props) => {
         const promiseList = res.data.map((item) => {
           return new Promise((resolve) => {
             // 不换行
-            const ddl = (item.ddl || '')?.replace(/\n/g, ' ');
+            // const ddl = (item.ddl || '')?.replace(/\n/g, ' ');
+            const ddl = item.ddl || '';
             monaco.editor.colorize(ddl, 'sql', {}).then((_res) => {
               resolve({
                 ...item,
@@ -49,6 +53,22 @@ export default memo<IProps>((props) => {
       });
   };
 
+  const copySql = (text: IDatasource['ddl']) => {
+    copy(text || '');
+  }
+
+  const openSql = (data: IDatasource) => {
+    createConsole({
+      ddl: data.ddl || '',
+      dataSourceId: data.dataSourceId!,
+      dataSourceName: data.dataSourceName!,
+      databaseType: data.type!,
+      databaseName: data.databaseName!,
+      schemaName: data.schemaName!,
+      // operationType: WorkspaceTabType,
+    })
+  }
+
   return (
     <div className={classnames(styles.output, className)}>
       <div className={styles.outputTitle}>
@@ -64,19 +84,29 @@ export default memo<IProps>((props) => {
         >
           <>
             {dataSource.map((item, index) => {
-              const nameList = [item.databaseName, item.schemaName];
+              const nameList = [item.dataSourceName, item.databaseName, item.schemaName];
               return (
                 <div key={index} className={styles.outputItem}>
                   <div className={styles.timeBox}>
-                    <div className={classnames(styles.iconBox, { [styles.failureIconBox]: item.status !== 'success' })}>
-                      <Iconfont code="&#xe650;" />
-                    </div>
+                    <Iconfont classNameBox={classnames(styles.timeBoxIcon, { [styles.failureIconBox]: item.status !== 'success' })} box boxSize={20} code="&#xe650;" />
                     <span className={styles.timeSpan}>[{item.gmtCreate}]</span>
                     {/* {!!item.operationRows && <span>{item.operationRows} rows</span>} */}
                     {!!item.useTime && <span>{i18n('common.text.executionTime', item.useTime)}</span>}
                   </div>
-                  <div className={styles.sqlPlace}>{nameList.filter((name) => name).join(' > ')}</div>
-                  <div className={styles.sqlBox} dangerouslySetInnerHTML={{ __html: item.highlightedCode }} />
+                  <div className={styles.executedDatabaseBox}>
+                    <Popover mouseEnterDelay={0.8} content={i18n('workspace.tips.openExecutiveLogging')}>
+                      <Iconfont classNameBox={styles.iconBox} box boxSize={20} code="&#xe6bb;" onClick={()=>{openSql(item)}} />
+                    </Popover>
+                    <div className={styles.executedDatabase}>
+                      {nameList.filter((name) => name).join(' > ')}
+                    </div>
+                  </div>
+                  <div className={styles.sqlBox}>
+                    <Popover mouseEnterDelay={0.8} content={i18n('common.button.copy')}>
+                      <Iconfont classNameBox={styles.iconBox} box boxSize={20} code="&#xec7a;" onClick={()=>{copySql(item.ddl)}} />
+                    </Popover>
+                    <div className={styles.sqlContent} dangerouslySetInnerHTML={{ __html: item.highlightedCode }} />
+                  </div>
                 </div>
               );
             })}
diff --git a/chat2db-client/src/i18n/en-us/workspace.ts b/chat2db-client/src/i18n/en-us/workspace.ts
@@ -33,4 +33,5 @@ export default {
   'workspace.tree.delete.table.tip': 'Are you sure you want to delete the table {1}?',
   'workspace.tips.noConnection': 'You have not created a connection yet',
   'workspace.tips.maxConsole': 'You can only open up to 20 consoles',
+  'workspace.tips.openExecutiveLogging': 'Open this executive logging',
 };
diff --git a/chat2db-client/src/i18n/zh-cn/workspace.ts b/chat2db-client/src/i18n/zh-cn/workspace.ts
@@ -32,4 +32,5 @@ export default {
   'workspace.tree.delete.table.tip': '确定要删除表{1}吗？',
   'workspace.tips.noConnection': '你还没有创建连接',
   'workspace.tips.maxConsole': '最多只能打开20个控制台',
+  'workspace.tips.openExecutiveLogging': '打开执行记录',
 };
diff --git a/chat2db-client/src/service/history.ts b/chat2db-client/src/service/history.ts
@@ -71,7 +71,7 @@ export interface IHistoryRecord {
  /**
   * ddl语言类型
   */
- type?: null | string;
+ type?: DatabaseTypeCode | null;
  /**
   * 使用时长
   */
