fanruan
/
decision-webui-dcm
2
0
Fork 0
Code Issues 8 Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #2114 in DEC/decision-webui-dcm from feature/10.0 to research/10.0 

* commit '39c508bf4ececeb4ea8a62f579aec03e34bbe376':
  DEC-18828 feat: 隔离插件支持kerberos认证前后端交互connectionData中新增useJaas字段
research/10.0
superman 4 years ago
parent
a9b745765c 39c508bf4e
commit
a68c6e2083
4 changed files with 77 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/modules/crud/crud.typings.d.ts
  2. 72
      src/modules/pages/maintain/forms/components/form.jdbc.ts
  3. 30
      src/modules/pages/maintain/forms/components/form.jndi.ts
  4. 12
      src/modules/pages/maintain/forms/components/form.plugin.ts

3
src/modules/crud/crud.typings.d.ts vendored
Unescape View File

@ -1,4 +1,3 @@
export interface CrudReqOpts {
url?: string;
type?: 'GET' | 'POST' | 'DELETE' | 'PUT';
@ -83,7 +82,7 @@ export interface ConnectionJDBC {
/**
* 端口号
*/
port?: number|'';
port?: number | '';
/**
* 主机名
*/

72
src/modules/pages/maintain/forms/components/form.jdbc.ts
Unescape View File

@ -1,13 +1,22 @@
import { shortcut } from '@core/core';
import { Collapse, EVENT_CHANGE } from 'src/modules/components/collapse/collapse';
import { FormItem } from '../../components/form_item/form_item';
import { Connection, ConnectionJDBC, ConnectionPoolJDBC } from 'src/modules/crud/crud.typings';
import { connectionType } from '@constants/env';
import { CONNECT_CHARSET, CONNECTION_LAYOUT, INT_MAX_VALUE, INT_MIN_VALUE } from '@constants/constant';
import { getAllDatabaseTypes, getJdbcDatabaseType, resolveUrlInfo, splitUrl } from '../../../../app.service';
import { TextChecker } from '../../../../components/text_checker/text_checker';
import { ApiFactory } from 'src/modules/crud/apiFactory';
import { Editor, EditorIconCheckCombo, Label, TextAreaEditor, TextEditor, TextValueCombo, VerticalLayout } from '@fui/core';
import {shortcut} from '@core/core';
import {Collapse, EVENT_CHANGE} from 'src/modules/components/collapse/collapse';
import {FormItem} from '../../components/form_item/form_item';
import {Connection, ConnectionJDBC, ConnectionPoolJDBC} from 'src/modules/crud/crud.typings';
import {connectionType} from '@constants/env';
import {CONNECT_CHARSET, CONNECTION_LAYOUT, INT_MAX_VALUE, INT_MIN_VALUE} from '@constants/constant';
import {getAllDatabaseTypes, getJdbcDatabaseType, resolveUrlInfo, splitUrl} from '../../../../app.service';
import {TextChecker} from '../../../../components/text_checker/text_checker';
import {ApiFactory} from 'src/modules/crud/apiFactory';
import {
Editor,
EditorIconCheckCombo,
Label,
TextAreaEditor,
TextEditor,
TextValueCombo,
VerticalLayout
} from '@fui/core';
const api = new ApiFactory().create();
@shortcut()
@ -57,13 +66,38 @@ export class FormJdbc extends BI.Widget {
};
render() {
const { connectionName, connectionData } = this.options.formData;
const { driver, user, password, originalCharsetName, schema, url, connectionPoolAttr, database, authType, principal, keyPath } = connectionData as ConnectionJDBC;
const { initialSize, maxActive, maxIdle, maxWait, validationQuery, testOnBorrow, testOnReturn, testWhileIdle, timeBetweenEvictionRunsMillis, numTestsPerEvictionRun, minIdle, minEvictableIdleTimeMillis } = connectionPoolAttr as ConnectionPoolJDBC;
const {connectionName, connectionData} = this.options.formData;
const {
driver,
user,
password,
originalCharsetName,
schema,
url,
connectionPoolAttr,
database,
authType,
principal,
keyPath
} = connectionData as ConnectionJDBC;
const {
initialSize,
maxActive,
maxIdle,
maxWait,
validationQuery,
testOnBorrow,
testOnReturn,
testWhileIdle,
timeBetweenEvictionRunsMillis,
numTestsPerEvictionRun,
minIdle,
minEvictableIdleTimeMillis
} = connectionPoolAttr as ConnectionPoolJDBC;
const databaseType = getJdbcDatabaseType(database, driver);
this.oldPassword = password;
const { host, port, databaseName } = resolveUrlInfo(url, database);
const { hgap, vgap } = CONNECTION_LAYOUT;
const {host, port, databaseName} = resolveUrlInfo(url, database);
const {hgap, vgap} = CONNECTION_LAYOUT;
const valueRangeConfig = {
errorText: BI.i18nText('Dec-Dcm_Connection_Value_Out_Range'),
@ -360,7 +394,7 @@ export class FormJdbc extends BI.Widget {
vgap: 15,
disabled: true,
value: schema,
items: schema ? [{ text: schema, value: schema }] : [],
items: schema ? [{text: schema, value: schema}] : [],
ref: (_ref: TextValueCombo) => {
this.form.schema = _ref;
},
@ -733,7 +767,7 @@ export class FormJdbc extends BI.Widget {
}
private onHostPortChange(databaseType) {
const { urls, url } = databaseType;
const {urls, url} = databaseType;
const driver = this.form.driver.getValue();
const selectUrl = BI.get(urls, driver) || url;
const host = this.form.host.getValue();
@ -766,7 +800,7 @@ export class FormJdbc extends BI.Widget {
connectionType: connectionType.JDBC,
connectionId: this.form.connectionName.getValue(),
connectionName: this.form.connectionName.getValue(),
connectionData: {
connectionData: <ConnectionJDBC>BI.extend({}, connectionData, {
database: connectionData.database,
connectionName: this.form.connectionName.getValue(),
driver: this.form.driver.getValue(),
@ -796,7 +830,7 @@ export class FormJdbc extends BI.Widget {
numTestsPerEvictionRun: this.form.numTestsPerEvictionRun.getValue(),
minEvictableIdleTimeMillis: this.form.minEvictableIdleTimeMillis.getValue(),
},
},
}),
};
}
}

30
src/modules/pages/maintain/forms/components/form.jndi.ts
Unescape View File

@ -1,11 +1,11 @@
import { shortcut } from '@core/core';
import { FormItem } from '../../components/form_item/form_item';
import { ConnectionJNDI, Connection, ContextHashtable } from 'src/modules/crud/crud.typings';
import { CONNECT_CHARSET, CONNECTION_LAYOUT, JNDI_FACTORYS } from '@constants/constant';
import { Collapse, EVENT_CHANGE } from 'src/modules/components/collapse/collapse';
import { connectionType } from '@constants/env';
import { TextChecker } from '../../../../components/text_checker/text_checker';
import { EditorIconCheckCombo, TextEditor, TextValueCombo, VerticalLayout } from '@fui/core';
import {shortcut} from '@core/core';
import {FormItem} from '../../components/form_item/form_item';
import {ConnectionJNDI, Connection, ContextHashtable} from 'src/modules/crud/crud.typings';
import {CONNECT_CHARSET, CONNECTION_LAYOUT, JNDI_FACTORYS} from '@constants/constant';
import {Collapse, EVENT_CHANGE} from 'src/modules/components/collapse/collapse';
import {connectionType} from '@constants/env';
import {TextChecker} from '../../../../components/text_checker/text_checker';
import {EditorIconCheckCombo, TextEditor, TextValueCombo, VerticalLayout} from '@fui/core';
@shortcut()
export class FormJndi extends BI.Widget {
@ -37,9 +37,9 @@ export class FormJndi extends BI.Widget {
}
render() {
const { connectionName, connectionData } = this.options.formData;
const { jndiName, newCharsetName, contextHashtable } = connectionData as ConnectionJNDI;
const { hgap, vgap } = CONNECTION_LAYOUT;
const {connectionName, connectionData} = this.options.formData;
const {jndiName, newCharsetName, contextHashtable} = connectionData as ConnectionJNDI;
const {hgap, vgap} = CONNECTION_LAYOUT;
return {
type: BI.VerticalLayout.xtype,
@ -399,7 +399,9 @@ export class FormJndi extends BI.Widget {
this.form.connectionName.setError(value);
}
public getSubmitValue():Connection {
public getSubmitValue(): Connection {
const connectionData = this.options.formData.connectionData as ConnectionJNDI;
const contextHashtable = {
'java.naming.factory.initial': this.form.initial.getValue(),
'java.naming.provider.url': this.form.providerUrl.getValue(),
@ -428,13 +430,13 @@ export class FormJndi extends BI.Widget {
connectionId: this.form.connectionName.getValue(),
connectionName: this.form.connectionName.getValue(),
connectionType: connectionType.JNDI,
connectionData: {
connectionData: <ConnectionJNDI>BI.extend({}, connectionData, {
jndiName: this.form.jndiName.getValue(),
newCharsetName: this.form.newCharsetName.getValue()[0] || '',
originalCharsetName: this.form.newCharsetName.getValue()[0] || '',
creator: Dec ? Dec.personal.username : '',
contextHashtable: contextHashtable as ContextHashtable,
},
}),
};
}
}

12
src/modules/pages/maintain/forms/components/form.plugin.ts
Unescape View File

@ -1,13 +1,13 @@
import {shortcut} from '@core/core';
import {Connection} from 'src/modules/crud/crud.typings';
import {getPluginWidgetEdit} from '../../../../app.service';
import { shortcut } from '@core/core';
import { Connection, ConnectionPlugin } from 'src/modules/crud/crud.typings';
import { getPluginWidgetEdit } from '../../../../app.service';
@shortcut()
export class FormPlugin extends BI.Widget {
static xtype = 'dec.dcm.maintain_plugin';
props = {
formData: {} as Connection,
}
};
plugin: any;
@ -28,13 +28,13 @@ export class FormPlugin extends BI.Widget {
}
public getSubmitValue(): Connection {
const { connectionType, connectionId, connectionName } = this.options.formData;
const { connectionType, connectionId, connectionName, connectionData } = this.options.formData;
return {
connectionId,
connectionType,
connectionName: this.plugin.getConnectionName ? this.plugin.getConnectionName() : connectionName,
connectionData: this.plugin.getValue(),
connectionData: <ConnectionPlugin>BI.extend({}, connectionData, this.plugin.getValue()),
};
}
}

Write Preview
Loading…
Cancel
Save