Commit Graph

689 Commits

Author SHA1 Message Date
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
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
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
pianruijie
5386b1ab08 [amis-saas-8208] fix自定义js光标错位
Change-Id: Ic0d1e5d1add755639acd3b55ec67246c39f7f105
2022-11-21 11:32:11 +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
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
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
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
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
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
dc6be6e7e0 style: 完善日期范围组件的快捷键-按钮样式 amis-saas-7301
Change-Id: Ife3301697086d42f79accacd66860afe553ce663
2022-11-04 17:47:10 +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