Obo-王学仁
951253ffef
Pull request #13562 : REPORT-111619 控件增强-更多的样式配置--报表支撑 自测问题修复
...
Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0
* commit 'c4b278061b67fd4cfdc60ed3443ba0c59dbc2b47':
REPORT-111619 控件增强-更多的样式配置--报表支撑 自测问题修复
10 months ago
obo
c4b278061b
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
10 months ago
obo
8f23325ecd
REPORT-111619 控件增强-更多的样式配置--报表支撑 自测问题修复
10 months ago
jacky.li-李星
6e7a61c4b0
Pull request #13561 : REPORT-111299 控件扩展样式-复选框组扩展样式bugfix
...
Merge in DESIGN/design from ~JACKY.LI/design:release/11.0 to release/11.0
* commit '5bb7f59560adb0388624e8acb047b4330fac91dc':
REPORT-114161 控件扩展样式—图文按钮新增的图标格没有默认选中
REPORT-114070 控件扩展样式—布局方式固定列数,应该只支持正整数
REPORT-114115 控件扩展样式—新建模板,联排按钮、图文按钮排布方式默认要选"等分布局"
10 months ago
jacky.li-李星
5bb7f59560
Pull request #2 : REPORT-111299 控件扩展样式-复选框组扩展样式bugfix
...
Merge in ~JACKY.LI/design from bugfix/11.0 to release/11.0
* commit '48b5706ce5213c236b79e815d75b3922003ae836':
REPORT-114161 控件扩展样式—图文按钮新增的图标格没有默认选中
REPORT-114070 控件扩展样式—布局方式固定列数,应该只支持正整数
REPORT-114115 控件扩展样式—新建模板,联排按钮、图文按钮排布方式默认要选"等分布局"
10 months ago
jacky.li-李星
48b5706ce5
Pull request #1 : REPORT-111299 控件扩展样式-复选框组扩展样式bugfix
...
Merge in ~JACKY.LI/design from feature/x to bugfix/11.0
* commit 'ac7feaf916d3de9d69ae883450bf67a934d2ea92':
REPORT-114161 控件扩展样式—图文按钮新增的图标格没有默认选中
REPORT-114070 控件扩展样式—布局方式固定列数,应该只支持正整数
REPORT-114115 控件扩展样式—新建模板,联排按钮、图文按钮排布方式默认要选"等分布局"
10 months ago
Obo-王学仁
e7c80ee920
Pull request #13560 : REPORT-111619 控件增强-更多的样式配置--报表支撑 移动端部分代码之前在别的工程漏提了,补一下
...
Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0
* commit '8a89fd2fc78364f90e0196bdacade93dcf2fb732':
REPORT-111619 控件增强-更多的样式配置--报表支撑 移动端部分代码之前在别的工程漏提了,补一下
10 months ago
obo
8a89fd2fc7
REPORT-111619 控件增强-更多的样式配置--报表支撑 移动端部分代码之前在别的工程漏提了,补一下
10 months ago
superman
9095993cf6
Merge pull request #13559 in DESIGN/design from bugfix/11.0 to release/11.0
...
* commit '65059e13b6319aa19b36e39f97686407cf442958':
无JIRA,去除多余import,解决打包错误
消除静态引入
优化代码,补充一些代码
REPORT-111619 控件增强-更多的样式配置--报表支撑
REPORT-111299 控件扩展样式-复选框组扩展样式 feat:调整移动端单选框组样式;扩展复选框组样式
REPORT-111299 控件扩展样式-复选框组扩展样式 feat:调整移动端单选框组样式;扩展复选框组样式
REPORT-111299 控件扩展样式-复选框组扩展样式 feat:调整移动端单选框组样式;扩展复选框组样式
REPORT-106829 FineOne前端样式统一
10 months ago
jacky.li-李星
ac7feaf916
Pull request #13557 : REPORT-111299 控件扩展样式-复选框组扩展样式bugfix
...
Merge in DESIGN/design from ~JACKY.LI/design:feature/x to feature/x
* commit '266b9b48ab341477f62ef6439411a3e46c63328f':
REPORT-114161 控件扩展样式—图文按钮新增的图标格没有默认选中
REPORT-114070 控件扩展样式—布局方式固定列数,应该只支持正整数
REPORT-114115 控件扩展样式—新建模板,联排按钮、图文按钮排布方式默认要选"等分布局"
10 months ago
superman
65059e13b6
Merge pull request #13558 in DESIGN/design from feature/x to bugfix/11.0
...
* commit 'b5d2098ba72c6ba97d882dc4f9f75fd7203c2940':
无JIRA,去除多余import,解决打包错误
消除静态引入
优化代码,补充一些代码
REPORT-111619 控件增强-更多的样式配置--报表支撑
REPORT-111299 控件扩展样式-复选框组扩展样式 feat:调整移动端单选框组样式;扩展复选框组样式
REPORT-111299 控件扩展样式-复选框组扩展样式 feat:调整移动端单选框组样式;扩展复选框组样式
REPORT-111299 控件扩展样式-复选框组扩展样式 feat:调整移动端单选框组样式;扩展复选框组样式
REPORT-106829 FineOne前端样式统一
10 months ago
lixing
266b9b48ab
REPORT-114161 控件扩展样式—图文按钮新增的图标格没有默认选中
10 months ago
lixing
3cdb066aad
REPORT-114070 控件扩展样式—布局方式固定列数,应该只支持正整数
10 months ago
lixing
afdba13100
REPORT-114115 控件扩展样式—新建模板,联排按钮、图文按钮排布方式默认要选"等分布局"
10 months ago
Obo-王学仁
b5d2098ba7
Pull request #13554 : 无JIRA,去除多余import,解决打包错误
...
Merge in DESIGN/design from ~OBO/design1:feature/x to feature/x
* commit '3b6382443905e882043849adb59d010ed736f34a':
无JIRA,去除多余import,解决打包错误
10 months ago
obo
3b63824439
Merge remote-tracking branch 'origin/feature/x' into feature/x
10 months ago
obo
3ee75bbb72
无JIRA,去除多余import,解决打包错误
10 months ago
vito-刘恒霖
2f90449dca
Pull request #13549 : REPORT-112769 JxUIPane新增执行js方法
...
Merge in DESIGN/design from ~VITO/c-design:release/11.0 to release/11.0
* commit '743d96946e438f0c5beebc8e583a5f6d969b95f2':
REPORT-112769 JxUIPane新增执行js方法
10 months ago
Obo-王学仁
172011cbce
Pull request #13553 : REPORT-111619 控件增强-更多的样式配置--报表支撑
...
Merge in DESIGN/design from ~OBO/design1:feature/x to feature/x
* commit '8fe43ca30b053e3cf48b844095a439c343fd2163':
消除静态引入
优化代码,补充一些代码
REPORT-111619 控件增强-更多的样式配置--报表支撑
10 months ago
obo
8fe43ca30b
消除静态引入
10 months ago
obo
05d416ed99
优化代码,补充一些代码
10 months ago
obo
8a6b741546
Merge remote-tracking branch 'origin/feature/x' into feature/x
10 months ago
obo
6b5a9dbee7
REPORT-111619 控件增强-更多的样式配置--报表支撑
10 months ago
superman
b71edda07a
Pull request #13548 : 无jira任务, final/11.0 合 release/11.0
...
Merge in DESIGN/design from final/11.0 to release/11.0
* commit 'c7821abc9404c1391ac8a3fdda5ca9f1563d8713':
REPORT-112501 模板主题管理英文显示不全
10 months ago
Crawford.Zhou-周旭
159233fc01
Pull request #13542 : REPORT-111299 控件扩展样式-复选框组扩展样式
...
Merge in DESIGN/design from ~CRAWFORD.ZHOU/design:feature/x to feature/x
* commit 'e913f94dab117988babf24f2fab97cfae1d967ff':
REPORT-111299 控件扩展样式-复选框组扩展样式 feat:调整移动端单选框组样式;扩展复选框组样式
REPORT-111299 控件扩展样式-复选框组扩展样式 feat:调整移动端单选框组样式;扩展复选框组样式
REPORT-111299 控件扩展样式-复选框组扩展样式 feat:调整移动端单选框组样式;扩展复选框组样式
10 months ago
Crawford.Zhou
e913f94dab
REPORT-111299 控件扩展样式-复选框组扩展样式
...
feat:调整移动端单选框组样式;扩展复选框组样式
10 months ago
vito
743d96946e
REPORT-112769 JxUIPane新增执行js方法
10 months ago
Crawford.Zhou
9075a8cdd3
REPORT-111299 控件扩展样式-复选框组扩展样式
...
feat:调整移动端单选框组样式;扩展复选框组样式
10 months ago
Crawford.Zhou
3ce1ce0d45
Merge remote-tracking branch 'origin/feature/x' into feature/x
10 months ago
Crawford.Zhou
f70a3cea5e
REPORT-111299 控件扩展样式-复选框组扩展样式
...
feat:调整移动端单选框组样式;扩展复选框组样式
10 months ago
Obo-王学仁
c7821abc94
Pull request #13540 : REPORT-112501 模板主题管理英文显示不全
...
Merge in DESIGN/design from ~OBO/design-obo:final/11.0 to final/11.0
* commit 'c903dd6523e28d27271b3459474abfcf3f8cb586':
REPORT-112501 模板主题管理英文显示不全
10 months ago
obo
c903dd6523
REPORT-112501 模板主题管理英文显示不全
10 months ago
superman
d3fcddf43f
Merge pull request #13504 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '929499c6f69de78703a50ba76be391b33d255fa8':
10 months ago
superman
929499c6f6
Merge pull request #13503 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'df155524a4b7a24364f2250f39d2610d6be58eb8':
10 months ago
superman
df155524a4
Merge pull request #13502 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'd358e21d7c9453c50524220b6e0e98223e9b1857':
10 months ago
superman
d358e21d7c
Merge pull request #13501 in DESIGN/design from persist/11.0 to final/11.0
...
* commit 'd1429cc23c0531b31e8dc12a702d20eddbcaeea6':
10 months ago
superman
7f4666b698
Pull request #13470 : 无jira任务, bugfix/11.0 合 feature/x
...
Merge in DESIGN/design from bugfix/11.0 to feature/x
* commit '54b365242522076e1e19a4a05d54d86d00811570':
REPORT-112641 F0028埋点JDK版本获取有问题
11 months ago
superman
d1429cc23c
Merge pull request #13476 in DESIGN/design from final/11.0 to persist/11.0
...
* commit '3b68b8d534fa271e0668e5218b7ace34ef00f084': (46 commits)
REPORT-112641 F0028埋点JDK版本获取有问题
REPORT-111890 升级到release后,延迟启动云端运维模块不会自动开启
REPORT-111890 升级到release后,延迟启动云端运维模块不会自动开启
方法名也改下,以及成员变量名
改下命名,颜色深浅模式可以作为公共枚举使用,并且层级往上抽一下
改为枚举实现
REPORT-111740 【控件显示增强】历史模板升级后,工具栏没有根据背景适配深浅
改下实现
REPORT-92893 锁定的模板,重复另存副本,设计器页面模板内容不更新
REPORT-109129 偶现设计器关闭后进程残留 添加日志
REPORT-109129 偶现设计器关闭后进程残留
REPORT-111549 标签控件设置的字体背景样式等,开启控件增强,之前设置的样式丢了
REPORT-111281 控件内置后,新模版默认开启变成默认关闭
REPORT-111723 【控件显示增强】删除当前模板主题,按钮和标签控件的字体大小异常
REPORT-111841 启动后不输出任何日志
REPORT-111169 数据集含有注释的参数,但参数依然生效
REPORT-109525 【设计器性能】启动性能优化 代码规范
REPORT-111690 A用户断网,B用户打开模板,A用户联网保存,副本保存异常
改个默认颜色,把类中的去掉,不提代码了,就一行
少提一个类
...
11 months ago
superman
54b3652425
Merge pull request #13469 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '34c4ab1f686b916a9a5bc596a648029350ccfaeb':
REPORT-112641 F0028埋点JDK版本获取有问题
11 months ago
superman
34c4ab1f68
Merge pull request #13467 in DESIGN/design from final/11.0 to release/11.0
...
* commit '3b68b8d534fa271e0668e5218b7ace34ef00f084':
REPORT-112641 F0028埋点JDK版本获取有问题
11 months ago
Destiny.Lin-林锦龙
3b68b8d534
Pull request #13450 : REPORT-112641 F0028埋点JDK版本获取有问题
...
Merge in DESIGN/design from ~DESTINY.LIN/design:final/11.0 to final/11.0
* commit '77cf674e8480c632109f371f1e75a8a6fccfe28f':
REPORT-112641 F0028埋点JDK版本获取有问题
11 months ago
Destiny.Lin
77cf674e84
Merge remote-tracking branch 'origin/final/11.0' into final/11.0
11 months ago
Destiny.Lin
45ff9f44e1
REPORT-112641 F0028埋点JDK版本获取有问题
11 months ago
superman
78da60fd0f
Merge pull request #13415 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '17a3b1e1397db6b5e5283cabb03464cd6f15cbd3':
REPORT-111890 升级到release后,延迟启动云端运维模块不会自动开启
REPORT-111890 升级到release后,延迟启动云端运维模块不会自动开启
方法名也改下,以及成员变量名
改下命名,颜色深浅模式可以作为公共枚举使用,并且层级往上抽一下
改为枚举实现
REPORT-111740 【控件显示增强】历史模板升级后,工具栏没有根据背景适配深浅
11 months ago
superman
17a3b1e139
Merge pull request #13414 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '00e98cf94d21fbadea28ef39d5f6b7d271557769':
REPORT-111890 升级到release后,延迟启动云端运维模块不会自动开启
REPORT-111890 升级到release后,延迟启动云端运维模块不会自动开启
方法名也改下,以及成员变量名
改下命名,颜色深浅模式可以作为公共枚举使用,并且层级往上抽一下
改为枚举实现
REPORT-111740 【控件显示增强】历史模板升级后,工具栏没有根据背景适配深浅
11 months ago
superman
00e98cf94d
Merge pull request #13413 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'fd30b296d570632c9205a92224926bf1d7b6c5b2':
REPORT-111890 升级到release后,延迟启动云端运维模块不会自动开启
REPORT-111890 升级到release后,延迟启动云端运维模块不会自动开启
11 months ago
Destiny.Lin-林锦龙
fd30b296d5
Pull request #13396 : REPORT-111890 升级到release后,延迟启动云端运维模块不会自动开启
...
Merge in DESIGN/design from ~DESTINY.LIN/design:final/11.0 to final/11.0
* commit '46e07da9e757acd974fbc85cbee44777c55795c0':
REPORT-111890 升级到release后,延迟启动云端运维模块不会自动开启
REPORT-111890 升级到release后,延迟启动云端运维模块不会自动开启
11 months ago
superman
642bbac30e
Merge pull request #13403 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'a590cd8ede2a8db03a2979cbe3ed05df62edf2ae':
11 months ago
Destiny.Lin
46e07da9e7
REPORT-111890 升级到release后,延迟启动云端运维模块不会自动开启
11 months ago
Destiny.Lin
d54acbcfd3
Merge remote-tracking branch 'origin/final/11.0' into final/11.0
...
# Conflicts:
# designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateConfigManager.java
11 months ago