Merge branch 'main' of github.com:actiontech/dms-ui into test/DMS-800

actiontech · Jan 12, 2024 · ad7b056 · ad7b056
2 parents 820cb20 + d030d4f
commit ad7b056
Show file tree

Hide file tree

Showing 191 changed files with 105,126 additions and 810 deletions.
diff --git a/packages/base/src/hooks/useSystemConfig.tsx/index.test.tsx b/packages/base/src/hooks/useSystemConfig.tsx/index.test.tsx
@@ -8,7 +8,6 @@ import dayjs from 'dayjs';
 import { renderHook } from '@testing-library/react-hooks';
 import useSystemConfig from '.';
 import { render } from '@testing-library/react';
-import { getBySelector } from '@actiontech/shared/lib/testUtil/customQuery';
 
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),

diff --git a/packages/base/src/locale/en-US/dmsSystem.ts b/packages/base/src/locale/en-US/dmsSystem.ts
@@ -121,9 +121,15 @@ export default {
     accessTokenKeyNameTips:
       'sqle会在获取用户ID时将access_token放在这个key对应的value中, 此参数会作为get请求的参数发送给用户ID获取地址',
 
-    userIdKeyName: 'user_id Key名称',
+    userIdKeyName: '用户UID的JSON路径',
     userIdKeyNameTips:
-      'sqle会尝试使用此key从第三方平台的响应中解析出用户ID,用户ID应当为唯一ID',
+      'sqle会尝试使用此路径，从第三方平台获取用户信息的响应中解析出用户ID，用户ID应当为唯一ID',
+    userEmailTagName: '用户邮箱的JSON路径',
+    userEmailTagNameTips:
+      'sqle会尝试使用此路径，从第三方平台获取用户信息的响应中解析出用户邮箱',
+    userWechatTagName: '用户微信ID的JSON路径',
+    userWechatTagNameTips:
+      'sqle会尝试使用此路径，从第三方平台获取用户信息的响应中解析出用户微信ID',
 
     loginButtonText: '登录按钮文字',
     loginButtonTextTips: 'login页面oauth登录按钮文字',

diff --git a/packages/base/src/locale/zh-CN/dmsSystem.ts b/packages/base/src/locale/zh-CN/dmsSystem.ts
@@ -121,9 +121,15 @@ export default {
     accessTokenKeyNameTips:
       'sqle会在获取用户ID时将access_token放在这个key对应的value中, 此参数会作为get请求的参数发送给用户ID获取地址',
 
-    userIdKeyName: 'user_id Key名称',
+    userIdKeyName: '用户UID的JSON路径',
     userIdKeyNameTips:
-      'sqle会尝试使用此key从第三方平台的响应中解析出用户ID,用户ID应当为唯一ID',
+      'sqle会尝试使用此路径，从第三方平台获取用户信息的响应中解析出用户ID，用户ID应当为唯一ID',
+    userEmailTagName: '用户邮箱的JSON路径',
+    userEmailTagNameTips:
+      'sqle会尝试使用此路径，从第三方平台获取用户信息的响应中解析出用户邮箱',
+    userWechatTagName: '用户微信ID的JSON路径',
+    userWechatTagNameTips:
+      'sqle会尝试使用此路径，从第三方平台获取用户信息的响应中解析出用户微信ID',
 
     loginButtonText: '登录按钮文字',
     loginButtonTextTips: 'login页面oauth登录按钮文字',

diff --git a/packages/base/src/page/Account/__snapshots__/index.test.tsx.snap b/packages/base/src/page/Account/__snapshots__/index.test.tsx.snap
@@ -5,7 +5,7 @@ exports[`test base/page/Account should match snapshot 1`] = `
   <div>
     <div>
       <div
-        class="actiontech-page-header-namespace css-14fwawz"
+        class="actiontech-page-header-namespace css-1xspr0w"
       >
         <div
           class="title"
@@ -283,7 +283,7 @@ exports[`test base/page/Account should match snapshot 2`] = `
   <div>
     <div>
       <div
-        class="actiontech-page-header-namespace css-14fwawz"
+        class="actiontech-page-header-namespace css-1xspr0w"
       >
         <div
           class="title"
@@ -885,7 +885,7 @@ exports[`test base/page/Account should match snapshot when "getUserInfoLoading"
   <div>
     <div>
       <div
-        class="actiontech-page-header-namespace css-14fwawz"
+        class="actiontech-page-header-namespace css-1xspr0w"
       >
         <div
           class="title"

diff --git a/packages/base/src/page/CloudBeaver/__snapshots__/index.test.tsx.snap b/packages/base/src/page/CloudBeaver/__snapshots__/index.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`test base/page/CloudBeaver should match snapshot when sql query is disabled 1`] = `
 <div>
   <div
-    class="actiontech-page-header-namespace css-14fwawz"
+    class="actiontech-page-header-namespace css-1xspr0w"
   >
     <div
       class="title"
@@ -116,7 +116,7 @@ exports[`test base/page/CloudBeaver should match snapshot when sql query is disa
 exports[`test base/page/CloudBeaver should match snapshot when sql query is disabled 2`] = `
 <div>
   <div
-    class="actiontech-page-header-namespace css-14fwawz"
+    class="actiontech-page-header-namespace css-1xspr0w"
   >
     <div
       class="title"
@@ -205,7 +205,7 @@ exports[`test base/page/CloudBeaver should match snapshot when sql query is disa
 exports[`test base/page/CloudBeaver should render jump to cloud beaver when sql query is enable 1`] = `
 <div>
   <div
-    class="actiontech-page-header-namespace css-14fwawz"
+    class="actiontech-page-header-namespace css-1xspr0w"
   >
     <div
       class="title"