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

Merge pull request #9309 in DEC/decision-webui-dcm from research/mss-2.0 to research/11.0 

* commit 'c58b16497d43a0f75a373d48a5706bf2bdcef0b7': (116 commits)
  REPORT-114169 fix: 【多租户】新建数据连接输入框样式问题
  BI-144496 fix: 数据连接增加埋点
  getJdyDataLinkAppList
  REPORT-112276 公共数据取数简道云数据连接部分适配 设计优先级,优先使用平台内置的
  FDL-9101 fix: 修复hana数据连接url联动输入框异常问题
  REPORT-112768 fix: 修复数据连接更新视图不同步问题
  REPORT-112768 fix: 修复数据连接更新视图不同步问题
  REPORT-111534 fix：数据连接脏数据容错
  无JIRA任务，修复打包问题
  REPORT-109671 feat:druid校验语句问题
  REPORT-110986 feat: 数据连接支持跳转至详情&联动
  REPORT-110986 feat: 数据连接支持跳转至详情&联动
  FDL-9101 fix: 修复saphana数据连接失败问题
  FDL-9101 fix: 修复saphana数据连接失败问题
  REPORT-107734 fix:【数据连接增加fetchsize配置项】tdsql数据连接特殊处理下
  REPORT-107734【平台前端适配】数据连接增加fetchsize配置项
  REPORT-102763 fix:数据连接支持对接业务系统-接口补充
  REPORT-108103 Starrocks数据连接解析不包含catalog的数据连接出错
  REPORT-108103 Starrocks数据连接解析不包含catalog的数据连接出错
  REPORT-108103 Starrocks数据连接解析不包含catalog的数据连接出错
  ...
research/11.0
superman 6 months ago
parent
570e6fd9d2 c58b16497d
commit
9518f7aa5a
61 changed files with 4507 additions and 1429 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      .eslintrc
  2. 165
      README.md
  3. 14
      babel.config.js
  4. 20
      i18n/zh_cn.properties
  5. 7
      package.json
  6. 16
      private/i18n.ts
  7. 3
      src/modules/app.model.ts
  8. 127
      src/modules/app.provider.ts
  9. 52
      src/modules/app.service.ts
  10. 34
      src/modules/app.ts
  11. 11
      src/modules/app.typings.d.ts
  12. 6
      src/modules/components/collapse/collapse.ts
  13. 68
      src/modules/components/file_chooser/file_chooser.model.ts
  14. 183
      src/modules/components/file_chooser/file_chooser.ts
  15. 13
      src/modules/components/file_upload/file_upload.less
  16. 35
      src/modules/components/file_upload/file_upload.model.ts
  17. 327
      src/modules/components/file_upload/file_upload.ts
  18. 33
      src/modules/components/test_status/test_status.ts
  19. 21
      src/modules/components/test_status/tip_icon/tip_fail.ts
  20. 120
      src/modules/components/text_checker/text_checker.ts
  21. 41
      src/modules/components/tips_combo/tips_combo.ts
  22. 121
      src/modules/constants/constant.ts
  23. 52
      src/modules/core/checkIllegalStrings/checkIllegalStrings.ts
  24. 15
      src/modules/core/checkIllegalStrings/constant.ts
  25. 1
      src/modules/core/index.ts
  26. 17
      src/modules/crud/api.ts
  27. 6
      src/modules/crud/crud.service.ts
  28. 245
      src/modules/crud/crud.typings.d.ts
  29. 48
      src/modules/crud/decision.api.ts
  30. 27
      src/modules/crud/design.api.ts
  31. 24
      src/modules/pages/__point__/connect.point.ts
  32. 9
      src/modules/pages/connection/connection.model.ts
  33. 84
      src/modules/pages/connection/connection.ts
  34. 600
      src/modules/pages/connection/connection_jdbc/connection_jdbc.ts
  35. 1
      src/modules/pages/connection/list/list.constant.ts
  36. 34
      src/modules/pages/connection/list/list.model.ts
  37. 2
      src/modules/pages/connection/list/list.ts
  38. 3
      src/modules/pages/connection/list/list_item/list_item.model.ts
  39. 33
      src/modules/pages/connection/list/list_item/list_item.ts
  40. 17
      src/modules/pages/database/database.constant.ts
  41. 23
      src/modules/pages/database/database.model.ts
  42. 46
      src/modules/pages/database/database.ts
  43. 7
      src/modules/pages/database/database_type/database_type.model.ts
  44. 4
      src/modules/pages/database/database_type/database_type.ts
  45. 17
      src/modules/pages/maintain/components/driverselector/driverselector.model.ts
  46. 32
      src/modules/pages/maintain/components/driverselector/driverselector.ts
  47. 18
      src/modules/pages/maintain/components/form_item/form_item.ts
  48. 2755
      src/modules/pages/maintain/forms/components/form.jdbc.ts
  49. 4
      src/modules/pages/maintain/forms/components/form.plugin.ts
  50. 5
      src/modules/pages/maintain/forms/form.model.ts
  51. 60
      src/modules/pages/maintain/forms/form.server.ts
  52. 114
      src/modules/pages/maintain/forms/form.ts
  53. 21
      src/modules/pages/maintain/maintain.ts
  54. 96
      src/modules/pages/setting/setting.ts
  55. 11
      src/modules/title/title.ts
  56. 5
      src/modules/title/title_database/title_datebase.ts
  57. 3
      src/modules/title/title_maintain/title_maintain.model.ts
  58. 14
      src/modules/title/title_maintain/title_maintain.ts
  59. 28
      tsconfig.json
  60. 24
      types/globals.d.ts
  61. 9
      types/request.d.ts

5
.eslintrc
Unescape View File

@ -30,7 +30,8 @@
"no-use-before-define": [ "no-use-before-define": [
"error", "error",
{ {
"functions": false "functions": false,
"classes ": false
} }
], ],
"new-cap": [ "new-cap": [
@ -179,7 +180,7 @@
"array-bracket-spacing": ["error", "never"], // 数组紧贴括号部分不允许包含空格 "array-bracket-spacing": ["error", "never"], // 数组紧贴括号部分不允许包含空格
"object-curly-spacing": ["error", "always"], // 对象紧贴花括号部分不允许包含空格 "object-curly-spacing": ["error", "always"], // 对象紧贴花括号部分不允许包含空格
"no-regex-spaces": "error", // 禁止正则表达式字面量中出现多个空格 "no-regex-spaces": "error", // 禁止正则表达式字面量中出现多个空格
"no-multi-spaces": "error", // 禁止出现多个空格而且不是用来作缩进的 // "no-multi-spaces": "error", // 禁止出现多个空格而且不是用来作缩进的
"block-spacing": ["error", "never"], // 单行代码块中紧贴括号部分不允许包含空格 "block-spacing": ["error", "never"], // 单行代码块中紧贴括号部分不允许包含空格
"computed-property-spacing": ["error", "never"], // 禁止括号和其内部值之间的空格 "computed-property-spacing": ["error", "never"], // 禁止括号和其内部值之间的空格
"no-trailing-spaces": [ "no-trailing-spaces": [

165
README.md
Unescape View File

@ -7,7 +7,7 @@
## 开始 ## 开始
安装依赖 安装依赖
``` ```
yarn yarn install
``` ```
开始开发 开始开发
@ -15,8 +15,107 @@ yarn
yarn dev yarn dev
``` ```
## 决策平台开发:
### A.项目运行
#### 1. 工程`decision-webui-dev`添加代理（可跳过）
```js
webpack/webpack.config
"/plugin/dcm": {
pathRewrite: { "^/plugin/dcm": "" },
target: "http://localhost:10002",
},
```
#### 2. 工程`decision-webui-dev`引入
fr环境：`templates/bundle.report.html` bi环境：`templates/bundle.bi.html`
```html
// css 文件：
<head>
<link rel="stylesheet" type="text/css" href="/plugin/dcm/show.dev.css" />
<link rel="stylesheet" type="text/css" href="http://localhost:10002/show.dev.css" />
</head>
// js 文件
<script type="text/javascript" src="/plugin/dcm/show.dev.js"></script>
```
若未设1，将`/plugin/dcm`替换成`http://localhost:10002`亦可
#### 3. 启动工程[decision-webui-dev]以及数据连接[desicion-webui-dcm]工程
#### 4. 此时工程`decision-webui-dev`的`http://localhost:9002/#management/connnection`数据连接模块已替换成该工程
### B.插件形式添加数据连接-数据库
#### 1. 以多版本的tdsql为例 单一版本数据库不需drivers,versions,hasSchemas
```js
BI.config("dec.connection.provider.datebase", function (provider) {
BI.isFunction(provider.registerJdbcDatabase) && provider.registerJdbcDatabase({
text: 'TDSQL', // 数据库名称
databaseType: 'tdsql', // 数据库key
driver: 'org.postgresql.Driver', // 默认驱动
drivers: {
"pgsql": ["org.postgresql.Driver"],
"mysql": ["com.mysql.jdbc.Driver"]
}, // 驱动可选项，version: array[driver],[0]为该版本的默认驱动
versions: ["pgsql", "mysql"], // array[version]
urls: {
"org.postgresql.Driver": "jdbc:postgresql://hostname:port/database?finedbType=tdsql-pgsql",
"com.mysql.jdbc.Driver": "jdbc:mysql://hostname:port/database?finedbType=tdsql-mysql"
}, // urlkey : url 一个驱动对应一个url
url: 'jdbc:postgresql://hostname:port/database?finedbType=tdsql-pgsql',
commonly: false,
internal: true,
type: 'jdbc', 数据库类型
hasSchema: true, // 默认是否支持模式
hasSchemas: {
"pgsql": true,
"mysql": false,
},是否支持模式 version: boolean
kerberos: false, // 是否添加kerberos认证方式
}, function (url) {
var result = url.match(/^jdbc:(mysql|postgresql):\/\/([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?\/([0-9a-zA-Z_\\.]+)(.*)finedbType=([^&]+)(|(&.*))/i); // 匹配正则
if (result) {
return {
host: result[2], //主机
port: result[4] === "port" ? "" : result[4], // 端口
databaseName: result[5], // 数据库名称
version: result[7].split('-')[1] ?? "pgsql", // 版本 单版本不要返回这个
};
}
//适配原先tbase的url
result = url.match(/^jdbc:postgresql:\/\/([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?\/([0-9a-zA-Z_\\.]+)(.*)/i);
if (result) {
return {
host: result[1],
port: result[3] === "port" ? "" : result[3],
databaseName: result[4],
version: "pgsql",
};
}
});
});
```
### C 工程开发
#### 1. 图片资源添加
工程`decision-webui-dev`
decision-webui/dist/images/1x/icon/database
decision-webui/dist/images/2x/icon/database
#### 2. 国际化添加
工程`decision-webui-dev`
decision-i18n/decision-main-i18n/src/main/resources/com/fr/decision/web/i18n
#### 3. 版本控制
版本和平台保持一致
## 接口文档： ## 接口文档：
### 增加数据连接类型 ### A 增加数据连接类型
#### 1. 增加数据连接类型
使用`BI.config`,ConstantName名称为`dec.constant.database.conf.connect.types`，值为连接的名称 使用`BI.config`,ConstantName名称为`dec.constant.database.conf.connect.types`，值为连接的名称
例如增加`Redis`的连接： 例如增加`Redis`的连接：
@ -30,25 +129,25 @@ BI.config(ConstantPluginTyps, (datas: string[]) => [...datas, {
}]); }]);
``` ```
### 数据连接填写页面 #### 2. 数据连接填写页面
edit属性值为填写组件shortcut的名称 edit属性值为填写组件shortcut的名称
### 数据连接展示页面 #### 3. 数据连接展示页面
show属性值为组件shortcut的名称 show属性值为组件shortcut的名称
### 示例 #### 4. 示例
``` ```js
const DataBaseConfigProvider = 'dec.connection.provider.datebase'; const DataBaseConfigProvider = 'dec.connection.provider.datebase';
const RedisShowName = 'dec.dcm.connection.plugin.redis.show'; const RedisShowName = 'dec.dcm.connection.plugin.redis.show';
const RedisEditName = 'dec.dcm.connection.plugin.redis.edit'; const RedisEditName = 'dec.dcm.connection.plugin.redis.edit';
BI.config(DataBaseConfigProvider, function (provider) { BI.config(DataBaseConfigProvider, function (provider) {
provider.registerDatabaseType({ provider.registerDatabaseType([{
text: "Redis", text: "Redis",
databaseType: "Redis", databaseType: "Redis",
edit: "dec.dcm.connection.plugin.demo.edit", edit: "dec.dcm.connection.plugin.demo.edit",
show: "dec.dcm.connection.plugin.demo.show", show: "dec.dcm.connection.plugin.demo.show",
}); }]);
}); });
const RedisShow = BI.inherit(BI.Widget, { const RedisShow = BI.inherit(BI.Widget, {
@ -116,7 +215,7 @@ const RedisShow = BI.inherit(BI.Widget, {
], ],
}, },
], ],
}; },
}, },
}); });
BI.shortcut(RedisShowName, RedisShow); BI.shortcut(RedisShowName, RedisShow);
@ -211,7 +310,55 @@ const RedisEdit = BI.inherit(BI.Widget, {
password: this.password.getValue(), password: this.password.getValue(),
}; };
}, },
//可以触发组件的数据save方法，不需要则可不写
async save() {
let result = false;
await Promise.resolve().then(() => {result = true});
//要求返回是否成功的boolean变量
return result;
},
}); });
BI.shortcut(RedisEditName, RedisEdit); BI.shortcut(RedisEditName, RedisEdit);
``` ```
### B 添加数据连接实例
#### 1. 增加数据连接
```js
BI.config('dec.constant.connection.list', function (value) {
const result = [{
"connectionType": "Redis",//和databaseType一致
"connectionName": "CHART",//类似于id,唯一性
"pluginConnection": true,//表示是外来添加的插件
"connectionData": {
//表单保存数据
},
"connectionId": null,
}];
return value.concat(result);
})
```
### C 添加数据连接类型分类
#### 1. 添加分类DEMO
```js
BI.config('dec.constant.database.filter.type', (value) => {
value.push({
text:"DEMO",
value:"DEMO_VALUE"
});
return value;
});
```
#### 2. 添加数据连接类型进DEMO
```js
BI.config('dec.connection.provider.datebase', function (provider) {
text: "Redis",//必填
databaseType: "Redis",//唯一值
marker: 'DEMO_VALUE',//marker对标dec.constant.database.filter.type常量item的value，用于过滤
isHideConnection: true, //是否隐藏测试连接按钮
isNoSave: true,//是否不执行平台的保存逻辑
iconUrl:'https://work.fineres.com/secure/projectavatar?pid=10301&avatarId=10011',
driver: 'com.amazon.redshift.jdbc41.Driver',
drivers: ['com.amazon.redshift.jdbc4.Driver', 'com.amazon.redshift.jdbc41.Driver'],
url: 'jdbc:redshift://endpoint:port/database',
}
```

14
babel.config.js
Unescape View File

@ -1,3 +1,13 @@
module.exports = function (api) { module.exports = api => {
return require("@fui/babel-preset-fineui").configs.base(api) const { plugins, presets, sourceType } = require("@fui/babel-preset-fineui").configs.base(api);
return {
compact: false,
presets,
sourceType,
plugins: [
...plugins,
"@babel/plugin-proposal-logical-assignment-operators",
],
};
}; };

20
i18n/zh_cn.properties
Unescape View File

@ -62,6 +62,11 @@ Dec-Dcm_Connection_Form_UserName= 用户名
Dec-Dcm_Connection_Form_Password= 密码 Dec-Dcm_Connection_Form_Password= 密码
Dec-Dcm_Connection_Form_Principal= 客户端principal Dec-Dcm_Connection_Form_Principal= 客户端principal
Dec-Dcm_Connection_Form_KeyPath= keytab密钥路径 Dec-Dcm_Connection_Form_KeyPath= keytab密钥路径
Dec-Dcm_Connection_Form_Krb5File= krb5.conf文件
Dec-Dcm_Connection_File_Upload_Success= 已成功上传并校验成功
Dec-Dcm_Connection_File_Upload_Error= 检测异常
Dec-Dcm_Connection_File_Upload_ErrorCode= 错误代码
Dec-Dcm_Connection_File_Upload_ErrorMsg= 错误详情
Dec-Dcm_Connection_Form_Pool_Properties= 连接池属性 Dec-Dcm_Connection_Form_Pool_Properties= 连接池属性
Dec-Dcm_Connection_Form_SQL_Validation_Query= SQL验证查询 Dec-Dcm_Connection_Form_SQL_Validation_Query= SQL验证查询
Dec-Dcm_Connection_Form_Connection-Check= 获取连接前校验 Dec-Dcm_Connection_Form_Connection-Check= 获取连接前校验
@ -80,10 +85,10 @@ Dec-Dcm_Connection_Form_Database_Max_Wait= 最大等待时间
Dec-Dcm_Connection_Form_Database_Validation_Query= SQL验证查询 Dec-Dcm_Connection_Form_Database_Validation_Query= SQL验证查询
Dec-Dcm_Connection_Form_Database_Test_On_Borrow= 获取连接前检验 Dec-Dcm_Connection_Form_Database_Test_On_Borrow= 获取连接前检验
Dec-Dcm_Connection_Form_Database_Test_On_Return= 归还连接前检验 Dec-Dcm_Connection_Form_Database_Test_On_Return= 归还连接前检验
Dec-Dcm_Connection_Form_Database_Test_While_Idle= 开启空闲回收器检验 Dec-Dcm_Connection_Form_Database_Test_While_Idle= 获取连接时空闲连接可用性校验
Dec-Dcm_Connection_Form_Database_Test_Between_Eviction_Millis= 空闲连接回收器休眠时间 Dec-Dcm_Connection_Form_Database_Test_Between_Eviction_Millis= 空闲连接回收器工作间隔
Dec-Dcm_Connection_Form_Database_Tests_PerEviction_Run_Num= 空闲连接回收检查数 Dec-Dcm_Connection_Form_Database_Tests_PerEviction_Run_Num= 空闲连接回收检查数
Dec-Dcm_Connection_Form_Database_Min_Evictable_Idle_Time_Millis= 保持空闲最小时间值 Dec-Dcm_Connection_Form_Database_Min_Evictable_Idle_Time_Millis= 空闲连接回收时间阈值
Dec-Dcm_Connection_Make_Sure_Delete= 确定删除该数据连接？ Dec-Dcm_Connection_Make_Sure_Delete= 确定删除该数据连接？
Dec-Dcm_Connection_ReConnect= 重新连接 Dec-Dcm_Connection_ReConnect= 重新连接
Dec-Dcm_Connection_JNDI_Form_ConnectionName= JNDI的名字 Dec-Dcm_Connection_JNDI_Form_ConnectionName= JNDI的名字
@ -96,7 +101,7 @@ Dec-Dcm_Connection_JNDI= JNDI数据连接
Dec-Dcm_Connection_JNDI_Warning= 注意：需要把包含INTIAL_CONTEXT_FACTORY类的.jar文件复制到软件安装目录下的/lib目录下 Dec-Dcm_Connection_JNDI_Warning= 注意：需要把包含INTIAL_CONTEXT_FACTORY类的.jar文件复制到软件安装目录下的/lib目录下
Dec-Dcm_Connection_Error= 接口访问错误 Dec-Dcm_Connection_Error= 接口访问错误
Dec-Dcm_Connection_Is_Using= 该连接正在被{R1}编辑，请稍后再试 Dec-Dcm_Connection_Is_Using= 该连接正在被{R1}编辑，请稍后再试
Dec-Dcm_Connection_Check_Integer= 请输入不小于0的整数 Dec-Dcm_Connection_Check_Integer= 请输入不小于{}的整数
Dec-Dcm_Connection_Check_Number= 只允许为整数 Dec-Dcm_Connection_Check_Number= 只允许为整数
Dec-Dcm_Connection_JDBC_Other=其他JDBC Dec-Dcm_Connection_JDBC_Other=其他JDBC
Dec-Dcm_Connection_JDBC_Warning= 请确认已经将krb5.Conf文件添加到/webapps/webroot/WEB_INF/resources目录 Dec-Dcm_Connection_JDBC_Warning= 请确认已经将krb5.Conf文件添加到/webapps/webroot/WEB_INF/resources目录
@ -303,4 +308,9 @@ BI-Basic_No_Select= 不选
BI-Basic_Now= 此刻 BI-Basic_Now= 此刻
Dec-Dcm_Connection_Analytic_DB=阿里云AnalyticDB Dec-Dcm_Connection_Analytic_DB=阿里云AnalyticDB
Dec-Dcm_Connection_Value_Out_Range=数值超出范围 Dec-Dcm_Connection_Value_Out_Range=数值超出范围
Dec-Dcm_Socket_Unable_Connect_Tip=可能出现编辑冲突 Dec-Dcm_Socket_Unable_Connect_Tip=可能出现编辑冲突
Dec-Dcm_Connection_File_Upload_ErrorTip1= 参考
Dec-Dcm_Connection_File_Upload_ErrorTip2= kerberos配置
Dec-Dcm_Connection_File_Upload_ErrorTip3= 获取帮助或联系技术支持
Dec-Dcm_Connection_Timeout_Detection=数据连接超时检测
Dec-Dcm_Connection_Timeout_Millisecond=毫秒(ms)

7
package.json
Unescape View File

@ -7,6 +7,7 @@
"author": "decision", "author": "decision",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@babel/plugin-proposal-logical-assignment-operators": "^7.20.7",
"@types/jss": "9.5.8", "@types/jss": "9.5.8",
"autoprefixer": "^9.6.1", "autoprefixer": "^9.6.1",
"es6-promise": "4.2.6", "es6-promise": "4.2.6",
@ -18,9 +19,9 @@
"devDependencies": { "devDependencies": {
"@fui/babel-preset-fineui": "^1.0.0", "@fui/babel-preset-fineui": "^1.0.0",
"@types/jest": "24.0.11", "@types/jest": "24.0.11",
"@typescript-eslint/eslint-plugin": "1.7.0", "@typescript-eslint/eslint-plugin": "^5.0.0",
"@typescript-eslint/parser": "1.7.0", "@typescript-eslint/parser": "^5.0.0",
"axios": "0.18.0", "axios": "^0.24.0",
"babel-loader": "8.0.6", "babel-loader": "8.0.6",
"body-parser": "1.18.3", "body-parser": "1.18.3",
"chokidar": "2.1.5", "chokidar": "2.1.5",

16
private/i18n.ts
Unescape View File

@ -61,6 +61,11 @@ export default {
'Dec-Dcm_Connection_Form_Password': '密码', 'Dec-Dcm_Connection_Form_Password': '密码',
'Dec-Dcm_Connection_Form_Principal': '客户端principal', 'Dec-Dcm_Connection_Form_Principal': '客户端principal',
'Dec-Dcm_Connection_Form_KeyPath': 'keytab密钥路径', 'Dec-Dcm_Connection_Form_KeyPath': 'keytab密钥路径',
'Dec-Dcm_Connection_Form_Krb5File': 'krb5.conf文件',
'Dec-Dcm_Connection_File_Upload_Success': ' 已成功上传并校验成功',
'Dec-Dcm_Connection_File_Upload_Error': '检测异常',
'Dec-Dcm_Connection_File_Upload_ErrorCode': '错误代码',
'Dec-Dcm_Connection_File_Upload_ErrorMsg': '错误详情',
'Dec-Dcm_Connection_Form_Pool_Properties': '连接池属性', 'Dec-Dcm_Connection_Form_Pool_Properties': '连接池属性',
'Dec-Dcm_Connection_Form_SQL_Validation_Query': 'SQL验证查询', 'Dec-Dcm_Connection_Form_SQL_Validation_Query': 'SQL验证查询',
'Dec-Dcm_Connection_Form_Connection-Check': '获取连接前校验', 'Dec-Dcm_Connection_Form_Connection-Check': '获取连接前校验',
@ -79,10 +84,10 @@ export default {
'Dec-Dcm_Connection_Form_Database_Validation_Query': 'SQL验证查询', 'Dec-Dcm_Connection_Form_Database_Validation_Query': 'SQL验证查询',
'Dec-Dcm_Connection_Form_Database_Test_On_Borrow': '获取连接前检验', 'Dec-Dcm_Connection_Form_Database_Test_On_Borrow': '获取连接前检验',
'Dec-Dcm_Connection_Form_Database_Test_On_Return': '归还连接前检验', 'Dec-Dcm_Connection_Form_Database_Test_On_Return': '归还连接前检验',
'Dec-Dcm_Connection_Form_Database_Test_While_Idle': '开启空闲回收器检验', 'Dec-Dcm_Connection_Form_Database_Test_While_Idle': '获取连接时空闲连接可用性校验',
'Dec-Dcm_Connection_Form_Database_Test_Between_Eviction_Millis': '空闲连接回收器休眠时间', 'Dec-Dcm_Connection_Form_Database_Test_Between_Eviction_Millis': '空闲连接回收器工作间隔',
'Dec-Dcm_Connection_Form_Database_Tests_PerEviction_Run_Num': '空闲连接回收检查数', 'Dec-Dcm_Connection_Form_Database_Tests_PerEviction_Run_Num': '空闲连接回收检查数',
'Dec-Dcm_Connection_Form_Database_Min_Evictable_Idle_Time_Millis': '保持空闲最小时间值', 'Dec-Dcm_Connection_Form_Database_Min_Evictable_Idle_Time_Millis': '空闲连接回收时间阈值',
'Dec-Dcm_Connection_Make_Sure_Delete': '确定删除该数据连接？', 'Dec-Dcm_Connection_Make_Sure_Delete': '确定删除该数据连接？',
'Dec-Dcm_Connection_ReConnect': '重新连接', 'Dec-Dcm_Connection_ReConnect': '重新连接',
'Dec-Dcm_Connection_JNDI_Form_ConnectionName': 'JNDI的名字', 'Dec-Dcm_Connection_JNDI_Form_ConnectionName': 'JNDI的名字',
@ -95,7 +100,7 @@ export default {
'Dec-Dcm_Connection_JNDI_Warning': '注意：需要把包含INTIAL_CONTEXT_FACTORY类的.jar文件复制到软件安装目录下的/lib目录下', 'Dec-Dcm_Connection_JNDI_Warning': '注意：需要把包含INTIAL_CONTEXT_FACTORY类的.jar文件复制到软件安装目录下的/lib目录下',
'Dec-Dcm_Connection_Error': '接口访问错误', 'Dec-Dcm_Connection_Error': '接口访问错误',
'Dec-Dcm_Connection_Is_Using': '该连接正在被{R1}编辑，请稍后再试', 'Dec-Dcm_Connection_Is_Using': '该连接正在被{R1}编辑，请稍后再试',
'Dec-Dcm_Connection_Check_Integer': '请输入不小于0的整数', 'Dec-Dcm_Connection_Check_Integer': '请输入不小于{}的整数',
'Dec-Dcm_Connection_Check_Number': '只允许为整数', 'Dec-Dcm_Connection_Check_Number': '只允许为整数',
'Dec-Dcm_Connection_JDBC_Other': '其他JDBC', 'Dec-Dcm_Connection_JDBC_Other': '其他JDBC',
'Dec-Dcm_Connection_JDBC_Warning': '请确认已经将krb5.Conf文件添加到/webapps/webroot/WEB_INF/resources目录', 'Dec-Dcm_Connection_JDBC_Warning': '请确认已经将krb5.Conf文件添加到/webapps/webroot/WEB_INF/resources目录',
@ -306,4 +311,7 @@ export default {
'Dec-Connection_Lic_Limit_Approach_Tip': '当前数据连接数量超过注册lic限制（{}个），所有数据连接都不可用，请删除多余的数据连接', 'Dec-Connection_Lic_Limit_Approach_Tip': '当前数据连接数量超过注册lic限制（{}个），所有数据连接都不可用，请删除多余的数据连接',
'Dec-Connection_Lic_Limit_Approach_Prevent_Tip': '当前数据连接数量已经达到注册lic限制（{}个），无法新增', 'Dec-Connection_Lic_Limit_Approach_Prevent_Tip': '当前数据连接数量已经达到注册lic限制（{}个），无法新增',
'Dec-Dcm_Connection_Check_Fetch_Size_Range': '请输入0-1000000之间的值', 'Dec-Dcm_Connection_Check_Fetch_Size_Range': '请输入0-1000000之间的值',
'Dec-Dcm_Connection_File_Upload_ErrorTip1':'参考',
'Dec-Dcm_Connection_File_Upload_ErrorTip2': 'kerberos配置',
'Dec-Dcm_Connection_File_Upload_ErrorTip3': '取帮助或联系技术支持',
}; };

3
src/modules/app.model.ts
Unescape View File

@ -7,7 +7,7 @@ import { getAllDatabaseTypes } from './app.service';
export class AppModel extends Model { export class AppModel extends Model {
static xtype = 'dec.dcm.model.main'; static xtype = 'dec.dcm.model.main';
childContext = <const>['pageIndex', 'datebaseTypeSelected', 'datebaseTypeSelectedOne', 'filter', 'connections', 'connectionSelected', 'connectionSelectedOne', 'saveEvent', 'testEvent', 'isCopy', 'connectionLicInfo']; childContext = <const>['pageIndex', 'datebaseTypeSelected', 'datebaseTypeSelectedOne', 'filter', 'connections', 'connectionSelected', 'connectionSelectedOne', 'saveEvent', 'testEvent', 'isCopy', 'connectionLicInfo', 'noTestConnection'];
state() { state() {
return { return {
@ -23,6 +23,7 @@ export class AppModel extends Model {
currentConnectionNum: 0, currentConnectionNum: 0,
maxConnectionNum: 0, maxConnectionNum: 0,
}, },
noTestConnection: false,
}; };
} }

127
src/modules/app.provider.ts
Unescape View File

@ -1,11 +1,67 @@
import { CONSTANT_PLUGIN_TYPES } from './app.constant'; import { CONSTANT_PLUGIN_TYPES } from './app.constant';
import { DATA_BASE_TYPES } from '@constants/constant';
BI.provider('dec.connection.provider.datebase', function() { BI.provider('dec.connection.provider.datebase', function () {
this.resolves = {}; this.resolves = {};
function starRocksResolve(url: string) {
// 处理starRocks数据连接常规模式
let result = url.match(/^jdbc:mysql:\/\/([0-9a-zA-Z_\\.-]+):([0-9a-zA-Z_\\.-]+)\/([0-9a-zA-Z_\\.-]+)\.([^]+)(.*)/i);
if (result) {
return {
host: result[1],
port: result[2] === 'port' ? '' : result[2],
catalog: result[3],
databaseName: result[4],
urlInfo: result[0],
};
} else {
// 兼容老数据库里面没有catalog的情况
result = url.match(/^jdbc:mysql:\/\/([0-9a-zA-Z_\\.-]+):([0-9a-zA-Z_\\.-]+)\/([^]+)(.*)/i);
if (result) {
return {
host: result[1],
port: result[2] === 'port' ? '' : result[2],
catalog: '',
databaseName: result[3],
urlInfo: result[0],
};
}
}
// 处理starRocks数据连接负载均衡模式
let loadBalance = url.match(/^jdbc:mysql:loadbalance:\/\/[^/]+\/([^/]+)\.([^/]+)/i);
if (loadBalance) {
return {
host: '',
port: '',
catalog: loadBalance[1],
databaseName: loadBalance[2],
urlInfo: loadBalance[0],
}
} else {
// 兼容老数据库里面没有catalog的情况
loadBalance = url.match(/^jdbc:mysql:loadbalance:\/\/[^/]+\/([^/]+)([^/]+)/i);
if (loadBalance) {
return {
host: '',
port: '',
catalog: '',
databaseName: loadBalance[1],
urlInfo: loadBalance[0],
}
}
}
return {
host: '',
port: '',
databaseName: '',
urlInfo: '',
};
}
// 原service中resolveUrlInfo方法 // 原service中resolveUrlInfo方法
function jdbcResolve (url: string) { function jdbcResolve(url: string) {
if (BI.isNull(url)) return {}; if (BI.isNull(url)) return {};
const oracleUlr = url.match(/^jdbc:(oracle):(thin:([0-9a-zA-Z/]*)?@|thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(:|\/)([^]+)(.*)/i); const oracleUlr = url.match(/^jdbc:(oracle):(thin:([0-9a-zA-Z/]*)?@|thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(:|\/)([^]+)(.*)/i);
if (oracleUlr) { if (oracleUlr) {
return { return {
@ -15,8 +71,8 @@ BI.provider('dec.connection.provider.datebase', function() {
urlInfo: oracleUlr[10], urlInfo: oracleUlr[10],
}; };
} }
const greenplumUrl = url.match(/^jdbc:(pivotal:greenplum):(thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(\/|;)([^]+)(.*)/i); const greenplumUrl = url.match(/^jdbc:(pivotal:greenplum):(thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(\/|;DatabaseName=)?([^]+)(.*)/i);
if (greenplumUrl) { if (greenplumUrl) {
return { return {
host: greenplumUrl[4], host: greenplumUrl[4],
@ -25,7 +81,7 @@ BI.provider('dec.connection.provider.datebase', function() {
urlInfo: greenplumUrl[9], urlInfo: greenplumUrl[9],
}; };
} }
const result = url.match(/^jdbc:(mysql|sqlserver|db2|impala|kylin|phoenix|derby|gbase|gbasedbt-sqli|informix-sqli|h2|postgresql|hive2|vertica|kingbase|presto|redshift|postgresql|clickhouse):(thin:([0-9a-zA-Z/]*)?@|thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(\/|;DatabaseName=)?([^]+)?(.*)/i); const result = url.match(/^jdbc:(mysql|sqlserver|db2|dm|impala|kylin|phoenix|derby|gbase|gbasedbt-sqli|informix-sqli|h2|postgresql|hive2|vertica|kingbase|presto|redshift|postgresql|clickhouse|trino|sybase:Tds):(thin:([0-9a-zA-Z/]*)?@|thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(\/|;DatabaseName=)?([^]+)?(.*)/i);
if (result) { if (result) {
return { return {
host: result[5], host: result[5],
@ -34,13 +90,24 @@ BI.provider('dec.connection.provider.datebase', function() {
urlInfo: result[10], urlInfo: result[10],
}; };
} }
// 处理SAP HANA数据连接url
const sapHanaUrl = url.match(/^jdbc:(sap):(thin:([0-9a-zA-Z/]*)?@|thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(\?databaseName=)?([^&]+)([^]+)?(.*)/i);
if (sapHanaUrl) {
return {
host: sapHanaUrl[5],
port: sapHanaUrl[7] === 'port' ? '' : sapHanaUrl[7],
databaseName: sapHanaUrl[9] || '',
urlInfo: sapHanaUrl[10],
};
}
// 处理oracle的RAC方式 // 处理oracle的RAC方式
if (/^jdbc:oracle:thin:([0-9a-zA-Z/]*)?@\(DESCRIPTION/i.test(url)) { if (/^jdbc:oracle:thin:([0-9a-zA-Z/]*)?@\(DESCRIPTION/i.test(url)) {
const host = url.match(/\(HOST\s*=\s*([0-9a-zA-Z_\\.-]+)\)/i); const host = url.match(/\(HOST\s*=\s*([0-9a-zA-Z_\\.-]+)\)/i);
const port = url.match(/\(PORT\s*=\s*([0-9]+)\)/i); const port = url.match(/\(PORT\s*=\s*([0-9]+)\)/i);
const databaseName = url.match(/\(SERVICE_NAME\s*=\s*([\s0-9a-zA-Z_\\.]+)\)/i); const databaseName = url.match(/\(SERVICE_NAME\s*=\s*([\s0-9a-zA-Z_\\.]+)\)/i);
return { return {
host: host ? host[1] : '', host: host ? host[1] : '',
port: port && port[1] !== 'port' ? port[1] : '', port: port && port[1] !== 'port' ? port[1] : '',
@ -48,7 +115,6 @@ BI.provider('dec.connection.provider.datebase', function() {
urlInfo: '', urlInfo: '',
}; };
} }
return { return {
host: '', host: '',
port: '', port: '',
@ -57,18 +123,55 @@ BI.provider('dec.connection.provider.datebase', function() {
}; };
} }
function coverBaseDatabase(config) {
const baseDataBase = DATA_BASE_TYPES.find(item => item.text === config.text);
if (BI.isNotNull(baseDataBase)) {
// 覆盖基础配置
Object.assign(baseDataBase, config);
return true;
}
return false;
}
function filterPluginDataTypeByPriority() {
const originTypes = [...BI.Constants.getConstant(CONSTANT_PLUGIN_TYPES)];
const sortDataTypes = BI.sortBy(originTypes, (index, value: any) => {
return value.priority || 0;
})
return BI.uniqWith(sortDataTypes, (current, other) => {
return current.text == other.text;
});
}
this.registerDatabaseType = (config: any) => { this.registerDatabaseType = (config: any) => {
if (coverBaseDatabase(config)) return;
BI.config(CONSTANT_PLUGIN_TYPES, connections => BI.concat(connections, config)); BI.config(CONSTANT_PLUGIN_TYPES, connections => BI.concat(connections, config));
}; };
this.registerJdbcDatabase = (config: any, resolve?: Function) => { this.registerJdbcDatabase = (config: any, resolve?: Function) => {
BI.config(CONSTANT_PLUGIN_TYPES, connections => BI.concat(connections, { ...config, type: 'jdbc' })); config = {
...config,
type: 'jdbc',
};
BI.isFunction(resolve) && (this.resolves[config.databaseType] = resolve); BI.isFunction(resolve) && (this.resolves[config.databaseType] = resolve);
if (coverBaseDatabase(config)) return;
BI.config(CONSTANT_PLUGIN_TYPES, connections => BI.concat(connections, config));
}; };
this.$get = () => BI.inherit(BI.OB, { this.$get = () => BI.inherit(BI.OB, {
getJdbcResolveByType: (type: string) => this.resolves[type] || jdbcResolve, getJdbcResolveByType: (type: string) => {
// starRocks特殊处理
// todo: 后面有专门的迭代系统处理，这里先临时解决下bug
if (type === "starrocks"){
return starRocksResolve
}
return this.resolves[type] || jdbcResolve
},
customDatabaseType: BI.Constants.getConstant(CONSTANT_PLUGIN_TYPES), customDatabaseType: BI.Constants.getConstant(CONSTANT_PLUGIN_TYPES),
}); });
}); });

52
src/modules/app.service.ts
Unescape View File

@ -1,7 +1,13 @@
import { DATA_BASE_TYPES, DATA_BASE_TYPES_OTHER, DESIGN_DRIVER_TYPE, OTHER_JDBC } from '@constants/constant'; import {
DATA_BASE_TYPES,
DATA_BASE_TYPES_OTHER,
DESIGN_DRIVER_TYPE,
OTHER_JDBC,
DATABASE_TYPE,
} from '@constants/constant';
import { DatabaseType } from './app.typings'; import { DatabaseType } from './app.typings';
import { Connection } from './crud/crud.typings'; import { Connection } from './crud/crud.typings';
export function getAllDatabaseTypes():DatabaseType[] { export function getAllDatabaseTypes(): DatabaseType[] {
return [ return [
...DATA_BASE_TYPES, ...DATA_BASE_TYPES,
...BI.Providers.getProvider('dec.connection.provider.datebase').customDatabaseType.map(item => { ...BI.Providers.getProvider('dec.connection.provider.datebase').customDatabaseType.map(item => {
@ -45,13 +51,13 @@ export function getJdbcDatabaseType(database: string, driver: string): DatabaseT
if (!databaseType) { if (!databaseType) {
return DATA_BASE_TYPES_OTHER; return DATA_BASE_TYPES_OTHER;
} }
return databaseType; return databaseType;
} }
export function resolveUrlInfo (url: string, database?: string) { export function resolveUrlInfo(url: string, database?: string) {
if (BI.isNull(url)) return {}; if (BI.isNull(url)) return {};
return BI.Providers.getProvider('dec.connection.provider.datebase').getJdbcResolveByType(database)(url) || { return BI.Providers.getProvider('dec.connection.provider.datebase').getJdbcResolveByType(database)(url) || {
host: '', host: '',
port: '', port: '',
@ -61,14 +67,40 @@ export function resolveUrlInfo (url: string, database?: string) {
} }
// 拼接url // 拼接url
export function splitUrl(host: string, port: string, database: string, baseUrl: string) { export function splitUrl(host: string, port: string, catalog: string, database: string, baseUrl: string, databaseType: string) {
if (baseUrl.startsWith('jdbc:sqlserver')) { if (baseUrl.startsWith('jdbc:sqlserver')) {
return baseUrl.replace('hostname', host).replace(':port', port ? `:${port}` : '') return baseUrl.replace('hostname', host).replace(':port', port ? `:${port}` : '')
.replace('=database', `=${database}`); .replace('=database', `=${database}`);
} }
// https://work.fineres.com/browse/REPORT-72078
if (baseUrl.startsWith('jdbc:informix-sqli')) {
return baseUrl.replace('hostname', host)
.replace(':port', port ? `:${port}` : '')
.replace('database', database)
.replace(':INFORMIXSERVER={server}', '');
}
if (databaseType === DATABASE_TYPE.STAR_ROCKS) {
let databaseStr = '';
if (!catalog || !database) {
databaseStr = catalog + database;
} else {
databaseStr = catalog + '.' + database;
}
return baseUrl.replace('hostname', host).replace(':port', port ? `:${port}` : '')
.replace('default_catalog.database', databaseStr);
}
if (databaseType === DATABASE_TYPE.SAP_HANA) {
return baseUrl.replace('hostname', host)
.replace('port', port || '')
.replace('=database', `=${database}`);
}
return baseUrl.replace('hostname', host).replace(':port', port ? `:${port}` : '') return baseUrl.replace('hostname', host).replace(':port', port ? `:${port}` : '')
.replace('database', database) .replace('/database', `/${database}`)
.replace(':database', `:${database}`)
.replace('dbname', database); .replace('dbname', database);
} }
@ -77,13 +109,13 @@ export function connectionCanEdit(connection: Connection) {
// privilegeType === 4 代表编辑权限，privilegeValue === 2 代表有权限 // privilegeType === 4 代表编辑权限，privilegeValue === 2 代表有权限
return connection.privilegeDetailBeanList.some(item => item.privilegeType === 4 && item.privilegeValue === 2); return connection.privilegeDetailBeanList.some(item => item.privilegeType === 4 && item.privilegeValue === 2);
} }
return true; return true;
} }
export function getTextByDatabaseType(databaseType: string) { export function getTextByDatabaseType(databaseType: string) {
const database = getAllDatabaseTypes().find(item => item.databaseType === databaseType); const database = getAllDatabaseTypes().find(item => item.databaseType === databaseType);
return database ? database.text : ''; return database ? database.text : '';
} }

34
src/modules/app.ts
Unescape View File

@ -7,8 +7,10 @@ import { Tab } from '@fui/core';
import { Datebase } from './pages/database/database'; import { Datebase } from './pages/database/database';
import { Maintain } from './pages/maintain/maintain'; import { Maintain } from './pages/maintain/maintain';
import { ConnectionPool } from './pages/connection_pool/connection_pool'; import { ConnectionPool } from './pages/connection_pool/connection_pool';
import { TimeOutSetting } from './pages/setting/setting';
import './app.provider'; import './app.provider';
import '../less/index.less'; import '../less/index.less';
import "./pages/__point__/connect.point";
@shortcut() @shortcut()
@store(AppModel) @store(AppModel)
@ -37,7 +39,12 @@ export class App extends BI.Widget {
{ {
el: { el: {
type: Title.xtype, type: Title.xtype,
cls: 'bi-border-bottom', listeners: [{
eventName: 'EVENT_CLICK_SETTING',
action:() => {
this._setting();
},
}]
}, },
height: 40, height: 40,
}, },
@ -75,13 +82,30 @@ export class App extends BI.Widget {
} }
}, },
}, },
left: 10, left: 0,
top: 10, top: 0,
right: 10, right: 0,
bottom: 10, bottom: 0,
}], }],
}, },
], ],
}; };
} }
private _setting() {
const settingLayerId = BI.UUID();
BI.Layers.create(settingLayerId, null, {
container: this,
render: {
type: TimeOutSetting.xtype,
listeners: [{
eventName: "EVENT_CHANGE",
action: function () {
BI.Layers.remove(settingLayerId);
},
}],
},
}, this);
BI.Layers.show(settingLayerId);
}
} }

11
src/modules/app.typings.d.ts vendored
Unescape View File

@ -8,9 +8,18 @@ export interface DatabaseType {
internal: boolean; internal: boolean;
type: string; type: string;
hasSchema?: boolean; hasSchema?: boolean;
hasSchemas?: {
[key: string]: boolean;
};
fetchSize: number;
versionConfig?: {
[key: string]: DatabaseType;
},
kerberos?: boolean; kerberos?: boolean;
iconUrl?: string; iconUrl?: string;
versions?: string[];
urls?: { urls?: {
[key: string]: string; [key: string]: string;
} };
marker?: string;
} }

6
src/modules/components/collapse/collapse.ts
Unescape View File

@ -12,6 +12,7 @@ export class Collapse extends BI.BasicButton {
name: '', name: '',
isCollapse: true, isCollapse: true,
$testId: 'dec-dcm-components-collapse', $testId: 'dec-dcm-components-collapse',
el: {},
} }
rightFont: IconLabel; rightFont: IconLabel;
@ -57,6 +58,7 @@ export class Collapse extends BI.BasicButton {
lgap: 2, lgap: 2,
text: this.options.name, text: this.options.name,
}, },
this.options.el,
], ],
}; };
} }
@ -64,4 +66,8 @@ export class Collapse extends BI.BasicButton {
doClick() { doClick() {
this.store.setCollapse(!this.model.isCollapse); this.store.setCollapse(!this.model.isCollapse);
} }
setCollapse(v: boolean) {
this.store.setCollapse(v);
}
} }

68
src/modules/components/file_chooser/file_chooser.model.ts
Unescape View File

@ -0,0 +1,68 @@
import { model, Model } from '@core/core';
type RootInfo = {
url: string; // api url
prefix: string; // 路径前缀
root: string; // 根文件夹名称
};
export const ROOT_INFO_MAP: Record<string, RootInfo> = {
// 证书 resources/certificates/
certificates: {
url: '/v10/certificates/all',
prefix: 'resources/',
root: 'certificates',
},
};
@model()
export class FileChooserModel extends Model {
static xtype = 'dec.dcm.model.components.file_chooser';
private options: {
root: string;
};
state() {
return {
keyword: '', // 搜索关键字
items: [], // 文件项
};
}
actions = {
/**
* 请求获取items
* @param callback 回调
*/
requestGetItems: (callback?: Function) => {
const { keyword } = this.model;
const { url, prefix, root } = ROOT_INFO_MAP[this.options.root];
const requestUrl = `${url}?keyword=${encodeURIComponent(keyword)}`;
Dec.reqGetHandle(requestUrl, '', (data) => {
this.model.items = data
.concat({
id: root,
text: prefix + root,
value: prefix + root,
isParent: true,
})
.map((item) => ({
...item,
value: prefix + item.path,
open: item.id === root || BI.isKey(keyword),
}));
BI.isFunction(callback) && callback();
});
},
/**
* 设置keyword
* @param value
*/
setKeyword: (value: string) => {
this.model.keyword = value;
this.requestGetItems();
},
};
}

183
src/modules/components/file_chooser/file_chooser.ts
Unescape View File

@ -0,0 +1,183 @@
import { EVENT_CHANGE } from './../collapse/collapse';
import { shortcut, store } from '@core/core';
import { SignEditor, MultiLayerSingleLevelTree, SearchEditor, Button, Editor } from '@fui/core';
import { FileChooserModel } from './file_chooser.model';
@shortcut()
@store(FileChooserModel, {
props(this: FileChooser) {
return this.options;
},
})
export class FileChooser extends BI.Widget {
static xtype = 'dec.dcm.components.file_chooser';
props = {
width: 300,
root: '', // 含义见model中的RootInfo
watermark: '',
value: '',
};
model: FileChooserModel['model'];
store: FileChooserModel['store'];
watch = {
items: (value) => {
this.fileTree.populate(value);
},
};
textEditor: SignEditor;
keywordEditor: SearchEditor;
fileTree: MultiLayerSingleLevelTree;
sureButton: Button;
render() {
const { width, watermark, value } = this.options;
return {
type: BI.VerticalAdaptLayout.xtype,
height: 24,
items: [
{
type: BI.SignEditor.xtype,
cls: 'bi-border-bottom bi-focus-shadow',
width,
height: 22,
watermark,
title: value,
value,
ref: (_ref: SignEditor) => {
this.textEditor = _ref;
},
listeners: [
{
eventName: BI.SignEditor.EVENT_CHANGE,
action: () => {
const value = this.textEditor.getValue();
this.setValue(value);
},
},
],
},
{
el: {
type: BI.Button.xtype,
text: BI.i18nText('Dec-Basic_Choose_File'),
clear: true,
handler: () => {
this.openFileChoosePopover();
},
},
lgap: 10,
},
],
};
}
getValue(): string {
return this.textEditor.getValue();
}
setValue(value: string) {
this.options.value = value;
this.textEditor.text.setTitle(value);
this.textEditor.setValue(value);
}
/**
* 打开文件选择弹窗
*/
private openFileChoosePopover() {
// 重置搜索关键词
this.store.setKeyword('');
// 创建并显示窗口
const popoverName = BI.UUID();
BI.Popovers.create(
popoverName,
{
header: BI.i18nText('Dec-Data_Set_File_Select_Server_File'),
body: {
type: BI.VTapeLayout.xtype,
items: [
{
type: BI.SearchEditor.xtype,
ref: (ref: SearchEditor) => {
this.keywordEditor = ref;
},
height: 24,
value: this.model.keyword,
listeners: [
{
eventName: BI.SearchEditor.EVENT_CHANGE,
action: () => {
const value = this.keywordEditor.getValue();
this.store.setKeyword(value);
},
},
{
eventName: BI.SearchEditor.EVENT_CLEAR,
action: () => {
this.store.setKeyword('');
},
},
],
},
{
el: {
type: BI.MultiLayerSingleLevelTree.xtype,
ref: (ref: MultiLayerSingleLevelTree) => {
this.fileTree = ref;
},
keywordGetter: () => this.model.keyword,
items: this.model.items,
listeners: [
{
eventName: BI.MultiLayerSingleLevelTree.EVENT_CHANGE,
action: () => {
this.sureButton.setEnable(true);
},
},
],
},
tgap: 15,
},
{
type: BI.RightVerticalAdaptLayout.xtype,
height: 24,
vgap: 10,
items: [
{
type: BI.Button.xtype,
text: BI.i18nText('BI-Basic_Cancel'),
level: 'ignore',
handler: () => {
BI.Popovers.remove(popoverName);
},
},
{
el: {
type: BI.Button.xtype,
ref: (ref: Button) => {
this.sureButton = ref;
},
text: BI.i18nText('BI-Basic_OK'),
disabled: true,
handler: () => {
const value = this.fileTree.getValue()[0];
this.setValue(value);
BI.Popovers.remove(popoverName);
},
},
lgap: 10,
},
],
},
],
},
},
this
).show(popoverName);
}
}

13
src/modules/components/file_upload/file_upload.less
Unescape View File

@ -0,0 +1,13 @@
.data-conf-file {
.x-icon{
width: 48px;
height: 48px;
}
}
.data-keytab-file {
.x-icon{
width: 48px;
height: 48px;
}
}

35
src/modules/components/file_upload/file_upload.model.ts
Unescape View File

@ -0,0 +1,35 @@
import { model, Model } from '@core/core';
type UploadParam = {
keytabPath: string;
krb5ConfPath: string;
principal: string;
}
@model()
export class FileUploadModel extends Model {
static xtype = 'dec.dcm.model.components.file_upload';
private options: {
inter: string;
}
state() {
return {
uploadUrl: '',
fileName: '',
};
}
actions = {
setFileInfo: (params: UploadParam) => {
const inter = this.options.inter;
this.model.uploadUrl = Dec.Utils.getEncodeURL(Dec.fineServletURL + inter, "", params);
},
setFileName:(v: string) => {
this.model.fileName = v;
}
}
}

327
src/modules/components/file_upload/file_upload.ts
Unescape View File

@ -0,0 +1,327 @@
import { shortcut, store } from '@core/core';
import { SignEditor, MultiLayerSingleLevelTree, SearchEditor, Button, Editor, Label } from '@fui/core';
import { FileUploadModel } from './file_upload.model';
import { ApiFactory } from 'src/modules/crud/apiFactory';
import './file_upload.less';
const api = new ApiFactory().create();
@shortcut()
@store(FileUploadModel, {
props(this: FileUpload) {
return this.options;
},
})
export class FileUpload extends BI.Widget {
public static xtype = "dec.dcm.components.file_upload";
public static EVENT_CHECK_SUCCESS = 'EVENT_CHECK_SUCCESS';
public static EVENT_CLEAR_FILE = 'EVENT_CLEAR_FILE';
public props = {
watermark: '',
value: '',
processId: '',
disabled: false,
inter: '',
access: '',
iconCls: ''
};
model: FileUploadModel['model'];
store: FileUploadModel['store'];
watch = {
uploadUrl: function () {
this.uploader.setUrl(this.model.uploadUrl);
},
};
public textEditor: SignEditor;
public keywordEditor: SearchEditor;
public fileTree: MultiLayerSingleLevelTree;
public sureButton: Button;
public infoLabel: Label;
public render() {
const { width, watermark, value, processId, inter } = this.options;
let self = this;
const processName = BI.concat("process-", processId);
const processClass = BI.concat(".process-", processId);
this.setFileInfo({
keytabPath: '',
principal:'',
krb5ConfPath: '',
});
return {
type: BI.VerticalLayout.xtype,
items:[{
type: BI.FloatLeftLayout.xtype,
items: [
{
type: BI.SignEditor.xtype,
cls: 'bi-border-bottom bi-focus-shadow',
width: 300,
height: 22,
watermark,
disabled: true,
value,
ref: (_ref: SignEditor) => {
this.textEditor = _ref;
},
listeners: [
{
eventName: BI.SignEditor.EVENT_CHANGE,
action: () => {
const value = this.textEditor.getValue();
this.setValue(value);
},
},
],
}, {
type: BI.Button.xtype,
width: 100,
_lgap: 10,
iconCls: "upload-font",
level: "ignore",
ghost: true,
ref: (_ref: Button) => {
this.uploadButton = _ref;
},
text: BI.i18nText('Dec-Basic_Choose_File'),
handler: () => {
this.uploader.select();
},
},
],
}, {
type: BI.FloatLeftLayout.xtype,
tgap: 8,
invisible: true,
ref: (_ref) => {
this.fileInfo = _ref;
},
items: [
{
type: BI.VerticalLayout.xtype,
cls: "bi-border",
items: [{
type: BI.HTapeLayout.xtype,
height: 68,
width: 300,
items: [{
el: {
type: BI.IconLabel.xtype,
cls: this.options.iconCls,
},
width: 48,
lgap: 8,
}, {
el: {
type: BI.VerticalLayout.xtype,
items : [{
type: BI.Label.xtype,
width: 200,
height: 20,
textAlign: "left",
ref: (_ref: Label) => {
this.fileName = _ref;
},
},{
type: BI.VerticalAdaptLayout.xtype,
items: [{
type: BI.Label.xtype,
cls: "bi-tips",
height: 20,
rgap: 3,
ref: (_ref: Label) => {
this.fileSize = _ref;
},
}, {
type: BI.Label.xtype,
cls: "bi-tips",
height: 20,
ref: (_ref: Label) => {
this.fileModified = _ref;
},
}]
}],
},
tgap: 14,
lgap: 4,
}, {
el: {
type: BI.IconButton.xtype,
cls: "default-delete-font",
handler: function () {
NProgress.set(0.0);
self.xhr.abort();
self.store.setFileName('');
self.clearInfo();
self.fireEvent(FileUpload.EVENT_CLEAR_FILE);
},
},
rgap: 10,
}]
}, {
type: BI.VerticalLayout.xtype,
cls: processName,
width: 300,
height: 1,
}]
}, {
el :{
type: BI.VerticalLayout.xtype,
cls: "bi-error",
ref: (_ref: any) => {
this.errorInfo = _ref;
},
invisible: true,
items : [{
type: BI.Label.xtype,
height: 20,
textAlign: "left",
ref: (_ref: Label) => {
this.errorCode = _ref;
},
},{
type: BI.Label.xtype,
height: 20,
textAlign: "left",
ref: (_ref: Label) => {
this.errorMsg = _ref;
},
}, {
type: BI.VerticalAdaptLayout.xtype,
rgap: 5,
items: [
{
type: BI.Label.xtype,
text: BI.i18nText('Dec-Dcm_Connection_File_Upload_ErrorTip1'),
},{
type: BI.TextButton.xtype,
cls: "bi-high-light bi-high-light-border-bottom",
text: BI.i18nText('Dec-Dcm_Connection_File_Upload_ErrorTip2'),
handler: function () {
window.open(Dec.system[DecCst.Hyperlink.DECISION_HYPERLINK_CONFIG][DecCst.Hyperlink.KERBEROS_CONF_HELP]);
},
},{
type: BI.Label.xtype,
text: BI.i18nText('Dec-Dcm_Connection_File_Upload_ErrorTip3'),
}
],
},],
},
vgap: 4,
lgap: 8,
}
],
}, {
type: BI.MultifileEditor.xtype,
ref: (ref:any) => {
self.uploader = ref;
},
url: this.model.uploadUrl,
accept: this.options.accept,
listeners: [
{
// 选择文件
eventName: BI.MultifileEditor.EVENT_CHANGE,
action: function (files) {
self.options.attachId = '';
const fileInfo = files.files[0];
self.setInfo(fileInfo);
self.store.setFileName(fileInfo.fileName);
this.upload();
NProgress.configure({ parent: processClass, minimum: 0.0 });
},
},
{
// 上传进度刷新
eventName: BI.MultifileEditor.EVENT_PROGRESS,
action: function (progress) {
let rate = progress.loaded/progress.total;
NProgress.set(rate);
},
},
{
// 开始上传文件
eventName: BI.MultifileEditor.EVENT_UPLOADSTART,
action: function (progressEvent, xhr) {
self.xhr = xhr;
},
},
{
// 上传文件完毕
eventName: BI.MultifileEditor.EVENT_UPLOADED,
action: function () {
const uploadedInfo = this.getValue();
const failed = BI.some(uploadedInfo, function (index, file) {
if (file.data.errorCode) {
BI.Msg.toast(uploadedInfo[0].filename + BI.i18nText('Dec-Dcm_Connection_File_Upload_Error'), {
level: "error",
});
self.setErrorInfo(file.data)
return true;
}
});
const key = self.options.processId +'Path';
!failed && self.setValue(uploadedInfo[0].data.kerberosInfo[key]);
!failed && self.fireEvent(FileUpload.EVENT_CHECK_SUCCESS, uploadedInfo[0].data);
!failed && BI.Msg.toast(uploadedInfo[0].filename + BI.i18nText('Dec-Dcm_Connection_File_Upload_Success'),{
level: "success"
});
NProgress.configure({ parent: 'body'});
},
},
],
}]
};
}
public getValue(): string {
return this.options.value;
}
public setValue(value: string) {
this.options.value = value;
this.textEditor.text.setTitle(value);
this.textEditor.setValue(value);
}
public setInfo(info: any) {
this.uploadButton.setEnable(false);
this.fileInfo.setVisible(true);
this.textEditor.setValue(info.fileName);
this.fileName.setText(info.fileName);
this.fileSize.setText(Dec.Utils.getByteWidthUnit(info.size));
this.fileModified.setText(BI.getDate().print("%Y-%X-%d %H:%M:%S"))
}
public clearInfo() {
this.uploadButton.setEnable(true);
this.fileInfo.setVisible(false);
this.errorInfo.setVisible(false);
this.textEditor.setValue('');
this.options.attachId = '';
}
public setErrorInfo(errorInfo: any) {
this.errorInfo.setVisible(true);
this.errorCode.setText(BI.i18nText("Dec-Dcm_Connection_File_Upload_ErrorCode") + ":"+ errorInfo.errorCode);
this.errorMsg.setText(BI.i18nText("Dec-Dcm_Connection_File_Upload_ErrorMsg") + ":" + errorInfo.errorMessage);
}
public setEnable(v) {
this.uploadButton._setEnable(v);
}
public setFileInfo(params) {
this.store.setFileInfo(params);
}
}

33
src/modules/components/test_status/test_status.ts
Unescape View File

@ -29,6 +29,9 @@ export class TestStatus extends BI.Widget {
failDriverMessage: Label; failDriverMessage: Label;
driverLink: FloatLeftLayout; driverLink: FloatLeftLayout;
detail: VerticalLayout; detail: VerticalLayout;
failMaskers: any;
extraContainer: VerticalLayout;
watch = { watch = {
status: (status: string) => { status: (status: string) => {
@ -37,6 +40,7 @@ export class TestStatus extends BI.Widget {
} }
render() { render() {
const LAYOUT_WIDTH = 400;
const { loadingCls, loadingText, successCls, successText, failCls, failText, retryText } = this.options; const { loadingCls, loadingText, successCls, successText, failCls, failText, retryText } = this.options;
return { return {
@ -51,7 +55,7 @@ export class TestStatus extends BI.Widget {
cls: 'bi-card', cls: 'bi-card',
width: 450, width: 450,
height: 250, height: 250,
single: true, // single: true,
showIndex: this.model.status, showIndex: this.model.status,
ref: (_ref: Tab) => { ref: (_ref: Tab) => {
this.tab = _ref; this.tab = _ref;
@ -70,6 +74,12 @@ export class TestStatus extends BI.Widget {
tipCls: failCls, tipCls: failCls,
tipText: failText, tipText: failText,
retryText, retryText,
ref: (_ref: TipFail) => {
this.failMaskers = _ref;
if (BI.isEmptyString(this.failMessage.getText())) {
this.failMaskers.populateFail(BI.i18nText('Dec-Conn-ect-Failed'), false);
}
},
listeners: [ listeners: [
{ {
eventName: TipFail.EVENT_RELOAD, eventName: TipFail.EVENT_RELOAD,
@ -116,10 +126,17 @@ export class TestStatus extends BI.Widget {
scrolly: true, scrolly: true,
height: 75, height: 75,
items: [ items: [
{
type: BI.VerticalLayout.xtype,
width: LAYOUT_WIDTH,
ref: (_ref: VerticalLayout) => {
this.extraContainer = _ref;
}
},
{ {
type: BI.Label.xtype, type: BI.Label.xtype,
whiteSpace: 'normal', whiteSpace: 'normal',
width: 400, width: LAYOUT_WIDTH,
textAlign: 'left', textAlign: 'left',
text: '', text: '',
ref: (_ref: Label) => { ref: (_ref: Label) => {
@ -168,7 +185,7 @@ export class TestStatus extends BI.Widget {
this.store.setStatus(TEST_STATUS.SUCCESS); this.store.setStatus(TEST_STATUS.SUCCESS);
} }
setFail(message: string, driver = '', link = '') { setFail(message: string = '', driver = '', link = '') {
this.store.setStatus(TEST_STATUS.FAIL); this.store.setStatus(TEST_STATUS.FAIL);
this.failMessage.setText(message); this.failMessage.setText(message);
this.failDriverMessage.setVisible(!!driver); this.failDriverMessage.setVisible(!!driver);
@ -182,4 +199,14 @@ export class TestStatus extends BI.Widget {
setLoading() { setLoading() {
this.store.setStatus(TEST_STATUS.LOADING); this.store.setStatus(TEST_STATUS.LOADING);
} }
/**
* 设置报错弹窗自定义展示内容
*/
setExtraContainer(container: Obj) {
BI.createWidget({
...container,
element: this.extraContainer,
});
}
} }

21
src/modules/components/test_status/tip_icon/tip_fail.ts
Unescape View File

@ -1,5 +1,5 @@
import { shortcut, store } from '@core/core'; import { shortcut, store } from '@core/core';
import { Button } from '@fui/core'; import { Button, Label } from '@fui/core';
import { TipFailModel } from './tip_fail.model'; import { TipFailModel } from './tip_fail.model';
@shortcut() @shortcut()
@ -21,7 +21,7 @@ export class TipFail extends BI.Widget {
store: TipFailModel['store']; store: TipFailModel['store'];
detailButton: Button; detailButton: Button;
failText:Label;
watch = { watch = {
isCollapse: (isCollapse: boolean) => { isCollapse: (isCollapse: boolean) => {
this.detailButton.setText(isCollapse ? this.detailButton.setText(isCollapse ?
@ -29,6 +29,10 @@ export class TipFail extends BI.Widget {
BI.i18nText('Dec-Dcm_Connection_Detailed_Information')); BI.i18nText('Dec-Dcm_Connection_Detailed_Information'));
}, },
} }
populateFail(text:string,isVisible:boolean){
this.failText.setText(text);
this.detailButton.setVisible(isVisible);
}
render() { render() {
const { tipCls, tipText, retryText } = this.options; const { tipCls, tipText, retryText } = this.options;
@ -50,18 +54,20 @@ export class TipFail extends BI.Widget {
}], }],
}, { }, {
type: BI.Label.xtype, type: BI.Label.xtype,
height: 14, _bgap: 10,
bgap: 10,
text: tipText, text: tipText,
ref:(_ref:Label)=>{
this.failText=_ref;
}
}, },
{ {
type: BI.VerticalAdaptLayout.xtype, type: BI.VerticalAdaptLayout.xtype,
hgap: 5, hgap: 12,
items: [ items: [
{ {
type: BI.Button.xtype, type: BI.Button.xtype,
text: BI.i18nText('Dec-Dcm_Connection_Detailed_Information'), text: BI.i18nText('Dec-Dcm_Connection_Detailed_Information'),
level: 'ignore', clear: true,
ref: (_ref: Button) => { ref: (_ref: Button) => {
this.detailButton = _ref; this.detailButton = _ref;
}, },
@ -72,8 +78,8 @@ export class TipFail extends BI.Widget {
}, },
{ {
type: BI.Button.xtype, type: BI.Button.xtype,
light: true,
text: BI.i18nText('Dec-Dcm_Back'), text: BI.i18nText('Dec-Dcm_Back'),
level: 'ignore',
handler: () => { handler: () => {
this.fireEvent(TipFail.EVENT_CLOSE); this.fireEvent(TipFail.EVENT_CLOSE);
}, },
@ -82,6 +88,7 @@ export class TipFail extends BI.Widget {
type: BI.Button.xtype, type: BI.Button.xtype,
text: retryText, text: retryText,
handler: () => { handler: () => {
this.store.setIsCollapse(false);
this.fireEvent(TipFail.EVENT_RELOAD); this.fireEvent(TipFail.EVENT_RELOAD);
}, },
}, },

120
src/modules/components/text_checker/text_checker.ts
Unescape View File

@ -3,87 +3,97 @@ import { Label, TextEditor } from '@fui/core';
@shortcut() @shortcut()
export class TextChecker extends BI.Widget { export class TextChecker extends BI.Widget {
static xtype = 'dec.dcm.components.text_checker'; public static xtype = 'dec.dcm.components.text_checker';
props = { public props = {
width: 300, width: 300,
allowBlank: true, allowBlank: true,
value: '', value: '',
watermark: '', watermark: '',
inputType: 'text',
autocomplete: '',
validationChecker: [] as { validationChecker: [] as {
errorText: string; errorText: string;
checker: (value: string) => boolean; checker: (value: string) => boolean;
autoFix?: boolean; autoFix?: boolean;
}[], }[],
$value: '', $value: '',
} };
textEditor: TextEditor; public textEditor: TextEditor;
errorLabel: Label; public errorLabel: Label;
private isError: boolean; private isError: boolean;
private value: string; private value: string;
private errorChecker: { private errorChecker: {
errorText: string; errorText: string;
checker: (value: string) => boolean; checker: (value: string) => boolean;
autoFix?: boolean; autoFix?: boolean;
} };
render() { public render() {
const { width, allowBlank, value, watermark, validationChecker, $value } = this.options; const { width, allowBlank, value, watermark, inputType, autocomplete, validationChecker, $value } = this.options;
this.value = value; this.value = value;
return { return {
type: BI.AbsoluteLayout.xtype, type: BI.AbsoluteLayout.xtype,
width, width,
height: 20, height: 20,
items: [{ items: [
el: { {
type: BI.TextEditor.xtype, el: {
$value, type: BI.TextEditor.xtype,
width, $value,
allowBlank, width,
value, allowBlank,
watermark, value,
ref: (_ref: TextEditor) => { watermark,
this.textEditor = _ref; inputType,
}, autocomplete,
listeners: [{ ref: (_ref: TextEditor) => {
eventName: BI.Editor.EVENT_CHANGE, this.textEditor = _ref;
action: () => {
const value = this.getValue();
if (value) {
this.errorChecker = validationChecker.find(item => item.checker && !item.checker(value));
this.errorLabel.setText(BI.get(this.errorChecker, 'errorText'));
this.isError = !!BI.get(this.errorChecker, 'errorText');
} else {
this.errorLabel.setText('');
this.isError = false;
}
if (!this.isError) {
this.value = value;
}
this.fireEvent(BI.Editor.EVENT_CHANGE);
},
}, {
eventName: BI.TextEditor.EVENT_BLUR,
action: () => {
if (BI.get(this.errorChecker, 'autoFix')) {
this.setValue(this.value);
this.errorLabel.setText('');
}
}, },
}], listeners: [
{
eventName: BI.Editor.EVENT_CHANGE,
action: () => {
const value = this.getValue();
if (value) {
this.errorChecker = validationChecker.find((item) => item.checker && !item.checker(value));
this.errorLabel.setText(BI.get(this.errorChecker, 'errorText'));
this.isError = !!BI.get(this.errorChecker, 'errorText');
} else {
this.errorLabel.setText('');
this.isError = false;
}
if (!this.isError) {
this.value = value;
}
this.fireEvent(BI.Editor.EVENT_CHANGE);
},
},
{
eventName: BI.TextEditor.EVENT_BLUR,
action: () => {
if (BI.get(this.errorChecker, 'autoFix')) {
this.setValue(this.value);
this.errorLabel.setText('');
}
},
},
],
},
}, },
}, { {
el: { el: {
type: BI.Label.xtype, type: BI.Label.xtype,
cls: 'bi-error', cls: 'bi-error',
ref: (_ref: Label) => { ref: (_ref: Label) => {
this.errorLabel = _ref; this.errorLabel = _ref;
},
}, },
top: -15,
}, },
top: -15, ],
}],
}; };
} }
@ -98,4 +108,8 @@ export class TextChecker extends BI.Widget {
public setError(value: string) { public setError(value: string) {
this.errorLabel.setText(value); this.errorLabel.setText(value);
} }
public setWatermark(value: string) {
this.textEditor.setWaterMark(value);
}
} }

41
src/modules/components/tips_combo/tips_combo.ts
Unescape View File

@ -0,0 +1,41 @@
import { shortcut } from '@core/core';
import { BubbleCombo, BubblePopupView, IconButton } from '@fui/core';
@shortcut()
export class TipsCombo extends BI.Widget {
public static xtype = 'dec.dcm.tips.combo';
public props: BubblePopupView['props'] & IconButton['props'] = {
trigger: 'hover',
direction: 'top'
};
private bubbleCombo: BubbleCombo;
private bubbleComboPopup: BubblePopupView;
public render() {
const { direction, trigger, el } = this.options;
return {
type: BI.BubbleCombo.xtype,
trigger,
direction,
el: {
type: BI.IconButton.xtype,
cls: "detail-font",
},
popup: {
type: BI.BubblePopupView.xtype,
ref: (_ref: BubblePopupView) => {
this.bubbleComboPopup = _ref;
},
el,
},
listeners: [],
ref: (_ref: BubbleCombo) => {
this.bubbleCombo = _ref;
}
}
}
}

121
src/modules/constants/constant.ts
Unescape View File

@ -5,6 +5,11 @@ export const PAGE_INDEX = {
POOL: 'pool', POOL: 'pool',
}; };
export const DATABASE_TYPE = {
SAP_HANA: "sap-hana",
STAR_ROCKS :'starrocks',
};
export const OTHER_JDBC = 'otherJDBC'; export const OTHER_JDBC = 'otherJDBC';
export const DEFAULT_HELP_LINK = 'databaseHelpLink'; export const DEFAULT_HELP_LINK = 'databaseHelpLink';
@ -279,7 +284,7 @@ export const DATA_BASE_TYPES = [
text: 'ClickHouse', text: 'ClickHouse',
databaseType: 'clickhouse', databaseType: 'clickhouse',
driver: 'ru.yandex.clickhouse.ClickHouseDriver', driver: 'ru.yandex.clickhouse.ClickHouseDriver',
url: 'jdbc:clickhouse://hostname:port', url: 'jdbc:clickhouse://hostname:port/database',
commonly: false, commonly: false,
internal: true, internal: true,
type: 'jdbc', type: 'jdbc',
@ -459,6 +464,7 @@ export const DATA_BASE_TYPES = [
text: 'KINGBASE', text: 'KINGBASE',
databaseType: 'kingbase', databaseType: 'kingbase',
driver: 'com.kingbase.Driver', driver: 'com.kingbase.Driver',
versions: ['KingbaseES 7.0'],
url: 'jdbc:kingbase://hostname:port/database', url: 'jdbc:kingbase://hostname:port/database',
commonly: false, commonly: false,
internal: true, internal: true,
@ -537,7 +543,7 @@ export const DATA_BASE_TYPES = [
kerberos: false, kerberos: false,
urls: { urls: {
'org.postgresql.Driver': 'jdbc:postgresql://hostname:port/dbname', 'org.postgresql.Driver': 'jdbc:postgresql://hostname:port/dbname',
'com.pivotal.jdbc.GreenplumDriver': 'jdbc:pivotal:greenplum://hostname:port;dbname', 'com.pivotal.jdbc.GreenplumDriver': 'jdbc:pivotal:greenplum://hostname:port;DatabaseName=dbname',
}, },
}, { }, {
text: 'Postgresql', text: 'Postgresql',
@ -561,6 +567,39 @@ export const DATA_BASE_TYPES = [
type: 'jdbc', type: 'jdbc',
hasSchema: false, hasSchema: false,
kerberos: false, kerberos: false,
}, {
text: 'Doris',
databaseType: 'doris',
driver: 'com.mysql.jdbc.Driver',
drivers: ['com.mysql.jdbc.Driver'],
url: 'jdbc:mysql://hostname:port/database',
commonly: false,
internal: true,
type: 'jdbc',
hasSchema: false,
kerberos: false,
}, {
text: BI.i18nText('Dec-Dcm_Connection_Database_DM'),
databaseType: 'dm',
driver: 'dm.jdbc.driver.DmDriver',
drivers: ['dm.jdbc.driver.DmDriver'],
url: 'jdbc:dm://hostname:port',
commonly: false,
internal: true,
type: 'jdbc',
hasSchema: true,
kerberos: true,
}, {
text: 'dremio',
databaseType: 'dremio',
driver: 'com.dremio.jdbc.Driver',
drivers: ['com.dremio.jdbc.Driver'],
url: 'jdbc:dremio:direct=hostname:31010',
commonly: false,
internal: true,
type: 'jdbc',
hasSchema: true,
kerberos: false,
}, { }, {
text: 'Presto', text: 'Presto',
databaseType: 'presto', databaseType: 'presto',
@ -575,7 +614,7 @@ export const DATA_BASE_TYPES = [
text: 'SAP HANA', text: 'SAP HANA',
databaseType: 'sap-hana', databaseType: 'sap-hana',
driver: 'com.sap.db.jdbc.Driver', driver: 'com.sap.db.jdbc.Driver',
url: 'jdbc:sap://hostname:port?reconnect=true', url: 'jdbc:sap://hostname:port?databaseName=database&reconnect=true',
commonly: false, commonly: false,
internal: true, internal: true,
type: 'jdbc', type: 'jdbc',
@ -659,6 +698,42 @@ export const DATA_BASE_TYPES = [
'org.sqlite.JDBC': 'jdbc:sqlite:[PATH_TO_DB_FILES]', 'org.sqlite.JDBC': 'jdbc:sqlite:[PATH_TO_DB_FILES]',
}, },
}, },
{
text: 'trino',
databaseType: 'trino',
driver: 'io.trino.jdbc.TrinoDriver',
url: 'jdbc:trino://hostname:port/database',
commonly: false,
internal: true,
type: 'jdbc',
hasSchema: true,
kerberos: false,
},
{
text: 'TDSQL',
databaseType: 'tdsql',
driver: 'org.postgresql.Driver',
url: 'jdbc:postgresql://hostname:port/database',
versions: ['pgsql'],
commonly: false,
internal: true,
type: 'jdbc',
hasSchema: true,
kerberos: false,
fetchSize: 10000,
},
{
text: BI.i18nText('StarRocks'),
databaseType: 'starrocks',
driver: 'com.mysql.jdbc.Driver',
drivers: ['com.mysql.jdbc.Driver'],
url: 'jdbc:mysql://hostname:port/default_catalog.database',
commonly: false,
internal: true,
type: 'jdbc',
hasSchema: false,
kerberos: false,
}
]; ];
@ -701,6 +776,28 @@ export const CONNECT_CHARSET = [
}, },
]; ];
export const CONNECT_SSH_TYPE = [
{
text: BI.i18nText('Dec-Dcm_Connection_Form_Password'),
value: 'NORMAL',
privateKeyPathFormVisible: false,
secretFormName: BI.i18nText('Dec-Dcm_Connection_Form_Password'),
},
{
text: BI.i18nText('Dec-Dcm_Connection_Form_PublicKey'),
value: 'KEY',
privateKeyPathFormVisible: true,
secretFormName: BI.i18nText('Dec-Dcm_Connection_Form_Passphrase'),
},
];
export const CONNECT_SSL_TYPE = [
{
text: BI.i18nText('Dec-Dcm_Connection_Form_Password'),
value: 'NORMAL',
},
];
export const TEST_STATUS = { export const TEST_STATUS = {
LOADING: 'loading', LOADING: 'loading',
SUCCESS: 'success', SUCCESS: 'success',
@ -737,15 +834,18 @@ export const DEFAULT_JDBC_POOL = {
minIdle: 0, minIdle: 0,
maxWait: 10000, maxWait: 10000,
testOnBorrow: true, testOnBorrow: true,
keepAlive: true,
testOnReturn: false, testOnReturn: false,
testWhileIdle: false, testWhileIdle: false,
timeBetweenEvictionRunsMillis: -1, timeBetweenEvictionRunsMillis: 60000,
numTestsPerEvictionRun: 3, numTestsPerEvictionRun: 3,
minEvictableIdleTimeMillis: 1800, minEvictableIdleTimeMillis: 1800,
maxEvictableIdleTimeMillis: 25200,
keepAliveBetweenTimeMillis: 120000,
}; };
export const CONNECTION_LAYOUT = { export const CONNECTION_LAYOUT = {
hgap: 5, hgap: 10,
vgap: 15, vgap: 15,
labelHeight: 24, labelHeight: 24,
}; };
@ -776,3 +876,14 @@ export const JNDI_FACTORYS = [
export const PAGE_SIZE = 50; export const PAGE_SIZE = 50;
export const INT_MAX_VALUE = 2147483647; export const INT_MAX_VALUE = 2147483647;
export const INT_MIN_VALUE = -2147483648; export const INT_MIN_VALUE = -2147483648;
export const YES_OR_NO = [
{
text: BI.i18nText('Dec-Basic_Yes'),
value: 1,
},
{
text: BI.i18nText('Dec-Basic_No'),
value: 0,
}
]

52
src/modules/core/checkIllegalStrings/checkIllegalStrings.ts
Unescape View File

@ -0,0 +1,52 @@
/*
https://work.fineres.com/browse/REPORT-91724 用于参数统一校验
*/
import { ILLEGAL_STRINGS } from "./constant";
export type CheckResult = {
legal: boolean,
errorMsg: string,
}
export const CHECK_CORRECT: CheckResult = {
legal: true,
errorMsg: "",
};
/**
* 检测非法字符，返回错误提示
* @param value 要校验的字符串
*/
export function checkIllegalStrings(value: string): CheckResult {
// 后端传入的校验开关，如果没传，那也默认开启
const enabled = Dec.system.enableParameterVerify ?? true;
let result = CHECK_CORRECT;
if (enabled) {
// 关键字不区分大小写
ILLEGAL_STRINGS.every(s => {
const sIndex = value.toLowerCase().indexOf(s);
if (sIndex !== -1) {
result = {
legal: false,
errorMsg: `${BI.i18nText("Dec-Basic_Check_Illegal_Strings")}${value.substr(sIndex, s.length)}`,
};
return false;
}
return true;
});
return result;
}
return result;
}
export function checkIllegalStringsInWidgetAndShowError(widget: any) {
const value = widget.getValue();
const result = checkIllegalStrings(value);
if (!result.legal) {
widget.showError(result.errorMsg);
}
return result.legal;
}

15
src/modules/core/checkIllegalStrings/constant.ts
Unescape View File

@ -0,0 +1,15 @@
/**
* 参数检验的非法字符数组，由于不区分大小写，统一用小写
*/
export const ILLEGAL_STRINGS = [
"\"",
"<",
">",
"&",
"/script",
"javascript:",
"onblur",
"getruntime",
"processbuilder",
"java.lang.processimpl",
];

1
src/modules/core/index.ts
Unescape View File

@ -0,0 +1 @@
export { checkIllegalStringsInWidgetAndShowError, checkIllegalStrings } from "./checkIllegalStrings/checkIllegalStrings"

17
src/modules/crud/api.ts
Unescape View File

@ -5,6 +5,7 @@ import {
ConnectionPoolType, ConnectionPoolType,
SocketResult, SocketResult,
ResultType, ResultType,
checkDriverStatusParams,
} from './crud.typings'; } from './crud.typings';
export interface Api { export interface Api {
@ -46,6 +47,17 @@ export interface Api {
*/ */
testConnection(data: Connection): Promise<TestRequest>; testConnection(data: Connection): Promise<TestRequest>;
/**
* 获取驱动加载路径
*/
getDriverLoadPath(data: Connection): Promise<ResultType<string>>;
/**
* 检测驱动冲突状态
* @param data 驱动路径
*/
checkDriverStatus(data: checkDriverStatusParams): Promise<ResultType<boolean>>;
/** /**
* 获取连接池数据 * 获取连接池数据
* @param name * @param name
@ -99,4 +111,9 @@ export interface Api {
* 获取外链 * 获取外链
*/ */
getHyperlink(name: string): string; getHyperlink(name: string): string;
/**
* 获取JNDI数据库类型可用状态
*/
getJNDIDatabaseStatus(): Promise<{ data?: boolean }>;
} }

6
src/modules/crud/crud.service.ts
Unescape View File

@ -15,7 +15,7 @@ export function requestGet(url: string, data?: any): Promise<ResultType> {
export function requestPost(url: string, data = {}): Promise<ResultType> { export function requestPost(url: string, data = {}): Promise<ResultType> {
return new Promise(resolve => { return new Promise(resolve => {
Dec.reqPost(getFullUrl(url), data, re => { Dec.reqByEncrypt("POST", getFullUrl(url), data, re => {
resolve(re); resolve(re);
}); });
}); });
@ -23,7 +23,7 @@ export function requestPost(url: string, data = {}): Promise<ResultType> {
export function requestDelete(url: string, data = {}) { export function requestDelete(url: string, data = {}) {
return new Promise(resolve => { return new Promise(resolve => {
Dec.reqDelete(getFullUrl(url), data, re => { Dec.reqByEncrypt("DELETE", getFullUrl(url), data, re => {
resolve(re); resolve(re);
}); });
}); });
@ -31,7 +31,7 @@ export function requestDelete(url: string, data = {}) {
export function requestPut(url: string, data = {}) { export function requestPut(url: string, data = {}) {
return new Promise(resolve => { return new Promise(resolve => {
Dec.reqPut(getFullUrl(url), data, re => { Dec.reqByEncrypt("PUT", getFullUrl(url), data, re => {
resolve(re); resolve(re);
}); });
}); });

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

@ -1,3 +1,7 @@
export interface CrudParams {
[key: string]: string | number | { [key: string]: any };
}
export interface CrudReqOpts { export interface CrudReqOpts {
url?: string; url?: string;
type?: 'GET' | 'POST' | 'DELETE' | 'PUT'; type?: 'GET' | 'POST' | 'DELETE' | 'PUT';
@ -9,28 +13,116 @@ export interface CrudReqOpts {
params?: CrudParams; params?: CrudParams;
} }
export interface CrudParams { export interface ConnectionLicInfo {
[key: string]: string | number | { [key: string]: any }; currentConnectionNum: number;
maxConnectionNum: number;
} }
export interface Connection { export interface ConnectionPoolType {
connectionId: string; maxActive: number;
connectionType: string; maxIdle: number;
connectionName: string; numActive: number;
creator?: string; numIdle: number;
connectionData: ConnectionJDBC | ConnectionJNDI | ConnectionPlugin | string;
privilegeDetailBeanList?: {
privilegeType: number;
privilegeValue: number;
}[];
} }
export interface ConnectionLicInfo { type ConnectionDataOfSSH = {
currentConnectionNum: number; usingSsh: boolean; // 使用SSH通道
maxConnectionNum: number; sshIp: string; // 主机
sshPort: number; // 端口
sshUser: string; // 用户名
redirectPort: number;
redirectIp: string;
sshTimeOut: number;
sshKeepAlive: number;
} & (
| {
sshType: 'NORMAL'; // 验证方法:密码
sshPrivateKeyPath: ''; // 没啥意义，该验证方法下为空字符串
sshSecret: string; // 密码
}
| {
sshType: 'KEY'; // 验证方法:公钥
sshPrivateKeyPath: string; // 私钥
sshSecret: string; // 密码短语
}
);
type ConnectionDataOfSSL = {
usingSsl: boolean; // 使用SSL通道
sslType: 'NORMAL'; // SSL类型，只有NORMAL一种
caCertificate: string; // CA证书
verifyCa: boolean; // 验证针对CA的服务器证书
sslClientPrivateKey: string; // 客户端密钥
sslClientCertificate: string; // 客户端证书
};
export interface ConnectionPoolJDBC {
/**
* 初始化连接数量
*/
initialSize?: number;
/**
* 最大连接数
*/
maxActive?: number;
/**
* 最大空闲数
*/
maxIdle?: number;
/**
* 最小空闲数
*/
minIdle?: number;
/**
* 最大等待时间
*/
maxWait?: number;
/**
* sql查询
*/
validationQuery?: string;
/**
* 连接前校验
*/
testOnBorrow?: boolean;
/**
* 空闲连接可用性定期检查
*/
keepAlive?: boolean;
/**
* 归还前校验
*/
testOnReturn?: boolean;
/**
* 空闲校验
*/
testWhileIdle?: boolean;
/**
* 在空闲连接回收器线程运行期间休眠的时间值，毫秒。
*/
timeBetweenEvictionRunsMillis?: number;
/**
* 每次空闲连接回收器现成运行时检查的连接数量
*/
numTestsPerEvictionRun?: number;
/**
* 连接在池中保持空闲而不被空闲连接回收器回收的最小时间，单位毫秒
*/
minEvictableIdleTimeMillis?: number;
/**
* 连接在池中保持空闲而不被空闲连接回收器回收的最小时间，单位毫秒
*/
maxEvictableIdleTimeMillis?: number;
/**
* 空闲连接可用性定期检查时间阈值
*/
keepAliveBetweenTimeMillis?: number;
} }
export interface ConnectionJDBC { export type ConnectionJDBC = {
/** /**
* 数据库名称 * 数据库名称
*/ */
@ -44,6 +136,10 @@ export interface ConnectionJDBC {
* 驱动 * 驱动
*/ */
driver: string; driver: string;
/**
* 驱动来源
*/
driverSource: 'default' | 'custom';
/** /**
* 数据库连接url * 数据库连接url
*/ */
@ -108,6 +204,10 @@ export interface ConnectionJDBC {
* 秘钥路径 * 秘钥路径
*/ */
keyPath?: string; keyPath?: string;
/**
* krb5.conf文件
*/
krb5Path?: string;
/** /**
* fetchSize * fetchSize
*/ */
@ -118,71 +218,45 @@ export interface ConnectionJDBC {
identity?: string; identity?: string;
connectionPoolAttr: ConnectionPoolJDBC; connectionPoolAttr: ConnectionPoolJDBC;
}
export interface ConnectionPoolJDBC {
/**
* 初始化连接数量
*/
initialSize?: number;
/**
* 最大连接数
*/
maxActive?: number;
/**
* 最大空闲数
*/
maxIdle?: number;
/**
* 最小空闲数
*/
minIdle?: number;
/** /**
* 最大等待时间 * 并行装载
*/ */
maxWait?: number; parallelLoad?: IParallelLoad;
/** /**
* sql查询 * HDFS
*/ */
validationQuery?: string; hdfs?: {
/**
/** * HDFS地址
* 连接前校验 */
*/ hdfsAddress?: string;
testOnBorrow?: boolean; };
} & ConnectionDataOfSSH & ConnectionDataOfSSL;
/**
* 并行装载
*/
export interface IParallelLoad {
/** /**
* 归还前校验 * 服务器地址
*/ */
testOnReturn?: boolean; serverAddress?: string;
/** /**
* 空闲校验 * 服务器地址选项
*/ */
testWhileIdle?: boolean; serverAddressItems?: string[];
/** /**
* 在空闲连接回收器线程运行期间休眠的时间值，毫秒。 * 复用临时表
*/ */
timeBetweenEvictionRunsMillis?: number; reuseTemporaryTable?: string;
/** /**
* 每次空闲连接回收器现成运行时检查的连接数量 * 临时文件条数限制
*/ */
numTestsPerEvictionRun?: number; filePiecesLimit?: string;
/** /**
* 连接在池中保持空闲而不被空闲连接回收器回收的最小时间，单位毫秒 * 临时文件大小限制
*/ */
minEvictableIdleTimeMillis?: number; fileSizeLimit?: string
}
export interface ConnectionJNDI {
jndiName: string;
/**
* 编码
*/
originalCharsetName: string;
newCharsetName: string;
creator?: string;
contextHashtable: ContextHashtable;
} }
export interface ContextHashtable { export interface ContextHashtable {
@ -203,33 +277,54 @@ export interface ContextHashtable {
'java.naming.applet': string; 'java.naming.applet': string;
} }
export interface ConnectionJNDI {
jndiName: string;
/**
* 编码
*/
originalCharsetName: string;
newCharsetName: string;
creator?: string;
contextHashtable: ContextHashtable;
}
export interface ConnectionPlugin { export interface ConnectionPlugin {
pluginType: 'json'; pluginType: 'json';
creator: ''; creator: '';
pluginData: any; pluginData: any;
} }
export interface Connection {
connectionId: string;
connectionType: string;
connectionName: string;
creator?: string;
connectionData: ConnectionJDBC | ConnectionJNDI | ConnectionPlugin | string;
privilegeDetailBeanList?: {
privilegeType: number;
privilegeValue: number;
}[];
}
export interface TestRequest { export interface TestRequest {
data?: string[]; data?: string[];
errorCode?: string; errorCode?: string;
errorMsg?: string; errorMsg?: string;
} }
export interface ConnectionPoolType {
maxActive: number;
maxIdle: number;
numActive: number;
numIdle: number;
}
export interface SocketResult { export interface SocketResult {
data?: string; data?: string;
errorCode?: string; errorCode?: string;
errorMsg?: string; errorMsg?: string;
} }
export interface ResultType { export interface ResultType<T = any> {
data?: any; data?: T;
errorCode?: string; errorCode?: string;
errorMsg?: string; errorMsg?: string;
} }
export type checkDriverStatusParams = {
path: string;
driver: ConnectionJDBC['driver'];
}

48
src/modules/crud/decision.api.ts
Unescape View File

@ -1,5 +1,5 @@
import { Api } from './api'; import { Api } from './api';
import { Connection, TestRequest, ConnectionPoolType, SocketResult, ConnectionLicInfo } from './crud.typings'; import { Connection, TestRequest, ConnectionPoolType, SocketResult, ConnectionLicInfo, ResultType, checkDriverStatusParams } from './crud.typings';
import { requestGet, requestDelete, requestPost, requestPut } from './crud.service'; import { requestGet, requestDelete, requestPost, requestPut } from './crud.service';
import { editStatusEvent, errorCode } from '@constants/env'; import { editStatusEvent, errorCode } from '@constants/env';
@ -48,6 +48,27 @@ export class DecisionApi implements Api {
return requestPost('test', form); return requestPost('test', form);
} }
/**
* 获取驱动加载路径
* @returns
*/
getDriverLoadPath(data: Connection): Promise<ResultType<string>> {
const form = {
...data,
connectionData: JSON.stringify(data.connectionData),
};
return requestPost('driver/path', form);
}
/**
* 检测驱动冲突状态
* @param data 驱动路径
*/
checkDriverStatus(data: checkDriverStatusParams): Promise<ResultType<boolean>> {
return requestGet(Dec.Utils.getEncodeURL('test/driver/conflict', '', data));
}
getConnectionPool(name: string): Promise<{ data?: ConnectionPoolType }> { getConnectionPool(name: string): Promise<{ data?: ConnectionPoolType }> {
return requestGet(`pool/info?connectionName=${encodeURIComponent(name)}`, {}); return requestGet(`pool/info?connectionName=${encodeURIComponent(name)}`, {});
} }
@ -118,18 +139,39 @@ export class DecisionApi implements Api {
getCipher(password: string) { getCipher(password: string) {
return BI.Providers.getProvider('dec.provider.cipher') return BI.Providers.getProvider('dec.provider.cipher')
.getCipher(password); .getCompleteCipher(password);
} }
getPlain(cipher: string) { getPlain(cipher: string) {
return BI.Providers.getProvider('dec.provider.cipher') return BI.Providers.getProvider('dec.provider.cipher')
.getPlain(cipher); .getCompletePlain(cipher);
} }
getHyperlink(name: string) { getHyperlink(name: string) {
return Dec.system[DecCst.Hyperlink.DECISION_HYPERLINK_CONFIG][name]; return Dec.system[DecCst.Hyperlink.DECISION_HYPERLINK_CONFIG][name];
} }
changePrincipal(value: any) {
return requestPost(`switch/principal`, value);
}
getPrincipals(keytab: string) {
return requestGet(`/principals?keytabPath=${keytab}`, {});
}
getTimeOut(): Promise<{ data?: any }> {
return requestGet('kdc/timeout', {});
}
putTimeOut(value: number) {
return requestPut(`kdc/timeout?timeout=${value}`, {})
}
// 获取当前lic是否可以使用JNDI数据库类型
getJNDIDatabaseStatus(): Promise<{ data?: boolean }> {
return requestGet('databasetype/limit', {});
}
private sendEditStatusEvent(name: string, type: string): Promise<SocketResult> { private sendEditStatusEvent(name: string, type: string): Promise<SocketResult> {
return new Promise(resolve => { return new Promise(resolve => {
if (Dec?.socket?.connected) { if (Dec?.socket?.connected) {

27
src/modules/crud/design.api.ts
Unescape View File

@ -1,5 +1,5 @@
import { Api } from './api'; import { Api } from './api';
import { Connection, TestRequest, ConnectionPoolType, SocketResult, ConnectionLicInfo } from './crud.typings'; import { Connection, TestRequest, ConnectionPoolType, SocketResult, ConnectionLicInfo, ResultType, ConnectionJDBC, checkDriverStatusParams } from './crud.typings';
import { requestGet } from './crud.service'; import { requestGet } from './crud.service';
// TODO: 此页面的接口等待设计器提供相应的方法 // TODO: 此页面的接口等待设计器提供相应的方法
@ -39,6 +39,27 @@ export class DesignApi implements Api {
}); });
} }
/**
* 获取驱动加载路径
* @param name
* @returns
*/
getDriverLoadPath(data: Connection): Promise<ResultType<string>> {
return new Promise(resolve => {
resolve({ data: '' });
});
}
/**
* 检测驱动冲突状态
* @param data 驱动路径
*/
checkDriverStatus(data: checkDriverStatusParams): Promise<ResultType<boolean>> {
return new Promise(resolve => {
resolve({ data: false });
});
}
getConnectionPool(name: string): Promise<{ data: ConnectionPoolType }> { getConnectionPool(name: string): Promise<{ data: ConnectionPoolType }> {
return new Promise(resolve => { return new Promise(resolve => {
resolve({ resolve({
@ -88,4 +109,8 @@ export class DesignApi implements Api {
// 设计器获取超链 // 设计器获取超链
return ''; return '';
} }
getJNDIDatabaseStatus() {
return Promise.resolve({ data: true });
}
} }

24
src/modules/pages/__point__/connect.point.ts
Unescape View File

@ -0,0 +1,24 @@
BI.point("dec.dcm.model.connection", "createNewConnection", () => {
Dec.Utils.saveFocusPoint({
id: "E73325",
title: "新建数据连接",
});
});
BI.point("dec.dcm.model.title_maintain", "setTestEvent", () => {
Dec.Utils.saveFocusPoint({
id: "E73328",
title: "测试数据连接",
});
});
BI.point("dec.dcm.model.maintain_form", "addConnection", function () {
Dec.Utils.saveFocusPoint({
id: "E8827",
title: "保存数据连接",
body: {
datebaseType: this.model.datebaseTypeSelected,
databaseName: this.model.connectionSelected,
},
});
});

9
src/modules/pages/connection/connection.model.ts
Unescape View File

@ -13,13 +13,14 @@ export class ConnectionModel extends Model<{
connectionSelected: AppModel['TYPE']['connectionSelected']; connectionSelected: AppModel['TYPE']['connectionSelected'];
connectionSelectedOne: AppModel['TYPE']['connectionSelectedOne']; connectionSelectedOne: AppModel['TYPE']['connectionSelectedOne'];
datebaseTypeSelected: AppModel['TYPE']['datebaseTypeSelected']; datebaseTypeSelected: AppModel['TYPE']['datebaseTypeSelected'];
noTestConnection: AppModel['TYPE']['noTestConnection'];
}, },
childContext: ConnectionModel['childContext']; childContext: ConnectionModel['childContext'];
context: ConnectionModel['context']; context: ConnectionModel['context'];
}> { }> {
static xtype = 'dec.dcm.model.connection'; static xtype = 'dec.dcm.model.connection';
context = <const>['pageIndex', 'connectionSelected', 'connectionSelectedOne', 'datebaseTypeSelected', 'connectionLicInfo']; context = <const>['pageIndex', 'connectionSelected', 'connectionSelectedOne', 'datebaseTypeSelected', 'connectionLicInfo', 'noTestConnection'];
actions = { actions = {
initConnectionLicInfo: (cb: Function) => { initConnectionLicInfo: (cb: Function) => {
@ -53,8 +54,14 @@ export class ConnectionModel extends Model<{
this.model.connectionSelected = name; this.model.connectionSelected = name;
}, },
getConnectionStatus() { getConnectionStatus() {
if (this.model.connectionSelectedOne.pluginConnection) {
return Promise.resolve();
}
return api.getConnectionStatus(this.model.connectionSelected); return api.getConnectionStatus(this.model.connectionSelected);
}, },
setNoTestConnection(value: boolean) {
this.model.noTestConnection = value;
},
checkConnectionLic() { checkConnectionLic() {
return this.model.connectionLicInfo.currentConnectionNum > this.model.connectionLicInfo.maxConnectionNum; return this.model.connectionLicInfo.currentConnectionNum > this.model.connectionLicInfo.maxConnectionNum;
}, },

84
src/modules/pages/connection/connection.ts
Unescape View File

@ -24,24 +24,17 @@ export class Connection extends BI.Widget {
title: HTapeLayout; title: HTapeLayout;
watch = { watch = {
connectionSelected: (name: string) => { connectionSelectedOne: {
if (name) { immediate: true,
const canEdit = connectionCanEdit(this.model.connectionSelectedOne); handler: (v: Connection) => {
const type = this.getSelectConnectionType(); BI.nextTick(() => {
this.connectionTitleWidget.setText(`${name}（${getTextByDatabaseType(type)}）`); const connectionName = v.connectionName;
this.connectionEditWidget.setVisible(canEdit);
const hasRegistered = this.hasRegistered(); connectionName
this.title.setVisible(hasRegistered); ? this.renderConnectionListView(connectionName)
if (!hasRegistered) { : this.renderEmptyListView();
this.listView.populate(BI.createItems(this.renderNoRegistered())); });
} else { },
this.listView.populate(BI.createItems(this.renderItems()));
}
} else {
this.listView.populate(BI.createItems(this.renderEmpty()));
this.connectionTitleWidget.setText('');
this.connectionEditWidget.setVisible(false);
}
}, },
}; };
@ -50,8 +43,6 @@ export class Connection extends BI.Widget {
} }
render() { render() {
this.store.setConnectionSelected('');
return { return {
type: BI.HTapeLayout.xtype, type: BI.HTapeLayout.xtype,
hgap: 10, hgap: 10,
@ -71,6 +62,9 @@ export class Connection extends BI.Widget {
{ {
type: BI.Button.xtype, type: BI.Button.xtype,
text: BI.i18nText('Dec-Dcm_Connection_New'), text: BI.i18nText('Dec-Dcm_Connection_New'),
title: BI.i18nText('Dec-Dcm_Connection_New'),
minWidth: 0,
width: 98,
handler: () => { handler: () => {
this.store.createNewConnection(); this.store.createNewConnection();
}, },
@ -79,7 +73,7 @@ export class Connection extends BI.Widget {
right: [ right: [
{ {
type: 'dec.connection.driver.entry', type: 'dec.connection.driver.entry',
invisible: true, invisible: !BI.Services.getService('dec.service.global').isAdmin(),
from: '.dec-dcm', from: '.dec-dcm',
listeners: [ listeners: [
{ {
@ -134,16 +128,17 @@ export class Connection extends BI.Widget {
}, },
handler: () => { handler: () => {
this.store.getConnectionStatus() this.store.getConnectionStatus()
.then(re => { .then(() => {
this.store.setPageIndex(PAGE_INDEX.MAINTAIN); const databaseType = this.model.connectionSelectedOne.connectionType;
this.store.setDatebaseTypeSelected(''); const database = BI.find(getAllDatabaseTypes(), (_index, value) => value.databaseType === databaseType);
this.setMaintainPage();
this.store.setNoTestConnection(database.isHideConnection);
}) })
.catch(() => { .catch(() => {
}); });
}, },
}], }],
}, },
width: 90,
}, },
], ],
}, },
@ -210,12 +205,6 @@ export class Connection extends BI.Widget {
}]; }];
} }
private renderEmpty() {
return [{
type: BI.Layout.xtype,
}];
}
private hasRegistered() { private hasRegistered() {
const allDatabaseTypes = getAllDatabaseTypes(); const allDatabaseTypes = getAllDatabaseTypes();
switch (this.model.connectionSelectedOne.connectionType) { switch (this.model.connectionSelectedOne.connectionType) {
@ -237,4 +226,37 @@ export class Connection extends BI.Widget {
return databaseType; return databaseType;
} }
private setMaintainPage() {
this.store.setPageIndex(PAGE_INDEX.MAINTAIN);
this.store.setDatebaseTypeSelected('');
}
private renderConnectionListView(name: string) {
const canEdit = connectionCanEdit(this.model.connectionSelectedOne),
type = this.getSelectConnectionType(),
hasRegistered = this.hasRegistered();
this.connectionTitleWidget.setText(`${name}（${getTextByDatabaseType(type)}）`);
this.connectionEditWidget.setVisible(canEdit);
this.title.setVisible(hasRegistered);
hasRegistered
? this.listView.populate(BI.createItems(this.renderItems()))
: this.listView.populate(BI.createItems(this.renderNoRegistered()));
}
private renderEmptyListView() {
this.listView.populate(
BI.createItems([
{
type: BI.Layout.xtype,
}
])
);
this.connectionTitleWidget.setText('');
this.connectionEditWidget.setVisible(false);
}
} }

600
src/modules/pages/connection/connection_jdbc/connection_jdbc.ts
Unescape View File

@ -1,195 +1,405 @@
import { shortcut, store } from '@core/core'; import { shortcut, store } from '@core/core';
import { FormItem } from '../components/form_item/form_item'; import { FormItem } from '../components/form_item/form_item';
import { Collapse, EVENT_CHANGE } from 'src/modules/components/collapse/collapse'; import { Collapse, EVENT_CHANGE } from 'src/modules/components/collapse/collapse';
import { ConnectionJdecModel } from './connection_jdbc.model'; import { ConnectionJdecModel } from './connection_jdbc.model';
import { ConnectionJDBC } from 'src/modules/crud/crud.typings'; import { ConnectionJDBC } from 'src/modules/crud/crud.typings';
import { getAllDatabaseTypes, getJdbcDatabaseType, resolveUrlInfo } from '../../../app.service'; import { getAllDatabaseTypes, getJdbcDatabaseType, resolveUrlInfo } from '../../../app.service';
import { CONNECTION_LAYOUT } from '@constants/constant'; import { CONNECTION_LAYOUT, CONNECT_SSH_TYPE } from '@constants/constant';
import { VerticalLayout } from '@fui/core'; import { VerticalLayout } from '@fui/core';
import { ApiFactory } from '../../../crud/apiFactory'; import { ApiFactory } from '../../../crud/apiFactory';
const api = new ApiFactory().create(); const api = new ApiFactory().create();
@shortcut() @shortcut()
@store(ConnectionJdecModel) @store(ConnectionJdecModel)
export class ConnectionJdbc extends BI.Widget { export class ConnectionJdbc extends BI.Widget {
static xtype = 'dec.dcm.connection_jdbc'; static xtype = 'dec.dcm.connection_jdbc';
advancedSet: any; model: ConnectionJdecModel['model'];
model: ConnectionJdecModel['model']; allDatabaseTypes = getAllDatabaseTypes();
allDatabaseTypes = getAllDatabaseTypes();
sshSet: VerticalLayout;
render() { sslSet: VerticalLayout;
const connectionData = this.model.connectionSelectedOne.connectionData as ConnectionJDBC; advancedSet: VerticalLayout;
const { parallelLoadSet: VerticalLayout;
driver,
driverSource, render() {
database, const connectionData = this.model.connectionSelectedOne.connectionData as ConnectionJDBC;
user, const {
originalCharsetName, driver,
schema, driverSource,
connectionPoolAttr, database,
authType, user,
principal, originalCharsetName,
url, schema,
fetchSize, connectionPoolAttr,
} = connectionData; authType,
const databaseType = getJdbcDatabaseType(database, driver); principal,
const { host, port, databaseName } = resolveUrlInfo(url, database); url,
const { hgap, vgap } = CONNECTION_LAYOUT; fetchSize,
// ssh
return { usingSsh,
type: BI.VerticalLayout.xtype, sshIp,
hgap, sshPort,
vgap, sshUser,
items: [ sshType,
{ sshSecret,
type: FormItem.xtype, sshPrivateKeyPath,
name: BI.i18nText('Dec-Dcm_Connection_Form_Driver'), // ssl
value: BI.isKey(driverSource) ? `${driver} (${driverSource})` : driver, usingSsl,
}, caCertificate,
{ verifyCa,
type: FormItem.xtype, sslClientPrivateKey,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Name'), sslClientCertificate,
value: databaseName, // 并行装载
}, parallelLoad,
{ // HDFS
type: FormItem.xtype, hdfs,
name: BI.i18nText('Dec-Dcm_Connection_Form_Host'), } = connectionData;
value: host, const databaseType = getJdbcDatabaseType(database, driver);
}, const { host, port, catalog, databaseName, version } = resolveUrlInfo(url, database);
{ this.version = !BI.isUndefined(databaseType.versions) ? (version ?? databaseType.versions[0]) : version;
type: FormItem.xtype, const { hgap, vgap } = CONNECTION_LAYOUT;
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Port'),
value: port, return {
}, type: BI.VerticalLayout.xtype,
authType ? hgap,
{ vgap,
type: FormItem.xtype, items: [
name: BI.i18nText('Dec-Dcm_Connection_Form_AuthType'), {
value: authType, type: FormItem.xtype,
} : { name: BI.i18nText('Dec-Basic_Version'),
type: BI.Layout.xtype, invisible: BI.isUndefined(this.version),
}, value: BI.i18nText('Dec-Migration_Database_Version', this.version),
{ },
type: FormItem.xtype, {
name: authType ? BI.i18nText('Dec-Dcm_Connection_Form_Principal') : BI.i18nText('Dec-Dcm_Connection_Form_UserName'), type: FormItem.xtype,
value: authType ? principal : user, _tgap: BI.isUndefined(this.version) ? vgap : 0,
}, name: BI.i18nText('Dec-Dcm_Connection_Form_Driver'),
{ value: BI.isKey(driverSource) ? `${driver} (${driverSource})` : driver,
type: FormItem.xtype, },
name: authType ? BI.i18nText('Dec-Dcm_Connection_Form_KeyPath') : BI.i18nText('Dec-Dcm_Connection_Form_Password'), {
value: '******', type: FormItem.xtype,
}, name: 'catalog',
{ invisible: database !== 'starrocks',
type: FormItem.xtype, value: catalog,
name: BI.i18nText('Dec-Dcm_Connection_Form_OriginalCharsetName'), },
value: originalCharsetName ? originalCharsetName : BI.i18nText('Dec-Dcm_Connection_Form_Default'), {
}, type: FormItem.xtype,
{ name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Name'),
type: FormItem.xtype, value: databaseName,
name: BI.i18nText('Dec-Dcm_Connection_Form_Pattern'), },
value: schema, {
invisible: !databaseType.hasSchema, type: FormItem.xtype,
}, name: BI.i18nText('Dec-Dcm_Connection_Form_Host'),
{ value: host,
type: FormItem.xtype, },
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_URL'), {
value: url, type: FormItem.xtype,
}, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Port'),
{ value: port,
type: Collapse.xtype, },
width: 70, authType
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Advanced_Setting'), ? {
listeners: [ type: FormItem.xtype,
{ name: BI.i18nText('Dec-Dcm_Connection_Form_AuthType'),
eventName: EVENT_CHANGE, value: authType,
action: (isCollapse: boolean) => { }
this.advancedSet.setVisible(!isCollapse); : {
}, type: BI.Layout.xtype,
}, },
], {
}, type: FormItem.xtype,
{ name: authType ? BI.i18nText('Dec-Dcm_Connection_Form_Principal') : BI.i18nText('Dec-Dcm_Connection_Form_UserName'),
type: BI.VerticalLayout.xtype, value: authType ? principal : user,
tgap: -15, },
vgap, {
invisible: true, type: FormItem.xtype,
ref: (_ref: VerticalLayout) => { name: authType ? BI.i18nText('Dec-Dcm_Connection_Form_KeyPath') : BI.i18nText('Dec-Dcm_Connection_Form_Password'),
this.advancedSet = _ref; value: '******',
}, },
items: [ {
{ type: FormItem.xtype,
type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_OriginalCharsetName'),
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Initial_Size'), value: originalCharsetName ? originalCharsetName : BI.i18nText('Dec-Dcm_Connection_Form_Default'),
value: connectionPoolAttr.initialSize, },
}, // HDFS设置
{ {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Active'), invisible: BI.isNull(hdfs),
value: connectionPoolAttr.maxActive, name: BI.i18nText('Dec-Dcm_Connection_Address', 'HDFS'),
}, value: hdfs?.hdfsAddress,
{ },
type: FormItem.xtype, // 并行装载设置
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Idle'), {
value: connectionPoolAttr.maxIdle, type: Collapse.xtype,
}, invisible: BI.isNull(parallelLoad),
{ name: BI.i18nText('Dec-Dcm_Connection_Setting', BI.i18nText('Dec-Dcm_Connection_Parallel_Load')),
type: FormItem.xtype, listeners: [
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Min_Idle'), {
value: connectionPoolAttr.minIdle, eventName: EVENT_CHANGE,
}, action: (isCollapse: boolean) => {
{ this.parallelLoadSet.setVisible(!isCollapse);
type: FormItem.xtype, },
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Wait'), },
value: connectionPoolAttr.maxWait, ],
unit: BI.i18nText('Dec-Dcm_Millisecond'), },
}, {
{ type: BI.VerticalLayout.xtype,
type: FormItem.xtype, invisible: true,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Validation_Query'), ref: (_ref: VerticalLayout) => {
value: api.getPlain(connectionPoolAttr.validationQuery || ''), this.parallelLoadSet = _ref;
}, },
{ items: [
type: FormItem.xtype, {
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_On_Borrow'), type: FormItem.xtype,
value: connectionPoolAttr.testOnBorrow ? BI.i18nText('Dec-Dcm_Yes') : BI.i18nText('Dec-Dcm_No'), _bgap: vgap,
}, name: `${BI.i18nText('Dec-Dcm_Connection_Server_Address')}-${BI.i18nText('Dec-Memory_Detection_Server_Cluster_Node', '1')}`,
{ value: parallelLoad?.serverAddress,
type: FormItem.xtype, },
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_On_Return'), {
value: connectionPoolAttr.testOnReturn ? BI.i18nText('Dec-Dcm_Yes') : BI.i18nText('Dec-Dcm_No'), type: FormItem.xtype,
}, _bgap: vgap,
{ name: BI.i18nText('Dec-Dcm_Connection_Reuse_Temporary_Table'),
type: FormItem.xtype, value: parallelLoad?.reuseTemporaryTable,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_While_Idle'), },
value: connectionPoolAttr.testWhileIdle ? BI.i18nText('Dec-Dcm_Yes') : BI.i18nText('Dec-Dcm_No'), {
}, type: FormItem.xtype,
{ _bgap: vgap,
type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Temporary_File_Pieces_Limit'),
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_Between_Eviction_Millis'), value: parallelLoad?.filePiecesLimit,
value: connectionPoolAttr.timeBetweenEvictionRunsMillis, },
unit: BI.i18nText('Dec-Dcm_Millisecond'), {
}, type: FormItem.xtype,
{ name: BI.i18nText('Dec-Dcm_Connection_Temporary_File_Size_Limit'),
type: FormItem.xtype, value: parallelLoad?.fileSizeLimit,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Tests_PerEviction_Run_Num'), },
value: connectionPoolAttr.numTestsPerEvictionRun, ],
}, },
{ {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Min_Evictable_Idle_Time_Millis'), name: BI.i18nText('Dec-Dcm_Connection_Form_Pattern'),
value: connectionPoolAttr.minEvictableIdleTimeMillis, value: schema,
unit: BI.i18nText('BI-Basic_Seconds'), invisible: !databaseType.hasSchema,
}, { },
type: FormItem.xtype, {
invisible: fetchSize < 0 && fetchSize !== -2, type: FormItem.xtype,
name: 'Fetchsize', name: BI.i18nText('Dec-Dcm_Connection_Form_Database_URL'),
value: fetchSize === -2 ? '' : fetchSize, value: url,
}, },
], {
}, type: FormItem.xtype,
], name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Active'),
}; value: connectionPoolAttr.maxActive,
} },
} {
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_On_Borrow'),
value: connectionPoolAttr.testOnBorrow ? BI.i18nText('Dec-Dcm_Yes') : BI.i18nText('Dec-Dcm_No'),
},
{
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Regular_Check_On_Borrow'),
value: connectionPoolAttr.keepAlive ? BI.i18nText('Dec-Dcm_Yes') : BI.i18nText('Dec-Dcm_No'),
},
{
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_SQL_Validation_Query'),
value: api.getPlain(connectionPoolAttr.validationQuery || ''),
},
{
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Wait'),
value: connectionPoolAttr.maxWait,
unit: BI.i18nText('Dec-Dcm_Millisecond'),
},
// ssh设置
{
type: Collapse.xtype,
width: 100,
invisible: !usingSsh,
name: BI.i18nText('Dec-Dcm_Connection_Setting', 'SSH'),
listeners: [
{
eventName: EVENT_CHANGE,
action: (isCollapse: boolean) => {
this.sshSet.setVisible(!isCollapse);
},
},
],
},
{
el: {
type: BI.VerticalLayout.xtype,
bgap: vgap,
invisible: true,
ref: (_ref: VerticalLayout) => {
this.sshSet = _ref;
},
items: [
{
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_Host'),
value: sshIp,
},
{
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Port'),
value: sshPort,
},
{
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_UserName'),
value: sshUser,
},
{
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_VerifyType'),
value: CONNECT_SSH_TYPE.find((SSH_TYPE) => sshType === SSH_TYPE.value).text,
},
{
type: FormItem.xtype,
invisible: sshType !== 'KEY',
name: BI.i18nText('Dec-Dcm_Connection_Form_PrivateKey'),
value: sshPrivateKeyPath,
},
{
type: FormItem.xtype,
name: CONNECT_SSH_TYPE.find((SSH_TYPE) => sshType === SSH_TYPE.value).secretFormName,
value: sshSecret,
},
],
},
},
// ssl设置
{
type: Collapse.xtype,
width: 100,
invisible: !usingSsl,
name: BI.i18nText('Dec-Dcm_Connection_Setting', 'SSL'),
listeners: [
{
eventName: EVENT_CHANGE,
action: (isCollapse: boolean) => {
this.sslSet.setVisible(!isCollapse);
},
},
],
},
{
el: {
type: BI.VerticalLayout.xtype,
bgap: vgap,
invisible: true,
ref: (_ref: VerticalLayout) => {
this.sslSet = _ref;
},
items: [
{
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_CA_Certificate'),
value: caCertificate,
},
{
type: FormItem.xtype,
invisible: !caCertificate,
name: BI.i18nText('Dec-Dcm_Connection_Form_Verify_CA_Certificate'),
value: verifyCa ? BI.i18nText('Dec-Dcm_Yes') : BI.i18nText('Dec-Dcm_No'),
},
{
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Client') + BI.i18nText('Dec-Dcm_Connection_Form_SecretKey'),
value: sslClientPrivateKey,
},
{
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Client') + BI.i18nText('Dec-Dcm_Connection_Form_Certificate'),
value: sslClientCertificate,
},
],
},
},
// 更多设置
{
type: Collapse.xtype,
width: 100,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_More_Setting'),
listeners: [
{
eventName: EVENT_CHANGE,
action: (isCollapse: boolean) => {
this.advancedSet.setVisible(!isCollapse);
},
},
],
},
{
el: {
type: BI.VerticalLayout.xtype,
bgap: vgap,
invisible: true,
ref: (_ref: VerticalLayout) => {
this.advancedSet = _ref;
},
items: [
{
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Initial_Size'),
value: connectionPoolAttr.initialSize,
},
{
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Min_Idle'),
value: connectionPoolAttr.minIdle,
},
{
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_On_Return'),
value: connectionPoolAttr.testOnReturn ? BI.i18nText('Dec-Dcm_Yes') : BI.i18nText('Dec-Dcm_No'),
},
{
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_While_Idle'),
value: connectionPoolAttr.testWhileIdle ? BI.i18nText('Dec-Dcm_Yes') : BI.i18nText('Dec-Dcm_No'),
},
{
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_Between_Eviction_Millis'),
value: connectionPoolAttr.timeBetweenEvictionRunsMillis,
unit: BI.i18nText('Dec-Dcm_Millisecond'),
},
{
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Tests_PerEviction_Run_Num'),
value: connectionPoolAttr.numTestsPerEvictionRun,
},
{
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Min_Evictable_Idle_Time_Millis'),
value: connectionPoolAttr.minEvictableIdleTimeMillis,
unit: BI.i18nText('BI-Basic_Seconds'),
},
{
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Evictable_Idle_Time_Millis'),
value: connectionPoolAttr.maxEvictableIdleTimeMillis,
unit: BI.i18nText('BI-Basic_Seconds'),
},
{
type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Regular_Check_On_Borrow_Threshold'),
value: connectionPoolAttr.keepAliveBetweenTimeMillis,
unit: BI.i18nText('Dec-Dcm_Millisecond'),
},
{
type: FormItem.xtype,
name: 'Fetchsize',
value: fetchSize,
},
],
},
},
],
};
}
}

1
src/modules/pages/connection/list/list.constant.ts
Unescape View File

@ -0,0 +1 @@
BI.constant('dec.constant.connection.list', []);

34
src/modules/pages/connection/list/list.model.ts
Unescape View File

@ -1,10 +1,11 @@
import { model, Model } from '@core/core'; import { model, Model } from '@core/core';
import { ApiFactory } from '../../..//crud/apiFactory'; import { ApiFactory } from '../../..//crud/apiFactory';
import { AppModel } from '../../../app.model'; import { AppModel } from '../../../app.model';
import type { ConnectionJDBC } from '../../../crud/crud.typings';
const api = new ApiFactory().create(); const api = new ApiFactory().create();
@model() @model()
export class ConnectionListModel extends Model<{ export class ConnectionListModel extends Model<{
types : { types: {
connections: AppModel['TYPE']['connections']; connections: AppModel['TYPE']['connections'];
connectionSelected: AppModel['TYPE']['connectionSelected']; connectionSelected: AppModel['TYPE']['connectionSelected'];
}, },
@ -19,21 +20,40 @@ export class ConnectionListModel extends Model<{
} }
actions = { actions = {
setConnections: ():Promise<void> => api.getConnectionList().then(data => { setConnections: (): Promise<void> => api.getConnectionList().then(data => {
data.data.push(...BI.Constants.getConstant('dec.constant.connection.list'));
if (BI.size(data.data) > 0) { if (BI.size(data.data) > 0) {
this.model.connections = data.data; this.model.connections = data.data;
let defaultDatabaseName,
defaultDatabaseId = BI.Services.getService("dec.service.global")
.getHashSearchParams("databaseId");
this.model.connections.forEach(item => { this.model.connections.forEach(item => {
// 后端传过来的是字符串，转为对象 // REPORT-111534 有些环境存在脏数据，补下容错
item.connectionData = JSON.parse(item.connectionData as string); if (BI.isNull(item.connectionData)) return;
// 后端传过来的是字符串，转为对象
BI.isString(item.connectionData) && (item.connectionData = JSON.parse(item.connectionData as string));
// 目前只有jdbc存在identity，后期拓展
if ((item.connectionData as ConnectionJDBC).identity === defaultDatabaseId) {
defaultDatabaseName = item.connectionName;
}
}); });
this.model.connectionSelected = data.data[0].connectionName;
} else { // 仅首次进入时从url中读取参数，其他情况保留选中状态
this.model.connectionSelected = ''; defaultDatabaseName ||= data.data[0].connectionName;
this.setSelectedConnection(defaultDatabaseName);
} }
return new Promise(resolve => { return new Promise(resolve => {
resolve(); resolve();
}); });
}), }),
setSelectedConnection(name: string) {
this.model.connectionSelected = name;
}
} }
} }

2
src/modules/pages/connection/list/list.ts
Unescape View File

@ -3,6 +3,7 @@ import { ListItem } from './list_item/list_item';
import { ConnectionListModel } from './list.model'; import { ConnectionListModel } from './list.model';
import { getDatabaseType } from './list.service'; import { getDatabaseType } from './list.service';
import { Tab } from '@fui/core'; import { Tab } from '@fui/core';
import './list.constant'
@shortcut() @shortcut()
@store(ConnectionListModel) @store(ConnectionListModel)
@ -91,6 +92,7 @@ export class ConnectionList extends BI.Pane {
creator: item.creator, creator: item.creator,
databaseType: getDatabaseType(item), databaseType: getDatabaseType(item),
selected: this.model.connectionSelected ? this.model.connectionSelected === item.connectionName : index === 0, selected: this.model.connectionSelected ? this.model.connectionSelected === item.connectionName : index === 0,
pluginConnection: item.pluginConnection,
}; };
}); });
} }

3
src/modules/pages/connection/list/list_item/list_item.model.ts
Unescape View File

@ -139,8 +139,9 @@ export class ListItemModel extends Model<{
// 后端传过来的是字符串，转为对象 // 后端传过来的是字符串，转为对象
item.connectionData = JSON.parse(item.connectionData as string); item.connectionData = JSON.parse(item.connectionData as string);
}); });
if (name === this.model.connectionSelected) { if (name === this.model.connectionSelected) {
this.model.connectionSelected = BI.size(this.model.connections) > 0 ? this.model.connections[0].connectionName : ''; this.setConnectionSelected(this.model.connections?.[0]?.connectionName || '');
} }
api.shutdownConnectionStatus(name); api.shutdownConnectionStatus(name);
}); });

33
src/modules/pages/connection/list/list_item/list_item.ts
Unescape View File

@ -6,6 +6,10 @@ import { hasRegistered } from '../list.service';
import { connectionCanEdit, getTextByDatabaseType, getChartLength } from '../../../../app.service'; import { connectionCanEdit, getTextByDatabaseType, getChartLength } from '../../../../app.service';
import { testConnection } from '../../../maintain/forms/form.server'; import { testConnection } from '../../../maintain/forms/form.server';
import { DownListCombo, Label, SignEditor } from '@fui/core'; import { DownListCombo, Label, SignEditor } from '@fui/core';
import { ApiFactory } from '../../../../crud/apiFactory';
import { checkIllegalStrings } from "@core/index";
const api = new ApiFactory().create();
@shortcut() @shortcut()
@store(ListItemModel) @store(ListItemModel)
@ -16,6 +20,7 @@ export class ListItem extends BI.BasicButton {
name: '', name: '',
creator: '', creator: '',
databaseType: '', databaseType: '',
pluginConnection: false,
height: 25, height: 25,
baseCls: 'dec-dcm-connection-list-item bi-list-item-active2', baseCls: 'dec-dcm-connection-list-item bi-list-item-active2',
$testId: 'dec-dcm-connection-list-item', $testId: 'dec-dcm-connection-list-item',
@ -39,7 +44,7 @@ export class ListItem extends BI.BasicButton {
}; };
render() { render() {
const { name, databaseType } = this.options; const { name, databaseType, pluginConnection } = this.options;
return { return {
type: BI.HTapeLayout.xtype, type: BI.HTapeLayout.xtype,
@ -86,6 +91,17 @@ export class ListItem extends BI.BasicButton {
return; return;
} }
const result = checkIllegalStrings(newName);
if (!result.legal) {
BI.Msg.toast(result.errorMsg, {
level: 'error',
});
this.store.setIsEdit(false, name);
this.nameLabel.setText(name);
this.nameEditor.setValue(name);
return;
}
this.store.changeName(name, newName).then(re => { this.store.changeName(name, newName).then(re => {
this.store.setIsEdit(false, name); this.store.setIsEdit(false, name);
if (re.errorCode) { if (re.errorCode) {
@ -103,7 +119,7 @@ export class ListItem extends BI.BasicButton {
}, },
], ],
}, { }, {
el: databaseType ? { el: databaseType && !pluginConnection ? {
type: BI.DownListCombo.xtype, type: BI.DownListCombo.xtype,
cls: 'link-item-icon', cls: 'link-item-icon',
stopPropagation: true, stopPropagation: true,
@ -206,8 +222,17 @@ export class ListItem extends BI.BasicButton {
} }
private testConnectionAction() { private testConnectionAction() {
const { name } = this.options; // 接口返回的内容是对称加密的，前端要先解密再用新加密传回去
testConnection(this.model.connections.find(item => item.connectionName === name)); const connection = BI.cloneDeep(this.model.connections
.find(item => item.connectionName === this.options.name));
if (BI.isNull(connection)) return;
const validationQuery = connection?.connectionData?.connectionPoolAttr?.validationQuery || '';
BI.set(connection, 'connectionData.connectionPoolAttr.validationQuery', api.getCipher(api.getPlain(validationQuery)));
testConnection(connection);
} }
private itemActionCalculate() { private itemActionCalculate() {

17
src/modules/pages/database/database.constant.ts
Unescape View File

@ -0,0 +1,17 @@
import { DATEBASE_FILTER_TYPE } from "@constants/constant";
BI.constant('dec.constant.database.filter.type', [
{
text: BI.i18nText('Dec-Dcm_Connection_Commonly'),
value: DATEBASE_FILTER_TYPE.COMMONLY,
selected: true,
},
{
text: BI.i18nText('Dec-Dcm_Connection_All'),
value: DATEBASE_FILTER_TYPE.ALL,
},
{
text: BI.i18nText('Dec-Dcm_Connection_Other'),
value: DATEBASE_FILTER_TYPE.OTHER,
},
]);

23
src/modules/pages/database/database.model.ts
Unescape View File

@ -2,10 +2,12 @@ import { model, Model } from '@core/core';
import { AppModel } from 'src/modules/app.model'; import { AppModel } from 'src/modules/app.model';
import { getAllDatabaseTypes } from '../../app.service'; import { getAllDatabaseTypes } from '../../app.service';
import { DatabaseType } from '../../app.typings'; import { DatabaseType } from '../../app.typings';
import { connectionType } from '@constants/env';
import { OTHER_JDBC } from '@constants/constant';
@model() @model()
export class DatebaseModel extends Model<{ export class DatebaseModel extends Model<{
types : { types: {
filter: AppModel['TYPE']['filter']; filter: AppModel['TYPE']['filter'];
datebaseTypeSelected: AppModel['TYPE']['datebaseTypeSelected']; datebaseTypeSelected: AppModel['TYPE']['datebaseTypeSelected'];
}, },
@ -20,20 +22,30 @@ export class DatebaseModel extends Model<{
isInternal: true, isInternal: true,
isPlugin: true, isPlugin: true,
datebaseTypes: getAllDatabaseTypes().filter(item => item.commonly), datebaseTypes: getAllDatabaseTypes().filter(item => item.commonly),
isJNDILimit: false,
}; };
} }
computed = {
otherDatabases: () => {
return this.model.isJNDILimit
? [OTHER_JDBC]
: [OTHER_JDBC, connectionType.JNDI];
}
}
actions = { actions = {
setSearch:(search: string) => { setSearch: (search: string) => {
this.model.search = search; this.model.search = search;
}, },
setFilter:(filter: string) => { setFilter: (filter: string) => {
this.model.filter = filter; this.model.filter = filter;
}, },
setDatebaseTypes: (datebaseTypes: DatabaseType[]) => { setDatebaseTypes: (datebaseTypes: DatabaseType[]) => {
this.model.datebaseTypes = datebaseTypes; this.model.datebaseTypes = datebaseTypes;
this.model.datebaseTypeSelected = ''; this.model.datebaseTypeSelected = '';
}, },
setInternal:(isInternal: boolean) => { setInternal: (isInternal: boolean) => {
this.model.isInternal = isInternal; this.model.isInternal = isInternal;
}, },
setPlugin: (isPlugin: boolean) => { setPlugin: (isPlugin: boolean) => {
@ -42,5 +54,8 @@ export class DatebaseModel extends Model<{
setDatebaseTypeSelected(datebaseType: string) { setDatebaseTypeSelected(datebaseType: string) {
this.model.datebaseTypeSelected = datebaseType; this.model.datebaseTypeSelected = datebaseType;
}, },
setJNDILimit: (v: boolean) => {
this.model.isJNDILimit = v;
},
} }
} }

46
src/modules/pages/database/database.ts
Unescape View File

@ -6,6 +6,11 @@ import { connectionType } from '@constants/env';
import { DatebaseType } from './database_type/database_type'; import { DatebaseType } from './database_type/database_type';
import { getAllDatabaseTypes } from '../../app.service'; import { getAllDatabaseTypes } from '../../app.service';
import { ButtonGroup, MultiSelectItem, SearchEditor } from '@fui/core'; import { ButtonGroup, MultiSelectItem, SearchEditor } from '@fui/core';
import { ApiFactory } from 'src/modules/crud/apiFactory';
import './database.constant'
const api = new ApiFactory().create();
@shortcut() @shortcut()
@store(DatebaseModel) @store(DatebaseModel)
export class Datebase extends BI.Widget { export class Datebase extends BI.Widget {
@ -65,6 +70,7 @@ export class Datebase extends BI.Widget {
mounted() { mounted() {
this.store.setFilter(DATEBASE_FILTER_TYPE.COMMONLY); this.store.setFilter(DATEBASE_FILTER_TYPE.COMMONLY);
this.store.setDatebaseTypeSelected(''); this.store.setDatebaseTypeSelected('');
this.getDatabaseTypeLimit();
} }
render() { render() {
@ -116,24 +122,12 @@ export class Datebase extends BI.Widget {
ref: (_ref: ButtonGroup) => { ref: (_ref: ButtonGroup) => {
this.filter = _ref; this.filter = _ref;
}, },
items: [ items: () => BI.map(BI.Constants.getConstant('dec.constant.database.filter.type'), (_, value) => {
{ return {
type: Filter.xtype, type: Filter.xtype,
text: BI.i18nText('Dec-Dcm_Connection_Commonly'), ...value,
value: DATEBASE_FILTER_TYPE.COMMONLY, }
selected: true, }),
},
{
type: Filter.xtype,
text: BI.i18nText('Dec-Dcm_Connection_All'),
value: DATEBASE_FILTER_TYPE.ALL,
},
{
type: Filter.xtype,
text: BI.i18nText('Dec-Dcm_Connection_Other'),
value: DATEBASE_FILTER_TYPE.OTHER,
},
],
}, },
width: 200, width: 200,
}, },
@ -142,20 +136,18 @@ export class Datebase extends BI.Widget {
items: [ items: [
{ {
el: { el: {
type: BI.HTapeLayout.xtype, type: BI.VerticalAdaptLayout.xtype,
hgap: 20, hgap: 20,
invisible: true, invisible: true,
items: [ items: [
{ {
type: BI.Label.xtype, type: BI.Label.xtype,
width: 70,
textAlign: 'left', textAlign: 'left',
text: BI.i18nText('Dec-Dcm_Connection_Type_Filter'), text: BI.i18nText('Dec-Dcm_Connection_Type_Filter'),
title: BI.i18nText('Dec-Dcm_Connection_Type_Filter'), title: BI.i18nText('Dec-Dcm_Connection_Type_Filter'),
}, },
{ {
type: BI.MultiSelectItem.xtype, type: BI.MultiSelectItem.xtype,
width: 80,
selected: this.model.isInternal, selected: this.model.isInternal,
text: BI.i18nText('Dec-Dcm_Connection_Support_Inner'), text: BI.i18nText('Dec-Dcm_Connection_Support_Inner'),
title: BI.i18nText('Dec-Dcm_Connection_Support_Inner'), title: BI.i18nText('Dec-Dcm_Connection_Support_Inner'),
@ -168,7 +160,6 @@ export class Datebase extends BI.Widget {
}, },
{ {
type: BI.MultiSelectItem.xtype, type: BI.MultiSelectItem.xtype,
width: 80,
selected: this.model.isPlugin, selected: this.model.isPlugin,
text: BI.i18nText('Dec-Dcm_Connection_Support_Plugin'), text: BI.i18nText('Dec-Dcm_Connection_Support_Plugin'),
title: BI.i18nText('Dec-Dcm_Connection_Support_Plugin'), title: BI.i18nText('Dec-Dcm_Connection_Support_Plugin'),
@ -250,11 +241,20 @@ export class Datebase extends BI.Widget {
this.store.setDatebaseTypes(this.allDatabaseTypes.filter(item => item.commonly)); this.store.setDatebaseTypes(this.allDatabaseTypes.filter(item => item.commonly));
break; break;
case DATEBASE_FILTER_TYPE.OTHER: case DATEBASE_FILTER_TYPE.OTHER:
this.store.setDatebaseTypes(this.allDatabaseTypes.filter(item => item.type === connectionType.JNDI || item.type === OTHER_JDBC)); this.store.setDatebaseTypes(this.allDatabaseTypes.filter(item => this.model.otherDatabases.includes(item.type)));
break; break;
default: case DATEBASE_FILTER_TYPE.ALL:
this.store.setDatebaseTypes(this.allDatabaseTypes.filter(item => item.type !== connectionType.JNDI && item.type !== OTHER_JDBC)); this.store.setDatebaseTypes(this.allDatabaseTypes.filter(item => item.type !== connectionType.JNDI && item.type !== OTHER_JDBC));
break; break;
default:
this.store.setDatebaseTypes(this.allDatabaseTypes.filter(item => item.marker && (item.marker === filter)));
break;
} }
} }
// 获取JNDI
private async getDatabaseTypeLimit() {
const result = await api.getJNDIDatabaseStatus();
this.store.setJNDILimit(result.data);
}
} }

7
src/modules/pages/database/database_type/database_type.model.ts
Unescape View File

@ -6,11 +6,13 @@ export class DatebaseTypeModel extends Model<
types: { types: {
datebaseTypeSelected: AppModel['TYPE']['datebaseTypeSelected']; datebaseTypeSelected: AppModel['TYPE']['datebaseTypeSelected'];
pageIndex: AppModel['TYPE']['pageIndex']; pageIndex: AppModel['TYPE']['pageIndex'];
noTestConnection: AppModel['TYPE']['noTestConnection'];
datebaseTypeSelectedOne: AppModel['TYPE']['datebaseTypeSelectedOne'];
}, },
context: DatebaseTypeModel['context']; context: DatebaseTypeModel['context'];
}> { }> {
static xtype = 'dec.dcm.model.datebase.type'; static xtype = 'dec.dcm.model.datebase.type';
context = <const>['datebaseTypeSelected', 'pageIndex']; context = <const>['datebaseTypeSelected', 'pageIndex', 'noTestConnection', 'datebaseTypeSelectedOne'];
actions = { actions = {
setDatebaseTypeSelected: (datebaseTypeSelected: string) => { setDatebaseTypeSelected: (datebaseTypeSelected: string) => {
@ -19,5 +21,8 @@ export class DatebaseTypeModel extends Model<
setPageIndex: (index: string) => { setPageIndex: (index: string) => {
this.model.pageIndex = index; this.model.pageIndex = index;
}, },
setNoTestConnection: (value: boolean) => {
this.model.noTestConnection = value;
}
} }
} }

4
src/modules/pages/database/database_type/database_type.ts
Unescape View File

@ -70,6 +70,7 @@ export class DatebaseType extends BI.BasicButton {
const { value } = this.options; const { value } = this.options;
this.store.setDatebaseTypeSelected(value); this.store.setDatebaseTypeSelected(value);
this.store.setPageIndex(PAGE_INDEX.MAINTAIN); this.store.setPageIndex(PAGE_INDEX.MAINTAIN);
this.store.setNoTestConnection(this.model.datebaseTypeSelectedOne.isHideConnection);
} }
mounted() { mounted() {
@ -88,6 +89,9 @@ export class DatebaseType extends BI.BasicButton {
if (url.startsWith('/')) { if (url.startsWith('/')) {
return `${PluginImgPrefix}${url}`; return `${PluginImgPrefix}${url}`;
} }
if (url.startsWith('http')) {
return url;
}
return `${PluginImgPrefix}/${url}`; return `${PluginImgPrefix}/${url}`;
} }

17
src/modules/pages/maintain/components/driverselector/driverselector.model.ts
Unescape View File

@ -67,7 +67,8 @@ export class DriverSelectorModel extends Model {
this.model.customDriver.driver = driver; this.model.customDriver.driver = driver;
this.model.customDrivers.some(customDriver => { this.model.customDrivers.some(customDriver => {
if (customDriver.driverClass === driver) { // DEC-21469 存在driver值相同但driver名不同的场景,因此要用拼接名判断
if (`${customDriver.driverClass} (${customDriver.name})` === value) {
this.model.driverSource = customDriver.name; this.model.driverSource = customDriver.name;
this.model.customDriver.value = `${driver} (${customDriver.name})`; this.model.customDriver.value = `${driver} (${customDriver.name})`;
@ -86,6 +87,12 @@ export class DriverSelectorModel extends Model {
changeDriverSource: driverTypeComboValue => { changeDriverSource: driverTypeComboValue => {
this.model.driverSource = driverTypeComboValue === 'default' ? '' : this.model.driverSource; this.model.driverSource = driverTypeComboValue === 'default' ? '' : this.model.driverSource;
}, },
setDefaultDrivers: version => {
const defaultDrivers = this.getDrivers(version);
this.model.defaultDrivers = defaultDrivers;
this.changeDefaultDriver(defaultDrivers[0]?.value);
}
}; };
private resolveSelectedDriverType = () => { private resolveSelectedDriverType = () => {
@ -96,11 +103,12 @@ export class DriverSelectorModel extends Model {
return [this.options.driverSource, this.options.driver]; return [this.options.driverSource, this.options.driver];
}; };
private getDrivers = () => { private getDrivers = (version?: string) => {
const connectionData = this.options.connectionData as ConnectionJDBC; const connectionData = this.options.connectionData as ConnectionJDBC;
const connectionType = getJdbcDatabaseType(connectionData.database, connectionData.driver); const connectionType = getJdbcDatabaseType(connectionData.database, connectionData.driver);
const selectedVersion = version ?? this.options.version;
const drivers = connectionType.drivers ? const drivers = connectionType.drivers ?
connectionType.drivers.map(item => { (BI.isUndefined(connectionType.versions) ? connectionType.drivers : connectionType.drivers[selectedVersion]).map(item => {
return { return {
text: item, text: item,
value: item, value: item,
@ -110,8 +118,7 @@ export class DriverSelectorModel extends Model {
text: connectionType.driver, text: connectionType.driver,
value: connectionType.driver, value: connectionType.driver,
}]; }];
if (BI.isUndefined(connectionType.versions) && !drivers.some(item => item.text === connectionData.driver)) {
if (!drivers.some(item => item.text === connectionData.driver)) {
return [ return [
{ {
text: connectionData.driver, text: connectionData.driver,

32
src/modules/pages/maintain/components/driverselector/driverselector.ts
Unescape View File

@ -24,21 +24,32 @@ export class DriverSelector extends BI.Widget {
driver: '', driver: '',
driverSource: '', driverSource: '',
connectionData: {} as ConnectionJDBC, connectionData: {} as ConnectionJDBC,
version: '',
}; };
defaultDrivers: EditorIconCheckCombo = null; defaultDrivers: EditorIconCheckCombo = null;
customDrivers: SearchTextValueCombo = null; customDrivers: SearchTextValueCombo = null;
beforeRender(cb: Function) {
this.store.initDriverClassList(cb);
}
watch = { watch = {
driverClassItems: items => { driverClassItems: items => {
// this.customDrivers.populate(items); this.customDrivers.populate(items);
// this.customDrivers.setValue(this.model.customDriver.value); this.customDrivers.setValue(this.model.customDriver.value);
}, },
driverManageEntryVisible: b => { driverManageEntryVisible: b => {
this.driverManageEntry.setVisible(false); this.driverManageEntry.setVisible(b);
}, },
defaultDrivers: items => {
this.defaultDrivers.populate(items);
this.defaultDrivers.setValue(this.model.defaultDriver.driver);
this.fireEvent('EVENT_CHANGE');
}
}; };
private driverManageEntry = null; private driverManageEntry = null;
@ -55,7 +66,6 @@ export class DriverSelector extends BI.Widget {
type: BI.TextValueCombo.xtype, type: BI.TextValueCombo.xtype,
width: 86, width: 86,
value: this.model.selectedDriverType, value: this.model.selectedDriverType,
invisible: true,
items: [ items: [
{ {
text: BI.i18nText('Dec-Basic_Default'), text: BI.i18nText('Dec-Basic_Default'),
@ -95,7 +105,7 @@ export class DriverSelector extends BI.Widget {
this.defaultDrivers = _ref; this.defaultDrivers = _ref;
}, },
invisible: this.model.driverSource !== '', invisible: this.model.driverSource !== '',
width: 300, width: 204,
items: this.model.defaultDrivers, items: this.model.defaultDrivers,
value: this.model.defaultDriver.driver, value: this.model.defaultDriver.driver,
listeners: [ listeners: [
@ -116,13 +126,13 @@ export class DriverSelector extends BI.Widget {
ref: _ref => { ref: _ref => {
this.customDrivers = _ref; this.customDrivers = _ref;
}, },
invisible: true, invisible: this.model.driverSource === '',
width: 204, width: 204,
watermark: BI.i18nText('Dec-Please_Input'), watermark: BI.i18nText('Dec-Please_Input'),
items: this.model.driverClassItems, items: this.model.driverClassItems,
value: this.model.customDriver.value, value: this.model.customDriver.value,
text: () => this.model.customDriver.value || '', text: () => this.model.customDriver.value || '',
defaultText: BI.i18nText('Dec-Please_Select'), defaultText: BI.i18nText('Dec-Please_Select_One'),
warningTitle: BI.i18nText('Dec-Dcm-Driver_Driver_File_Lost'), warningTitle: BI.i18nText('Dec-Dcm-Driver_Driver_File_Lost'),
listeners: [ listeners: [
{ {
@ -146,7 +156,7 @@ export class DriverSelector extends BI.Widget {
text: BI.i18nText('Dec-Dcm_Create_New_Driver'), text: BI.i18nText('Dec-Dcm_Create_New_Driver'),
}, },
from: '.dec-dcm', from: '.dec-dcm',
invisible: true, invisible: !this.model.driverManageEntryVisible,
listeners: [ listeners: [
{ {
eventName: 'EVENT_CLOSE', eventName: 'EVENT_CLOSE',
@ -175,8 +185,12 @@ export class DriverSelector extends BI.Widget {
getValue() { getValue() {
return { return {
// driverSource: this.model.driverSource, driverSource: this.model.driverSource,
driver: this.model.driverSource === '' ? this.model.defaultDriver.driver : this.model.customDriver.driver, driver: this.model.driverSource === '' ? this.model.defaultDriver.driver : this.model.customDriver.driver,
}; };
} }
setDefaultDrivers(version: string) {
this.store.setDefaultDrivers(version);
}
} }

18
src/modules/pages/maintain/components/form_item/form_item.ts
Unescape View File

@ -1,4 +1,5 @@
import { shortcut } from '@core/core'; import { shortcut } from '@core/core';
import { Label } from '@fui/core';
import { CONNECTION_LAYOUT } from '@constants/constant'; import { CONNECTION_LAYOUT } from '@constants/constant';
@shortcut() @shortcut()
@ -11,14 +12,19 @@ export class FormItem extends BI.Widget {
nameWidth: 140, nameWidth: 140,
isBold: true, isBold: true,
$testId: 'dec-dcm-maintain-form-item', $testId: 'dec-dcm-maintain-form-item',
} };
nameLabel: Label;
render () { render() {
return { return {
type: BI.FloatLeftLayout.xtype, type: BI.FloatLeftLayout.xtype,
items: [ items: [
{ {
type: BI.Label.xtype, type: BI.Label.xtype,
ref: (ref: Label) => {
this.nameLabel = ref;
},
cls: this.options.isBold ? 'bi-font-bold' : '', cls: this.options.isBold ? 'bi-font-bold' : '',
width: this.options.nameWidth, width: this.options.nameWidth,
textAlign: 'left', textAlign: 'left',
@ -29,4 +35,12 @@ export class FormItem extends BI.Widget {
], ],
}; };
} }
/**
* 设置表单名称
* @param name
*/
setName(name: string) {
this.nameLabel.setText(name);
}
} }

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

File diff suppressed because it is too large Load Diff

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

@ -37,4 +37,8 @@ export class FormPlugin extends BI.Widget {
connectionData: <ConnectionPlugin>BI.extend({}, connectionData, this.plugin.getValue()), connectionData: <ConnectionPlugin>BI.extend({}, connectionData, this.plugin.getValue()),
}; };
} }
public getSaveFn() {
return this.plugin.save;
}
} }

5
src/modules/pages/maintain/forms/form.model.ts
Unescape View File

@ -17,6 +17,7 @@ export class MaintainFormModel extends Model<{
pageIndex: AppModel['TYPE']['pageIndex']; pageIndex: AppModel['TYPE']['pageIndex'];
connections: AppModel['TYPE']['connections']; connections: AppModel['TYPE']['connections'];
isCopy: AppModel['TYPE']['isCopy']; isCopy: AppModel['TYPE']['isCopy'];
connectionSelected: AppModel['TYPE']['connectionSelected'];
}, },
context: MaintainFormModel['context']; context: MaintainFormModel['context'];
}> { }> {
@ -31,6 +32,7 @@ export class MaintainFormModel extends Model<{
'testEvent', 'testEvent',
'connections', 'connections',
'isCopy', 'isCopy',
'connectionSelected',
]; ];
actions = { actions = {
@ -51,5 +53,8 @@ export class MaintainFormModel extends Model<{
goFirstPage() { goFirstPage() {
this.model.pageIndex = PAGE_INDEX.CONNECTION; this.model.pageIndex = PAGE_INDEX.CONNECTION;
}, },
setConnectionSelected(name: string) {
this.model.connectionSelected = name;
}
} }
} }

60
src/modules/pages/maintain/forms/form.server.ts
Unescape View File

@ -5,6 +5,7 @@ import { TestStatus } from '../../../components/test_status/test_status';
import { getJdbcDatabaseType } from '../../../app.service'; import { getJdbcDatabaseType } from '../../../app.service';
import { ApiFactory } from '../../../crud/apiFactory'; import { ApiFactory } from '../../../crud/apiFactory';
const api = new ApiFactory().create(); const api = new ApiFactory().create();
export function testConnection(value: Connection): Promise<string[]> { export function testConnection(value: Connection): Promise<string[]> {
return new Promise(resolve => { return new Promise(resolve => {
let testStatus = null; let testStatus = null;
@ -15,12 +16,18 @@ export function testConnection(value: Connection): Promise<string[]> {
return false; return false;
} }
const id = BI.UUID(); const id = BI.UUID();
const testConnection = () => { const testConnection = () => {
const formValue = value; const formValue = value;
api.testConnection(formValue).then(re => { api.testConnection(formValue).then(re => {
if (re && re.errorCode) { if (re && re.errorCode) {
// 判断是否是缺少驱动，如果缺少驱动则显示下载驱动的连接 if (re.errorCode === DecCst.ErrorCode.NO_IP_AUTHORIZED) {
testStatus.setFail();
return;
}
// 判断是否是缺少驱动，如果缺少驱动则显示下载驱动的连接
if (api.isDriverError(re.errorCode)) { if (api.isDriverError(re.errorCode)) {
if (formValue.connectionType === connectionType.JDBC) { if (formValue.connectionType === connectionType.JDBC) {
const driver = (formValue.connectionData as ConnectionJDBC).driver; const driver = (formValue.connectionData as ConnectionJDBC).driver;
@ -40,7 +47,11 @@ export function testConnection(value: Connection): Promise<string[]> {
} else if (re.errorCode === errorCode.DUPLICATE_NAMES) { } else if (re.errorCode === errorCode.DUPLICATE_NAMES) {
testStatus.setFail(BI.i18nText(re.errorMsg)); testStatus.setFail(BI.i18nText(re.errorMsg));
} else { } else {
// 不缺少驱动，但连接失败，打印出当前驱动加载路径，并显示检测驱动按钮
testStatus.setFail(re.errorMsg); testStatus.setFail(re.errorMsg);
api.getDriverLoadPath(formValue).then(res => {
testStatus.setExtraContainer(createDriverTestContainer(res.data));
})
} }
} else if (re.data) { } else if (re.data) {
testStatus.setSuccess(); testStatus.setSuccess();
@ -55,7 +66,54 @@ export function testConnection(value: Connection): Promise<string[]> {
BI.Maskers.remove(id); BI.Maskers.remove(id);
} }
}); });
/**
* 驱动及冲突检测内容，补充到报错弹窗里
*/
function createDriverTestContainer(path: string) {
return {
type: BI.VerticalLayout.xtype,
vgap: 5,
items: [
{
type: BI.Label.xtype,
text: BI.i18nText('Dec-Connection_Driver_Current_Load_Path', path),
textAlign: 'left',
whiteSpace: 'normal',
},
{
type: BI.TextButton.xtype,
cls: 'bi-high-light',
text: BI.i18nText('Dec-Connection_Driver_Check'),
textAlign: 'left',
handler: () => {
api.checkDriverStatus({
driver: (formValue.connectionData as ConnectionJDBC).driver,
path,
}).then(res => {
const isDriverConflict = res.data;
testStatus.setExtraContainer({
type: BI.VerticalLayout.xtype,
items: [
{
type: BI.Label.xtype,
textAlign: 'left',
text: isDriverConflict
? BI.i18nText('Dec-Connection_Driver_Has_Confilt_Tip')
: BI.i18nText('Dec-Connection_Driver_No_Confilt_Tip'),
cls: isDriverConflict ? 'bi-error' : '',
}
]
})
});
}
}
]
}
}
}; };
BI.Maskers.create(id, null, { BI.Maskers.create(id, null, {
render: { render: {
type: TestStatus.xtype, type: TestStatus.xtype,

114
src/modules/pages/maintain/forms/form.ts
Unescape View File

@ -6,13 +6,15 @@ import { FormPlugin } from './components/form.plugin';
import { connectionType, errorCode } from '@constants/env'; import { connectionType, errorCode } from '@constants/env';
import { ConnectionJDBC, Connection, ResultType } from 'src/modules/crud/crud.typings'; import { ConnectionJDBC, Connection, ResultType } from 'src/modules/crud/crud.typings';
import { DEFAULT_JNDI_DATA, DEFAULT_JDBC_POOL, DATEBASE_FILTER_TYPE } from '@constants/constant'; import { DEFAULT_JNDI_DATA, DEFAULT_JDBC_POOL, DATEBASE_FILTER_TYPE } from '@constants/constant';
import { getJdbcDatabaseType, getChartLength } from '../../../app.service'; import { getJdbcDatabaseType, getChartLength, getAllDatabaseTypes } from '../../../app.service';
import { NAME_MAX_LENGTH } from '../../../app.constant'; import { NAME_MAX_LENGTH } from '../../../app.constant';
import { checkIllegalStrings } from "@core/index";
@shortcut() @shortcut()
@store(MaintainFormModel) @store(MaintainFormModel)
export class MaintainForm extends BI.Widget { export class MaintainForm extends BI.Widget {
static xtype = 'dec.dcm.maintain.form'; static xtype = 'dec.dcm.maintain.form';
static EVENT_TESTCONNECTION = 'EVENT_TEST_CONNECTION';
props = { props = {
connectionType: '', connectionType: '',
@ -28,29 +30,37 @@ export class MaintainForm extends BI.Widget {
watch = { watch = {
saveEvent: () => { saveEvent: () => {
if (!this.testValue()) { const sonSave = this.form.getSaveFn?.();
return; if (sonSave) {
} sonSave().then((success: boolean) => {
if (this.connectionName && !this.model.isCopy) { if (success) {
const value = this.form.getSubmitValue(); this.store.goFirstPage();
(value.connectionData as ConnectionJDBC).creator = BI.get(this.getFormData(), 'creator'); BI.Msg.toast(BI.i18nText("Dec-Basic_Save_Success"), {
// DEC-10155 为了适配插件的数据连接，在外层也加一个creator字段 level: "success",
value.creator = BI.get(this.getFormData(), 'creator'); });
this.store.updateConnection(this.connectionName, value).then(result => { } else {
if (result.errorCode) { BI.Msg.toast(BI.i18nText("Dec-Basic_Save_Fail"), {
this.showError(result); level: "error",
});
}
});
//只有外来插件才可以使用是否不执行平台的保存逻辑
if (this.model.datebaseTypeSelected) {
const isPluginDatabase = BI.some(BI.Providers.getProvider('dec.connection.provider.datebase').customDatabaseType, (_index, value) => value.databaseType === this.model.datebaseTypeSelected);
if (isPluginDatabase && this.model.datebaseTypeSelectedOne.isNoSave) {
return; return;
} }
this.store.goFirstPage(); } else {
}); const databaseType = this.model.connectionSelectedOne.connectionType;
} else { const database = BI.find(getAllDatabaseTypes(), (_index, value) => value.databaseType === databaseType);
const form = this.form.getSubmitValue(); if (this.model.connectionSelectedOne.pluginConnection && database?.isNoSave) {
form.connectionId = this.connectionName; return;
// DEC-10155 为了适配插件的数据连接，在外层也加一个creator字段 }
form.creator = Dec ? Dec.personal.username : ''; }
this.addConnection(form);
} }
this.save();
}, },
testEvent: () => { testEvent: () => {
this.testConnection(); this.testConnection();
@ -71,7 +81,7 @@ export class MaintainForm extends BI.Widget {
this.form = _ref; this.form = _ref;
}, },
listeners: [{ listeners: [{
eventName: 'EVENT_TEST_CONNECTION', eventName: MaintainForm.EVENT_TESTCONNECTION,
action: () => { action: () => {
this.testConnection(); this.testConnection();
}, },
@ -116,15 +126,16 @@ export class MaintainForm extends BI.Widget {
let editConnection: Connection; let editConnection: Connection;
let connectionData: ConnectionJDBC; let connectionData: ConnectionJDBC;
if (this.model.datebaseTypeSelected) { if (this.model.datebaseTypeSelected) {
const { databaseType: database, fetchSize } = this.model.datebaseTypeSelectedOne;
connectionData = { connectionData = {
driver: this.model.datebaseTypeSelectedOne.driver, ...this.model.datebaseTypeSelectedOne,
url: this.model.datebaseTypeSelectedOne.url, database,
database: this.model.datebaseTypeSelectedOne.databaseType,
connectionName, connectionName,
connectionPoolAttr: DEFAULT_JDBC_POOL, connectionPoolAttr: DEFAULT_JDBC_POOL,
port: '', port: '',
host: 'localhost', host: 'localhost',
fetchSize: this.model.datebaseTypeSelectedOne.fetchSize ?? -1, fetchSize: fetchSize ?? -1,
identity: BI.UUID(), identity: BI.UUID(),
}; };
editConnection = { editConnection = {
@ -139,9 +150,12 @@ export class MaintainForm extends BI.Widget {
this.isEdit = true; this.isEdit = true;
this.connectionName = this.model.connectionSelectedOne.connectionName; this.connectionName = this.model.connectionSelectedOne.connectionName;
const connection = BI.clone(this.model.connectionSelectedOne); const connection = BI.clone(this.model.connectionSelectedOne);
const { database, driver } = connection.connectionData as ConnectionJDBC; connectionData = connection.connectionData as ConnectionJDBC;
(connection.connectionData as ConnectionJDBC).database = getJdbcDatabaseType(database, driver).databaseType; const { database, driver } = connectionData;
connectionData.database = getJdbcDatabaseType(database, driver).databaseType;
if (this.model.isCopy) {
connectionData.identity = BI.UUID();
}
return connection; return connection;
} }
@ -200,6 +214,12 @@ export class MaintainForm extends BI.Widget {
if (this.form.validation && !this.form.validation()) { if (this.form.validation && !this.form.validation()) {
return false; return false;
} }
const result = checkIllegalStrings(value.connectionName);
if (!result.legal) {
this.setFromError(result.errorMsg);
return false;
}
return true; return true;
} }
@ -250,6 +270,11 @@ export class MaintainForm extends BI.Widget {
private addConnection(form: Connection) { private addConnection(form: Connection) {
this.store.addConnection(form).then(result => { this.store.addConnection(form).then(result => {
if (result.errorCode) { if (result.errorCode) {
if (result.errorCode === DecCst.ErrorCode.NO_IP_AUTHORIZED) {
BI.Msg.toast(BI.i18nText("Dec-Basic_Save_Fail"), {
level: "error",
});
}
if (result.errorCode === errorCode.DUPLICATE_NAMES) { if (result.errorCode === errorCode.DUPLICATE_NAMES) {
if (form.connectionType !== connectionType.JDBC && form.connectionType !== connectionType.JNDI) { if (form.connectionType !== connectionType.JDBC && form.connectionType !== connectionType.JNDI) {
// 如果不是jdbc或jndi，即如果是插件，名称重复的时候需要修改名字重新提交给后台 // 如果不是jdbc或jndi，即如果是插件，名称重复的时候需要修改名字重新提交给后台
@ -270,8 +295,41 @@ export class MaintainForm extends BI.Widget {
return; return;
} }
// 新增之后connections待更新，connectionSelected先置空
this.store.setConnectionSelected('');
this.store.goFirstPage(); this.store.goFirstPage();
this.store.setIsCopy(false); this.store.setIsCopy(false);
}); });
} }
private save() {
if (!this.testValue()) {
return;
}
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) {
if (result.errorCode === DecCst.ErrorCode.NO_IP_AUTHORIZED) {
BI.Msg.toast(BI.i18nText("Dec-Basic_Save_Fail"), {
level: "error",
});
}
this.showError(result);
return;
}
this.store.goFirstPage();
});
} else {
const form = this.form.getSubmitValue();
form.connectionId = this.connectionName;
// DEC-10155 为了适配插件的数据连接，在外层也加一个creator字段
form.creator = Dec ? Dec.personal.username : '';
this.addConnection(form);
}
}
} }

21
src/modules/pages/maintain/maintain.ts
Unescape View File

@ -9,7 +9,7 @@ import './maintain.less';
import { connectionType } from '@constants/env'; import { connectionType } from '@constants/env';
import { getJdbcDatabaseType, getTextByDatabaseType } from '../../app.service'; import { getJdbcDatabaseType, getTextByDatabaseType } from '../../app.service';
import { ConnectionJDBC } from 'src/modules/crud/crud.typings'; import { ConnectionJDBC } from 'src/modules/crud/crud.typings';
import { ListView } from '@fui/core'; import { ButtonGroup } from '@fui/core';
@shortcut() @shortcut()
@store(MaintainModel) @store(MaintainModel)
@ -19,16 +19,16 @@ export class Maintain extends BI.Widget {
model: MaintainModel['model']; model: MaintainModel['model'];
store: MaintainModel['store']; store: MaintainModel['store'];
listView: ListView; buttonGroup: ButtonGroup;
socketTip: LinkButton; socketTip: LinkButton;
render() { render() {
const { isEdit, databaseType } = this.getEditConnection(); const { isEdit, databaseType } = this.getEditConnection();
const titleText = getTextByDatabaseType(databaseType); const titleText = getTextByDatabaseType(databaseType);
return { return {
type: BI.VTapeLayout.xtype, type: BI.VTapeLayout.xtype,
hgap: 5, hgap: 16,
items: [ items: [
{ {
type: BI.VerticalAdaptLayout.xtype, type: BI.VerticalAdaptLayout.xtype,
@ -64,9 +64,9 @@ export class Maintain extends BI.Widget {
], ],
}, },
{ {
type: BI.ListView.xtype, type: BI.ButtonGroup.xtype,
ref: (_ref: ListView) => { ref: (_ref: ButtonGroup) => {
this.listView = _ref; this.buttonGroup = _ref;
}, },
items: this.renderItems(), items: this.renderItems(),
}, },
@ -82,12 +82,13 @@ export class Maintain extends BI.Widget {
this.socketTip.setVisible(true); this.socketTip.setVisible(true);
} }
api.setEditedConnectionStatus(this.model.connectionSelectedOne.connectionName); this.model.connectionSelectedOne
&& api.setEditedConnectionStatus(this.model.connectionSelectedOne.connectionName);
} }
private renderItems() { private renderItems() {
const { type } = this.getEditConnection(); const { type } = this.getEditConnection();
return [{ return [{
type: MaintainForm.xtype, type: MaintainForm.xtype,
connectionType: type, connectionType: type,
@ -108,7 +109,7 @@ export class Maintain extends BI.Widget {
const connectionJDBC = this.model.connectionSelectedOne.connectionData as ConnectionJDBC; const connectionJDBC = this.model.connectionSelectedOne.connectionData as ConnectionJDBC;
databaseType = getJdbcDatabaseType(connectionJDBC.database, connectionJDBC.driver).databaseType; databaseType = getJdbcDatabaseType(connectionJDBC.database, connectionJDBC.driver).databaseType;
} }
return { return {
type: this.model.connectionSelectedOne.connectionType, type: this.model.connectionSelectedOne.connectionType,
text: this.model.connectionSelectedOne.connectionName, text: this.model.connectionSelectedOne.connectionName,

96
src/modules/pages/setting/setting.ts
Unescape View File

@ -0,0 +1,96 @@
import { shortcut } from '@core/core';
import { ApiFactory } from 'src/modules/crud/apiFactory';
const api = new ApiFactory().create();
@shortcut()
export class TimeOutSetting extends BI.Widget {
public static xtype = 'dec.dcm.page.timeout.setting';
public props = {
value: 0,
};
beforeRender(cb: Function) {
const self = this;
api.getTimeOut().then(res => {
self.props.value = res.data.count;
cb();
});
}
public render() {
const { value } = this.props;
const self = this;
return {
type: 'bi.vtape',
cls: 'bi-background',
items: [{
type: 'dec.setting.header',
height: 40,
listeners: [{
eventName: 'EVENT_CANCEL',
action: function () {
self.fireEvent('EVENT_CHANGE');
},
}, {
eventName: 'EVENT_SAVE',
action: function () {
api.putTimeOut(Number(self.editor.getValue()));
self.fireEvent('EVENT_CHANGE');
},
}],
}, {
type: 'bi.vertical',
cls: 'bi-card',
vgap: 10,
items: [
{
el: {
type: 'bi.vertical_adapt',
cls: 'bi-border-bottom',
height: 40,
items: [{
type: 'bi.label',
textAlign: 'left',
width: 120,
cls: 'dec-font-weight-bold',
text: BI.i18nText('Dec-Dcm_Connection_Timeout_Detection'),
}]
}, tgap: -10, hgap: 16,
},
{
type: 'bi.vertical_adapt',
hgap: 16,
items: [{
type: 'dec.label.editor.item',
text: BI.i18nText('Dec-Over_Time'),
textWidth: 100,
editorWidth: 80,
allowBlank: false,
value: value,
validationChecker: function(v) {
return BI.isPositiveInteger(v);
},
errorText: BI.i18nText('BI-Please_Input_Positive_Integer'),
ref: function (_ref) {
self.editor = _ref;
},
}, {
el: {
type: 'bi.label',
text: BI.i18nText('Dec-Dcm_Connection_Timeout_Millisecond'),
},
lgap: 10,
}]
},
]
}],
ref: function (_ref) {
self.setting = _ref;
},
};
}
}

11
src/modules/title/title.ts
Unescape View File

@ -11,7 +11,7 @@ export class Title extends BI.Widget {
static xtype = 'dec.dcm.title'; static xtype = 'dec.dcm.title';
props = { props = {
baseCls: 'bi-card', baseCls: '',
} }
tab: Tab; tab: Tab;
linearSegment: LinearSegment; linearSegment: LinearSegment;
@ -31,6 +31,14 @@ export class Title extends BI.Widget {
type: BI.LeftRightVerticalAdaptLayout.xtype, type: BI.LeftRightVerticalAdaptLayout.xtype,
items: { items: {
left: [ left: [
{
type: 'bi.icon_button',
cls: 'setting-font',
_lgap: 15,
handler: () => {
this.fireEvent('EVENT_CLICK_SETTING');
},
},
{ {
type: BI.LinearSegment.xtype, type: BI.LinearSegment.xtype,
cls: 'bi-font-bold', cls: 'bi-font-bold',
@ -70,6 +78,7 @@ export class Title extends BI.Widget {
type: BI.Tab.xtype, type: BI.Tab.xtype,
height: 40, height: 40,
showIndex: this.model.pageIndex, showIndex: this.model.pageIndex,
width:200,
ref: (_ref: Tab) => { ref: (_ref: Tab) => {
this.tab = _ref; this.tab = _ref;
}, },

5
src/modules/title/title_database/title_datebase.ts
Unescape View File

@ -25,13 +25,13 @@ export class TitleDatabase extends BI.Widget {
items: [{ items: [{
type: BI.VerticalAdaptLayout.xtype, type: BI.VerticalAdaptLayout.xtype,
height: 40, height: 40,
rgap: 5, rgap: 16,
items: [ items: [
{ {
type: BI.Button.xtype, type: BI.Button.xtype,
$value: 'title-database-cancel', $value: 'title-database-cancel',
text: BI.i18nText('BI-Basic_Cancel'), text: BI.i18nText('BI-Basic_Cancel'),
level: 'ignore', light: true,
handler: () => { handler: () => {
this.store.setPageIndex(PAGE_INDEX.CONNECTION); this.store.setPageIndex(PAGE_INDEX.CONNECTION);
}, },
@ -49,6 +49,7 @@ export class TitleDatabase extends BI.Widget {
}, },
}, },
], ],
_rgap: -16,
}], }],
}; };
} }

3
src/modules/title/title_maintain/title_maintain.model.ts
Unescape View File

@ -11,12 +11,13 @@ export class TitleMaintainModel extends Model<{
connectionSelected: AppModel['TYPE']['connectionSelected']; connectionSelected: AppModel['TYPE']['connectionSelected'];
testEvent: AppModel['TYPE']['testEvent']; testEvent: AppModel['TYPE']['testEvent'];
isCopy: AppModel['TYPE']['isCopy']; isCopy: AppModel['TYPE']['isCopy'];
noTestConnection: AppModel['TYPE']['noTestConnection'];
}, },
context: TitleMaintainModel['context']; context: TitleMaintainModel['context'];
}> { }> {
static xtype = 'dec.dcm.model.title_maintain'; static xtype = 'dec.dcm.model.title_maintain';
context = <const>['pageIndex', 'saveEvent', 'testEvent', 'connectionSelected', 'isCopy']; context = <const>['pageIndex', 'saveEvent', 'testEvent', 'connectionSelected', 'isCopy', 'noTestConnection'];
actions = { actions = {
setPageIndex: (index: string) => { setPageIndex: (index: string) => {

14
src/modules/title/title_maintain/title_maintain.ts
Unescape View File

@ -1,6 +1,7 @@
import { shortcut, store } from '@core/core'; import { shortcut, store } from '@core/core';
import { TitleMaintainModel } from './title_maintain.model'; import { TitleMaintainModel } from './title_maintain.model';
import { PAGE_INDEX } from '@constants/constant'; import { PAGE_INDEX } from '@constants/constant';
import { Button } from '@fui/core';
@shortcut() @shortcut()
@store(TitleMaintainModel) @store(TitleMaintainModel)
@ -9,19 +10,20 @@ export class TitleMaintain extends BI.Widget {
store: TitleMaintainModel['store']; store: TitleMaintainModel['store'];
model: TitleMaintainModel['model']; model: TitleMaintainModel['model'];
render() { render() {
return { return {
type: BI.FloatRightLayout.xtype, type: BI.FloatRightLayout.xtype,
items: [{ items: [{
type: BI.VerticalAdaptLayout.xtype, type: BI.VerticalAdaptLayout.xtype,
height: 40, height: 40,
rgap: 5,
items: [ items: [
{ {
type: BI.Button.xtype, type: BI.Button.xtype,
$value: 'title-maintain-cancel', $value: 'title-maintain-cancel',
text: BI.i18nText('BI-Basic_Cancel'), text: BI.i18nText('BI-Basic_Cancel'),
level: 'ignore', clear: true,
_rgap: 16,
handler: () => { handler: () => {
this.store.setIsCopy(false); this.store.setIsCopy(false);
this.store.setPageIndex(PAGE_INDEX.CONNECTION); this.store.setPageIndex(PAGE_INDEX.CONNECTION);
@ -30,15 +32,21 @@ export class TitleMaintain extends BI.Widget {
}, },
{ {
type: BI.Button.xtype, type: BI.Button.xtype,
ref: (_ref) => {
this.testConnectionBtn = _ref;
},
invisible: () => this.model.noTestConnection,
_rgap: 16,
$value: 'title-maintain-connection-test', $value: 'title-maintain-connection-test',
text: BI.i18nText('Dec-Dcm_Connection_Test'), text: BI.i18nText('Dec-Dcm_Connection_Test'),
level: 'ignore', light: true,
handler: () => { handler: () => {
this.store.setTestEvent(); this.store.setTestEvent();
}, },
}, },
{ {
type: BI.Button.xtype, type: BI.Button.xtype,
_rgap: 16,
$value: 'title-maintain-save', $value: 'title-maintain-save',
text: BI.i18nText('BI-Basic_Save'), text: BI.i18nText('BI-Basic_Save'),
handler: () => { handler: () => {

28
tsconfig.json
Unescape View File

@ -5,8 +5,8 @@
"module": "es2015", "module": "es2015",
"moduleResolution": "node", "moduleResolution": "node",
"lib": [ "lib": [
"es2017", "es2017",
"dom" "dom"
], ],
"declaration": true, "declaration": true,
"experimentalDecorators": true, "experimentalDecorators": true,
@ -19,13 +19,23 @@
// "noUnusedParameters": true, // "noUnusedParameters": true,
// "noImplicitReturns": true, // "noImplicitReturns": true,
"noFallthroughCasesInSwitch": true, "noFallthroughCasesInSwitch": true,
"skipLibCheck": true, "skipLibCheck": false,
"paths": { "paths": {
"ui": ["./src/ui"], "ui": [
"ReportCst": ["./private/constants"], "./src/ui"
"types": ["./types/index.d.ts"], ],
"@core/*": ["./src/modules/core/*"], "ReportCst": [
"@constants/*": ["./src/modules/constants/*"] "./private/constants"
],
"types": [
"./types/index.d.ts"
],
"@core/*": [
"./src/modules/core/*"
],
"@constants/*": [
"./src/modules/constants/*"
]
} }
}, },
"include": [ "include": [
@ -33,6 +43,6 @@
"src/**/*.ts", "src/**/*.ts",
"private/*.ts", "private/*.ts",
"private/**/*.ts", "private/**/*.ts",
"types/globals.d.ts" "types"
] ]
} }

24
types/globals.d.ts vendored
Unescape View File

@ -2,6 +2,8 @@ interface Obj {
[key: string]: any; [key: string]: any;
} }
type RequestFunction = (url: string, data: any, callback: (re: any) => void) => void;
declare let BI: Obj & import('@fui/core').BI & import('@fui/materials').BI; declare let BI: Obj & import('@fui/core').BI & import('@fui/materials').BI;
declare const Fix: Obj; declare const Fix: Obj;
declare const DecCst: Obj; declare const DecCst: Obj;
@ -14,15 +16,21 @@ declare const Dec: {
hasListeners: Function; hasListeners: Function;
removeListener: Function; removeListener: Function;
}; };
system: { system: {};
};
personal: { personal: {
username: string; username: string;
}; };
Utils: Obj;
reqByEncrypt: (method: AxiosType.X_Method, url: string, data?: any, config?: AxiosType.X_AxiosRequestConfig) => {},
socketEmit: (type: string, name: string, callback: (re: any) => void) => void; socketEmit: (type: string, name: string, callback: (re: any) => void) => void;
reqGet: (url: string, data: any, callback: (re: any) => void) => void; // req
reqPost: (url: string, data: any, callback: (re: any) => void) => void; reqGet: RequestFunction;
reqPut: (url: string, data: any, callback: (re: any) => void) => void; reqPost: RequestFunction;
reqDelete: (url: string, data: any, callback: (re: any) => void) => void; reqPut: RequestFunction;
}; reqDelete: RequestFunction;
// reqHandle
reqGetHandle: RequestFunction;
reqPostHandle: RequestFunction;
reqPutHandle: RequestFunction;
reqDeleteHandle: RequestFunction;
};

9
types/request.d.ts vendored
Unescape View File

@ -0,0 +1,9 @@
import { Method, AxiosRequestConfig } from 'axios';
declare namespace AxiosType {
type X_Method = Method
interface X_AxiosRequestConfig extends AxiosRequestConfig { }
}
export = AxiosType;
export as namespace AxiosType;
Write Preview
Loading…
Cancel
Save