Commit Graph

672 Commits

Author SHA1 Message Date
jiatianqi
33c7257f22 [amis-saas-5962] editor 历史问题修复&优化 ,提测
Change-Id: I477accad22acd0ac5bfb472b2d49d174148d9354
2022-11-09 15:32:41 +08:00
jiatianqi
0040c36815 合并pre-release分支,解决一个文件冲突InputDateRange.tsx [amis-saas-6890]
Change-Id: I8432f63f419e383d2e7e646339c5047f4069c6d4
2022-11-09 14:36:47 +08:00
liuzedong02
dae3d70613 Merge "[amis-saas-3465]评分组件没有min\max属性,有count属性" into pre-release 2022-11-08 17:41:11 +08:00
jiatianqi
d90cbe96c9 amis-saas-6070 [Bug] 测试:【页面配置,外观下内联】设置占满后与默认展示一致
Change-Id: Id1c497b3c0f98fdcf290f50c15805e6930fda9c7
2022-11-07 17:18:07 +08:00
jiatianqi
0eaad8ff92 amis-saas-7793 [Bug] 测试:【组件优化第五批】点击选取数字框input-number后,外观配置下的快捷编辑属性值没有回显;
Change-Id: I10b4d12781d657b68d11d77e3e47335adb854c58
2022-11-07 14:55:53 +08:00
jiatianqi
6751be02f8 amis-saas-7796 [Bug] 测试:【组件优化第五批】点击选取链接link组件后,属性配置拦下缺少图标配置栏
Change-Id: Iaaf1ad646a423a4bf43878b72ccc82428b4efb6f
2022-11-07 14:34:38 +08:00
jiatianqi
764cb544dd Merge branch 'master' into pre-release 2022-11-07 14:14:34 +08:00
jiatianqi
41a74f6b77 amis-saas-7927 [Bug] 「外观配置」背景配置项功能异常
Change-Id: Id8bbd155b11ea40fea3c2bfb8d348e2e322b64bf
2022-11-07 12:21:31 +08:00
wibetter
f72bf58918 fix(布局能力提升amis-saas-7924): 当wrapper为空插入布局容器时,自动改为置换
Change-Id: Icafb6c50d53ebcb876f82e5f75ca3168ab7989d1
2022-11-06 00:43:17 +08:00
zhou999
dc6be6e7e0 style: 完善日期范围组件的快捷键-按钮样式 amis-saas-7301
Change-Id: Ife3301697086d42f79accacd66860afe553ce663
2022-11-04 17:47:10 +08:00
jiatianqi
d3f0e52f46 Merge "amis-saas-6892 [Feature] tooltip展示优化" into fix-fx-formula 2022-11-04 10:18:19 +08:00
jiatianqi
37904df988 amis-saas-6892 [Feature] tooltip展示优化
Change-Id: Ie8caecf074ba4f7a571bb7cea39d257c40a421c2
2022-11-04 10:17:44 +08:00
jiatianqi
4f14bae2d1 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
f61ab35882 amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I9436c534dabfdefa73291b39856a1a8f8879f6ce
2022-11-03 21:28:48 +08:00
qkiroc
6e6202f688 amis-saas-7758 修复icon问题
Change-Id: I9063db8a6b5c2b899d46e729f3ac8c1e42efa306
2022-11-03 20:36:07 +08:00
jiatianqi
063c69955d amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I81ef06573cb468b38cbccd7262a3d527fde7209b
2022-11-03 20:32:26 +08:00
wibetter
4b54ad823e fix(布局能力提升项amis-saas-7852): 「布局组件」fixed和absolute定位时,新增「参考位置」配置项
Change-Id: If3f33a320a8290fb36bce090a794d3619cccc214
2022-11-03 20:31:11 +08:00
lvxiaojiao
0cf073c41d Merge changes I02e6bb53,Ice1d6445 into pre-release
* changes:
  [amis-saas-7505]:chart接入事件
  [amis-saas-7505]:chart接入事件
2022-11-03 19:51:49 +08:00
hsm-lv
a5990659e1 [amis-saas-7505]:chart接入事件
Change-Id: I02e6bb535f2f06bed0b9e0908c3f103ae76577a6
2022-11-03 19:50:38 +08:00
hsm-lv
524b43c964 [amis-saas-7505]:chart接入事件
Change-Id: Ice1d6445afb3dc4ebaf14882ce49f3e5692879c3
2022-11-03 19:48:09 +08:00
jiatianqi
b099b35a97 Merge changes I8f78c4c7,Idd5d3e65 into pre-release
* changes:
  amis-saas-6890 [Story] page apiControl面板显示异常
  amis-saas-6890 [Story] 标题提示、控件提示的打开弹窗图标背景问题
2022-11-03 19:29:36 +08:00
jiatianqi
4aed947a3e amis-saas-6890 [Story] page apiControl面板显示异常
Change-Id: I8f78c4c727472f4726aa5d1487ac0c81354ec41b
2022-11-03 19:28:45 +08:00
jiatianqi
14c16d98ec amis-saas-6890 [Story] 标题提示、控件提示的打开弹窗图标背景问题
Change-Id: Idd5d3e65e3a66c4a4ac8871823f4d3f9c7e858cc
2022-11-03 19:23:50 +08:00
jiatianqi
de06815f69 Merge "amis-saas-6892 [Feature] 编辑器fx 交互优化" into fix-fx-formula 2022-11-03 18:49:47 +08:00
jiatianqi
9c443957e2 amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I347e33a08ef6cd4a144de2f640d88d6dea11f17d
2022-11-03 18:31:51 +08:00
wutong25
b361987974 Merge "amis-saas-6892 fix: 长文本下拉菜单hover移出后未消失问题" into fix-fx-formula 2022-11-03 17:55:45 +08:00
igrowp
95f49e6862 amis-saas-6892 fix: 长文本下拉菜单hover移出后未消失问题
Change-Id: I89042270212884be77a79e63b7c74b2e3fe7c646
2022-11-03 17:54:35 +08:00
jiatianqi
65dd84ba23 amis-saas-6892 [Feature] select组件示例代码
Change-Id: I4e782b8285bf3257d9fc1b6158c8efb3e72c4f20
2022-11-03 14:11:22 +08:00
jinye
ca04c2f632 amis-saas-7820 「editor」API编辑器保存时,会把trackExpression等不支持可视化配置的属性删掉
Change-Id: I984071ddc0973ee3c989511d636781f6fc534d5d
2022-11-03 13:19:21 +08:00
jiatianqi
f7e65080e5 amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I7df9e9895136678df0eae3bb762c265c9a4a1e4e
2022-11-03 13:16:45 +08:00
tooeast
f6ae48a300 [amis-saas-3465]评分组件没有min\max属性,有count属性
Change-Id: I070cc48d1acb34a6762504c404abc6c411f98ea2
2022-11-03 10:47:53 +08:00
wibetter
26b56c0070 fix(布局能力提升amis-saas-7790): 最大最小宽高增加关联
Change-Id: I918c6f53cddbbb97fb23425bab3a97147eeb0ac3
2022-11-02 20:16:33 +08:00
wibetter
e8549dc2f9 fix(amis-saas-7727): 细节完善
Change-Id: I3d31df6e101be39a6fbc2372c700b1fcae62b75e
2022-11-02 19:22:29 +08:00
tooeast
3fae18d189 [amis-saas-7468] 日期组件 sizeMutable 配置问题修复
Change-Id: I0ffaf9a0ebec6354671c0c4ac43cab17ab33d5f9
2022-11-02 18:59:37 +08:00
jiatianqi
e586c57d3b Merge branch 'fix-fx-formula' of ssh://icode.baidu.com:8235/baidu/amis/editor into fix-fx-formula
Change-Id: Id83f5ccdc1efa081d79b5724c32d46b52d3befed
2022-11-02 16:52:24 +08:00
jiatianqi
2ab575b200 amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I8593c1c40a8f1be2c6bc601041e966793d257cac
2022-11-02 16:52:18 +08:00
wutong25
830c4be7fd Merge "amis-saas-6892 fix: 长文本输入框表达式提示样式调整" into fix-fx-formula 2022-11-02 16:43:48 +08:00
igrowp
4e34fe7ae7 amis-saas-6892 fix: 长文本输入框表达式提示样式调整
Change-Id: Ie687148b058931b26f79f93cf0b635faa0d9924d
2022-11-02 16:42:47 +08:00
jiatianqi
3ef7b49f9f amis-saas-6892 穿梭框组件使用formulaControl问题修复
Change-Id: I5d97c00de168345d0d95a799cb40fffb29b3dcd3
2022-11-02 15:20:54 +08:00
jiatianqi
9382731f15 Merge branch 'pre-release' into fix-fx-formula 2022-11-02 10:01:35 +08:00
jiatianqi
05089a6679 Merge changes I87999ed1,I9c651fc5 into pre-release
* changes:
  amis-saas-6890 [Story] 增加css权重,覆盖amis样式
  amis-saas-7731 [Bug] 升级amis版本后,问题不能复现
2022-11-01 20:17:54 +08:00
jiatianqi
87080c4de0 Merge branch 'pre-release' into fix-fx-formula 2022-11-01 19:22:58 +08:00
wutong25
51ef48fb56 Merge changes Iaa7a4fb7,Ia0998f0b,Id04fddb5,I7e047a08,Iab086db2 into fix-fx-formula
* changes:
  amis-saas-6892 fix: 长文本输入框支持折行
  amis-saas-6892 fix: 长文本公式输入框支持全屏
  amis-saas-6892 fix: 长文本公式输入框基于codeMirror实现
  amis-saas-7603 feat: 纯表达式输入框
  amis-saas-6892 feat: 长文本公式输入框
2022-11-01 17:52:26 +08:00
igrowp
b1a362ebe9 amis-saas-6892 fix: 长文本输入框支持折行
Change-Id: Iaa7a4fb7c46588fd29e87020af0dcacc1c5d031c
2022-11-01 17:47:33 +08:00
jiatianqi
8649fc3632 amis-saas-7731 [Bug] 升级amis版本后,问题不能复现
Change-Id: I9c651fc561ed8a8b896ba0de395dcfb9cc8522a5
2022-11-01 17:36:57 +08:00
jiatianqi
ce760b299e amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I8024b4c76232cc8c2429fc83838cd9bef6bf01f0
2022-11-01 15:16:49 +08:00
jiatianqi
c084c93aa3 Merge changes I3eef34a4,Idc662378 into pre-release
* changes:
  amis-saas-6069 [Improvement.] 测试【编辑器「剪切配置」】剪切配置后ui显示不正确
  amis-saas-6073 [Improvement.] 测试【数字框,前缀,后缀提示】前缀后缀提示一致
2022-11-01 11:54:46 +08:00
wibetter
f8b652e192 fix(amis-saas-4371): 常见布局组件改为非内置,放示例中
Change-Id: Ie2791f4f3a942ac40b2321da8f2661782c04f45e
2022-11-01 11:40:23 +08:00
jiatianqi
1645a6c451 amis-saas-6073 [Improvement.] 测试【数字框,前缀,后缀提示】前缀后缀提示一致
Change-Id: Idc6623785db242287611af87900ee68f61c05279
2022-11-01 11:27:01 +08:00
jiatianqi
4bc6c6e658 Merge "amis-saas-5472 [Bug] 测试:【组件优化第四批】数字输入框-键盘事件-初始化状态未进行限制;" into pre-release 2022-11-01 11:11:13 +08:00