Merge pull request #7141 in DEC/decision-webui-dcm from bugfix/11.0 to feature/x

* commit 'c19d03652c8b50758e440c660dd9b64b45140c0b':
  无JIRA任务，修复类型错误
  REPORT-91396 fix:拼接url精准匹配:database

src/modules/app.service.ts

@@ -51,7 +51,7 @@ export function getJdbcDatabaseType(database: string, driver: string): DatabaseT
 
 export function resolveUrlInfo(url: string, database?: string) {
     if (BI.isNull(url)) return {};
-    
+
     return BI.Providers.getProvider('dec.connection.provider.datebase').getJdbcResolveByType(database)(url) || {
         host: '',
         port: '',
@@ -77,6 +77,7 @@ export function splitUrl(host: string, port: string, database: string, baseUrl:
 
     return baseUrl.replace('hostname', host).replace(':port', port ? `:${port}` : '')
         .replace('/database', `/${database}`)
+        .replace(':database', `:${database}`)
         .replace('dbname', database);
 }
 

tsconfig.json

@@ -5,8 +5,8 @@
         "module": "es2015",
         "moduleResolution": "node",
         "lib": [
-        "es2017",
+            "es2017",
-        "dom"
+            "dom"
         ],
         "declaration": true,
         "experimentalDecorators": true,
@@ -21,11 +21,21 @@
         "noFallthroughCasesInSwitch": true,
         "skipLibCheck": false,
         "paths": {
-            "ui": ["./src/ui"],
+            "ui": [
-            "ReportCst": ["./private/constants"],
+                "./src/ui"
-            "types": ["./types/index.d.ts"],
+            ],
-            "@core/*": ["./src/modules/core/*"],
+            "ReportCst": [
-            "@constants/*": ["./src/modules/constants/*"]
+                "./private/constants"
+            ],
+            "types": [
+                "./types/index.d.ts"
+            ],
+            "@core/*": [
+                "./src/modules/core/*"
+            ],
+            "@constants/*": [
+                "./src/modules/constants/*"
+            ]
         }
     },
     "include": [
@@ -33,6 +43,6 @@
         "src/**/*.ts",
         "private/*.ts",
         "private/**/*.ts",
-        "types/globals.d.ts"
+        "types"
     ]
 }

types/globals.d.ts

@@ -1,4 +1,3 @@
-import type { Method, AxiosRequestConfig } from 'axios';
 interface Obj {
     [key: string]: any;
 }
@@ -17,7 +16,7 @@ declare const Dec: {
     personal: {
         username: string;
     };
-    reqByEncrypt: (method: Method, url: string, data?: any, config?: AxiosRequestConfig) => {},
+    reqByEncrypt: (method: AxiosType.X_Method, url: string, data?: any, config?: AxiosType.X_AxiosRequestConfig) => {},
     socketEmit: (type: string, name: string, callback: (re: any) => void) => void;
     // req
     reqGet: RequestFunction;

types/request.d.ts

@@ -0,0 +1,9 @@
+import { Method, AxiosRequestConfig } from 'axios';
+
+declare namespace AxiosType {
+    type X_Method = Method
+    interface X_AxiosRequestConfig extends AxiosRequestConfig { }
+}
+
+export = AxiosType;
+export as namespace AxiosType;