superman
ef4555782c
Merge pull request #9001 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '340e68d78c3a84be1a53a66177e0712a7efbdb6f':
3 years ago
superman
340e68d78c
Merge pull request #8999 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'a8a5de63f687cef441e934c644e4957dc1071c27':
3 years ago
superman
a8a5de63f6
Merge pull request #8998 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'fd4ab359181cb93ed2b60e376f466fa44e728c8b':
3 years ago
superman
fd4ab35918
Merge pull request #8997 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'f208414b7b2a7ced070589706cbfa133fe30af1e':
3 years ago
superman
f208414b7b
Merge pull request #8996 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'ca990d3f8aaab3e76100436a99ac8ca4f25d2a14':
3 years ago
superman
ca990d3f8a
Merge pull request #8992 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '92c42d72664cb5da11c7d080c55b7c0e92aa5336':
REPORT-71890 重新加上 使用refresh模式
REPORT-71890 填报-填报属性设置-填报属性的数据库保存后打开,不显示了
REPORT-71855 10.0下产品动态不显示new图标
REPORT-70681 搜索一些特殊字符 高亮展示时 展示效果不对
REPORT-70681 超长文本搜索问题 同步10.0
REPORT-69532 10.0创建复用组件超出960*540时,给出提示
REPORT-67417 运营产品v1.0 bug patch
REPORT-67417 运营产品v1.0 同步一份到10.0
REPORT-71425 websocket断开优化 同步到10.0.19.13
REPORT-69285 数据连接安全关键字检查拦截
REPORT-69285 数据连接安全关键字检查拦截
REPORT-69285 数据连接安全关键字检查拦截
REPORT-70605 控件-新建数据集后,控件的数据字典选项 切换焦点后才 刷新
REPORT-70011 国际化适配
REPORT-68607 数据连接配置操作放事务
3 years ago
superman
0da16a380d
Merge pull request #8985 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '10effddc73c9334f5b748c434bff17e00771391a':
REPORT-71890 重新加上 使用refresh模式
REPORT-71890 填报-填报属性设置-填报属性的数据库保存后打开,不显示了
3 years ago
superman
10effddc73
Merge pull request #8983 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '0f60d52434aa65c6eec8edc5cc0c32ad44eb306f':
REPORT-71890 重新加上 使用refresh模式
REPORT-71890 填报-填报属性设置-填报属性的数据库保存后打开,不显示了
3 years ago
superman
0f60d52434
Merge pull request #8982 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'd31f3267d4d5613d35dbe76bb504afb69927fc0a':
REPORT-71890 重新加上 使用refresh模式
REPORT-71890 填报-填报属性设置-填报属性的数据库保存后打开,不显示了
3 years ago
superman
d31f3267d4
Merge pull request #8981 in DESIGN/design from final/10.0 to release/10.0
...
* commit '92c42d72664cb5da11c7d080c55b7c0e92aa5336':
REPORT-71890 重新加上 使用refresh模式
REPORT-71890 填报-填报属性设置-填报属性的数据库保存后打开,不显示了
3 years ago
Hades
92c42d7266
Pull request #8969 : REPORT-71890 填报-填报属性设置-填报属性的数据库保存后打开,不显示了
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '8dfb80ad6f02c647e3d16c62e35e60db60515b31':
REPORT-71890 重新加上 使用refresh模式
REPORT-71890 填报-填报属性设置-填报属性的数据库保存后打开,不显示了
3 years ago
superman
817e62947e
Merge pull request #8975 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'ebe78cb1b2bb26cf00ed4f36e59a7238651aa160':
REPORT-68422 决策报表-客户模板,body下放绝对画布块,绝对画布块下tab,旧模式预览,tab切换不生效,删掉绝对画布块就正常了
3 years ago
superman
ebe78cb1b2
Merge pull request #8973 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '6d258dbc9a95f6d459fe26275048104e84b41fce':
REPORT-68422 决策报表-客户模板,body下放绝对画布块,绝对画布块下tab,旧模式预览,tab切换不生效,删掉绝对画布块就正常了
3 years ago
superman
6d258dbc9a
Merge pull request #8972 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '9add47068a90c15f80b14d19df0c1ee6e12895ad':
REPORT-68422 决策报表-客户模板,body下放绝对画布块,绝对画布块下tab,旧模式预览,tab切换不生效,删掉绝对画布块就正常了
3 years ago
hades
8dfb80ad6f
REPORT-71890 重新加上 使用refresh模式
3 years ago
kerry
9add47068a
Pull request #8967 : REPORT-68422 决策报表-客户模板,body下放绝对画布块,绝对画布块下tab,旧模式预览,tab切换不生效,删掉绝对画布块就正常了
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit '78ca28174bbecfbfb363a538b64d405022456049':
REPORT-68422 决策报表-客户模板,body下放绝对画布块,绝对画布块下tab,旧模式预览,tab切换不生效,删掉绝对画布块就正常了
3 years ago
hades
08b8f71b86
REPORT-71890 填报-填报属性设置-填报属性的数据库保存后打开,不显示了
3 years ago
kerry
78ca28174b
REPORT-68422 决策报表-客户模板,body下放绝对画布块,绝对画布块下tab,旧模式预览,tab切换不生效,删掉绝对画布块就正常了
3 years ago
superman
594c278daa
Merge pull request #8962 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'e88c4d8ee163b4e7dccabac186e020b85841c989':
REPORT-71855 10.0下产品动态不显示new图标
REPORT-70681 搜索一些特殊字符 高亮展示时 展示效果不对
3 years ago
superman
e88c4d8ee1
Merge pull request #8960 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '217ac08d067f0c2bc8beee9c8fbdbda95e0dd707':
REPORT-71855 10.0下产品动态不显示new图标
REPORT-70681 搜索一些特殊字符 高亮展示时 展示效果不对
3 years ago
superman
217ac08d06
Merge pull request #8959 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'c79d9dfddd34179b45fe0803da4a031636fd600a':
REPORT-71855 10.0下产品动态不显示new图标
REPORT-70681 搜索一些特殊字符 高亮展示时 展示效果不对
3 years ago
superman
c79d9dfddd
Merge pull request #8958 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'e18058dd789a9b29a853a342c79cb7c76e0d02b5':
REPORT-71855 10.0下产品动态不显示new图标
REPORT-70681 搜索一些特殊字符 高亮展示时 展示效果不对
3 years ago
Hades
e18058dd78
Pull request #8956 : REPORT-71855 10.0下产品动态不显示new图标
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '67ab1e9f5c756eb63298753b63fbbb46d6ee80c7':
REPORT-71855 10.0下产品动态不显示new图标
3 years ago
hades
67ab1e9f5c
REPORT-71855 10.0下产品动态不显示new图标
3 years ago
Hades
e12c4ba7c9
Pull request #8955 : REPORT-70681 搜索一些特殊字符 高亮展示时 展示效果不对 10.0同步一份
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit 'ada25d5ab82138504a505f9b2de408952078630c':
REPORT-70681 搜索一些特殊字符 高亮展示时 展示效果不对
3 years ago
hades
ada25d5ab8
REPORT-70681 搜索一些特殊字符 高亮展示时 展示效果不对
3 years ago
superman
02e9fb8e7a
Merge pull request #8949 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '8bc257cf665122f5e2c6002a1f19a151de860dd5':
REPORT-70681 超长文本搜索问题 同步10.0
3 years ago
superman
8bc257cf66
Merge pull request #8941 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'bdb7d83dbbbdf25cfe7008604919dea0c3a0c56b':
REPORT-70681 超长文本搜索问题 同步10.0
3 years ago
superman
bdb7d83dbb
Merge pull request #8947 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '33a1cb692adf59809ab726258b877099d7547666':
REPORT-70681 超长文本搜索问题 同步10.0
3 years ago
superman
33a1cb692a
Merge pull request #8946 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'ac1c5c46bf5c955c7b038972b84a1dbbd67b645f':
REPORT-70681 超长文本搜索问题 同步10.0
3 years ago
Hades
ac1c5c46bf
Pull request #8942 : REPORT-70681 超长文本搜索问题 同步10.0
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '38ded435a475c40cae45b6249a8f86af79c7a4a7':
REPORT-70681 超长文本搜索问题 同步10.0
3 years ago
hades
38ded435a4
REPORT-70681 超长文本搜索问题 同步10.0
3 years ago
superman
972636fa67
Merge pull request #8940 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'b1bd2cccb74970991ffe1a6578b52d6957a1e5f5':
3 years ago
superman
b1bd2cccb7
Merge pull request #8939 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'a099c6a5bb0d76edb68d56c0760f61d010009c05':
3 years ago
superman
a099c6a5bb
Merge pull request #8935 in DESIGN/design from release/10.0 to final/10.0
...
* commit '2576e5ecc2cc9dd2c89afab9545c13208c7e7963':
3 years ago
superman
2576e5ecc2
Merge pull request #8934 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '87cb671caa5cc401d7a52e739aecd28fe77c04b2':
3 years ago
superman
0aac39936a
Merge pull request #8921 in DESIGN/design from release/10.0 to final/10.0
...
* commit 'd84f7a9b05acad1ddff2c8246f534a260fb384e0':
REPORT-69532 10.0创建复用组件超出960*540时,给出提示
REPORT-67417 运营产品v1.0 bug patch
REPORT-67417 运营产品v1.0 同步一份到10.0
REPORT-71425 websocket断开优化 同步到10.0.19.13
REPORT-69285 数据连接安全关键字检查拦截
REPORT-69285 数据连接安全关键字检查拦截
REPORT-69285 数据连接安全关键字检查拦截
REPORT-70011 国际化适配
REPORT-68607 数据连接配置操作放事务
3 years ago
superman
97fe52ee07
Merge pull request #8927 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '45d6cd590cbf259382487c2d154c3d31a136f5a6':
3 years ago
superman
45d6cd590c
Merge pull request #8925 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '87cb671caa5cc401d7a52e739aecd28fe77c04b2':
3 years ago
superman
87cb671caa
Merge pull request #8924 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'd84f7a9b05acad1ddff2c8246f534a260fb384e0':
3 years ago
superman
d84f7a9b05
Merge pull request #8920 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '15dfd4fafb061d49319f717f8f2442f05fb41164':
3 years ago
superman
6903dd65e6
Merge pull request #8915 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '966a42ae40b4761b7dc2e5180abaec741b04b4c1':
REPORT-69532 10.0创建复用组件超出960*540时,给出提示
REPORT-67417 运营产品v1.0 bug patch
REPORT-67417 运营产品v1.0 同步一份到10.0
REPORT-71425 websocket断开优化 同步到10.0.19.13
3 years ago
superman
966a42ae40
Merge pull request #8913 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '15dfd4fafb061d49319f717f8f2442f05fb41164':
REPORT-69532 10.0创建复用组件超出960*540时,给出提示
REPORT-67417 运营产品v1.0 bug patch
REPORT-67417 运营产品v1.0 同步一份到10.0
REPORT-71425 websocket断开优化 同步到10.0.19.13
3 years ago
superman
15dfd4fafb
Merge pull request #8912 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '6b0aaebc7b081d3e90f4bce340235ad889f58dda':
REPORT-69532 10.0创建复用组件超出960*540时,给出提示
REPORT-67417 运营产品v1.0 bug patch
REPORT-67417 运营产品v1.0 同步一份到10.0
REPORT-71425 websocket断开优化 同步到10.0.19.13
3 years ago
fanglei
6b0aaebc7b
Pull request #8909 : REPORT-69532 10.0创建复用组件超出960*540时,给出提示
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit '236dece1d88d2e6ea1e1e3da704864438b95574a':
REPORT-69532 10.0创建复用组件超出960*540时,给出提示
3 years ago
Hades
fc0fc54887
Pull request #8907 : REPORT-67417 运营产品v1.0 同步一份到10.0
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'aba9f7d5a3b471c18c9e53067d42ec1c22ffbcfc':
REPORT-67417 运营产品v1.0 bug patch
REPORT-67417 运营产品v1.0 同步一份到10.0
3 years ago
方磊
236dece1d8
REPORT-69532 10.0创建复用组件超出960*540时,给出提示
3 years ago
hades
aba9f7d5a3
REPORT-67417 运营产品v1.0 bug patch
3 years ago
hades
cc5d9910dc
REPORT-67417 运营产品v1.0 同步一份到10.0
3 years ago
Hades
38fa734e03
Pull request #8904 : REPORT-71425 websocket断开优化 同步到10.0.19.13
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '527618f35a6891c8cfe7406f4e93b11224d44c17':
REPORT-71425 websocket断开优化 同步到10.0.19.13
3 years ago