kerry
6cb20ba768
修改
4 years ago
kerry
552e0b09c9
REPORT-35149 预定义样式功能feature合到release
4 years ago
superman
6c06d03fde
Merge pull request #1172 in DESIGN/design-i18n from feature/10.0 to research/10.0
...
* commit '122197019a715e040cf3c2625a44378d2f036f12':
4 years ago
superman
122197019a
Merge pull request #1171 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit 'c1a3daa484bf7a665918c86e1e3f5a6695f96fae':
4 years ago
superman
c1a3daa484
Merge pull request #1170 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'a1ff334a8ba3032d1e426cd953fae5836f3ded7c':
4 years ago
superman
a1ff334a8b
Merge pull request #1169 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit 'ef3b6c3e60ebb813e255dfe9c7e3b731f8dc00d1':
4 years ago
superman
ef3b6c3e60
Merge pull request #1168 in DESIGN/design-i18n from persist/10.0 to final/10.0
...
* commit '0af4d12cd6d29107c36766e4b8dbc136985f8158':
4 years ago
superman
0af4d12cd6
Merge pull request #1164 in DESIGN/design-i18n from final/10.0 to persist/10.0
...
* commit 'e88c0d71fbfc2680fe09b307e4d46fe7f51c2f1f':
4 years ago
superman
6766403ad6
Merge pull request #1161 in DESIGN/design-i18n from feature/10.0 to research/10.0
...
* commit 'f21c6a89ae50d93c113b335311f9f0b5077f61e8':
REPORT-40646 远程设计对接平台密码策略 国际化
4 years ago
Hades
f21c6a89ae
Pull request #1160 : 无jira 解决冲突
...
Merge in DESIGN/design-i18n from ~HADES/design-i18n:feature/10.0 to feature/10.0
* commit '0d341d52ebec0e0615b3159f49344670db5e222f':
REPORT-40646 远程设计对接平台密码策略 国际化
4 years ago
hades
0d341d52eb
无jira 解决冲突
4 years ago
superman
9d02c89074
Merge pull request #1157 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'c6204d7c4ec620235b9435ca80fa4656b5f98e3f':
REPORT-40646 远程设计对接平台密码策略 国际化
4 years ago
Hades
c6204d7c4e
Pull request #1147 : REPORT-40646 远程设计对接平台密码策略 国际化
...
Merge in DESIGN/design-i18n from ~HADES/design-i18n:release/10.0 to release/10.0
* commit '3546624b8dc142d3d40914f6bbb5f6118a2da792':
REPORT-40646 远程设计对接平台密码策略 国际化
4 years ago
superman
8c7e94c7ea
Merge pull request #1154 in DESIGN/design-i18n from feature/10.0 to research/10.0
...
* commit '3f91298768acf419b3a98b8f9449678384c711e4':
REPORT-26209 chore:国际化crm模板->代码库同步
CHART-15902 分类轴标签显示方式界面
4 years ago
superman
3f91298768
Merge pull request #1153 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '95459aa7e3c9e3d633c9b3619fd61d34fec51e55':
REPORT-26209 chore:国际化crm模板->代码库同步
CHART-15902 分类轴标签显示方式界面
4 years ago
superman
95459aa7e3
Merge pull request #1152 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '7f776f25eef0ca6e822221e2b44bb09a7787d254':
REPORT-26209 chore:国际化crm模板->代码库同步
CHART-15902 分类轴标签显示方式界面
4 years ago
superman
7f776f25ee
Merge pull request #1151 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit 'e88c0d71fbfc2680fe09b307e4d46fe7f51c2f1f':
4 years ago
superman
e88c0d71fb
Merge pull request #1150 in DESIGN/design-i18n from persist/10.0 to final/10.0
...
* commit '91c6dc45d4ab3a8412f7e9f159e9edb75657a759':
4 years ago
lidongy
39aea41712
Pull request #1148 : REPORT-26209 chore:国际化crm模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit 'c808a5d3b4f0d37e844cafaf06576fa430a52cf4':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
superman
91c6dc45d4
Merge pull request #1149 in DESIGN/design-i18n from final/10.0 to persist/10.0
...
* commit 'ff6e1d70d203e6956493a9003a4346eec8c2aa00':
4 years ago
lidongy
c808a5d3b4
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~lidongy/design-i18n into release/10.0
4 years ago
lidongy
22f2a2182f
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
Qinghui.Liu
b8b47a8775
Pull request #1146 : CHART-15902 分类轴标签显示方式界面
...
Merge in DESIGN/design-i18n from ~QINGHUI.LIU/design-i18n:release/10.0 to release/10.0
* commit 'd3c5aa88f24b7c0bb2b652e98c1dff19a12ea489':
CHART-15902 分类轴标签显示方式界面
4 years ago
hades
3546624b8d
REPORT-40646 远程设计对接平台密码策略 国际化
4 years ago
Qinghui.Liu
d3c5aa88f2
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design-i18n into release/10.0
...
# Conflicts:
# design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties
# design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties
# design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties
# design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties
# design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties
# design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties
4 years ago
Qinghui.Liu
07a94e3a24
CHART-15902 分类轴标签显示方式界面
4 years ago
superman
680f82cd93
Merge pull request #1145 in DESIGN/design-i18n from feature/10.0 to research/10.0
...
* commit '6ff0ff3a09c3beb4bc9b09312882537d0645e6d8':
4 years ago
superman
6ff0ff3a09
Merge pull request #1139 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit 'd86be5066b0452127a99c1badcfce227f6ad7556':
4 years ago
superman
d86be5066b
Merge pull request #1138 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '7218dda0c1438c0127c56de265f26d56d0f028dc':
4 years ago
superman
7218dda0c1
Merge pull request #1137 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit 'ff6e1d70d203e6956493a9003a4346eec8c2aa00':
4 years ago
superman
ff6e1d70d2
Merge pull request #1134 in DESIGN/design-i18n from persist/10.0 to final/10.0
...
* commit '6d8ed4225deb2d14ab6f9ffe4010dcf854782044':
4 years ago
superman
6d8ed4225d
Merge pull request #1133 in DESIGN/design-i18n from final/10.0 to persist/10.0
...
* commit '389f225b453e86d4dc1dd38a3d883af2badeeabf':
4 years ago
superman
6689a3ebff
Merge pull request #1132 in DESIGN/design-i18n from feature/10.0 to research/10.0
...
* commit '87f2a55c97887e7edbd47408798d986762d5fc1e':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
superman
87f2a55c97
Merge pull request #1131 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit 'ffb23a902eb6bf0a15d204b7fdc22e6031125a51':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
superman
ffb23a902e
Merge pull request #1130 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '94412f4d40b1c2971addbbb853923b657d07eb88':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
lidongy
94412f4d40
Pull request #1127 : REPORT-26209 chore:国际化crm模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit '7cabd12131a0b97982a8d4f3bd01d33602bf2c35':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
lidongy
7cabd12131
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
superman
0354377fa9
Merge pull request #1112 in DESIGN/design-i18n from feature/10.0 to research/10.0
...
* commit 'e7ee4c4d251bbde33b7388c27cd9b1d25e436b78':
4 years ago
superman
e7ee4c4d25
Merge pull request #1111 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit 'fb9c2b7558c2cf9dc379c26ef164469f494a62fb':
4 years ago
superman
fb9c2b7558
Merge pull request #1110 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'c29214af51313a37027163ee7d7c1c75bcf32ff6':
4 years ago
superman
c29214af51
Merge pull request #1109 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit '389f225b453e86d4dc1dd38a3d883af2badeeabf':
4 years ago
superman
389f225b45
Merge pull request #1108 in DESIGN/design-i18n from persist/10.0 to final/10.0
...
* commit '716ee00ab2ae7c9680ef51e30543d2e186b98aba':
4 years ago
superman
caa05bfefb
Merge pull request #1107 in DESIGN/design-i18n from feature/10.0 to research/10.0
...
* commit '9210cb6ea085749d6797a1a038469cc2715c2e4a':
REPORT-41753【预定义样式】如果新设计器远程老jar,显示的默认预定义不是兼容
4 years ago
superman
716ee00ab2
Merge pull request #1106 in DESIGN/design-i18n from final/10.0 to persist/10.0
...
* commit '7a0542beb376566198485f49f001d48639d19134':
REPORT-26209 chore:国际化crm模板->代码库同步
REPORT-26209 chore:国际化crm模板->代码库同步
REPORT-26209 chore:国际化crm模板->代码库同步
REPORT-39338 【回归】内置服务器启动进度条会先展示上次的进度再初始化 更新修改方案:不改变弹窗大小,将原本文字标签setPreferredSize注释掉,在FlowLayout布局下,标签大小会自适应,另外测试的时候发现在日语和韩语下文字显示不全,这是个以前就存在的问题,与产品和国际化同学沟通了,精简翻译,这次顺便一起改了 CHART-15905 最新的release插件,打开cpt空白,打开frm的,右侧面板打不开 【问题原因】之前改动的UISpinner,添加了一种传参为double、double、double、int的构造方法,与另一个原有的double、double、double、double冲突了,因为代码内很多地方都是传了四个int值进来,然后被绑定了新添加的那种构造方法 【改动思路】将新添加的构造方法传参修改为double、double、double、double、int,对第四个double值进行判断,如果等于Double.MIN_VALUE,就不做处理,否则正常设置为defaultValue
标签增加文本方向
CHART-15510 调整富文本标签和数据点提示界面
REPORT-26209 国际化crm模板->代码库同步
无jira任务 chore:删除错误数据
REPORT-26209 chore:国际化crm模板->代码库同步
REPORT-26209 style: 国际化crm模板->代码库同步
CHART-15510 标签和提示中插入BI的富文本编辑器
REPORT-26209 国际化crm模板->代码库同步
REPORT-37915 报表分栏弹窗显示未适配国际化 1. 为每种语言都适配了报表分栏弹窗中的示例图片 2. 修改对应国际化文件中代表此示例图片的文件名
REPORT-26209 国际化crm模板->代码库同步
REPORT-26209 国际化crm模板->代码库同步
MOBILE-28888 Tab手势样式设计器端开发 1. 移动端Tab属性面板新增三个tab通用属性,显示标题,滑动切换,显示圆点指示器(通用样式设置) 2. 兼容旧模版,转换Tab就样式分散的属性到Tab属性面板的通用属性 3. 新增中英文翻译
REPORT-26209 国际化crm模板->代码库同步
REPORT-26209 国际化crm模板->代码库同步
4 years ago
kerry
9210cb6ea0
Pull request #1101 : REPORT-41753【预定义样式】如果新设计器远程老jar,显示的默认预定义不是兼容
...
Merge in DESIGN/design-i18n from ~KERRY/design-i18n:feature/10.0 to feature/10.0
* commit '42c09e417e4a088cecd1334cca325480a0900461':
REPORT-41753【预定义样式】如果新设计器远程老jar,显示的默认预定义不是兼容
4 years ago
kerry
42c09e417e
REPORT-41753【预定义样式】如果新设计器远程老jar,显示的默认预定义不是兼容
4 years ago
superman
0191c85eb9
Merge pull request #1090 in DESIGN/design-i18n from feature/10.0 to research/10.0
...
* commit '72603e697a4d9c4da6fdfcca1e7febf19ac25788':
REPORT-35149 增加不支持tab的提示
4 years ago
kerry
72603e697a
Pull request #1080 : REPORT-35149 增加不支持tab的提示
...
Merge in DESIGN/design-i18n from ~KERRY/design-i18n:feature/10.0 to feature/10.0
* commit '4559e79b3fc9dabeb5a7d29c96e954e30a11ed58':
REPORT-35149 增加不支持tab的提示
4 years ago
superman
09d6bee3e7
Merge pull request #1085 in DESIGN/design-i18n from feature/10.0 to research/10.0
...
* commit '4bef9167bb99209cb35f76bb03d04bc6683180a6':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
superman
4bef9167bb
Merge pull request #1084 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '2dcd137500d53ada1742887b637b85147b42ecbb':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago