refactor: 修改文件命名

private/constants.ts

@@ -12,81 +12,7 @@ export const TAB_LINK_POOL = 'TAB_LINK_POOL';
 
 export const DATA_LINKS = ['APACHE KYLIN', 'DERBY', 'HP Vertica', 'IBM DB2', 'INFORMIX', 'Microsoft SQL Server', 'MySQL', 'Oracle', 'Privotal Greenplum Database', 'Postgresql', 'GaussDB 200', 'JNDI'];
 
-export const DATA_BASE_TYPE = [
+export const DATA_BASE_TYPE_OTHER = [
-  {
-    text: 'APACHE KYLIN',
-    databaseType: 'apache-kylin',
-    driver: 'org.apache.kylin.jdbc.Driver',
-    url: 'jdbc:kylin://<hostname>:<port>/<kylin_project_name>',
-  },
-  {
-    text: 'DERBY',
-    databaseType: 'derby',
-    driver: 'org.apache.derby.jdbc.ClientDriver',
-    url: 'jdbc:derby://localhost:1527/',
-  },
-  {
-    text: 'HP Vertica',
-    databaseType: 'hp-vertica',
-    driver: 'com.vertica.jdbc.Driver',
-    url: 'jdbc:vertica://ip:port/databaseName',
-  },
-  {
-    text: 'IBM DB2',
-    databaseType: 'ibm-db2',
-    driver: 'com.ibm.db2.jcc.DB2Driver',
-    url: 'jdbc:db2://hostname:port/dbname',
-  },
-  {
-    text: 'INFORMIX',
-    databaseType: 'informix',
-    driver: 'com.informix.jdbc.IfxDriver',
-    url: 'jdbc:informix-sqli://{host}:{port}/{database}:INFORMIXSERVER={server}',
-  },
-  {
-    text: 'Microsoft SQL Server',
-    databaseType: 'sql-server',
-    driver: 'com.microsoft.sqlserver.jdbc.SQLServerDriver',
-    url: 'jdbc:sqlserver://localhost:1433;databaseName=',
-  },
-  {
-    text: 'Oracle',
-    databaseType: 'oracle',
-    driver: 'oracle.jdbc.driver.OracleDriver',
-    url: 'jdbc:oracle:thin:@localhost:1521:databaseName',
-  },
-  {
-    text: 'Privotal Greenplum Database',
-    databaseType: 'pivotal-greenplum-database',
-    driver: 'org.postgresql.Driver',
-    url: 'jdbc:postgresql://hostname:port/dbname',
-  },
-  {
-    text: 'Postgresql',
-    databaseType: 'postgresql',
-    driver: 'org.postgresql.Driver',
-    url: 'jdbc:postgresql://hostname:port/dbname',
-  },
-  {
-    text: 'GaussDB 200',
-    databaseType: 'hw-libr-a',
-    driver: 'org.postgresql.Driver',
-    url: 'jdbc:postgresql://hostname:port/dbname',
-  },
-  {
-    text: 'MySQL',
-    databaseType: 'mysql',
-    driver: 'com.mysql.jdbc.Driver',
-    drivers: ['com.mysql.jdbc.Driver', 'org.gjt.mm.mysql.Driver'],
-    url: 'jdbc:mysql://localhost/dbname',
-  },
-  {
-    text: OTHER_CONNECT,
-    databaseType: 'other',
-    driver: 'org.h2.Driver',
-    drivers: ['org.h2.Driver', 'com.fr.third.org.hsqldb.jdbcDriver', 'org.sqlite.JDBC'],
-    url: 'jdbc:h2://${ENV_HOME}/../databaseName',
-  },
   {
     text: 'ADS',
     databaseType: 'ads',
@@ -269,7 +195,86 @@ export const DATA_BASE_TYPE = [
     databaseType: 'transwarp-inceptor',
     driver: 'org.apache.hive.jdbc.HiveDriver',
     url: 'jdbc:hive2://hostname:port/databasename',
-  }, {
+  },
+];
+
+export const DATA_BASE_TYPE = [
+  {
+    text: 'APACHE KYLIN',
+    databaseType: 'apache-kylin',
+    driver: 'org.apache.kylin.jdbc.Driver',
+    url: 'jdbc:kylin://<hostname>:<port>/<kylin_project_name>',
+  },
+  {
+    text: 'DERBY',
+    databaseType: 'derby',
+    driver: 'org.apache.derby.jdbc.ClientDriver',
+    url: 'jdbc:derby://localhost:1527/',
+  },
+  {
+    text: 'HP Vertica',
+    databaseType: 'hp-vertica',
+    driver: 'com.vertica.jdbc.Driver',
+    url: 'jdbc:vertica://ip:port/databaseName',
+  },
+  {
+    text: 'IBM DB2',
+    databaseType: 'ibm-db2',
+    driver: 'com.ibm.db2.jcc.DB2Driver',
+    url: 'jdbc:db2://hostname:port/dbname',
+  },
+  {
+    text: 'INFORMIX',
+    databaseType: 'informix',
+    driver: 'com.informix.jdbc.IfxDriver',
+    url: 'jdbc:informix-sqli://{host}:{port}/{database}:INFORMIXSERVER={server}',
+  },
+  {
+    text: 'Microsoft SQL Server',
+    databaseType: 'sql-server',
+    driver: 'com.microsoft.sqlserver.jdbc.SQLServerDriver',
+    url: 'jdbc:sqlserver://localhost:1433;databaseName=',
+  },
+  {
+    text: 'Oracle',
+    databaseType: 'oracle',
+    driver: 'oracle.jdbc.driver.OracleDriver',
+    url: 'jdbc:oracle:thin:@localhost:1521:databaseName',
+  },
+  {
+    text: 'Privotal Greenplum Database',
+    databaseType: 'pivotal-greenplum-database',
+    driver: 'org.postgresql.Driver',
+    url: 'jdbc:postgresql://hostname:port/dbname',
+  },
+  {
+    text: 'Postgresql',
+    databaseType: 'postgresql',
+    driver: 'org.postgresql.Driver',
+    url: 'jdbc:postgresql://hostname:port/dbname',
+  },
+  {
+    text: 'GaussDB 200',
+    databaseType: 'hw-libr-a',
+    driver: 'org.postgresql.Driver',
+    url: 'jdbc:postgresql://hostname:port/dbname',
+  },
+  {
+    text: 'MySQL',
+    databaseType: 'mysql',
+    driver: 'com.mysql.jdbc.Driver',
+    drivers: ['com.mysql.jdbc.Driver', 'org.gjt.mm.mysql.Driver'],
+    url: 'jdbc:mysql://localhost/dbname',
+  },
+  {
+    text: OTHER_CONNECT,
+    databaseType: 'other',
+    driver: 'org.h2.Driver',
+    drivers: ['org.h2.Driver', 'com.fr.third.org.hsqldb.jdbcDriver', 'org.sqlite.JDBC'],
+    url: 'jdbc:h2://${ENV_HOME}/../databaseName',
+  },
+  ...DATA_BASE_TYPE_OTHER,
+  {
     text: JNDI_CONNECT,
   },
 ];

src/app/app.ts

@@ -1,9 +1,9 @@
 import {Vtape} from '../ui/index';
 import {LinkType} from '@ui/type';
 import appModel from './app.model';
-import title from './title/title.component';
+import title from './title/title';
-import linkSet from './link_set/link-set.component';
+import linkSet from './link_set/link_set';
-import linkStatus from './link_status/link_status.component';
+import linkStatus from './link_status/link_status';
 import {fetchLinkList} from '../shared/crud/crud.request';
 import './app.component.scss';
 

src/app/link_set/left/left.service.ts

@@ -1,5 +1,5 @@
 import {LinkType} from '@ui/type';
-import LeftItem from './left_item/left.item.component';
+import LeftItem from './left_item/left_item';
 
 export const getLinks = (linkList: LinkType[]): any => {
   const links: any[] = [];

src/app/link_set/left/left.ts

@@ -1,5 +1,5 @@
 import {WidgetType, Vertical} from '@ui';
-import Model from '../link-set.model';
+import Model from '../link_set.model';
 import {LinkType} from '@ui/type';
 import {getLinks} from './left.service';
 const className = 'fr.component.linkset.left';
@@ -8,7 +8,7 @@ const Widget: WidgetType = {
   _store() {
     return BI.Models.getModel(Model);
   },
-  watch:{
+  watch: {
     linkList(linkList: LinkType[]) {
       leftContent.populate(BI.createItems(getLinks(linkList)));
     },

src/app/link_set/left/left_item/left_item.ts

@@ -1,6 +1,6 @@
 import {WidgetType, Left, Label, Icon, TextButton} from '@ui';
-import ItemIcon from './left.item.icon.component';
+import ItemIcon from './left_item_icon';
-import Model from '../../link-set.model';
+import Model from '../../link_set.model';
 import {ACTION_COPY, ACTION_TEST, ACTION_DELETE, DEFAULT_INFO} from '@private/constants';
 const className = 'fr.component.linkSet.left.item';
 const Widget: WidgetType = {

src/app/link_set/left/left_item/left_item_icon.ts

@@ -1,5 +1,5 @@
 import {WidgetType, Icon, BubbleCombo, TextBubblePopupBarView, IconButton} from '@ui/index';
-import Model from '../../link-set.model';
+import Model from '../../link_set.model';
 import {ACTION_DELETE} from '@private/constants';
 
 const className = 'fr.component.linkSet.left.item.icon';

src/app/link_set/link_set.model.ts

@@ -4,7 +4,7 @@ import {deleteConnection, testConnection} from '@shared/crud/crud.request';
 import {getCnnectionName} from './select/select.service';
 import {DATA_BASE_TYPE} from '@private/constants';
 import dialog from '@shared/service/dialog.service';
-import {saveConnection} from './link-set.service';
+import {saveConnection} from './link_set.service';
 
 const className = 'fr.model.linkset';
 const Model: ModelType = {

src/app/link_set/link_set.ts

@@ -1,8 +1,8 @@
 import {Htape, WidgetType, Vtape, Left} from '@ui';
-import LeftList from './left/left.component';
+import LeftList from './left/left';
-import linkSetModel from './link-set.model';
+import linkSetModel from './link_set.model';
-import Select from './select/select.component';
+import Select from './select/select';
-import Right from './right/right.component';
+import Right from './right/right';
 import {TAB_LINK_SET} from '@private/constants';
 const className = 'fr.linkset';
 const Widget: WidgetType = {

src/app/link_set/more/more_link.service.ts

@@ -1,4 +1,4 @@
-import MoreLink from './more.link.component';
+import MoreLink from './more_link';
 let SubbitButton: any = null;
 let selectKey = '';
 export const moreLink = (onConfirm?: Function): void => {
@@ -22,7 +22,7 @@ export const moreLink = (onConfirm?: Function): void => {
         },
       ],
     },
-    footer:{
+    footer: {
       type: 'bi.right_vertical_adapt',
       lgap: 10,
       items: [{

src/app/link_set/more/more_link.ts

@@ -1,6 +1,6 @@
 import {WidgetType, Vertical, SearchEditor, Left, Vtape} from '@ui/index';
-import {DATA_BASE_TYPE} from '@private/constants';
+import {DATA_BASE_TYPE_OTHER} from '@private/constants';
-import MoreLinkItem from './more.link.item.component';
+import MoreLinkItem from './more_link_item';
 const className = 'fr.component.linkSet.morelink';
 let morkLinkItem: any = null;
 const Widget: WidgetType = {
@@ -34,7 +34,7 @@ const Widget: WidgetType = {
     this._renderItems();
   },
   _renderItems(text = '') {
-    const databaseLink = DATA_BASE_TYPE.slice(12, 12 + 33);
+    const databaseLink = DATA_BASE_TYPE_OTHER;
     const items: any[] = [];
     const that = this;
     databaseLink.forEach(item => {

src/app/link_set/more/more_link_item.ts

@@ -6,24 +6,24 @@ const Widget: WidgetType = {
     
     return {
       type: Vertical,
-      cls:'link-item',
+      cls: 'link-item',
       width: 120,
       height: 117,
-      items:[
+      items: [
         {
           type: Img,
           width: 120,
           height: 90,
-          src:`./img/${name}.jpg`,
+          src: `./img/${name}.jpg`,
         }, {
           type: Layout,
           cls: 'selected',
           invisible: !selected,
-          width:30,
+          width: 30,
           height: 30,
         }, {
           type: Label,
-          cls:'text',
+          cls: 'text',
           text,
         },
       ],

src/app/link_set/right/nothing.ts

@@ -8,7 +8,7 @@ const Widget: WidgetType = {
         type: Vertical,
         width: 260,
         height: 180,
-        items:[
+        items: [
           {
             type: Layout,
             cls: 'data-connection-background',
@@ -16,7 +16,7 @@ const Widget: WidgetType = {
             height: 130,
           },
           {
-            type:Label,
+            type: Label,
             height: 20,
             text: BI.i18nText('Dec-Dcm_Connection_Plase_Add_One'),
           },

src/app/link_set/right/right.ts

@@ -1,15 +1,15 @@
 import {WidgetType, Vertical} from '@ui';
 import {LinkType} from '@ui/type';
-import Nothing from './nothing.component';
+import Nothing from './nothing';
-import RightDetail from './right_detail/right.detail.component';
+import RightDetail from './right_detail/right_detail';
-import Model from '../link-set.model';
+import Model from '../link_set.model';
 let rightContent: any = null;
 const className = 'fr.component.right';
 const Widget: WidgetType = {
   _store() {
     return BI.Models.getModel(Model);
   },
-  watch:{
+  watch: {
     linkSelected(linkSelected: LinkType) {
       rightContent.populate(BI.createItems([
         {
@@ -20,8 +20,8 @@ const Widget: WidgetType = {
   },
   render() {
     return {
-      type:Vertical,
+      type: Vertical,
-      cls:'database-right',
+      cls: 'database-right',
       ref(_ref: any) {
         rightContent = _ref;
       },

src/app/link_set/right/right_detail/right_detail.service.ts

@@ -1,9 +1,9 @@
-import Title from '../right_title/right.title.component';
+import Title from '../right_title/right_title';
-import RightShow from '../right_show/right.show.component';
+import RightShow from '../right_show/right_show';
-import RightShowJndi from '../right_show/right.show.jndi.component';
+import RightShowJndi from '../right_show/right_show_jndi';
-import RightEdit from '../right_edit/right.edit.component';
+import RightEdit from '../right_edit/right_edit';
-import RightEditMysql from '../right_edit/right.edit.mysql.component';
+import RightEditMysql from '../right_edit/right_edit_mysql';
-import RightEditJndi from '../right_edit/right.edit.jndi.component';
+import RightEditJndi from '../right_edit/right_edit_jndi';
 import {LinkType} from '@ui/type';
 import pluginListConstant from '../../../app.constant';
 import {MYSQL_CONNECT, JNDI_CONNECT} from '@private/constants';

src/app/link_set/right/right_detail/right_detail.ts

@@ -1,6 +1,6 @@
 import {WidgetType, Vertical} from '@ui/index';
-import Model from '../../link-set.model';
+import Model from '../../link_set.model';
-import {renderEdit} from './right.detail.service';
+import {renderEdit} from './right_detail.service';
 import {LinkType} from '@ui/type';
 
 const className = 'fr.component.right.detail';

src/app/link_set/right/right_edit/right_edit.ts

@@ -1,10 +1,10 @@
 import {WidgetType, Vertical, MultiSelectItem, TextAreaEditor, Editor, Button, TextValueCombo} from '@ui/index';
 import {LinkType} from '@ui/type';
 import {CONNECT_CHARSET} from '@private/constants';
-import Model from '../../link-set.model';
+import Model from '../../link_set.model';
-import FormItem from '@shared/components/form.item.component';
+import FormItem from '@shared/components/form_item';
-import Title from '@shared/components/title.component';
+import Title from '@shared/components/title';
-import {getDrivers, connectNameChecker} from './right.edit.service';
+import {getDrivers, connectNameChecker} from './right_edit.service';
 let ConnectionName: any = null;
 const className = 'fr.component.right.edit';
 const Widget: WidgetType = {

src/app/link_set/right/right_edit/right_edit_jndi.ts

@@ -1,5 +1,5 @@
 import {Vertical, Editor, TextValueCombo, TextButton, Label} from '@ui';
-import FormItem from '@shared/components/form.item.component';
+import FormItem from '@shared/components/form_item';
 import {JNDI_FACTORYS, OTHER_ATTRIBUTES, CONNECT_CHARSET} from '@private/constants';
 import {AttributeType} from '../right.typing';
 

src/app/link_set/right/right_edit/right_edit_mysql.ts

@@ -1,10 +1,10 @@
 import {WidgetType, Vertical, MultiSelectItem, TextAreaEditor, Editor, Button, TextValueCombo} from '@ui/index';
 import {LinkType} from '@ui/type';
 import {CONNECT_CHARSET} from '@private/constants';
-import Model from '../../link-set.model';
+import Model from '../../link_set.model';
-import FormItem from '@shared/components/form.item.component';
+import FormItem from '@shared/components/form_item';
-import Title from '@shared/components/title.component';
+import Title from '@shared/components/title';
-import {getDrivers, connectNameChecker} from './right.edit.service';
+import {getDrivers, connectNameChecker} from './right_edit.service';
 const className = 'fr.component.right.edit.mysql';
 const Widget: WidgetType = {
   _store() {

src/app/link_set/right/right_show/right_show.ts

@@ -1,7 +1,7 @@
 import {WidgetType, Vertical} from '@ui/index';
-import RightShowModel from '../../link-set.model';
+import RightShowModel from '../../link_set.model';
-import BothSide from '@shared/components/both.side.component';
+import BothSide from '@shared/components/both_side';
-import Title from '@shared/components/title.component';
+import Title from '@shared/components/title';
 import {LinkType} from '@ui/type';
 const className = 'fr.component.right.show';
 const Widget: WidgetType = {

src/app/link_set/right/right_show/right_show_jndi.ts

@@ -1,5 +1,5 @@
 import {Vertical, TextButton, Label} from '@ui';
-import FormItem from '@shared/components/form.item.component';
+import FormItem from '@shared/components/form_item';
 import {OTHER_ATTRIBUTES} from '@private/constants';
 import {AttributeType} from '../right.typing';
 

src/app/link_set/right/right_title/right_title.ts

@@ -1,5 +1,5 @@
 import {WidgetType, Left, Label, Button} from '@ui/index';
-import RightTitleModel from '../../link-set.model';
+import RightTitleModel from '../../link_set.model';
 import {LinkType} from '@ui/type';
 import {OTHER_CONNECT} from '@private/constants';
 const className = 'fr.component.right.title';
@@ -26,7 +26,7 @@ const Widget: WidgetType = {
         },
         {
           type: Button,
-          cls:'right-title-button',
+          cls: 'right-title-button',
           invisible: isEdit,
           text: BI.i18nText('Dec-Dcm_Edit'),
           handler() {
@@ -35,7 +35,7 @@ const Widget: WidgetType = {
         },
         {
           type: Button,
-          cls:'right-title-button',
+          cls: 'right-title-button',
           invisible: !isEdit,
           text: BI.i18nText('Dec-Dcm_Save'),
           handler() {
@@ -49,7 +49,7 @@ const Widget: WidgetType = {
         },
         {
           type: Button,
-          cls:'right-title-button',
+          cls: 'right-title-button',
           invisible: !isEdit,
           level: 'ignore',
           text: BI.i18nText('BI-Basic_Cancel'),

src/app/link_set/select/select.ts

@@ -1,6 +1,6 @@
 import {WidgetType, Combo, ButtonGroup, TextItem, Vertical} from '@ui';
-import selectModel from '../link-set.model';
+import selectModel from '../link_set.model';
-import {moreLink} from '../more/more.link.service';
+import {moreLink} from '../more/more_link.service';
 import connectList from '../../app.constant';
 import {DATA_LINKS} from '@private/constants';
 const className = 'fr.linkset.select';

src/app/link_status/left/left.service.ts

@@ -1,5 +1,5 @@
 import {LinkType} from '@ui/type';
-import LeftItem from './left.item.component';
+import LeftItem from './left_item';
 
 export const getLinks = (linkList: LinkType[], selectTitle = ''): any => {
   const links: any[] = [];

src/app/link_status/link_status.ts

@@ -1,7 +1,7 @@
 import {WidgetType, Htape, Vtape, Left, Label} from '@ui';
 import linkStatusModel from './link_status.model';
-import LeftList from './left/left.component';
+import LeftList from './left/left';
-import Right from './right/right.component';
+import Right from './right/right';
 import {TAB_LINK_POOL} from '@private/constants';
 const className = 'fr.linkstatus';
 

src/app/link_status/right/right.ts

@@ -1,7 +1,7 @@
 import {WidgetType, Vertical, Left, Label} from '@ui/index';
 import Model from './right.model';
 import {info} from '@shared/crud/crud.request';
-import RightCard from './right.card.component';
+import RightCard from './right_card';
 import {InfoType} from './right.typings';
 import {LinkType} from '@ui/type';
 import pluginListConstant from '../../app.constant';
@@ -14,7 +14,7 @@ const Widget: WidgetType = {
   _store() {
     return BI.Models.getModel(Model);
   },
-  watch:{
+  watch: {
     statusSelected(title: string) {
       const link = BI.find(this.model.linkList, (index: number, item: LinkType) => item.connectionName === title);
       const plugins: string[] = BI.Constants.getConstant(pluginListConstant);
@@ -31,17 +31,17 @@ const Widget: WidgetType = {
   },
   render() {
     return {
-      type:Vertical,
+      type: Vertical,
-      cls:'database-right',
+      cls: 'database-right',
-      items:[
+      items: [
         {
           type: Left,
           height: 40,
           cls: 'right-status-title',
-          items:[
+          items: [
             {
               type: Label,
-              text:BI.i18nText('Dec-Dcm_Data_Connections'),
+              text: BI.i18nText('Dec-Dcm_Data_Connections'),
             },
           ],
           ref(ref: any) {

src/app/link_status/right/right_card.ts

@@ -13,11 +13,11 @@ const Widget: WidgetType = {
           items: [
             {
               type: Vertical,
-              cls:'right-status-board',
+              cls: 'right-status-board',
               items: [
                 {
                   type: Vertical,
-                  cls:'right-status-board-item',
+                  cls: 'right-status-board-item',
                   items: [
                     {
                       type: Label,
@@ -52,11 +52,11 @@ const Widget: WidgetType = {
           items: [
             {
               type: Vertical,
-              cls:'right-status-board',
+              cls: 'right-status-board',
               items: [
                 {
                   type: Vertical,
-                  cls:'right-status-board-item',
+                  cls: 'right-status-board-item',
                   items: [
                     {
                       type: Label,

src/app/title/title.ts

@@ -1,5 +1,5 @@
 import {Left, WidgetType, IconButton} from '@ui/index';
-import TitleItem from './title_item/title_item.component';
+import TitleItem from './title_item/title_item';
 import {isDesigner, closeWindow} from '@shared/crud/crud.request';
 import {TAB_LINK_SET, TAB_LINK_POOL} from '@private/constants';
 const className = 'fr.title';

src/index.ts

@@ -1,10 +1,10 @@
 import i18n from '../private/i18n';
 BI.DOM.ready(() => {
-  const app = require('./app/app.component').default;
+  const app = require('./app/app').default;
   // TODO: 先采用这种方式方便前端调试
   BI.addI18n(i18n);
   BI.createWidget({
-    type:app,
+    type: app,
     element: 'body',
   });
 });

src/shared/components/both_side.ts

@@ -7,7 +7,7 @@ const Widget: WidgetType = {
     return {
       type: Htape,
       cls: 'both-side',
-      height:24,
+      height: 24,
       items: [{
         el: {
           type: Label,