superman
3d4b546f54
Merge pull request #13591 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'bdd70ede2a55b163b7d5b6f29d8dfc20a9fd4f3f':
9 months ago
superman
bdd70ede2a
Merge pull request #13584 in DESIGN/design from persist/11.0 to final/11.0
...
* commit 'c35906c3ab77c18e6aaf31d1c1ed8ae46643ff01':
9 months ago
Levy.Xie-解安森
fdde96a0d9
Pull request #13576 : REPORT-113377 设计器视觉验收-左侧列表区
...
Merge in DESIGN/design from ~LEVY.XIE/design:newui to newui
* commit '9b5efc29c846a9cc6ad3679dff39969a9ca46cd7':
REPORT-113377 设计器视觉验收-左侧列表区
REPORT-113377 设计器视觉验收-左侧列表区
9 months ago
Levy.Xie-解安森
9b5efc29c8
REPORT-113377 设计器视觉验收-左侧列表区
9 months ago
Levy.Xie-解安森
0d5905b326
REPORT-113377 设计器视觉验收-左侧列表区
9 months ago
Obo-王学仁
bb3c37f55e
Pull request #13574 : REPORT-114548 【控件显示增强-按钮控件边框线型颜色】按钮控件的边框线型颜色自定义保存后,再打开颜色会变为跟随的主题色。且边框线型颜色展示异常
...
Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0
* commit 'e23a554484077fba542f891ee7b5888e3c6f5f37':
REPORT-114548 【控件显示增强-按钮控件边框线型颜色】按钮控件的边框线型颜色自定义保存后,再打开颜色会变为跟随的主题色。且边框线型颜色展示异常
9 months ago
obo
e23a554484
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
9 months ago
obo
bca82d153c
REPORT-114548 【控件显示增强-按钮控件边框线型颜色】按钮控件的边框线型颜色自定义保存后,再打开颜色会变为跟随的主题色。且边框线型颜色展示异常
9 months ago
vito-刘恒霖
18dae2b7cb
Pull request #13570 : 无jira任务 release合并newui
...
Merge in DESIGN/design from ~VITO/c-design:newui to newui
* commit 'e286ef903dfa2908e2dfe63eab56288edbbb4e66': (21 commits)
REPORT-111619 控件增强-更多的样式配置--报表支撑 主题预览界面支持控件及提升跟随tab切换
REPORT-114305 控件扩展样式—等分布局、自然布局效果都反了
REPORT-114164 控件扩展样式-图文按钮图标格添加至12个以上,显示异常
REPORT-111619 控件增强-更多的样式配置--报表支撑 自测问题修复3
REPORT-111619 控件基础面板的字体名面板初始化
REPORT-111619 控件增强-更多的样式配置--报表支撑 自测问题修复
REPORT-111619 控件增强-更多的样式配置--报表支撑 自测问题修复
REPORT-111619 控件增强-更多的样式配置--报表支撑 移动端部分代码之前在别的工程漏提了,补一下
REPORT-114161 控件扩展样式—图文按钮新增的图标格没有默认选中
REPORT-114070 控件扩展样式—布局方式固定列数,应该只支持正整数
REPORT-114115 控件扩展样式—新建模板,联排按钮、图文按钮排布方式默认要选"等分布局"
无JIRA,去除多余import,解决打包错误
消除静态引入
优化代码,补充一些代码
REPORT-111619 控件增强-更多的样式配置--报表支撑
REPORT-111299 控件扩展样式-复选框组扩展样式 feat:调整移动端单选框组样式;扩展复选框组样式
REPORT-112769 JxUIPane新增执行js方法
REPORT-111299 控件扩展样式-复选框组扩展样式 feat:调整移动端单选框组样式;扩展复选框组样式
REPORT-111299 控件扩展样式-复选框组扩展样式 feat:调整移动端单选框组样式;扩展复选框组样式
REPORT-112501 模板主题管理英文显示不全
...
9 months ago
Obo-王学仁
f06f2f054b
Pull request #13573 : REPORT-114524 【控件显示增强-复选按钮组控件】自定义,自定义修改控件背景后会报错
...
Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0
* commit '56fd8856300fb7242c80b79d107c72fb4edd6e93':
视图树也补一下
REPORT-114524 【控件显示增强-复选按钮组控件】自定义,自定义修改控件背景后会报错
9 months ago
obo
56fd885630
视图树也补一下
9 months ago
obo
3039f1dd9e
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
9 months ago
obo
1cd29b730b
REPORT-114524 【控件显示增强-复选按钮组控件】自定义,自定义修改控件背景后会报错
9 months ago
Obo-王学仁
2af1861232
Pull request #13572 : REPORT-114501 【控件显示增强-边框颜色】边框颜色传到前端为null
...
Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0
* commit 'b0e20355191fb2143678ddaa5d899ea401ca63c4':
REPORT-114501 【控件显示增强-边框颜色】边框颜色传到前端为null
9 months ago
obo
b0e2035519
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
9 months ago
obo
a411e490e7
REPORT-114501 【控件显示增强-边框颜色】边框颜色传到前端为null
9 months ago
jacky.li-李星
683599cbc8
Pull request #13571 : REPORT-114164 控件扩展样式-图文按钮图标格添加至12个以上,显示异常
...
Merge in DESIGN/design from ~JACKY.LI/design:release/11.0 to release/11.0
* commit '02d947b391f624bd8c452dba740530238e5fcf08':
REPORT-114164 控件扩展样式-图文按钮图标格添加至12个以上,显示异常
9 months ago
lixing
02d947b391
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
9 months ago
lixing
f78fd4fc4d
REPORT-114164 控件扩展样式-图文按钮图标格添加至12个以上,显示异常
9 months ago
zheng-郑潇
8ba713b832
Pull request #13569 : fix: 回退代码 fvs.chart和fvs.ec.chart都不走refresh逻辑 原始问题fvs.ec.chart的邮件使用chartemailpane才没有正文勾选项不通过refresh实现 通过插件DuchampHyperlinkGroup重写实现邮件&联动fvs组件 #REPORT-111618
...
Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0
* commit 'ec15cd629a05181547d75332b9e9c33646b89754':
fix: 回退代码 fvs.chart和fvs.ec.chart都不走refresh逻辑 原始问题fvs.ec.chart的邮件使用chartemailpane才没有正文勾选项不通过refresh实现 通过插件DuchampHyperlinkGroup重写实现邮件&联动fvs组件 #REPORT-111618
9 months ago
vito
e286ef903d
Merge branch 'release/11.0' into newui
10 months ago
shine
ec15cd629a
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/11.0
10 months ago
shine
153e2d9fcd
fix: 回退代码 fvs.chart和fvs.ec.chart都不走refresh逻辑 原始问题fvs.ec.chart的邮件使用chartemailpane才没有正文勾选项不通过refresh实现 通过插件DuchampHyperlinkGroup重写实现邮件&联动fvs组件 #REPORT-111618
10 months ago
jacky.li-李星
2bb4e7b3c1
Pull request #13567 : REPORT-114164 & REPORT-114305 单复选框bugfix
...
Merge in DESIGN/design from ~JACKY.LI/design:release/11.0 to release/11.0
* commit '268478dc5ab62e6beacf898b630fbd5965a42241':
REPORT-114305 控件扩展样式—等分布局、自然布局效果都反了
REPORT-114164 控件扩展样式-图文按钮图标格添加至12个以上,显示异常
10 months ago
Obo-王学仁
3619cfcb6e
Pull request #13568 : REPORT-111619 控件增强-更多的样式配置--报表支撑 主题预览界面支持控件及提升跟随tab切换
...
Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0
* commit '8c64f9d6c81b290cebb393e7fb3b9f69e934736f':
REPORT-111619 控件增强-更多的样式配置--报表支撑 主题预览界面支持控件及提升跟随tab切换
10 months ago
obo
8c64f9d6c8
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
10 months ago
obo
d15d7538a1
REPORT-111619 控件增强-更多的样式配置--报表支撑 主题预览界面支持控件及提升跟随tab切换
10 months ago
lixing
268478dc5a
REPORT-114305 控件扩展样式—等分布局、自然布局效果都反了
10 months ago
lixing
2ac4d4312e
REPORT-114164 控件扩展样式-图文按钮图标格添加至12个以上,显示异常
10 months ago
vito-刘恒霖
83198b6355
Pull request #13565 : REPORT-99485 TableLayoutHelper 适配DPI缩放
...
Merge in DESIGN/design from ~VITO/c-design:newui to newui
* commit '9d3a52475e47c84363e0536f6813fd7729893f6e':
REPORT-99485 TableLayoutHelper 适配DPI缩放
10 months ago
Obo-王学仁
78d6e7d3b6
Pull request #13566 : REPORT-111619 控件增强-更多的样式配置--报表支撑 自测问题修复3
...
Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0
* commit 'eddf184747f7a5cd0a08450aa121cc7fdf267c45':
REPORT-111619 控件增强-更多的样式配置--报表支撑 自测问题修复3
10 months ago
obo
eddf184747
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
10 months ago
obo
d943917c95
REPORT-111619 控件增强-更多的样式配置--报表支撑 自测问题修复3
10 months ago
vito
9d3a52475e
Merge branch 'newui' of ssh://code.fineres.com:7999/~vito/c-design into newui
10 months ago
vito
7ed5e6545d
REPORT-99485 TableLayoutHelper 适配DPI缩放
10 months ago
Obo-王学仁
1dfb1851f1
Pull request #13564 : REPORT-111619 控件增强-更多的样式配置--报表支撑 自测问题修复
...
Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0
* commit 'b269562fa7af7d6138d497150df45b2e1e6f82df':
REPORT-111619 控件基础面板的字体名面板初始化
REPORT-111619 控件增强-更多的样式配置--报表支撑 自测问题修复
10 months ago
obo
b269562fa7
REPORT-111619 控件基础面板的字体名面板初始化
10 months ago
obo
d225c0aba1
REPORT-111619 控件增强-更多的样式配置--报表支撑 自测问题修复
10 months ago
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
Levy.Xie-解安森
fc87a0c8f9
Pull request #13556 : REPORT-111995 【UI翻新】滚动面板补充storyboard&解决控件面板一些问题
...
Merge in DESIGN/design from ~LEVY.XIE/design:newui to newui
* commit '2e06f2d7f185ac8aff95b1031837cd31829a92ad':
REPORT-111995 【UI翻新】滚动面板补充storyboard&解决控件面板一些问题
10 months ago