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
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
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
e88c0d71fb
Merge pull request #1150 in DESIGN/design-i18n from persist/10.0 to final/10.0
...
* commit '91c6dc45d4ab3a8412f7e9f159e9edb75657a759':
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
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
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
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
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
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
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
superman
2dcd137500
Merge pull request #1083 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '446dd69ddeed52017b8dc4b0976cf94accc1816c':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
kerry
4559e79b3f
REPORT-35149 增加不支持tab的提示
4 years ago
lidongy
446dd69dde
Pull request #1079 : REPORT-26209 chore:国际化crm模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit '6f43d7ecf51303ccdc653e0056dc0ddc7cdd6f98':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
lidongy
6f43d7ecf5
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
superman
490b80d10f
Merge pull request #1074 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '4f896127538556718e3f14adfcc7f00ff8321711':
4 years ago
superman
4f89612753
Merge pull request #1073 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'b51fb6bfd21cc63ebe113e9b86504ad1c5420442':
4 years ago
superman
b51fb6bfd2
Merge pull request #1072 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit '7a0542beb376566198485f49f001d48639d19134':
4 years ago
superman
c57cac09cc
Merge pull request #1068 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit 'affcb75c863350a8ca3fb918b9e54e29e9bdddcf':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
superman
7a0542beb3
Merge pull request #1069 in DESIGN/design-i18n from release/10.0 to final/10.0
...
* commit '334bf1b396e6fae755aea6f80bf6121104f2b8d1':
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
superman
affcb75c86
Merge pull request #1067 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '334bf1b396e6fae755aea6f80bf6121104f2b8d1':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
lidongy
334bf1b396
Pull request #1064 : REPORT-26209 chore:国际化crm模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit '681b216f7bfa36be2b5c20327db4b4d5b0eb63f2':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
lidongy
681b216f7b
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
superman
6da5cc2b9e
Merge pull request #1057 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit 'c34c63c811d0ef70c64722ee67146d5ee957c266':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
superman
c34c63c811
Merge pull request #1056 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'a329402dd3a85a85c5d9228ecf6d87992961c86c':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
lidongy
a329402dd3
Pull request #1053 : REPORT-26209 chore:国际化crm模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit '6fe1e52bdceab333b237e07a3eecc99ed8ebb8e4':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
lidongy
6fe1e52bdc
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
superman
962a35c96b
Merge pull request #1045 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit 'b7bbd32872d454bad8680872fead0f35e0015cbd':
标签增加文本方向
4 years ago