qinhaoyan
|
5547855bd8
|
Merge "amis-saas-2569 图标select回滚" into pre-release
|
2022-10-14 12:50:05 +08:00 |
|
qkiroc
|
031856bb9f
|
amis-saas-2569 图标select回滚
Change-Id: I8c5195e43e5b0a698c65a2b927450422bf4413ef
|
2022-10-14 12:22:11 +08:00 |
|
donglinan
|
f5a1068697
|
Merge "amis-saas-7452 [Feature] 隐藏状态文案未翻译" into pre-release
|
2022-10-14 11:31:33 +08:00 |
|
donglinan
|
938ede5ae5
|
amis-saas-7452 [Feature] 隐藏状态文案未翻译
Change-Id: I5437fa1500492e005da1bd83df9738eec2401080
|
2022-10-14 11:25:34 +08:00 |
|
liaoxuezhi
|
d82992e5ea
|
Merge "amis-saas-638 [项目] 本地开发升级最新的 amis" into pre-release
|
2022-10-13 21:35:14 +08:00 |
|
2betop
|
459577d099
|
amis-saas-638 [项目] 本地开发升级最新的 amis
Change-Id: Iead66c146e0fff228a0b428f5d01251843cafe37
|
2022-10-13 21:32:47 +08:00 |
|
zhuwei11
|
482fe66a16
|
Merge "amis-saas-7483 补充文案翻译" into pre-release
|
2022-10-13 21:25:52 +08:00 |
|
zhuwei11
|
dc0f9c0591
|
amis-saas-7483 补充文案翻译
Change-Id: I6e25bab96d3b06ac7cdff6c3dca174c9a39aa953
|
2022-10-13 21:23:11 +08:00 |
|
zhoushengqiang01
|
9497df94d4
|
Merge "fix: amis-saas-7233 测试：【组件】添加树下拉框，设计态下未开启可清除选项的配置，预览态选取选项后返回编辑态，可清除选项配置开启；（不符合预期）" into pre-release
|
2022-10-13 20:24:20 +08:00 |
|
zhuwei11
|
4f01c3888c
|
Merge "amis-saas-7483 补充文案翻译" into pre-release
|
2022-10-13 20:21:45 +08:00 |
|
zhuwei11
|
e1e5558c83
|
amis-saas-7483 补充文案翻译
Change-Id: I2c89ec96b21f356071a497b333c4cabe38c12cb7
|
2022-10-13 20:15:30 +08:00 |
|
zhou999
|
8ae19c2c1c
|
fix: amis-saas-7233 测试：【组件】添加树下拉框，设计态下未开启可清除选项的配置，预览态选取选项后返回编辑态，可清除选项配置开启；（不符合预期）
Change-Id: I57ec81356ee9187dc53cdccce622cef983763f09
|
2022-10-13 15:33:20 +08:00 |
|
qkiroc
|
03a6469b8b
|
amis-saas-2569 修复国际化
Change-Id: Ida8e10dcc47c0087345e7b50dc9eac338b175ed3
|
2022-10-13 13:10:10 +08:00 |
|
hsm-lv
|
66755d4d19
|
[amis-saas-6725]优化事件变量
Change-Id: I46f76136b4ca362f0f218de3b79a9a68219ff0ee
|
2022-10-12 19:39:33 +08:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|