Commit Graph

815 Commits

Author SHA1 Message Date
wibetter
9b6ff107bf fix(amis-saas-8278): 时间展示组件不显示秒问题修正
Change-Id: I09e8d7d2d33319ea2433aef3bdcb308996db37b8
2022-11-26 20:29:30 +08:00
wibetter
8571aca296 fix(amis-saas-8354): 调整内间距英文文案,避免撑开配置面板
Change-Id: I9fae6156d94d53ab343188e9eef5f726250495a1
2022-11-26 17:39:48 +08:00
wibetter
c937e44c8c fix(amis-saas-8357): 更新和补充国际化语料
Change-Id: If6922d50a9288fbdef25a5c7d852f32691679ec2
2022-11-26 17:05:00 +08:00
wibetter
cd838fc756 Merge branch 'pre-release' of ssh://icode.baidu.com:8235/baidu/amis/editor into pre-release
Change-Id: I1a897973839fe1d3b584f5ef92ed818890069af6
2022-11-26 16:42:08 +08:00
wibetter
6c1daeb811 fix(amis-saas-8303): 调整弹性比例说么文案
Change-Id: I46e420bc1f5862d1c2da4da62c468e7c55642def
2022-11-26 16:41:29 +08:00
tooeast
e37eb67b88 [amis-saas-7496]tree treeSelect 支持虚拟滚动参数
Change-Id: I26c5da2d353e16088605c52b439b07474a6134f0
2022-11-25 16:20:48 +08:00
qkiroc
ade4919cc5 amis-saas-7517 扩展外观编辑器
Change-Id: I2fec79d751d8a1936d88a39d3f0f8ec98a5ee48e
2022-11-25 15:01:52 +08:00
qkiroc
9d59dd83b2 amis-saas-7517 样式选择器css分离
Change-Id: I3189bb0e2429f1539387ca85b13ea001d969860b
2022-11-24 11:39:28 +08:00
wibetter
2e31f802f0 feat(amis-saas-8288): amis-editor-core增加构建es m模块
Change-Id: Ie8f33d693ba15acd457571ff6128434b352cc760
2022-11-24 10:42:15 +08:00
jiatianqi
a5bec66f33 Merge "amis-saas-8183 [Bug] 组件状态中,表达式展示不一致" into pre-release 2022-11-22 19:06:58 +08:00
jiatianqi
12e17a3d2e amis-saas-8183 [Bug] 组件状态中,表达式展示不一致
Change-Id: Ided72f1317bf26a65ba2056555b53f1842d9c881
2022-11-22 19:04:12 +08:00
wibetter
5ad1a0589a fix(amis-saas-2815): 处理代码冲突
Change-Id: I6c67982a7752104f8a4b23b918e6f205dafb1b3d
2022-11-22 18:30:31 +08:00
wibetter
bffc3362b4 fix(amis-saas-2815): 补上缺失的依赖react-json-view
Change-Id: I28a8fb91f7e6d20999e391904ffdeafa11f0689b
2022-11-22 18:28:35 +08:00
jiatianqi
7e78807922 amis-saas-6892 publish 5.2.1-beta.18 提测 fx表达式
Change-Id: I4a70b00fdc06865278e047854e435c27bb7472fe
2022-11-22 17:36:41 +08:00
jiatianqi
a79bfade83 amis-saas-8252 [Bug] 开关组件配置表达式无效
Change-Id: Ieae60b9ea3a82a9b60b0dbe0eaa1efd48bf70ef6
2022-11-22 16:35:24 +08:00
jiatianqi
c8ca2d65e8 amis-saas-8192 [Bug] 组合穿梭器组件,右侧选项界面混乱
Change-Id: I7cfa3cd318952b0a3487be1423965261c3abf2a1
2022-11-22 10:51:44 +08:00
jiatianqi
1836a83bc9 amis-saas-8240 「纯表达式」当为设置 evalMode 为 true的属性时候,回显有问题
Change-Id: I9bd8c6667faae02af7589615a14864f203550a5c
2022-11-22 10:49:34 +08:00
wibetter
c4d0577dbd fix(amis-saas-8235/):「占比设置」改成「弹性比例」
Change-Id: I6d3dbe21d2499c0d525b1d1cbf33153c4b925ae1
2022-11-22 09:44:08 +08:00
wibetter
3985ba963d fix(布局容器amis-saas-8224): 更新国际化语料
Change-Id: Ied828661eff1b8e8062b6cdaea525709cd98a67e
2022-11-21 22:11:06 +08:00
wibetter
5ce7185135 Merge branch 'pre-release' of ssh://icode.baidu.com:8235/baidu/amis/editor into pre-release
Change-Id: Ibdcac6312c491c16930d6fd6dc606784902e0a3e
2022-11-21 22:07:45 +08:00
wibetter
0ae22e798b fix(amis-saas-8235/):「布局容器」配置项细节优化
Change-Id: I878ae91705d0eb6629beb60640e313fc15048272
2022-11-21 22:07:27 +08:00
zhoushengqiang01
57314ad6ec Merge "fix: amis-saas-8121 测试:【组件优化第五批】transfer修改组件的默认值value,对应文本下的值同时被修改" into pre-release 2022-11-21 20:56:10 +08:00
zhou999
7877b371f0 fix: amis-saas-8121 测试:【组件优化第五批】transfer修改组件的默认值value,对应文本下的值同时被修改
Change-Id: Ie77d951f166a4fc433aefa6f9c606daa4b14daff
2022-11-21 20:52:17 +08:00
zhou999
a847f277b5 feat: combo组件优化 amis-saas-5352
Change-Id: Ib5972bc48f92ee72e7f0a2e1deb9a5de82ed0779
2022-11-21 19:42:57 +08:00
jiatianqi
6143f6a10d amis-saas-8187 [Bug] 【测试:】时间展示组件-时间数值没有秒
Change-Id: Iee32a50fdcdbdcfd97da8d6032da0179a070e5e7
2022-11-21 19:36:34 +08:00
jiatianqi
9db07a9c8c amis-saas-8231 [Bug] list-select 组件默认值样式
Change-Id: Ic7295f8e804b328b7668877f2d9adb67d2f0a550
2022-11-21 19:15:07 +08:00
zhou999
e12f1196f5 Merge branch 'pre-release' into feature-new-combo 2022-11-21 19:13:47 +08:00
wibetter
9cfe1036ea Merge branch 'pre-release' of ssh://icode.baidu.com:8235/baidu/amis/editor into pre-release
Change-Id: I4e960ee01f4bfc765924204d3801dea717a184c6
2022-11-21 17:26:54 +08:00
wibetter
098e5d5ea3 fix(布局容器amis-saas-8224): 细节完善
Change-Id: I0282321f279e261e923f416b99ed1dec68814aa4
2022-11-21 17:26:37 +08:00
pianruijie
9ccc9cf178 Merge "[amis-saas-8208] fix自定义js光标错位" into pre-release 2022-11-21 12:03:10 +08:00
jinye
cf7ffbb554 amis-saas-7974 左侧系统组件栏隐藏静态展示框组件
Change-Id: I0d749bb50548c97d07ba3347ed269f3ccd7af22c
2022-11-21 11:45:51 +08:00
pianruijie
5386b1ab08 [amis-saas-8208] fix自定义js光标错位
Change-Id: Ic0d1e5d1add755639acd3b55ec67246c39f7f105
2022-11-21 11:32:11 +08:00
jinye
5ad7b2d70d amis-saas-7974 静态展示框组件配置面板优化
Change-Id: I3e308743dc639c372f7aa8171c4138882876b43e
2022-11-21 11:10:56 +08:00
qkiroc
b01955fa6a amis-saas-7517 主题外观
Change-Id: If6d82ef043334e9ffd5e6472e2c7f3b451ce1411
2022-11-20 22:24:38 +08:00
liuguihua
3df3984383 amis-saas-7948:log组件配置面板
Change-Id: Ie8a9bf06264b22b2829859d7033cdc735b2fbca6
2022-11-20 20:58:30 +08:00
wibetter
77b288c6c5 fix(amis-saas-8191): 细节完善
Change-Id: Icc449a40bdb079f346d7c05f7946a3b27f58866b
2022-11-18 19:22:43 +08:00
tooeast
957c53c528 [amis-saas-7496]transfer select 虚拟滚动字段配置
Change-Id: Iffae5ffe5fc23be6d903c5ed2b6c9ffb305745c6
2022-11-18 17:34:53 +08:00
wibetter
c6199b8f24 fix(amis-saas-8191): 修复固定高度/宽度、最大/小高度宽度设置失效问题
Change-Id: I1202af12f4de84f036233251349832406e2c5f90
2022-11-18 16:44:35 +08:00
wibetter
0be10041a3 Merge branch 'pre-release' of ssh://icode.baidu.com:8235/baidu/amis/editor into pre-release
Change-Id: I79c9fe521f18125eaf5d769d1935d8b93eee4afe
2022-11-18 15:16:08 +08:00
wibetter
c0c83307d6 fix(amis-saas-2815): 统一react和amis相关依赖版本
Change-Id: I9066c93895ef9213b58205ed1a92b6c367e28965
2022-11-18 15:15:20 +08:00
jiatianqi
ef76cb1438 amis-saas-8179 [Feature] 日期、日期范围组件补充 [标题提示]、[控件提示]
Change-Id: Ifd700b983ee8d0bb30b594dddd471d670deb4784
2022-11-18 11:27:54 +08:00
wibetter
0088a7d0f2 docs(amis-saas-2815): 更新国际化语料
Change-Id: I1e17dbd47c7986829319f96bdc9e935dcd07be6b
2022-11-17 19:49:41 +08:00
wibetter
c176066ee2 Merge branch 'pre-release' of ssh://icode.baidu.com:8235/baidu/amis/editor into pre-release
Change-Id: I90903f4d96077c21bbff4901f2bedda1b1fcd3be
2022-11-17 19:35:12 +08:00
wibetter
8d5f1247a5 fix(布局功能amis-saas-8131): 完善高度/宽度、最大/小高度宽度清空逻辑
Change-Id: I92287cb9e1688d5b5659ad5f5e630951860e8930
2022-11-17 19:34:29 +08:00
zhou999
43e023b349 feat: amis-saas-7945 input-city优化
Change-Id: Ie2d2874d14d0b0846ef48e5948f4c3ae34405779
2022-11-17 19:28:28 +08:00
wibetter
1d77b5797e fix(amis-saas-8133): 定位模式配置项切换后数值重置
Change-Id: I5510c70faa492ec3645ebc7a587783f283d8fabd
2022-11-17 19:10:57 +08:00
wibetter
45c6b08287 fix(amis-saas-8080): 布局容器设置成公共组件默认样式优化
Change-Id: I627a33349f4efae81d29cf0f6c3dbc8ef468b801
2022-11-17 19:05:36 +08:00
huangying11
5faae92171 Merge "amis-saas-8092 improve: 长文本表达式展示" into fix-fx-formula 2022-11-17 17:02:47 +08:00
jiatianqi
bda435cd70 amis-saas-6892 [Feature] 编辑器表达式【组件面板】补充调整
Change-Id: Ib13146cde1ae1a9aead6f00449158e077c144a97
2022-11-17 16:25:12 +08:00
huangying11
4d4658b5ef amis-saas-8092 improve: 长文本表达式展示
Change-Id: I6ed6502eb10e9d5c9cf2080471a1297d4a7da012
2022-11-17 15:52:09 +08:00
jiatianqi
ddcfd07cba amis-saas-6892 [Feature] 编辑器表达式【事件动作面板】补充
Change-Id: I32de215ecc92913c7e8c223a6b88bc515443b4d6
2022-11-17 15:36:49 +08:00
jiatianqi
9b1a77360a amis-saas-6892 [Feature] 编辑器表达式【事件动作面板】场景替换
Change-Id: Id99dd35191877618745799b07d0b9b3b94720877
2022-11-17 15:18:35 +08:00
jiatianqi
de15fc7cd5 amis-saas-7601 优化细节点
Change-Id: Iaea124b7b346385c87102455e3ddb91177535cf1
2022-11-17 15:17:18 +08:00
jiatianqi
72bef5693b 替换几个组件属性配置面板 amis-saas-6892
Change-Id: I7d8e05a1d96bd05b2e3fb32d6df70b00f9d69181
2022-11-17 11:41:46 +08:00
jiatianqi
29c315acff amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I848a65473f6494a8d2f8ebdcb411287c8b06f86f
2022-11-17 10:13:55 +08:00
jiatianqi
a879d276d7 amis-saas-7601 [Feature] 表达式抽离公共方法封装
Change-Id: I25a7cc1df5a6517183fb2bbfe4d79e37778d20c2
2022-11-17 09:57:19 +08:00
zhou999
8e8259c62e Merge branch 'pre-release' into feature-new-combo 2022-11-16 20:12:59 +08:00
zhou999
d857f2169a feat: combo组件优化 amis-saas-5352
Change-Id: I7853725c32737ae5bc164b413e44c2f433b51b12
2022-11-16 20:04:58 +08:00
wibetter
00bfbd7ca1 fix(amis-saas-8086): 常见布局容器默认数据调整
Change-Id: Ia500e81b2e8791d6e6d76af33176c132c07c162b
2022-11-16 18:50:42 +08:00
jiatianqi
5a2e07adaa amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: If18a1e61a3584cdc80a7fe83254539dfa398f20a
2022-11-16 15:49:31 +08:00
jiatianqi
ec4e7d9988 amis-saas-6892 merge pre-release分支,解决common.ts一个文件冲突
Change-Id: I24f9841fbe5b07bdf463945245049a74248c2ef1
2022-11-16 11:22:25 +08:00
qkiroc
805d1cd500 amis-saas-7517 editor
Change-Id: I3165b21aff1f0065ceddf6d025881a7e2b299d6c
2022-11-16 10:25:42 +08:00
jiatianqi
0cca82543d amis-saas-7601 [Feature] 「编辑器」长文本输入失焦后自动高亮表达式
Change-Id: I371ab24134661c8e8de8bd53fd8bb11ff4c91315
2022-11-15 21:03:58 +08:00
hsm-lv
a38b56cf93 [amis-saas-7862]:补充Page、Service、Chart初始化事件&选项组件的seletedItems参数
Change-Id: I56b4667a8ab44ea215ee59f822d71a2488aee072
2022-11-15 20:33:08 +08:00
jiatianqi
fbdc2fe3d8 amis-saas-7603 [Feature] 「编辑器」纯表达式样式调整
Change-Id: If02a39263529af632b87138a72cff15132c64851
2022-11-15 17:37:37 +08:00
jiatianqi
8b7b82e774 amis-saas-7601 [Feature] 「编辑器」长文本外观样式调整
Change-Id: I73800dd805dcbab2a352f648c1b68bf50447ff28
2022-11-15 17:13:31 +08:00
hsm-lv
9f838d338a [amis-saas-8054]:接口配置体验优化
Change-Id: I771efe203f20105cc82316154f11b98b288e9270
2022-11-15 17:08:16 +08:00
lvxiaojiao
06a6c75af6 Merge "[amis-saas-7862]:补充Page、Service、Chart初始化事件&选项组件的seletedItems参数" into pre-release 2022-11-15 14:05:48 +08:00
wibetter
abc2aba7e7 fix(amis-saas-7727): 内网发一版5.2.1-beta.5
Change-Id: Id5c5c27de5e031e0053bd1011577910ad0ac4f66
2022-11-14 22:24:51 +08:00
wibetter
76d0fda4bd style(amis-saas-7727): 代码全局格式化
Change-Id: I280729c60133d151868ec8b4638e6060c5175230
2022-11-14 22:10:23 +08:00
wibetter
be4c341f8b fix(amis-saas-7727): 补充国际化物料
Change-Id: I983221c6b279bf5c5d849e10927c43b17b44f525
2022-11-14 22:06:50 +08:00
jiatianqi
1ea2b82e85 amis-saas-7601 [Feature] 「编辑器」长文本公式输入框 样式统一
Change-Id: I6da3324f24536fb75a5f926ad592cb902e71d32a
2022-11-14 20:32:03 +08:00
jiatianqi
55be53e5f0 amis-saas-7603 [Feature] 「编辑器」纯表达式输入框添加props的evalMode属性参数
Change-Id: I5ba0f7c65b0f56d4fbd51fb8b62dcbdcbfa2f10b
2022-11-14 18:23:03 +08:00
jiatianqi
434279ffde amis-saas-6892 [Feature] 完善短文本tooltip高亮文案
Change-Id: Ifb50a2b5a5dfde6acb6513b5e89b3d43cf012cf1
2022-11-14 17:58:25 +08:00
wibetter
56a2480ebf fix(amis-saas-4371): 合入布局容器相关代码
Change-Id: I32f0e69e3ba397821561f4881ebc131c9112f065
2022-11-14 17:03:04 +08:00
wibetter
91daa0bd3a fix(amis-saas-4371): 细节完善
Change-Id: I769586929fb1ba4a9775bdea7c88ba53ae28b719
2022-11-14 16:10:49 +08:00
jiatianqi
1aafb7b1a6 amis-saas-7980 [研发任务] 树选择、树下拉要合并优化
Change-Id: I89c304d57e8df94b60b1a105f2be16ad3457e047
2022-11-14 15:50:06 +08:00
wibetter
dda816abf4 fix(amis-saas-8035): 特殊布局参考位置增加默认值
Change-Id: I230f57f883d51615f54069b7c30e0ae642d05839
2022-11-14 15:31:20 +08:00
wibetter
1c7a82732f fix(amis-saas-4371): 细节完善
Change-Id: Iad351546904bd4503e6a7feda0d7a2f539e96e12
2022-11-14 15:16:51 +08:00
wibetter
0f8c1cc72a fix(amis-saas-4371): 细节完善
Change-Id: I438b4604437706ffaf16692174f6f9dd2f603d21
2022-11-14 14:58:48 +08:00
jiatianqi
b7b8779828 amis-saas-7983 [研发任务] 公式组件 左侧组件列表面板下掉
Change-Id: Id6c2b11b15561814cc2502def06d8fe488d5a65e
2022-11-14 14:20:45 +08:00
jiatianqi
64b8026d69 amis-saas-7980 日期外观模式调整
Change-Id: I3ff6e0a6bb9e6dfc1a8fa99d7df74a83d26ddceb
2022-11-14 14:17:16 +08:00
wibetter
7e230ee719 fix(amis-saas-4371): 剔除布局容器中重复的状态配置项
Change-Id: I7a3eaa644cdb5c999b2176391d647d3bd1332920
2022-11-14 13:23:07 +08:00
wibetter
33743c62a8 fix(amis-saas-4371): 剔除布局容器中重复的节点管理功能
Change-Id: Ic78f07c911c4ba585bb636e4fe88b95d20d83a90
2022-11-14 13:18:13 +08:00
wibetter
0790058ea9 fix(amis-saas-4371): 剔除布局容器中外观配置面板中的重复配置项
Change-Id: I2c284de8c4c2de395f5e876a990d12426807d345
2022-11-14 13:09:07 +08:00
wibetter
78aad3c37d fix(amis-saas-4371): 细节完善
Change-Id: I71f489635b94740cbd2c23afe41104c9c2f06d22
2022-11-14 12:18:17 +08:00
wibetter
aca1051104 fix(amis-saas-4371): 补充布局相关国际化语料
Change-Id: Idca195655e90656b37faf74ee21b735607463cb3
2022-11-14 11:52:21 +08:00
wibetter
de0cceddc7 fix(amis-saas-4371): 完善布局相关配置联动
Change-Id: Ib155fc0d215b98a0ab1e8ffc8ec7c3278a402f1f
2022-11-14 11:44:34 +08:00
hsm-lv
d7fada82bc [amis-saas-7862]:补充Page、Service、Chart初始化事件&选项组件的seletedItems参数
Change-Id: Ic901b65fb7b1d2ce9819e5bd27405fb75f69a0a9
2022-11-14 11:35:16 +08:00
xujiahao01
ba36d5aaae Merge "amis-saas-7537 feat:icon-picker=>tpl:icon" into pre-release 2022-11-11 17:11:58 +08:00
wibetter
388706aeed fix(amis-saas-7819): 同步主干最新代码
Change-Id: Id7cdbc0c38221eb7547c9ea8d1dd897e223b0549
2022-11-11 12:01:28 +08:00
wibetter
6cc39ea8bb fix(amis-saas-7819): 细节优化,并简化前后移动判断逻辑
Change-Id: I4633d53238eb6a673140d04b0007bca60d9d1a61
2022-11-11 10:15:30 +08:00
jiatianqi
7b4195c3a6 amis-saas-6892 [Feature] 纯表达式增加requiredDataPropsVariables属性功能
Change-Id: I304aaf359dc6f4011e33377ff4f3ea0cfb9860ac
2022-11-10 19:27:36 +08:00
jiatianqi
1d88ae8011 amis-saas-6892 [Feature] 短文本、长文本表达式增加requiredDataPropsVariables属性功能
Change-Id: Ib348ed5ca2395f471434d80b80326468a1c689b3
2022-11-10 15:31:47 +08:00
jiatianqi
0db3fddc32 amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I4f9c5a4a808d121f873f05d593982920558ab8c2
2022-11-09 20:02:13 +08:00
jiatianqi
1ae85da863 amis-saas-6892 [Feature] 表达式配置后 输入框的样式调整
Change-Id: I9ae53cdd8f55472a563cb89cef27a173df35a2d7
2022-11-09 19:44:21 +08:00
wibetter
55eeb3a699 fix(布局组件amis-saas-7939): 包裹容器上下追加元素icon位置自适应调整
Change-Id: I16b1710885223ee95ede81a0e21ff6360f3bd65a
2022-11-09 18:58:54 +08:00
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
91e85a1698 feat: combo组件优化 amis-saas-5352
Change-Id: I2469b3899226a75f9d2aa5cbb4bdb289415b445b
2022-11-04 19:58:23 +08:00
zhou999
dc6be6e7e0 style: 完善日期范围组件的快捷键-按钮样式 amis-saas-7301
Change-Id: Ife3301697086d42f79accacd66860afe553ce663
2022-11-04 17:47:10 +08:00
zhou999
ad6e222976 feat: combo组件优化 amis-saas-5352
Change-Id: I27ac134257d06f66d1ceac63431039bb26aa2a81
2022-11-04 15:55:52 +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
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
hsm-lv
b0d31df615 [amis-saas-7150]:补充抽屉事件变量
Change-Id: I33c9cb924b542cd2a2fcc3ddbf5eed95ee10675d
2022-10-26 15:57:58 +08:00
zhou999
94f96bf422 fix: amis-saas-7145 测试:【组件优化第五批】input-date组件下的获取/失去焦点事件下获取不到事件变量;
Change-Id: I1769a4510c6b9497b07bcf4bbfcd1d99cb42bd6b
2022-10-26 14:53:17 +08:00
zhou999
f7251f1f30 fix: amis-saas-7691 测试:【组件优化第五批】穿梭器左侧展示面板-展示方式为表格形式,添加表格列报错;
Change-Id: I89715586facc71b579101d649f08cdc17d8c4a33
2022-10-26 13:23:35 +08:00
hsm-lv
4c93c869b6 [amis-saas-7686]:跳转和打开页面动作配置后提交报forEach错误
Change-Id: I9643aca9f9dabeaf40ebf2b448f93b2478beb99a
2022-10-25 15:29:01 +08:00
jiatianqi
52bfa124bf amis-saas-6348 publish 5.2.0-beta.87
Change-Id: I572dc114cf48a4fa595ad89145a76309976b54b0
2022-10-24 21:13:59 +08:00
jiatianqi
fbde4e3765 amis-saas-6348 [研发任务] 「平台国际化」语料翻译
Change-Id: I1fdc3c4a975b9da58a2c0c3e5e29a8b50c2cc63e
2022-10-24 21:05:38 +08:00
hsm-lv
d2a4d1f49a [amis-saas-6723]:优化刷新动作配置,增加数据追加控制
Change-Id: I6ced9c8349fdf876d82455e9f5b52bcc60f15205
2022-10-24 20:16:18 +08:00
hsm-lv
da9195ca88 [amis-saas-7667]:国际化补充
Change-Id: Ic2aaed5122e31f6ddfd2c925d815faa01059e31d
2022-10-24 19:30:28 +08:00
jiatianqi
403fb1f2ae amis-saas-6348 [研发任务] 「平台国际化」针对工具对模板字符串的bug临时修复
Change-Id: I43c8d394a8452a0f5c92c2f9de44675226b6d1d9
2022-10-24 17:35:39 +08:00
hsm-lv
afde5391a5 [amis-saas-7667]:国际化补充
Change-Id: Ia5bbd8b55d99e86da4155876c82b5bf98e599a51
2022-10-24 16:48:44 +08:00
hsm-lv
b5bf21baf0 [amis-saas-7667]:调用组件特性动作配置完成提交后右侧面板报错
Change-Id: I88f27dc5dfbeadeaebcfa0cfad87ba0bd7b444ac
2022-10-24 16:02:17 +08:00
jiatianqi
acd613ced6 amis-saas-5748 [Bug] 组合输入框等旧表单项组件配置面板,隐藏时删除字段配置项无法关闭
Change-Id: Ic056755bd9edaac7ef50408ed19710c7b1ebc0bc
2022-10-24 10:34:43 +08:00
qkiroc
300959133e amis-saas-7517 主题国际化
Change-Id: Ia339c54ab19916b2fc90b7e9905efb17c543e06b
2022-10-21 23:53:08 +08:00
jiatianqi
3c6f96f9d1 amis-saas-5962 发版5.2.0-beta.84 版本,第五批遗留问题的修复
Change-Id: I87d06c97f01c6c84d419653a18c92e20445c0960
2022-10-20 20:42:24 +08:00
jiatianqi
629ca30129 amis-saas-7230 [Improvement.] 测试:【组件】page组件外观配置取消布局设置
Change-Id: I61d8719ec2cf654133a03c4de41d5ff7b1a17434
2022-10-20 15:53:32 +08:00
jiatianqi
48664cbeab Merge "amis-saas-7065 显示输入框图片尺寸限制的单位 B" into pre-release 2022-10-19 20:14:38 +08:00
jiatianqi
74eea462eb amis-saas-7065 显示输入框图片尺寸限制的单位 B
Change-Id: Ib4bae8938db9e7719d6ee8d21e9a181904190e4b
2022-10-19 20:13:35 +08:00
jinye
2385df9506 amis-saas-5351 从开发分支合入release
Change-Id: Ib192a24f0ed3500b3480d6103d9cf3ad3dcd9c64
2022-10-19 18:40:52 +08:00
jinye
9a0ef67179 Merge "amis-saas-5351 「组件配置」组件 - 表单及表单项展示态切换" into feat-form-static 2022-10-19 17:31:45 +08:00
wanglinfang
25d808d9b2 amis-saas-7476 table2字段调整
Change-Id: I20cd6c63447a08785ae5de1d3477033a0a98871d
2022-10-19 15:38:10 +08:00
jiatianqi
e6e06534a3 amis-saas-7244 [Bug] 测试:【组件】树下拉框下-高级配置下的显示顶级节点配置属性未生效;
Change-Id: Ib8db842ab367d0086768d48f741336601e07942d
2022-10-19 15:23:46 +08:00
jiatianqi
5677fd64d9 amis-saas-7466 [Bug] 内网版本,富文本编辑器,拖入时编辑器类型没有回填默认值
Change-Id: I5747df7f3d186370df769c45440064f8b342dc1f
2022-10-19 15:04:23 +08:00
qinhaoyan
60ebcef8ab Merge changes I1f91a6a2,I7917ba1d into pre-release
* changes:
  amis-saas-7517 修改插件名
  amis-saas-7517 更新图标选择器
2022-10-19 13:41:08 +08:00
qkiroc
7d647f5580 amis-saas-7517 更新图标选择器
Change-Id: I7917ba1db94159614ea8c4bde31b415a27f42eda
2022-10-19 11:59:36 +08:00
jiatianqi
8ac6d437ca Merge "amis-saas-7391 「校验浮层」位置问题" into pre-release 2022-10-19 11:40:39 +08:00
jinye
532ff4ca10 amis-saas-5351 「组件配置」组件 - 表单及表单项展示态切换
Change-Id: Ie2079a5bb02404670fea538f00c6b6c242ef3a7a
2022-10-18 23:47:04 +08:00
hsm-lv
0023e419e5 [amis-saas-7476]:几个build warging
Change-Id: I4bce64b31260d9f1d53e0f8e9969e5eb8488b5e4
2022-10-18 20:39:38 +08:00
hsm-lv
7df75b140c [amis-saas-7476]:动作中页面参数显示问题&组件数据初始化时上下文获取问题
Change-Id: Id8420adf7b12ecf6e9c5f6d603804f578d2d2c3a
2022-10-18 20:06:32 +08:00