Commit Graph

1076 Commits

Author SHA1 Message Date
刘丹
dcd310cb45
Merge pull request #7451 from wibetter/master
fix(amis): flex组件/合并flex和flexBasis,并优先使用flexBasis
2023-07-12 14:10:58 +08:00
hsm-lv
f64b9889a4
Merge pull request #7102 from lurunze1226/feat-cb-formula
feat: ConditionBuilder使用公式输入时支持设定输入框类型
2023-07-12 09:22:56 +08:00
wibetter
92d24f9680 fix(amis): flex组件/合并flex和flexBasis,并优先使用flexBasis 2023-07-11 18:08:28 +08:00
殷亮辉
dbef91b952 input-text组件的placeholder属性支持表达式 #7426 判断空值逻辑中也执行filter表达式 2023-07-11 06:57:30 +00:00
殷亮辉
76904e556b Merge branch 'master' of https://github.com/baidu/amis into feat-placeholder-filter 2023-07-11 06:53:53 +00:00
hsm-lv
8cc88d5fa5
Merge pull request #7434 from steedos/feat-input-file-label-filter
input-file组件的btnLabel属性支持表达式 #7433
2023-07-11 11:27:36 +08:00
lvxiaojiao
16c37f3387 Merge branch 'master' into fix-event 2023-07-10 18:44:52 +08:00
hsm-lv
2c32986518
Merge pull request #7436 from allenve/master
fix input-number 前后缀问题
2023-07-10 15:04:39 +08:00
hsm-lv
225fbe4673
Merge pull request #7394 from 2betop/chore-autoGenerateFilterOD
feat: autoGenerateFilter 添加 defaultCollapsed 配置,同时优化搜索框位置有空间时复用表单项那行 …
2023-07-10 14:32:35 +08:00
lvxiaojiao
53170c5418 chore:刷新动作参数调整(默认不传数据) 2023-07-10 14:19:01 +08:00
allenve
707031b2f8 fix input-number 前后缀问题 2023-07-10 14:13:34 +08:00
殷亮辉
423f82b206 input-file组件的btnLabel属性支持表达式 #7433 优化代码 2023-07-10 05:39:58 +00:00
殷亮辉
989c8f243f Merge branch 'master' of https://github.com/baidu/amis into feat-input-file-label-filter 2023-07-10 05:16:23 +00:00
hsm-lv
1b18e477b8
Merge pull request #7361 from lurunze1226/chore-combo-deletebtn-index
chore: Combo组件的deleteBtn数据域透传index
2023-07-10 12:39:22 +08:00
hsm-lv
a67ab2fd68
Merge pull request #7422 from lurunze1226/chore-crud-image-placeholder
chore: CRUD列为Image组件时, placeholder属性无法覆盖兜底图片
2023-07-10 12:36:47 +08:00
hsm-lv
86a20c0624
Merge pull request #7431 from steedos/feat-nav-filter
nav组件下的option下的label属性支持表达式 #7430
2023-07-10 12:35:53 +08:00
殷亮辉
2d87436190 input-file组件的btnLabel属性支持表达式 #7433 2023-07-10 04:06:04 +00:00
hsm-lv
1314d93c30
Merge pull request #7411 from 2betop/crud-reload
fix: 修复crud 中 drawer 动作后不刷新问题   Close: #6903
2023-07-10 11:09:33 +08:00
hsm-lv
2bdfb1a9f8
Merge pull request #7432 from nwind/chore-office-viewer-inited
chore: 进一步避免 office viewer 在 loading 时更新
2023-07-10 10:49:12 +08:00
2betop
6aa16aec50 merge from upstream 2023-07-10 10:45:23 +08:00
hsm-lv
6d2dd47a9f
Merge pull request #7423 from lurunze1226/feat-nested-select-overflow
feat: NestedSelect组件支持最大展示标签数量
2023-07-10 10:38:37 +08:00
2betop
b337c1590d fix: 修复crud 中 drawer 动作后不刷新问题 Close: #6903 2023-07-10 10:37:18 +08:00
Dora
5638927871
feat: checkboxs允许配置全选/不选文案 (#7408)
* perf: checkboxs允许配置全选/不选文案

* perf: checkboxs允许配置全选/不选文案

---------

Co-authored-by: yanglu19 <yanglu19@baidu.com>
2023-07-10 10:36:09 +08:00
qkiroc
51bd288d0a
feat: 整理项目图标 (#7362)
* feat: 整理项目图标

* feat: 整理项目图标

* feat: 整理项目图标, 更新快照

* feat: 整理项目图标, 更新快照

* feat: 整理项目图标, 更新快照

* feat: 整理项目图标, 更新快照

* feat: 整理项目图标, 更新快照

* feat: 整理项目图标, 更新快照

---------

Co-authored-by: qinhaoyan <30946345+qinhaoyan@users.noreply.github.com>
2023-07-10 10:34:42 +08:00
liaoxuezhi
c84644b3bd
fix: 修复crud查询条件中的值回显问题,只回显 query 部分 Close: #7274 (#7418) 2023-07-10 10:32:38 +08:00
liaoxuezhi
2ca764d22c
chore: select 默认的搜索调整相关性参数 (#7420) 2023-07-10 10:32:07 +08:00
hsm-lv
24fb5dfc1e
Merge pull request #7421 from lurunze1226/feat-range-var
feat: InputRange组件min,max,step支持变量
2023-07-10 10:26:11 +08:00
wuduoyi
e6456837f4 chore: 进一步避免 office viewer 在 loading 时更新 2023-07-10 10:24:01 +08:00
Allen
ae20cb77f1
Merge pull request #7416 from allenve/master
fix: input-number 值为0时静态展示问题
2023-07-10 10:01:26 +08:00
殷亮辉
c2a8aee6ef nav组件下的option下的label属性支持表达式 #7430 2023-07-09 15:08:05 +00:00
殷亮辉
223f778dd4 input-text组件的placeholder属性支持表达式 #7426 2023-07-09 03:05:19 +00:00
lurunze1226
95a037fe1e feat: NestedSelect组件支持最大展示标签数量 2023-07-07 19:46:26 +08:00
lurunze1226
885c5f0447 chore: CRUD列为Image组件时, placeholder属性无法覆盖兜底图片 2023-07-07 18:54:13 +08:00
lurunze1226
13d9d6838e feat: InputRange组件min,max,step支持变量 2023-07-07 18:11:03 +08:00
吴多益
b159a650e3
fix: 修复 office-viewer 开启变量后无限渲染问题 (#7414) 2023-07-07 18:08:51 +08:00
allenve
ddde514cc3 fix: input-number 值为0时静态展示问题 2023-07-07 17:35:33 +08:00
xiangwaner
04d5931c08
docs:更新tabs组件文档 (#7417)
Co-authored-by: zhaowenli <zhaowenli@baidu.com>
2023-07-07 17:28:38 +08:00
hsm-lv
04a947da42
Merge pull request #7363 from hsm-lv/chore-action
chore:表单校验和提交动作支持返回结果 Close #6941
2023-07-07 16:44:23 +08:00
hsm-lv
55320461f3
Merge pull request #7415 from allenve/master
feat: inputNubmer formatter优化
2023-07-07 16:26:07 +08:00
lvxiaojiao
7d7ac9a4a1 Merge branch 'master' into chore-action 2023-07-07 16:18:00 +08:00
allenve
db4ef97b82 feat: inputNubmer formatter优化 2023-07-07 15:36:54 +08:00
hsm-lv
fce25b4975
Merge pull request #7395 from nwind/fix-office-viewer-uri
fix: office-viewer 加载错误时显示错误信息
2023-07-07 09:48:55 +08:00
liaoxuezhi
1bc2a5fb13
fix: 修复静态展示设置 style 后展示双份的问题 Close: #7381 (#7383) 2023-07-06 20:18:49 +08:00
liaoxuezhi
97fef6a70a
fix: 修复 jssdk 中 popOver 问题 Close: #7372 (#7382) 2023-07-06 20:17:47 +08:00
liaoxuezhi
c8d36ad8b3
fix: 修复 dropdownbutton 配置 confirmText 弹出来两次的问题 Close: #7378 (#7385) 2023-07-06 20:15:50 +08:00
liaoxuezhi
1a2cb0882e
fix: 修复 accessSuperData 逻辑解决表格中通过非 name 方式无法获取不到上下文数据的问题 Close: #7387 (#7396) 2023-07-06 20:14:56 +08:00
wuduoyi
4da094c70f fix: office-viewer 链接地址时显示错误信息 2023-07-06 16:36:17 +08:00
2betop
a3fdea185d feat: autoGenerateFilter 添加 defaultCollapsed 配置,同时优化搜索框位置有空间时服用表单项那行 Close: #7386 2023-07-06 15:58:53 +08:00
吴多益
61eede4501
fix: 修复 office-viewer 不支持问边框组合问题 (#7376)
* fix: 修复 office-viewer 不支持问边框组合问题

* 修复表格行替换导致内容插入到最后问题

* 优化正则性能
2023-07-06 12:51:34 +08:00
lurunze1226
07dfb3c48a chore: Combo组件的deleteBtn数据域透传index 2023-07-06 12:38:27 +08:00
liaoxuezhi
0537b6cd1e
fix: 修复容忍 null #7275 后导致的自动取对象第一个数组功能异常 (#7353) 2023-07-05 19:05:43 +08:00
hsm-lv
bf46e33ac8
Merge pull request #7343 from 2betop/fix-api-regxp
chore: 优化判断是否是 api 的正则判断
2023-07-05 17:43:32 +08:00
2betop
a6b5da848c chore: 调整ss 2023-07-05 17:39:30 +08:00
2betop
1f22bef018 Merge remote-tracking branch 'baidu/master' into fix-api-regxp 2023-07-05 16:02:25 +08:00
2betop
c636c5e461 chore: 调整 snapshot 比对忽略 aria-labelledby 2023-07-05 15:17:34 +08:00
liaoxuezhi
71c406883a chore: 优化判断是否是 api 的正则判断 2023-07-05 11:53:55 +08:00
hsm-lv
3a2c649a36
Merge pull request #7340 from 2betop/fix-api-outdated
fix: 修复 api 无变量时的地址变化检测问题
2023-07-04 10:36:21 +08:00
廖学之
8c98da691f 默认不要收集覆盖率 2023-07-04 08:46:36 +08:00
lurunze1226
09601df439 bump: amis v3.2.0 2023-07-03 21:39:46 +08:00
lurunze1226
d9a9999a8d feat: ConditionBuilder使用公式输入时支持设定输入框类型 2023-07-03 21:18:51 +08:00
内小子
672bae3702
fix: 解决分页变量表达式不生效问题 (#7338)
Co-authored-by: nabaonan <nabaonan@yunlizhihui.com>
2023-07-03 21:12:37 +08:00
lmaomaoz
2e0e45ee6b
fix: 修复InputNumber 数字输入框 带单位数字 表单设置为静态时会显示数字无效的问题 (#7334)
Co-authored-by: jinye <jinye@baidu.com>
2023-07-03 19:59:56 +08:00
刘丹
d6a9d5ce5c
Merge pull request #7336 from wibetter/master
fix(amis): 更新input-sub-form snapshot
2023-07-03 18:30:07 +08:00
wibetter
2a7601f4ca fix(amis): 更新input-sub-form snapshot 2023-07-03 17:26:09 +08:00
刘丹
153443528b
Merge pull request #7331 from wibetter/master
fix(amis): input-sub-form优先使用input-sub-form
2023-07-03 15:21:19 +08:00
Hsirius
dbc4da2740
fix: 列表选取boolean类型选择错误 (#7328) 2023-07-03 15:02:33 +08:00
wibetter
eff7f8afb9 fix(amis): input-sub-form优先使用input-sub-form 2023-07-03 14:57:01 +08:00
吴多益
0f97e378d9
chore: 换一下 office-viewer 包名 (#7321)
* chore: 换一下 office-viewer 包名

* 恢复误改的文件
2023-07-03 14:31:27 +08:00
liaoxuezhi
10ddff8199
chore: condition-builder 弹窗模式支持 jssdk Close: #7324 (#7329) 2023-07-03 14:20:35 +08:00
吴多益
caea8ec5b4
feat:导出 excel 支持指定行 Closes #2738 (#7316) 2023-07-03 14:19:55 +08:00
zhangzhulei
340bb31d73
feat: collapse-group组件支持change事件 (#7213)
* feat: collapse-group组件支持对外抛出 折叠状态改变 事件

* feat: collapse-group组件支持对外抛出 折叠状态改变 事件

* feat: collapse-group组件支持对外抛出 折叠状态改变 事件

* feat: collapse-group组件支持对外抛出 折叠状态改变 事件

* feat: collapse-group组件支持对外抛出 折叠状态改变 事件

---------

Co-authored-by: zhangzhulei <zhangzhulei@baidu.com>
2023-06-30 13:55:25 +08:00
5se7en
916a170427
feat: conditionBuilder组件增加是否可拖拽字段控制 (#7111)
* feat: conditionBuilder组件增加是否可拖拽字段控制

* 更新用例

---------

Co-authored-by: wangqiang <wangqiang@lattebank.com>
Co-authored-by: liaoxuezhi <2betop.cn@gmail.com>
2023-06-30 11:38:01 +08:00
liaoxuezhi
0f4363f8d1
feat: inputDateTime 支持 isEndDate 配置自动选中 23:59:59 Close: 7277 (#7302) 2023-06-30 11:10:56 +08:00
lvxiaojiao
80243b84db fix:修复确认弹窗自定义内容问题 2023-06-30 09:22:31 +08:00
hsm-lv
ce50db6d25
Merge pull request #7269 from 2betop/fix-affixRow627
chore: 总结行与列显隐切换联动 Close: #7073
2023-06-29 15:48:27 +08:00
hsm-lv
8473def58b
Merge pull request #7289 from 2betop/fix-input-group-validate
fix: 修复 inputGroup 表单项在 service 下时校验问题 Close: #7279
2023-06-29 14:46:31 +08:00
hsm-lv
8266789336
Merge pull request #7298 from 2betop/chore-table-orderby
chore: table 支持自己的排序逻辑并修复 table 嵌套 crud 时排序冲突问题 Close: #6774
2023-06-29 14:45:15 +08:00
hsm-lv
932186e8f0
Merge pull request #7301 from 2betop/fix-page0629
fix: 修复 Page 组件快速切换可能的 warning 报错 Close: #6657
2023-06-29 14:36:55 +08:00
wanglinfang2014
1e13974f57
fix: Nav完善事件动作以及相关文档、展开逻辑以及source重置问题修复 (#7227)
Co-authored-by: wanglinfang <wanglinfang@baidu.com>
2023-06-29 14:09:02 +08:00
Jack Zhuang
db1e5cbacc
DropDownButton 支持配置 amis json 作为下拉内容 #7141 (#7233) 2023-06-29 13:10:16 +08:00
liaoxuezhi
0ceaa0d6be
feat: action 支持 confirmTitle 来设置 confirmText 的弹窗标题 Close: #7200 (#7204) 2023-06-29 13:08:58 +08:00
liaoxuezhi
6707db8a9e
chore: inputText 优化下拉 popvoer 支持在 table 下下拉展示全 Close: #7075 (#7268) 2023-06-29 13:08:07 +08:00
2betop
8600320c29 fix: 修复 Page 组件快速切换可能的 warning 报错 Close: #6657 2023-06-29 11:21:23 +08:00
2betop
b399c030e7 chore: table 支持自己的排序逻辑并修复 table 嵌套 crud 时排序冲突问题 Close: #6774 2023-06-29 10:30:32 +08:00
liaoxuezhi
71c0d6eda9
chore: 接口轮训添加限制, 接口正常返回才轮训 Close: #7260 (#7263) 2023-06-28 18:41:38 +08:00
lvxiaojiao
f3ee4ca702 fix:文档链接错误 2023-06-28 16:42:15 +08:00
2betop
f3c81b7944 fix: 修复 inputGroup 表单项在 service 下时校验问题 Close: #7279 2023-06-28 15:29:45 +08:00
2betop
a3d3244c2e chore: 总结行与列显隐切换联动 Close: #7073 2023-06-27 09:37:42 +08:00
wibetter
0152027bec fix(amis): pageLoaded事件增加props的传递 2023-06-26 17:09:22 +08:00
wibetter
203687827b feat(amis): 日历组件日程内容支持富文本 2023-06-26 16:55:56 +08:00
刘丹
a76ae0431d
Merge pull request #7212 from sqzhou/feat/tabs-title-schema
feat: Tabs组件title支持schema
2023-06-21 11:02:22 +08:00
sqzhou
ee596d4584 feat: 新增tab的tip属性&tab的title为自定义schema时,支持双击编辑 2023-06-20 20:00:50 +08:00
allenve
85d77a73ee feat: crud 导出csv支持自定义文件名 2023-06-20 15:49:22 +08:00
sqzhou
1b09b97d78 feat: Tabs组件title支持schema 2023-06-19 20:14:04 +08:00
sqzhou
f48b88abe1 feat: Tabs组件title支持schema 2023-06-19 19:26:07 +08:00
sqzhou
d70c45f133 feat: Tabs组件title支持schema 2023-06-19 19:25:02 +08:00
sqzhou
489243974d feat: Tabs组件title支持schema 2023-06-19 15:15:42 +08:00
sqzhou
099c9a6ea7 feat: Tabs组件title支持schema 2023-06-19 15:10:09 +08:00
吴多益
d7675012e5
chore: 尝试修复 codecov 不生效问题 (#7207) 2023-06-16 21:46:02 +08:00
hsm-lv
167e2b6b79
Merge pull request #7203 from sqzhou/master
fix: 修复List多选情况下两个全选按钮的问题
2023-06-16 18:23:33 +08:00