Commit Graph

649 Commits

Author SHA1 Message Date
qkiroc
9292e4bb4c amis-saas-2569 国际化版本
Change-Id: I857f4288467cdb263fde832a62174756d9bfb1ec
2022-10-12 11:45:25 +08:00
qinhaoyan
a5ee1ce787 Merge "amis-saas-2569 修复国际化问题" into pre-release 2022-10-12 11:31:07 +08:00
qkiroc
f72bde3f20 amis-saas-2569 修复国际化问题
Change-Id: Ia73072b6163b2ccf8f5167f236d0688eb01337cd
2022-10-12 11:30:35 +08:00
lvxiaojiao
0959a8e449 Merge "[amis-saas-7408]:优化刷新动作配置,增加数据追加控制" into pre-release 2022-10-11 22:06:06 +08:00
hsm-lv
1d0119a01d [amis-saas-7408]:优化刷新动作配置,增加数据追加控制
Change-Id: If0cab922f8b40b092c22edfc865ceab09a2a83c2
2022-10-11 21:42:28 +08:00
xujiahao01
3d6afde60a amis-saas-6716 feat:解决冲突 icon-picker=>select
Change-Id: I8a798cd4bb80b0d08f53afe58f40f1787e367f01
2022-10-11 15:58:09 +08:00
qinhaoyan
045fb8965a Merge changes Id8f1657d,Iabaacca1 into pre-release
* changes:
  amis-saas-6436  国际化翻译更新
  amis-saas-2569 merge
2022-10-09 16:07:09 +08:00
jiatianqi
9952b094f1 amis-saas-7391 「校验浮层」位置问题
Change-Id: Iad32876338dbdfef004383c0f66fef691602a746
2022-10-08 07:36:30 +08:00
zhuwei11
18f6aa01cf Merge "amis-saas-7346 [Story] switch描述文案展示修复" into pre-release 2022-09-30 17:14:53 +08:00
zhuwei11
9a2b1175bd amis-saas-7346 [Story] switch描述文案展示修复
Change-Id: I0bcba892d1f29dd1b0d89a5f8f48ab9ed99c2727
2022-09-30 17:12:04 +08:00
zhuwei11
78e33d2a64 Merge "amis-saas-7346 [Story] switch描述文案展示修复+tooltip title字号调整" into pre-release 2022-09-30 16:02:50 +08:00
zhuwei11
619537b1be amis-saas-7346 [Story] switch描述文案展示修复+tooltip title字号调整
Change-Id: Id6c080a0981b95c63c0e429c222709041f56207c
2022-09-30 15:51:26 +08:00
jiatianqi
65d800b43c amis-saas-7377 「commbo提示」存在删除、可拖拽的tooltip提示被遮盖 &导致出现横向滚动条
Change-Id: I8698621b4e87b3de34eb3269ae1f8d7990fce3fb
2022-09-30 11:56:38 +08:00
qkiroc
ddcc68dfbe amis-saas-6436 国际化翻译更新
Change-Id: Id8f1657d0f51571ba6d0fb31bfe4b9499c7e3de5
2022-09-30 11:15:00 +08:00
qkiroc
f41ae0f70f amis-saas-2569 merge
Change-Id: Iabaacca109f45a703dadb4b0ebe0b505547e325b
2022-09-30 11:11:08 +08:00
jiatianqi
563736b2c7 amis-saas-7372 「调整组件布局切换select」调整切换button-group-select切换为 select
Change-Id: Iea605bb802c800b1bff0e2a736a2d8320704f7df
2022-09-30 10:29:51 +08:00
jiatianqi
d317685a3f amis-saas-7370 「文案调整」英文翻译调整
Change-Id: I01253c61d4c00140d4928a96c96ab2ca81a9a6b5
2022-09-30 10:24:11 +08:00
zhou999
6eadc9df9a feat: 「日期范围快捷键」快捷键优化调整 amis-saas-7301
Change-Id: Icc94132831faacb2730e532f5766f7da53084ab1
2022-09-29 14:14:22 +08:00
qinhaoyan
acd233860c Merge changes I32832257,I8a6c16b3,I2fa8fa11 into pre-release
* changes:
  amis-saas-2569 更新国际化
  amis-saas-2569 更新国际化
  amis-saas-2569 修改脚本
2022-09-28 15:58:13 +08:00
qkiroc
0e8affd01f amis-saas-2569 更新国际化
Change-Id: I32832257c9c721dc4087ce4f8672f0d8edd3ee40
2022-09-28 15:57:37 +08:00
qkiroc
165645815d amis-saas-2569 更新国际化
Change-Id: I8a6c16b3be93ed344043e978912ebe5f1528de12
2022-09-28 14:53:47 +08:00
jiatianqi
2298aaca96 Merge branch 'master' into pre-release 2022-09-28 14:47:26 +08:00
qkiroc
8662d4d884 amis-saas-6436 国际化翻译更新
Change-Id: Ie5afbf3e26049e2b2c44680f8dd3ee9065bafa3f
2022-09-27 18:41:18 +08:00
qkiroc
2e0e90147c Merge branch 'pre-release' of ssh://icode.baidu.com:8235/baidu/amis/editor into pre-release
Change-Id: Id9af4ce19f8621f1a111959a650bbdaff9c6d11a
2022-09-27 18:41:02 +08:00
jiatianqi
b6ef0091e6 Merge "amis-saas-6890 [Story] tsconfig.json调整" into pre-release 2022-09-27 17:44:18 +08:00
jiatianqi
1e252ba275 amis-saas-6890 [Story] tsconfig.json调整
Change-Id: Idd20f71191c181f62e1061796d1f43faeca6ab94
2022-09-27 17:41:18 +08:00
jiatianqi
2b83ed3913 amis-saas-5329 fix:单存编辑器服务下api问题修复
Change-Id: Id7011176647c45f84d7e96a12cb3fc2017fe36d1
2022-09-27 17:39:45 +08:00
qkiroc
bf99393ac5 amis-saas-2569 merge
Change-Id: I82bd022172e13d3a604b7ebb49a4384357f89e24
2022-09-27 16:57:12 +08:00
qkiroc
cba6725400 amis-saas-2569 国际化更新
Change-Id: I212cbf23f38ec40a05b5d25cc15570282a0f1d52
2022-09-27 16:53:46 +08:00
jiatianqi
5ae559a5b2 amis-saas-6892 补充3个组件针对默认值的处理
Change-Id: I0573d9d446277ea4c98381ac0c51b1d9e0616441
2022-09-27 15:51:11 +08:00
nwind
6bb7257fe4 amis-saas-6890 优化 tinymce 的默认值,并在配置 richTextToken 后自动切换为 froala
Change-Id: I6e03c8abef18720903e12546c70e4cc0c27b9546
2022-09-27 15:16:02 +08:00
hsm-lv
463a34fb86 Merge branch 'feat-optimize-5' into pre-release 2022-09-26 18:51:17 +08:00
pianruijie
1295a34bad amis-saas-7150 数据容器组件赋值问题
Change-Id: Id4b8047f2efe81f3a582d2cbfc379c597613f09f
2022-09-26 17:59:29 +08:00
jiatianqi
156a9abaf4 [amis-saas-5962] 合并第五批组件分支
Change-Id: Idf21932c4ed4db401efe421acbbb00b25358e7fb
2022-09-26 17:45:48 +08:00
jiatianqi
b790aad48d amis-saas-7262 [Bug] 图片问题修复
Change-Id: Ifef5c310c365bd2a21b917acebed69a55326a721
2022-09-25 20:26:22 +08:00
jiatianqi
8580271f94 amis-saas-7262 [Bug] 测试:【组件】图片上传开启固定尺寸上传图片后,已选择的图片不支持预览;
Change-Id: Ibfaba1e55eb699a9c3e8ae2fe82e4205e99e9551
2022-09-25 20:06:29 +08:00
jiatianqi
7ade25e19f amis-saas-7247 [Bug] 测试:【组件】支持事件的组件下添加弹窗动作配置,属性默认配置属性未开启;
Change-Id: I960c44d526b2c86e600d452b9fe2e021f6b58dbf
2022-09-25 15:44:55 +08:00
jiatianqi
43cacd93b1 amis-saas-7253 [Bug] 静态展示框默认值配置不回显,且不支持输入问题修复
Change-Id: Ic430b19cc708bf29f6862f200552d1cb0643596e
2022-09-24 19:48:22 +08:00
jiatianqi
245ce48853 amis-saas-7256 [Improvement.] 城市选择组件无必填配置项问题修复
Change-Id: I889822f9104511e48940310a738c345ee67b4fbc
2022-09-24 19:28:21 +08:00
zhoushengqiang01
d5ef2fed91 Merge "fix: 测试:【组件优化第五批】穿梭框表格形式下添加表格行只对表格下的最后一行为空进行校验; amis-saas-7219" into feat-optimize-5 2022-09-23 20:01:40 +08:00
zhou999
e058192010 fix: 测试:【组件优化第五批】穿梭框表格形式下添加表格行只对表格下的最后一行为空进行校验; amis-saas-7219
Change-Id: I868eae5155957ad1c47e2217d077360d310b3f80
2022-09-23 20:00:59 +08:00
zhoushengqiang01
643a822650 Merge changes Ib6bfd9e2,I98964f3e,Ia0580c95 into feat-optimize-5
* changes:
  fix: 测试:【组件优化第五批】穿梭框表格形式下添加表格行只对表格下的最后一行为空进行校验; amis-saas-7219
  fix: 测试:【组件优化第五批】穿梭框表格形式下添加表格行只对表格下的最后一行为空进行校验; amis-saas-7219
  fix: 测试:【组件优化第五批】穿梭框表格形式下添加表格行只对表格下的最后一行为空进行校验; amis-saas-7219
2022-09-23 20:00:30 +08:00
zhou999
3122b5b0c8 fix: 测试:【组件优化第五批】穿梭框表格形式下添加表格行只对表格下的最后一行为空进行校验; amis-saas-7219
Change-Id: Ib6bfd9e2db3842f39779ae208cf43d88f6f54bda
2022-09-23 19:58:52 +08:00
zhou999
8b24082732 fix: 测试:【组件优化第五批】穿梭框表格形式下添加表格行只对表格下的最后一行为空进行校验; amis-saas-7219
Change-Id: I98964f3e2f89cae4d103ebb3b961508fe5982bee
2022-09-23 19:42:39 +08:00
zhou999
c9d53b9a85 fix: 测试:【组件优化第五批】穿梭框表格形式下添加表格行只对表格下的最后一行为空进行校验; amis-saas-7219
Change-Id: Ia0580c95853e98bc1776bd927a49cde455773b18
2022-09-23 19:41:10 +08:00
jiatianqi
f543c7027e amis-saas-7237 [Bug] dropdown-button组件在使用时传入 popOverContainer: null情况下,buttons属性内容会渲染在当前层级下
Change-Id: I1909b4e11b2b8efff0ee37221c42753d9ee15419
2022-09-23 19:16:58 +08:00
jiatianqi
90381320db amis-saas-7237 [Bug] 测试:【组件】在树下拉框,自定义选项下,无法新增选项及子选项;
Change-Id: Ide1674ff09215c621be894ddfd5a0e459deb03f0
2022-09-23 18:01:07 +08:00
jiatianqi
ef0bf5199e amis-saas-7241 [Bug] 测试:【组件】树选择框外观配置项(待确认)
Change-Id: I5aee9f10b1cc63c975ef17fb67fc0b9084206c3e
2022-09-23 17:59:51 +08:00
pianruijie
1b6db38132 Merge "fix:修复dialog、transfer事件变量[amis-saas-7150]" into feat-optimize-5 2022-09-23 16:52:03 +08:00
pianruijie
3e9a58e5f8 fix:修复dialog、transfer事件变量[amis-saas-7150]
Change-Id: I8506108ae46c539c352ac115a7361e08d88c9250
2022-09-23 16:50:13 +08:00