Commit Graph

653 Commits

Author SHA1 Message Date
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
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