Entropy
/
design
forked from fanruan/design
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • c61ab4d317 Merge branch 'feature/x' of https://code.fineres.com/scm/~henry.wang/design into feature/x Henry.Wang 2021-12-16 11:21:13 +0800
  • 9d5349d34b REPORT-62440 表头排序内置 Henry.Wang 2021-12-16 11:20:37 +0800
  • 9cfd53195c Pull request #7177: REPORT-64173 限定具体实现的最大占用布局，优化展示效果 Xiqiu 2021-12-16 10:12:57 +0800
  • 6a46188353 Pull request #7171: CHART-22075 富文本支持9～11号字体 Qinghui.Liu 2021-12-16 09:32:52 +0800
  • 6a5e5f889d Pull request #7186: REPORT-64125 【主题边框】新设计器远程旧服务器，设置的边框预览图上看不到 starryi 2021-12-15 19:58:32 +0800
  • 5075be2117 Merge pull request #7187 in DESIGN/design from final/11.0 to persist/11.0 superman 2021-12-15 19:37:11 +0800
  • 3dd912b680 修改富文本字体限制 Qinghui.Liu 2021-12-15 19:19:06 +0800
  • a5d1cd190b REPORT-64125 【主题边框】新设计器远程旧服务器，设置的边框预览图上看不到 Starryi 2021-12-15 18:39:30 +0800
  • a3a656124e Pull request #7172: KERNEL-9636 && REPORT-63725 新自适应中设计器模块和主 jar 中的重复代码 kerry 2021-12-15 18:29:26 +0800
  • 6cd7c0409a Merge pull request #7185 in DESIGN/design from release/11.0 to feature/x superman 2021-12-15 17:40:36 +0800
  • 1b0ae7b6ee Pull request #7179: 无jira任务 单元测试打包 vito 2021-12-15 17:33:55 +0800
  • 3e25450132 Merge branch 'release/10.0' of https://code.fineres.com/scm/~lucian.chen/design into release/10.0 lucian 2021-12-15 17:32:39 +0800
  • e103647723 无jira任务 单元测试打包 vito 2021-12-15 17:32:25 +0800
  • 86b4ee0de6 Pull request #7178: 无jira任务 单元测试打包失败，先屏蔽这边 vito 2021-12-15 17:26:40 +0800
  • 9eeb83cf4a 无jira任务 单元测试打包失败，先屏蔽这边 vito 2021-12-15 17:14:04 +0800
  • ab7de686bd Merge remote-tracking branch 'origin/feature/x' into feature/x xiqiu 2021-12-15 16:49:36 +0800
  • 987923d5f8 REPORT-64173 限定具体实现的最大占用布局，优化展示效果 xiqiu 2021-12-15 16:47:57 +0800
  • a07d8a9f75 KERNEL-9636 新自适应中设计器模块和主 jar 中的重复代码 kerry 2021-12-15 16:40:27 +0800
  • 6f8046a07a Pull request #7170: REPORT-64286 fix: 内嵌tomcat不支持websocket Elijah 2021-12-15 16:30:10 +0800
  • 59c499244b Pull request #7168: REPORT-64156 解锁失败加个提示弹窗 Hades 2021-12-15 16:26:32 +0800
  • 2c182a7052 Pull request #7169: REPORT-64267 【主题优化】拖入数据列以后，双击打开点击确定，数据列没了 starryi 2021-12-15 16:14:20 +0800
  • 6b51e7fcd0 CHART-22075 富文本支持9～11号字体 Qinghui.Liu 2021-12-15 16:06:36 +0800
  • a3381a843b Pull request #7153: KERNEL-9636 && REPORT-63725 frm设计器界面修改; 新自适应中设计器模块和主 jar 中的重复代码 kerry 2021-12-15 14:00:58 +0800
  • ea86dd59d5 REPORT-64286 fix: 内嵌tomcat不支持websocket Elijah 2021-12-15 13:43:35 +0800
  • 51b9bfb372 REPORT-64267 【主题优化】拖入数据列以后，双击打开点击确定，数据列没了 Starryi 2021-12-15 11:03:57 +0800
  • ce8baa1732 Pull request #7167: REPORT-64262 【视觉验收】主题编辑的边框配置完善 starryi 2021-12-15 12:03:24 +0800
  • e0acf70497 REPORT-64156 解锁失败加个提示弹窗 hades 2021-12-15 11:22:30 +0800
  • 977e23dbc5 REPORT-64262 【视觉验收】主题编辑的边框配置完善 Starryi 2021-12-15 10:36:08 +0800
  • 3d91403aac Merge branch 'feature/x' of https://code.fineres.com/scm/design/design into feature/x kerry 2021-12-15 10:20:58 +0800
  • 658e983ec5 Pull request #7166: REPORT-62440 表头排序内置 Henry.Wang 2021-12-15 09:44:50 +0800
  • 50f7e2237a Pull request #7155: REPORT-62876 填报配置时支持表的精确搜索 Lucian.Chen 2021-12-15 09:34:03 +0800
  • d0f2c920ed Pull request #7128: REPORT-64080 【主题边框】框选设置样式外边框后，框选小部分切换自定义，之后设计器里显示有问题 starryi 2021-12-15 09:33:29 +0800
  • dcc2606106 REPORT-62440 表头排序内置 Henry.Wang 2021-12-14 20:13:16 +0800
  • 7af2ec98cf Merge pull request #7165 in DESIGN/design from release/11.0 to feature/x superman 2021-12-14 17:25:15 +0800
  • 8535783b6e Merge pull request #7164 in DESIGN/design from final/11.0 to release/11.0 superman 2021-12-14 17:24:52 +0800
  • 7ecbffadbb Merge pull request #7163 in DESIGN/design from persist/11.0 to final/11.0 superman 2021-12-14 17:03:24 +0800
  • 6ffa8c60e1 Merge pull request #7162 in DESIGN/design from feature/10.0 to feature/big-screen superman 2021-12-14 17:02:59 +0800
  • fe74d6d77a Merge pull request #7161 in DESIGN/design from feature/10.0 to research/10.0 superman 2021-12-14 17:02:55 +0800
  • b670c0836a Merge pull request #7160 in DESIGN/design from bugfix/10.0 to feature/10.0 superman 2021-12-14 17:02:18 +0800
  • 6b431180e3 Merge pull request #7159 in DESIGN/design from release/10.0 to release/11.0 superman 2021-12-14 17:01:46 +0800
  • b61de82e05 Merge pull request #7158 in DESIGN/design from release/10.0 to bugfix/10.0 superman 2021-12-14 17:01:23 +0800
  • 95b3ef73f1 Merge pull request #7157 in DESIGN/design from final/10.0 to release/10.0 superman 2021-12-14 17:00:59 +0800
  • ca27d54e84 Merge pull request #7156 in DESIGN/design from persist/10.0 to final/10.0 superman 2021-12-14 17:00:41 +0800
  • d075335787 REPORT-62876 填报配置时支持表的精确搜索 lucian 2021-12-14 16:30:10 +0800
  • 5aa637b87f 代码修改 kerry 2021-12-14 16:18:14 +0800
  • 8947fee0c9 Merge pull request #7154 in DESIGN/design from final/11.0 to persist/11.0 superman 2021-12-14 14:13:06 +0800
  • 6d6f5362bd Merge branch 'feature/x' of ssh://code.fineres.com:7999/~kerry/design_10.0 into feature/x kerry 2021-12-14 11:54:17 +0800
  • 08a39eee5c KERNEL-9636 新自适应中设计器模块和主 jar 中的重复代码 kerry 2021-12-14 11:54:08 +0800
  • 99056db189 Pull request #7139: REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表 Tommy 2021-12-14 10:59:12 +0800
  • 07be63cef3 REPORT-64080 【主题边框】框选设置样式外边框后，框选小部分切换自定义，之后设计器里显示有问题 Starryi 2021-12-10 16:39:53 +0800
  • 320a5ac5c9 Pull request #7152: REPORT-63808 【主题优化】格式单独拿出来以后，发现数据列的弹窗配置中没有格式项 starryi 2021-12-14 10:04:22 +0800
  • 19954cabfd REPORT-63808 【主题优化】格式单独拿出来以后，发现数据列的弹窗配置中没有格式项 Starryi 2021-12-13 16:58:42 +0800
  • 656b3fcbbd Merge pull request #7150 in DESIGN/design from final/10.0 to persist/10.0 10.0.19.2021.12.13 superman 2021-12-13 17:34:37 +0800
  • 4f62f88149 REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表 Tommy 2021-12-13 11:48:34 +0800
  • be2644be66 Pull request #7103: KERNEL-9687 log4j版本升级-设计器配合 Dylan.Liu 2021-12-13 09:57:34 +0800
  • 46413b0201 Pull request #7075: REPORT-62440 表头排序内置 Henry.Wang 2021-12-12 21:36:07 +0800
  • bd82a9d694 REPORT-62440 表头排序内置 Henry.Wang 2021-12-12 16:51:49 +0800
  • 98a30cb40d REPORT-62440 表头排序内置 Henry.Wang 2021-12-12 15:56:23 +0800
  • 1b66571feb REPORT-62440 表头排序内置 Henry.Wang 2021-12-12 15:29:47 +0800
  • 9944abee2c Pull request #7105: REPORT-64062 & REPORT-64079 & REPORT-64112 starryi 2021-12-12 12:25:51 +0800
  • 854ff33129 Pull request #7104: KERNEL-9636 设计器渲染表单去除分辨率的差异 kerry 2021-12-12 11:40:01 +0800
  • 9afbbdc933 Pull request #7117: 无jira 解决冲突 ju|剧浩宇 2021-12-10 17:34:55 +0800
  • 4319065b62 无jira 去掉无用 import hades 2021-12-10 17:32:41 +0800
  • 0635b1642b 无jira 解决冲突 hades 2021-12-10 17:29:26 +0800
  • 2c9830cfaf Merge pull request #7113 in DESIGN/design from feature/10.0 to feature/big-screen superman 2021-12-10 17:22:51 +0800
  • 4c5f25dc13 Merge pull request #7112 in DESIGN/design from feature/10.0 to research/10.0 superman 2021-12-10 17:22:46 +0800
  • bf3225e260 Merge pull request #7111 in DESIGN/design from bugfix/10.0 to feature/10.0 superman 2021-12-10 17:22:41 +0800
  • c6e89835d2 Pull request #7110: 无jira 解决冲突 Hades 2021-12-10 17:22:24 +0800
  • 0da1ac1ad0 无jira 解决冲突 hades 2021-12-10 17:19:15 +0800
  • 57f997fcbc Merge pull request #7108 in DESIGN/design from release/10.0 to bugfix/10.0 superman 2021-12-10 17:00:19 +0800
  • e20b93f7b5 Merge pull request #7107 in DESIGN/design from final/10.0 to release/10.0 superman 2021-12-10 17:00:14 +0800
  • 0155250ccc Pull request #7100: KERNEL-9860 插件修改xml中active标签逻辑重构 Yvan 2021-12-10 16:42:05 +0800
  • e972e7ef1c 去除新老转换时，调整表单组件尺寸的逻辑 kerry 2021-12-10 16:11:17 +0800
  • b6d38f7f2e KERNEL-9860 插件修改xml中active标签逻辑重构 跟vito讨论了下，决定模板报错的一键处理这儿，也是需要修改xml的，因为也是用户自己点的处理 Yvan 2021-12-10 16:05:46 +0800
  • f52b66508f Merging in latest from upstream (DESIGN/design:refs/heads/feature/x) kerry 2021-12-10 15:47:21 +0800
  • b56616d078 Pull request #7102: CHART-22213 cherry pick to final10.0 fix:新增警戒线 默认应该是9px12px 不是9px zheng 2021-12-10 15:38:25 +0800
  • 77ba71a7be REPORT-64112 【模板主题】悬浮元素样式切换，上方的预览图没有即时生效 Starryi 2021-12-10 15:37:37 +0800
  • d6abbc268d 代码修改 kerry 2021-12-10 15:30:10 +0800
  • 47409dd690 REPORT-64079 【主题边框】悬浮元素的样式效果跟交互稿不一致 Starryi 2021-12-10 15:16:48 +0800
  • 6c57ae3713 CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px shine 2021-12-08 17:08:57 +0800
  • b7d61b5196 KERNEL-9687 log4j版本升级-设计器配合 hades 2021-12-10 15:13:28 +0800
  • 11200fb8b6 Pull request #7101: REPORT-64075 【主题边框】框选设置主题样式，关闭模板，删除模板主题，重新打开模板边框丢失 starryi 2021-12-10 15:13:06 +0800
  • 685bdddcde 代码修改 kerry 2021-12-10 14:58:03 +0800
  • 5b5f49540f REPORT-64062 【主题边框】上一个样式设置边框颜色后，新增的样式默认边框色会记录 Starryi 2021-12-10 14:36:09 +0800
  • 8a015c7039 Pull request #7099: REPORT-64095 websocket频繁出现断开又连上问题 Hades 2021-12-10 14:24:47 +0800
  • a1c88fd6c3 Merge branch 'feature/x' of ssh://code.fineres.com:7999/~kerry/design_10.0 into feature/x kerry 2021-12-10 13:57:35 +0800
  • 003361ad38 KERNEL-9636 设计器渲染表单去除分辨率的差异 kerry 2021-12-10 13:57:27 +0800
  • ba4b28c641 REPORT-64075 【主题边框】框选设置主题样式，关闭模板，删除模板主题，重新打开模板边框丢失 Starryi 2021-12-10 10:54:31 +0800
  • 6f497ae0f8 Merge remote-tracking branch 'origin/release/11.0' into release/11.0 Yvan 2021-12-10 11:26:59 +0800
  • cbdbc9d5d0 KERNEL-9860 插件修改xml中active标签逻辑重构 【问题原因】rt 【改动思路】详见https://kms.fineres.com/pages/viewpage.action?pageId=289590798 【review建议】 Yvan 2021-12-10 11:25:49 +0800
  • c6677e6906 REPORT-64095 websocket频繁出现断开又连上问题 hades 2021-12-10 11:12:50 +0800
  • ce44f4b365 Pull request #7098: REPORT-62424 【模板主题】见附件截图，windows的主题配置中的整体预览图显示有点问题 kerry 2021-12-10 10:40:01 +0800
  • 8177964d23 Pull request #7081: REPORT-63760 7 REPORT-64006 7 & REPORT-64005 starryi 2021-12-10 10:38:33 +0800
  • 27aa973230 Merge pull request #7096 in DESIGN/design from release/11.0 to feature/x superman 2021-12-10 10:14:30 +0800
  • 4fe9b0b460 Pull request #7097: REPORT-63505 解决10.0合11.0导致的逻辑冲突 Tommy 2021-12-10 10:10:07 +0800
  • 8f733e588b Merge branch 'feature/x' of ssh://code.fineres.com:7999/~kerry/design_10.0 into feature/x kerry 2021-12-10 10:04:37 +0800
  • bb391c1135 REPORT-62424 【模板主题】见附件截图，windows的主题配置中的整体预览图显示有点问题 kerry 2021-12-10 10:04:16 +0800
  • 027b84bf62 REPORT-63505 解决10.0合11.0导致的逻辑冲突 Tommy 2021-12-10 09:48:50 +0800
  • 20452f96e5 REPORT-62440 表头排序内置 Henry.Wang 2021-12-09 22:56:03 +0800
  • 787fb204af REPORT-62440 表头排序内置 Henry.Wang 2021-12-09 22:21:32 +0800