Commit Graph

143 Commits

Author SHA1 Message Date
jiatianqi
547df12e20 amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: If25f25ca4e966b75f71f07d53e8a43add8fdbc5f
2022-11-09 16:21:14 +08:00
jiatianqi
6fcd1bf1dd 合并pre-release分支,解决一个文件冲突InputDateRange.tsx [amis-saas-6890]
Change-Id: I8432f63f419e383d2e7e646339c5047f4069c6d4
2022-11-09 14:36:47 +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
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
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
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
jiatianqi
2054602566 Merge branch 'pre-release' into fix-fx-formula 2022-11-01 19:22:58 +08:00
wutong25
1057485a3c 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
a5e4ada6ce amis-saas-6892 fix: 长文本输入框支持折行
Change-Id: Iaa7a4fb7c46588fd29e87020af0dcacc1c5d031c
2022-11-01 17:47:33 +08:00
jiatianqi
eb6dbe918a amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I8024b4c76232cc8c2429fc83838cd9bef6bf01f0
2022-11-01 15:16:49 +08:00
jiatianqi
a85d435fd6 amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: Ia669d4abaed1ac0c19ebb0d09df6ac20f0a9a307
2022-10-31 19:59:40 +08:00
jiatianqi
22b599e3b2 Merge branch 'feature-datapicker-shortcut-improve' into pre-release 2022-10-31 16:31:35 +08:00
igrowp
afc636edff amis-saas-6892 fix: 长文本公式输入框支持全屏
Change-Id: Ia0998f0baeaa4c9e4f359e6b87b77fbb4226d953
2022-10-31 16:21:45 +08:00
igrowp
35c05ef045 amis-saas-6892 fix: 长文本公式输入框基于codeMirror实现
Change-Id: Id04fddb52e9591ba42c66505ea4c00cea3a97122
2022-10-31 16:21:44 +08:00
igrowp
e4103d697d amis-saas-7603 feat: 纯表达式输入框
Change-Id: I7e047a08bfeb638d9d8e21a00d7fe9db66b1d5b1
2022-10-31 16:21:43 +08:00
igrowp
14a12a3fd0 amis-saas-6892 feat: 长文本公式输入框
Change-Id: Iab086db2c39626d0d4e30679f1ed3d0a45b42225
2022-10-31 16:21:43 +08:00
jiatianqi
7be12b4ae8 Auto Resolve Conflict To Branch fix-fx-formula By iCode
Change-Id: I1cd2811b9e3b47bbd51ef712b7adde8cd5c4dac1
2022-10-31 15:52:06 +08:00
wibetter
59bf4a9c79 fix(amis-saas-7728): 修复右侧配置面板外观样式设置弹窗展示问题
Change-Id: I096803a0ac1406e18f152047bde783296f7336a3
2022-10-27 17:58:21 +08:00
hsm-lv
147da96cb8 [amis-saas-7150]:选择组件下拉字体大小问题
Change-Id: Id3acd1e446c08b8c715dcddcbfc73c342eafa0e6
2022-10-26 20:17:34 +08:00
jiatianqi
1cbeff98a4 amis-saas-7665 [Improvement.] 「page页面」当展示区域仅有[内容区] 也展示头部标签
Change-Id: I134fbf5b1e624330c234e8f0064e86fda8add805
2022-10-24 14:53:12 +08:00
jiatianqi
0fb509f75b amis-saas-7072 [Bug] 弹窗配置的时候,如果内容超出页面高度,滚动的时候组件会有点卡
Change-Id: Iac3b0df3f061ef415efccef564f053ca121ba43b
2022-10-20 15:33:33 +08:00
donglinan
9f2e94f24c Merge "amis-saas-7452 [Feature] 隐藏状态文案未翻译" into pre-release 2022-10-14 11:31:33 +08:00
donglinan
337cca42c1 amis-saas-7452 [Feature] 隐藏状态文案未翻译
Change-Id: I5437fa1500492e005da1bd83df9738eec2401080
2022-10-14 11:25:34 +08:00
qkiroc
4127bf92fa Merge branch 'feat-theme-editor' into pre-release 2022-10-12 14:48:10 +08:00
hongyang03
0554c0f10d amis-saas-6716 样式修复
Change-Id: Idb2de768c90054b64587407884731461f40f4716
2022-10-12 14:46:09 +08:00
lvxiaojiao
189f1cd644 Merge "[amis-saas-7408]:优化刷新动作配置,增加数据追加控制" into pre-release 2022-10-11 22:06:06 +08:00
hsm-lv
3298d19a20 [amis-saas-7408]:优化刷新动作配置,增加数据追加控制
Change-Id: If0cab922f8b40b092c22edfc865ceab09a2a83c2
2022-10-11 21:42:28 +08:00
zhuwei11
c82ac0a973 Merge "amis-saas-7346 [Story] switch描述文案展示修复+tooltip title字号调整" into pre-release 2022-09-30 16:02:50 +08:00
zhuwei11
13d7852931 amis-saas-7346 [Story] switch描述文案展示修复+tooltip title字号调整
Change-Id: Id6c080a0981b95c63c0e429c222709041f56207c
2022-09-30 15:51:26 +08:00
lvxiaojiao
9070a3ecc0 Merge "[amis-saas-5165]:恢复分栏占位样式" into pre-release 2022-09-30 15:28:00 +08:00
hsm-lv
6b6061e145 [amis-saas-5165]:恢复分栏占位样式
Change-Id: I1a046da396b632a97667fab464d0a9bc8203caae
2022-09-30 15:21:21 +08:00