Merge branch 'feature_addsource' into main

CloudWise-OpenSource · Nov 25, 2022 · dc2f2d2 · dc2f2d2
2 parents 5a704a2 + e33cf2f
commit dc2f2d2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lcapWeb/src/pages/Data/NewData/components/Http/index.js b/lcapWeb/src/pages/Data/NewData/components/Http/index.js
@@ -10,6 +10,18 @@ import DataTable from '../../../components/NewTable';
 import enums from '@/utils/enums.js';
 import { toJS } from '@chaoswise/cw-mobx';
 import { JSONEditor } from '@json-editor/json-editor';
+
+const schemaTypeEnums = {
+  MySQL: 'mysql',
+  Postgres: 'postgresql',
+  达梦: 'dm',
+  MariaDB: 'mariadb',
+  SqlServer: 'sqlserver',
+  Oracle: 'oracle',
+  Clickhouse: 'clickhouse',
+  HTTP: 'HTTP',
+};
+
 export default Form.create({ name: 'FORM_IN_PROJECT_MODAL' })(function EditProjectModal({
   form,
   activeData = {},
@@ -76,7 +88,7 @@ export default Form.create({ name: 'FORM_IN_PROJECT_MODAL' })(function EditProje
 
         let sendData = {
           datasourceName: values.datasourceName,
-          schemaType: type,
+          schemaType: (schemaTypeEnums[type] || type === 'dm' ? type : enums[type])?.toLowerCase(),
           connectData: JSON.stringify({
             ...values,
             url,

diff --git a/lcapWeb/src/pages/Data/NewData/components/nomal/index.js b/lcapWeb/src/pages/Data/NewData/components/nomal/index.js
@@ -65,7 +65,7 @@ export default Form.create({ name: 'FORM_IN_PROJECT_MODAL' })(function EditProje
       if (!err) {
         let sendData = {
           datasourceName: values.datasourceName,
-          schemaType: schemaTypeEnums[type] || type === 'dm' ? type : enums[type]?.toLowerCase(),
+          schemaType: (schemaTypeEnums[type] || type === 'dm' ? type : enums[type])?.toLowerCase(),
           connectData: JSON.stringify(values),
         };
         setConnectState(true);