design

Commit Graph

Author	SHA1	Message	Date
ju\|剧浩宇	21d79b1fb3	Pull request #4531 : 无jira任务， feature/10.0 合 feature/big-screen Merge in DESIGN/design from ~FANGLEI/design10.0:feature/big-screen to feature/big-screen * commit 'a36395a2efd63078afe474eba56613c14323f001': (21 commits) REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置 REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置 REPORT-53592 扩展图表创建共享组件npe问题 REPORT-53362 复制传参后sql-鼠标悬浮查看设计器面板，会多出来查看执行sql的界面 REPORT-53367 复制传参后sql-远程下，新增的转义字符提示失效 REPORT-53367 复制传参后sql-远程下，新增的转义字符提示失效 REPORT-52539 window上生成面板出现了滚动条 REPORT-53133 组件复用-合入主版本-有俩商城下载下来的复用组件，拖入后组件树处没显示复用组件的图标，麻烦看下是这俩组件结构有啥问题嘛 REPORT-53135 漏交 REPORT-53135 【智能联动】组件生成时，没有新增文案视觉调整 REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置 REPORT-53351 复制传参后sql-参数为空时的显示结果不对 REPORT-53592 扩展图表创建共享组件npe问题 REPORT-53365 && REPORT-53310 交互修改 KERNEL-7634 依赖问题 REPORT-53351 复制传参后sql-参数为空时的显示结果不对 REPORT-53398 【智能联动】组件拖入时，tab2内引用到组件名的地方，替换名称有误 REPORT-53229 补上空格 REPORT-53240 加密组件在服务器上预览不显示 ...	4 years ago
方磊	a36395a2ef	Merge branch 'feature/10.0' into feature/big-screen * feature/10.0: (21 commits) REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置 REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置 REPORT-53592 扩展图表创建共享组件npe问题 REPORT-53362 复制传参后sql-鼠标悬浮查看设计器面板，会多出来查看执行sql的界面 REPORT-53367 复制传参后sql-远程下，新增的转义字符提示失效 REPORT-53367 复制传参后sql-远程下，新增的转义字符提示失效 REPORT-52539 window上生成面板出现了滚动条 REPORT-53133 组件复用-合入主版本-有俩商城下载下来的复用组件，拖入后组件树处没显示复用组件的图标，麻烦看下是这俩组件结构有啥问题嘛 REPORT-53135 漏交 REPORT-53135 【智能联动】组件生成时，没有新增文案视觉调整 REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置 REPORT-53351 复制传参后sql-参数为空时的显示结果不对 REPORT-53592 扩展图表创建共享组件npe问题 REPORT-53365 && REPORT-53310 交互修改 KERNEL-7634 依赖问题 REPORT-53351 复制传参后sql-参数为空时的显示结果不对 REPORT-53398 【智能联动】组件拖入时，tab2内引用到组件名的地方，替换名称有误 REPORT-53229 补上空格 REPORT-53240 加密组件在服务器上预览不显示 ... # Conflicts: # designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java	4 years ago
pengda	31cd8ef498	Pull request #4529 : REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置 Merge in DESIGN/design from ~PENGDA/design:feature/10.0 to feature/10.0 * commit 'c2b91aabf45f08aba95e9f324f6f90a24f0c2238': REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置 REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置 REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置	4 years ago
pengda	c2b91aabf4	REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置	4 years ago
pengda	b351e01298	REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置	4 years ago
Tommy	9094d90149	Pull request #4515 : REPORT-53592 扩展图表创建共享组件npe问题 Merge in DESIGN/design from ~TOMMY/design:feature/10.0 to feature/10.0 * commit '3af622275391f496956161d41650569a460a6299': REPORT-53592 扩展图表创建共享组件npe问题 REPORT-52539 window上生成面板出现了滚动条 REPORT-53592 扩展图表创建共享组件npe问题	4 years ago
Bruce.Deng	25a0b785f8	Pull request #4527 : REPORT-53351 & REPORT-53367 & REPORT-53362 复制传参后sql相关问题 Merge in DESIGN/design from ~BRUCE.DENG/design:feature/10.0 to feature/10.0 * commit '82f8d822129d2d1d88fb14e27c65d50e642de7f0': REPORT-53362 复制传参后sql-鼠标悬浮查看设计器面板，会多出来查看执行sql的界面 REPORT-53367 复制传参后sql-远程下，新增的转义字符提示失效 REPORT-53367 复制传参后sql-远程下，新增的转义字符提示失效 REPORT-53351 复制传参后sql-参数为空时的显示结果不对 REPORT-53351 复制传参后sql-参数为空时的显示结果不对	4 years ago
kuangshuai	3af6222753	REPORT-53592 扩展图表创建共享组件npe问题	4 years ago
Bruce.Deng	82f8d82212	Merge branch 'feature/10.0' of https://code.fineres.com/scm/~bruce.deng/design into feature/10.0	4 years ago
Bruce.Deng	310eb160bd	REPORT-53362 复制传参后sql-鼠标悬浮查看设计器面板，会多出来查看执行sql的界面	4 years ago
Hades	80dae438bd	Pull request #4523 : REPORT-53135 【智能联动】组件生成时，没有新增文案 Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0 * commit '77076eae38ad4eff198b29a3ffb9b265830f4b16': REPORT-53135 漏交 REPORT-53135 【智能联动】组件生成时，没有新增文案	4 years ago
kerry	6f64f92410	Pull request #4525 : REPORT-53133 组件复用-合入主版本-有俩商城下载下来的复用组件，拖入后组件树处没显示复用组件的图标，麻烦看下是这俩组件结构有啥问题嘛 Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0 * commit '59d5958c8cc39df0bd7182ea0f39ab7b6e06d89f': REPORT-53133 组件复用-合入主版本-有俩商城下载下来的复用组件，拖入后组件树处没显示复用组件的图标，麻烦看下是这俩组件结构有啥问题嘛	4 years ago
Bruce.Deng	d8dc68e440	REPORT-53367 复制传参后sql-远程下，新增的转义字符提示失效	4 years ago
Bruce.Deng	70e34c2117	REPORT-53367 复制传参后sql-远程下，新增的转义字符提示失效	4 years ago
kuangshuai	ed8b36a8ad	REPORT-52539 window上生成面板出现了滚动条	4 years ago
kerry	59d5958c8c	REPORT-53133 组件复用-合入主版本-有俩商城下载下来的复用组件，拖入后组件树处没显示复用组件的图标，麻烦看下是这俩组件结构有啥问题嘛	4 years ago
kerry	132ebb8a69	Pull request #4522 : REPORT-53328 视觉调整 Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0 * commit '9c51640be0cd67477df803d0ff7fb61319de6e79': 视觉调整	4 years ago
hades	77076eae38	REPORT-53135 漏交	4 years ago
hades	a8596d7e27	REPORT-53135 【智能联动】组件生成时，没有新增文案	4 years ago
Tommy	216f689c1c	Merging in latest from upstream (DESIGN/design:refs/heads/feature/10.0) * commit '7f27a557931816c15f7219668c7dbe72763d06db': REPORT-53365 && REPORT-53310 交互修改 REPORT-53229 补上空格 REPORT-53229 设计器顶部版本号信息改为小版本信息	4 years ago
kerry	9c51640be0	视觉调整	4 years ago
superman	7f27a55793	Merge pull request #4519 in DESIGN/design from bugfix/10.0 to feature/10.0 * commit 'c3d729b956f6a30452891fb1d259f3ea8eaf5618': REPORT-53229 补上空格 REPORT-53229 设计器顶部版本号信息改为小版本信息	4 years ago
superman	c3d729b956	Merge pull request #4518 in DESIGN/design from release/10.0 to bugfix/10.0 * commit '6bc3b5c0a0d89704a3a0f55b5ceee1273b076173': REPORT-53229 补上空格 REPORT-53229 设计器顶部版本号信息改为小版本信息	4 years ago
pengda	215c5198bb	Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0	4 years ago
pengda	7edab03d09	REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置	4 years ago
Bruce.Deng	be9a0b313f	REPORT-53351 复制传参后sql-参数为空时的显示结果不对	4 years ago
kerry	311d096961	Pull request #4514 : REPORT-53365 && REPORT-53310 交互修改 Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0 * commit 'a92a5c82d8c6781f13a4c3105ceb871c5b962dfe': REPORT-53365 && REPORT-53310 交互修改	4 years ago
kuangshuai	58364c9503	REPORT-53592 扩展图表创建共享组件npe问题	4 years ago
kerry	a92a5c82d8	REPORT-53365 && REPORT-53310 交互修改	4 years ago
Bruce.Deng	d3801369d8	Merge branch 'feature/10.0' of https://code.fineres.com/scm/~bruce.deng/design into feature/10.0	4 years ago
Hades	80f2959213	Pull request #4513 : KERNEL-7634 依赖问题 Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0 * commit '0afe612090338c0feed70fc5e8acce2924afc564': KERNEL-7634 依赖问题	4 years ago
hades	0afe612090	KERNEL-7634 依赖问题	4 years ago
Hades	28ba84a129	Pull request #4509 : REPORT-53398 【智能联动】组件拖入时，tab2内引用到组件名的地方，替换名称有误 Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0 * commit '4b2f2d51d8e60ea395c21472fecee26e21c0dae0': REPORT-53398 【智能联动】组件拖入时，tab2内引用到组件名的地方，替换名称有误	4 years ago
Bruce.Deng	f1f223f5ff	Merge branch 'feature/10.0' of https://code.fineres.com/scm/~bruce.deng/design into feature/10.0	4 years ago
fanglei	6bc3b5c0a0	Pull request #4508 : REPORT-53229 设计器顶部版本号信息改为小版本信息 Merge in DESIGN/design from ~FANGLEI/design10.0:release/10.0 to release/10.0 * commit '6e1c75179cbb8de8ae6aba3d3d0980fe20949802': REPORT-53229 补上空格	4 years ago
Tommy	0de58d4dbb	Pull request #4506 : REPORT-53240 加密组件在服务器上预览不显示 Merge in DESIGN/design from ~TOMMY/design:feature/10.0 to feature/10.0 * commit '8a61c789df0e89c032ba6ffb44e81955fd388975': REPORT-53240 加密组件在服务器上预览不显示	4 years ago
superman	4ff109d97e	Merge pull request #4512 in DESIGN/design from feature/10.0 to feature/big-screen * commit 'af36a7a6dfb3b02d2c3819928cc8c50e34ecadb2': REPORT-51360 设计器通行证和finedb里的区分开，对不支持jxbrowser的系统做兼容处理 REPORT-51360 新增模板商城toast提示兼容处理 REPORT-51360 【10.0.17】设计器用户登录策略调整 KERNEL-7634 mac和win使用不同版本的jxbrowser CHART-19475 条件属性的标签固定宽度 REPORT-51958 远程环境检测及同步 REPORT-53019 字体检查国际化显示不全 REPORT-53328 && REPORT-53314 交互修改 REPORT-53305 去掉匿名内部类对象隐式持有的外层对象字段 REPORT-51958 远程环境检测及同步 REPORT-51958 远程环境检测及同步 REPORT-51958 远程环境检测及同步 REPORT-51958 远程环境检测及同步 REPORT-51958 远程环境检测及同步 REPORT-51958 远程环境检测及同步 REPORT-51958 远程环境检测及同步 REPORT-51958 远程环境检测及同步 KERNEL-7974 看下新的控件式组件做成插件支持需要开放什么接口	4 years ago
superman	af36a7a6df	Merge pull request #4505 in DESIGN/design from bugfix/10.0 to feature/10.0 * commit 'b677a3fc35d0f0d9f528c69dbe2c613bf8fc6d08': REPORT-53019 字体检查国际化显示不全	4 years ago
Lanlan	398fc83780	Pull request #4507 : REPORT-51360 【10.0.17】设计器用户登录策略调整 Merge in DESIGN/design from ~LANLAN/design:feature/10.0 to feature/10.0 * commit 'd727b8f4244e224311d00fb709b8ae46bb6bedc1': REPORT-51360 设计器通行证和finedb里的区分开，对不支持jxbrowser的系统做兼容处理 REPORT-51360 新增模板商城toast提示兼容处理 REPORT-51360 【10.0.17】设计器用户登录策略调整	4 years ago
Bruce.Deng	eeb3ad9ce3	REPORT-53351 复制传参后sql-参数为空时的显示结果不对	4 years ago
hades	4b2f2d51d8	REPORT-53398 【智能联动】组件拖入时，tab2内引用到组件名的地方，替换名称有误	4 years ago
方磊	6e1c75179c	REPORT-53229 补上空格	4 years ago
fanglei	02895b37ef	Pull request #4493 : REPORT-53229 设计器顶部版本号信息改为小版本信息 Merge in DESIGN/design from ~FANGLEI/design10.0:release/10.0 to release/10.0 * commit 'd96a9af5531cf3dd8fb2885a65b3c0e33aea502e': REPORT-53229 设计器顶部版本号信息改为小版本信息	4 years ago
Hades	93581e168b	Pull request #4495 : KERNEL-7634 mac和win使用不同版本的jxbrowser Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0 * commit '9dc3b6b87709b24fd9c0e8e0f485f05a3574a1d8': KERNEL-7634 mac和win使用不同版本的jxbrowser	4 years ago
Bjorn	778b7e3a94	Pull request #4494 : CHART-19475 条件属性的标签固定宽度 Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0 * commit '9fba224bf5486ce54901b1dffac10fe03d29a467': CHART-19475 条件属性的标签固定宽度	4 years ago
Lanlan	d727b8f424	REPORT-51360 设计器通行证和finedb里的区分开，对不支持jxbrowser的系统做兼容处理	4 years ago
kuangshuai	8a61c789df	Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~tommy/design into feature/10.0	4 years ago
kuangshuai	50d105b4a5	REPORT-53240 加密组件在服务器上预览不显示	4 years ago
kerry	68869c55c6	Pull request #4491 : KERNEL-7974 && REPORT-53328 && REPORT-53314 交互修改看下新的控件式组件做成插件支持需要开放什么接口 Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0 * commit '0c0ba054b9ff2e983150c4800514deccda0e98f1': REPORT-53328 && REPORT-53314 交互修改 KERNEL-7974 看下新的控件式组件做成插件支持需要开放什么接口	4 years ago
Lanlan	f3a19d05d2	REPORT-51360 新增模板商城toast提示	4 years ago

1 2 3 4 5 ...

13640 Commits (21d79b1fb300369c37be68a3434bd83ba7577737) All Branches Search

13640 Commits (21d79b1fb300369c37be68a3434bd83ba7577737)

All Branches