Commit Graph

649 Commits

Author SHA1 Message Date
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
jiatianqi
a0207cd952 amis-saas-5472 [Bug] 测试:【组件优化第四批】数字输入框-键盘事件-初始化状态未进行限制;
Change-Id: I5f1d8112e2b739a5e7a97b45e13577fcc5a520b8
2022-11-01 11:09:53 +08:00
zhou999
b1f8243a1d fix: 修复日期时间范围-快捷键显示 amis-saas-7301
Change-Id: I628c7e27cffdec4257f07dfe8f47ea61bdd570d5
2022-10-31 21:50:17 +08:00
jiatianqi
6bc663f2c3 amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I66f0b1323d3cc05acac7664c31add6087edc0647
2022-10-31 20:19:27 +08:00
jiatianqi
65efad9f8f amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: Ia669d4abaed1ac0c19ebb0d09df6ac20f0a9a307
2022-10-31 19:59:40 +08:00
wibetter
436cb76f3a fix: 同步主干最新代码
Change-Id: I1be20cd91bf2bad336df84de8c60ec435027401a
2022-10-31 17:04:02 +08:00
jiatianqi
c3f58874d4 Merge branch 'feature-datapicker-shortcut-improve' into pre-release 2022-10-31 16:31:35 +08:00
igrowp
82749c63c5 amis-saas-6892 fix: 长文本公式输入框支持全屏
Change-Id: Ia0998f0baeaa4c9e4f359e6b87b77fbb4226d953
2022-10-31 16:21:45 +08:00
igrowp
fa51bef367 amis-saas-6892 fix: 长文本公式输入框基于codeMirror实现
Change-Id: Id04fddb52e9591ba42c66505ea4c00cea3a97122
2022-10-31 16:21:44 +08:00
igrowp
7c110abcc7 amis-saas-7603 feat: 纯表达式输入框
Change-Id: I7e047a08bfeb638d9d8e21a00d7fe9db66b1d5b1
2022-10-31 16:21:43 +08:00
igrowp
da6f941d4a amis-saas-6892 feat: 长文本公式输入框
Change-Id: Iab086db2c39626d0d4e30679f1ed3d0a45b42225
2022-10-31 16:21:43 +08:00
jiatianqi
8294d1d85b Auto Resolve Conflict To Branch fix-fx-formula By iCode
Change-Id: I1cd2811b9e3b47bbd51ef712b7adde8cd5c4dac1
2022-10-31 15:52:06 +08:00
jiatianqi
df1eb49807 publish 5.2.1 [amis-saas-5962]
Change-Id: I811536639134dfb598dc248577bc181ed12b4873
2022-10-31 15:42:46 +08:00
hsm-lv
16fb2fb05b [amis-saas-7734]事件文案优化
Change-Id: I67c9ae870f376d5717ed5305fb757d47e62452dd
2022-10-31 14:48:11 +08:00
jiatianqi
c6f51c3293 amis-saas-7760 [Bug] 「Bug」文字提示容器配置面板渲染异常
Change-Id: I795d4e37dcbc6d98250bef5b0726e2244ac4f94b
2022-10-31 14:45:46 +08:00
liujintao03
dc64c96094 amis-saas-7754 添加input-image 默认值
Change-Id: I4ff3ae277b8d40b687fe62028f8ecc820f3e65e1
2022-10-31 14:40:15 +08:00
jiatianqi
c9bb8087c4 amis-saas-7754 [Bug] 测试:【组件】文件上传属性-后端代理未开启前,对应的url前默认添加raw;
Change-Id: I91adba9538cefbf9bf7acea00d053688bacc3ac7
2022-10-28 18:15:05 +08:00
xujiahao01
38d8554532 amis-saas-7537 feat:icon-picker=>tpl:icon
Change-Id: I5e3a175c77df98ccca17b406bf8ee9c40e60b9c6
2022-10-28 18:10:52 +08:00
jiatianqi
9d6dbf44e4 amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I70589a0f99cb82a8cc1b7779cdbb504a83b22797
2022-10-28 13:58:24 +08:00
jiatianqi
3ec7647759 amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I2deff274ad0b2f572167e61b9114db7795e7680c
2022-10-27 19:39:39 +08:00
wibetter
db30f30eef fix(amis-saas-7727): 下掉分页组件
Change-Id: Ia1dbe5650bc7131d8db9088e7bf70be9e916e08a
2022-10-27 18:01:02 +08:00
wibetter
13def8c43b Merge branch 'pre-release' of ssh://icode.baidu.com:8235/baidu/amis/editor into pre-release
Change-Id: Iafc5d28e31c60ee0afc14175e4d1e44a98fb1022
2022-10-27 15:58:33 +08:00
wibetter
b072eff602 fix(amis-saas-7730): 下掉多余的卡片组件
Change-Id: I7bb1a6b3cef0fccbc5604deda73ade72bf1a1eef
2022-10-27 15:58:05 +08:00
liqiu03
b07c7ad24b amis-saas-6518 [Bug] 测试:【组件优化第五批】时间轴-数据-接口获取,通过输入框、API中心、高级配置的API,配置后无法获取数据;
Change-Id: If39046a5e2f2a83ec9ebd2b7f4c3433853466007
2022-10-27 15:13:21 +08:00