Merge pull request #31 in DEC/decision-webui-dcm from ~ALAN/decision-webui-dcm:feature/10.0 to feature/10.0

* commit 'f3b19815f7d712553dfaef45064bf8a6e7a4738d':
  fix: 修复重命名时的bug
  fix: 无jira任务 重命名的时候也发送socket，修改插件图片地址

redis.js

@@ -6,7 +6,7 @@ BI.DOM.ready(() => {
     BI.config(ConstantRedisType, datas => [...datas, {
         text: 'Redis',
         databaseType: 'Redis',
-        iconUrl: 'http://alan-picpack.oss-cn-hangzhou.aliyuncs.com/1567134942861890',
+        iconUrl: 'com/fr/plugin/db/redis/images/redis.png',
     }]);
 
     const RedisShowName = 'dec.dcm.connection.plugin.redis.show';

src/modules/constants/env.ts

@@ -1,6 +1,7 @@
 const fineServletURL = Dec ? Dec.fineServletURL : '/webroot/decision';
 export const ReqPrefix = `${fineServletURL}/v10/config/connection`;
 export const ImgPrefix = `${fineServletURL}/resources?path=/com/fr/web/resources/dist/images/2x/icon/database/`;
+export const PluginImgPrefix = `${fineServletURL}/resources?path=`;
 
 export const connectionType = DecCst ? DecCst.Connect.ConnectionType : {
     JDBC: 'jdbc',

src/modules/pages/connection/list/list_item/list_item.model.ts

@@ -50,11 +50,27 @@ export class ListItemModel extends Model<{
         setDatebaseTypeSelected(name: string) {
             this.model.datebaseTypeSelected = name;
         },
-        setIsEdit(isEdit: boolean) {
-            this.model.isEdit = isEdit;
+        setIsEdit(isEdit: boolean, name: string) {
+            if (isEdit) {
+                api.getConnectionStatus(name).then(re => {
+                    if (re.data && re.data === 'success') {
+                        this.model.isEdit = true;
+                    } else {
+                        BI.Msg.toast(BI.i18nText('Dec-Dcm_Connection_Is_Using', re.errorMsg), {
+                            level: 'error',
+                        });
+                    }
+                });
+            } else {
+                api.shutdownConnectionStatus(name);
+                this.model.isEdit = false;
+            }
         },
         changeName(oldName: string, newName: string) {
-            const connections = this.model.connections.map(item => {
+            const connection = this.model.connections.find(item => item.connectionName === oldName);
+            connection.connectionId = oldName;
+            connection.connectionName = newName;
+            this.model.connections = this.model.connections.map(item => {
                 return {
                     ...item,
                     connectionName: item.connectionName === oldName ? newName : item.connectionName,
@@ -62,7 +78,7 @@ export class ListItemModel extends Model<{
                 };
             });
             
-            return api.updateConnection(connections);
+            return api.updateConnection(connection);
         },
         setIsCopy(isCopy: boolean) {
             this.model.isCopy = isCopy;

src/modules/pages/connection/list/list_item/list_item.ts

@@ -68,7 +68,7 @@ export class ListItem extends BI.BasicButton {
                             action: () => {
                                 const newName = this.nameEditor.getValue();
                                 this.store.changeName(name, newName).then(() => {
-                                    this.store.setIsEdit(false);
+                                    this.store.setIsEdit(false, name);
                                     this.nameLabel.setText(newName);
                                 });
                             },
@@ -227,7 +227,7 @@ export class ListItem extends BI.BasicButton {
                 });
             },
             changeName: () => {
-                this.store.setIsEdit(true);
+                this.store.setIsEdit(true, name);
             },
             copy: () => {
                 this.store.setConnectionSelected(name);

src/modules/pages/database/database_type/database_type.ts

@@ -1,7 +1,7 @@
 import { shortcut, store } from '@core/core';
 import { Vtape, Label, Absolute, Img } from 'ui';
 import { DatebaseTypeModel, DatebaseTypeModelXtype } from './database_type.model';
-import { ImgPrefix } from '@constants/env';
+import { ImgPrefix, PluginImgPrefix } from '@constants/env';
 import './database_type.less';
 
 export const DatebaseTypeXtype = 'dec.dcm.datebase.type';
@@ -38,7 +38,7 @@ export class DatebaseType extends BI.BasicButton {
                             {
                                 el: {
                                     type: Img,
-                                    src: iconUrl ? iconUrl : `${ImgPrefix}${databaseType}.jpg`,
+                                    src: iconUrl ? this.getIconUrl(iconUrl) : `${ImgPrefix}${databaseType}.jpg`,
                                     ref: (_ref: any) => {
                                         this.img = _ref;
                                     },
@@ -79,4 +79,12 @@ export class DatebaseType extends BI.BasicButton {
             this.img.setSrc(`${ImgPrefix}default.jpg`);
         };
     }
+
+    private getIconUrl(url: string) {
+        if (url.startsWith('/')) {
+            return `${PluginImgPrefix}${url}`;
+        }
+        
+        return `${PluginImgPrefix}/${url}`;
+    }
 }