Merge pull request #8831 in DEC/decision-webui-dcm from final/11.0 to persist/11.0

* commit 'c48a58253f3560ac6ea2d44544a80d8bf41e2b2b':
  BI-144496 fix: 数据连接增加埋点
  getJdyDataLinkAppList
  REPORT-112276 公共数据取数简道云数据连接部分适配 设计优先级,优先使用平台内置的
  FDL-9101 fix: 修复hana数据连接url联动输入框异常问题
  REPORT-112768 fix: 修复数据连接更新视图不同步问题

src/modules/app.provider.ts

@@ -92,13 +92,13 @@ BI.provider('dec.connection.provider.datebase', function () {
         }
 
         // 处理SAP HANA数据连接url
-        const sapHanaUrl = url.match(/^jdbc:(sap):(thin:([0-9a-zA-Z/]*)?@|thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?([^]+)?(.*)/i);
+        const sapHanaUrl = url.match(/^jdbc:(sap):(thin:([0-9a-zA-Z/]*)?@|thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(\?databaseName=)?([^&]+)([^]+)?(.*)/i);
         if (sapHanaUrl) {
             return {
                 host: sapHanaUrl[5],
                 port: sapHanaUrl[7] === 'port' ? '' : sapHanaUrl[7],
-                databaseName: '',
-                urlInfo: sapHanaUrl[9],
+                databaseName: sapHanaUrl[9] || '',
+                urlInfo: sapHanaUrl[10],
             };
         }
 
@@ -135,6 +135,16 @@ BI.provider('dec.connection.provider.datebase', function () {
         return false;
     }
 
+    function filterPluginDataTypeByPriority() {
+       const originTypes = [...BI.Constants.getConstant(CONSTANT_PLUGIN_TYPES)];
+       const sortDataTypes = BI.sortBy(originTypes, (index, value: any) => {
+          return value.priority || 0;
+       })
+        return BI.uniqWith(sortDataTypes, (current, other) => {
+            return current.text == other.text;
+        });
+    }
+
     this.registerDatabaseType = (config: any) => {
         if (coverBaseDatabase(config)) return;
 

src/modules/app.ts

@@ -10,6 +10,7 @@ import { ConnectionPool } from './pages/connection_pool/connection_pool';
 import { TimeOutSetting } from './pages/setting/setting';
 import './app.provider';
 import '../less/index.less';
+import "./pages/__point__/connect.point";
 
 @shortcut()
 @store(AppModel)

src/modules/pages/__point__/connect.point.ts

@@ -0,0 +1,24 @@
+BI.point("dec.dcm.model.connection", "createNewConnection", () => {
+    Dec.Utils.saveFocusPoint({
+        id: "E73325",
+        title: "新建数据连接",
+    });
+});
+
+BI.point("dec.dcm.model.title_maintain", "setTestEvent", () => {
+    Dec.Utils.saveFocusPoint({
+        id: "E73328",
+        title: "测试数据连接",
+    });
+});
+
+BI.point("dec.dcm.model.maintain_form", "addConnection", function () {
+    Dec.Utils.saveFocusPoint({
+        id: "E8827",
+        title: "保存数据连接",
+        body: {
+            datebaseType: this.model.datebaseTypeSelected,
+            databaseName: this.model.connectionSelected,
+        },
+    });
+});