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

Commit Graph

  • 48b946eede Merge pull request #7295 in DESIGN/design from release/10.0 to final/10.0 superman 2021-12-23 17:38:13 +0800
  • cda6fa52a4 Merge pull request #7294 in DESIGN/design from bugfix/10.0 to release/10.0 superman 2021-12-23 17:28:15 +0800
  • 202eca7a7a Pull request #7289: NoJira release10.0 to release11.0 ju|剧浩宇 2021-12-23 17:22:11 +0800
  • f94919407c Fixed merge conflict zheng 2021-12-23 17:20:09 +0800
  • 95f61babb5 Merge pull request #7286 in DESIGN/design from release/10.0 to bugfix/10.0 superman 2021-12-23 17:00:21 +0800
  • e9da8d8726 Pull request #7282: REPORT-64601 公式编辑器首次进入的时候光标位置不正确 Hoky.He 2021-12-23 16:11:22 +0800
  • 28d25c080c Pull request #7283: CHART-22211 甘特图用文件数据集日期显示异常 pengda 2021-12-23 16:04:48 +0800
  • 1977aa29d3 REPORT-64601 公式编辑器首次进入的时候光标位置不正确 1.放到swing执行队列队尾。 Hoky 2021-12-23 16:03:39 +0800
  • 8d46130275 CHART-22211 甘特图用文件数据集日期显示异常 pengda 2021-12-23 15:23:26 +0800
  • 79bf7e442f REPORT-64601 公式编辑器首次进入的时候光标位置不正确 1.修改代码。 Hoky 2021-12-23 14:44:32 +0800
  • 74d7f9cd4d REPORT-64601 公式编辑器首次进入的时候光标位置不正确 1.加载完公式编辑器后异步请求一下光标； Hoky 2021-12-23 14:38:20 +0800
  • 0376e4742a REPORT-64811 保持设计器商城下载reu文件名中的版本信息 Starryi 2021-12-23 11:12:07 +0800
  • 79e42b26a4 REPORT-64741 【组件可更新提醒】组件复用-设计器端安装设计器版本高于当前设计器版本的组件的情况 Starryi 2021-12-23 14:03:15 +0800
  • 06a0bf5754 Pull request #7279: REPORT-64451 最新官网jar包，11.0设计器切换成英文，新建决策报表异常 fanglei 2021-12-23 11:23:26 +0800
  • 847b2938a4 REPORT-64451 最新官网jar包，11.0设计器切换成英文，新建决策报表异常 方磊 2021-12-23 11:15:11 +0800
  • 1f6752d08f REPORT-64811 保持设计器商城下载reu文件名中的版本信息 Starryi 2021-12-23 11:12:07 +0800
  • 385df82ebc Pull request #7278: REPORT-64506 && REPORT-64457 && REPORT-64456 && REPORT-64425 && REPORT-64422 Henry.Wang 2021-12-23 11:07:49 +0800
  • b86e4a0bcb Pull request #7276: CHART-22076 fix bugs zheng 2021-12-23 10:41:42 +0800
  • ff8805aec1 REPORT-64506 && REPORT-64457 && REPORT-64456 && REPORT-64425 && REPORT-64422 Henry.Wang 2021-12-22 23:27:43 +0800
  • 18df9f4f0c Pull request #7277: REPORT-64702【frm设计器界面修改】新&旧模式下，新拖入的报表块，组件尺寸是250*150，进入报表块编辑，悬浮虚线看到的尺寸也是250*150，但退出编辑，拖拽调整报表块尺寸时，虚线范围比刚才看到的大了 kerry 2021-12-22 17:24:54 +0800
  • c4a9881f89 REPORT-64702【frm设计器界面修改】新&旧模式下，新拖入的报表块，组件尺寸是250*150，进入报表块编辑，悬浮虚线看到的尺寸也是250*150，但退出编辑，拖拽调整报表块尺寸时，虚线范围比刚才看到的大了 kerry 2021-12-22 16:12:42 +0800
  • 43af52b356 Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/10.0 shine 2021-12-22 15:27:36 +0800
  • 39a8fc41ea Pull request #7273: REPORT-64606 插件修改active逻辑重构-插件校验未通过，没有被禁用 Yvan 2021-12-22 11:53:18 +0800
  • 60306715e5 Pull request #7274: REPORT-64412 连续选中两次同一选项，编辑框值不对 Lucian.Chen 2021-12-22 11:11:22 +0800
  • 6bb1c97741 Pull request #7275: REPORT-64022 Fly.Li 2021-12-22 11:06:05 +0800
  • 5b8b5ef095 Pull request #7272: REPORT-64527 && REPORT-64525 && REPORT-64489 && REPORT-64485 && REPORT-64466 && REPORT-64463 && REPORT-64462 && REPORT-64460 Henry.Wang 2021-12-22 11:01:07 +0800
  • c0a6fb7d6a Merge branch 'feature/x' of https://code.fineres.com/scm/~fly.li/design into feature/x fly.li 2021-12-22 10:57:23 +0800
  • d964c7e7d5 REPORT-64022:面板添加一个提示 fly.li 2021-12-22 10:49:10 +0800
  • f0b8a1770c Merge branch 'feature/x' of https://code.fineres.com/scm/~lucian.chen/design into feature/x lucian 2021-12-22 10:31:58 +0800
  • 94c67746ec REPORT-64412 连续选中两次同一选项，编辑框值不对 lucian 2021-12-22 10:31:53 +0800
  • dfb980e52c Pull request #7268: CHART-22090 fix: 悬浮窗图表-条件属性-颜色控件残留 zheng 2021-12-22 10:21:01 +0800
  • e49d512d18 CHART-21877 fix:fvs.cpt 批量设置单元格背景颜色后 单元格字体是黑色 shine 2021-12-22 10:18:51 +0800
  • 50fb8f23eb REPORT-64527 && REPORT-64525 && REPORT-64489 && REPORT-64485 && REPORT-64466 && REPORT-64463 && REPORT-64462 && REPORT-64460 Henry.Wang 2021-12-21 23:32:17 +0800
  • 75a342690c CHART-22076 fix:fvs.cpt 单元格设置超链删除超链 文本白色 shine 2021-12-21 18:58:26 +0800
  • 42a314fb13 Merge remote-tracking branch 'origin/release/11.0' into release/11.0 Yvan 2021-12-21 18:16:43 +0800
  • 180119fa83 REPORT-64606 插件修改active逻辑重构-插件校验未通过，没有被禁用 【问题原因】未适配插件管理里的插件运行状态 【改动思路】1. 传递正确的插件管理里请求的插件运行状态；2. 当isActive与isRunning不匹配时，保证可以正确的启用或禁用插件 【review建议】无 Yvan 2021-12-21 18:15:54 +0800
  • d0c5384fd5 Pull request #7269: REPORT-64656 设计器操作，双击已打开的模板，不会定位到对应模板 Hades 2021-12-21 17:55:20 +0800
  • e3a7a7c66e Pull request #7271: REPORT-55241 Fly.Li 2021-12-21 17:25:34 +0800
  • b1d23b093d REPORT-55241:修改没有开启固定分页时固定分页的数值 fly.li 2021-12-21 17:17:06 +0800
  • c6244df10e Pull request #7270: REPORT-63808 & REPORT-64642 starryi 2021-12-21 17:16:46 +0800
  • 4e9a12fc73 REPORT-55241:修改一下代码格式 fly.li 2021-12-21 17:14:26 +0800
  • d116628a56 REPORT-64642 【主题边框】左侧预览图中单元格设置逻辑调整 Starryi 2021-12-21 16:50:56 +0800
  • 9e3d2a3e4e REPORT-63808 【主题优化】格式单独拿出来以后，发现数据列的弹窗配置中没有格式项 Starryi 2021-12-21 15:54:40 +0800
  • 2e3a6de6ef Merge branch 'feature/x' of https://code.fineres.com/scm/~fly.li/design into feature/x fly.li 2021-12-21 17:05:00 +0800
  • 49784e833d REPORT-55241:添加报表引擎属性埋点 fly.li 2021-12-21 17:01:06 +0800
  • 5188dfc04e REPORT-64656 设计器操作，双击已打开的模板，不会定位到对应模板 hades 2021-12-21 16:15:10 +0800
  • 8638c51f4c update shine 2021-12-21 14:48:14 +0800
  • 2983ac90bb Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/10.0 shine 2021-12-21 14:45:47 +0800
  • 539dd8ca4c CHART-22090 条件属性-颜色控件残留 shine 2021-12-21 14:45:30 +0800
  • fb8d2da5c5 Pull request #7255: REPORT-64412 获取表名使用文本框内容，而非选择的值 Lucian.Chen 2021-12-21 13:49:03 +0800
  • 21f0587cae Pull request #7267: REPORT-64486 视觉验收-远程模版锁定优化 && REPORT-64581 本地目录下内置服务器未启动时 双击打不开目录树中的模板 Hades 2021-12-21 13:37:14 +0800
  • ab1247612d REPORT-64581 本地目录下内置服务器未启动时 双击打不开目录树中的模板 hades 2021-12-21 10:31:15 +0800
  • 2c9290863a REPORT-64486 视觉验收-远程模版锁定优化 hades 2021-12-21 10:17:11 +0800
  • 3522160cd6 Merge pull request #7266 in DESIGN/design from release/11.0 to feature/x superman 2021-12-20 17:03:40 +0800
  • 86b1c10c05 Pull request #7256: REPORT-62834 数据校验支持控件不允许自定义值校验 Yuan.Wang 2021-12-20 16:48:59 +0800
  • b652f05153 Merge branch 'feature/x' of https://code.fineres.com/scm/~yuan.wang/design into feature/x Yuan.Wang 2021-12-20 16:44:53 +0800
  • 3bab59843a REPORT-64412 获取表名使用文本框内容，而非选择的值 lucian 2021-12-20 15:57:19 +0800
  • 2eaf3b057c REPORT-62876 表名显示时不用toString，会与初始化时不一致，统一为name lucian 2021-12-20 15:54:07 +0800
  • 35f478d106 Pull request #7213: REPORT-64262 【视觉验收】主题编辑的边框配置完善 starryi 2021-12-20 09:57:00 +0800
  • a8e6fbd0f4 Pull request #7211: REPORT-64172 创建图表组件封面图绘制错误 Tommy 2021-12-19 19:20:58 +0800
  • 5f7ebc3fc2 Merge pull request #7220 in DESIGN/design from feature/10.0 to feature/big-screen superman 2021-12-17 17:48:57 +0800
  • a5a2bfea04 Merge pull request #7219 in DESIGN/design from feature/10.0 to research/10.0 superman 2021-12-17 17:48:54 +0800
  • 1388c227b6 Pull request #7212: REPORT-64434【11.0.2迭代验收】带模式的数据库选中表再下拉无匹配内容 Lucian.Chen 2021-12-17 17:32:21 +0800
  • b24c9ebf6e REPORT-64262 【视觉验收】主题编辑的边框配置完善 Starryi 2021-12-17 16:45:05 +0800
  • 8b43bd42cb Pull request #7210: REPORT-62533【主题预览图】单元格样式只设置下边框线时，左侧预览图中看不到效果 kerry 2021-12-17 16:38:32 +0800
  • 7e2fdfd99a Pull request #7209: REPORT-64207 单击选中来回切换模板 目录树右上角没有显示锁定状态及icon Hades 2021-12-17 16:20:44 +0800
  • 1a20de07f0 Merge branch 'release/10.0' of https://code.fineres.com/scm/~lucian.chen/design into release/10.0 lucian 2021-12-17 15:31:48 +0800
  • 552dfaa581 REPORT-62834 数据校验支持控件不允许自定义值校验 Yuan.Wang 2021-12-17 15:17:36 +0800
  • 5c73cfbe2e Merge branch 'feature/x' of https://code.fineres.com/scm/~lucian.chen/design into feature/x lucian 2021-12-17 14:47:31 +0800
  • 5546bda83a REPORT-64434【11.0.2迭代验收】带模式的数据库选中表再下拉无匹配内容 lucian 2021-12-17 14:46:21 +0800
  • 458e4397df REPORT-64172 创建图表组件封面图绘制错误 Tommy 2021-12-17 14:09:09 +0800
  • ed44b067cc REPORT-62533【主题预览图】单元格样式只设置下边框线时，左侧预览图中看不到效果 kerry 2021-12-17 13:43:43 +0800
  • 3df380266d REPORT-64207 单击选中来回切换 目录树右上角没有显示锁定状态及icon hades 2021-12-17 10:52:54 +0800
  • 881146320e Pull request #7192: REPORT-64340 去除无用日志 Tommy 2021-12-17 09:38:55 +0800
  • 34cf30ba1d Pull request #7208: REPORT-64300 远程设计时日志推送问题 Hades 2021-12-17 09:36:44 +0800
  • 9749beda88 Pull request #7191: REPORT-64262 【视觉验收】主题编辑的边框配置完善 starryi 2021-12-17 09:28:32 +0800
  • 3462aca957 Merge pull request #7204 in DESIGN/design from release/11.0 to feature/x superman 2021-12-16 20:00:41 +0800
  • eb2f77d365 Pull request #7206: REPORT-62440 表头排序内置 Henry.Wang 2021-12-16 18:15:49 +0800
  • 33e1ac2dde REPORT-64300 远程设计时日志推送问题 hades 2021-12-16 17:26:57 +0800
  • 7038beae50 REPORT-63751 11.0.1-多维数据集/SAP数据集对普通用户设置不开放 使用权限，但对模板依然能保存成功 Henry.Wang 2021-12-16 17:19:28 +0800
  • da720c54fc Pull request #7193: MOBILE-34385 设计器文本控件移动端新增nfc输入 Hades 2021-12-16 17:18:54 +0800
  • 87655021f3 Pull request #7205: Revert "REPORT-64103 游标分页" rinoux 2021-12-16 17:12:07 +0800
  • 184bc1462d Revert "REPORT-64103 游标分页" rinoux 2021-12-16 17:08:23 +0800
  • 3f09f2e718 Merge branch 'feature/x' of https://code.fineres.com/scm/~henry.wang/design into feature/x Henry.Wang 2021-12-16 17:07:33 +0800
  • 9336b1d7f2 REPORT-62440 表头排序内置 Henry.Wang 2021-12-16 17:07:19 +0800
  • 28c946b1c9 Merge pull request #7203 in DESIGN/design from final/11.0 to release/11.0 superman 2021-12-16 17:01:30 +0800
  • c9e56c186c Merge pull request #7202 in DESIGN/design from persist/11.0 to final/11.0 superman 2021-12-16 17:01:03 +0800
  • 0f3bdbab38 Merge pull request #7201 in DESIGN/design from feature/10.0 to feature/big-screen superman 2021-12-16 17:00:35 +0800
  • a7f262b617 Merge pull request #7200 in DESIGN/design from feature/10.0 to research/10.0 superman 2021-12-16 17:00:32 +0800
  • 48da834d09 Merge pull request #7199 in DESIGN/design from bugfix/10.0 to feature/10.0 superman 2021-12-16 17:00:27 +0800
  • 96d81873b5 Merge pull request #7198 in DESIGN/design from release/10.0 to release/11.0 superman 2021-12-16 17:00:22 +0800
  • 4805c8a0c2 Merge pull request #7197 in DESIGN/design from release/10.0 to bugfix/10.0 superman 2021-12-16 17:00:17 +0800
  • 689164870d Pull request #7194: REPORT-64103 游标分页 rinoux 2021-12-16 16:29:16 +0800
  • c5ad17adbe REPORT-64103 游标分页 rinoux 2021-12-16 11:55:05 +0800
  • d8f6332bd2 MOBILE-34385 设计器文本控件移动端新增nfc输入 hades 2021-12-16 14:29:17 +0800
  • b075c4fc32 REPORT-64340 去除无用日志 Tommy 2021-12-16 14:18:52 +0800
  • 1d26e370d8 Pull request #7189: REPORT-64103 新引擎游标分页合11 rinoux 2021-12-16 14:14:49 +0800
  • 330343be85 REPORT-64262 【视觉验收】主题编辑的边框配置完善 Starryi 2021-12-16 14:14:18 +0800
  • 1658378937 Pull request #7188: REPORT-62440 表头排序内置 Henry.Wang 2021-12-16 13:56:17 +0800
  • bd6e6ed7ad REPORT-64103 游标分页 rinoux 2021-12-16 11:55:05 +0800