Commit Graph

731 Commits

Author SHA1 Message Date
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
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
hsm-lv
9c96baca03 [amis-saas-7504]: crud reload增加resetPage
Change-Id: I66386e5f6a22e16cdaa837df9a9e6f3fddf05126
2022-10-18 17:09:53 +08:00
hsm-lv
ac1c37d91b [amis-saas-7408]:暂时隐藏刷新动作配置优化
Change-Id: Id9bded55a2c45eba00ae3fcf0233f922122a8a7d
2022-10-18 17:03:13 +08:00
zhuwei11
7ba8000afc amis-saas-7483 国际化翻译
Change-Id: I92dd039d927ce5c4b3203af38b75a01ed304452e
2022-10-14 19:42:53 +08:00
wibetter
afe2cd42c7 fix(amis-saas-7103): 代码格式化一下
Change-Id: I5a8da179d640a4bdccc405b1a7ef56168f08d33b
2022-10-14 13:41:25 +08:00
wibetter
0bb0422d8b fix(amis-saas-7103): 完善开关组件默认值类型校验
Change-Id: I1c8985e67853fbffe7acd9f3de183b117ade4f92
2022-10-14 13:41:14 +08:00
qinhaoyan
5547855bd8 Merge "amis-saas-2569 图标select回滚" into pre-release 2022-10-14 12:50:05 +08:00
qkiroc
031856bb9f amis-saas-2569 图标select回滚
Change-Id: I8c5195e43e5b0a698c65a2b927450422bf4413ef
2022-10-14 12:22:11 +08:00
wibetter
74530d9ef1 fix(amis-saas-7103): 完善开关组件默认值类型校验
Change-Id: I08a1eabf77fbc783ec328fab2387ccaddca7bfbc
2022-10-14 12:11:34 +08:00
donglinan
f5a1068697 Merge "amis-saas-7452 [Feature] 隐藏状态文案未翻译" into pre-release 2022-10-14 11:31:33 +08:00
donglinan
938ede5ae5 amis-saas-7452 [Feature] 隐藏状态文案未翻译
Change-Id: I5437fa1500492e005da1bd83df9738eec2401080
2022-10-14 11:25:34 +08:00
liaoxuezhi
d82992e5ea Merge "amis-saas-638 [项目] 本地开发升级最新的 amis" into pre-release 2022-10-13 21:35:14 +08:00
2betop
459577d099 amis-saas-638 [项目] 本地开发升级最新的 amis
Change-Id: Iead66c146e0fff228a0b428f5d01251843cafe37
2022-10-13 21:32:47 +08:00
zhuwei11
482fe66a16 Merge "amis-saas-7483 补充文案翻译" into pre-release 2022-10-13 21:25:52 +08:00
zhuwei11
dc0f9c0591 amis-saas-7483 补充文案翻译
Change-Id: I6e25bab96d3b06ac7cdff6c3dca174c9a39aa953
2022-10-13 21:23:11 +08:00
zhoushengqiang01
9497df94d4 Merge "fix: amis-saas-7233 测试:【组件】添加树下拉框,设计态下未开启可清除选项的配置,预览态选取选项后返回编辑态,可清除选项配置开启;(不符合预期)" into pre-release 2022-10-13 20:24:20 +08:00
zhuwei11
4f01c3888c Merge "amis-saas-7483 补充文案翻译" into pre-release 2022-10-13 20:21:45 +08:00
zhuwei11
e1e5558c83 amis-saas-7483 补充文案翻译
Change-Id: I2c89ec96b21f356071a497b333c4cabe38c12cb7
2022-10-13 20:15:30 +08:00
zhou999
8ae19c2c1c fix: amis-saas-7233 测试:【组件】添加树下拉框,设计态下未开启可清除选项的配置,预览态选取选项后返回编辑态,可清除选项配置开启;(不符合预期)
Change-Id: I57ec81356ee9187dc53cdccce622cef983763f09
2022-10-13 15:33:20 +08:00
qkiroc
03a6469b8b amis-saas-2569 修复国际化
Change-Id: Ida8e10dcc47c0087345e7b50dc9eac338b175ed3
2022-10-13 13:10:10 +08:00
hsm-lv
66755d4d19 [amis-saas-6725]优化事件变量
Change-Id: I46f76136b4ca362f0f218de3b79a9a68219ff0ee
2022-10-12 19:39:33 +08:00
qkiroc
9292e4bb4c amis-saas-2569 国际化版本
Change-Id: I857f4288467cdb263fde832a62174756d9bfb1ec
2022-10-12 11:45:25 +08:00
qinhaoyan
a5ee1ce787 Merge "amis-saas-2569 修复国际化问题" into pre-release 2022-10-12 11:31:07 +08:00
qkiroc
f72bde3f20 amis-saas-2569 修复国际化问题
Change-Id: Ia73072b6163b2ccf8f5167f236d0688eb01337cd
2022-10-12 11:30:35 +08:00
lvxiaojiao
0959a8e449 Merge "[amis-saas-7408]:优化刷新动作配置,增加数据追加控制" into pre-release 2022-10-11 22:06:06 +08:00
hsm-lv
1d0119a01d [amis-saas-7408]:优化刷新动作配置,增加数据追加控制
Change-Id: If0cab922f8b40b092c22edfc865ceab09a2a83c2
2022-10-11 21:42:28 +08:00
xujiahao01
3d6afde60a amis-saas-6716 feat:解决冲突 icon-picker=>select
Change-Id: I8a798cd4bb80b0d08f53afe58f40f1787e367f01
2022-10-11 15:58:09 +08:00
qinhaoyan
045fb8965a Merge changes Id8f1657d,Iabaacca1 into pre-release
* changes:
  amis-saas-6436  国际化翻译更新
  amis-saas-2569 merge
2022-10-09 16:07:09 +08:00
jiatianqi
9952b094f1 amis-saas-7391 「校验浮层」位置问题
Change-Id: Iad32876338dbdfef004383c0f66fef691602a746
2022-10-08 07:36:30 +08:00
zhuwei11
18f6aa01cf Merge "amis-saas-7346 [Story] switch描述文案展示修复" into pre-release 2022-09-30 17:14:53 +08:00
zhuwei11
9a2b1175bd amis-saas-7346 [Story] switch描述文案展示修复
Change-Id: I0bcba892d1f29dd1b0d89a5f8f48ab9ed99c2727
2022-09-30 17:12:04 +08:00
zhuwei11
78e33d2a64 Merge "amis-saas-7346 [Story] switch描述文案展示修复+tooltip title字号调整" into pre-release 2022-09-30 16:02:50 +08:00
zhuwei11
619537b1be amis-saas-7346 [Story] switch描述文案展示修复+tooltip title字号调整
Change-Id: Id6c080a0981b95c63c0e429c222709041f56207c
2022-09-30 15:51:26 +08:00
jiatianqi
65d800b43c amis-saas-7377 「commbo提示」存在删除、可拖拽的tooltip提示被遮盖 &导致出现横向滚动条
Change-Id: I8698621b4e87b3de34eb3269ae1f8d7990fce3fb
2022-09-30 11:56:38 +08:00
qkiroc
ddcc68dfbe amis-saas-6436 国际化翻译更新
Change-Id: Id8f1657d0f51571ba6d0fb31bfe4b9499c7e3de5
2022-09-30 11:15:00 +08:00
qkiroc
f41ae0f70f amis-saas-2569 merge
Change-Id: Iabaacca109f45a703dadb4b0ebe0b505547e325b
2022-09-30 11:11:08 +08:00
jiatianqi
563736b2c7 amis-saas-7372 「调整组件布局切换select」调整切换button-group-select切换为 select
Change-Id: Iea605bb802c800b1bff0e2a736a2d8320704f7df
2022-09-30 10:29:51 +08:00
jiatianqi
d317685a3f amis-saas-7370 「文案调整」英文翻译调整
Change-Id: I01253c61d4c00140d4928a96c96ab2ca81a9a6b5
2022-09-30 10:24:11 +08:00
zhou999
6eadc9df9a feat: 「日期范围快捷键」快捷键优化调整 amis-saas-7301
Change-Id: Icc94132831faacb2730e532f5766f7da53084ab1
2022-09-29 14:14:22 +08:00
qinhaoyan
acd233860c Merge changes I32832257,I8a6c16b3,I2fa8fa11 into pre-release
* changes:
  amis-saas-2569 更新国际化
  amis-saas-2569 更新国际化
  amis-saas-2569 修改脚本
2022-09-28 15:58:13 +08:00
qkiroc
0e8affd01f amis-saas-2569 更新国际化
Change-Id: I32832257c9c721dc4087ce4f8672f0d8edd3ee40
2022-09-28 15:57:37 +08:00
qkiroc
165645815d amis-saas-2569 更新国际化
Change-Id: I8a6c16b3be93ed344043e978912ebe5f1528de12
2022-09-28 14:53:47 +08:00
jiatianqi
2298aaca96 Merge branch 'master' into pre-release 2022-09-28 14:47:26 +08:00
qkiroc
8662d4d884 amis-saas-6436 国际化翻译更新
Change-Id: Ie5afbf3e26049e2b2c44680f8dd3ee9065bafa3f
2022-09-27 18:41:18 +08:00
qkiroc
2e0e90147c Merge branch 'pre-release' of ssh://icode.baidu.com:8235/baidu/amis/editor into pre-release
Change-Id: Id9af4ce19f8621f1a111959a650bbdaff9c6d11a
2022-09-27 18:41:02 +08:00
jiatianqi
b6ef0091e6 Merge "amis-saas-6890 [Story] tsconfig.json调整" into pre-release 2022-09-27 17:44:18 +08:00
jiatianqi
1e252ba275 amis-saas-6890 [Story] tsconfig.json调整
Change-Id: Idd20f71191c181f62e1061796d1f43faeca6ab94
2022-09-27 17:41:18 +08:00
jiatianqi
2b83ed3913 amis-saas-5329 fix:单存编辑器服务下api问题修复
Change-Id: Id7011176647c45f84d7e96a12cb3fc2017fe36d1
2022-09-27 17:39:45 +08:00
qkiroc
bf99393ac5 amis-saas-2569 merge
Change-Id: I82bd022172e13d3a604b7ebb49a4384357f89e24
2022-09-27 16:57:12 +08:00
qkiroc
cba6725400 amis-saas-2569 国际化更新
Change-Id: I212cbf23f38ec40a05b5d25cc15570282a0f1d52
2022-09-27 16:53:46 +08:00
jiatianqi
5ae559a5b2 amis-saas-6892 补充3个组件针对默认值的处理
Change-Id: I0573d9d446277ea4c98381ac0c51b1d9e0616441
2022-09-27 15:51:11 +08:00
nwind
6bb7257fe4 amis-saas-6890 优化 tinymce 的默认值,并在配置 richTextToken 后自动切换为 froala
Change-Id: I6e03c8abef18720903e12546c70e4cc0c27b9546
2022-09-27 15:16:02 +08:00
hsm-lv
463a34fb86 Merge branch 'feat-optimize-5' into pre-release 2022-09-26 18:51:17 +08:00
pianruijie
1295a34bad amis-saas-7150 数据容器组件赋值问题
Change-Id: Id4b8047f2efe81f3a582d2cbfc379c597613f09f
2022-09-26 17:59:29 +08:00
jiatianqi
156a9abaf4 [amis-saas-5962] 合并第五批组件分支
Change-Id: Idf21932c4ed4db401efe421acbbb00b25358e7fb
2022-09-26 17:45:48 +08:00
jiatianqi
b790aad48d amis-saas-7262 [Bug] 图片问题修复
Change-Id: Ifef5c310c365bd2a21b917acebed69a55326a721
2022-09-25 20:26:22 +08:00
jiatianqi
8580271f94 amis-saas-7262 [Bug] 测试:【组件】图片上传开启固定尺寸上传图片后,已选择的图片不支持预览;
Change-Id: Ibfaba1e55eb699a9c3e8ae2fe82e4205e99e9551
2022-09-25 20:06:29 +08:00
jiatianqi
7ade25e19f amis-saas-7247 [Bug] 测试:【组件】支持事件的组件下添加弹窗动作配置,属性默认配置属性未开启;
Change-Id: I960c44d526b2c86e600d452b9fe2e021f6b58dbf
2022-09-25 15:44:55 +08:00
jiatianqi
43cacd93b1 amis-saas-7253 [Bug] 静态展示框默认值配置不回显,且不支持输入问题修复
Change-Id: Ic430b19cc708bf29f6862f200552d1cb0643596e
2022-09-24 19:48:22 +08:00
jiatianqi
245ce48853 amis-saas-7256 [Improvement.] 城市选择组件无必填配置项问题修复
Change-Id: I889822f9104511e48940310a738c345ee67b4fbc
2022-09-24 19:28:21 +08:00
zhoushengqiang01
d5ef2fed91 Merge "fix: 测试:【组件优化第五批】穿梭框表格形式下添加表格行只对表格下的最后一行为空进行校验; amis-saas-7219" into feat-optimize-5 2022-09-23 20:01:40 +08:00
zhou999
e058192010 fix: 测试:【组件优化第五批】穿梭框表格形式下添加表格行只对表格下的最后一行为空进行校验; amis-saas-7219
Change-Id: I868eae5155957ad1c47e2217d077360d310b3f80
2022-09-23 20:00:59 +08:00
zhoushengqiang01
643a822650 Merge changes Ib6bfd9e2,I98964f3e,Ia0580c95 into feat-optimize-5
* changes:
  fix: 测试:【组件优化第五批】穿梭框表格形式下添加表格行只对表格下的最后一行为空进行校验; amis-saas-7219
  fix: 测试:【组件优化第五批】穿梭框表格形式下添加表格行只对表格下的最后一行为空进行校验; amis-saas-7219
  fix: 测试:【组件优化第五批】穿梭框表格形式下添加表格行只对表格下的最后一行为空进行校验; amis-saas-7219
2022-09-23 20:00:30 +08:00
zhou999
3122b5b0c8 fix: 测试:【组件优化第五批】穿梭框表格形式下添加表格行只对表格下的最后一行为空进行校验; amis-saas-7219
Change-Id: Ib6bfd9e2db3842f39779ae208cf43d88f6f54bda
2022-09-23 19:58:52 +08:00
zhou999
8b24082732 fix: 测试:【组件优化第五批】穿梭框表格形式下添加表格行只对表格下的最后一行为空进行校验; amis-saas-7219
Change-Id: I98964f3e2f89cae4d103ebb3b961508fe5982bee
2022-09-23 19:42:39 +08:00
zhou999
c9d53b9a85 fix: 测试:【组件优化第五批】穿梭框表格形式下添加表格行只对表格下的最后一行为空进行校验; amis-saas-7219
Change-Id: Ia0580c95853e98bc1776bd927a49cde455773b18
2022-09-23 19:41:10 +08:00
jiatianqi
f543c7027e amis-saas-7237 [Bug] dropdown-button组件在使用时传入 popOverContainer: null情况下,buttons属性内容会渲染在当前层级下
Change-Id: I1909b4e11b2b8efff0ee37221c42753d9ee15419
2022-09-23 19:16:58 +08:00
jiatianqi
90381320db amis-saas-7237 [Bug] 测试:【组件】在树下拉框,自定义选项下,无法新增选项及子选项;
Change-Id: Ide1674ff09215c621be894ddfd5a0e459deb03f0
2022-09-23 18:01:07 +08:00
jiatianqi
ef0bf5199e amis-saas-7241 [Bug] 测试:【组件】树选择框外观配置项(待确认)
Change-Id: I5aee9f10b1cc63c975ef17fb67fc0b9084206c3e
2022-09-23 17:59:51 +08:00
pianruijie
1b6db38132 Merge "fix:修复dialog、transfer事件变量[amis-saas-7150]" into feat-optimize-5 2022-09-23 16:52:03 +08:00
pianruijie
3e9a58e5f8 fix:修复dialog、transfer事件变量[amis-saas-7150]
Change-Id: I8506108ae46c539c352ac115a7361e08d88c9250
2022-09-23 16:50:13 +08:00
jiatianqi
5b9ed17b6b 补充发版携带文件目录 amis-saas-6890 [Story]
Change-Id: I494114e97c96fa132278191e45a699b2c00cd9b6
2022-09-23 15:49:46 +08:00
liujintao03
1ebe50e1e2 amis-saas-7139 input-file 事件参数修改
Change-Id: I394a9db1feeda6427afdd7b50f258c5a7cb16c66
2022-09-23 14:35:41 +08:00
liujintao03
4dab3c7e54 amis-saas-7153 input-image 事件参数修改
Change-Id: I02955aad6b091a2e81b9902336162dde6ce7ce7f
2022-09-23 14:35:41 +08:00
qkiroc
40883747b8 amis-saas-7199 国际化翻译更新
Change-Id: Iee05446320fb3dbf39ba07b570a9dec974e7c37a
2022-09-23 10:17:53 +08:00
jiatianqi
7f628f8786 fix: amis-saas-6665 [Bug] 选项文本值无法修改
Change-Id: I08bb7fa2d04bfc206bfd0a3734465409980aaf37
2022-09-22 20:59:55 +08:00
jiatianqi
3a50a31cea amis-saas-6892 [Feature] fx公式函数支持日期类快捷键功能
Change-Id: I7ec472578ed7fdf4c66bb963caa482a7f98ed7b8
2022-09-22 19:09:46 +08:00
jiatianqi
035d1e4b0e amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I8e51158c2612ebed0b18865a7b3cb1844cbceeda
2022-09-22 15:32:13 +08:00
RickCole21
b034c38a29 amis-saas-7095 [Bug] 前端select调用api 预览态返回设计态 接口配置异常
Change-Id: I3c4e62a8e2cf5153da948f466dc064a930b4eadd
2022-09-20 20:19:15 +08:00
RickCole21
a0ea7176d5 amis-saas-7095 [Bug] 前端select调用api 预览态返回设计态 接口配置异常
Change-Id: I13bfda821cc9daedfccee9aa69c5a9bfe89448b1
2022-09-20 19:09:41 +08:00
jiatianqi
e001d3d98c amis-saas-5962 [随机卡片] 发版5.2.0-beta.74
Change-Id: Id487117954891bea2971d47515ee20573ea3b188
2022-09-20 16:35:40 +08:00
jiatianqi
9638625943 Merge "amis-saas-6890 fix: 更改校验触发选项浮层默认位置为top,防止在弹窗下浮层被遮挡" into pre-release 2022-09-20 11:32:05 +08:00
jiatianqi
1367538337 amis-saas-6890 fix: 更改校验触发选项浮层默认位置为top,防止在弹窗下浮层被遮挡
Change-Id: Ic0d46f0f8f71ffc80bf64ad901f137525528a2b4
2022-09-20 11:14:57 +08:00
RickCole21
809c430362 amis-saas-7095 [Bug] 前端select调用api 预览态返回设计态 接口配置异常
Change-Id: Ia87ee8b0f83f9e628dec44e5c24f9f4a65f54f88
2022-09-19 19:53:16 +08:00
jiatianqi
a9af5e1ec8 amis-saas-6890 [研发任务] 「编辑器」文案统一
Change-Id: If7a253552ea432410da0ceb20bccd47425172f78
2022-09-19 19:31:03 +08:00