Merge pull request #1700 in DEC/decision-webui-dcm from feature/10.0 to research/10.0

* commit 'c7e190e915edddf5bfef6acf3b0336c2703c6266':
  update demo
  DEC-17991 chore: 甘老师插件接口问题反馈--数据连接支持创建时添加connectionname

README.md

@@ -36,18 +36,20 @@ ConstantName名称为`dec.constant.database.conf.connect.form.${name}.show`，
 
 ### 示例
 ```
-const ConstantRedisType = 'dec.constant.database.conf.connect.types';
+const DataBaseConfigProvider = 'dec.connection.provider.datebase';
-const ConstantRedisShow = 'dec.constant.database.conf.connect.form.Redis.show';
+
-const ConstantRedisEdit = 'dec.constant.database.conf.connect.form.Redis.edit';
+const RedisShowName = 'dec.dcm.connection.plugin.redis.show';
-
+const RedisEditName = 'dec.dcm.connection.plugin.redis.edit';
-BI.DOM.ready(() => {
+BI.config(DataBaseConfigProvider, function (provider) {
-    BI.config(ConstantRedisType, datas => [...datas, {
+    provider.registerDatabaseType({
-        text: 'Redis',
+        text: "Redis",
-        databaseType: 'Redis',
+        databaseType: "Redis",
-    }]);
+        edit: "dec.dcm.connection.plugin.demo.edit",
+        show: "dec.dcm.connection.plugin.demo.show",
+    });
+});
 
-    const RedisShowName = 'dec.dcm.connection.plugin.redis.show';
+const RedisShow = BI.inherit(BI.Widget, {
-    const RedisShow = BI.inherit(BI.Widget, {
     props: {
         formData: {
             url: '',
@@ -114,14 +116,10 @@ BI.DOM.ready(() => {
             ],
         };
     },
-    });
+});
-
+BI.shortcut(RedisShowName, RedisShow);
-    BI.shortcut(RedisShowName, RedisShow);
-    BI.constant(ConstantRedisShow, RedisShowName);
-
 
-    const RedisEditName = 'dec.dcm.connection.plugin.redis.edit';
+const RedisEdit = BI.inherit(BI.Widget, {
-    const RedisEdit = BI.inherit(BI.Widget, {
     props: {
         formData: {
             url: '',
@@ -211,10 +209,7 @@ BI.DOM.ready(() => {
             password: this.password.getValue(),
         };
     },
-    });
-
-    BI.shortcut(RedisEditName, RedisEdit);
-    BI.constant(ConstantRedisEdit, RedisEditName);
 });
+BI.shortcut(RedisEditName, RedisEdit);
 
 ```

src/modules/pages/maintain/forms/components/form.plugin.ts

@@ -11,24 +11,28 @@ export class FormPlugin extends BI.Widget {
     plugin: any;
 
     render() {
-        const { connectionType } = this.options.formData;
+        const { connectionType, connectionId, connectionName, connectionData } = this.options.formData;
 
         return {
             type: getPluginWidgetEdit(connectionType),
             ref: (_ref: any) => {
                 this.plugin = _ref;
             },
-            value: this.options.formData.connectionData,
+            value: connectionData, //   兼容
+            connectionData,
+            connectionId,
+            connectionType,
+            connectionName,
         };
     }
 
     public getSubmitValue(): Connection {
-        const { connectionType, connectionId, connectionName } = this.options.formData;
+        const { connectionType, connectionId } = this.options.formData;
 
         return {
             connectionId,
             connectionType,
-            connectionName,
+            connectionName: this.plugin.getName ? this.plugin.getName() : '',
             connectionData: this.plugin.getValue(),
         };
     }