Commit Graph

198 Commits

Author SHA1 Message Date
RickCole21
98eefa0a59 Merge remote-tracking branch 'origin/feat-dataInput' into qatest_feat-2899
Change-Id: Iaf2ea54298e995faa6a19c1daf23f01deec3958c
2022-08-05 18:35:35 +08:00
RickCole21
138f980b9c amis-saas-5329 [Feature] 「feat」服务调用配置升级
Change-Id: I7a95383e444a71ed64805615b9348d37e326d286
2022-08-05 18:27:13 +08:00
RickCole21
7b560b917a amis-saas-5329 [Feature] 「feat」服务调用配置升级
Change-Id: Ic26cd7da98be4ada9a0433b7b3d5a8943c47f6bd
2022-08-05 17:54:36 +08:00
RickCole21
1011cee9cc amis-saas-5329 [Feature] 「feat」服务调用配置升级
Change-Id: I729bfc812ece83eac5de3b47c2ba340141b45a2d
2022-08-04 11:16:57 +08:00
RickCole21
a3de043b1f Revert "amis-saas-5329 [Feature] 「feat」服务调用配置升级"
This reverts commit bc3266516887e78208028f52598dc26ce3c9f80a.

Change-Id: I9655b7613dfdb50c7e1aea514874b0e631248545
2022-08-04 11:05:35 +08:00
RickCole21
746331c62f amis-saas-5329 [Feature] 「feat」服务调用配置升级
Change-Id: I24eb1b55ba3193651e07cbd2a2a5c98f8c270953
2022-08-03 20:21:31 +08:00
qianchuan
2d2a4cd26e merge maseter
Change-Id: Ia6dc7b3044bc75a0924eb3a1ee124059f96d4b11
2022-08-02 11:42:05 +08:00
nwind
49ad3e08a5 修复 crud 脚手架生成的 api 地址错误
Change-Id: Ib39e17f0c1f7d9db5ed816c0b894839ce4ace053
2022-08-02 10:33:15 +08:00
wibetter
5a3b158d76 docs: 内网amis-editor和amis-editor-core发一版 5.2.0-beta.36
Change-Id: Ie3ad1f217133dfbd2ca096035eccb2c55c202423
2022-08-01 20:44:19 +08:00
qianchuan
42ac152d2d fix:自动填充显示兼容
Change-Id: I888e6ffa3a6e497152a05fb4f1d144eabe5a7eec
2022-08-01 17:01:38 +08:00
liaoxuezhi
5ddf197d45 Merge changes I0f79c25d,Ie1393474
* changes:
  样式优化
  fix: 修复日期类控件自动将 value 默认值运算并设置上的问题
2022-08-01 17:01:32 +08:00
2betop
94f5cb05c6 fix: 修复日期类控件自动将 value 默认值运算并设置上的问题
Change-Id: Ie1393474a59455b991e09bfc3a84f574b6cdbff9
2022-08-01 16:47:17 +08:00
nwind
45e7a3b5bc 修复 api 示例无法显示问题
Change-Id: Idc55248ad7475e48749030350aed8c08cfe48b2c
2022-08-01 15:44:50 +08:00
wibetter
177b417f99 fix(valueFormula): 设置统一的popOverContainer
Change-Id: I12ccb3d2e752e67147df4810d4d783504e17c2af
2022-08-01 11:29:58 +08:00
qianchuan
b7eae07ddc fix:作用域值更行
Change-Id: Ib6cf7315c3813c04aba1fe1b36d8c4e01ad39888
2022-07-29 21:56:50 +08:00
qianchuan
314ca35640 fix:值更新
Change-Id: I3a83fe7cde62ecf15b641727b41305d355e7276b
2022-07-29 19:43:18 +08:00
hsm-lv
d45b0a464d Merge branch 'pre-release' into master 2022-07-29 14:39:06 +08:00
hsm-lv
0ca61174e5 fix:修复下载请求动作样式&ts问题
Change-Id: I82130adce5d0d5fa370b885b3baed7fa6e79e39e
2022-07-29 14:37:23 +08:00
pianruijie
f106e0ac45 可视化选择请求结果数据、状态、提示
Change-Id: I048017d1772e31e20cab183f5a5ba46fcf7e9801
2022-07-29 12:14:02 +08:00
pianruijie
4fbd0e3a25 ajax动作支持可视化选择数据、提示、状态
Change-Id: I1ae1c2251578b2b2ef8a3d5a7900b0d764f3502d
2022-07-29 12:14:02 +08:00
allenve
fd9ffd4e0c merge pre-release
Change-Id: Ie4c4024e2cbe75651845f51ac25129e69266ff6e
2022-07-28 17:50:24 +08:00
hsm-lv
be6a45ca1e fix:codeEditor import&按钮为特殊类型时开启老动作入口
Change-Id: Idf46ff78eb3bfb97dc032da1415e13c2f2fdfe6f
2022-07-28 17:44:03 +08:00
panzheng
e650d6839a 解决原图表组件右侧面板展示不正常的问题 [amis-saas-5662]
Change-Id: Iac2e5d5d33065a8d22130268f309cf8e63a7440d
2022-07-28 16:57:14 +08:00
allenve
d007ffc9ae merge feat-4
Change-Id: Ie1349dc7374a99b7ad9fea457f703144827e6b9a
2022-07-28 15:49:32 +08:00
pianruijie
f19d056a59 支持外部组件
Change-Id: Ia621f61b16d0f0e94078250c717fdc2bfb6670cf
2022-07-28 12:33:48 +08:00
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
yangwei9012
62ab9ebbcf bump: 5.2.0-beta.27
Change-Id: I4cbda3babfdfa475fb7490380f8921aa9daa112a
2022-07-27 19:55:02 +08:00
yangwei9012
33da19230f revert: feat-crud中不可提测的内容
Change-Id: Iaeb23225905fe57c5aff7418e32a00da619bda33
2022-07-27 19:48:02 +08:00
yangwei9012
83b937f5f7 merge pre-release
Change-Id: Icc0954d0d7f8fc9f9a1577da20cad732e7b7be60
2022-07-27 17:56:04 +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
pianruijie
a059875c23 弹框支持选择外部组件
Change-Id: Ib8f64cedad9502f3c35169e782dc4df25450366d
2022-07-27 11:00:38 +08:00
pianruijie
1bdb07bd44 Merge "兼容api string格式 && tooltip优化" into feat-optimize-4 2022-07-27 10:56:01 +08:00
yangwei9012
1ac28a0f5d merge optimize-4
Change-Id: I68a7271fef099dbc13940bc786c191771fcab364
2022-07-27 10:52:31 +08:00
jiatianqi
6c616c1017 chore: 添加安全规范的代码豁免注释
Change-Id: I9a98c8cc2127add903c6a9b07a51d0dda924155a
2022-07-27 10:41:08 +08:00
pianruijie
b399a59004 fix:处理打开页面影响变量赋值
Change-Id: I5a2ccbd9dc7f0750c5ef6a223b66d3176143522f
2022-07-26 21:18:49 +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