Commit Graph

155 Commits

Author SHA1 Message Date
lvxiaojiao
df95a0e73a Merge "fix:文案" into pre-release 2022-07-28 11:46:22 +08:00
hsm-lv
9a5bc10cf1 fix:文案
Change-Id: Ib7cd2b220a42793ef0403a5110b1959c71c84078
2022-07-28 11:45:54 +08:00
lvxiaojiao
adc1bcaa2b Merge "fix:文案" into pre-release 2022-07-28 11:44:17 +08:00
hsm-lv
94613936da fix:文案
Change-Id: I0cbe40836ca6bc5414d250aadfc4e3d220d3900a
2022-07-28 11:42:13 +08:00
pianruijie
90c7a8e997 处理按钮位置
Change-Id: Id58ec34d48814602818b85285e5db937838f1e14
2022-07-28 11:36:40 +08:00
jiatianqi
b0dd9d7214 fix:配置面板右侧开关属性文字对齐
Change-Id: I0aa062962ddebf40b564980b52f0f5d5b6557c51
2022-07-28 10:55:22 +08:00
hsm-lv
1eacd22079 [amis-saas-5460]代码编辑器,默认值js报错时,组件中无法显示代码
Change-Id: I61c3003daddda542c8a46f6d06c84020ec168ee7
2022-07-27 20:08:11 +08:00
allenve
2f2f57eed9 fix: CRUD 新增配置问题
Change-Id: I40bd523767025f0e5910ca26c685e80f77dcf2ef
2022-07-27 17:06:12 +08:00
hsm-lv
df49046f73 fix:eventaction ts errir
Change-Id: I462f47935a9d8dc7a65376c998fd37c9f3579fa6
2022-07-27 16:46:36 +08:00
pianruijie
69f2ae47bc fix:复制影响打开页面 && 变量赋值组件切换显示问题 && 打开页面不展示页面名称
Change-Id: I6cbc86ac311d647fc37825bde79aef731e25db18
2022-07-27 16:02:26 +08:00
jiatianqi
6c616c1017 chore: 添加安全规范的代码豁免注释
Change-Id: I9a98c8cc2127add903c6a9b07a51d0dda924155a
2022-07-27 10:41:08 +08:00
jiatianqi
e2dba3b4a1 fix: 文件上传添加默认路径object-upload://default
Change-Id: I9c235806ac13e6680337cd03167cde4ceb7a5f9a
2022-07-26 16:24:30 +08:00
jiatianqi
f2fe4c4900 Merge "amis-saas-5534 [Bug] DATEMODIFY(DATE(),1,days) ,日期函数有问题" into feat-optimize-4 2022-07-26 10:44:25 +08:00
jiatianqi
2374b07921 amis-saas-5534 [Bug] DATEMODIFY(DATE(),1,days) ,日期函数有问题
Change-Id: Ib4dcf8068d477ca2a3c36dbaf4310b47b474277d
2022-07-26 10:43:08 +08:00
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
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
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
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
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