fanglei
13f832ef78
Pull request #7029 : REPORT-63499 按钮控件树节点配置控件事件,设计器上显示有问题
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit 'ca2fcb358e038e9564ac0f5edc6aad48c554316d':
REPORT-63092 漏传了import语句
REPORT-63499
REPORT-63499 按钮控件树节点配置控件事件,设计器上显示有问题
3 years ago
方磊
ca2fcb358e
REPORT-63092 漏传了import语句
3 years ago
方磊
72b7bdacae
REPORT-63499
3 years ago
hades
596486c056
REPORT-62882 websocket攻坚落地(远程设计适配)
3 years ago
方磊
c19bb8edeb
REPORT-63499 按钮控件树节点配置控件事件,设计器上显示有问题
3 years ago
zheng
11bdd55efc
Pull request #7027 : CHART-21584 feat:fvs.chart.font 单位px 范围6-200
...
Merge in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit 'adf49bfded20a12f7fc261119314b1fc582069f4':
update
CHART-21584 feat:fvs.chart.font 单位px 范围6-200
3 years ago
Starryi
fafd3b57bd
REPORT-63760 【主题切换】撤销以后,样式设置有问题
...
【问题原因】
背景色控件中父组件ColorBackgroundQuickPane
和子组件NewColorSelectBox内部实现,都给
NewColorSelectBox添加了监听器,导致颜色值发生
一次更改后,调用了两次回调,产生了两个UndoState
【改动思路】
ColorBackgroundQuickPane的UIObserver实现置空
3 years ago
Starryi
59b84da228
REPORT-63760 【主题切换】撤销以后,样式设置有问题
...
【问题原因】
撤销和重做时都需要重置模版主题样式
【改动思路】
同上
3 years ago
shine
adf49bfded
update
3 years ago
shine
043a81042d
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/10.0
3 years ago
shine
a74ef15eb8
CHART-21584 feat:fvs.chart.font 单位px 范围6-200
3 years ago
Tommy
2313fa818d
Pull request #6992 : REPORT-62743 服务器启动模态框位置异常
...
Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0
* commit 'fa6eb6a145eb4f20442fefd4b25311fe4ebd85a8':
REPORT-62743 服务器启动模态框位置异常
3 years ago
starryi
4396805594
Pull request #6990 : REPORT-56014 & REPORT-56015 & REPORT-60161
...
Merge in DESIGN/design from ~STARRYI/design:bugfix/10.0 to bugfix/10.0
* commit '84b3103890b1620c393be4657a8ca9720301f800':
REPORT-60161 【组件背景分离】设置九点图的线在边界上后,其他操作回来发现恢复成默认井字型
REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图,如果线重叠了的话,web端显示有问题
3 years ago
fly.li
30748629ae
Merge branch 'feature/x' of https://code.fineres.com/scm/~fly.li/design into feature/x
3 years ago
fly.li
9d4d8e8097
REPORT-55240:修改一下设计器关于报表引擎的设置界面
3 years ago
superman
b561bc3d66
Merge pull request #7016 in DESIGN/design from release/11.0 to feature/x
...
* commit '5d2b7133de2da0d6e3898a116306dfd193f04f1d':
REPORT-63092 组件复用-拖入带数据集的复用组件,删除设计画布中的组件后,数据集没有被删除
REPORT-63729 填报-控件-控件数据字典设置显示值为公式时,公式界面关几次才关得掉
REPORT-63729 填报-控件-控件数据字典设置显示值为公式时,公式界面关几次才关得掉
3 years ago
superman
5d2b7133de
Merge pull request #7015 in DESIGN/design from final/11.0 to release/11.0
...
* commit '7b3aafba5ec2389cf15bbd0971697ee6a440e090':
REPORT-63729 填报-控件-控件数据字典设置显示值为公式时,公式界面关几次才关得掉
3 years ago
superman
7b3aafba5e
Merge pull request #7014 in DESIGN/design from persist/11.0 to final/11.0
...
* commit 'e99eb7e160ab57e9974825ab43ef40571d657b6c':
3 years ago
superman
c5c3d41c30
Merge pull request #7010 in DESIGN/design from release/10.0 to release/11.0
...
* commit '925f5058768a450212da7fd55df7689002f2c67f':
REPORT-63092 组件复用-拖入带数据集的复用组件,删除设计画布中的组件后,数据集没有被删除
3 years ago
superman
52925ffe09
Merge pull request #7009 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '925f5058768a450212da7fd55df7689002f2c67f':
REPORT-63092 组件复用-拖入带数据集的复用组件,删除设计画布中的组件后,数据集没有被删除
3 years ago
superman
925f505876
Merge pull request #7008 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'dc6b99807e495492062639ce007cc6c831616798':
3 years ago
superman
dc6b99807e
Merge pull request #7007 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'c60528cff2e0ecb91224714bc407efce7792437d':
3 years ago
superman
c60528cff2
Merge pull request #7006 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'b5ae394a59595d62ef2acfd102773d84b0a55f2e':
3 years ago
superman
e99eb7e160
Merge pull request #7005 in DESIGN/design from final/11.0 to persist/11.0
...
* commit '5c79b710d270d8bf0409ac2b22765b59b50594a7':
REPORT-63729 填报-控件-控件数据字典设置显示值为公式时,公式界面关几次才关得掉
CHART-22060 fix:fvs.cpt.chart 渲染使用的默认配色和配置界面默认不同 同fvs.chart指定配色
3 years ago
fanglei
93e04b27fc
Pull request #7004 : REPORT-63092 组件复用-拖入带数据集的复用组件,删除设计画布中的组件后,数据集没有被删除
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit '69ed61a95692120a21f786ce5c837cb4730ba374':
REPORT-63092 组件复用-拖入带数据集的复用组件,删除设计画布中的组件后,数据集没有被删除
3 years ago
方磊
69ed61a956
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~fanglei/design into release/10.0
...
* 'release/10.0' of ssh://cloud.finedevelop.com:7999/~fanglei/design:
REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后,自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置
CHART-22038 决策报表,安装ECharts后,图表块插入图表区域不显示echarts的图标
REPORT-63305 设计器获取父容器,需要对拓展的布局插件兼容处理下
3 years ago
方磊
dceeb24569
REPORT-63092 组件复用-拖入带数据集的复用组件,删除设计画布中的组件后,数据集没有被删除
3 years ago
fanglei
5c79b710d2
Pull request #7003 : REPORT-63729 填报-控件-控件数据字典设置显示值为公式时,公式界面关几次才关得掉
...
Merge in DESIGN/design from ~FANGLEI/design:final/11.0 to final/11.0
* commit 'f7b1fd6f1945bb6f55ab23f3a83ae2e61d4d6cd0':
REPORT-63729 填报-控件-控件数据字典设置显示值为公式时,公式界面关几次才关得掉
3 years ago
fanglei
1644f79c97
Pull request #6991 : REPORT-63729 填报-控件-控件数据字典设置显示值为公式时,公式界面关几次才关得掉
...
Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0
* commit 'f0e6bc120b0ab04a5f206ed7a827a676d5ba91be':
REPORT-63729 填报-控件-控件数据字典设置显示值为公式时,公式界面关几次才关得掉
3 years ago
方磊
f7b1fd6f19
REPORT-63729 填报-控件-控件数据字典设置显示值为公式时,公式界面关几次才关得掉
3 years ago
superman
fa62be832b
Merge pull request #7002 in DESIGN/design from release/11.0 to feature/x
...
* commit 'd58018f922fc036e0f49fe5ef24fec46a5ba3fd6':
REPORT-63675
REPORT-63675 自动构建的下拉树数据字典点击后数据集字段会变化
3 years ago
Tommy
fa6eb6a145
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~tommy/design into release/11.0
3 years ago
Tommy
6c1cd3471f
REPORT-62743 服务器启动模态框位置异常
3 years ago
fanglei
d58018f922
Pull request #6989 : REPORT-63675 自动构建的下拉树数据字典点击后数据集字段会变化
...
Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0
* commit 'ea39f1b4473c4659c7578b0bd79dd610ce2a98b9':
REPORT-63675
REPORT-63675 自动构建的下拉树数据字典点击后数据集字段会变化
3 years ago
方磊
f0e6bc120b
REPORT-63729 填报-控件-控件数据字典设置显示值为公式时,公式界面关几次才关得掉
3 years ago
Starryi
84b3103890
REPORT-60161 【组件背景分离】设置九点图的线在边界上后,其他操作回来发现恢复成默认井字型
...
【问题原因】
点九图边界线值为0也是有效值
【改动思路
3 years ago
Starryi
6621921d0d
REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图,如果线重叠了的话,web端显示有问题
...
【问题原因】
点九图小而组件大,且中间不可缩放的尺寸为0时,就会出现空白。从点九图的
使用机制上看无法避免上上述情况,需要在生成点九图的时候,强制中间缩放
区域的尺寸最小为1才行,即两条平行线之间的最小间距为1.
【改动思路】
同上
3 years ago
方磊
ea39f1b447
REPORT-63675
3 years ago
方磊
401a9a8de3
REPORT-63675 自动构建的下拉树数据字典点击后数据集字段会变化
3 years ago
fanglei
dd1aa8a8ba
Pull request #6978 : CHART-22039 设计器增加自动的逻辑
...
Merge in DESIGN/design from ~FANGLEI/design:feature/x to feature/x
* commit '4619bec0de9ea0c1c44acd85f3d94520b4377629':
CHART-22039 设计器增加自动的逻辑
3 years ago
starryi
5e73cad221
Pull request #6961 : REPORT-62689 主题编辑的边框配置完善
...
Merge in DESIGN/design from ~STARRYI/design:REPORT-62689/feature/x to feature/x
* commit '0113bf2e89ab9aa2095337b201a4dfa9ed509271':
REPORT-62689 主题编辑的边框配置完善
3 years ago
superman
deee9c29fb
Merge pull request #6988 in DESIGN/design from release/11.0 to feature/x
...
* commit '09d02ba5723eb610d1cf98c7cb2dbf8798e122f7':
无JIRA任务 处理合并后冲突
3 years ago
方磊
4619bec0de
CHART-22039 设计器增加自动的逻辑
3 years ago
ju|剧浩宇
09d02ba572
Pull request #6977 : 无JIRA任务 处理合并后冲突
...
Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0
* commit 'f583dd99584d785393aae3a3aee7b9db6b94868f':
无JIRA任务 处理合并后冲突
3 years ago
Starryi
f583dd9958
无JIRA任务 处理合并后冲突
...
bugfix/10.0和feature/x修复了两个不同但
原因一致的bug,分别独立提交,导致
release/10.0自动合并到release/11.0时,
该文件内代码出现重复。
需要删除合并进来的重复的代码
3 years ago
superman
daa03c8561
Merge pull request #6976 in DESIGN/design from release/11.0 to feature/x
...
* commit 'f9f5997fc165278666f3e60f4f4172338528ee9b':
CHART-22060 fix:fvs.cpt.chart 渲染使用的默认配色和配置界面默认不同 同fvs.chart指定配色
REPORT-60163 公式编辑器优化2.0 1.优化错误提示 2.修改埋点逻辑
REPORT-63524 【组件可更新提醒】组件复用-埋点,现在设计器端弹出可更新弹窗时没有触发埋点记录
REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填
REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后,自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置
3 years ago
superman
f9f5997fc1
Merge pull request #6975 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'ef026e964fb09db867b206a1ad1a736ab412235a':
CHART-22060 fix:fvs.cpt.chart 渲染使用的默认配色和配置界面默认不同 同fvs.chart指定配色
REPORT-60163 公式编辑器优化2.0 1.优化错误提示 2.修改埋点逻辑
REPORT-63524 【组件可更新提醒】组件复用-埋点,现在设计器端弹出可更新弹窗时没有触发埋点记录
REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填
3 years ago
superman
ef026e964f
Merge pull request #6974 in DESIGN/design from persist/11.0 to final/11.0
...
* commit '4049aa887c6175a7b0903738e52c6e36033dd8c8':
3 years ago
superman
ac7a0078d5
Merge pull request #6970 in DESIGN/design from release/10.0 to release/11.0
...
* commit '22d1824127fe2296171820d6feb24bf133f1833d':
REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后,自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置
3 years ago
superman
bd533afa9b
Merge pull request #6965 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '22d1824127fe2296171820d6feb24bf133f1833d':
3 years ago