Commit Graph

491 Commits

Author SHA1 Message Date
huangying11
37cc8765cc Merge "amis-saas-8092 improve: 长文本表达式展示" into fix-fx-formula 2022-11-17 17:02:47 +08:00
huangying11
92fb55e5d2 amis-saas-8092 improve: 长文本表达式展示
Change-Id: I6ed6502eb10e9d5c9cf2080471a1297d4a7da012
2022-11-17 15:52:09 +08:00
jiatianqi
354d9105e7 amis-saas-7601 优化细节点
Change-Id: Iaea124b7b346385c87102455e3ddb91177535cf1
2022-11-17 15:17:18 +08:00
liaoxuezhi
1342fc22d0 Merge changes I91fd842b,I6f9aacbc,Icfe66a5c,I133ebe2b,I161a488c, ... into pre-release
* changes:
  amis-saas-7740 [子模块] 模型设计器草稿代码
  amis-saas-7740 [子模块] 模型设计器草稿代码
  amis-saas-7740 [子模块] 模型设计器草稿代码
  amis-saas-7740 [子模块] 模型设计器草稿代码
  amis-saas-7740 [子模块] 模型设计器草稿代码
  amis-saas-7740 [子模块] 模型设计器草稿代码
  amis-saas-7740 [子模块] 模型设计器草稿代码
  amis-saas-7740 [子模块] 模型设计器草稿代码
  amis-saas-7740 [子模块] 模型设计器草稿代码
  amis-saas-7740 [子模块] 模型设计器草稿代码
2022-11-17 14:22:53 +08:00
2betop
4dbbf62f5a amis-saas-7740 [子模块] 模型设计器草稿代码
Change-Id: I91fd842b9358739d51692d907d5f1fce00dab434
2022-11-17 14:18:55 +08:00
jiatianqi
0882c6de3d 替换几个组件属性配置面板 amis-saas-6892
Change-Id: I7d8e05a1d96bd05b2e3fb32d6df70b00f9d69181
2022-11-17 11:41:46 +08:00
jiatianqi
978ccc3188 amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: If18a1e61a3584cdc80a7fe83254539dfa398f20a
2022-11-16 15:49:31 +08:00
jiatianqi
f33b995b05 amis-saas-7601 补充:[表达式]浮层遮挡问题
Change-Id: I1265326b989ec2fb78c6cdad567d10dc2b24b501
2022-11-16 12:44:13 +08:00
jiatianqi
3d599b83a4 amis-saas-6892 merge pre-release分支,解决common.ts一个文件冲突
Change-Id: I24f9841fbe5b07bdf463945245049a74248c2ef1
2022-11-16 11:22:25 +08:00
jiatianqi
30e75272df amis-saas-7601 [Feature] 「编辑器」长文本表达式上下[表达式]浮层遮挡问题
Change-Id: I010b10d33d36bd7b182b3139ccf963ffaea0cd65
2022-11-16 10:58:37 +08:00
qkiroc
0f2a7dffe0 amis-saas-7517 editor
Change-Id: I3165b21aff1f0065ceddf6d025881a7e2b299d6c
2022-11-16 10:25:42 +08:00
hsm-lv
146141a9a0 [amis-saas-7862]:补充Page、Service、Chart初始化事件&选项组件的seletedItems参数
Change-Id: I56b4667a8ab44ea215ee59f822d71a2488aee072
2022-11-15 20:33:08 +08:00
jiatianqi
4fa143a5cb amis-saas-7601 [Feature] 「编辑器」长文本外观样式调整
Change-Id: I5c289b8955bfb9cbb616c90c5c2932c77697ca14
2022-11-15 19:39:36 +08:00
jiatianqi
e5df65e033 amis-saas-7603 [Feature] 「编辑器」纯表达式样式调整
Change-Id: If02a39263529af632b87138a72cff15132c64851
2022-11-15 17:37:37 +08:00
jiatianqi
d627c3f271 amis-saas-7601 [Feature] 「编辑器」长文本外观样式调整
Change-Id: I73800dd805dcbab2a352f648c1b68bf50447ff28
2022-11-15 17:13:31 +08:00
wibetter
f248457baf fix(amis-saas-7727): 内网发一版5.2.1-beta.5
Change-Id: Id5c5c27de5e031e0053bd1011577910ad0ac4f66
2022-11-14 22:24:51 +08:00
wibetter
b98c987b9e fix(amis-saas-7727): 代码编写问题修正
Change-Id: I42d5b784787917bd270590ae5575cf34be26e0cd
2022-11-14 22:21:06 +08:00
wibetter
c0cf011352 style(amis-saas-7727): 代码全局格式化
Change-Id: I280729c60133d151868ec8b4638e6060c5175230
2022-11-14 22:10:23 +08:00
wibetter
6475c2d853 fix(amis-saas-7727): 补充国际化物料
Change-Id: I983221c6b279bf5c5d849e10927c43b17b44f525
2022-11-14 22:06:50 +08:00
wibetter
46d3601eb2 fix(amis-saas-6948): 左侧组件搜索问题优化,避免切换预览模式后丢失搜索字段
Change-Id: I2ca2e88daee1c4602f8a9ad401b7e7a1ee9cf95c
2022-11-14 21:35:36 +08:00
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
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