Commit Graph

728 Commits

Author SHA1 Message Date
zhoushengqiang01
8778f51476 Merge "feat: amis-saas-7945 input-city优化" into feat-optimize-6 2022-12-22 15:47:00 +08:00
zhou999
49ffd1b23c feat: amis-saas-7945 input-city优化
Change-Id: Ie409f13d14ce54109f89fde415b8f6c2e3a9f412
2022-12-22 15:44:08 +08:00
zhoushengqiang01
4a9cac0431 Merge "feat:input-group 组件配置面板优化 amis-saas-5352" into feat-optimize-6 2022-12-22 15:28:34 +08:00
zhou999
1cc1f5bec4 feat:input-group 组件配置面板优化 amis-saas-5352
Change-Id: I38895904de1bb0fb0b40dc98675203d60aec6efb
2022-12-22 15:26:40 +08:00
jinye
d6054ea62b amis-saas-8684 mapping editor 增加 map类型变动监听
Change-Id: Ie6bad448b43cde8f3b6627e4f3bb970ff627e571
2022-12-22 15:22:47 +08:00
jinye
08dc068e0e amis-saas-8684 mapping editor 优化
Change-Id: I86a08520917f4c391982ae30d76fe052c24f6da2
2022-12-22 13:31:50 +08:00
zhou999
e98941fe29 fix: amis-saas-5352 combo组件可删除按钮、图标切换问题
Change-Id: Iaa2ce07d9b0bd67466df912ee2edb09eb3b7ffdb
2022-12-22 11:12:06 +08:00
zhou999
a59068297f merge feat-combo amis-saas-5352
Change-Id: I76c34407675efff61527680263b8860fadb1c891
2022-12-22 10:59:04 +08:00
wutong25
00d330d73a Merge changes Ifbc9342c,I68883845,I3dad6252,I0253c53c,Iff01c432, ... into amis-saas-7944
* changes:
  Merge remote-tracking branch 'origin/feature-new-combo' into amis-saas-7944
  amis-saas-7978 Merge remote-tracking branch 'origin/amis-saas-7978' into amis-saas-7944
  amis-saas-7945 Merge remote-tracking branch 'origin/feat_input-city-improve' into amis-saas-7944
  amis-saas-7948 Merge remote-tracking branch 'origin/feat-log' into amis-saas-7944
  amis-saas-7974 Merge remote-tracking branch 'origin/amis-saas-7974' into amis-saas-7944
  amis-saas-7944 Merge remote-tracking branch 'origin/feat-tree-merge' into amis-saas-7944
2022-12-21 10:41:36 +08:00
igrowp
f8d3467a13 Merge branch 'feat-input-group-improve' into amis-saas-7944 2022-12-21 10:40:32 +08:00
igrowp
9749f4a74f Merge remote-tracking branch 'origin/feature-new-combo' into amis-saas-7944
Change-Id: Ifbc9342c309f6f2663701cf1341f3a1c90faa596
2022-12-21 10:26:41 +08:00
igrowp
fabd7e9e8d amis-saas-7978 Merge remote-tracking branch 'origin/amis-saas-7978' into amis-saas-7944
Change-Id: I688838455a48a4858fde255d10e53c97469a29b2
2022-12-21 10:15:03 +08:00
zhou999
65bc95a637 feat: combo组件优化 amis-saas-5352
Change-Id: I0628b7bf0baf00b84a229e9204189222e39ac405
2022-12-20 18:42:38 +08:00
zhou999
d483f10b17 feat: combo组件优化 amis-saas-5352
Change-Id: I511b13e1d2bbfaed2863c293902a08d05e776b85
2022-12-20 17:43:53 +08:00
zhou999
ba8ee992a7 feat:input-group 组件配置面板优化 amis-saas-5352
Change-Id: I01af44ec8781b8a4aecf5e2eaf575c6504e10a6c
2022-12-19 15:44:44 +08:00
igrowp
4070a89214 amis-saas-7945 Merge remote-tracking branch 'origin/feat_input-city-improve' into amis-saas-7944
Change-Id: I3dad6252853fd654e9620c289efaad1896229602
2022-12-19 15:23:37 +08:00
igrowp
2131df7dd6 amis-saas-7948 Merge remote-tracking branch 'origin/feat-log' into amis-saas-7944
Change-Id: I0253c53c211cd7aa6924424e58ca7c7416c62ff6
2022-12-19 15:17:48 +08:00
igrowp
6e99e51fbf amis-saas-7974 Merge remote-tracking branch 'origin/amis-saas-7974' into amis-saas-7944
Change-Id: Iff01c432c9f64ec47773fcf781ddd8b37d7b589c
2022-12-19 15:16:28 +08:00
igrowp
ade4dc4e82 amis-saas-7944 Merge remote-tracking branch 'origin/feat-tree-merge' into amis-saas-7944
Change-Id: I638d7d39743f12978521beaf8304ea203f9ac6c8
2022-12-19 14:51:51 +08:00
wibetter
815e44413b fix(amis-saas-8763): 补充国际化语料
Change-Id: I34bf3b9c289bb7dd73c0a31ae466e99ae9a1ff99
2022-12-19 12:17:40 +08:00
wibetter
1f7d6a57f7 Merge branch 'pre-release' of ssh://icode.baidu.com:8235/baidu/amis/editor into pre-release
Change-Id: Ieb904efaf2e3f739286a3cb13ff12305ec873563
2022-12-19 12:12:49 +08:00
wibetter
89e0c4e264 fix(amis-saas-8763): 布局容器配置项优化
Change-Id: I173e909f50e75f84a04f98e16952bd3ec0bbeb63
2022-12-19 12:12:24 +08:00
wibetter
7e15e0374b fix(amis-saas-8703): 新增滚动吸附功能 + 配置项
Change-Id: Id77d45773fbe25357cf3ed615ffc5460965f7334
2022-12-16 23:09:53 +08:00
wibetter
da8e1a2514 fix(amis-saas-8761): 吸附容器合并,并禁用拖拽和定位相关配置项
Change-Id: I08051428d71fad5d21c24795219c7d4e215d1b43
2022-12-16 17:21:33 +08:00
jinye
aca33176e1 Merge branch 'pre-release' into amis-saas-7978 2022-12-16 16:02:34 +08:00
jinye
c61097717a amis-saas-7978 映射 [mapping] 组件配置面板优化
Change-Id: I3d49ca190afaf7f1abf52adde4330f124259072a
2022-12-16 15:33:22 +08:00
kangkai04
396024eb45 Merge "amis-saas-8338 优化多个loading配置" into pre-release 2022-12-16 15:17:22 +08:00
wibetter
fe98366bbc feat(amis-saas-8477): 新增自由容器
Change-Id: Id8e363f4f0718421963bd04c0aea4748786cdf23
2022-12-16 11:56:33 +08:00
meerkat-morecats
1b36da34ce amis-saas-8338 优化多个loading配置
Change-Id: Ibf187b85fb3aa74c21875b4b0a6ffb9ac6d692a4
2022-12-15 17:14:39 +08:00
pianruijie
abf0861e62 放开防抖入口 [amis-saas-8098]
Change-Id: I0569961d4484ac9bc34a90f4fca943319288aeef
2022-12-12 14:28:55 +08:00
pianruijie
19d5fbb30e Merge branch 'feature/amis-saas-8095' into pre-release 2022-12-12 11:51:45 +08:00
2betop
9ab2335181 amis-saas-7740 升级 amis 版本
Change-Id: I02ee803bbfc080167cb207f2b992ef0c9e639511
2022-12-09 16:32:44 +08:00
pianruijie
f1cc25f2cb Merge "优化提示 amis-saas-8098" into pre-release 2022-12-08 11:35:11 +08:00
pianruijie
e4832f9adf 优化提示 amis-saas-8098
Change-Id: I2ac257a3f0b2dbf2946020a646b2796ce5f69692
2022-12-08 11:32:10 +08:00
wibetter
b798c7fb49 Merge branch 'master' into pre-release
Change-Id: I45f0d7ef51b53c9641d67e2238a889d1b693eb0f
2022-12-07 19:21:05 +08:00
pianruijie
f1cc039081 amis-saas-8098 先去掉防抖和阻止冒泡
Change-Id: I45438639948ad63f4da045e1b5450387c58a80b4
2022-12-06 10:57:41 +08:00
zhaojianhui
03fe7a827f amis-saas-8095 [Improvement.] 「动作配置」显隐/可用禁用分别合并
Change-Id: Ia58683f2d059aa561147fe03c4f7b90c3447f834
2022-12-06 10:55:10 +08:00
pianruijie
0ce9a64218 Merge "[amis-saas-8098] [amis-saas-8099] 支持防抖 & 支持阻止冒泡" into pre-release 2022-12-06 10:10:17 +08:00
wibetter
09702795c1 fix(amis-saas-8563): 补充国际化语料
Change-Id: I16b4982119517c5b23b7e1dda81e9f7255ec111d
2022-12-05 12:28:26 +08:00
wibetter
7478534774 fix(amis-saas-8563):Image 补上 组件内层 CSS 类名 配置项
Change-Id: I0a8bdee1cb06a5d949e0f4920773078a48d494b6
2022-12-05 12:26:15 +08:00
wibetter
0384fc99e9 fix(amis-saas-2815): 显示类型切换后,剔除多余属性
Change-Id: If5949ae1548ebadf4f3b086f41e2f07deda00b8b
2022-12-05 11:29:56 +08:00
pianruijie
5711c16101 [amis-saas-8098] [amis-saas-8099] 支持防抖 & 支持阻止冒泡
Change-Id: Idba11cc838b4bf612b384c468ff35646f63b3d8e
2022-12-02 16:34:25 +08:00
igrowp
2c6679c354 amis-saas-5995 编辑器升级amis版本
Change-Id: I51c6a31cede1598a53a34d32b124174b2f94972b
2022-12-02 11:30:03 +08:00
wibetter
9b4a763c9a fix(amis-saas-8078): 支持 postMessage 间接动态注册自定义组件
Change-Id: Ia5de717ec6fbc1bf3489946e7f52dac9b3daef94
2022-12-01 17:57:42 +08:00
wibetter
17ffeea390 fix(amis-saas-8462): amis-editor-core的输出新增static目录
Change-Id: I35496071d5fe62259ee3e7d2ec0e97e9c2fb78c7
2022-12-01 10:51:15 +08:00
wibetter
e81e38c9f5 fix(amis-saas-8462): amis-editor-core补充css图片的构建逻辑
Change-Id: I7dafc9591dcc6ffa51275451211050e396fd1121
2022-11-30 18:14:24 +08:00
wibetter
2cd51dbe97 fix(amis-saas-8226): render方式改用react18方法
Change-Id: I6bba95700d2262bc074c5a51f8147d95b329f400
2022-11-30 12:33:08 +08:00
wibetter
1141b2ec78 fix(amis-saas-2815): update
Change-Id: I7f9334d0d5205d6c410dffd98008e0baf7752c40
2022-11-30 10:29:48 +08:00
wibetter
6af4727007 fix(amis-saas-6852): amis-editor-core输出的样式名字改回使用style.css
Change-Id: I88f7a51941b74fda0ca5d47bfe8418efcd973491
2022-11-29 20:41:01 +08:00
wibetter
882a1a957a fix(amis-saas-6852): 完善表单脚手架,分组中单选和复选框自动补全options
Change-Id: I3924cf6c343f42a6d5382ab04a864e046014c10c
2022-11-29 20:08:37 +08:00