Commit Graph

202 Commits

Author SHA1 Message Date
liujintao03
97a7d778f0 Merge changes I988bad14,I770db7c4 into feat-optimize-4
* changes:
  amis-saas-5247 input-file支持accept配置
  amis-saas-5251 修复input-image表单项丢失
2022-07-25 21:01:00 +08:00
liujintao03
38e6b49d1c amis-saas-5247 input-file支持accept配置
Change-Id: I988bad147aa4447e3391c6fb8e85b1969ca03db2
2022-07-25 20:59:50 +08:00
jiatianqi
93c52c5ed7 Merge branch 'feat-optimize-4' of ssh://icode.baidu.com:8235/baidu/amis/editor into feat-optimize-4
Change-Id: Ib3bb2bc31dc2e190fb5e15b885ea37979bef86d1
2022-07-25 15:13:30 +08:00
jiatianqi
cafd51915a merge master分支
Change-Id: I0d948d8c1f1b9bc638b68cf06e953057bf31e011
2022-07-25 15:13:18 +08:00
hsm-lv
8548fd2e7c feat:优化动作出参
Change-Id: I999220a00bf17b82afbfe707c69072dcab64a62c
2022-07-23 20:54:14 +08:00
jiatianqi
530766f87a amis-saas-5484 [Bug] 测试:【组件优化第四批】下拉框切换数据来源,默认值输入框会消失;
Change-Id: I6a139ca819ddab829e97735b6104fd6ca2010922
2022-07-22 11:26:08 +08:00
pianruijie
b864c733cf Merge "兼容api string格式 && tooltip优化" into feat-optimize-4 2022-07-21 18:52:58 +08:00
pianruijie
3efd3cae64 兼容api string格式 && tooltip优化
Change-Id: I248967ebba36d906cf86ef8dd02e2563f30dd71b
2022-07-21 16:58:08 +08:00
pianruijie
21ef86a5a9 兼容api string格式 && tooltip优化
Change-Id: I05b1a5e03060ee73affd203b1308fb3ddb8b126b
2022-07-21 16:56:01 +08:00
jiatianqi
42b0428ec3 Merge "fix:修复下拉框 valuesNoWrap属性设置" into feat-optimize-4 2022-07-20 21:08:12 +08:00
jiatianqi
d40eb818ed fix:修复下拉框 valuesNoWrap属性设置
Change-Id: I76f08902d6aeda25cdd3ef0099f8a41d320eaa5a
2022-07-20 21:07:29 +08:00
pianruijie
a2c720fd2c Merge "修复内容覆盖问题" into feat-optimize-4 2022-07-20 19:08:02 +08:00
pianruijie
56e75341fc 修复内容覆盖问题
Change-Id: I4d28fee34a2f51088eecf39a67e35223aa25c209
2022-07-20 19:06:23 +08:00
liujintao03
5c2cba3720 amis-saas-5251 修复input-image表单项丢失
Change-Id: I770db7c4a954cd02fed0afd1f4171948ab6a16c4
2022-07-20 17:04:27 +08:00
hsm-lv
931fbcc0f4 fix:tip positoin
Change-Id: I087b593ec324a7f2457e8d4a2c0e705c85117b9f
2022-07-20 15:46:47 +08:00
hsm-lv
46125142c1 feat:ajax动作支持静默模式
Change-Id: Id23910c2e5013e4ea0ba3bd40c72e6a27dfdb80b
2022-07-20 15:30:20 +08:00
hsm-lv
7908bdfe76 [amis-saas-5499]当按钮类型为submit或reset时才展示按钮类型选择
Change-Id: I7f5dc77e179424115d2f22145d34ffd2ad047857
2022-07-19 20:51:04 +08:00
yangwei9012
1a2dfe79e6 fix: 字段绑定样式 & bump: 5.2.0-beta.21
Change-Id: Ifd2d9e4f89bfa4c452047d222ab0bef2672dd410
2022-07-19 20:01:00 +08:00
liuzedong02
b790128536 Merge "amis-saas-5128 tabs 增加 activeKey 配置" into feat-optimize-4 2022-07-19 16:52:10 +08:00
jinye
f08d9000ea amis-saas-5482 颜色框-可清除配置默认为true
Change-Id: Ibfd47c2d452261ccac021dc94fb3b9329888e2c8
2022-07-19 15:20:56 +08:00
yangwei9012
90ab02b9e3 feat: 表单项字段绑定
Change-Id: I3699a5371f78225246d4745a3f8e17721d28b30b
2022-07-19 14:30:04 +08:00
jiatianqi
5f14857fed publish amis-editor & amis-editor-core 发版 5.2.0-beta.20
Change-Id: If5b6b18c641cc78cbd7372e981f292e1a24deb99
2022-07-19 10:17:46 +08:00
liuguihua
be10f01bc9 amis-saas-4924:更换添加icon
Change-Id: I0e9953b46150d59d50fcbb1655c9a3b93f730a40
2022-07-18 21:11:11 +08:00
pianruijie
f79df869d7 去掉多余属性 & 修改文案
Change-Id: I74a87b9143492cd58b8c71477aaa1eac4a66fa44
2022-07-18 14:44:16 +08:00
pianruijie
d1afb8a694 处理变量赋值bug
Change-Id: I316dd7b974f38e6ba369624d149d02633aa0a6e0
2022-07-15 19:29:19 +08:00
pianruijie
299bb97720 支持可视化选择请求结果变量
Change-Id: Ia4b0290a5bff095663cdffeb41bf03fabc643c42
2022-07-15 16:44:57 +08:00
yangwei9012
92e68b01fa feat: 复制一份 & 新增复合组件
Change-Id: I30a218665bc3cf5e80438ff9dd2b22c5a69555be
2022-07-15 13:06:47 +08:00
pianruijie
8df83bd50b fix:测试:【组件优化第四批】事件监听-动作配置-选择对应的打开页面后,清空所选择的页面,页面参数会自动填充;
Change-Id: I635b42b5e5a8b59fab56c46caba9b6467b1508af
2022-07-14 20:38:17 +08:00
hsm-lv
1f46f56772 fix:自定义js动作样式问题&提交表单描述
Change-Id: Ib4a83edf49c0c621e98cbe943872e4dcb3f9c158
2022-07-14 12:43:10 +08:00
hsm-lv
f90cfb2689 fix:去掉多余动作配置
Change-Id: I03ed751a140e28a7e56c58a58284faf9c1e0fc9c
2022-07-14 11:28:46 +08:00
hsm-lv
921be3b845 fix:动作列表描述信息丢失问题
Change-Id: I890ceb2fd804c157fc989b5562854effdd328d10
2022-07-14 10:59:54 +08:00
2betop
bca80d9c9f chore: 富文本编辑器将颜色按钮放出来,方便飘红操作
Change-Id: I16417f8d38b3dfd49043f67c359b79021af94132
2022-07-13 15:20:51 +08:00
2betop
ec9cee2617 merge master into feat-optimize-4
Change-Id: Ic6555d621403455805dc5c22213726f73f307313
2022-07-13 14:44:51 +08:00
wibetter
22453d337f fix(valueFormula): 完善最大&最小值影响自身默认值设置
Change-Id: Id8949fba9328ff317770c4b957e8a9616ed97b2f
2022-07-13 13:15:45 +08:00
jiatianqi
ac50da4655 publish @fex/amis-editor@5.2.0-beta.19
Change-Id: Iae994b9bb5682ab62eaa568a27f6d988526752d2
2022-07-13 12:34:06 +08:00
jiatianqi
916c4561da update amis包版本
Change-Id: I3473c549bf0a9f6124df980b3f01263fb37875b7
2022-07-13 12:22:10 +08:00
jiatianqi
2a247ac32a fix:角标问题的修复
Change-Id: If36691527edb0892cc1830b66f5d73872dffa26e
2022-07-13 12:06:16 +08:00
wibetter
1dfea3b938 fix: 修复显隐切换时出现异常数值
Change-Id: I74fad75d207d4d320a5cb467222f7e3c639ce782
2022-07-13 11:14:13 +08:00
wibetter
69ef3be3ea fix(formulaControl): evalMode改为默认true,valueFormula处改为默认false
Change-Id: I4153407a2b5995f1117c323fd422c5feba0c3016
2022-07-13 10:52:01 +08:00
liuguihua
c24217c6b9 Merge "amis-saas-5196:层级限制并提示" into feat-optimize-4 2022-07-12 12:26:41 +08:00
liuguihua
099ed37e6b amis-saas-5196:层级限制并提示
Change-Id: Ic543d0ba6ecaf208d253731d0dfa888bb8d0f1d0
2022-07-12 11:43:03 +08:00
pianruijie
e34d57f4ca combo支持赋值指定序号
Change-Id: I5394b2af100d44bac6cb681eeae54440f67c21b1
2022-07-12 11:19:40 +08:00
yangwei9012
58c32423dd fix: 合并遗漏问题
Change-Id: I41e35d0f6233218b6fb1015a6c801a370d3f801a
2022-07-11 15:12:02 +08:00
yangwei9012
e50e098fd3 feat: 简单筛选的字段过滤条件设置 & 部分问题修复
Change-Id: Iae1e078295932ea4e8a89208daf90cf8f8e8f1e3
2022-07-08 16:05:25 +08:00
tooeast
ae8d430553 amis-saas-5128 tabs 增加 activeKey 配置
Change-Id: I9bcd5eafc2eba99a57479200539e05f703385ac7
2022-07-08 11:04:23 +08:00
pianruijie
60adac3367 Merge "发送请求支持存储接口返回结果 & 变量赋值支持下拉选择变量" into feat-optimize-4 2022-07-07 16:21:37 +08:00
yangwei9012
3a039d1427 fix: bug & bump 15
Change-Id: I07bb977871b708fd207c3dc62f18c9875ce77ca5
2022-07-07 16:17:38 +08:00
pianruijie
82fa7b9a67 发送请求支持存储接口返回结果 & 变量赋值支持下拉选择变量
Change-Id: I038b49a6c8647ed2960b03ec684443140ced2e10
2022-07-07 16:14:11 +08:00
jiatianqi
562b440276 fix:分页组件maxButtons属性
Change-Id: I44e4000fd5469dd9b2b81bbe8c73d784ccf54181
2022-07-07 15:44:55 +08:00
qianchuan
99fbf15d4c version:5.2.0-beta.16
Change-Id: Ic87f15b87992d3c9dcbc7ff72b15aa710759a7ed
2022-07-07 15:36:20 +08:00
qianchuan
f264e2c34f fix:兼容autoFill 自动填充与数据录入场景
Change-Id: Ibc5e8f494b97589187416d33cb8bc2c38a6a4bf3
2022-07-07 14:55:51 +08:00
wibetter
335222fe73 fix(下拉选项配置): 区分多选模式
Change-Id: I85d06012d0cbe8766728c3b3894180d6ed438fcf
2022-07-07 11:32:23 +08:00
wibetter
1bb451c28f fix(下拉选项配置): 增加取消操作
Change-Id: I9af236209c8889fa1142177d6a3f8e11ede7b14a
2022-07-07 11:24:22 +08:00
liqiu03
943586ba62 Merge "amis-saas-5204 [Bug] 测试:【组件优化第四批】链接-属性-基本配置-图标位置默认右侧,图标配置栏缺失;" into feat-optimize-4 2022-07-07 11:01:41 +08:00
liqiu03
2cf7fc11f3 amis-saas-5204 [Bug] 测试:【组件优化第四批】链接-属性-基本配置-图标位置默认右侧,图标配置栏缺失;
Change-Id: I46c5010a98315f67d120311505b00bfaabf2a40d
2022-07-07 10:32:30 +08:00
jiatianqi
f42345981c publish: @fex/amis-editor@5.2.0-beta.14
Change-Id: I2616ad06a490a5e41c5af389da302bc0de2392cc
2022-07-06 21:09:47 +08:00
renyuguang
8567ddc711 Merge "修复重复显示和文案" into feat-optimize-4 2022-07-06 21:01:36 +08:00
wibetter
9b169b15dc fix(valueFormula): 组件设置交互中剔除多余字段
Change-Id: I04ae6796fb436acd418dba5cef4b405b2bb559be
2022-07-06 20:50:07 +08:00
wibetter
9450824789 fix(valueFormula): 避免组件配置项本身数值限制
Change-Id: I75b9c83c0df7a23e67dcc0cd7866f248d515ee3b
2022-07-06 20:47:04 +08:00
renyuguang
8cc3a2bacc 修复重复显示和文案
Change-Id: Iccf597105357d4a854821ea32b760bbe96b22c2a
2022-07-06 20:46:19 +08:00
lvxiaojiao
657e0d355a Merge changes I30929f08,I8447a84a into feat-optimize-4
* changes:
  style:调整添加事件按钮到顶部
  fix:事件动作args错误问题
2022-07-06 20:40:42 +08:00
hsm-lv
ed1026d43b style:调整添加事件按钮到顶部
Change-Id: I30929f08583b12241115ef4076179c724598e5ee
2022-07-06 20:36:14 +08:00
jiangchunhui
c9730c24d5 [BCE-FE-551] 修复api编辑高级配置时,删除部分数据映射,json格式不变的问题
Change-Id: I4a85afb3c5f26e139c31fee5e617ce2647fc2207
2022-07-06 19:54:11 +08:00
wibetter
ad74fdd1bd fix(valueFormula): 组件默认值设置交互细节优化
Change-Id: Ia8f150a7a8f42e9ef5d5222576cf7c0d53152f88
2022-07-06 19:23:16 +08:00
hsm-lv
e9a805cadf fix:事件动作args错误问题
Change-Id: I8447a84a971814c1d990b210384d249d2b978778
2022-07-06 17:36:20 +08:00
liuguihua
e60cf433f2 amis-saas-4924:修复一个拖拽问题
Change-Id: I9d038bd311885517e1b3aafb33b8b579e762ee11
2022-07-06 16:06:33 +08:00
yangwei9012
a0bd198573 doc
Change-Id: I2aff4cd7875271f57bbf0749603920409f8cbbce
2022-07-06 14:24:42 +08:00
allenve
b799d0957d suda-form theme-editor 独立打包
Change-Id: I48cd2b4ebb42445dbd270261331cc6c0facd33da
2022-07-06 10:20:07 +08:00
yangwei9012
ec4170017f merge feat-optimize-4
Change-Id: I8974063a944df31cfcd401f416b69859fa53c04d
2022-07-05 23:12:28 +08:00
liqiu03
b126ca576f amis-saas-4605 [Bug] 测试:【组件优化第四批】超链接-基本配置-图标; 预期:图标名称过长时展示在输入框外,可清除按钮展示在输入框外(可优化)
Change-Id: Ia1aa6a58c6ce0ece2d2ee6a58869ebb98242801d
2022-07-05 20:17:25 +08:00
liuguihua
0237345427 Merge "amis-saas-4924:增加选项管理及API配置" into feat-optimize-4 2022-07-05 19:45:24 +08:00
qianchuan
6f3833cbc5 fix:variables支持获取上下文数据
Change-Id: I7693263220b866ce8721ebcb146758dff3b25ede
2022-07-05 16:21:49 +08:00
hsm-lv
29bd6b5e91 完善事件描述
Change-Id: Ib1f997f8740aace5c7efa01c5289faef1aeb5526
2022-07-05 15:30:09 +08:00
hsm-lv
687e31e6c9 [amis-saas-4984]:测试:【回归】事件监听-动作配置-组件(刷新),基础设置下选择对应的组件名称保存,返回动作配置编辑态,动作说明缺失;
Change-Id: I262628656293b1f6397d4be3d1a8bf2e0596392a
2022-07-05 15:03:31 +08:00
liuguihua
b304ce811a amis-saas-4924:增加选项管理及API配置
Change-Id: If13229af2938b7d77228288d151d3583e1a124d0
2022-07-05 15:00:28 +08:00
wibetter
aa6aa57d0f docs: 修正代码规范问题
Change-Id: Idd6269ebdf4d5678f4f14c78ab008a1f71650487
2022-07-04 20:37:28 +08:00
wibetter
3fed1ffec9 build: 修复构建偶发报错问题
Change-Id: I0e4c5cf4d3c7cdb00adc534b0eaec6bfc2e3661e
2022-07-04 20:10:11 +08:00
allenve
f21f4de649 过滤公式中为空的tab
Change-Id: I2f9e314c26892021919b8c7cefe1e02b9599c352
2022-07-01 15:32:29 +08:00
hsm-lv
6f4853e755 [amis-saas-4999]测试:修复部分组件禁用动作不可用问题
Change-Id: I204d37f92763a009a1602ea7c86c2c12f0bd0d7a
2022-07-01 10:08:49 +08:00
hsm-lv
721b06308e [amis-saas-5036]打开页面动作回显为空
Change-Id: Ie4648c90a1ad1bbf5b7707b382e3f3fb6094aad5
2022-06-30 14:29:05 +08:00
chengjinyang
f99bfc98b7 [amis-saas-4806] style: 动作设置表单label左对齐
Change-Id: I0931f98dce73d46b9bf93adc73d7fb60e575ed5e
2022-06-29 22:09:16 +08:00
jiatianqi
066b6aee6d update: 5.2.0-beta.9 版本
Change-Id: I5ff6e1082ce908fe5d5ee519a619d63f8aad696d
2022-06-29 15:34:18 +08:00
jiatianqi
d5c228fd00 fix: 下掉按钮点选的自动填充功能
Change-Id: I87f48b5ec964ae36be51381cfca32c71b02598a7
2022-06-29 15:27:44 +08:00
hsm-lv
4960aa296b fix:合并的问题
Change-Id: I187e02d52a1a6ded9c91f3a57dda6e605fc27e64
2022-06-29 12:12:29 +08:00
jiatianqi
a8eae0f996 merge pre-release 分支
Change-Id: Ib69bc81c94fb0b4bbd969dcee6a7160016f7b58b
2022-06-28 21:42:18 +08:00
hsm-lv
6561c1f84b feat:补充老crud的reload动作
Change-Id: I53dfec3fef93f54ee10b6683811cb8a0abddef65
2022-06-28 11:11:58 +08:00
chengjinyang
ff49158dec fix: 表单schema包含函数或类时渲染失败
Change-Id: Iaa699a0c1e2c1b09a478c6c058defd72c483d4ed
2022-06-24 21:12:31 +08:00
hsm-lv
4e2dc7f9e5 fix:动作配置
Change-Id: Ia0bada12e46fe36044163b28e1ce1f9f4b9eaea6
2022-06-24 17:59:36 +08:00
chengjinyang
b7e4adadbc Merge "fix: amis-formula版本错误" into feat-optimize-4 2022-06-24 14:23:04 +08:00
chengjinyang
81a5144186 fix: amis-formula版本错误
Change-Id: I447b5164fc6d00179fe93c9f1e4584915c5361f4
2022-06-24 14:12:53 +08:00
wibetter
4d53b41397 fix: 新版组件icon改放amis-editor
Change-Id: Id5eb955e98001bce98618304df065ec0f5fc9735
2022-06-24 12:49:09 +08:00
chengjinyang
8a91a122cb [amis-saas-4806] feat: 事件动作树优化及支持搜索
Change-Id: I41ecf6e4d3a0f4aabfcf98982af649a1ed86f3a5
2022-06-24 10:38:04 +08:00
hsm-lv
fed67cf2e7 update: 动作弹窗拆出来
Change-Id: I9a6769619bdb1e9b1f4fabadcbe168f61681b6e2
2022-06-23 23:11:01 +08:00
liudan21
db193b2aed Merge "fix: 修正build构建报错" into feat-optimize-4 2022-06-23 20:54:09 +08:00
wibetter
ba40ae006e fix: 修正build构建报错
Change-Id: I1c364c75f2e5118727e918eb02e0fe5ee5edde3e
2022-06-23 20:52:41 +08:00
yangdianhua
5a9b6ed3e4 Merge "amis-saas-4945 [Feature] 「按钮优化」按钮点选优化" into feat-optimize-4 2022-06-23 20:50:13 +08:00
yangdianhua
dcb52fcf1f amis-saas-4945 [Feature] 「按钮优化」按钮点选优化
Change-Id: Ie6a030c2458f2086dd735973130f171fb10a1e7a
2022-06-23 20:46:11 +08:00
yangdianhua
037ad4fce1 Merge "amis-saas-4944 [Feature] 「容器类优化」Container组件优化" into feat-optimize-4 2022-06-23 20:26:04 +08:00
hsm-lv
8de7964511 fix:Offset type import
Change-Id: Iaa54297385999bf0a0c96df21f89cd7e0123b572
2022-06-23 20:03:38 +08:00
hsm-lv
ff0c1135a2 update: 文案修改
Change-Id: I604751aad8bd1f626ca922f50c6cd898d412e3fb
2022-06-23 19:59:38 +08:00