superman
|
e408b5ee40
|
Merge pull request #661 in BA/design from ~LEE/design_release:release to release
* commit 'a2a7a6bd155c5bd97ac181cc37b4e603affde8d7':
REPORT-1808 字体,背景
|
8 years ago |
lee
|
a2a7a6bd15
|
REPORT-1808 字体,背景
1.字体设置之后的控件的宽度,导致设计器端的显示异常。
2.背景设置恢复默认之后,后台的属性设置为空。
|
8 years ago |
superman
|
883f6a580a
|
Merge pull request #660 in BA/design from ~LEE/design_release:release to release
* commit '3b5c88284205dfe01a381e182fb4ba357914b846':
REPORT-1808 font空值判断给予默认值
|
8 years ago |
lee
|
3b5c882842
|
REPORT-1808 font空值判断给予默认值
|
8 years ago |
superman
|
1243b1c491
|
Merge pull request #655 in BA/design from ~HUGH/design:release to release
* commit '6a8b12b3b109de89384b1b5de118bfb7e9d1525d':
遗漏了一个地方
之前接口开得有问题,部署时算子初始化会出错【读不到函数,因为依赖中有designer的类】
更改接口,分离原来的方法,单独成接口,为了方便算子生成时获取分组接口里面的函数。没有动FinctionGroup这个接口,因为动这里牵扯太广了,单独做一个接口专职获取公式就好
|
8 years ago |
superman
|
5c7a0b5130
|
Merge pull request #658 in BA/design from ~LEE/design_release:release to release
* commit '001aab092b24f24154103d2b6d54e5ccc53f9c4a':
1
|
8 years ago |
lee
|
001aab092b
|
1
1
|
8 years ago |
superman
|
a1fef7c518
|
Merge pull request #657 in BA/design from ~LEE/design_release:release to release
* commit '2dad275f38b868bab361a6ff18b51ad0b7344ea9':
REPORT-1808 设计器内tab bug修复
|
8 years ago |
lee
|
2dad275f38
|
REPORT-1808 设计器内tab bug修复
1.嵌套情况下,删除不起效果。
2.删除最后一个没有提示。
3.字体自定义之后再设置默认,字体没有变回来。
|
8 years ago |
superman
|
a0368e7dcc
|
Merge pull request #656 in BA/design from ~PLOUGH/design:release to release
* commit '2c50ee981b85daf7483d335720996447448b0466':
REPORT-1390 设计器中,在选中“悬浮元素”时,隐藏右侧的“单元格属性表”面板
|
8 years ago |
superman
|
776ea87c51
|
Merge pull request #653 in BA/design from ~LEE/design_release:release to release
* commit '49e88c6ced05c9f6853550e5ef9da6179189a7fd':
REPORT-576 字体设置功能完善
|
8 years ago |
plough
|
2c50ee981b
|
REPORT-1390 设计器中,在选中“悬浮元素”时,隐藏右侧的“单元格属性表”面板
|
8 years ago |
hugh
|
6a8b12b3b1
|
遗漏了一个地方
|
8 years ago |
hugh
|
dcb837a721
|
之前接口开得有问题,部署时算子初始化会出错【读不到函数,因为依赖中有designer的类】
|
8 years ago |
hugh
|
406c5e7d1b
|
更改接口,分离原来的方法,单独成接口,为了方便算子生成时获取分组接口里面的函数。没有动FinctionGroup这个接口,因为动这里牵扯太广了,单独做一个接口专职获取公式就好
|
8 years ago |
lee
|
49e88c6ced
|
REPORT-576 字体设置功能完善
|
8 years ago |
superman
|
dede814828
|
Merge pull request #652 in BA/design from ~LEE/design_release:release to release
* commit '3e336de89112134b56027d55542717a26f04e6a2':
1
国际化文件
|
8 years ago |
lee
|
3e336de891
|
1
1
|
8 years ago |
lee
|
bbff9a6b83
|
国际化文件
|
8 years ago |
superman
|
cabf42ac13
|
Merge pull request #650 in BA/design from ~HUGH/design:release to release
* commit '9d9cbacef0bd50a56148f4b7ae28648ca1f9db31':
调整国际化,命名之类的
把原来代码重不符合PMD要求的更正了
换个地方再开~
为自定义函数进行分组【一次引入一组公式用,比如财务主题公式】
|
8 years ago |
hugh
|
9d9cbacef0
|
调整国际化,命名之类的
|
8 years ago |
hugh
|
fe67f6ad45
|
把原来代码重不符合PMD要求的更正了
|
8 years ago |
hugh
|
29fdfce305
|
换个地方再开~
|
8 years ago |
hugh
|
5fa2691e8d
|
为自定义函数进行分组【一次引入一组公式用,比如财务主题公式】
|
8 years ago |
superman
|
27082090d6
|
Merge pull request #644 in BA/design from ~LEE/design_release:release to release
* commit '53068a5b3608156b16088f421995bbc0eceaac91':
无jiar任务 早上代码漏传了
|
8 years ago |
PanLi320
|
53068a5b36
|
无jiar任务 早上代码漏传了
|
8 years ago |
superman
|
5331dc7d4d
|
Merge pull request #643 in BA/design from ~LEE/design_release:release to release
* commit 'a869832d99fd999684129aa43ca097254b1bba62':
REPORT-576 font代码调整
|
8 years ago |
PanLi320
|
a869832d99
|
REPORT-576 font代码调整
|
8 years ago |
superman
|
47a2b6b0f2
|
Merge pull request #641 in BA/design from ~LEE/design_release:release to release
* commit '8d9ddb0502227685c5eecd0cda291b930289c0b1':
REPORT-576 tab中button内容自动扩展bug修复
|
8 years ago |
PanLi320
|
8d9ddb0502
|
REPORT-576 tab中button内容自动扩展bug修复
|
8 years ago |
superman
|
908dbd687c
|
Merge pull request #637 in BA/design from ~LEE/design_release:release to release
* commit '6d32ba0c7bc42d62fd918a3ff77892cf5d6cd557':
1
代码调整
REPORT-1438 属性控制,之前直接拿的button的属性,多了一个样式的
REPORT-576 tab button输入标题内容自动变宽
|
8 years ago |
superman
|
6376514b9b
|
Merge pull request #638 in BA/design from ~XIAOHU/design:master to master
* commit 'd87a903c8116bf14941e8aa26555f57e4d236182':
下拉框监听器
|
8 years ago |
Fangjie Hu
|
d87a903c81
|
下拉框监听器
|
8 years ago |
PanLi320
|
6d32ba0c7b
|
1
1
|
8 years ago |
PanLi320
|
83da497124
|
代码调整
|
8 years ago |
PanLi320
|
e5903dbf9d
|
REPORT-1438 属性控制,之前直接拿的button的属性,多了一个样式的
这边条件判断取一下,留下两个默认的属性即可。
|
8 years ago |
PanLi320
|
002cb45615
|
REPORT-576 tab button输入标题内容自动变宽
|
8 years ago |
superman
|
6dcd58259d
|
Merge pull request #635 in BA/design from ~LEE/design_release:release to release
* commit '5cc464edb21f82e7b61bc4a4867540227ea9f1b5':
REPORT-576 dev内代码完善到release中
|
8 years ago |
PanLi320
|
5cc464edb2
|
REPORT-576 dev内代码完善到release中
button初始化背景颜色
|
8 years ago |
superman
|
d845c90456
|
Merge pull request #633 in BA/design from ~PLOUGH/design:master to master
* commit '11fb4878f357c4f46fff2fe2b10142cfd82ee0f3':
REPORT-1417 中文设计器,取色器更多颜色下确定取消按钮显示为英文key值
|
8 years ago |
plough
|
11fb4878f3
|
REPORT-1417 中文设计器,取色器更多颜色下确定取消按钮显示为英文key值
|
8 years ago |
superman
|
f0af16ebfc
|
Merge pull request #630 in BA/design from ~NEIL/design:release to master
* commit '96519eca895b24cc8a0b945c5aec98ec61197345': (53 commits)
ct
REPORT-1096 取色板=》调整代码
REPORT-1096 取色板=》修复在实时模式下,无法取消颜色拾取的问题
populate之前,移除控件本身的listener
update
删除当前按钮时,也要考虑重新更新面板
REPORT-1096 取色板=》修复一些bug
下拉框重构时,不能触发更新动作
无JIRA任务。调整代码。
REPORT-1096 不继承UIButton
无JIRA任务。调整代码。
无JIRA任务。整理代码
REPORT-1096 在“纸张背景”窗口中增加取色器按钮
REPORT-1096 自定义界面的颜色随鼠标位置动态变化;修改取色框的UI
REPORT-1096 完成基本功能
无JIRA任务,给CustomChooserPanel.java 调整缩进
REPORT-1096 将取色按钮封装为一个类
REPORT-1096 实现第一个界面(下拉颜色选择框)里的取色器功能
REPORT-1287 属性返回数组代码问题
返回空数组
...
|
8 years ago |
neil
|
96519eca89
|
ct
|
8 years ago |
superman
|
7d50ddc86e
|
Merge pull request #628 in BA/design from ~LEE/design:dev to dev
* commit '36624f09ce9a2b5a40dbb021943d8387ea02e348':
调整格式
调整一下
调整一下
调整一下
REPORT-576 tab属性部分添加
|
8 years ago |
PanLi320
|
36624f09ce
|
调整格式
|
8 years ago |
PanLi320
|
f08d6748e2
|
调整一下
|
8 years ago |
PanLi320
|
80b069f065
|
调整一下
|
8 years ago |
PanLi320
|
a73679be40
|
调整一下
|
8 years ago |
PanLi320
|
bfd06483b7
|
REPORT-576 tab属性部分添加
|
8 years ago |
superman
|
a8e17c2632
|
Merge pull request #621 in BA/design from ~PLOUGH/design:dev to dev
* commit 'a7fafda5a41b5f8b74206a4b24be38e03b26ac5e':
REPORT-1096 取色板=》调整代码
REPORT-1096 取色板=》调整代码
无JIRA任务。修改代码
REPORT-1096 取色板=》解决一些bug
REPORT-1096 取色板=》将取色框改为模态对话框;修改鼠标事件响应方法
REPORT-1096 取色板=》改为只在按下鼠标左键时设置颜色
|
8 years ago |