Commit Graph

3330 Commits

Author SHA1 Message Date
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
hsm-lv
13fa5e4cbb
Merge pull request #7297 from hsm-lv/chore-event
chore:去掉组件动作调用目标为自身的判断
2023-06-29 14:35:55 +08:00
wanglinfang2014
1e13974f57
fix: Nav完善事件动作以及相关文档、展开逻辑以及source重置问题修复 (#7227)
Co-authored-by: wanglinfang <wanglinfang@baidu.com>
2023-06-29 14:09:02 +08:00
lvxiaojiao
d79e39469b chore:去掉组件动作调用目标为自身的判断&修复事件触发时renderer获取不准确的问题 2023-06-29 13:59:49 +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
Allen
9897d5e1c6
Merge pull request #7292 from allenve/master
fix: disabled 失效问题
2023-06-29 10:36:06 +08:00
2betop
b399c030e7 chore: table 支持自己的排序逻辑并修复 table 嵌套 crud 时排序冲突问题 Close: #6774 2023-06-29 10:30:32 +08:00
allenve
3e3bfdb45d fix: disabled static 失效问题 2023-06-29 10:06:00 +08:00
2betop
4fa2510d29 chore: 调整引用路径 2023-06-29 09:45:43 +08:00
lvxiaojiao
8715924425 chore:去掉组件动作调用目标为自身的判断 2023-06-29 08:56:55 +08:00
sqzhou
cfb6a26ff7
fix: 修复condition-builder的下拉icon和select不统一 (#7295) 2023-06-28 20:53:19 +08:00
liaoxuezhi
8aacd4361e
chore: 调整 dataMapping 中 '&' 特殊 key 的逻辑 始终优先处理 Close: #7247 (#7264) 2023-06-28 19:27:46 +08:00
liaoxuezhi
bc43375b81
fix: 修复 inputTree 改成虚拟滚动后新增节点逻辑错误 Close: #7070 (#7272) 2023-06-28 19:20:01 +08:00
liaoxuezhi
71c0d6eda9
chore: 接口轮训添加限制, 接口正常返回才轮训 Close: #7260 (#7263) 2023-06-28 18:41:38 +08:00
liaoxuezhi
fc4c189f35
feat: app 渲染器页面配置支持 visibleOn Close: #7067 (#7273) 2023-06-28 18:39:25 +08:00
liaoxuezhi
58bb8d6466
chore: crud 的 api 返回容忍返回为空 null Close: #6391 (#7275) 2023-06-28 18:39:00 +08:00
hsm-lv
40c9592c9c
Merge pull request #7291 from hsm-lv/fix-doc
fix:文档链接错误
2023-06-28 18:22:40 +08:00
HongYang
cd064653ca
fix: 修复英文环境下日程展示问题 (#7290)
Co-authored-by: hongyang03 <hongyang03@baidu.com>
2023-06-28 16:44:18 +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
wutong
3da60c91e2
fix: 编辑器添加文档预览组件 (#7284)
Co-authored-by: wutong25 <wutong25@baidu.com>
2023-06-28 12:17:00 +08:00
wutong
84393de36c
Merge pull request #7280 from igrowp/fix-page-params
fix: 事件动作 -> 页面变量列表为空,无法选择 & 勾选框组件默认值配置fx无效
2023-06-27 20:38:31 +08:00
lvxiaojiao
af96202307 chore:去掉表达式编辑器组件没用代码 2023-06-27 20:31:01 +08:00
hsm-lv
9e5dca76ca
Merge pull request #7281 from hsm-lv/feat-formualeditor
feat:表达式编辑器支持变量为函数和表达式&editor导出上下文变量获取方法
2023-06-27 20:28:05 +08:00
lvxiaojiao
259f1cc93c feat:表达式编辑器支持变量为函数和表达式&editor导出上下文变量获取方法 2023-06-27 19:40:53 +08:00
wibetter
35981b0176 fix(amis-editor): 调整theme:common tpl 传参方式 2023-06-27 18:58:57 +08:00
wutong25
cfc41c26f4 fix: 勾选框-属性-默认勾选配置项的fx配置项未生效 2023-06-27 17:51:09 +08:00
wutong25
4ec41cc4ac amis-saas-12716 fix: [事件动作]页面变量列表为空,无法选择 2023-06-27 17:43:51 +08:00
wibetter
d003d648ed fix(amis-editor): 补充国际化语料 2023-06-27 17:04:43 +08:00
wibetter
60cf06bf4f fix(amis-editor): theme:common tpl 增加collapsed配置项 2023-06-27 16:52:31 +08:00
wibetter
a56bfa5594 fix(amis-editor): 修复collapseGroup tpl 可折叠控制项不生效问题 2023-06-27 16:36:05 +08:00
pianruijie
4b793fde2e 逻辑优化 2023-06-27 11:44:14 +08:00
hsm-lv
4beeaca727
Merge pull request #7241 from wibetter/master
feat(amis): 日历组件日程内容支持富文本
2023-06-27 10:52:46 +08:00
2betop
a3d3244c2e chore: 总结行与列显隐切换联动 Close: #7073 2023-06-27 09:37:42 +08:00
lvxiaojiao
0cb5d98ca6 feat:表达式输入框高亮改为源码 2023-06-26 19:16:29 +08:00
wibetter
0152027bec fix(amis): pageLoaded事件增加props的传递 2023-06-26 17:09:22 +08:00
pianruijie
de12234640 fix: 兼容api string格式 2023-06-26 17:00:15 +08:00
wibetter
203687827b feat(amis): 日历组件日程内容支持富文本 2023-06-26 16:55:56 +08:00
lvxiaojiao
b1f5dba3ee feat:dataschema增加typeLabel 2023-06-26 12:57:03 +08:00
kano
c373a25138
fix: button-group-select校验配置&多个button换行 (#7237) 2023-06-26 12:02:07 +08:00
qkiroc
00fbddf524
styles: 优化treeSelection组件样式 (#7256)
Co-authored-by: qinhaoyan <30946345+qinhaoyan@users.noreply.github.com>
2023-06-26 11:19:21 +08:00
hsm-lv
0eac2f5182
Merge pull request #7253 from miaoxinyu01/feat-event-action-stop
feat:【事件动作】发送请求动作,阻断条件支持获取请求结果数据
2023-06-26 11:02:40 +08:00
lmaomaoz
7e33a8933f
fix:去掉editor里api请求适配器里关于api.body的说明,统一使用api.data (#7254)
Co-authored-by: jinye <jinye@baidu.com>
2023-06-25 16:20:11 +08:00
miaoxinyu01
4a2d8b6800
Update index.tsx 2023-06-25 16:01:27 +08:00
miaoxinyu01
18d3db7aed
Update index.tsx 2023-06-25 15:59:47 +08:00
miaoxinyu01
dc6325be3b
Merge branch 'master' into feat-event-action-stop 2023-06-25 15:25:56 +08:00
lvxiaojiao
1a0cfe9008 chore:表达式函数注释微调 2023-06-21 19:53:09 +08:00
hsm-lv
c331b4cec3
Merge pull request #7239 from hsm-lv/fix-formulaeditor
fix:表达式编辑器回显示&非对象数组处理
2023-06-21 17:28:55 +08:00
lvxiaojiao
f38b8bef08 fix:表达式编辑器回显示&非对象数组处理 2023-06-21 16:27:14 +08:00
wibetter
b5f61e699e feat(amis-editor): 表单项增加标签排列方式配置项labelAlign 2023-06-21 16:21:09 +08:00
hsm-lv
15c7d3b9b8
Merge pull request #7228 from CheshireJCat/fix-editor-tag-clear-icon-when-status-change
fix: 修复Editor-Tag 配置面板状态变更时schema中icon未清除的问题
2023-06-21 13:09:05 +08:00
pianruijie
202b9bb5af feat:ajaxAction传参处理 2023-06-21 11:20:51 +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
Allen
9e0cffd756
Merge pull request #7231 from allenve/master
feat: crud 导出csv支持自定义文件名
2023-06-21 10:06:43 +08:00
sqzhou
c0a7b6cec6 feat: 新增tab的tip属性&tab的title为自定义schema时,不支持双击编辑 2023-06-21 09:57:43 +08:00
sqzhou
ee596d4584 feat: 新增tab的tip属性&tab的title为自定义schema时,支持双击编辑 2023-06-20 20:00:50 +08:00
lvxiaojiao
aeaf887f06 fix:表达式编辑器升级增加变量normalize 2023-06-20 17:13:45 +08:00
sqzhou
23a86adc46 feat: 新增tab的tip属性&tab的title为自定义schema时,支持双击编辑 2023-06-20 17:00:25 +08:00
allenve
85d77a73ee feat: crud 导出csv支持自定义文件名 2023-06-20 15:49:22 +08:00
jinye
417a5fa046 fix: 修复Editor-Tag 配置面板状态变更时schema中icon未清除的问题 2023-06-20 13:31:00 +08:00
wutong
dc196fcd68
Merge pull request #7217 from hsm-lv/fix-formulaeditor
fix:表达式编辑器数组高亮&限制数组成员变量操作层级
2023-06-20 10:11:40 +08:00
Allen
e20b52d66e
Merge pull request #7218 from allenve/master
fix: 公式函数参数描述可能不存在的问题
2023-06-20 10:01:58 +08:00
hsm-lv
1f400f1207
Merge pull request #7222 from yinchunyu/bugfix/subEditor
fix: 编辑态下子编辑器不能展示正确数据
2023-06-20 09:58:23 +08:00
yinchunyu
f347184061 fix: 编辑态下子编辑器不能展示正确数据 2023-06-19 20:52:28 +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
allenve
c47a7368eb fix: 公式函数参数描述可能不存在的问题 2023-06-19 18:52:58 +08:00
lvxiaojiao
c141a0617f fix:表达式编辑器数组高亮 2023-06-19 16:53:13 +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
RUNZE LU
c644ef4f19
fix: GET请求中api.data未追加到query中问题 (#7214) 2023-06-19 13:06:12 +08:00
wutong
8bafcb1492
Merge pull request #7209 from CheshireJCat/fix-editor-each-component-when-container-selection-hide-sidebar
fix: 修复循环each组件,配置成员渲染器,选中容器,组件侧边栏隐藏的问题
2023-06-17 18:18:16 +08:00
吴多益
d7675012e5
chore: 尝试修复 codecov 不生效问题 (#7207) 2023-06-16 21:46:02 +08:00
jinye
19c9556950 fix: 修复循环each组件,配置成员渲染器,选中容器,组件侧边栏隐藏的问题 2023-06-16 20:24:07 +08:00
hsm-lv
167e2b6b79
Merge pull request #7203 from sqzhou/master
fix: 修复List多选情况下两个全选按钮的问题
2023-06-16 18:23:33 +08:00
lvxiaojiao
960014955c fix:formulaeditor单测 2023-06-16 18:10:28 +08:00
hsm-lv
0ce97c81f7
Merge pull request #7147 from hsm-lv/feat-formulaeditor
feat:表达式编辑器升级
2023-06-16 18:07:41 +08:00
liaoxuezhi
132761fcf1
fix: 修复 inputFile 的initAutoFill false 功能 Close: #7087 (#7191)
* chore: tpl 初始用同步模版渲染后更新异步模版 Close: #7099

* fix: 修复 inputFile 的initAutoFill false 功能 Close: #7087
2023-06-16 17:49:02 +08:00
hsm-lv
78a81e3d0e
Merge branch 'master' into feat-formulaeditor 2023-06-16 17:31:18 +08:00
sqzhou
08f288b013 fix: 修复List多选情况下两个全选按钮的问题 2023-06-16 16:32:21 +08:00
2betop
ff8051fb0f feat: crud filter 支持深层数组的清除 Close: #7083 2023-06-16 16:05:20 +08:00
hsm-lv
a97dfe234d
Merge pull request #7189 from lurunze1226/editor-formula-hook
chore(amis-editor): TplFormulaControl补充onFormulaEditorOpen
2023-06-16 13:48:25 +08:00
hsm-lv
dfadfed174
Merge pull request #7193 from joelost/feat-inputimage-renderer
fix: 传图多选,joinValues为false的时候,render死循环问题修复
2023-06-16 13:46:43 +08:00
hsm-lv
321e66347c
Merge pull request #7182 from lurunze1226/chore-jsonql-req
chore: JSONQL请求支持追加 data 中的变量到 query 中
2023-06-16 13:46:09 +08:00
hsm-lv
7dc984b463
Merge pull request #7187 from lurunze1226/editor-sharedcontext
chore(amis-editor): EditorNode中info支持设置sharedContext; fix: InputTable…
2023-06-16 13:43:25 +08:00
RUNZE LU
ff0514e8d4
chore: Table2排序属性名称变更order => orderDir (#7188) 2023-06-16 13:35:57 +08:00
liaoxuezhi
a3802d8327
chore: 补充 picker 值右侧删除按钮不触发 change 事件问题 Close: #7084 (#7197)
* chore: tpl 初始用同步模版渲染后更新异步模版 Close: #7099

* chore: 补充 picker 值右侧删除按钮不触发 change 事件问题 Close: #7084
2023-06-16 13:30:49 +08:00
hsm-lv
3181488c92
Merge pull request #7183 from lurunze1226/styles-editor-featcontrol
styles(amis-editor): FeatControl样式优化
2023-06-16 13:29:48 +08:00
hsm-lv
115a956d24
Merge pull request #7158 from 2betop/chore-fieldset
chore: fieldset 没有配置 title 时不要输出相关 dom
2023-06-16 13:28:38 +08:00
hsm-lv
8b48d3b7b3
Merge pull request #7169 from 2betop/feat-trackExpression
feat: 数据域组件扩充 trackExpression 属性用于显式的设置跟踪上层数据变化 Close: #7152
2023-06-16 13:23:29 +08:00
hsm-lv
5037c0bfda
Merge pull request #7174 from 2betop/fix-select-tree-mode
fix: 修复 select 的 tree 模式点击搜索结果无效果问题 Close: #7173
2023-06-16 13:19:16 +08:00
hsm-lv
320108817e
Merge pull request #7175 from 2betop/fix-table-affixedHeader
fix: 修复二级弹窗表格表头固顶位置不正确问题 Close: baidu#7153
2023-06-16 13:18:47 +08:00
hsm-lv
15f8c88467
Merge pull request #7177 from 2betop/chore-affixrow-prefixrow
chore: affixRow 和 prefixRow 支持跟列固定搭配使用 Close: #7131
2023-06-16 13:17:42 +08:00
hsm-lv
c07951b123
Merge pull request #7181 from 2betop/feat-crud-filter-togglable
feat: CRUD 的 filterTogglable 支持配置文案和图标 Close: #7089
2023-06-16 13:17:00 +08:00
2betop
8956591323 应该是缺少 id 导致的 2023-06-15 19:17:47 +08:00
lvxiaojiao
2407e009bf feat:表达式编辑器升级 2023-06-15 17:40:36 +08:00
allenve
e7c63bf4ab feat: tabs 配置面板优化 2023-06-15 16:44:38 +08:00
2betop
ef3b3c6314 fix: 修复二级弹窗表格表头固顶位置不正确问题 Close: #7153 2023-06-15 16:23:29 +08:00
hsm-lv
26faa2630c
Merge pull request #7186 from allenve/master
feat: input-number 支持根据精度设置展示长度
2023-06-15 16:10:34 +08:00
joelost
2a146fcec4 feat: 传图多选,joinValues为false的时候,render死循环问题修 2023-06-15 15:24:57 +08:00
allenve
8d7c63d3f8 feat: input-number 支持根据精度设置展示长度 2023-06-15 14:00:48 +08:00
lurunze1226
11bd2e38db chore(amis-editor): TplFormulaControl补充onFormulaEditorOpen 2023-06-15 13:01:24 +08:00
RUNZE LU
f9fa66e526
chore(amis-editor): Plugin增加ID静态属性, 支持注册时基于ID去重 (#7101) 2023-06-15 12:48:28 +08:00
lurunze1226
37510c710b chore(amis-editor): EditorNode中info支持设置sharedContext; fix: InputTable & Combo获取上下文错误 2023-06-15 12:46:36 +08:00
lurunze1226
c9f5ae11e1 styles(amis-editor): FeatControl样式优化 2023-06-15 11:48:04 +08:00
吴多益
a4f877587c
chore: ios 的 DragEvent 报错修复挪到 core 模块下 (#7154)
* chore: ios 的 DragEvent 报错修复挪到主项目中

* chore: ios 的 DragEvent 报错修复挪到 core 模块下
2023-06-15 11:36:29 +08:00
lurunze1226
8a62aa7d7d chore: JSONQL请求支持追加 data 中的变量到 query 中 2023-06-15 11:14:30 +08:00
2betop
5881ca2ee5 feat: CRUD 的 filterTogglable 支持配置文案和图标 Close: #7089 2023-06-15 10:19:47 +08:00
2betop
d02e113413 chore: affixRow 和 prefixRow 支持跟列固定搭配使用 Close: #7131 2023-06-15 09:22:38 +08:00
2betop
66d674906c fix: 修复 select 的 tree 模式点击搜索结果无效果问题 Close: #7173 2023-06-14 20:10:13 +08:00
2betop
fc33a00e73 feat: 数据域组件扩充 trackExpression 属性用于显式的设置跟踪上层数据变化 Close: #7152 2023-06-14 17:25:10 +08:00
wutong
85810fea45
Merge pull request #7165 from igrowp/fix-style
Fix: 配置面板字体调整 & CRUD列支持fx
2023-06-14 15:44:25 +08:00
wutong25
c416f4aeb5 fix:「表达式」CRUD列支持fx 2023-06-14 14:22:16 +08:00
wutong25
9a52635e87 fix: 配置面板字体调整 2023-06-14 14:19:05 +08:00
lvxiaojiao
b9e09e0528 fix:表单视图中动作配置面板报错问题 2023-06-14 14:18:29 +08:00
zhangxulong
cc2b63d227 fix: 移动端表单行内样式调整 2023-06-13 19:42:42 +08:00
2betop
6b4bce35c0 chore: fieldset 没有配置 title 时不要输出相关 dom 2023-06-13 19:08:01 +08:00
ls
bfcfab6fa5
Merge branch 'baidu:master' into master 2023-06-13 17:50:20 +08:00
zhangxulong
1779966f85 fix: 调整class 2023-06-13 17:26:54 +08:00
zhangxulong
169669320d fix: 修改TouchEvent 2023-06-13 17:16:57 +08:00
zhangxulong
321c188758 fix: 移动端表单项错误提示、description 样式调整 2023-06-13 17:13:29 +08:00
lvxiaojiao
96a9b272e0 fix:input-table构建dataschema报错问题 2023-06-13 16:36:08 +08:00
hsm-lv
e046cfc423
Merge pull request #7155 from z1769057083/master
fix:sdk中popup失效
2023-06-13 15:58:11 +08:00
zhangxulong
6d25b11b21 fix:sdk中popup失效 2023-06-13 15:11:25 +08:00
hsm-lv
6e330227b0
fix:修复动作配置面板切换动作选中失效问题 (#7148) 2023-06-12 20:52:23 +08:00
qkiroc
c461898c1e
styles: 修复select组件全选样式错乱问题 (#7086)
Co-authored-by: qinhaoyan <30946345+qinhaoyan@users.noreply.github.com>
2023-06-12 19:05:14 +08:00
qkiroc
5788d3c031
styles: 优化combo组件删除按钮提示浮层的位置 (#7144)
Co-authored-by: qinhaoyan <30946345+qinhaoyan@users.noreply.github.com>
2023-06-12 18:51:43 +08:00
qkiroc
d3b2006d64
styles: 修复input-color组件样式问题 (#7145)
Co-authored-by: qinhaoyan <30946345+qinhaoyan@users.noreply.github.com>
2023-06-12 18:50:46 +08:00
刘丹
d4442e917c
Merge pull request #7143 from z1769057083/master
fix: 移动端人员选择
2023-06-12 17:57:55 +08:00
ls
70626bd0f4
Update UserSelect.tsx 2023-06-12 16:43:33 +08:00
zhangxulong
4f0642f120 fix: 移动端人员选择 2023-06-12 16:41:57 +08:00
wutong
f37359593f
Merge pull request #7135 from yinchunyu/feat-nav-height
feat: nav组件增加最小高度
2023-06-12 15:46:46 +08:00
zhangxulong
83d847b90b fix: 移动端人员选择 2023-06-12 15:42:54 +08:00
wutong
f05e361bd8
Merge pull request #7136 from igrowp/fix-lexer
fix: text文本框下默认值不支持不加空格的“-”减法运算
2023-06-12 14:45:42 +08:00
hsm-lv
2233551dbe
Merge pull request #7129 from allenve/master
feat: tabs source支持动态hash key 配置
2023-06-12 14:25:41 +08:00
wutong25
6febae76df fix: text文本框下默认值不支持不加空格的“-”减法运算 2023-06-12 14:14:12 +08:00
zhangxulong
ddcc7bfca5 fix:移动端人员选择 2023-06-12 14:08:21 +08:00
sqzhou
75952bd558
feat: condition-builder支持selectMode为chained的选项层级显示 (#7120)
* feat: condition-builder支持selectMode为chained的选项层级显示
2023-06-12 12:58:22 +08:00
wutong25
3552983f74 fix: 单选框/复选框/checkbox绑定参照录入后,预览没有效果 2023-06-12 11:32:33 +08:00
allenve
b7b700be4f feat: tabs source支持动态hash key 配置 2023-06-12 11:27:47 +08:00
yinchunyu
c6a42f14f5 feat: nav组件增加最小高度 2023-06-12 11:23:25 +08:00
刘丹
125d860c2b
Merge pull request #7130 from wibetter/master
fix(amis-editor): 补充国际化语料,并发布5.4.1
2023-06-09 17:43:29 +08:00
wibetter
47d7868154 fix(amis-editor): 补充国际化语料,并发布5.4.1 2023-06-09 16:29:06 +08:00
wutong
10a727cab2
Merge pull request #7128 from igrowp/fix-date-range-panel
fix: inputDateRange 快捷键选择上周时,配置面板报错
2023-06-09 16:15:52 +08:00
wutong25
2e203ed786 fix: inputDateRange 快捷键选择上周时,配置面板报错 2023-06-09 15:27:20 +08:00