From dadb0d5b344eb852fc92137d4527665d0ecacc71 Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 11 Oct 2019 10:37:56 +0800 Subject: [PATCH 01/20] =?UTF-8?q?fix:=20=E9=80=82=E9=85=8D=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E5=88=9B=E5=BB=BA=E8=80=85=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/maintain/forms/form.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/modules/pages/maintain/forms/form.ts b/src/modules/pages/maintain/forms/form.ts index 3214c1e..704be55 100644 --- a/src/modules/pages/maintain/forms/form.ts +++ b/src/modules/pages/maintain/forms/form.ts @@ -31,6 +31,8 @@ export class MaintainForm extends BI.Widget { if (this.connectionName && !this.model.isCopy) { const value = this.form.getSubmitValue(); (value.connectionData as ConnectionJDBC).creator = BI.get(this.getFormData(), 'creator'); + // DEC-10155 为了适配插件的数据连接，在外层也加一个creator字段 + value.creator = BI.get(this.getFormData(), 'creator'); this.store.updateConnection(this.connectionName, value).then(result => { if (result.errorCode) { this.showError(result); @@ -42,6 +44,8 @@ export class MaintainForm extends BI.Widget { } else { const form = this.form.getSubmitValue(); form.connectionId = this.connectionName; + // DEC-10155 为了适配插件的数据连接，在外层也加一个creator字段 + form.creator = Dec ? Dec.personal.username : ''; this.store.addConnection(form).then(result => { if (result.errorCode) { this.showError(result); From 35db7db401c5e74423a9bd3cacea1e435efbab89 Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 11 Oct 2019 14:14:59 +0800 Subject: [PATCH 02/20] =?UTF-8?q?fix:=20DEC-10299=20=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=8F=92=E4=BB=B6=E6=95=B0=E6=8D=AE=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=EF=BC=8C=E5=90=8D=E7=A7=B0=E9=87=8D=E5=A4=8D=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/constants/env.ts | 10 +++++-- src/modules/pages/maintain/forms/form.ts | 38 ++++++++++++++++++------ 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/src/modules/constants/env.ts b/src/modules/constants/env.ts index 3ddd37c..8095b92 100644 --- a/src/modules/constants/env.ts +++ b/src/modules/constants/env.ts @@ -3,9 +3,15 @@ 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.Connect.ConnectionType; +export const connectionType: { + JDBC: string; + JNDI: string; +} = DecCst.Connect.ConnectionType; -export const editStatusEvent = DecCst.Connect.EditStatusEvent; +export const editStatusEvent: { + OPEN: string; + SHUTDOWN: string; +} = DecCst.Connect.EditStatusEvent; export const errorCode: { CONNECTION_DELETED: string; diff --git a/src/modules/pages/maintain/forms/form.ts b/src/modules/pages/maintain/forms/form.ts index 704be55..0952894 100644 --- a/src/modules/pages/maintain/forms/form.ts +++ b/src/modules/pages/maintain/forms/form.ts @@ -46,15 +46,7 @@ export class MaintainForm extends BI.Widget { form.connectionId = this.connectionName; // DEC-10155 为了适配插件的数据连接，在外层也加一个creator字段 form.creator = Dec ? Dec.personal.username : ''; - this.store.addConnection(form).then(result => { - if (result.errorCode) { - this.showError(result); - - return; - } - this.store.goFirstPage(); - this.store.setIsCopy(false); - }); + this.addConnection(form); } }, testEvent: () => { @@ -252,4 +244,32 @@ export class MaintainForm extends BI.Widget { this.form.setSchemas(re); }); } + + private addConnection(form: Connection) { + this.store.addConnection(form).then(result => { + if (result.errorCode) { + if (result.errorCode === errorCode.DUPLICATE_NAMES) { + if (form.connectionType !== connectionType.JDBC && form.connectionType !== connectionType.JNDI) { + // 如果不是jdbc或jndi，即如果是插件，名称重复的时候需要修改名字重新提交给后台 + const newName = `${form.connectionName}${Math.floor(Math.random() * 10)}`; + form.connectionName = newName; + if (!this.model.isCopy) { + form.connectionId = newName; + } + this.addConnection(form); + } else { + this.setFromError(result.errorMsg); + } + } else { + BI.Msg.toast(BI.i18nText(result.errorMsg), { + level: 'error', + }); + } + + return; + } + this.store.goFirstPage(); + this.store.setIsCopy(false); + }); + } } From 6f8343bdffecdd00cd9ce06aef4575182cc41b1e Mon Sep 17 00:00:00 2001 From: alan Date: Mon, 14 Oct 2019 09:42:35 +0800 Subject: [PATCH 03/20] undefined([object Object]): --- assets/scripts/dec.js | 3 +++ i18n/zh_cn.properties | 1 + private/i18n.ts | 1 + src/modules/constants/env.ts | 3 +++ src/modules/crud/crud.service.ts | 32 ++++++++++++++++++++++---------- 5 files changed, 30 insertions(+), 10 deletions(-) diff --git a/assets/scripts/dec.js b/assets/scripts/dec.js index a9a806e..7e9ad92 100644 --- a/assets/scripts/dec.js +++ b/assets/scripts/dec.js @@ -3,6 +3,9 @@ window.DecCst = { CONNECTION_DELETED: '21300035', CONNECTION_UNDER_EDIT: '21300034', DUPLICATE_NAMES: '21300005', + LOGIN_INFO_NOT_AVAILABLE: '21300014', + LOGIN_INFO_ERROR: '21300018', + TIMEOUT: '21300001', }, Connect: { ConnectionType: { diff --git a/i18n/zh_cn.properties b/i18n/zh_cn.properties index 1f0edee..4154eed 100644 --- a/i18n/zh_cn.properties +++ b/i18n/zh_cn.properties @@ -111,6 +111,7 @@ Dec-Dcm_Connection_Click_Connect_Database=点击连接数据库 Dec-Dcm_Connection_Read_Mode_List=以读取模式列表 Dec-Dcm_Connection_NO_Connection_Pool=无数据连接，可在数据连接管理页面添加 Dec-Dcm_Connection_Cannot_Too_Lang=文本长度不能大于200个字符 +Dec-Dcm_Login_Error=登录信息已失效，请重新登录 BI-Multi_Date_Quarter_End= 季度末 BI-Multi_Date_Month_Begin= 月初 BI-Multi_Date_YMD= 年月日 diff --git a/private/i18n.ts b/private/i18n.ts index 1fdf08b..77be638 100644 --- a/private/i18n.ts +++ b/private/i18n.ts @@ -110,6 +110,7 @@ export default { 'Dec-Dcm_Connection_Read_Mode_List': '以读取模式列表', 'Dec-Dcm_Connection_NO_Connection_Pool': '无数据连接，可在数据连接管理页面添加', 'Dec-Dcm_Connection_Cannot_Too_Lang': '文本长度不能大于200个字符', + 'Dec-Dcm_Login_Error': '登录信息已失效，请重新登录', 'BI-Multi_Date_Quarter_End': '季度末', 'BI-Multi_Date_Month_Begin': '月初', 'BI-Multi_Date_YMD': '年月日', diff --git a/src/modules/constants/env.ts b/src/modules/constants/env.ts index 8095b92..3030fbb 100644 --- a/src/modules/constants/env.ts +++ b/src/modules/constants/env.ts @@ -17,4 +17,7 @@ export const errorCode: { CONNECTION_DELETED: string; CONNECTION_UNDER_EDIT: string; DUPLICATE_NAMES: string; + LOGIN_INFO_NOT_AVAILABLE: string; + LOGIN_INFO_ERROR: string; + TIMEOUT: string; } = DecCst.ErrorCode; diff --git a/src/modules/crud/crud.service.ts b/src/modules/crud/crud.service.ts index c67636e..ce0872a 100644 --- a/src/modules/crud/crud.service.ts +++ b/src/modules/crud/crud.service.ts @@ -1,7 +1,7 @@ import 'es6-promise/auto'; import axios, { AxiosResponse, AxiosError } from 'axios'; import { CrudReqOpts, CrudParams, ResultType } from './crud.typings.d'; -import { ReqPrefix } from '../constants/env'; +import { ReqPrefix, errorCode } from '../constants/env'; const defaultHeaders = { 'Content-Type': 'application/json', 'X-Requested-With': 'XMLHttpRequest', @@ -39,6 +39,26 @@ function getCookieByName(name: string):string { return value; } +function checkStatus(response: AxiosResponse) { + const status = response.status; + const noLoginErr = [errorCode.LOGIN_INFO_ERROR, errorCode.LOGIN_INFO_NOT_AVAILABLE, errorCode.TIMEOUT]; + + const resData = status === 200 + ? typeof response.data === 'string' + ? BI.jsonDecode(response.data) + : response.data + : {}; + if (noLoginErr.includes(BI.get(resData, 'errorCode'))) { + BI.Msg.alert(BI.i18nText('BI-Basic_Prompt'), BI.i18nText('Dec-Dcm_Login_Error'), () => { + window.location.reload(true); + }); + + return new Promise(() => {}); + } + + return resData; +} + export async function request(reqOptions: CrudReqOpts = {}): Promise { const { url, type, headers, data, params } = reqOptions; @@ -57,15 +77,7 @@ export async function request(reqOptions: CrudReqOpts = {}): Promise paramsSerializer, data, }) - .then((response: AxiosResponse) => { - const status = response.status; - - return status === 200 - ? typeof response.data === 'string' - ? BI.jsonDecode(response.data) - : response.data - : {}; - }) + .then(checkStatus) .catch((error: AxiosError) => { console.log(error); }); From 91dd17558f9fedf70920bccb17f2c94b45b247be Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 18 Oct 2019 09:55:21 +0800 Subject: [PATCH 04/20] =?UTF-8?q?fix:=20DEC-10466=20=E5=8A=A0=E5=85=A5titl?= =?UTF-8?q?e=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/connection/list/list_item/list_item.ts | 1 + src/modules/pages/connection_pool/list_item/list_item.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/modules/pages/connection/list/list_item/list_item.ts b/src/modules/pages/connection/list/list_item/list_item.ts index cc1c054..d4b1ebf 100644 --- a/src/modules/pages/connection/list/list_item/list_item.ts +++ b/src/modules/pages/connection/list/list_item/list_item.ts @@ -55,6 +55,7 @@ export class ListItem extends BI.BasicButton { text: name, width: 200, textAlign: 'left', + title: name, ref: (_ref: any) => { this.nameLabel = _ref; }, diff --git a/src/modules/pages/connection_pool/list_item/list_item.ts b/src/modules/pages/connection_pool/list_item/list_item.ts index baf8d3c..814255e 100644 --- a/src/modules/pages/connection_pool/list_item/list_item.ts +++ b/src/modules/pages/connection_pool/list_item/list_item.ts @@ -21,6 +21,7 @@ export class ListItem extends BI.BasicButton { { type: Label, text: this.options.name, + title: this.options.name, width: 250, textAlign: 'left', }, From b4907e84599a3360f8b3d1b21e4006250c488262 Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 18 Oct 2019 10:19:28 +0800 Subject: [PATCH 05/20] =?UTF-8?q?fix:=20DEC-10479=20=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E7=9A=84=E5=9C=B0=E6=96=B9=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/maintain/forms/components/form.jdbc.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/modules/pages/maintain/forms/components/form.jdbc.ts b/src/modules/pages/maintain/forms/components/form.jdbc.ts index 9aed141..d3fa953 100644 --- a/src/modules/pages/maintain/forms/components/form.jdbc.ts +++ b/src/modules/pages/maintain/forms/components/form.jdbc.ts @@ -394,7 +394,7 @@ export class FormJdbc extends BI.Widget { forms: [{ type: TextCheckerXtype, width: 300, - allowBlank: true, + allowBlank: false, value: initialSize, validationChecker: [{ errorText: BI.i18nText('Dec-Dcm_Connection_Check_Integer'), @@ -413,7 +413,7 @@ export class FormJdbc extends BI.Widget { forms: [{ type: TextCheckerXtype, width: 300, - allowBlank: true, + allowBlank: false, value: maxActive, watermark: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Active'), validationChecker: [{ @@ -432,7 +432,7 @@ export class FormJdbc extends BI.Widget { forms: [{ type: TextCheckerXtype, width: 300, - allowBlank: true, + allowBlank: false, value: maxIdle, watermark: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Idle'), validationChecker: [{ @@ -451,7 +451,7 @@ export class FormJdbc extends BI.Widget { forms: [{ type: TextCheckerXtype, width: 300, - allowBlank: true, + allowBlank: false, value: minIdle, watermark: BI.i18nText('Dec-Dcm_Connection_Form_Database_Min_Idle'), validationChecker: [{ @@ -471,7 +471,7 @@ export class FormJdbc extends BI.Widget { { type: TextCheckerXtype, width: 300, - allowBlank: true, + allowBlank: false, value: maxWait, watermark: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Wait'), validationChecker: [{ @@ -558,7 +558,7 @@ export class FormJdbc extends BI.Widget { { type: TextCheckerXtype, width: 300, - allowBlank: true, + allowBlank: false, value: timeBetweenEvictionRunsMillis, watermark: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_Between_Eviction_Millis'), validationChecker: [{ @@ -583,7 +583,7 @@ export class FormJdbc extends BI.Widget { forms: [{ type: TextCheckerXtype, width: 300, - allowBlank: true, + allowBlank: false, value: numTestsPerEvictionRun, watermark: BI.i18nText('Dec-Dcm_Connection_Form_Database_Tests_PerEviction_Run_Num'), validationChecker: [{ @@ -603,7 +603,7 @@ export class FormJdbc extends BI.Widget { { type: TextCheckerXtype, width: 300, - allowBlank: true, + allowBlank: false, value: minEvictableIdleTimeMillis, watermark: BI.i18nText('Dec-Dcm_Connection_Form_Database_Min_Evictable_Idle_Time_Millis'), validationChecker: [{ From 05dcfc1266c77b8602777637f5873ca49bda4935 Mon Sep 17 00:00:00 2001 From: alan Date: Tue, 22 Oct 2019 10:26:08 +0800 Subject: [PATCH 06/20] =?UTF-8?q?fix:=20DEC-10494=20=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/maintain/forms/form.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/pages/maintain/forms/form.ts b/src/modules/pages/maintain/forms/form.ts index 0952894..d288fce 100644 --- a/src/modules/pages/maintain/forms/form.ts +++ b/src/modules/pages/maintain/forms/form.ts @@ -258,7 +258,7 @@ export class MaintainForm extends BI.Widget { } this.addConnection(form); } else { - this.setFromError(result.errorMsg); + this.setFromError(BI.i18nText(result.errorMsg)); } } else { BI.Msg.toast(BI.i18nText(result.errorMsg), { From ec294a3c4903a4aa315860703951a145fdda00f5 Mon Sep 17 00:00:00 2001 From: alan Date: Thu, 24 Oct 2019 14:00:10 +0800 Subject: [PATCH 07/20] =?UTF-8?q?fix:=20DEC-10620=20=E6=94=B9=E6=88=90?= =?UTF-8?q?=E7=94=A8=E5=8E=9F=E7=94=9F=E7=9A=84encodeURI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/crud/crud.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/crud/crud.service.ts b/src/modules/crud/crud.service.ts index ce0872a..1df6220 100644 --- a/src/modules/crud/crud.service.ts +++ b/src/modules/crud/crud.service.ts @@ -15,7 +15,7 @@ export function paramsSerializer(params: { [key: string]: any }) { let value = ''; if (BI.isObject(paramValue)) { - value = BI.encodeURIComponent(JSON.stringify(paramValue)); + value = encodeURI(JSON.stringify(paramValue)); } else { value = paramValue; } From 461912f675431f15c4bbf35b666caaa820d13a81 Mon Sep 17 00:00:00 2001 From: alan Date: Thu, 24 Oct 2019 14:32:28 +0800 Subject: [PATCH 08/20] =?UTF-8?q?fix:=20KERNEL-1655=20=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=97=A7=E7=89=88=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/app.service.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/modules/app.service.ts b/src/modules/app.service.ts index a770f78..9139f32 100644 --- a/src/modules/app.service.ts +++ b/src/modules/app.service.ts @@ -26,11 +26,14 @@ export function getPluginWidgetEdit(plugin: string) { // 由于database可能为空，所以为了兼容平台和设计器，需要根据driver来判断数据库类型 export function getJdbcDatabaseType(database: string, driver: string): DatabaseType { let databaseType = null; - if (database && DATA_BASE_TYPES.some(item => item.databaseType === database)) { + // KERNEL-1655 兼容旧版 由于旧版设计器创建的数据连接database都为other，所以要根据driber来判断数据类型 + if (database && database !== 'other' && DATA_BASE_TYPES.some(item => item.databaseType === database)) { databaseType = DATA_BASE_TYPES.find(item => item.databaseType === database); } else { - const desingDatabase = DESIGN_DRIVER_TYPE.find(item => item.driver === driver); - databaseType = DATA_BASE_TYPES.find(item => item.databaseType === BI.get(desingDatabase, 'type')); + const designDatabase = DESIGN_DRIVER_TYPE.find(item => item.driver === driver); + const decisionDatabase = DATA_BASE_TYPES.find(item => item.driver === driver); + const type = designDatabase ? BI.get(designDatabase, 'type') : BI.get(decisionDatabase, 'databaseType'); + databaseType = DATA_BASE_TYPES.find(item => item.databaseType === type); } if (!databaseType) { return DATA_BASE_TYPES_OTHER; From 683e5a72681802c5874dfbb45b38f8da04f5b497 Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 25 Oct 2019 10:16:48 +0800 Subject: [PATCH 09/20] =?UTF-8?q?fix:=20=E6=97=A0jira=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8Dbabel/polyfill=20=E8=A2=AB=E5=A4=9A?= =?UTF-8?q?=E6=AC=A1=E5=BC=95=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webpack/webpack.prod.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack/webpack.prod.js b/webpack/webpack.prod.js index 0049917..619c41a 100644 --- a/webpack/webpack.prod.js +++ b/webpack/webpack.prod.js @@ -12,7 +12,7 @@ module.exports = merge.smart(common, { devtool: 'hidden-source-map', entry: { - show: ['@babel/polyfill', './src/modules/app.ts'], + show: ['@babel/polyfill/noConflict', './src/modules/app.ts'], }, output: { path: dirs.DEST, From 14e9fddf77ebd776a45af7f1acba61fd7cd780d5 Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 25 Oct 2019 10:44:18 +0800 Subject: [PATCH 10/20] =?UTF-8?q?build:=20=E5=8E=BB=E6=8E=89babel/polyfill?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 - webpack/webpack.dev.js | 4 ++-- webpack/webpack.prod.js | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 764e348..fe532bf 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "@babel/core": "7.4.5", "@babel/plugin-proposal-class-properties": "^7.5.0", "@babel/plugin-proposal-decorators": "7.4.4", - "@babel/polyfill": "7.4.4", "@babel/preset-env": "7.4.5", "@babel/preset-typescript": "7.3.3", "@types/jest": "24.0.11", diff --git a/webpack/webpack.dev.js b/webpack/webpack.dev.js index ec5e10f..8e94d1d 100644 --- a/webpack/webpack.dev.js +++ b/webpack/webpack.dev.js @@ -36,7 +36,7 @@ chokidar module.exports = merge(common, { devtool: 'eval-source-map', entry: { - show: ['@babel/polyfill', './src/i18n.ts', './src/index.ts'], + show: ['./src/i18n.ts', './src/index.ts'], }, output: { path: dirs.DEST, @@ -48,7 +48,7 @@ module.exports = merge(common, { liveReload: true, proxy: { '/webroot/decision/v10': { - target: 'http://localhost:8075', + target: 'http://api.fanruan.design/mock/135', secure: false, }, '/webroot/decision/resources': { diff --git a/webpack/webpack.prod.js b/webpack/webpack.prod.js index 619c41a..d71dcd3 100644 --- a/webpack/webpack.prod.js +++ b/webpack/webpack.prod.js @@ -12,7 +12,7 @@ module.exports = merge.smart(common, { devtool: 'hidden-source-map', entry: { - show: ['@babel/polyfill/noConflict', './src/modules/app.ts'], + show: ['./src/modules/app.ts'], }, output: { path: dirs.DEST, From c685283e7dc951bcd2bbf5295a394fc4b72793fb Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 25 Oct 2019 11:12:33 +0800 Subject: [PATCH 11/20] =?UTF-8?q?fix:=20=E4=BD=BF=E7=94=A8fineui.min.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 6bac9ec..cfb9c39 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,7 @@
- + From 55e81c94af5c4a121d56c3783cbab9d76f8a4146 Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 25 Oct 2019 11:18:11 +0800 Subject: [PATCH 12/20] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BB=A3?= =?UTF-8?q?=E7=90=86=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webpack/webpack.dev.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack/webpack.dev.js b/webpack/webpack.dev.js index 8e94d1d..f7e3bd1 100644 --- a/webpack/webpack.dev.js +++ b/webpack/webpack.dev.js @@ -48,7 +48,7 @@ module.exports = merge(common, { liveReload: true, proxy: { '/webroot/decision/v10': { - target: 'http://api.fanruan.design/mock/135', + target: 'http://localhost:8075', secure: false, }, '/webroot/decision/resources': { From 7534e322cc20753b1277bde04c90f99a1a844c19 Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 25 Oct 2019 14:31:15 +0800 Subject: [PATCH 13/20] =?UTF-8?q?fix:=20DEC-10620=20=E5=8F=A6=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=9C=B0=E6=96=B9=E4=B9=9F=E8=A6=81=E6=94=B9=E6=88=90?= =?UTF-8?q?encodeURI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/crud/decision.api.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/crud/decision.api.ts b/src/modules/crud/decision.api.ts index 23223be..30813ab 100644 --- a/src/modules/crud/decision.api.ts +++ b/src/modules/crud/decision.api.ts @@ -45,7 +45,7 @@ export class DecisionApi implements Api { } getConnectionPool(name: string): Promise<{data?: ConnectionPoolType}> { - return requestGet(`pool/info?connectionName=${BI.encodeURIComponent(name)}`, {}); + return requestGet(`pool/info?connectionName=${encodeURI(name)}`, {}); } getConnectionStatus(name: string): Promise { From 2055013ef044dd215997d94f65a8935cd79855dd Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 25 Oct 2019 14:36:27 +0800 Subject: [PATCH 14/20] =?UTF-8?q?fix:=20=E6=94=B9=E6=88=90encodeURICompone?= =?UTF-8?q?nt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/crud/crud.service.ts | 2 +- src/modules/crud/decision.api.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/crud/crud.service.ts b/src/modules/crud/crud.service.ts index 1df6220..483b918 100644 --- a/src/modules/crud/crud.service.ts +++ b/src/modules/crud/crud.service.ts @@ -15,7 +15,7 @@ export function paramsSerializer(params: { [key: string]: any }) { let value = ''; if (BI.isObject(paramValue)) { - value = encodeURI(JSON.stringify(paramValue)); + value = encodeURIComponent(JSON.stringify(paramValue)); } else { value = paramValue; } diff --git a/src/modules/crud/decision.api.ts b/src/modules/crud/decision.api.ts index 30813ab..55096b1 100644 --- a/src/modules/crud/decision.api.ts +++ b/src/modules/crud/decision.api.ts @@ -45,7 +45,7 @@ export class DecisionApi implements Api { } getConnectionPool(name: string): Promise<{data?: ConnectionPoolType}> { - return requestGet(`pool/info?connectionName=${encodeURI(name)}`, {}); + return requestGet(`pool/info?connectionName=${encodeURIComponent(name)}`, {}); } getConnectionStatus(name: string): Promise { From c9c2f318249666ad948d19252f7fe1805cc6b140 Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 1 Nov 2019 09:29:13 +0800 Subject: [PATCH 15/20] =?UTF-8?q?fix:=20BI-54743=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5=E8=87=AA=E5=8A=A8=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/maintain/forms/form.ts | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/modules/pages/maintain/forms/form.ts b/src/modules/pages/maintain/forms/form.ts index d288fce..ee0459a 100644 --- a/src/modules/pages/maintain/forms/form.ts +++ b/src/modules/pages/maintain/forms/form.ts @@ -210,19 +210,13 @@ export class MaintainForm extends BI.Widget { } private getConnectionName(name = BI.i18nText('Dec-Dcm_Data_Connections')) { - const connections = this.model.connections.filter(item => item.connectionName.startsWith(name)); + const defaultName = name.replace(/\d+$/, ''); + const connections = this.model.connections.filter(item => item.connectionName.startsWith(defaultName)); if (connections.length === 0) { return name; } - let index = 0; - connections.forEach(item => { - const num = parseFloat(item.connectionName.replace(name, '')); - if (num > index) { - index = num; - } - }); - return `${name}${index + 1}`; + return BI.Func.createDistinctName(connections.map(item => item.connectionName), defaultName); } private testConnection() { From 443fdb917244f62cdeef494e942f332c1bafbbbc Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 1 Nov 2019 09:35:25 +0800 Subject: [PATCH 16/20] =?UTF-8?q?fix:=20=E6=94=B9=E6=88=90=E5=92=8Cbi?= =?UTF-8?q?=E5=90=8C=E6=A0=B7=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/maintain/forms/form.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/modules/pages/maintain/forms/form.ts b/src/modules/pages/maintain/forms/form.ts index ee0459a..0c8733c 100644 --- a/src/modules/pages/maintain/forms/form.ts +++ b/src/modules/pages/maintain/forms/form.ts @@ -210,13 +210,9 @@ export class MaintainForm extends BI.Widget { } private getConnectionName(name = BI.i18nText('Dec-Dcm_Data_Connections')) { - const defaultName = name.replace(/\d+$/, ''); - const connections = this.model.connections.filter(item => item.connectionName.startsWith(defaultName)); - if (connections.length === 0) { - return name; - } + const connections = this.model.connections.filter(item => item.connectionName.startsWith(name)); - return BI.Func.createDistinctName(connections.map(item => item.connectionName), defaultName); + return BI.Func.createDistinctName(connections.map(item => item.connectionName), name); } private testConnection() { From e23e511b0d6cc034541af64b63334941ebea5fd7 Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 1 Nov 2019 09:36:43 +0800 Subject: [PATCH 17/20] fix: update --- src/modules/pages/maintain/forms/form.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/modules/pages/maintain/forms/form.ts b/src/modules/pages/maintain/forms/form.ts index 0c8733c..34fa0f2 100644 --- a/src/modules/pages/maintain/forms/form.ts +++ b/src/modules/pages/maintain/forms/form.ts @@ -210,9 +210,7 @@ export class MaintainForm extends BI.Widget { } private getConnectionName(name = BI.i18nText('Dec-Dcm_Data_Connections')) { - const connections = this.model.connections.filter(item => item.connectionName.startsWith(name)); - - return BI.Func.createDistinctName(connections.map(item => item.connectionName), name); + return BI.Func.createDistinctName(this.model.connections.map(item => item.connectionName), name); } private testConnection() { From 124ecc33353551bc7380d95a71d9b656602441fd Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 1 Nov 2019 16:27:04 +0800 Subject: [PATCH 18/20] =?UTF-8?q?fix:=20DEC-10788=20=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E8=A7=86=E8=A7=89=E6=96=87=E6=A1=A3=E8=B0=83=E6=95=B4=E7=BB=86?= =?UTF-8?q?=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/text_checker/text_checker.ts | 1 + src/modules/constants/constant.ts | 3 +- .../components/form_item/form_item.ts | 3 +- src/modules/pages/connection/connection.ts | 8 +- .../connection_jdbc/connection_jdbc.ts | 1 + .../connection_jndi/connection_jndi.ts | 11 ++- .../connection/list/list_item/list_item.ts | 83 ++++++++++--------- .../components/form_item/form_item.ts | 5 +- .../maintain/forms/components/form.jdbc.ts | 23 ++++- .../maintain/forms/components/form.jndi.ts | 26 +++++- src/modules/pages/maintain/maintain.ts | 9 +- 11 files changed, 112 insertions(+), 61 deletions(-) diff --git a/src/modules/components/text_checker/text_checker.ts b/src/modules/components/text_checker/text_checker.ts index 430e761..cb30572 100644 --- a/src/modules/components/text_checker/text_checker.ts +++ b/src/modules/components/text_checker/text_checker.ts @@ -36,6 +36,7 @@ export class TextChecker extends BI.Widget { items: [{ el: { type: TextEditor, + cls: 'bi-border-radius', width, allowBlank, value, diff --git a/src/modules/constants/constant.ts b/src/modules/constants/constant.ts index df50774..20f0200 100644 --- a/src/modules/constants/constant.ts +++ b/src/modules/constants/constant.ts @@ -678,8 +678,9 @@ export const DEFAULT_JDBC_POOL = { }; export const CONNECTION_LAYOUT = { - hgap: 15, + hgap: 5, vgap: 15, + labelHeight: 24, }; diff --git a/src/modules/pages/connection/components/form_item/form_item.ts b/src/modules/pages/connection/components/form_item/form_item.ts index 24dacd8..723ecaa 100644 --- a/src/modules/pages/connection/components/form_item/form_item.ts +++ b/src/modules/pages/connection/components/form_item/form_item.ts @@ -7,6 +7,7 @@ export class FormItem extends BI.Widget { name: '', value: '', unit: '', + isBold: true, nameWidth: 140, } @@ -20,7 +21,7 @@ export class FormItem extends BI.Widget { { el: { type: Label, - cls: 'bi-font-bold', + cls: this.options.isBold ? 'bi-font-bold' : '', textAlign: 'left', text: this.options.name, }, diff --git a/src/modules/pages/connection/connection.ts b/src/modules/pages/connection/connection.ts index 6714de9..b7bab2b 100644 --- a/src/modules/pages/connection/connection.ts +++ b/src/modules/pages/connection/connection.ts @@ -49,17 +49,18 @@ export class Connection extends BI.Widget { return { type: Htape, + hgap: 10, items: [ { el: { type: Vtape, cls: 'bi-border-right', + rgap: 10, items: [ { el: { type: VerticalAdapt, cls: 'bi-border-bottom', - lgap: 10, items: [{ type: Button, text: BI.i18nText('Dec-Dcm_Connection_New'), @@ -72,7 +73,7 @@ export class Connection extends BI.Widget { }, { type: ConnectionListXtype, - tgap: 5, + tgap: 10, }, ], }, @@ -91,7 +92,6 @@ export class Connection extends BI.Widget { items: [ { type: Label, - lgap: 5, textAlign: 'left', ref: (_ref: any) => { this.connectionTitleWidget = _ref; @@ -102,7 +102,6 @@ export class Connection extends BI.Widget { type: VerticalAdapt, items: [{ type: Button, - level: 'ignore', invisible: true, text: BI.i18nText('Dec-Dcm_Edit'), ref: (_ref: any) => { @@ -125,7 +124,6 @@ export class Connection extends BI.Widget { }, { type: ListView, - vgap: 15, ref: (_ref: any) => { this.listView = _ref; }, diff --git a/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts b/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts index 1c1c9af..627438d 100644 --- a/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts +++ b/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts @@ -96,6 +96,7 @@ export class ConnectionJdbc extends BI.Widget { }, { type: Vertical, + tgap: -15, vgap, invisible: true, ref: (_ref: any) => { diff --git a/src/modules/pages/connection/connection_jndi/connection_jndi.ts b/src/modules/pages/connection/connection_jndi/connection_jndi.ts index db04856..db99250 100644 --- a/src/modules/pages/connection/connection_jndi/connection_jndi.ts +++ b/src/modules/pages/connection/connection_jndi/connection_jndi.ts @@ -32,7 +32,7 @@ export class ConnectionJdbc extends BI.Widget { }, { type: Htape, - height: 120, + height: 115, items: [ { el: { @@ -50,31 +50,37 @@ export class ConnectionJdbc extends BI.Widget { }, { type: Vertical, - bgap: 10, + bgap: 15, + height: 115, items: [ { type: FormItemXtype, name: 'INTIAL_CONTEXT_FACTORY', nameWidth: 200, + isBold: false, value: contextHashtable['java.naming.factory.initial'], }, { type: FormItemXtype, name: 'PROVIDER_URL', nameWidth: 200, + isBold: false, value: contextHashtable['java.naming.provider.url'], }, { type: FormItemXtype, name: 'SECURITY_PRINCIPAL', nameWidth: 200, + isBold: false, value: contextHashtable['java.naming.security.principal'], }, { type: FormItemXtype, name: 'SECURITY_CREDENTIALS', nameWidth: 200, + isBold: false, value: contextHashtable['java.naming.security.credentials'], + bgap: -15, }, ], }, @@ -102,6 +108,7 @@ export class ConnectionJdbc extends BI.Widget { { type: Vertical, vgap, + tgap: -15, invisible: true, ref: (_ref: any) => { this.advancedSet = _ref; diff --git a/src/modules/pages/connection/list/list_item/list_item.ts b/src/modules/pages/connection/list/list_item/list_item.ts index d4b1ebf..be73a60 100644 --- a/src/modules/pages/connection/list/list_item/list_item.ts +++ b/src/modules/pages/connection/list/list_item/list_item.ts @@ -1,5 +1,5 @@ import { shortcut, store } from '@core/core'; -import { Label, LeftRightVerticalAdapt, IconLabel, IconButton, DownListCombo, SignEditor, Layout } from 'ui'; +import { Label, IconLabel, IconButton, DownListCombo, SignEditor, Layout, Htape, Vertical } from 'ui'; import './list_item.less'; import { ListItemModel, ListItemModelXtype } from './list_item.model'; import { PAGE_INDEX } from '@constants/constant'; @@ -41,20 +41,22 @@ export class ListItem extends BI.BasicButton { const { name, databaseType } = this.options; return { - type: LeftRightVerticalAdapt, - items: { - left: [ - { - type: IconLabel, - cls: 'dcm-link-font icon-size-16', - width: 25, - title: name, - }, + type: Htape, + items: [{ + el: { + type: IconLabel, + cls: 'dcm-link-font icon-size-16', + title: name, + }, + width: 25, + }, { + type: Vertical, + items: [ { type: Label, text: name, - width: 200, textAlign: 'left', + height: 25, title: name, ref: (_ref: any) => { this.nameLabel = _ref; @@ -63,7 +65,6 @@ export class ListItem extends BI.BasicButton { { type: SignEditor, value: name, - width: 200, invisible: !this.model.isEdit, ref: (_ref: any) => { this.nameEditor = _ref; @@ -98,37 +99,37 @@ export class ListItem extends BI.BasicButton { }], }, ], - right: [ - databaseType ? { - type: DownListCombo, - cls: 'link-item-icon', - stopPropagation: true, - hgap: 8, - el: { - type: IconButton, - cls: 'dcm-link-other-font icon-size-16', + }, { + el: databaseType ? { + type: DownListCombo, + cls: 'link-item-icon', + stopPropagation: true, + hgap: 8, + el: { + type: IconButton, + cls: 'dcm-link-other-font icon-size-16', + }, + items: this.renderDownList(), + ref: (_ref: any) => { + this.downListCombo = _ref; + }, + listeners: [{ + eventName: BI.DownListCombo.EVENT_CHANGE, + action: (value: string) => { + this.itemActionCalculate().actionClac(value); }, - items: this.renderDownList(), - ref: (_ref: any) => { - this.downListCombo = _ref; + }, { + eventName: BI.DownListCombo.EVENT_BEFORE_POPUPVIEW, + action: () => { + this.downListCombo.setValue(''); }, - listeners: [{ - eventName: BI.DownListCombo.EVENT_CHANGE, - action: (value: string) => { - this.itemActionCalculate().actionClac(value); - }, - }, { - eventName: BI.DownListCombo.EVENT_BEFORE_POPUPVIEW, - action: () => { - this.downListCombo.setValue(''); - }, - }], - - } : { - type: Layout, - }, - ], - }, + }], + + } : { + type: Layout, + }, + width: 25, + }], }; } diff --git a/src/modules/pages/maintain/components/form_item/form_item.ts b/src/modules/pages/maintain/components/form_item/form_item.ts index 6635e56..159332d 100644 --- a/src/modules/pages/maintain/components/form_item/form_item.ts +++ b/src/modules/pages/maintain/components/form_item/form_item.ts @@ -1,5 +1,6 @@ import { shortcut } from '@core/core'; import { Label, Left } from 'ui'; +import { CONNECTION_LAYOUT } from '@constants/constant'; export const FormItemXtype = 'dec.dcm.Maintain_form_item'; @shortcut(FormItemXtype) export class FormItem extends BI.Widget { @@ -7,6 +8,7 @@ export class FormItem extends BI.Widget { name: '', forms: '', nameWidth: 140, + isBold: true, } render () { @@ -15,9 +17,10 @@ export class FormItem extends BI.Widget { items: [ { type: Label, - cls: 'bi-font-bold', + cls: this.options.isBold ? 'bi-font-bold' : '', width: this.options.nameWidth, textAlign: 'left', + height: CONNECTION_LAYOUT.labelHeight, text: this.options.name, }, ...this.options.forms, diff --git a/src/modules/pages/maintain/forms/components/form.jdbc.ts b/src/modules/pages/maintain/forms/components/form.jdbc.ts index d3fa953..6ba9523 100644 --- a/src/modules/pages/maintain/forms/components/form.jdbc.ts +++ b/src/modules/pages/maintain/forms/components/form.jdbc.ts @@ -1,5 +1,5 @@ import { shortcut } from '@core/core'; -import { Vertical, TextEditor, TextValueCombo, Label, TextAreaEditor, Editor, EdirotIconCheckCombo, Left, TextButton } from 'ui'; +import { Vertical, TextEditor, TextValueCombo, Label, TextAreaEditor, Editor, EdirotIconCheckCombo, Left, TextButton, Layout } from 'ui'; import { CollapseXtype, EVENT_CHANGE } from 'src/modules/components/collapse/collapse'; import { FormItemXtype } from '../../components/form_item/form_item'; import { Connection, ConnectionJDBC, ConnectionPoolJDBC } from 'src/modules/crud/crud.typings'; @@ -114,6 +114,7 @@ export class FormJdbc extends BI.Widget { name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Name'), forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, watermark: BI.i18nText('Dec-Dcm_Connection_Form_Database_Name'), @@ -134,6 +135,7 @@ export class FormJdbc extends BI.Widget { name: BI.i18nText('Dec-Dcm_Connection_Form_Host'), forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, value: host, @@ -219,6 +221,7 @@ export class FormJdbc extends BI.Widget { }, forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, value: user, @@ -237,7 +240,7 @@ export class FormJdbc extends BI.Widget { }, forms: [{ type: Editor, - cls: 'bi-border', + cls: 'bi-border bi-border-radius', width: 300, height: 20, allowBlank: true, @@ -258,6 +261,7 @@ export class FormJdbc extends BI.Widget { }, forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, value: principal, @@ -276,7 +280,7 @@ export class FormJdbc extends BI.Widget { }, forms: [{ type: Editor, - cls: 'bi-border', + cls: 'bi-border bi-border-radius', width: 300, height: 20, allowBlank: true, @@ -313,6 +317,7 @@ export class FormJdbc extends BI.Widget { { type: FormItemXtype, invisible: !databaseType.hasSchema, + height: 64, name: BI.i18nText('Dec-Dcm_Connection_Form_Pattern'), forms: [{ type: Vertical, @@ -344,11 +349,17 @@ export class FormJdbc extends BI.Widget { }], }], }, + { + type: Layout, + cls: 'bi-border-top', + bgap: 8, + }, { type: FormItemXtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_URL'), forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, value: url, @@ -383,6 +394,7 @@ export class FormJdbc extends BI.Widget { { type: Vertical, vgap, + tgap: -15, invisible: true, ref: (_ref: any) => { this.advancedSet = _ref; @@ -486,6 +498,7 @@ export class FormJdbc extends BI.Widget { { type: Label, lgap: 5, + height: CONNECTION_LAYOUT.labelHeight, text: BI.i18nText('Dec-Dcm_Millisecond'), }, ], @@ -495,7 +508,7 @@ export class FormJdbc extends BI.Widget { name: BI.i18nText('Dec-Dcm_Connection_Form_SQL_Validation_Query'), forms: [{ type: TextAreaEditor, - cls: 'bi-border', + cls: 'bi-border bi-border-radius', allowBlank: true, watermark: BI.i18nText('Dec-Dcm_Connection_Form_Place_Input'), value: validationQuery, @@ -573,6 +586,7 @@ export class FormJdbc extends BI.Widget { { type: Label, lgap: 5, + height: CONNECTION_LAYOUT.labelHeight, text: BI.i18nText('Dec-Dcm_Millisecond'), }, ], @@ -618,6 +632,7 @@ export class FormJdbc extends BI.Widget { { type: Label, lgap: 5, + height: CONNECTION_LAYOUT.labelHeight, text: BI.i18nText('BI-Basic_Seconds'), }, ], diff --git a/src/modules/pages/maintain/forms/components/form.jndi.ts b/src/modules/pages/maintain/forms/components/form.jndi.ts index 5be5737..3ad3cc5 100644 --- a/src/modules/pages/maintain/forms/components/form.jndi.ts +++ b/src/modules/pages/maintain/forms/components/form.jndi.ts @@ -64,6 +64,7 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, value: jndiName, @@ -74,7 +75,7 @@ export class FormJndi extends BI.Widget { }, { type: Htape, - height: 180, + height: 175, items: [ { el: { @@ -92,12 +93,14 @@ export class FormJndi extends BI.Widget { }, { type: Vertical, - bgap: 10, + bgap: 15, + height: 175, items: [ { type: FormItemXtype, name: 'INTIAL_CONTEXT_FACTORY', nameWidth: 200, + isBold: false, forms: [{ type: EdirotIconCheckCombo, width: 300, @@ -124,9 +127,11 @@ export class FormJndi extends BI.Widget { { type: FormItemXtype, name: 'PROVIDER_URL', + isBold: false, nameWidth: 200, forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.provider.url'], @@ -138,9 +143,11 @@ export class FormJndi extends BI.Widget { { type: FormItemXtype, name: 'SECURITY_PRINCIPAL', + isBold: false, nameWidth: 200, forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.security.principal'], @@ -152,9 +159,11 @@ export class FormJndi extends BI.Widget { { type: FormItemXtype, name: 'SECURITY_CREDENTIALS', + isBold: false, nameWidth: 200, forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.security.credentials'], @@ -165,6 +174,7 @@ export class FormJndi extends BI.Widget { }, { type: Label, + bgap: -15, cls: 'bi-tips', textAlign: 'left', text: BI.i18nText('Dec-Dcm_Connection_JNDI_Warning'), @@ -203,6 +213,7 @@ export class FormJndi extends BI.Widget { { type: Vertical, vgap, + tgap: -15, invisible: true, ref: (_ref: any) => { this.advancedSet = _ref; @@ -214,6 +225,7 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.factory.object'], @@ -228,6 +240,7 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.factory.state'], @@ -242,6 +255,7 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.factory.url.pkgs'], @@ -256,6 +270,7 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.dns.url'], @@ -270,6 +285,7 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.authoritative'], @@ -284,6 +300,7 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.batchsize'], @@ -298,6 +315,7 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.referral'], @@ -312,6 +330,7 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.security.protocol'], @@ -326,6 +345,7 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.security.authentication'], @@ -340,6 +360,7 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.language'], @@ -354,6 +375,7 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, + cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.applet'], diff --git a/src/modules/pages/maintain/maintain.ts b/src/modules/pages/maintain/maintain.ts index 526dd10..7f25441 100644 --- a/src/modules/pages/maintain/maintain.ts +++ b/src/modules/pages/maintain/maintain.ts @@ -25,17 +25,18 @@ export class Maintain extends BI.Widget { return { type: Vtape, - hgap: 10, - vgap: 10, + hgap: 5, items: [ { type: VerticalAdapt, cls: 'bi-border-bottom', + height: 40, + hgap: 5, items: [ { type: IconButton, - hgap: 5, cls: 'dcm-back-font', + height: 15, invisible: this.model.isCopy || isEdit, handler: () => { this.store.setPageIndex(PAGE_INDEX.DATEBASE); @@ -44,9 +45,9 @@ export class Maintain extends BI.Widget { { type: Label, text: titleText, + height: 15, }, ], - height: 40, }, { type: ListView, From ac77e237121735f8d3d73f423ddc2e1a2582bc3f Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 1 Nov 2019 16:34:23 +0800 Subject: [PATCH 19/20] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=20bi-border-rad?= =?UTF-8?q?ius=20=E6=94=B9=E4=B8=BA=E5=9C=A8fineui=E4=B8=AD=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/text_checker/text_checker.ts | 1 - .../pages/maintain/forms/components/form.jdbc.ts | 11 +++-------- .../pages/maintain/forms/components/form.jndi.ts | 15 --------------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/src/modules/components/text_checker/text_checker.ts b/src/modules/components/text_checker/text_checker.ts index cb30572..430e761 100644 --- a/src/modules/components/text_checker/text_checker.ts +++ b/src/modules/components/text_checker/text_checker.ts @@ -36,7 +36,6 @@ export class TextChecker extends BI.Widget { items: [{ el: { type: TextEditor, - cls: 'bi-border-radius', width, allowBlank, value, diff --git a/src/modules/pages/maintain/forms/components/form.jdbc.ts b/src/modules/pages/maintain/forms/components/form.jdbc.ts index 6ba9523..972ebc3 100644 --- a/src/modules/pages/maintain/forms/components/form.jdbc.ts +++ b/src/modules/pages/maintain/forms/components/form.jdbc.ts @@ -114,7 +114,6 @@ export class FormJdbc extends BI.Widget { name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Name'), forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, watermark: BI.i18nText('Dec-Dcm_Connection_Form_Database_Name'), @@ -135,7 +134,6 @@ export class FormJdbc extends BI.Widget { name: BI.i18nText('Dec-Dcm_Connection_Form_Host'), forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, value: host, @@ -221,7 +219,6 @@ export class FormJdbc extends BI.Widget { }, forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, value: user, @@ -240,7 +237,7 @@ export class FormJdbc extends BI.Widget { }, forms: [{ type: Editor, - cls: 'bi-border bi-border-radius', + cls: 'bi-border', width: 300, height: 20, allowBlank: true, @@ -261,7 +258,6 @@ export class FormJdbc extends BI.Widget { }, forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, value: principal, @@ -280,7 +276,7 @@ export class FormJdbc extends BI.Widget { }, forms: [{ type: Editor, - cls: 'bi-border bi-border-radius', + cls: 'bi-border', width: 300, height: 20, allowBlank: true, @@ -359,7 +355,6 @@ export class FormJdbc extends BI.Widget { name: BI.i18nText('Dec-Dcm_Connection_Form_Database_URL'), forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, value: url, @@ -508,7 +503,7 @@ export class FormJdbc extends BI.Widget { name: BI.i18nText('Dec-Dcm_Connection_Form_SQL_Validation_Query'), forms: [{ type: TextAreaEditor, - cls: 'bi-border bi-border-radius', + cls: 'bi-border', allowBlank: true, watermark: BI.i18nText('Dec-Dcm_Connection_Form_Place_Input'), value: validationQuery, diff --git a/src/modules/pages/maintain/forms/components/form.jndi.ts b/src/modules/pages/maintain/forms/components/form.jndi.ts index 3ad3cc5..360e3bb 100644 --- a/src/modules/pages/maintain/forms/components/form.jndi.ts +++ b/src/modules/pages/maintain/forms/components/form.jndi.ts @@ -64,7 +64,6 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, value: jndiName, @@ -131,7 +130,6 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.provider.url'], @@ -147,7 +145,6 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.security.principal'], @@ -163,7 +160,6 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.security.credentials'], @@ -225,7 +221,6 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.factory.object'], @@ -240,7 +235,6 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.factory.state'], @@ -255,7 +249,6 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.factory.url.pkgs'], @@ -270,7 +263,6 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.dns.url'], @@ -285,7 +277,6 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.authoritative'], @@ -300,7 +291,6 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.batchsize'], @@ -315,7 +305,6 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.referral'], @@ -330,7 +319,6 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.security.protocol'], @@ -345,7 +333,6 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.security.authentication'], @@ -360,7 +347,6 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.language'], @@ -375,7 +361,6 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: TextEditor, - cls: 'bi-border-radius', width: 300, allowBlank: true, value: contextHashtable['java.naming.applet'], From d59f2b772c5e18aae04ac58e5f0e1b4e235c7909 Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 1 Nov 2019 16:59:36 +0800 Subject: [PATCH 20/20] =?UTF-8?q?fix:=20DEC-10788=20=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E4=B9=9F=E6=94=B9=E4=B8=BA=E5=9C=86?= =?UTF-8?q?=E8=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/maintain/forms/components/form.jdbc.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/pages/maintain/forms/components/form.jdbc.ts b/src/modules/pages/maintain/forms/components/form.jdbc.ts index 972ebc3..637e1bd 100644 --- a/src/modules/pages/maintain/forms/components/form.jdbc.ts +++ b/src/modules/pages/maintain/forms/components/form.jdbc.ts @@ -237,7 +237,7 @@ export class FormJdbc extends BI.Widget { }, forms: [{ type: Editor, - cls: 'bi-border', + cls: 'bi-border bi-border-radius', width: 300, height: 20, allowBlank: true,