Commit Graph

283 Commits

Author SHA1 Message Date
qianchuan
f75a322ee1 fix:[amis-saas-6770]2899 =>pre-release merge部分代码错误
Change-Id: I36e3b320dadb4bd2a1b649d515091d6e80d07d9b
2022-09-09 11:16:40 +08:00
liqiu03
6f9b614b61 amis-saas-6174 [Bug] 测试:【组件优化第五批】标题提示/控件提示的配置面板缺少边距;(待确认)
Change-Id: Ie84101ff03659a516225fc7b3ff6d3869b7aacf1
2022-09-09 10:55:15 +08:00
qianchuan
93ade21183 [amis-saas-6770]merge code
Change-Id: I880388000004e0d56a97a5c76ad2ce784632b988
2022-09-08 19:22:17 +08:00
jiatianqi
ad0e0ede30 fix: amis-saas-6565 [Bug] ang样式下细节问题
Change-Id: I3fa9dea7bfd6cc13ecdf8058eb95dd07d4cab0b6
2022-09-08 17:32:57 +08:00
qianchuan
917447596a [amis-saas-6692]merge pre-release code
Change-Id: I336d46180fae1d9b2807a6254af545da1d0312db
2022-09-08 17:14:51 +08:00
wibetter
10c0eb3c6a fix(amis-saas-5851): 完善组件搜索组件,支持配置tagKey
Change-Id: I2d0fe36629df7e2f65ebd9e52a58601be2d4005d
2022-09-08 15:19:30 +08:00
liqiu03
4fbc7b55ea Merge branch 'feat-optimize-5' of ssh://icode.baidu.com:8235/baidu/amis/editor into feat-optimize-5
Change-Id: I15e01429b7ee988af2abe6265bd95fbf9c14f8fa
2022-09-06 11:23:51 +08:00
liqiu03
9cc71d3cca amis-saas-6513 [Improvement.] 测试:【组件优化第五批】时间轴自定义选项下的时间、标题字符长度过长,输入框显示问题;
Change-Id: I0e9b2805378e9b86457ff0d44c1d6fef4cb4b260
2022-09-06 11:22:37 +08:00
pianruijie
b987fb3524 amis-saas-6135 事件面板去掉cxd样式
Change-Id: Ifb1d988e736105fa218f99454bcde562d9c4e302
2022-09-05 20:15:11 +08:00
wibetter
b3eda222cb style(amis-saas-6479): 修复快捷键展示面板样式异常
Change-Id: I7701c629f246ac73d118785ee16ff3965be9e731
2022-09-02 15:33:43 +08:00
jiatianqi
d5ac890449 Merge branch 'master' into pre-release 2022-09-01 15:48:05 +08:00
jiatianqi
13ce7676d5 fix:amis-saas-6393 [Bug] EditorToolbar图标经过svgr编译后的SVG文件样式显示问题
Change-Id: I2a0c9de3d2b7432192a35e7542cfae018c56bc92
2022-08-31 20:16:46 +08:00
liqiu03
9b340ef339 Merge changes Idef4818b,I65527e5d,I8e2e0631 into pre-release
* changes:
  amis-saas-6135 [Bug] 非云舍主题的应用,页面设计器无法使用
  amis-saas-6135 [Bug] 非云舍主题的应用,页面设计器无法使用
  修改:cxd前缀主题切换问题
2022-08-31 16:15:57 +08:00
liqiu03
bb94ca65c4 amis-saas-6135 [Bug] 非云舍主题的应用,页面设计器无法使用
Change-Id: Idef4818b655677a563abbcdcb07a37f0ccb72826
2022-08-31 16:10:22 +08:00
pianruijie
2cdfb8165c 事件动作面板适配多主题 amis-saas-6135
Change-Id: I86ed8983ede31c469c5c6b3b360db498bd08b97b
2022-08-31 10:57:28 +08:00
liqiu03
7813f78de8 amis-saas-6135 [Bug] 非云舍主题的应用,页面设计器无法使用
Change-Id: I65527e5d938179efc714c67af44586cb04a233b6
2022-08-31 10:06:42 +08:00
pianruijie
9763b16d0a 事件动作面板适配多主题 amis-saas-6135
Change-Id: I86ed8983ede31c469c5c6b3b360db498bd08b97b
2022-08-29 21:26:30 +08:00
liqiu03
02e71cde2b 修改:cxd前缀主题切换问题
Change-Id: I8e2e0631fedcd1ee61677d5e534201615e1cd854
2022-08-25 23:56:47 +08:00
jiatianqi
a8ba29ddb2 fix: amis-saas-6135 [Bug] 非云舍主题的应用,页面设计器无法使用
Change-Id: I29e29ecbbdebd1640419593e6bbabfe72eddcc85
2022-08-25 19:44:57 +08:00
zhangzhulei
83ddf632fe Merge "amis-saas-5967 [Bug] 走查问题-弹窗/抽屉配置界面溢出问题" into feat-optimize-5 2022-08-19 10:35:54 +08:00
zhangzhulei
ba3da288b1 amis-saas-5967 [Bug] 走查问题-弹窗/抽屉配置界面溢出问题
Change-Id: I21a88235665137a6d754236bf1f2fca895cc3c84
2022-08-18 21:16:08 +08:00
pianruijie
5b5d301d7f 优化样式 && 导出依赖
Change-Id: If76e0a5e2fac3b82eb00c2eeda70d2383b4be330
2022-08-18 10:55:18 +08:00
RickCole21
cfddcbd196 amis-saas-5329 [Feature] 「feat」服务调用配置升级
Change-Id: I3e01cfe7c093a8e9c838edc8a09065f10c2acadd
2022-08-12 17:25:15 +08:00
RickCole21
f719b6150a amis-saas-5329 [Feature] 「feat」服务调用配置升级
Change-Id: If832de40ea5bf2365bd96ff048333dead56876f6
2022-08-12 17:24:41 +08:00
RickCole21
283597f4cc Merge remote-tracking branch 'origin/feat-optimize-5' into qatest_feat-2899
Change-Id: I5448698f6e13929d171297e824320e526f31768d
2022-08-12 16:01:07 +08:00
RickCole21
acc1f3acf5 amis-saas-5329 [Feature] 「feat」服务调用配置升级
Change-Id: Ie6d56075d7143c7d3bc293b18886ea78396c846a
2022-08-12 14:55:35 +08:00
jiatianqi
e7a032a585 merge feat-timeline
Change-Id: I009b295c17ae4ddc05eb2fb247dfe7c3a55e5fea
2022-08-11 19:39:50 +08:00
jiatianqi
6fdd35862e Merge branch 'pre-release' into feat-optimize-5
Change-Id: I2121779148e90850d2fbcdddaccc1b9851df2045
2022-08-11 19:17:47 +08:00
pianruijie
f00539f27b fix:动作树样式 && 变量赋值支持输入
Change-Id: I99d0768c6171e7f1f9c2fdcfe47bf202e6f6bb12
2022-08-09 15:15:58 +08:00
RickCole21
04a09924e0 Merge remote-tracking branch 'origin/feat-dataInput' into qatest_feat-2899
Change-Id: Iaf2ea54298e995faa6a19c1daf23f01deec3958c
2022-08-05 18:35:35 +08:00
RickCole21
344dc9f927 amis-saas-5329 [Feature] 「feat」服务调用配置升级
Change-Id: Ic26cd7da98be4ada9a0433b7b3d5a8943c47f6bd
2022-08-05 17:54:36 +08:00
pianruijie
25ed8ab57e 修改默认箭头方向
Change-Id: I84ab644c209faad8c470b84d59e1a6042b956aa4
2022-08-04 17:38:58 +08:00
jiatianqi
f51bffba89 amis-saas-5155 [Bug] 测试:【组件优化第四批】单选框选项数值过长时,默认值页面显示跳出页面(可优化)
Change-Id: I2884d704d1af637038bff6d75e532403925db7be
2022-08-03 19:05:08 +08:00
qianchuan
3b92b3091e merge maseter
Change-Id: Ia6dc7b3044bc75a0924eb3a1ee124059f96d4b11
2022-08-02 11:42:05 +08:00
2betop
70eb1f873b 样式优化
Change-Id: I0f79c25d78a50d13fb39cd228f721daa972f81f1
2022-08-01 16:53:21 +08:00
yangwei9012
7246a044d9 merge pre-release
Change-Id: Icc0954d0d7f8fc9f9a1577da20cad732e7b7be60
2022-07-27 17:56:04 +08:00
yangwei9012
3d648cd64e merge optimize-4
Change-Id: I68a7271fef099dbc13940bc786c191771fcab364
2022-07-27 10:52:31 +08:00
hsm-lv
ffbde3d462 fix:action NestedSelect style
Change-Id: Ie7acc59d61c463b025c18d84ed7f505476d38297
2022-07-20 16:48:29 +08:00
hsm-lv
2dfef76645 feat:ajax动作支持静默模式
Change-Id: Id23910c2e5013e4ea0ba3bd40c72e6a27dfdb80b
2022-07-20 15:30:20 +08:00
jiatianqi
72002600e4 Merge branch 'pre-release' into feat-optimize-4
Change-Id: Ic364a6a65c0131b87d491e1bb2916d3f7077f867
2022-07-19 20:56:01 +08:00
yangwei9012
5347736bb1 fix: 字段绑定样式 & bump: 5.2.0-beta.21
Change-Id: Ifd2d9e4f89bfa4c452047d222ab0bef2672dd410
2022-07-19 20:01:00 +08:00
yangwei9012
af3905efe7 feat: 表单项字段绑定
Change-Id: I3699a5371f78225246d4745a3f8e17721d28b30b
2022-07-19 14:30:04 +08:00
liuguihua
c28428b7b2 amis-saas-4924:更换添加icon
Change-Id: I0e9953b46150d59d50fcbb1655c9a3b93f730a40
2022-07-18 21:11:11 +08:00
pianruijie
8fdda2fe3c 去掉多余属性 & 修改文案
Change-Id: I74a87b9143492cd58b8c71477aaa1eac4a66fa44
2022-07-18 14:44:16 +08:00
wibetter
813bf26444 fix: 同步主干代码
Change-Id: Idde93128a5bf7549a4e5bb3d0bd0cc0390749b01
2022-07-17 22:51:03 +08:00
2betop
6e5664774d merge master into feat-optimize-4
Change-Id: Ic6555d621403455805dc5c22213726f73f307313
2022-07-13 14:44:51 +08:00
liuguihua
a2ccf2f200 amis-saas-5196:层级限制并提示
Change-Id: Ic543d0ba6ecaf208d253731d0dfa888bb8d0f1d0
2022-07-12 11:43:03 +08:00
wibetter
a071d5e721 feat(layout): 布局容器右上角新增插入列级元素功能icon
Change-Id: Idbee73bc748e5d34cb876f96e39567ef0b33c4d3
2022-07-07 14:17:13 +08:00
wibetter
bf0856687d feat(layout): 列级容器增加左右插入功能icon
Change-Id: I8f96f44685ebc750e92cdf1c5428b9fcad8c7397
2022-07-07 14:17:13 +08:00
wibetter
7cd294a0ed feat(layout): 布局容器新增前后插入容器元素icon
Change-Id: I6ef8512f2a809088321a31799e31672a496f34de
2022-07-07 14:17:13 +08:00
wibetter
9c76e1a94a feat(layout): 特殊布局元素增加拖拽位置能力
Change-Id: I8206d95a1fd5c5c7cb871ff44d64833d28d6eb22
2022-07-07 14:16:06 +08:00
wibetter
993c808435 fix(layout): 优化常见布局icon
Change-Id: Idcab50e2eed78833d4ac2fd5e98d7cbf6c34dd75
2022-07-07 14:16:06 +08:00
wibetter
234c6137c2 fix(layout): 细节完善
Change-Id: Ib2740c5ed00400b73ba2b340af70d7d4d4c29e06
2022-07-07 14:16:06 +08:00
hsm-lv
646f5d9f5c style:调整添加事件按钮到顶部
Change-Id: I30929f08583b12241115ef4076179c724598e5ee
2022-07-06 20:36:14 +08:00
yangwei9012
f541968956 merge feat-optimize-4
Change-Id: I8974063a944df31cfcd401f416b69859fa53c04d
2022-07-05 23:12:28 +08:00
liqiu03
5e27af9e88 amis-saas-4605 [Bug] 测试:【组件优化第四批】超链接-基本配置-图标; 预期:图标名称过长时展示在输入框外,可清除按钮展示在输入框外(可优化)
Change-Id: Ia1aa6a58c6ce0ece2d2ee6a58869ebb98242801d
2022-07-05 20:17:25 +08:00
liqiu03
f829c7dac0 amis-saas-4859 [Improvement.] [配置面板] 折叠器展开后,无下边框
Change-Id: Ic59b3f72ea1dd6e7f56649486a8c572080baef2d
2022-07-05 19:58:09 +08:00
liuguihua
72014b2eaf Merge "amis-saas-4924:增加选项管理及API配置" into feat-optimize-4 2022-07-05 19:45:24 +08:00
liuguihua
146e58b141 amis-saas-4924:增加选项管理及API配置
Change-Id: If13229af2938b7d77228288d151d3583e1a124d0
2022-07-05 15:00:28 +08:00
chengjinyang
edcf97c71a [amis-saas-4806] style: 动作设置表单label左对齐
Change-Id: I0931f98dce73d46b9bf93adc73d7fb60e575ed5e
2022-06-29 22:09:16 +08:00
hsm-lv
682b8a2d39 fix:合并的问题
Change-Id: I187e02d52a1a6ded9c91f3a57dda6e605fc27e64
2022-06-29 12:12:29 +08:00
jiatianqi
b5ffb42c0c merge pre-release 分支
Change-Id: Ib69bc81c94fb0b4bbd969dcee6a7160016f7b58b
2022-06-28 21:42:18 +08:00
wibetter
f843f17c2e style: 修复右侧属性配置面板内层tabs切换抖动问题
Change-Id: I351a74bdd54f1d749e2ab69934f3cf09fd0b72f9
2022-06-24 15:28:33 +08:00
wibetter
fb2fd70c41 fix: scss文件支持导入其他npm模块中的scss
Change-Id: Idf545b566a669427d9b9be59977a2a281a03b638
2022-06-24 11:18:36 +08:00
chengjinyang
d66addbabc [amis-saas-4806] feat: 事件动作树优化及支持搜索
Change-Id: I41ecf6e4d3a0f4aabfcf98982af649a1ed86f3a5
2022-06-24 10:38:04 +08:00
wibetter
691d8b26d9 fix: 修正build构建报错
Change-Id: I1c364c75f2e5118727e918eb02e0fe5ee5edde3e
2022-06-23 20:52:41 +08:00
wibetter
4dc50acc53 style: 样式细节
Change-Id: Ib729d04aceafa9e6e58da3aa8eccdf4123f3f862
2022-06-23 13:11:29 +08:00
wibetter
e2d9ab2d50 style: 组件面板提示icon垂直居中
Change-Id: I8888559fcdadd9f0ed61db61ffadcfd2298afb4e
2022-06-23 13:05:55 +08:00
wibetter
7567678aea fix: 属性配置面板外层tab使用新版icon
Change-Id: I9a8c301524f4164ee45f5365fa06ecdc8809a243
2022-06-23 13:05:46 +08:00
wibetter
204f701e0f style: 调整新版icon颜色值
Change-Id: Id7871e12f7546476220bdad7d3efdad384985fbd
2022-06-23 13:05:38 +08:00
hsm-lv
57c686f778 update: 重构动作配置部分
Change-Id: I26fd1c8b00d1e5e5131dc8905b93fb466d8858f2
2022-06-22 22:36:24 +08:00
wibetter
121f02c500 fix: 修复导航面包屑 同级节点展示弹窗内容溢出问题
Change-Id: Ic56ee490f2d3fc79a2a1842efbe69069d4d0e49d
2022-06-22 16:45:39 +08:00
liqiu03
31eb03aaa6 amis-saas-3413 [Feature] 「组件配置」组件 - Timeline
Change-Id: I5f6e1aa7d878754efd76a4659cdba55cd72553f3
2022-06-20 19:47:46 +08:00
liqiu03
faa00bf4f7 amis-saas-3413 [Feature] 「组件配置」组件 - Timeline
Change-Id: I1462b5ff3eca959f10bc0250a4cb29d093f54369
2022-06-20 19:26:36 +08:00
huangying11
39aedcf5e2 Merge "amis-saas-4742 fix: 去掉相同的class" into feat-optimize-4 2022-06-20 17:12:30 +08:00
huangying11
d6432b3dbb amis-saas-4742 fix: 去掉相同的class
Change-Id: If738239d3221cd9cc20ec869a96413894dcfe870
2022-06-20 17:07:07 +08:00
huangying11
972dcce538 Merge changes I3db62f61,I455f1019 into feat-optimize-4
* changes:
  amis-saas-4742 fix: marksSource、partsSource根据配置获取
  amis-saas-4743 style: 最大值显示数值不全
2022-06-20 17:05:12 +08:00
liqiu03
0950014b6d amis-saas-3413 [Feature] 「组件配置」组件 - Timeline
Change-Id: I4c4407b5d35bc35cf764d8bd5afe840f45fec2e0
2022-06-20 16:19:00 +08:00
hsm-lv
6476b0c962 feat:迁移事件面板组件
Change-Id: Ibc8d894fc321ed6d792da39df5552404e4271f62
2022-06-17 21:20:34 +08:00
wibetter
981ca3e354 feat: 新增快捷键展示面板
Change-Id: I40d43ce4c083abf2985a2ceaf4233ede313b9aaf
2022-06-17 18:17:55 +08:00
huangying11
a2198642a5 amis-saas-4743 style: 最大值显示数值不全
Change-Id: I455f101961d726e94384008e11ec9c894e18cf2b
2022-06-17 11:35:05 +08:00
jiatianqi
9c4d7e9a6e merge: feat-optimize-3分支,处理 inputDate.tsx CollapseGroup.tsx 冲突
Change-Id: I85c16748545932024410d72e7402bec5e320a4d7
2022-06-17 10:38:26 +08:00
2betop
cac01a3018 调整为 monorepo
Change-Id: I06342cb12229885daf8e6fa2978f4e49ea0c49a2
2022-06-16 14:49:34 +08:00