From ee42412d6ff7e69578d6de64cfdb930df70a58ce Mon Sep 17 00:00:00 2001 From: alan Date: Tue, 7 May 2019 11:05:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app.component.scss | 15 +- src/app/link_set/left/left.component.ts | 4 +- src/app/link_set/left/left.model.ts | 8 - .../left/left_item/left.item.component.ts | 4 +- .../left_item/left.item.icon.component.ts | 5 +- .../left/left_item/left.item.model.ts | 66 ----- src/app/link_set/link-set.model.ts | 162 +++++++++++- src/app/link_set/link-set.service.ts | 18 ++ src/app/link_set/right/right.component.ts | 4 +- src/app/link_set/right/right.model.ts | 8 - .../right_detail/right.detail.component.ts | 41 ++- .../right/right_detail/right.detail.model.ts | 6 - .../right/right_edit/right.edit.component.ts | 4 +- .../right/right_edit/right.edit.model.ts | 11 - .../right_edit/right.edit.mysql.component.ts | 235 ++++++++++++++++++ .../right/right_show/right.show.component.ts | 2 +- .../right/right_show/right.show.model.ts | 8 - .../right_title/right.title.component.ts | 22 +- .../right/right_title/right.title.model.ts | 15 -- src/app/link_set/select/select.component.ts | 2 +- src/app/link_set/select/select.model.ts | 34 --- src/img/warning.png | Bin 0 -> 6085 bytes src/shared/crud/crud.request.ts | 42 +++- src/shared/service/dialog.service.ts | 8 +- 24 files changed, 507 insertions(+), 217 deletions(-) delete mode 100644 src/app/link_set/left/left.model.ts delete mode 100644 src/app/link_set/left/left_item/left.item.model.ts create mode 100644 src/app/link_set/link-set.service.ts delete mode 100644 src/app/link_set/right/right.model.ts delete mode 100644 src/app/link_set/right/right_detail/right.detail.model.ts delete mode 100644 src/app/link_set/right/right_edit/right.edit.model.ts create mode 100644 src/app/link_set/right/right_edit/right.edit.mysql.component.ts delete mode 100644 src/app/link_set/right/right_show/right.show.model.ts delete mode 100644 src/app/link_set/right/right_title/right.title.model.ts delete mode 100644 src/app/link_set/select/select.model.ts create mode 100644 src/img/warning.png diff --git a/src/app/app.component.scss b/src/app/app.component.scss index f94699f..71407ba 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -139,7 +139,20 @@ color: #9ea6b2; border-bottom: 1px solid #e8eaed; } - +.comfirm-content{ + margin-top: 40px; + margin-left: 20px; + .comfirm-icon{ + background-image: url("../img/warning.png"); + background-size: contain; + margin-right: 12px; + } + .bi-text{ + height: 50px; + line-height: 50px; + margin-left: 12px; + } +} .link-font .b-font:before { content: "\e759"; color: inherit; diff --git a/src/app/link_set/left/left.component.ts b/src/app/link_set/left/left.component.ts index 4a5feaf..0d4c53a 100644 --- a/src/app/link_set/left/left.component.ts +++ b/src/app/link_set/left/left.component.ts @@ -1,12 +1,12 @@ import {WidgetType, Vertical} from '@ui'; -import leftModel from './left.model'; +import Model from '../link-set.model'; import {LinkType} from '@ui/type'; import {getLinks} from './left.service'; const className = 'fr.component.linkset.left'; let leftContent: any = null; const Widget: WidgetType = { _store() { - return BI.Models.getModel(leftModel); + return BI.Models.getModel(Model); }, watch:{ linkList(linkList: LinkType[]) { diff --git a/src/app/link_set/left/left.model.ts b/src/app/link_set/left/left.model.ts deleted file mode 100644 index eb6102e..0000000 --- a/src/app/link_set/left/left.model.ts +++ /dev/null @@ -1,8 +0,0 @@ -const className = 'fr.model.linkSet.left'; -const Model = BI.inherit(Fix.Model, { - context: ['linkList'], - actions: { - }, -}); -BI.model(className, Model); -export default className; diff --git a/src/app/link_set/left/left_item/left.item.component.ts b/src/app/link_set/left/left_item/left.item.component.ts index 0d34029..dab4019 100644 --- a/src/app/link_set/left/left_item/left.item.component.ts +++ b/src/app/link_set/left/left_item/left.item.component.ts @@ -1,6 +1,6 @@ import {WidgetType, Left, Label, Icon} from '@ui'; import ItemIcon from './left.item.icon.component'; -import LeftItemModel from './left.item.model'; +import Model from '../../link-set.model'; const className = 'fr.component.linkSet.left.item'; const Widget: WidgetType = { props: { @@ -9,7 +9,7 @@ const Widget: WidgetType = { creator: '', }, _store() { - return BI.Models.getModel(LeftItemModel); + return BI.Models.getModel(Model); }, render() { const {title, extraCls, creator, text, id} = this.options; diff --git a/src/app/link_set/left/left_item/left.item.icon.component.ts b/src/app/link_set/left/left_item/left.item.icon.component.ts index 4f3b63a..fa7354c 100644 --- a/src/app/link_set/left/left_item/left.item.icon.component.ts +++ b/src/app/link_set/left/left_item/left.item.icon.component.ts @@ -1,10 +1,9 @@ import {WidgetType, Icon, BubbleCombo, TextBubblePopupBarView} from '@ui/index'; -import LeftItemModel from './left.item.model'; - +import Model from '../../link-set.model'; const className = 'fr.component.linkSet.left.item.icon'; const Widget: WidgetType = { _store() { - return BI.Models.getModel(LeftItemModel); + return BI.Models.getModel(Model); }, render() { const {cls, title, id} = this.options; diff --git a/src/app/link_set/left/left_item/left.item.model.ts b/src/app/link_set/left/left_item/left.item.model.ts deleted file mode 100644 index 0349cd3..0000000 --- a/src/app/link_set/left/left_item/left.item.model.ts +++ /dev/null @@ -1,66 +0,0 @@ -import {LinkType} from '@ui/type'; -import {deleteConnection, testConnection} from '@shared/crud/crud.request'; -import {databaseTyle, getCnnectionName} from '../../select/select.service'; -import {confirm} from '@shared/service/dialog.service'; -const className = 'fr.model.linkSet.left.item'; -const Model = BI.inherit(Fix.Model, { - context: ['linkList', 'linkSelected'], - actions: { - setLinkSelected(name: string) { - this.model.linkList.forEach((item: LinkType) => { - item.isSelected = item.connectionName === name; - if (item.connectionName === name) { - this.model.linkSelected = { - ...item, - isSelected: false, - }; - } - }); - this.model.linkList = [...this.model.linkList]; - }, - onIconClick(title: string, id: string) { - switch (title) { - case '删除': - deleteConnection(id, (res: string) => { - - }); - break; - case '测试连接': - testConnection(id, (res: any) => { - - }); - break; - case '复制': - this.copyLink(id); - break; - default: - break; - } - }, - copyLink(id: string) { - const name = getCnnectionName(this.model.linkList); - let data = {}; - this.model.linkList.forEach((item: LinkType) => { - if (item.connectionId === id) { - data = item; - } - }); - this.model.linkList.push({ - ...data, - connectionName:name, - isSelected: true, - }); - this.model.linkSelected = { - ...data, - isSelected: true, - connectionName:name, - }; - this.model.linkUpdate = { - ...data, - connectionName:name, - }; - }, - }, -}); -BI.model(className, Model); -export default className; diff --git a/src/app/link_set/link-set.model.ts b/src/app/link_set/link-set.model.ts index b1f4533..3dd6846 100644 --- a/src/app/link_set/link-set.model.ts +++ b/src/app/link_set/link-set.model.ts @@ -1,10 +1,168 @@ import {ModelType} from '@ui/index'; +import {LinkType} from '@ui/type'; +import {deleteConnection, getConnectionStatus} from '@shared/crud/crud.request'; +import {databaseTyle, getCnnectionName} from './select/select.service'; +import {confirm} from '@shared/service/dialog.service'; +import {saveConnection} from './link-set.service'; const className = 'fr.model.linkset'; const Model: ModelType = { - context: ['tab'], + context: ['tab', 'linkList', 'linkSelected', 'linkUpdate'], actions: { - + /** + * 左侧点击链接选中 + * @param name + */ + setLinkSelected(name: string) { + if (this.model.linkSelected && this.model.linkSelected.isSelected) { + confirm('当前设置尚未保存，是否保存？', (isConfirm: boolean) => { + if (isConfirm) { + saveConnection(this.model.linkUpdate).then(() => { + this.setEdit(false); + }); + } else { + this.setCancel(); + } + this._setLinkSelected(name); + }); + } else { + this._setLinkSelected(name); + } + }, + _setLinkSelected(name: string) { + this.model.linkList.forEach((item: LinkType) => { + item.isSelected = item.connectionName === name; + if (item.connectionName === name) { + this.model.linkSelected = { + ...item, + isSelected: false, + }; + } + }); + this.model.linkList = [...this.model.linkList]; + this.model.linkUpdate = this.model.linkSelected; + }, + onIconClick(title: string, id: string) { + switch (title) { + case '删除': + deleteConnection(id, (res: string) => { + + }); + break; + case '测试连接': + getConnectionStatus(id, (res: any) => { + + }); + break; + case '复制': + this.copyLink(id); + break; + default: + break; + } + }, + copyLink(id: string) { + const name = getCnnectionName(this.model.linkList); + let data = {}; + this.model.linkList.forEach((item: LinkType) => { + if (item.connectionId === id) { + data = item; + } + }); + this.model.linkList = [ + { + ...data, + isSelected: true, + connectionName:name, + }, + ...this.model.linkList, + ]; + this.model.linkSelected = { + ...data, + isSelected: true, + connectionName:name, + }; + this.model.linkUpdate = { + ...data, + connectionName:name, + }; + }, + setLinkUpdate(value: any) { + this.model.linkUpdate = value; + }, + setEdit(type: boolean) { + this.model.linkSelected = { + ...this.model.linkSelected, + isSelected: type, + }; + this.model.linkUpdate = this.model.linkSelected; + }, + setCancel() { + const linkSelected: LinkType = this.model.linkSelected; + const linkList: LinkType[] = this.model.linkList; + + if (linkSelected.connectionId) { + this.setEdit(false); + } else { + this.model.linkList = [ + ...linkList.filter(item => !!item.connectionId), + ]; + if (this.model.linkList.length > 0) { + this.model.linkList[0].isSelected = true; + this.model.linkSelected = { + ...this.model.linkList[0], + isSelected: false, + }; + } else { + this.model.linkSelected = {}; + } + this.model.linkUpdate = this.model.linkSelected; + } + }, + setNewLink(value: string) { + console.log('%cvalue: ', 'color: MidnightBlue; background: Aquamarine;', value); + console.log(this.model.linkSelected); + if (this.model.linkSelected && this.model.linkSelected.isSelected) { + confirm('当前设置尚未保存，是否保存？', (isConfirm: boolean) => { + if (isConfirm) { + saveConnection(this.model.linkUpdate).then(() => { + this.setEdit(false); + }); + } else { + this.setCancel(); + } + this._setNewLink(value); + }); + } else { + this._setNewLink(value); + } + }, + _setNewLink(value: string) { + const name = getCnnectionName(this.model.linkList); + let data = {}; + databaseTyle.forEach(item => { + if (item.text === value) { + data = item; + } + }); + this.model.linkList = [ + { + connectionName:name, + isSelected: true, + ...data, + }, + ...this.model.linkList, + ]; + this.model.linkSelected = { + connectionName:name, + isSelected: true, + ...data, + }; + this.model.linkUpdate = { + connectionName:name, + ...data, + }; + }, }, }; BI.model(className, BI.inherit(Fix.Model, Model)); diff --git a/src/app/link_set/link-set.service.ts b/src/app/link_set/link-set.service.ts new file mode 100644 index 0000000..4befbe1 --- /dev/null +++ b/src/app/link_set/link-set.service.ts @@ -0,0 +1,18 @@ +import {LinkType} from '@ui/type'; +import {addConnection, updateConnection} from '@shared/crud/crud.request'; + +export function saveConnection(linkUpdate: LinkType): Promise { + if (linkUpdate.connectionId) { + return new Promise(((resolve, reject) => { + addConnection(linkUpdate, (res: string) => { + resolve(res); + }); + })); + } + + return new Promise(((resolve, reject) => { + updateConnection(linkUpdate, (res: string) => { + resolve(res); + }); + })); +} diff --git a/src/app/link_set/right/right.component.ts b/src/app/link_set/right/right.component.ts index a0b0180..f801138 100644 --- a/src/app/link_set/right/right.component.ts +++ b/src/app/link_set/right/right.component.ts @@ -2,12 +2,12 @@ import {WidgetType, Vertical} from '@ui'; import {LinkType} from '@ui/type'; import Nothing from './nothing.component'; import RightDetail from './right_detail/right.detail.component'; -import RightModel from './right.model'; +import Model from '../link-set.model'; let rightContent: any = null; const className = 'fr.component.right'; const Widget: WidgetType = { _store() { - return BI.Models.getModel(RightModel); + return BI.Models.getModel(Model); }, watch:{ linkSelected(linkSelected: LinkType) { diff --git a/src/app/link_set/right/right.model.ts b/src/app/link_set/right/right.model.ts deleted file mode 100644 index c1eba8d..0000000 --- a/src/app/link_set/right/right.model.ts +++ /dev/null @@ -1,8 +0,0 @@ -const className = 'fr.model.linkSet.right'; -const Model = BI.inherit(Fix.Model, { - context: ['linkList', 'linkSelected'], - actions: { - }, -}); -BI.model(className, Model); -export default className; diff --git a/src/app/link_set/right/right_detail/right.detail.component.ts b/src/app/link_set/right/right_detail/right.detail.component.ts index 73f1ee8..532e869 100644 --- a/src/app/link_set/right/right_detail/right.detail.component.ts +++ b/src/app/link_set/right/right_detail/right.detail.component.ts @@ -1,40 +1,29 @@ -import {WidgetType, Vertical, Left, Label, Button} from '@ui/index'; -import RightDetailModel from './right.detail.model'; +import {WidgetType, Vertical} from '@ui/index'; +import Model from '../../link-set.model'; import Title from '../right_title/right.title.component'; import RightShow from '../right_show/right.show.component'; import RightEdit from '../right_edit/right.edit.component'; +import RightEditMysql from '../right_edit/right.edit.mysql.component'; import {LinkType} from '@ui/type'; const className = 'fr.component.right.detail'; let rightDetail: any = null; const Widget: WidgetType = { _store() { - return BI.Models.getModel(RightDetailModel); + return BI.Models.getModel(Model); }, watch:{ linkSelected(linkSelected: LinkType) { - if (linkSelected.isSelected) { - rightDetail.populate(BI.createItems([ - { - type: Title, - isEdit: true, - linkSelected, - }, { - type: RightEdit, - linkSelected, - }, - ])); - } else { - rightDetail.populate(BI.createItems([ - { - type: Title, - isEdit: false, - linkSelected, - }, { - type: RightShow, - linkSelected, - }, - ])); - } + const typeEdit = linkSelected.databaseType === 'mysql' ? RightEditMysql : RightEdit; + rightDetail.populate(BI.createItems([ + { + type: Title, + isEdit: linkSelected.isSelected, + linkSelected, + }, { + type: linkSelected.isSelected ? typeEdit : RightShow, + linkSelected, + }, + ])); }, }, render() { diff --git a/src/app/link_set/right/right_detail/right.detail.model.ts b/src/app/link_set/right/right_detail/right.detail.model.ts deleted file mode 100644 index 8b258bf..0000000 --- a/src/app/link_set/right/right_detail/right.detail.model.ts +++ /dev/null @@ -1,6 +0,0 @@ -const RightDetailModel = 'fr.model.linkSet.right.detail'; -const Model = BI.inherit(Fix.Model, { - context: ['linkList', 'linkSelected'], -}); -BI.model(RightDetailModel, Model); -export default RightDetailModel; diff --git a/src/app/link_set/right/right_edit/right.edit.component.ts b/src/app/link_set/right/right_edit/right.edit.component.ts index ff8fad7..48ffa9e 100644 --- a/src/app/link_set/right/right_edit/right.edit.component.ts +++ b/src/app/link_set/right/right_edit/right.edit.component.ts @@ -1,13 +1,13 @@ import {WidgetType, Vertical, MultiSelectItem, TextAreaEditor, Editor, Button, TextValueCombo} from '@ui/index'; import {LinkType} from '@ui/type'; import charset from './right.edit.constant'; -import RightEditModel from './right.edit.model'; +import Model from '../../link-set.model'; import FormItem from '@shared/components/form.item.component'; import Title from '@shared/components/title.component'; const className = 'fr.component.right.edit'; const Widget: WidgetType = { _store() { - return BI.Models.getModel(RightEditModel); + return BI.Models.getModel(Model); }, render() { const linkSelected: LinkType = this.model.linkSelected; diff --git a/src/app/link_set/right/right_edit/right.edit.model.ts b/src/app/link_set/right/right_edit/right.edit.model.ts deleted file mode 100644 index b6901c1..0000000 --- a/src/app/link_set/right/right_edit/right.edit.model.ts +++ /dev/null @@ -1,11 +0,0 @@ -const RightEditModel = 'fr.model.linkSet.right.edit'; -const Model = BI.inherit(Fix.Model, { - context: ['linkList', 'linkSelected', 'linkUpdate'], - actions: { - setLinkUpdate(value: any) { - this.model.linkUpdate = value; - }, - }, -}); -BI.model(RightEditModel, Model); -export default RightEditModel; diff --git a/src/app/link_set/right/right_edit/right.edit.mysql.component.ts b/src/app/link_set/right/right_edit/right.edit.mysql.component.ts new file mode 100644 index 0000000..65e391e --- /dev/null +++ b/src/app/link_set/right/right_edit/right.edit.mysql.component.ts @@ -0,0 +1,235 @@ +import {WidgetType, Vertical, MultiSelectItem, TextAreaEditor, Editor, Button, TextValueCombo} from '@ui/index'; +import {LinkType} from '@ui/type'; +import charset from './right.edit.constant'; +import Model from '../../link-set.model'; +import FormItem from '@shared/components/form.item.component'; +import Title from '@shared/components/title.component'; +const className = 'fr.component.right.edit.mysql'; +const Widget: WidgetType = { + _store() { + return BI.Models.getModel(Model); + }, + render() { + const linkSelected: LinkType = this.model.linkSelected; + const that = this; + + return { + type: Vertical, + cls: 'right-show', + items: [ + { + type: FormItem, + text: '数据连接名', + hint: '*修改数据连接名会影响相关数据表和仪表板', + form:{ + type: Editor, + cls: 'bi-border', + width: 300, + value: linkSelected.connectionName, + listeners: [{ + eventName: BI.Editor.EVENT_CHANGE, + action() { + that.store.setLinkUpdate({ + ...that.model.linkUpdate, + connectionName: this.getValue(), + }); + }, + }], + }, + }, + { + type: FormItem, + text: '驱动器', + form:{ + type: TextValueCombo, + cls: 'bi-border', + width: 300, + text: linkSelected.driver, + items: [{ + text: linkSelected.driver, + value: linkSelected.driver, + }], + listeners: [{ + eventName: BI.TextValueCombo.EVENT_CHANGE, + action() { + that.store.setLinkUpdate({ + ...that.model.linkUpdate, + driver: this.getValue()[0], + }); + }, + }], + }, + }, + { + type: FormItem, + text: 'URL', + form:{ + type: Editor, + cls: 'bi-border', + watermark:'请输入', + width: 300, + value: linkSelected.url, + listeners: [{ + eventName: BI.Editor.EVENT_CHANGE, + action() { + that.store.setLinkUpdate({ + ...that.model.linkUpdate, + url: this.getValue(), + }); + }, + }], + }, + }, + { + type: FormItem, + text: '编码', + form:{ + type: TextValueCombo, + cls: 'bi-border', + width: 300, + text: linkSelected.originalCharsetName === '' ? '自动' : linkSelected.originalCharsetName, + items: BI.Constants.getConstant(charset), + listeners: [{ + eventName: BI.TextValueCombo.EVENT_CHANGE, + action() { + that.store.setLinkUpdate({ + ...that.model.linkUpdate, + originalCharsetName: this.getValue()[0], + }); + }, + }], + }, + }, + { + type: FormItem, + text: '用户名', + form:{ + type: Editor, + cls: 'bi-border', + allowBlank:true, + watermark:'请输入', + width: 300, + value: linkSelected.user, + listeners: [{ + eventName: BI.Editor.EVENT_CHANGE, + action() { + that.store.setLinkUpdate({ + ...that.model.linkUpdate, + user: this.getValue(), + }); + }, + }], + }, + }, + { + type: FormItem, + text: '密码', + form:{ + type: Editor, + cls: 'bi-border', + inputType:'password', + allowBlank:true, + watermark:'请输入', + width: 300, + value: linkSelected.password, + listeners: [{ + eventName: BI.Editor.EVENT_CHANGE, + action() { + that.store.setLinkUpdate({ + ...that.model.linkUpdate, + password: this.getValue(), + }); + }, + }], + }, + }, + { + type: Title, + text: '连接池属性', + }, + { + type: FormItem, + text: 'SQL验证查询', + height: 100, + form:{ + type: TextAreaEditor, + cls: 'bi-border', + allowBlank:true, + watermark:'请输入', + width: 300, + height:100, + value: linkSelected.validationQuery, + listeners: [{ + eventName: BI.Editor.EVENT_CHANGE, + action() { + that.store.setLinkUpdate({ + ...that.model.linkUpdate, + validationQuery: this.getValue(), + }); + }, + }], + }, + }, + { + type: FormItem, + text: '获取连接前校验', + form:{ + type: MultiSelectItem, + text: '是', + selected: linkSelected.testOnBorrow, + width: 60, + listeners: [{ + eventName: BI.Editor.EVENT_CHANGE, + action() { + that.store.setLinkUpdate({ + ...that.model.linkUpdate, + testOnBorrow: this.isSelected(), + }); + }, + }], + }, + }, + { + type: FormItem, + text: '最大活动连接数', + form:{ + type: Editor, + cls: 'bi-border', + allowBlank:true, + watermark:'请输入', + width: 60, + value: linkSelected.maxActive, + errorText: '请输入有效的正整数', + validationChecker (v: string) { + if (/^\+?[1-9][0-9]*$/.test(v)) { + return true; + } + + return false; + }, + listeners: [{ + eventName: BI.Editor.EVENT_CHANGE, + action() { + that.store.setLinkUpdate({ + ...that.model.linkUpdate, + maxActive: this.getValue(), + }); + }, + }], + }, + }, + { + type: FormItem, + text: '测试连接', + form: { + type: Button, + text: '测试连接', + level: 'ignore', + }, + }, + ], + }; + }, +}; +BI.shortcut(className, BI.inherit(BI.Widget, Widget)); +export default className; diff --git a/src/app/link_set/right/right_show/right.show.component.ts b/src/app/link_set/right/right_show/right.show.component.ts index 0344da2..fa6b668 100644 --- a/src/app/link_set/right/right_show/right.show.component.ts +++ b/src/app/link_set/right/right_show/right.show.component.ts @@ -1,5 +1,5 @@ import {WidgetType, Vertical} from '@ui/index'; -import RightShowModel from './right.show.model'; +import RightShowModel from '../../link-set.model'; import BothSide from '@shared/components/both.side.component'; import Title from '@shared/components/title.component'; import {LinkType} from '@ui/type'; diff --git a/src/app/link_set/right/right_show/right.show.model.ts b/src/app/link_set/right/right_show/right.show.model.ts deleted file mode 100644 index 80161f0..0000000 --- a/src/app/link_set/right/right_show/right.show.model.ts +++ /dev/null @@ -1,8 +0,0 @@ -const RightShowModel = 'fr.model.linkSet.right.show'; -const Model = BI.inherit(Fix.Model, { - context: ['linkList', 'linkSelected'], - actions: { - }, -}); -BI.model(RightShowModel, Model); -export default RightShowModel; diff --git a/src/app/link_set/right/right_title/right.title.component.ts b/src/app/link_set/right/right_title/right.title.component.ts index fb0e5a8..2a8e509 100644 --- a/src/app/link_set/right/right_title/right.title.component.ts +++ b/src/app/link_set/right/right_title/right.title.component.ts @@ -1,7 +1,7 @@ import {WidgetType, Left, Label, Button} from '@ui/index'; -import RightTitleModel from './right.title.model'; +import RightTitleModel from '../../link-set.model'; import {LinkType} from '@ui/type'; -import {addConnection, updateConnection} from '@shared/crud/crud.request'; +import {saveConnection} from '../../link-set.service'; const className = 'fr.component.right.title'; const Widget: WidgetType = { _store() { @@ -37,19 +37,9 @@ const Widget: WidgetType = { invisible: !isEdit, text: '保存', handler() { - if (that.model.linkUpdate.connectionId) { - addConnection(that.model.linkUpdate, (res: string) => { - if (res === 'success') { - that.store.setEdit(false); - } - }); - } else { - updateConnection(that.model.linkUpdate, (res: string) => { - if (res === 'success') { - that.store.setEdit(false); - } - }); - } + saveConnection(that.model.linkUpdate).then(() => { + that.store.setEdit(false); + }); }, }, { @@ -59,7 +49,7 @@ const Widget: WidgetType = { level: 'ignore', text: '取消', handler() { - that.store.setEdit(false); + that.store.setCancel(); }, }, diff --git a/src/app/link_set/right/right_title/right.title.model.ts b/src/app/link_set/right/right_title/right.title.model.ts deleted file mode 100644 index 37fc937..0000000 --- a/src/app/link_set/right/right_title/right.title.model.ts +++ /dev/null @@ -1,15 +0,0 @@ -const RightTitleModel = 'fr.model.linkSet.right.title'; -const Model = BI.inherit(Fix.Model, { - context: ['linkList', 'linkSelected', 'linkUpdate'], - actions: { - setEdit(type: boolean) { - this.model.linkSelected = { - ...this.model.linkSelected, - isSelected: type, - }; - this.model.linkUpdate = this.model.linkSelected; - }, - }, -}); -BI.model(RightTitleModel, Model); -export default RightTitleModel; diff --git a/src/app/link_set/select/select.component.ts b/src/app/link_set/select/select.component.ts index d0b039c..8127aab 100644 --- a/src/app/link_set/select/select.component.ts +++ b/src/app/link_set/select/select.component.ts @@ -1,5 +1,5 @@ import {WidgetType, Combo, ButtonGroup, TextItem, Vertical} from '@ui'; -import selectModel from './select.model'; +import selectModel from '../link-set.model'; const linkList = [ 'APACHE KYLIN', 'DERBY', 'HP Vertica', 'IBM DB2', 'INFORMIX', 'Microsoft SQL Server', 'MySQL', 'Oracle', 'Privotal Greenplum Database', 'Postgresql', 'GaussDB 200', ]; diff --git a/src/app/link_set/select/select.model.ts b/src/app/link_set/select/select.model.ts deleted file mode 100644 index a7b0461..0000000 --- a/src/app/link_set/select/select.model.ts +++ /dev/null @@ -1,34 +0,0 @@ -import {LinkType} from '@ui/type'; -import {databaseTyle, getCnnectionName} from './select.service'; - -const className = 'fr.model.linkset.select'; -const Model = BI.inherit(Fix.Model, { - context: ['linkList', 'linkSelected', 'linkUpdate'], - actions: { - setNewLink(value: string) { - const name = getCnnectionName(this.model.linkList); - let data = {}; - databaseTyle.forEach(item => { - if (item.text === value) { - data = item; - } - }); - this.model.linkList.push({ - connectionName:name, - isSelected: true, - ...data, - }); - this.model.linkSelected = { - connectionName:name, - isSelected: true, - ...data, - }; - this.model.linkUpdate = { - connectionName:name, - ...data, - }; - }, - }, -}); -BI.model(className, Model); -export default className; diff --git a/src/img/warning.png b/src/img/warning.png new file mode 100644 index 0000000000000000000000000000000000000000..9e14cb51ba259632c79b2159e37578d95e561fb9 GIT binary patch literal 6085 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 literal 0 HcmV?d00001 diff --git a/src/shared/crud/crud.request.ts b/src/shared/crud/crud.request.ts index a60a5c3..85d2be3 100644 --- a/src/shared/crud/crud.request.ts +++ b/src/shared/crud/crud.request.ts @@ -2,6 +2,10 @@ import {linkList} from './curd.mock'; import {LinkType} from '@ui/type'; const Dec: any = (window as any).parent.Dec; +/** + * 获取数据连接列表 + * @param callback 回调函数 + */ export function fetchLinkList(callback: Function): void { if (Dec) { Dec.reqGet('/v10/config/connection/list', 'getInstalledPlugins', (res: any) => { @@ -12,6 +16,11 @@ export function fetchLinkList(callback: Function): void { } } +/** + * 新增数据连接 + * @param data 数据连接参数 + * @param cb 回调函数 + */ export function addConnection(data: LinkType, cb: Function): void{ console.log('%cdata: ', 'color: MidnightBlue; background: Aquamarine;', data); if (Dec) { @@ -23,6 +32,11 @@ export function addConnection(data: LinkType, cb: Function): void{ } } +/** + * 更新数据连接 + * @param data 数据连接参数 + * @param cb 回调函数 + */ export function updateConnection(data: LinkType, cb: Function): void{ console.log('%cdata: ', 'color: MidnightBlue; background: Aquamarine;', data); if (Dec) { @@ -33,7 +47,27 @@ export function updateConnection(data: LinkType, cb: Function): void{ cb('success'); } } +/** + * 测试数据连接 + * @param data 数据连接参数 + * @param cb 回调函数 + */ +export function testConnection(data: LinkType, cb: Function): void{ + console.log('%cdata: ', 'color: MidnightBlue; background: Aquamarine;', data); + if (Dec) { + Dec.reqPost(`/v10/config/connection/test`, data, (res: any) => { + cb(res.data); + }); + } else { + cb('success'); + } +} +/** + * 删除数据连接 + * @param id 数据连接id + * @param cb 回调函数 + */ export function deleteConnection(id: string, cb: Function): void{ console.log('%cid: ', 'color: MidnightBlue; background: Aquamarine;', id); if (Dec) { @@ -44,8 +78,12 @@ export function deleteConnection(id: string, cb: Function): void{ cb('success'); } } - -export function testConnection(id: string, cb: Function): void{ +/** + * 检查数据连接状态 + * @param id 数据连接id + * @param cb 回调函数 + */ +export function getConnectionStatus(id: string, cb: Function): void{ console.log('%cid: ', 'color: MidnightBlue; background: Aquamarine;', id); if (Dec) { Dec.reqDeleta(`/v10/config/connection/${id}/status`, (res: any) => { diff --git a/src/shared/service/dialog.service.ts b/src/shared/service/dialog.service.ts index 7c3073d..dcc172b 100644 --- a/src/shared/service/dialog.service.ts +++ b/src/shared/service/dialog.service.ts @@ -26,7 +26,13 @@ export const confirm = (message: string, onConfirm: Function): void => { { eventName: 'EVENT_CONFIRM', action () { - onConfirm ? onConfirm() : null; + onConfirm ? onConfirm(true) : null; + }, + }, + { + eventName: 'EVENT_CANCEL', + action () { + onConfirm ? onConfirm(false) : null; }, }, ],