From 85e8155d697f01a81824121604eb6f12731e9225 Mon Sep 17 00:00:00 2001 From: alan Date: Tue, 28 May 2019 11:14:45 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=95=B4=E7=90=86=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app.ts | 4 ++-- .../left/left_item => connection/left/item}/left_item.ts | 0 .../left/left_item => connection/left/item}/left_item_icon.ts | 2 +- src/app/{link_set => connection}/left/left.ts | 2 +- src/app/{link_set => connection}/link_set.model.ts | 0 src/app/{link_set => connection}/link_set.service.ts | 0 src/app/{link_set => connection}/link_set.ts | 0 src/app/{link_set => connection}/more/item/more_link_item.ts | 0 .../more/item/more_link_litem.model.ts | 0 src/app/{link_set => connection}/more/more_link.model.ts | 0 src/app/{link_set => connection}/more/more_link.service.ts | 0 src/app/{link_set => connection}/more/more_link.ts | 0 src/app/{link_set => connection}/right/nothing.ts | 0 src/app/{link_set => connection}/right/right.ts | 0 src/app/{link_set => connection}/right/right.typing.d.ts | 0 .../right/right_detail/right_detail.model.ts | 0 .../right/right_detail/right_detail.ts | 0 .../right/right_edit/right_edit.model.ts | 0 .../right/right_edit/right_edit.service.ts | 0 .../{link_set => connection}/right/right_edit/right_edit.ts | 0 .../right/right_edit/right_edit_jndi.ts | 0 .../right/right_edit/right_edit_mysql.ts | 0 .../{link_set => connection}/right/right_show/right_show.ts | 0 .../right/right_show/right_show_jndi.ts | 0 .../{link_set => connection}/right/right_title/right_title.ts | 0 src/app/{link_set => connection}/select/select.service.ts | 0 src/app/{link_set => connection}/select/select.ts | 0 src/app/{link_status => status}/left/left.model.ts | 0 src/app/{link_status => status}/left/left.ts | 0 src/app/{link_status => status}/left/left_item.ts | 0 src/app/{link_status => status}/link_status.model.ts | 0 src/app/{link_status => status}/link_status.ts | 0 src/app/{link_status => status}/right/right.model.ts | 0 src/app/{link_status => status}/right/right.ts | 0 src/app/{link_status => status}/right/right.typings.d.ts | 0 src/app/{link_status => status}/right/right_card.ts | 0 src/app/title/{title_item => item}/title_item.model.ts | 0 src/app/title/{title_item => item}/title_item.service.ts | 0 src/app/title/{title_item => item}/title_item.ts | 0 src/app/title/title.ts | 2 +- 40 files changed, 5 insertions(+), 5 deletions(-) rename src/app/{link_set/left/left_item => connection/left/item}/left_item.ts (100%) rename src/app/{link_set/left/left_item => connection/left/item}/left_item_icon.ts (98%) rename src/app/{link_set => connection}/left/left.ts (95%) rename src/app/{link_set => connection}/link_set.model.ts (100%) rename src/app/{link_set => connection}/link_set.service.ts (100%) rename src/app/{link_set => connection}/link_set.ts (100%) rename src/app/{link_set => connection}/more/item/more_link_item.ts (100%) rename src/app/{link_set => connection}/more/item/more_link_litem.model.ts (100%) rename src/app/{link_set => connection}/more/more_link.model.ts (100%) rename src/app/{link_set => connection}/more/more_link.service.ts (100%) rename src/app/{link_set => connection}/more/more_link.ts (100%) rename src/app/{link_set => connection}/right/nothing.ts (100%) rename src/app/{link_set => connection}/right/right.ts (100%) rename src/app/{link_set => connection}/right/right.typing.d.ts (100%) rename src/app/{link_set => connection}/right/right_detail/right_detail.model.ts (100%) rename src/app/{link_set => connection}/right/right_detail/right_detail.ts (100%) rename src/app/{link_set => connection}/right/right_edit/right_edit.model.ts (100%) rename src/app/{link_set => connection}/right/right_edit/right_edit.service.ts (100%) rename src/app/{link_set => connection}/right/right_edit/right_edit.ts (100%) rename src/app/{link_set => connection}/right/right_edit/right_edit_jndi.ts (100%) rename src/app/{link_set => connection}/right/right_edit/right_edit_mysql.ts (100%) rename src/app/{link_set => connection}/right/right_show/right_show.ts (100%) rename src/app/{link_set => connection}/right/right_show/right_show_jndi.ts (100%) rename src/app/{link_set => connection}/right/right_title/right_title.ts (100%) rename src/app/{link_set => connection}/select/select.service.ts (100%) rename src/app/{link_set => connection}/select/select.ts (100%) rename src/app/{link_status => status}/left/left.model.ts (100%) rename src/app/{link_status => status}/left/left.ts (100%) rename src/app/{link_status => status}/left/left_item.ts (100%) rename src/app/{link_status => status}/link_status.model.ts (100%) rename src/app/{link_status => status}/link_status.ts (100%) rename src/app/{link_status => status}/right/right.model.ts (100%) rename src/app/{link_status => status}/right/right.ts (100%) rename src/app/{link_status => status}/right/right.typings.d.ts (100%) rename src/app/{link_status => status}/right/right_card.ts (100%) rename src/app/title/{title_item => item}/title_item.model.ts (100%) rename src/app/title/{title_item => item}/title_item.service.ts (100%) rename src/app/title/{title_item => item}/title_item.ts (100%) diff --git a/src/app/app.ts b/src/app/app.ts index 97d114c..88015b2 100644 --- a/src/app/app.ts +++ b/src/app/app.ts @@ -1,8 +1,8 @@ import {Vtape, Left, Vertical, Absolute} from '../ui/index'; import appModel from './app.model'; import title from './title/title'; -import linkSet from './link_set/link_set'; -import linkStatus from './link_status/link_status'; +import linkSet from './connection/link_set'; +import linkStatus from './status/link_status'; import '../less/index.less'; const className = 'dec.dcm.main'; diff --git a/src/app/link_set/left/left_item/left_item.ts b/src/app/connection/left/item/left_item.ts similarity index 100% rename from src/app/link_set/left/left_item/left_item.ts rename to src/app/connection/left/item/left_item.ts diff --git a/src/app/link_set/left/left_item/left_item_icon.ts b/src/app/connection/left/item/left_item_icon.ts similarity index 98% rename from src/app/link_set/left/left_item/left_item_icon.ts rename to src/app/connection/left/item/left_item_icon.ts index 10e1a27..eca442b 100644 --- a/src/app/link_set/left/left_item/left_item_icon.ts +++ b/src/app/connection/left/item/left_item_icon.ts @@ -1,4 +1,4 @@ -import {WidgetType, Icon, BubbleCombo, TextBubblePopupBarView, IconButton} from '@ui/index'; +import {WidgetType, Icon, BubbleCombo, TextBubblePopupBarView, IconButton} from '@ui'; import Model from '../../link_set.model'; import {ACTION_DELETE} from '@private/constants'; diff --git a/src/app/link_set/left/left.ts b/src/app/connection/left/left.ts similarity index 95% rename from src/app/link_set/left/left.ts rename to src/app/connection/left/left.ts index 85aebd8..547d572 100644 --- a/src/app/link_set/left/left.ts +++ b/src/app/connection/left/left.ts @@ -1,7 +1,7 @@ import {WidgetType, ListView} from '@ui'; import Model from '../link_set.model'; import {LinkType} from '@ui/type'; -import LeftItem from './left_item/left_item'; +import LeftItem from './item/left_item'; const className = 'dec.dcm.component.linkset.left'; let leftContent: any = null; diff --git a/src/app/link_set/link_set.model.ts b/src/app/connection/link_set.model.ts similarity index 100% rename from src/app/link_set/link_set.model.ts rename to src/app/connection/link_set.model.ts diff --git a/src/app/link_set/link_set.service.ts b/src/app/connection/link_set.service.ts similarity index 100% rename from src/app/link_set/link_set.service.ts rename to src/app/connection/link_set.service.ts diff --git a/src/app/link_set/link_set.ts b/src/app/connection/link_set.ts similarity index 100% rename from src/app/link_set/link_set.ts rename to src/app/connection/link_set.ts diff --git a/src/app/link_set/more/item/more_link_item.ts b/src/app/connection/more/item/more_link_item.ts similarity index 100% rename from src/app/link_set/more/item/more_link_item.ts rename to src/app/connection/more/item/more_link_item.ts diff --git a/src/app/link_set/more/item/more_link_litem.model.ts b/src/app/connection/more/item/more_link_litem.model.ts similarity index 100% rename from src/app/link_set/more/item/more_link_litem.model.ts rename to src/app/connection/more/item/more_link_litem.model.ts diff --git a/src/app/link_set/more/more_link.model.ts b/src/app/connection/more/more_link.model.ts similarity index 100% rename from src/app/link_set/more/more_link.model.ts rename to src/app/connection/more/more_link.model.ts diff --git a/src/app/link_set/more/more_link.service.ts b/src/app/connection/more/more_link.service.ts similarity index 100% rename from src/app/link_set/more/more_link.service.ts rename to src/app/connection/more/more_link.service.ts diff --git a/src/app/link_set/more/more_link.ts b/src/app/connection/more/more_link.ts similarity index 100% rename from src/app/link_set/more/more_link.ts rename to src/app/connection/more/more_link.ts diff --git a/src/app/link_set/right/nothing.ts b/src/app/connection/right/nothing.ts similarity index 100% rename from src/app/link_set/right/nothing.ts rename to src/app/connection/right/nothing.ts diff --git a/src/app/link_set/right/right.ts b/src/app/connection/right/right.ts similarity index 100% rename from src/app/link_set/right/right.ts rename to src/app/connection/right/right.ts diff --git a/src/app/link_set/right/right.typing.d.ts b/src/app/connection/right/right.typing.d.ts similarity index 100% rename from src/app/link_set/right/right.typing.d.ts rename to src/app/connection/right/right.typing.d.ts diff --git a/src/app/link_set/right/right_detail/right_detail.model.ts b/src/app/connection/right/right_detail/right_detail.model.ts similarity index 100% rename from src/app/link_set/right/right_detail/right_detail.model.ts rename to src/app/connection/right/right_detail/right_detail.model.ts diff --git a/src/app/link_set/right/right_detail/right_detail.ts b/src/app/connection/right/right_detail/right_detail.ts similarity index 100% rename from src/app/link_set/right/right_detail/right_detail.ts rename to src/app/connection/right/right_detail/right_detail.ts diff --git a/src/app/link_set/right/right_edit/right_edit.model.ts b/src/app/connection/right/right_edit/right_edit.model.ts similarity index 100% rename from src/app/link_set/right/right_edit/right_edit.model.ts rename to src/app/connection/right/right_edit/right_edit.model.ts diff --git a/src/app/link_set/right/right_edit/right_edit.service.ts b/src/app/connection/right/right_edit/right_edit.service.ts similarity index 100% rename from src/app/link_set/right/right_edit/right_edit.service.ts rename to src/app/connection/right/right_edit/right_edit.service.ts diff --git a/src/app/link_set/right/right_edit/right_edit.ts b/src/app/connection/right/right_edit/right_edit.ts similarity index 100% rename from src/app/link_set/right/right_edit/right_edit.ts rename to src/app/connection/right/right_edit/right_edit.ts diff --git a/src/app/link_set/right/right_edit/right_edit_jndi.ts b/src/app/connection/right/right_edit/right_edit_jndi.ts similarity index 100% rename from src/app/link_set/right/right_edit/right_edit_jndi.ts rename to src/app/connection/right/right_edit/right_edit_jndi.ts diff --git a/src/app/link_set/right/right_edit/right_edit_mysql.ts b/src/app/connection/right/right_edit/right_edit_mysql.ts similarity index 100% rename from src/app/link_set/right/right_edit/right_edit_mysql.ts rename to src/app/connection/right/right_edit/right_edit_mysql.ts diff --git a/src/app/link_set/right/right_show/right_show.ts b/src/app/connection/right/right_show/right_show.ts similarity index 100% rename from src/app/link_set/right/right_show/right_show.ts rename to src/app/connection/right/right_show/right_show.ts diff --git a/src/app/link_set/right/right_show/right_show_jndi.ts b/src/app/connection/right/right_show/right_show_jndi.ts similarity index 100% rename from src/app/link_set/right/right_show/right_show_jndi.ts rename to src/app/connection/right/right_show/right_show_jndi.ts diff --git a/src/app/link_set/right/right_title/right_title.ts b/src/app/connection/right/right_title/right_title.ts similarity index 100% rename from src/app/link_set/right/right_title/right_title.ts rename to src/app/connection/right/right_title/right_title.ts diff --git a/src/app/link_set/select/select.service.ts b/src/app/connection/select/select.service.ts similarity index 100% rename from src/app/link_set/select/select.service.ts rename to src/app/connection/select/select.service.ts diff --git a/src/app/link_set/select/select.ts b/src/app/connection/select/select.ts similarity index 100% rename from src/app/link_set/select/select.ts rename to src/app/connection/select/select.ts diff --git a/src/app/link_status/left/left.model.ts b/src/app/status/left/left.model.ts similarity index 100% rename from src/app/link_status/left/left.model.ts rename to src/app/status/left/left.model.ts diff --git a/src/app/link_status/left/left.ts b/src/app/status/left/left.ts similarity index 100% rename from src/app/link_status/left/left.ts rename to src/app/status/left/left.ts diff --git a/src/app/link_status/left/left_item.ts b/src/app/status/left/left_item.ts similarity index 100% rename from src/app/link_status/left/left_item.ts rename to src/app/status/left/left_item.ts diff --git a/src/app/link_status/link_status.model.ts b/src/app/status/link_status.model.ts similarity index 100% rename from src/app/link_status/link_status.model.ts rename to src/app/status/link_status.model.ts diff --git a/src/app/link_status/link_status.ts b/src/app/status/link_status.ts similarity index 100% rename from src/app/link_status/link_status.ts rename to src/app/status/link_status.ts diff --git a/src/app/link_status/right/right.model.ts b/src/app/status/right/right.model.ts similarity index 100% rename from src/app/link_status/right/right.model.ts rename to src/app/status/right/right.model.ts diff --git a/src/app/link_status/right/right.ts b/src/app/status/right/right.ts similarity index 100% rename from src/app/link_status/right/right.ts rename to src/app/status/right/right.ts diff --git a/src/app/link_status/right/right.typings.d.ts b/src/app/status/right/right.typings.d.ts similarity index 100% rename from src/app/link_status/right/right.typings.d.ts rename to src/app/status/right/right.typings.d.ts diff --git a/src/app/link_status/right/right_card.ts b/src/app/status/right/right_card.ts similarity index 100% rename from src/app/link_status/right/right_card.ts rename to src/app/status/right/right_card.ts diff --git a/src/app/title/title_item/title_item.model.ts b/src/app/title/item/title_item.model.ts similarity index 100% rename from src/app/title/title_item/title_item.model.ts rename to src/app/title/item/title_item.model.ts diff --git a/src/app/title/title_item/title_item.service.ts b/src/app/title/item/title_item.service.ts similarity index 100% rename from src/app/title/title_item/title_item.service.ts rename to src/app/title/item/title_item.service.ts diff --git a/src/app/title/title_item/title_item.ts b/src/app/title/item/title_item.ts similarity index 100% rename from src/app/title/title_item/title_item.ts rename to src/app/title/item/title_item.ts diff --git a/src/app/title/title.ts b/src/app/title/title.ts index c9e577c..6d11acd 100644 --- a/src/app/title/title.ts +++ b/src/app/title/title.ts @@ -1,5 +1,5 @@ import {WidgetType, IconButton, LeftRightVerticalAdapt} from '@ui/index'; -import TitleItem from './title_item/title_item'; +import TitleItem from './item/title_item'; import {isDesigner, closeWindow} from '@shared/crud/crud.request'; import {TAB_LINK_SET, TAB_LINK_POOL} from '@private/constants'; const className = 'dec.dcm.title';