旭旭
80e6344383
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
...
# Conflicts:
# src/modules/pages/setting/setting.ts
1 year ago
superman
10278fc6a4
Merge pull request #7767 in DEC/decision-webui-dcm from bugfix/11.0 to feature/x
...
* commit '0d12a3aa50c3a359681d3d663a13f5c0f4bde7e9':
1 year ago
superman
0d12a3aa50
Merge pull request #7766 in DEC/decision-webui-dcm from release/11.0 to bugfix/11.0
...
* commit 'c3959116ae549ae458914102bd0f414ebac03379':
1 year ago
superman
c3959116ae
Merge pull request #7765 in DEC/decision-webui-dcm from final/11.0 to release/11.0
...
* commit '5b77281e33492aa5dccdbe4a7e3e82ff22f0f864':
1 year ago
superman
5b77281e33
Merge pull request #7764 in DEC/decision-webui-dcm from persist/11.0 to final/11.0
...
* commit '5628e054e4ba8c04b35ef3f6c3b21cfe44660ce0':
1 year ago
superman
5628e054e4
Merge pull request #7759 in DEC/decision-webui-dcm from final/11.0 to persist/11.0
...
* commit '0eeaf0c0fb32ed16aaae251ee3169b452931edf8':
1 year ago
superman
da0e343cd1
Merge pull request #7705 in DEC/decision-webui-dcm from bugfix/11.0 to feature/x
...
* commit 'e96dac6a9281d29ac49fbcc380db63420dcbbb91':
1 year ago
superman
e96dac6a92
Merge pull request #7704 in DEC/decision-webui-dcm from release/11.0 to bugfix/11.0
...
* commit 'ba1519d979ed3a3f7450558e4b2a21c5191cecdb':
1 year ago
superman
ba1519d979
Merge pull request #7703 in DEC/decision-webui-dcm from final/11.0 to release/11.0
...
* commit '0eeaf0c0fb32ed16aaae251ee3169b452931edf8':
1 year ago
superman
0eeaf0c0fb
Merge pull request #7697 in DEC/decision-webui-dcm from release/11.0 to final/11.0
...
* commit 'ec70052fc201c9763daff27565e5117347fdbfc8':
1 year ago
superman
a22cec6acd
Merge pull request #7653 in DEC/decision-webui-dcm from bugfix/11.0 to feature/x
...
* commit 'c17965fd342213710de71c7348265af28459d7d9':
1 year ago
superman
c17965fd34
Merge pull request #7652 in DEC/decision-webui-dcm from release/11.0 to bugfix/11.0
...
* commit 'ec70052fc201c9763daff27565e5117347fdbfc8':
1 year ago
superman
ec70052fc2
Merge pull request #7651 in DEC/decision-webui-dcm from final/11.0 to release/11.0
...
* commit '8a0356ff061f55d0c0f4058502738dc3f67c887f':
1 year ago
superman
8a0356ff06
Merge pull request #7650 in DEC/decision-webui-dcm from persist/11.0 to final/11.0
...
* commit 'a7a23c45200f0f7bd925a48bd6031cb7653a0b1f':
1 year ago
superman
78c1497c20
Merge pull request #7645 in DEC/decision-webui-dcm from bugfix/11.0 to feature/x
...
* commit '2a2011c85deb9473e64dc8dec56a0d618c0be676':
1 year ago
superman
c776ea518a
Merge pull request #7644 in DEC/decision-webui-dcm from bugfix/11.0 to release/11.0
...
* commit '2a2011c85deb9473e64dc8dec56a0d618c0be676':
1 year ago
superman
2a2011c85d
Merge pull request #7643 in DEC/decision-webui-dcm from feature/x to bugfix/11.0
...
* commit 'ec7f011d6ce76cbd9334b7fe06ea7cfa954592bd':
1 year ago
superman
a7a23c4520
Merge pull request #7641 in DEC/decision-webui-dcm from final/11.0 to persist/11.0
...
* commit 'd180322ebd3724dfd6f4f73af129fc6536b6b310':
1 year ago
superman
ec7f011d6c
Merge pull request #7617 in DEC/decision-webui-dcm from bugfix/11.0 to feature/x
...
* commit '89fe823e91affe6a7dc342ea35bf307b9eceddc0':
1 year ago
superman
89fe823e91
Merge pull request #7616 in DEC/decision-webui-dcm from release/11.0 to bugfix/11.0
...
* commit '3a12e2e85b60b062757d18e1da9ca1f48dd6dba9':
1 year ago
superman
3a12e2e85b
Merge pull request #7615 in DEC/decision-webui-dcm from final/11.0 to release/11.0
...
* commit 'd180322ebd3724dfd6f4f73af129fc6536b6b310':
1 year ago
superman
d180322ebd
Merge pull request #7607 in DEC/decision-webui-dcm from release/11.0 to final/11.0
...
* commit '717d10b44ddb5d0cace7c019eaa0c3b63ca3b083':
2 years ago
superman
ec56dc6c52
Merge pull request #7552 in DEC/decision-webui-dcm from bugfix/11.0 to feature/x
...
* commit '62e2f253cefa43e12c7de2631d5ec6a0957aa82d':
REPORT-94752【视觉验收】数据连接 fix:修复视觉问题
REPORT-94752【视觉验收】数据连接 fix:修复视觉问题
REPORT-94654 fix:数据连接异常报错问题修复
2 years ago
superman
62e2f253ce
Merge pull request #7551 in DEC/decision-webui-dcm from release/11.0 to bugfix/11.0
...
* commit '717d10b44ddb5d0cace7c019eaa0c3b63ca3b083':
REPORT-94752【视觉验收】数据连接 fix:修复视觉问题
REPORT-94752【视觉验收】数据连接 fix:修复视觉问题
REPORT-94654 fix:数据连接异常报错问题修复
2 years ago
superman
717d10b44d
Merge pull request #7550 in DEC/decision-webui-dcm from final/11.0 to release/11.0
...
* commit '4d7c05634d702db5e55ea022ccdf13085d397529':
2 years ago
superman
4d7c05634d
Merge pull request #7549 in DEC/decision-webui-dcm from persist/11.0 to final/11.0
...
* commit '2a1b52a268ee05277b976ec6a11934e500b37e2b':
2 years ago
superman
8b074d1021
Merge pull request #7544 in DEC/decision-webui-dcm from bugfix/11.0 to release/11.0
...
* commit '32146267c63bdb24d4472744bc2cef152cb0a99d':
2 years ago
superman
32146267c6
Merge pull request #7543 in DEC/decision-webui-dcm from feature/x to bugfix/11.0
...
* commit 'cccca5a428ecb05a909e33f251e47c60f971cee8':
2 years ago
superman
2a1b52a268
Merge pull request #7542 in DEC/decision-webui-dcm from final/11.0 to persist/11.0
...
* commit '08638c79cad28e455dc3f7405461e235627de0bc':
REPORT-94752【视觉验收】数据连接 fix:修复视觉问题
REPORT-94752【视觉验收】数据连接 fix:修复视觉问题
REPORT-94654 fix:数据连接异常报错问题修复
REPORT-94752【视觉验收】数据连接 fix: 视觉修复
REPORT-93097 fix: 修复数据连接多次连接报错问题
REPORT-91727 对用户输入的参数进行统一校验 DCM仓库也要改下 feat:产品逻辑变更,要求关键字校验不区分大小写
REPORT-93847 fix: 数据连接样式问题
REPORT-93628 fix:修改下文件上传的组件样式
无JIRA任务,顺带处理下数据连接样式
REPORT-93627【迭代】【平台视觉适配】数据连接管理-模式选择处有滚动条 fix: 并非这次迭代导致,之前就有问题。 调整一下间距的设置大小,防止挤出滚动条
REPORT-93628【迭代】【平台视觉适配】数据连接管理-修改下密码处的视觉展示 fix: 其实适配6.0的改动不涉及数据连接部分。 但是主风格改为输入框border-bottom风格了,那么这里也需要同步改一下。
REPORT-93513 fix: 修复长文本显示问题
REPORT-91727 对用户输入的参数进行统一校验 feat:dcm仓库里面有两个场景,这里引入进来补充
2 years ago
superman
75304bb570
Merge pull request #7541 in DEC/decision-webui-dcm from final/11.0 to release/11.0
...
* commit '08638c79cad28e455dc3f7405461e235627de0bc':
REPORT-94752【视觉验收】数据连接 fix:修复视觉问题
2 years ago
Crawford.Zhou-周旭
08638c79ca
Pull request #7530 : REPORT-94752【视觉验收】数据连接
...
Merge in DEC/decision-webui-dcm from ~CRAWFORD.ZHOU/decision-webui-dcm:final/11.0 to final/11.0
* commit '88f9e5fb54b55d86aa230817338915d1a6bb31b7':
REPORT-94752【视觉验收】数据连接 fix:修复视觉问题
2 years ago
旭旭
88f9e5fb54
REPORT-94752【视觉验收】数据连接
...
fix:修复视觉问题
2 years ago
旭旭
c3dc773417
REPORT-94752【视觉验收】数据连接
...
fix:修复视觉问题
2 years ago
superman
b0d6fe6344
Merge pull request #7528 in DEC/decision-webui-dcm from release/11.0 to final/11.0
...
* commit 'fa9edeaa61dd5676269b221acc332b7419f5a2eb':
REPORT-94752【视觉验收】数据连接 fix:修复视觉问题
REPORT-94654 fix:数据连接异常报错问题修复
REPORT-94752【视觉验收】数据连接 fix: 视觉修复
REPORT-93097 fix: 修复数据连接多次连接报错问题
REPORT-91727 对用户输入的参数进行统一校验 DCM仓库也要改下 feat:产品逻辑变更,要求关键字校验不区分大小写
REPORT-93847 fix: 数据连接样式问题
REPORT-93628 fix:修改下文件上传的组件样式
无JIRA任务,顺带处理下数据连接样式
REPORT-93627【迭代】【平台视觉适配】数据连接管理-模式选择处有滚动条 fix: 并非这次迭代导致,之前就有问题。 调整一下间距的设置大小,防止挤出滚动条
REPORT-93628【迭代】【平台视觉适配】数据连接管理-修改下密码处的视觉展示 fix: 其实适配6.0的改动不涉及数据连接部分。 但是主风格改为输入框border-bottom风格了,那么这里也需要同步改一下。
REPORT-93513 fix: 修复长文本显示问题
REPORT-91727 对用户输入的参数进行统一校验 feat:dcm仓库里面有两个场景,这里引入进来补充
2 years ago
Crawford.Zhou-周旭
fa9edeaa61
Pull request #7527 : REPORT-94752【视觉验收】数据连接
...
Merge in DEC/decision-webui-dcm from ~CRAWFORD.ZHOU/decision-webui-dcm:release/11.0 to release/11.0
* commit '06f1ea79a57dcb74d2c7adac4089f1dd790c53e7':
REPORT-94752【视觉验收】数据连接 fix:修复视觉问题
2 years ago
旭旭
06f1ea79a5
REPORT-94752【视觉验收】数据连接
...
fix:修复视觉问题
2 years ago
Austin.Duan-段嗣跃
3671116076
Pull request #7526 : REPORT-94654 fix:数据连接异常报错问题修复
...
Merge in DEC/decision-webui-dcm from ~AUSTIN.DUAN/decision-webui-dcm:release/11.0 to release/11.0
* commit '2b1cea4686513774d3745ded363e6b95c8f885f5':
REPORT-94654 fix:数据连接异常报错问题修复
2 years ago
Austin.Duan
2b1cea4686
REPORT-94654 fix:数据连接异常报错问题修复
2 years ago
superman
cccca5a428
Merge pull request #7525 in DEC/decision-webui-dcm from bugfix/11.0 to feature/x
...
* commit 'fb195ea56029d97b72e7386f3585a6281f78d03b':
REPORT-94752【视觉验收】数据连接 fix: 视觉修复
2 years ago
superman
fb195ea560
Merge pull request #7524 in DEC/decision-webui-dcm from release/11.0 to bugfix/11.0
...
* commit '37ac0a6ad1d5998578842c3ed1e1ef77224c842d':
REPORT-94752【视觉验收】数据连接 fix: 视觉修复
2 years ago
Crawford.Zhou-周旭
37ac0a6ad1
Pull request #7517 : REPORT-94752【视觉验收】数据连接
...
Merge in DEC/decision-webui-dcm from ~CRAWFORD.ZHOU/decision-webui-dcm:release/11.0 to release/11.0
* commit '60c5ecf23e108c779e01515e46788533d52adcfc':
REPORT-94752【视觉验收】数据连接 fix: 视觉修复
2 years ago
旭旭
60c5ecf23e
REPORT-94752【视觉验收】数据连接
...
fix: 视觉修复
2 years ago
superman
f70e316289
Merge pull request #7516 in DEC/decision-webui-dcm from bugfix/11.0 to feature/x
...
* commit '02d7267e130e393332fbd090691b7be53b83c9a0':
REPORT-93097 fix: 修复数据连接多次连接报错问题
2 years ago
superman
02d7267e13
Merge pull request #7515 in DEC/decision-webui-dcm from release/11.0 to bugfix/11.0
...
* commit 'a0ecf5b85c0c67c4ef10791e1a1d2c3e06406369':
REPORT-93097 fix: 修复数据连接多次连接报错问题
2 years ago
Austin.Duan-段嗣跃
a0ecf5b85c
Pull request #7500 : REPORT-93097 fix: 修复数据连接多次连接报错问题
...
Merge in DEC/decision-webui-dcm from ~AUSTIN.DUAN/decision-webui-dcm:release/11.0 to release/11.0
* commit 'eb6b5e6cffc817f239857d0556c24017b0785ab4':
REPORT-93097 fix: 修复数据连接多次连接报错问题
2 years ago
Austin.Duan
eb6b5e6cff
REPORT-93097 fix: 修复数据连接多次连接报错问题
2 years ago
superman
93ef1b6de0
Merge pull request #7481 in DEC/decision-webui-dcm from bugfix/11.0 to feature/x
...
* commit '0026c5dc665281f67124b39abd30c4c9e27d43e3':
REPORT-91727 对用户输入的参数进行统一校验 DCM仓库也要改下 feat:产品逻辑变更,要求关键字校验不区分大小写
2 years ago
superman
0026c5dc66
Merge pull request #7480 in DEC/decision-webui-dcm from release/11.0 to bugfix/11.0
...
* commit '871676f8c11251e094de7c3ce8441c6f1891689f':
REPORT-91727 对用户输入的参数进行统一校验 DCM仓库也要改下 feat:产品逻辑变更,要求关键字校验不区分大小写
2 years ago
Crawford.Zhou-周旭
871676f8c1
Pull request #7465 : REPORT-91727 对用户输入的参数进行统一校验 DCM仓库也要改下
...
Merge in DEC/decision-webui-dcm from ~CRAWFORD.ZHOU/decision-webui-dcm:release/11.0 to release/11.0
* commit '18539944944b9ddb5b5e072b169803b8e5f0aa43':
REPORT-91727 对用户输入的参数进行统一校验 DCM仓库也要改下 feat:产品逻辑变更,要求关键字校验不区分大小写
2 years ago
旭旭
1853994494
REPORT-91727 对用户输入的参数进行统一校验 DCM仓库也要改下
...
feat:产品逻辑变更,要求关键字校验不区分大小写
2 years ago