kerry
110f355ade
REPORT-35149 预定义样式优化及与图表统一
4 years ago
superman
7a1abdb4e3
Merge pull request #964 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '5c535d5122ee3eea079dbe74df78922725b58979':
4 years ago
superman
5c535d5122
Merge pull request #963 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'f1686631cdb8b494842014ab3edf20670c7a5607':
4 years ago
superman
f1686631cd
Merge pull request #962 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit 'aa73c7679cc90f26088d2e11604682b98ce17aa3':
4 years ago
superman
aa73c7679c
Merge pull request #961 in DESIGN/design-i18n from persist/10.0 to final/10.0
...
* commit 'bc1683f4397c198ed689d248878a940b8b1ae336':
4 years ago
Kara
bc1683f439
Pull request #960 : 无jira任务, final/10.0 合 persist/10.0
...
Merge in DESIGN/design-i18n from final/10.0 to persist/10.0
* commit '25ccacb11c1bff73c32d7f2adf0ab78cbd88f8bd':
4 years ago
ju.ju
195d48b02a
Pull request #933 : 无jira 解决冲突
...
Merge in DESIGN/design-i18n from ~HADES/design-i18n:feature/10.0 to feature/10.0
* commit 'a8a927fe7571d2a2204ab165757e40407798477b':
无jira 解决冲突
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
4 years ago
hades
a8a927fe75
无jira 解决冲突
4 years ago
hades
a2a0d07e3c
无jira 解决冲突
4 years ago
superman
0b401908d2
Merge pull request #930 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'db1f35a6fb8c731c05819521dee590d4b3963da2':
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
4 years ago
Yvan
db1f35a6fb
Pull request #924 : REPORT-38516 【回归】模板重命名界面,输入框显示不全
...
Merge in DESIGN/design-i18n from ~YVAN/design-i18n:release/10.0 to release/10.0
* commit '3e4594254ea24be53f95c9d31b8f076db4ef35ef':
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
4 years ago
Yvan
3e4594254e
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
4 years ago
Bjorn
04a3dbc062
Pull request #918 : CHART-15566 国际化
...
Merge in DESIGN/design-i18n from ~BJORN/design-i18n:feature/10.0 to feature/10.0
* commit 'f72c932f6d5f1592275807412aba5ca8a430feca':
CHART-15566 国际化
4 years ago
白岳
f72c932f6d
CHART-15566 国际化
4 years ago
superman
2a4611e6d3
Merge pull request #901 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '114f84a75110db02ceb3eba82fb43f731db6e0eb':
CHART-15510 调整富文本标签和数据点提示界面
4 years ago
superman
114f84a751
Merge pull request #900 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'e605f4cb00540a78e564f7f244f72f2a8ce7046e':
CHART-15510 调整富文本标签和数据点提示界面
4 years ago
eason
e605f4cb00
Pull request #892 : CHART-15510 调整富文本标签和数据点提示界面
...
Merge in DESIGN/design-i18n from ~QINGHUI.LIU/design-i18n:release/10.0 to release/10.0
* commit 'c0c8bb5accc16f6551144eb9609d7aed390ceac2':
CHART-15510 调整富文本标签和数据点提示界面
4 years ago
Qinghui.Liu
c0c8bb5acc
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design-i18n into release/10.0
4 years ago
Qinghui.Liu
35060a27c8
CHART-15510 调整富文本标签和数据点提示界面
4 years ago
kerry
6cc513d111
Pull request #876 : REPORT-35149 预定义样式优化及与图表统一
...
Merge in DESIGN/design-i18n from ~KERRY/design-i18n:feature/10.0 to feature/10.0
* commit '32be2b38915c886b204240d61d2c4843c23f5121':
REPORT-35149 预定义样式优化及与图表统一
4 years ago
kerry
32be2b3891
REPORT-35149 预定义样式优化及与图表统一
4 years ago
superman
419efa0d79
Merge pull request #874 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '33f787fef91321346cc37c363f7ff84b5db0847b':
REPORT-26209 国际化crm模板->代码库同步
4 years ago
superman
33f787fef9
Merge pull request #873 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '4cc3fc4ef8b07b03b2095572ded19c586a01f258':
REPORT-26209 国际化crm模板->代码库同步
4 years ago
lidongy
4cc3fc4ef8
Pull request #870 : REPORT-26209 国际化crm模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit 'e503dd2e8d3e862e1b302ac3870fe1bf4e9b7570':
REPORT-26209 国际化crm模板->代码库同步
4 years ago
lidongy
e503dd2e8d
REPORT-26209 国际化crm模板->代码库同步
4 years ago
superman
fd5d4fe2a8
Merge pull request #843 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '7986aad0468ab05d64875317b8a8df7f1681c359':
4 years ago
superman
7986aad046
Merge pull request #842 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '0491f09529908f8ad2e7d42f0eb690a67f87a544':
4 years ago
kerry
2ae46ab753
Pull request #839 : REPORT-35149 预定义样式优化及与图表统一
...
Merge in DESIGN/design-i18n from ~KERRY/design-i18n:feature/10.0 to feature/10.0
* commit '7b5781e8b50ad051989e10407ea4b45e2606cec7':
REPORT-35149 预定义样式优化及与图表统一
4 years ago
kerry
7b5781e8b5
解决冲突
4 years ago
superman
0491f09529
Merge pull request #838 in DESIGN/design-i18n from bugfix/10.0 to release/10.0
...
* commit '290435a5d38f764cda1fd89e7e93cbac2e031668':
4 years ago
superman
290435a5d3
Merge pull request #837 in DESIGN/design-i18n from feature/10.0 to bugfix/10.0
...
* commit '2b0c86e1e4b358f1873961f05426f5b64f0f1602':
4 years ago
superman
2b0c86e1e4
Merge pull request #829 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '9467f9d6bce33eabd2594eba9c8877ce06996be6':
无jira任务 chore:删除错误数据
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
superman
9467f9d6bc
Merge pull request #828 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'e758c31e598fc59cbad30ddb49491e6d1e2eb84e':
无jira任务 chore:删除错误数据
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
kerry
89c5829570
REPORT-35149 预定义样式优化及与图表统一
4 years ago
lidongy
e758c31e59
Pull request #823 : 无jira任务 chore:删除错误数据
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit '47a31e4f3d9133c2b95c41a2a2ffcb96a2f22fb1':
无jira任务 chore:删除错误数据
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
lidongy
47a31e4f3d
无jira任务 chore:删除错误数据
4 years ago
lidongy
04efbe67de
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
superman
ade391a507
Merge pull request #822 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '7f98886b39af184c5023f7e0d0b30618534c18f9':
CHART-15510 标签和提示中插入BI的富文本编辑器
4 years ago
superman
7f98886b39
Merge pull request #821 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'b55084e6b0dbb0fa1d2476935bd6064b3a7a7992':
CHART-15510 标签和提示中插入BI的富文本编辑器
4 years ago
eason
b55084e6b0
Pull request #791 : CHART-15510 标签和提示中插入BI的富文本编辑器
...
Merge in DESIGN/design-i18n from ~QINGHUI.LIU/design-i18n:release/10.0 to release/10.0
* commit 'c728c200203dbb23c9f3b31fa63037ce72d010ea':
CHART-15510 标签和提示中插入BI的富文本编辑器
4 years ago
superman
f6d19c7347
Merge pull request #814 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '8c3484662ec33ef64d407dae756725a9dae111db':
REPORT-26209 style: 国际化crm模板->代码库同步
4 years ago
superman
8c3484662e
Merge pull request #813 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '454e99894ab5093ab6a0aa2ebef06d3321870555':
REPORT-26209 style: 国际化crm模板->代码库同步
4 years ago
lidongy
454e99894a
Pull request #806 : REPORT-26209 style: 国际化crm模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit '4a07c1c175a503b67b71f58f6d6b11bb819a7303':
REPORT-26209 style: 国际化crm模板->代码库同步
4 years ago
superman
b1c0220fb8
Merge pull request #810 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '7ad1060119adee03518d32fe108c61f466f00ad6':
4 years ago
superman
7ad1060119
Merge pull request #809 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '4c0c18bebfc52b1b9c21d590539d6484b70bcba8':
4 years ago
lidongy
4a07c1c175
REPORT-26209 style: 国际化crm模板->代码库同步
4 years ago
superman
4c0c18bebf
Merge pull request #805 in DESIGN/design-i18n from bugfix/10.0 to release/10.0
...
* commit '985253c4ef05a580502b07df1ae38f602184b8db':
4 years ago
superman
985253c4ef
Merge pull request #804 in DESIGN/design-i18n from feature/10.0 to bugfix/10.0
...
* commit '80a725f24dfd17b685e0294f5a0ca9b726ddfff2':
4 years ago
Qinghui.Liu
c728c20020
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design-i18n into release/10.0
4 years ago
Qinghui.Liu
1722c2c80d
CHART-15510 标签和提示中插入BI的富文本编辑器
4 years ago