superman
c3f92ba838
Merge pull request #7043 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'fbe67c0078e40d21dc66f6bd228371c8abe2be4e':
3 years ago
superman
fbe67c0078
Merge pull request #7042 in DESIGN/design from persist/11.0 to final/11.0
...
* commit 'fa53222ff9d5a23d6fc99f0df0144ca10d324d72':
3 years ago
ju|剧浩宇
fe7868a7a0
Pull request #7038 : 无JIRA 代码合并
...
Merge in DESIGN/design from ~EASON/design:release/11.0 to release/11.0
* commit '0497bd25f5fb74eacca507ac66ac7ecf02f6e57c':
REPORT-63092 漏传了import语句
REPORT-63499
REPORT-63499 按钮控件树节点配置控件事件,设计器上显示有问题
update
CHART-21584 feat:fvs.chart.font 单位px 范围6-200
3 years ago
eason
0497bd25f5
conflict resolve
3 years ago
superman
fa53222ff9
Merge pull request #7031 in DESIGN/design from final/11.0 to persist/11.0
...
* commit '7b3aafba5ec2389cf15bbd0971697ee6a440e090':
3 years ago
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
方磊
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
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
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
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
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
方磊
ea39f1b447
REPORT-63675
3 years ago
方磊
401a9a8de3
REPORT-63675 自动构建的下拉树数据字典点击后数据集字段会变化
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
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
zheng
32b52cab30
Pull request #6962 : CHART-22060 fix:fvs.cpt.chart 渲染使用的默认配色和配置界面默认不同 同fvs.chart指定配色
...
Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to final/11.0
* commit '6775e1b88230c37a98bd265b6a7d9dbe9553d026':
CHART-22060 fix:fvs.cpt.chart 渲染使用的默认配色和配置界面默认不同 同fvs.chart指定配色
3 years ago
shine
6775e1b882
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/11.0
3 years ago
shine
922fa090ad
CHART-22060 fix:fvs.cpt.chart 渲染使用的默认配色和配置界面默认不同 同fvs.chart指定配色
3 years ago
superman
4049aa887c
Merge pull request #6960 in DESIGN/design from final/11.0 to persist/11.0
...
* commit '857bc45f43fdd8b686202eb260f2d0a97961a1ec': (152 commits)
REPORT-60163 公式编辑器优化2.0 1.优化错误提示 2.修改埋点逻辑
REPORT-63524 【组件可更新提醒】组件复用-埋点,现在设计器端弹出可更新弹窗时没有触发埋点记录
REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填
REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填
REPORT-63311【接触点优化】轮播期间切换组件设置页面,轮播停住了
REPORT-62672【接触点优化】部分埋点无法模拟对应埋点数据
CHART-22060 fix:fvs图表第一个不是跟随主题default 是normal
REPORT-63308【接触点优化】轮播期间在组件上右键的交互问题
REPORT-62175 && REPORT-63204 1.埋点适配 2.针对sum(1,)等此类公式进行合法性判断
CHART-22038 决策报表,安装ECharts后,图表块插入图表区域不显示echarts的图标
REPORT-63305 设计器获取父容器,需要对拓展的布局插件兼容处理下
REPORT-63196 && REPORT-63186 1.在双击之后使搜索框消失; 2.模拟计算在计算错误的时候提示计算异常
REPORT-62672【接触点优化】部分埋点无法模拟对应埋点数据
REPORT-63250 组件可更新视觉验收
REPORT-63190【接触点优化】轮播过程中切换组件包,再回来发现显示有问题
REPORT-63194 【组件可更新提醒】组件复用-适配设计器字段输入框输入时会出现字符消失的情况
REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填
REPORT-63102 公式编辑器优化,多行函数错误返回值异常 1.定制一个没有newline的frformulalexer
REPORT-62477 组件复用-10设计器在线组件预期不能看到11组件
REPORT-62808 公式编辑器优化,辅助框内选择函数后,函数名没有正确跳转 1.修复单击实现偶然失效的bug; 2.修复上下键不生效的bug。
...
3 years ago
starryi
857bc45f43
Pull request #6944 : REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填
...
Merge in DESIGN/design from ~STARRYI/design:final/11.0 to final/11.0
* commit '6f797af38e5dbc2aaf20b8d3e160258043cefdaf':
REPORT-63524 【组件可更新提醒】组件复用-埋点,现在设计器端弹出可更新弹窗时没有触发埋点记录
REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填
3 years ago
Hoky.He
9e03927238
Pull request #6959 : REPORT-60163 公式编辑器优化2.0
...
Merge in DESIGN/design from ~HOKY.HE/design-hoky:final/11.0 to final/11.0
* commit '0aa8d2dc39a1040c7c19599a0b4e8c51df1f6727':
REPORT-60163 公式编辑器优化2.0 1.优化错误提示 2.修改埋点逻辑
REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填
3 years ago
Hoky.He
0aa8d2dc39
Pull request #1 : Release/11.0
...
Merge in ~HOKY.HE/design-hoky from release/11.0 to final/11.0
* commit 'f6247b4f040f91488de70c20ccae7f7362321018':
REPORT-60163 公式编辑器优化2.0 1.优化错误提示 2.修改埋点逻辑
REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填
3 years ago
Hoky
f6247b4f04
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
3 years ago
Hoky
5a407a4491
REPORT-60163 公式编辑器优化2.0
...
1.优化错误提示
2.修改埋点逻辑
3 years ago
superman
22d1824127
Merge pull request #6946 in DESIGN/design from feature/10.0 to release/10.0
...
* commit '18ca498021f3533d538491f9f223f2ff10903d6a':
REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后,自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置
3 years ago
Starryi
6f797af38e
REPORT-63524 【组件可更新提醒】组件复用-埋点,现在设计器端弹出可更新弹窗时没有触发埋点记录
...
【问题原因】
将响应获取组件更新信息结果的动作抽离出来
【改动思路】
同上
3 years ago
Starryi
18d681ac36
REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填
...
【问题原因】
监听下必填项设置:组件分类
【改动思路】
同上
3 years ago