Merge pull request #1026 from chat2db/dev

ARM测试包公证

.github/workflows/pushdocker.yml

@@ -49,8 +49,10 @@ jobs:
           cd chat2db-client
           yarn install 
           yarn run build:web:prod --app_version=${{ steps.chat2db_version.outputs.substring }}
-          cp -r dist ../chat2db-server/chat2db-server-web-start/src/main/resources/static/front
-          cp -r dist/index.html ../chat2db-server/chat2db-server-web-start/src/main/resources/thymeleaf/
+          mkdir -p ../chat2db-server/chat2db-server-web-start/src/main/resources/static/
+          mkdir -p ../chat2db-server/chat2db-server-web-start/src/main/resources/thymeleaf/
+          cp -r dist ../chat2db-server/chat2db-server-start/src/main/resources/static/front
+          cp -r dist/index.html ../chat2db-server/chat2db-server-start/src/main/resources/thymeleaf/
 
       # 安装java
       - name: Install Java and Maven

.github/workflows/release_test.yml

@@ -145,6 +145,15 @@ jobs:
         run: |
           xcrun notarytool store-credentials "Chat2DB" --apple-id "${{ secrets.MAC_APPLE_ID }}" --password "${{ secrets.MAC_APPLE_PASSWORD }}" --team-id "${{ secrets.MAC_TEAM_ID }}"
           xcrun notarytool submit chat2db-client/release/Chat2DB-Test-99.0.${{ github.run_id }}-Test.dmg --keychain-profile "Chat2DB"
+      
+      - name: Notarize MacOS ARM64 App
+        if: matrix.os == 'macos-latest' && matrix.arch == 'arm64'
+        run: |
+          xcrun notarytool store-credentials "Chat2DB" --apple-id "${{ secrets.MAC_APPLE_ID }}" --password "${{ secrets.MAC_APPLE_PASSWORD }}" --team-id "${{ secrets.MAC_TEAM_ID }}"
+          xcrun notarytool submit chat2db-client/release/Chat2DB-Test-99.0.${{ github.run_id }}-Test-arm64.dmg --keychain-profile "Chat2DB"
+    
+
+
 
       # Build Jar包
       - name: Prepare upload for Jar

.vscode/settings.json

@@ -86,5 +86,6 @@
     "yapi",
     "yizhoumo",
     "zustand"
-  ]
+  ],
+  "java.compile.nullAnalysis.mode": "automatic"
 }

CHANGELOG.md

@@ -1,3 +1,55 @@
+## 3.1.16
+
+`2023-12-25`
+
+**Changelog**
+
+- ⭐【New Features】Execute the Record sql Add replication button
+- ⭐【New Features】Execution records can be opened directly in the console
+- ⭐【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
+- 🐞【Fixed】During web deployment, a page error occurs after the page switching page is refreshed
+- ⚡️【Optimize】The query result cancels in-cell scrolling and instead uses hover to view cell contents
+
+## 3.1.15
+
+`2023-12-20`
+
+**Changelog**
+
+- 🐞【Fixed】Every time I open the application, I occasionally cannot select the database problem
+- 🐞【Fixed】Compatible with old data types can not show deletion problems
+- 🐞【Fixed】Some databases cannot display the database /Schema structure
+
+## 3.1.14
+
+`2023-12-17`
+
+**Changelog**
+
+- 🐞【Fixed】Tree structure search for bugs
+- 🐞【Fixed】Switching tab causes edit data reset problem
+- 🐞【Fixed】Rename is reset after switching tab
+
+
+## 3.1.12
+
+`2023-12-15`
+
+**Changelog**
+
+- ⚡️【Optimize】Optimized tree structure search
+- ⚡️【Optimize】Tree structure search box resident
+
+## 3.1.11
+
+`2023-12-13`
+
+**Changelog**
+
+- 🐞【Fixed】A chart with a Schema cannot be saved and executed
+- 🐞【Fixed】Failure to start after the upgrade
+
 ## 3.1.1
 
 `2023-12-13`
@@ -19,9 +71,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
 
@@ -50,7 +102,7 @@
 
 `2023-11-13`
 
-**更新日志**
+**Changelog**
 
 - 🐞【Fixed】Copy as insert first row lost problem
 - 🐞【Fixed】DM database index bug

CHANGELOG_CN.md

@@ -1,4 +1,55 @@
-## 3.1.1
+## 3.1.16
+
+`2023-12-25`
+
+**更新日志**
+
+- ⭐【新功能】执行记录添加复制sql按钮
+- ⭐【新功能】执行记录可直接在控制台打开
+- ⭐【新功能】右侧执行记录、保存SQL栏展开大小可拖动
+- 🐞【修复】部分数据库无法显示数据库/Schema结构的问题
+- 🐞【修复】网页部署时，切换页面刷新后页面报错问题
+- ⚡️【优化】查询结果取消单元格内滚动，改为hover查看单元格内容
+
+## 3.1.15
+
+`2023-12-20`
+
+**更新日志**
+
+- 🐞【修复】每次打开应用时，偶现无法选择数据库问题
+- 🐞【修复】兼容老数据类型无法显示删除问题
+
+## 3.1.14
+
+`2023-12-17`
+
+**更新日志**
+
+- 🐞【修复】树结构搜索bug
+- 🐞【修复】切换tab导致编辑数据重置问题
+- 🐞【修复】切换tab后重命名被重置
+
+
+## 3.1.12
+
+`2023-12-15`
+
+**更新日志**
+
+- ⚡️【优化】优化树结构搜索
+- ⚡️【优化】树结构搜索框常驻
+
+## 3.1.11
+
+`2023-12-13`
+
+**更新日志**
+
+- 🐞【修复】带Schema的图表无法保存和执行
+- 🐞【修复】升级后无法启动问题
+
+## 3.1.10
 
 `2023-12-13`
 

chat2db-client/src/blocks/Setting/About/index.tsx

@@ -29,8 +29,6 @@ export default function AboutUs(props: IProps) {
     };
   });
 
-  console.log('holdingService', holdingService);
-
   const onChangeUpdateRul = (e) => {
     configService.setAppUpdateType(e.target.value).then(() => {
       setUpdateRule(e.target.value);

chat2db-client/src/blocks/Setting/BaseSetting/index.tsx

@@ -5,15 +5,13 @@ import classnames from 'classnames';
 import themeDarkImg from '@/assets/img/theme-dark.png';
 import themeLightImg from '@/assets/img/theme-light.png';
 import themeAutoImg from '@/assets/img/theme-auto.png';
-import { Radio, Select } from 'antd';
+import { Select } from 'antd';
 import Iconfont from '@/components/Iconfont';
 import { setLang as setLangLocalStorage } from '@/utils/localStorage';
 import { useTheme } from '@/hooks/useTheme';
 
 import styles from './index.less';
 
-const { Option } = Select;
-
 const themeList = [
   {
     code: ThemeType.Light,
@@ -42,6 +40,13 @@ const themeList = [
   // },
 ];
 
+const languageOptions = [
+  { value: LangType.ZH_CN, label: '简体中文' },
+  { value: LangType.EN_US, label: 'English' },
+  { value: LangType.TR_TR, label: 'Turkish' },
+  { value: LangType.JA_JP, label: '日本語' },
+]
+
 const colorList = [
   {
     code: 'golden-purple',
@@ -103,10 +108,10 @@ export default function BaseSetting() {
   };
 
   function changeLang(e: any) {
-    setLangLocalStorage(e.target.value);
+    setLangLocalStorage(e);
     //切换语言时，需要设置cookie，用来改变后台服务的Locale
     const date = new Date('2030-12-30 12:30:00').toUTCString();
-    document.cookie = `CHAT2DB.LOCALE=${e.target.value};Expires=${date}`;
+    document.cookie = `CHAT2DB.LOCALE=${e};Expires=${date}`;
     location.reload();
   }
 
@@ -118,10 +123,8 @@ export default function BaseSetting() {
     setCurrentTheme(backgroundColor);
   }
 
-
-  const changeSqlEditorFontSize = (e: any) => {
-
-  }
+  // const changeSqlEditorFontSize = (e: any) => {
+  // }
 
   return (
     <>
@@ -142,10 +145,17 @@ export default function BaseSetting() {
       </ul>
       <div className={styles.title}>{i18n('setting.title.language')}</div>
       <div className={styles.langBox}>
-        <Radio.Group onChange={changeLang} value={currentLang}>
+        {/* <Radio.Group onChange={changeLang} value={currentLang}>
           <Radio value={LangType.ZH_CN}>简体中文</Radio>
           <Radio value={LangType.EN_US}>English</Radio>
-        </Radio.Group>
+          <Radio value={LangType.TR_TR}>Turkish</Radio>
+        </Radio.Group> */}
+        <Select
+          style={{ width: 120 }}
+          onChange={changeLang}
+          value={currentLang}
+          options={languageOptions}
+        />
       </div>
       <div className={styles.title}>{i18n('setting.title.themeColor')}</div>
       <ul className={styles.primaryColorList}>