Commit Graph

524 Commits

Author SHA1 Message Date
jiatianqi
f176cdcad9 amis-saas-6892 [Feature] 完善短文本tooltip高亮文案
Change-Id: Ifb50a2b5a5dfde6acb6513b5e89b3d43cf012cf1
2022-11-14 17:58:25 +08:00
wibetter
990aa4deb2 fix(amis-saas-4371): 合入布局容器相关代码
Change-Id: I32f0e69e3ba397821561f4881ebc131c9112f065
2022-11-14 17:03:04 +08:00
wibetter
5a54ee55e6 fix(amis-saas-8035): 特殊布局参考位置增加默认值
Change-Id: I230f57f883d51615f54069b7c30e0ae642d05839
2022-11-14 15:31:20 +08:00
wibetter
baab4e90ee fix(amis-saas-4371): 细节完善
Change-Id: Iad351546904bd4503e6a7feda0d7a2f539e96e12
2022-11-14 15:16:51 +08:00
wibetter
168b4d69d4 fix(amis-saas-4371): 细节完善
Change-Id: I438b4604437706ffaf16692174f6f9dd2f603d21
2022-11-14 14:58:48 +08:00
wibetter
58ce5c08f9 fix(amis-saas-4371): 剔除布局容器中重复的状态配置项
Change-Id: I7a3eaa644cdb5c999b2176391d647d3bd1332920
2022-11-14 13:23:07 +08:00
wibetter
b73260b3a6 fix(amis-saas-4371): 细节完善
Change-Id: I71f489635b94740cbd2c23afe41104c9c2f06d22
2022-11-14 12:18:17 +08:00
wibetter
9c7012c467 fix(amis-saas-4371): 补充布局相关国际化语料
Change-Id: Idca195655e90656b37faf74ee21b735607463cb3
2022-11-14 11:52:21 +08:00
wibetter
e37567dabb fix(amis-saas-4371): 完善布局相关配置联动
Change-Id: Ib155fc0d215b98a0ab1e8ffc8ec7c3278a402f1f
2022-11-14 11:44:34 +08:00
lurunze1226
5ff95128ef merge: 合并pre-release分支
Change-Id: I91249304a5c80b68857846cdd2b88744753d7084
2022-11-14 11:03:39 +08:00
lurunze1226
b84dc31d73 amis-saas-5749 merge: 合并master分支
Change-Id: I1bbc94f3eb514663588162f1f31bcfbcf3bd75ce
2022-11-14 10:28:39 +08:00
wibetter
5581a91c57 fix(amis-saas-7819): 同步主干最新代码
Change-Id: Id7cdbc0c38221eb7547c9ea8d1dd897e223b0549
2022-11-11 12:01:28 +08:00
wibetter
4af912f178 fix(布局容器amis-saas-7819): 细节完善
Change-Id: I0a242ebe444fa173f51d74baf97dd943bcf66640
2022-11-11 11:57:50 +08:00
wibetter
57ab3b6a8e fix(amis-saas-7819): 细节优化,并简化前后移动判断逻辑
Change-Id: I4633d53238eb6a673140d04b0007bca60d9d1a61
2022-11-11 10:15:30 +08:00
jiatianqi
bfeb6563f1 amis-saas-6892 [Feature] fx样式优化
Change-Id: I59c6538aa31aba70ec27c6c0a169fe43b369fb1b
2022-11-10 11:30:05 +08:00
wibetter
3e917fdd35 fix(布局组件amis-saas-7939): 细节完善
Change-Id: I3e8202e4c3ae7c591daeaa3665edaf23a1728dce
2022-11-10 00:09:00 +08:00
jiatianqi
53d110ff42 amis-saas-6892 [Feature] 表达式配置后 输入框的样式调整
Change-Id: I9ae53cdd8f55472a563cb89cef27a173df35a2d7
2022-11-09 19:44:21 +08:00
wibetter
7fa28160a5 fix(布局组件amis-saas-7939): 包裹容器上下追加元素icon位置自适应调整
Change-Id: I16b1710885223ee95ede81a0e21ff6360f3bd65a
2022-11-09 18:58:54 +08:00
jiatianqi
547df12e20 amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: If25f25ca4e966b75f71f07d53e8a43add8fdbc5f
2022-11-09 16:21:14 +08:00
jiatianqi
c341db74ca [amis-saas-5962] editor 历史问题修复&优化 ,提测
Change-Id: I477accad22acd0ac5bfb472b2d49d174148d9354
2022-11-09 15:32:41 +08:00
jiatianqi
6fcd1bf1dd 合并pre-release分支,解决一个文件冲突InputDateRange.tsx [amis-saas-6890]
Change-Id: I8432f63f419e383d2e7e646339c5047f4069c6d4
2022-11-09 14:36:47 +08:00
jiatianqi
ad9bb604a1 Merge branch 'master' into pre-release 2022-11-09 14:31:28 +08:00
wibetter
a96aceccd8 fix(amis-saas-7973): 优化multifactor时多配置面板处理逻辑
Change-Id: I71aed9bcc47973717edb7ed0a8f9976b24395730
2022-11-09 11:32:09 +08:00
jiatianqi
2e0ce70a65 amis-saas-7954 [Bug] 「amis 按钮类名更新」导致 button的 size属性类名变更样式混乱
Change-Id: I6ed247d8f923aab087933f21296fdbed7764ee61
2022-11-08 14:32:56 +08:00
jiatianqi
a9b55b7408 amis-saas-7953 [Bug] 「amis版本升级样式问题」升级后 dialog默认左右间距为0
Change-Id: I2e14cc2c77347faaf308cead97d0bf8b341e132e
2022-11-08 14:08:38 +08:00
jiatianqi
efc597b877 Merge branch 'master' into pre-release 2022-11-07 14:14:34 +08:00
wibetter
cef36b0c62 fix(布局能力提升amis-saas-7924): 当wrapper为空插入布局容器时,自动改为置换
Change-Id: Icafb6c50d53ebcb876f82e5f75ca3168ab7989d1
2022-11-06 00:43:17 +08:00
zhou999
ab13e098e8 style: 完善日期范围组件的快捷键-按钮样式 amis-saas-7301
Change-Id: Ife3301697086d42f79accacd66860afe553ce663
2022-11-04 17:47:10 +08:00
igrowp
2eaefb5ad1 amis-saas-6892 fix: fix style
Change-Id: I1c1ebdf7e87e6f5f39281f1862b980644bd9b398
2022-11-04 15:57:01 +08:00
wibetter
92568e1888 fix(amis-saas-7792): region标签展示位置优化
Change-Id: If5ec1c71c53ff436809d20a58a9d6d75b0af3997
2022-11-04 14:05:28 +08:00
jiatianqi
b4fc431786 Merge changes I9436c534,I81ef0657 into fix-fx-formula
* changes:
  amis-saas-6892 [Feature] 编辑器fx 交互优化
  amis-saas-6892 [Feature] 编辑器fx 交互优化
2022-11-03 21:31:06 +08:00
jiatianqi
ac679c9cba amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I81ef06573cb468b38cbccd7262a3d527fde7209b
2022-11-03 20:32:26 +08:00
wibetter
752fcdba34 fix(布局能力提升项amis-saas-7852): 「布局组件」fixed和absolute定位时,新增「参考位置」配置项
Change-Id: If3f33a320a8290fb36bce090a794d3619cccc214
2022-11-03 20:31:11 +08:00
jiatianqi
2812802b5f amis-saas-6890 [Story] 标题提示、控件提示的打开弹窗图标背景问题
Change-Id: Idd5d3e65e3a66c4a4ac8871823f4d3f9c7e858cc
2022-11-03 19:23:50 +08:00
jiatianqi
a0b338a380 Merge "amis-saas-6892 [Feature] 编辑器fx 交互优化" into fix-fx-formula 2022-11-03 19:18:28 +08:00
jiatianqi
184e8acbd5 amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: Idea0ed8d9ea5f15a49a2a33e6c0575ae8e932744
2022-11-03 19:16:31 +08:00
jiatianqi
52a5af3e2f Merge "amis-saas-6892 [Feature] 编辑器fx 交互优化" into fix-fx-formula 2022-11-03 18:49:47 +08:00
jiatianqi
1f65b698d6 amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I347e33a08ef6cd4a144de2f640d88d6dea11f17d
2022-11-03 18:31:51 +08:00
wutong25
53d637aba0 Merge "amis-saas-6892 fix: 长文本下拉菜单hover移出后未消失问题" into fix-fx-formula 2022-11-03 17:55:45 +08:00
igrowp
814d5b3651 amis-saas-6892 fix: 长文本下拉菜单hover移出后未消失问题
Change-Id: I89042270212884be77a79e63b7c74b2e3fe7c646
2022-11-03 17:54:35 +08:00
jiatianqi
795eae22b4 Merge "amis-saas-6892 [Feature] 编辑器fx 交互优化" into fix-fx-formula 2022-11-03 14:02:36 +08:00
jiatianqi
54319dae2d amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I7df9e9895136678df0eae3bb762c265c9a4a1e4e
2022-11-03 13:16:45 +08:00
wutong25
e6ab70b1ea Merge "amis-saas-6892 fix: 修改事件动作按钮宽度" into fix-fx-formula 2022-11-02 20:28:52 +08:00
igrowp
62659ed6dc amis-saas-6892 fix: 修改事件动作按钮宽度
Change-Id: Id0521a39ad882a101d6dc3e8545c17c645d3b9f6
2022-11-02 20:22:02 +08:00
wibetter
471ee862e8 fix(amis-saas-7727): 细节完善
Change-Id: I3d31df6e101be39a6fbc2372c700b1fcae62b75e
2022-11-02 19:22:29 +08:00
jiatianqi
1128b7f51a amis-saas-6890 [Story] 「editor整体」样式问题修复
Change-Id: Icf8ebfc1ab6a7289758abffe1de5ab25c67e9474
2022-11-02 19:03:02 +08:00
igrowp
fe8a7634de amis-saas-6892 fix: 样式调整
Change-Id: I9f24c898268d8bbdc2c6c4a67b214124008910e2
2022-11-02 17:42:05 +08:00
igrowp
468614a417 amis-saas-6892 fix: 长文本输入框表达式提示样式调整
Change-Id: Ie687148b058931b26f79f93cf0b635faa0d9924d
2022-11-02 16:42:47 +08:00
jiatianqi
96fba371ec Merge branch 'pre-release' into fix-fx-formula 2022-11-02 10:01:35 +08:00
jiatianqi
e470882ee7 amis-saas-6890 [Story] 增加css权重,覆盖amis样式
Change-Id: I87999ed1e09a26004effc090eaae84daf6e8c83e
2022-11-01 20:07:17 +08:00