Commit Graph

515 Commits

Author SHA1 Message Date
jiatianqi
8ac6d437ca Merge "amis-saas-7391 「校验浮层」位置问题" into pre-release 2022-10-19 11:40:39 +08:00
jinye
532ff4ca10 amis-saas-5351 「组件配置」组件 - 表单及表单项展示态切换
Change-Id: Ie2079a5bb02404670fea538f00c6b6c242ef3a7a
2022-10-18 23:47:04 +08:00
hsm-lv
0023e419e5 [amis-saas-7476]:几个build warging
Change-Id: I4bce64b31260d9f1d53e0f8e9969e5eb8488b5e4
2022-10-18 20:39:38 +08:00
hsm-lv
7df75b140c [amis-saas-7476]:动作中页面参数显示问题&组件数据初始化时上下文获取问题
Change-Id: Id8420adf7b12ecf6e9c5f6d603804f578d2d2c3a
2022-10-18 20:06:32 +08:00
hsm-lv
9c96baca03 [amis-saas-7504]: crud reload增加resetPage
Change-Id: I66386e5f6a22e16cdaa837df9a9e6f3fddf05126
2022-10-18 17:09:53 +08:00
hsm-lv
ac1c37d91b [amis-saas-7408]:暂时隐藏刷新动作配置优化
Change-Id: Id9bded55a2c45eba00ae3fcf0233f922122a8a7d
2022-10-18 17:03:13 +08:00
zhuwei11
7ba8000afc amis-saas-7483 国际化翻译
Change-Id: I92dd039d927ce5c4b3203af38b75a01ed304452e
2022-10-14 19:42:53 +08:00
wibetter
afe2cd42c7 fix(amis-saas-7103): 代码格式化一下
Change-Id: I5a8da179d640a4bdccc405b1a7ef56168f08d33b
2022-10-14 13:41:25 +08:00
wibetter
0bb0422d8b fix(amis-saas-7103): 完善开关组件默认值类型校验
Change-Id: I1c8985e67853fbffe7acd9f3de183b117ade4f92
2022-10-14 13:41:14 +08:00
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
wibetter
74530d9ef1 fix(amis-saas-7103): 完善开关组件默认值类型校验
Change-Id: I08a1eabf77fbc783ec328fab2387ccaddca7bfbc
2022-10-14 12:11:34 +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
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
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
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
jiatianqi
5b9ed17b6b 补充发版携带文件目录 amis-saas-6890 [Story]
Change-Id: I494114e97c96fa132278191e45a699b2c00cd9b6
2022-09-23 15:49:46 +08:00
liujintao03
1ebe50e1e2 amis-saas-7139 input-file 事件参数修改
Change-Id: I394a9db1feeda6427afdd7b50f258c5a7cb16c66
2022-09-23 14:35:41 +08:00
liujintao03
4dab3c7e54 amis-saas-7153 input-image 事件参数修改
Change-Id: I02955aad6b091a2e81b9902336162dde6ce7ce7f
2022-09-23 14:35:41 +08:00
qkiroc
40883747b8 amis-saas-7199 国际化翻译更新
Change-Id: Iee05446320fb3dbf39ba07b570a9dec974e7c37a
2022-09-23 10:17:53 +08:00
jiatianqi
7f628f8786 fix: amis-saas-6665 [Bug] 选项文本值无法修改
Change-Id: I08bb7fa2d04bfc206bfd0a3734465409980aaf37
2022-09-22 20:59:55 +08:00
RickCole21
b034c38a29 amis-saas-7095 [Bug] 前端select调用api 预览态返回设计态 接口配置异常
Change-Id: I3c4e62a8e2cf5153da948f466dc064a930b4eadd
2022-09-20 20:19:15 +08:00
RickCole21
a0ea7176d5 amis-saas-7095 [Bug] 前端select调用api 预览态返回设计态 接口配置异常
Change-Id: I13bfda821cc9daedfccee9aa69c5a9bfe89448b1
2022-09-20 19:09:41 +08:00
jiatianqi
e001d3d98c amis-saas-5962 [随机卡片] 发版5.2.0-beta.74
Change-Id: Id487117954891bea2971d47515ee20573ea3b188
2022-09-20 16:35:40 +08:00
jiatianqi
9638625943 Merge "amis-saas-6890 fix: 更改校验触发选项浮层默认位置为top,防止在弹窗下浮层被遮挡" into pre-release 2022-09-20 11:32:05 +08:00
jiatianqi
1367538337 amis-saas-6890 fix: 更改校验触发选项浮层默认位置为top,防止在弹窗下浮层被遮挡
Change-Id: Ic0d46f0f8f71ffc80bf64ad901f137525528a2b4
2022-09-20 11:14:57 +08:00
RickCole21
809c430362 amis-saas-7095 [Bug] 前端select调用api 预览态返回设计态 接口配置异常
Change-Id: Ia87ee8b0f83f9e628dec44e5c24f9f4a65f54f88
2022-09-19 19:53:16 +08:00
jiatianqi
a9af5e1ec8 amis-saas-6890 [研发任务] 「编辑器」文案统一
Change-Id: If7a253552ea432410da0ceb20bccd47425172f78
2022-09-19 19:31:03 +08:00
zhangzhulei
53f9805b81 Merge "amis-saas-7044 [Improvement.] 「抽屉」外观的宽度、高度应跟随位置变化做清除处理" into feat-optimize-5 2022-09-19 16:24:00 +08:00
zhangzhulei
a9a5632170 amis-saas-7044 [Improvement.] 「抽屉」外观的宽度、高度应跟随位置变化做清除处理
Change-Id: I3bce28b80d1d184c1876a4ff114be1176a808262
2022-09-19 16:16:21 +08:00
liujintao03
d67055e60f amis-saas-6405 把固定尺寸移到外观里面
Change-Id: I8e56976e51bd4d673da7989c48dd74708c551b86
2022-09-19 16:15:09 +08:00
qianchuan
cd34c39f9a [amis-saas-7073]release:5.2.0-beta.73
Change-Id: Id514527cde4a0123f309ee72f24d8b698dfc3b49
2022-09-19 11:01:09 +08:00
qianchuan
a04d6c48ce fix:[amis-saas-7073]隐藏table-v2
Change-Id: I35177c16b4adafc31faba9f998d7f6706fea2c33
2022-09-18 22:19:36 +08:00
jiatianqi
23098693bc amis-saas-5962 [随机卡片] 发版 5.2.0-beta.72
Change-Id: If54e1f29728d4250e029824efe224f57713902b5
2022-09-17 22:32:16 +08:00
jiatianqi
9a74ba3fd0 amis-saas-5962 [随机卡片] 9.20本班暂时下掉国际化功能,防止后续发布版本携带问题
Change-Id: I0c470c2ba91851a63690439e283e0cda2850916b
2022-09-17 22:23:59 +08:00
jiatianqi
7a5be4ecc0 amis-saas-6565 [Bug] 「Bug」编辑器在非 cxd 主题下展示异常
Change-Id: Id842802f32d75bc83419f685e8f9248a38a4d70c
2022-09-16 19:52:54 +08:00
jiatianqi
66a86352c0 合并分支 feat-optimize-5
Change-Id: I03fc2b58363e62d01fa651b285a2a453d2d40d67
2022-09-16 19:36:04 +08:00
jiatianqi
9cb25925dd 最新代码无问题,回滚:amis-saas-6174 [Bug] 测试:【组件优化第五批】标题提示/控件提示的配置面板缺少边距
Change-Id: I7225fd1f7cae97c8d7216cbe00661c63aeb8c394
2022-09-16 19:06:05 +08:00
jiatianqi
78b76599ab [amis-saas-5962] 卡片随机 样式优化
Change-Id: I0b18e39d7ffb62bc3b0a316ae78ede283120716d
2022-09-16 17:43:58 +08:00
liqiu03
e36441f9a3 Merge "amis-saas-6465 [Bug] 测试:【组件优化第五批】tree-select、input-tree,高亮节点字符未生效;" into feat-optimize-5 2022-09-16 16:57:28 +08:00
liqiu03
0d274ec4fd amis-saas-6465 [Bug] 测试:【组件优化第五批】tree-select、input-tree,高亮节点字符未生效;
Change-Id: Ic2af118d72c75b68bc6a9dbef8273e1f0fd235d4
2022-09-16 16:56:08 +08:00
jiatianqi
dba94170d9 amis-saas-6565 [Bug] 「Bug」编辑器在非 cxd 主题下展示异常
Change-Id: I4d76fba4ee41a1b891fc4022c3800f4315feae87
2022-09-16 16:53:27 +08:00
liujintao03
4f4e493be5 amis-saas-6405 修复input-image 配置面板一些问题
Change-Id: I0ee06f7a543b39a3ddffdeb3c0624de8e21946d2
2022-09-16 16:03:15 +08:00
liujintao03
7fca54ce7f amis-saas-6405 修复input-image 配置面板一些问题
Change-Id: I076e7ddc65d5ab1b9e16cc8ff97d1ef1fd61ddc7
2022-09-16 15:09:21 +08:00