Commit Graph

10914 Commits

Author SHA1 Message Date
qinhaoyan
170b9b16f3 Merge remote-tracking branch 'amis-editor-core/theme/editor-20230201' into editor-style 2023-04-10 19:33:10 +08:00
qinhaoyan
06437eecfa Merge remote-tracking branch 'amis-editor/theme/editor-20230201' into editor-style 2023-04-10 19:18:48 +08:00
qkiroc
7cef012d57
Merge pull request #6564 from qkiroc/fix/inputnumber-ts-error
fix: 修复number组件ts报错
2023-04-10 14:41:48 +08:00
qinhaoyan
bc935c9325 chore: 补充number组件state声明 2023-04-10 14:16:47 +08:00
qinhaoyan
73fb2367d8 fix: 修复number组件ts报错 2023-04-10 14:12:47 +08:00
qinhaoyan
7b06f729af fix: 修复number组件ts报错 2023-04-10 13:11:27 +08:00
qkiroc
021c8b036a
Merge pull request #6562 from hy993658052/theme-0224-final-2
feat: 主题配置合并master
2023-04-10 11:38:49 +08:00
liaoxuezhi
008100fc94
fix: 修复 ooxml-viewer 包中 tslib 引用地址错误 (#6560)
* fix: 修复 ooxml-viewer 包中 tslib 引用地址错误

* fix: 修复 ooxml-viewer 包中 tslib 引用地址错误
2023-04-10 11:17:14 +08:00
HongYang
dd8906b80a fix: 自定义列样式修复 (#6535)
Co-authored-by: hongyang03 <hongyang03@baidu.com>
2023-04-10 11:04:01 +08:00
zzy1415447829
202696b867 Theme 0224 optmize (#6534)
* feature:[amis-saas-10368]向导组件样式

* feature:[amis-saas-10190]优化标签组件

---------

Co-authored-by: zhangzheyu02 <zhangzheyu02@baidu.com>
2023-04-10 11:04:01 +08:00
zzy1415447829
68785165e5 feature:[amis-saas-10368]向导组件样式 (#6532)
Co-authored-by: zhangzheyu02 <zhangzheyu02@baidu.com>
2023-04-10 11:04:01 +08:00
HongYang
67e196793a feat: table2&combo主题配置 (#6523)
* feat: table2主题适配

* feat: combo组件主题适配

* feat: table2增加图标和自定义列主题配置

---------

Co-authored-by: hongyang03 <hongyang03@baidu.com>
2023-04-10 11:04:01 +08:00
徐佳豪
467259286d style: progress主题样式修复 (#6515)
* style: progress主题样式修复

* 空白修改

---------

Co-authored-by: xujiahao01 <xujiahao01@baidu.com>
2023-04-10 11:04:01 +08:00
qiaoganggang
d7b95c6edc feat:picker接入主题 (#6497)
* feat: m

* feat: spinner删除propriety中css变量

* feat: 修改spinner变量

* feat: 删除多余代码

* fix: spinner css变量修改

* fix: spinner

* feat: toast接入主题

* feat: 去掉多余代码

* feat:timeline接入主题

* feat: 删除多余代码

* feat: 修改title margin

* feat: pick接入主题

---------

Co-authored-by: qiaoganggang <qiaoganggang@baidu.com>
2023-04-10 11:04:01 +08:00
徐佳豪
1620c6eb97 feat: icon-select组件 上传回调 (#6471)
* feat: icon-select组件 上传回调

* icon-select组件修改

* 自定义上传图标 回显

* 重新触发test

---------

Co-authored-by: xujiahao01 <xujiahao01@baidu.com>
2023-04-10 11:04:01 +08:00
HongYang
b6e5fd556f feat: 富文本&条件组合组件主题适配 (#6475)
Co-authored-by: hongyang03 <hongyang03@baidu.com>
2023-04-10 11:04:01 +08:00
qinhaoyan
8dcbfb5fc9 styles: 导出style 2023-04-10 11:04:01 +08:00
徐佳豪
33526bdd3d style: progress & image & images组件主题变量替换 (#6446)
Co-authored-by: xujiahao01 <xujiahao01@baidu.com>
2023-04-10 11:04:01 +08:00
qiaoganggang
0d9a512d55 feat:timeline接入主题 (#6441)
* feat: m

* feat: spinner删除propriety中css变量

* feat: 修改spinner变量

* feat: 删除多余代码

* fix: spinner css变量修改

* fix: spinner

* feat: toast接入主题

* feat: 去掉多余代码

* feat:timeline接入主题

* feat: 删除多余代码

* feat: 修改title margin

---------

Co-authored-by: qiaoganggang <qiaoganggang@baidu.com>
2023-04-10 11:04:01 +08:00
HongYang
266e72e9cc feat: transfer&inputTag&fieldset主题适配 (#6429)
* feat: 穿梭框主题修改

* feat: 标签选择器inputTag主题适配

* feat: 字段集fieldset主题适配

---------

Co-authored-by: hongyang03 <hongyang03@baidu.com>
2023-04-10 11:04:01 +08:00
qinhaoyan
4b2635abbc theme: 优化 2023-04-10 11:04:01 +08:00
zzy1415447829
89fbbff6bb faeture:[amis-saas-10191]status状态主题组件开发 (#6385)
* faeture:[amis-saas-10190]主题组件TAG开发

* faeture:[amis-saas-10190]主题组件TAG开发

* faeture:[amis-saas-10190]修改生成tag字段大小写

* faeture:[amis-saas-10190]修改tag配置

* faeture:[amis-saas-10191]status状态主题组件开发

---------

Co-authored-by: zhangzheyu02 <zhangzheyu02@baidu.com>
2023-04-10 11:04:01 +08:00
qinhaoyan
456f824eff theme: 主题改造 2023-04-10 11:04:01 +08:00
qiaoganggang
5c0758a388 feat: toast主题组件 (#6380)
* feat: m

* feat: spinner删除propriety中css变量

* feat: 修改spinner变量

* feat: 删除多余代码

* fix: spinner css变量修改

* fix: spinner

* feat: toast接入主题

* feat: 去掉多余代码

---------

Co-authored-by: qiaoganggang <qiaoganggang@baidu.com>
2023-04-10 11:03:58 +08:00
zzy1415447829
ef32b32c09 faeture:[amis-saas-10190]主题组件TAG开发 (#6344)
* faeture:[amis-saas-10190]主题组件TAG开发

* faeture:[amis-saas-10190]主题组件TAG开发

* faeture:[amis-saas-10190]修改生成tag字段大小写

* faeture:[amis-saas-10190]修改tag配置

---------

Co-authored-by: zhangzheyu02 <zhangzheyu02@baidu.com>
2023-04-10 11:03:29 +08:00
徐佳豪
72a0a571e8 feat: icon-select 上传图标 (#6339)
* feat: icon-select 上传图标

* feat: icon-select 自定义schema

* style:tpl组件变量去除

* 去掉无效内容

---------

Co-authored-by: xujiahao01 <xujiahao01@baidu.com>
2023-04-10 11:03:29 +08:00
qiaoganggang
d27c0d04fc feat: spinner组件接入主题 (#6340)
* feat: m

* feat: spinner删除propriety中css变量

* feat: 修改spinner变量

* feat: 删除多余代码

* fix: spinner css变量修改

* fix: spinner

---------

Co-authored-by: qiaoganggang <qiaoganggang@baidu.com>
2023-04-10 11:03:29 +08:00
HongYang
617bf790db feat: steps&alert组件主题适配 (#6323)
* feat: steps组件主题适配

* feat: alert提示组件主题适配

* fix: 修复代码

* feat: steps支持简单模式

---------

Co-authored-by: hongyang03 <hongyang03@baidu.com>
2023-04-10 11:03:26 +08:00
徐佳豪
3c6fbb7b9a style: Drawer抽屉 组件变量配置 & 迁移 (#6331)
Co-authored-by: xujiahao01 <xujiahao01@baidu.com>
2023-04-10 11:02:35 +08:00
徐佳豪
785ce176d7 style: Dialog 对话框组件变量配置化 (#6324)
* style: Dialog 对话框组件变量配置化

* style: 迁移Dialog对话框组件变量properties.scss=>component.scss

---------

Co-authored-by: xujiahao01 <xujiahao01@baidu.com>
2023-04-10 11:02:35 +08:00
徐佳豪
77a9817b52 style:inputTree树形选择框组件变量 (#6307)
Co-authored-by: xujiahao01 <xujiahao01@baidu.com>
2023-04-10 11:02:35 +08:00
HongYang
b61971eb3e feat:页面编辑器值继承 (#6274)
Co-authored-by: hongyang03 <hongyang03@baidu.com>
2023-04-10 11:02:35 +08:00
徐佳豪
b717d60be9 style:Tpl文字组件 组件自定义样式 (#6250)
Co-authored-by: xujiahao01 <xujiahao01@baidu.com>
2023-04-10 11:02:35 +08:00
qkiroc
e52ef10902
styles: 修复input组件没居中问题 (#6548)
Co-authored-by: qinhaoyan <30946345+qinhaoyan@users.noreply.github.com>
2023-04-07 17:01:19 +08:00
徐佳豪
6e3f6e2e19
style:checkbox 文本溢出时顶部对齐 (#6549)
Co-authored-by: xujiahao01 <xujiahao01@baidu.com>
2023-04-07 17:00:31 +08:00
lmaomaoz
c40b29dd2d
fix: 修复options选项hidden为true时无效的问题 (#6556)
Co-authored-by: jinye <jinye@baidu.com>
2023-04-07 16:58:27 +08:00
liaoxuezhi
17339d24ef
chore: combo 扩充 subFormHorizontal 属性支持 (#6544) 2023-04-07 16:56:11 +08:00
lmaomaoz
d4c931cb85
feat: 表单项校验变更为顺序校验模式 (#6553)
* feat:
    表单项校验不再校验全部规则,改为顺序校验模式;
    自定义校验 addRule 增加灵活展示错误信息特性。

* doc: 表单项校验不再校验全部规则,改为顺序校验模式

* doc: 自定义校验 addRule 增加灵活展示错误信息特性

* test: 表单验证规则改为顺序校验,不再全部校验,测试用例变更

---------

Co-authored-by: jinye <jinye@baidu.com>
2023-04-07 13:17:56 +08:00
lmaomaoz
5b0171032a
fix: 修复number render对于suffix的兼容 (#6537)
* fix:修复number render对于suffix的兼容

* fix: 去掉冗余逻辑,此逻辑已在StaticHoc中处理

---------

Co-authored-by: jinye <jinye@baidu.com>
2023-04-07 13:17:20 +08:00
hsm-lv
e42a68f360
Merge pull request #6551 from hsm-lv/fix-action
fix:事件动作支持获取crud批量操作ids
2023-04-06 21:14:00 +08:00
lvxiaojiao
f1523fd206 fix:事件动作支持获取crud批量操作ids&参数补充 2023-04-06 20:45:03 +08:00
lvxiaojiao
f720fc5342 fix:事件动作支持获取crud批量操作ids 2023-04-06 20:39:53 +08:00
hsm-lv
c9127bf324
Merge pull request #6550 from hsm-lv/fix-action
fix:编辑态弹窗问题
2023-04-06 20:13:26 +08:00
lvxiaojiao
27f81d6aab fix:编辑态弹窗问题 2023-04-06 19:27:03 +08:00
lmaomaoz
655d8c70a6
fix:完善Overlay弹层自动计算位置的兜底逻辑 (#6547)
Co-authored-by: jinye <jinye@baidu.com>
2023-04-06 18:08:47 +08:00
刘丹
f61e652c8d
Merge pull request #6540 from wibetter/fix-amis-editor
feat(amis-editor): 排列方向、水平对齐方式、垂直对齐方式配置项合并和配置交互优化
2023-04-06 12:51:42 +08:00
wibetter
091672dc93 fix(amis-editor): 弹性布局设置icon和提示文案根据当前排列方向进行联动 2023-04-06 11:33:12 +08:00
吴多益
660a7edaba
chore: pull_request_template.md 2023-04-04 15:00:48 +08:00
刘丹
e9f00132dd
Merge pull request #6527 from qkiroc/chore/editor-publish-shell
chore: 更新editor内网发布脚本
2023-04-04 12:07:32 +08:00
wibetter
0813818626 fix(amis-editor): 弹性布局设置配置项优化 2023-04-04 11:21:37 +08:00