Commit Graph

628 Commits

Author SHA1 Message Date
wibetter
23e62028d7 fix(amis-saas-9516): 细节调整
Change-Id: I8b6fab6fa23c3c3dd95f9e2a873de19176468978
2023-02-06 20:11:44 +08:00
wibetter
bff5fbcc70 feat(amis-saas-9517): 布局容器宽高可拖拽时支持按住边框进行拖拽
Change-Id: Ia0d42341aaf5c2d840330aa635c218abd1873527
2023-02-06 19:38:20 +08:00
wibetter
f53a5281ed fix(amis-saas-9516): 布局容器、自由容器宽高拖拽提示样式优化
Change-Id: I7ba66dd2c5108174756b14933da035e421b43396
2023-02-06 18:00:08 +08:00
2betop
d35b1633ab amis-saas-7740 esm 模块优化
Change-Id: Iace4a847eac3da8b26c20fc39ac3f9a594162c2f
2023-02-06 15:58:43 +08:00
wangyuzhen01
dac4f2b021 amis-saas-8146 1. editor-core 中 factory 和 manager 的 env 中去除 replaceText
Change-Id: Id2016dbe9ce69939fa2d59240411b654f7bcd2f5
2023-02-06 10:11:41 +08:00
igrowp
763d339ee0 amis-saas-9486 feat: 事件动作-变量赋值支持修改页面变量
Change-Id: Iac32cbf05244cd7414d3b39ae5be75f519ef37fc
2023-02-03 11:19:27 +08:00
wibetter
aeecfb6792 feat(amis-saas-9438): 自由容器和特殊布局元素拖拽交互优化,支持点住任何位置进行拖拽调整位置
Change-Id: I73cf2187c5496ce0c1eada7ddfdef18707467078
2023-02-02 15:40:23 +08:00
wibetter
42a62ded44 feat(amis-saas-9364): 优化容器和包裹的内部对齐方式配置项显示条件
Change-Id: Ied4fa9208013e3dccad17611df2883278757c4ec
2023-02-02 14:39:48 +08:00
wibetter
f16b03704c feat(amis-saas-9364): 细节优化
Change-Id: Ic466ce0a2ab360243bc0fe1da0f43f1352aae6a9
2023-02-02 11:40:03 +08:00
liudan21
6b59cae743 Merge changes Id4b83bbe,Ic7dd5945,I93fb4643,Id7fe94a3,If20a873d, ... into pre-release
* changes:
  feat(amis-saas-9364): 布局相关容器组件设置固定宽高后支持宽高可拖拽调整
  fix(amis-saas-9352): 容器和包裹增加内部对齐方式配置项
  fix(amis-saas-9353): 容器增加默认内边距配置项
  fix(amis-saas-9408): 自由容器内元素不限制拖拽区域
  fix(amis-saas-9408): 细节调整
  fix(amis-saas-9322): 自由容器拖拽交互优化
  fix(amis-saas-9362): 选中自由容器的直接子元素时,自由容器也高亮(虚线)
2023-02-01 17:08:45 +08:00
wibetter
7d0d29de84 feat(amis-saas-9364): 布局相关容器组件设置固定宽高后支持宽高可拖拽调整
Change-Id: Id4b83bbef0d3cbd390efe0fc8dc6161dd37ade35
2023-02-01 16:30:48 +08:00
wibetter
0ae93d2e5d fix(amis-saas-9408): 自由容器内元素不限制拖拽区域
Change-Id: Id7fe94a32d64c27b97c24d031a077b080cbbe31e
2023-01-31 19:53:00 +08:00
wibetter
1708dbd993 fix(amis-saas-9408): 细节调整
Change-Id: If20a873df47eb19c3fbe168559d477e8d9d2800c
2023-01-31 19:09:19 +08:00
wibetter
9e7cdb23e5 fix(amis-saas-9322): 自由容器拖拽交互优化
Change-Id: Ifdb7a82a5fb9e86e62ac71c83843667c68345350
2023-01-31 17:45:44 +08:00
lurunze1226
862caddc43 amis-saas-5996 merge: master branch
Change-Id: I8f7ea112d31c810a94138f16de112322faa7761d
2023-01-31 17:45:29 +08:00
wibetter
89fc5f133a fix(amis-saas-9362): 选中自由容器的直接子元素时,自由容器也高亮(虚线)
Change-Id: I1a9f4bc8cf61d673de4fe311d9842594162c715f
2023-01-31 17:28:33 +08:00
lurunze1226
f4ec1c5656 amis-saas-5996 feat: 组件变量&应用变量合并为变量赋值动作
Change-Id: I8d946f3336199055ac82143981beb0ca3c538348
2023-01-31 16:01:55 +08:00
pianruijie
6448849f6a [amis-saas-9393] && [amis-saas-8983]
Change-Id: I07fd4ad58eec3905a0b1f28795d07bae7038460c
2023-01-31 11:56:00 +08:00
lvxiaojiao
30a7128ad2 Merge "[amis-saas-9200]:选择组件优化" into pre-release 2023-01-30 10:13:26 +08:00
hsm-lv
f5103f6f30 [amis-saas-9200]:选择组件优化
Change-Id: I1b429c3582fab79fb914169835287a91333b1953
2023-01-30 10:10:11 +08:00
wangyuzhen01
509bcdc6de amis-saas-8146 1. 子编辑器 subEditor 不再重复设置 editorStore; 2. 增加 ListItem 和 ButtonToolbar 属性国际化
Change-Id: I724fcd3569afc57a8fbf010a1a366c998ce1aeeb
2023-01-29 09:33:02 +08:00
wangyuzhen01
2cc849e55c amis-saas-8146 1. 更改 i18nEnabled 的获取方式
Change-Id: Ie1c65b3e42054abf3522cd5101513288cc82507d
2023-01-17 17:56:53 +08:00
wibetter
7e217688a6 fix(amis-saas-9359): 自由容器和page边栏、内容区增加填充占位样式
Change-Id: I40a615d75b957a64d4fe7e9fdc53548758b32d4a
2023-01-17 11:39:56 +08:00
wibetter
8c0d95e262 fix(amis-saas-9324): 优先使用body作为插入子元素的位置
Change-Id: Ib8ba3dc186c7e3c14b4a274c1de8557ba0063caa
2023-01-17 10:23:26 +08:00
wibetter
85529fc6b4 fix(amis-saas-9318): 同步master分支最新代码
Change-Id: I6fff20f41f718beb00df57fcb8db136beb170bc6
2023-01-16 17:03:36 +08:00
liudan21
db55a1f6a0 Merge "fix(amis-saas-9318): 内网发版脚本支持amis-postcss替换" 2023-01-16 16:10:35 +08:00
wibetter
aece20c185 fix(amis-saas-9318): 内网发版脚本支持amis-postcss替换
Change-Id: I99a3d01a04a285fb7f49a188ca08a75fcd59ac7e
2023-01-16 16:09:29 +08:00
pianruijie
ac1f9481a6 [amis-saas-9350] 弹窗内容配置面板支持saas扩展的动作
Change-Id: I952717518667725cc40d531795f405e6123126a7
2023-01-16 15:30:20 +08:00
wibetter
6766e4513b fix(amis-saas-9318): 完善发版脚本
Change-Id: I6608f6631e085cb530b8a58d2473ab8ff32ebc79
2023-01-16 15:25:39 +08:00
wibetter
fa2854f28b fix(amis-saas-9318): 补充国际化预料
Change-Id: I79fcb566e40d946c3e60c951df0fd8c301ba2b97
2023-01-16 15:00:58 +08:00
wibetter
963f49583d fix(amis-saas-9320): page取消选中后默认以根节点收集面板数据,避免左侧组件物料面板为空
Change-Id: I9343d4e1c54c348c3601af1534c286db36f50054
2023-01-16 14:15:57 +08:00
wangyuzhen01
e89c93f205 amis-saas-8146 1. 编辑器 plugin 配置属性补齐国际化
Change-Id: Ic68432c757034dc9cb8f8508b68e36485df4d300
2023-01-15 21:11:34 +08:00
jinye
1b8a1a8dd1 amis-saas-9193 [Feature] 新拖放组件内置的tpl类型默认从富文本改为普通文本
Change-Id: I2839b0aa510909f4c33f987149daac7bd30dbf45
2023-01-11 21:17:16 +08:00
wibetter
1a713bedfd fix(amis-saas-2815): 发一个正式版本 5.2.3
Change-Id: I264cff733600005b150517c3708109c8b048409e
2023-01-11 18:04:20 +08:00
wibetter
d9aa6dc6b7 Merge branch 'pre-release'
Change-Id: Ib6483d1fddceb01ac2e72e2e67b31c540c94522e
2023-01-11 18:02:12 +08:00
qkiroc
d6afd4812a amis-saas-7517 阴影组件bugfix
Change-Id: I595bddfb9519d404d771b86eb12f274b0c97e5dc
2023-01-11 16:09:59 +08:00
wibetter
2c75fc57d2 fix(amis-saas-9257): 增加点注释
Change-Id: Ia3a54f76fcfec1734551c59e0d682dad995cca2a
2023-01-10 18:28:36 +08:00
wibetter
4cb6cbf236 fix(amis-saas-9257): 修复快速构建修改配置未更新问题
Change-Id: I919169c2e90f71e459dbd41c55ad6615f33a5663
2023-01-10 18:25:07 +08:00
yinchunyu
d90c41cd19 [amis-saas-7732] 复制元素自动删除id
Change-Id: I65eb2e8137ad574e26e539e2badb7b3b9ce7ef08
2023-01-09 19:29:53 +08:00
wangyuzhen01
de935ad32c amis-saas-8146 1. subEditor 透传 amisEnv; 2. 修复重名 schemaTpl
Change-Id: Ie42a07b6b208121acc99d7a7e9f5a65c86086e03
2023-01-06 15:49:36 +08:00
wibetter
d82f7edea9 fix(amis-saas-2815): 调整版本号,保持一致
Change-Id: If02cb9f56bdd9d59a2e78542846bba2837227828
2023-01-06 14:03:14 +08:00
wibetter
ae812e24ea fix(amis-saas-2815): 处理代码冲突
Change-Id: I305b32db2a59b31c4b508c1df829e9a893c90031
2023-01-06 14:01:11 +08:00
wibetter
ec0fba81ff fix(amis-saas-2815): 修复表格视图渲染报错问题
Change-Id: I8f127624ac0daca6e803416b898cbeea5010b1c6
2023-01-06 13:55:23 +08:00
wutong25
9771354613 Merge "amis-saas-8885 Merge remote-tracking branch 'origin/feat-optimize-6' into pre-release" into pre-release 2023-01-05 22:54:58 +08:00
qkiroc
48d3635a3e amis-saas-7517 merge
Change-Id: I258dfda0e134d82a16432cfaffe5de804b64d6c1
2023-01-05 22:49:22 +08:00
igrowp
dddaa0b6d3 amis-saas-8885 Merge remote-tracking branch 'origin/feat-optimize-6' into pre-release
Change-Id: I9d5ebc1cc2fe7a612cc77b6c4bde192422d99c08
2023-01-05 22:25:42 +08:00
wangyuzhen01
cd97fbad50 amis-saas-8146 子编辑器去除 replaceText
Change-Id: Ibc7f4f86ba8e2b94945c3e7f876fb59202d11d96
2023-01-05 19:22:53 +08:00
wibetter
bacbaf4280 fix(amis-saas-2815): 优化JsonGenerateID方法,兼容Frozen对象
Change-Id: Id9356aebc2818aa7229004fb1708e9a73556c432
2023-01-05 11:24:21 +08:00
wibetter
bd3ab91cf7 Merge branch 'pre-release' of ssh://icode.baidu.com:8235/baidu/amis/editor into pre-release
Change-Id: I542dec75704a557685a112c84a9f219678a60934
2023-01-05 10:46:41 +08:00
wibetter
45cf1ff60d fix(amis-saas-2815): 优化addChild方法
Change-Id: If016b68cdf7f8d3b7e42170ac5af89b411d0266c
2023-01-05 10:42:27 +08:00
wangyuzhen01
34f82a4301 amis-saas-8146 合并应用国际化 feature/app-i18n-8146 分支
Change-Id: I51360874e3ee49f2aa4aa55abed7aadfe16570e6
2023-01-05 10:01:35 +08:00
wibetter
4e67c09731 Merge branch 'pre-release' of ssh://icode.baidu.com:8235/baidu/amis/editor into pre-release
Change-Id: Ie1fdd8c4ffc5e8e27cfecfc8021541d0db3d8e64
2023-01-04 20:54:48 +08:00
wibetter
ea31252adb fix(amis-saas-8285): 修复撤销异常问题
Change-Id: Id3488cfc056fadfdda5ba6807f6bb40af1ef8afd
2023-01-04 20:54:14 +08:00
hsm-lv
940bec47ee [amis-saas-9161]:上下文补充页面静态数据
Change-Id: I124b427c9b563a88658f258d65590eda88d3d4f1
2023-01-04 20:11:58 +08:00
2betop
81c92814c2 amis-saas-7740 dynmaic require 调整
Change-Id: Idd57619b51f745c688ef25fe1163fbdda06c081d
2023-01-03 11:44:03 +08:00
wibetter
e3144466bf fix(amis-saas-2815): 细节调整
Change-Id: I35f6cd5ce7bedabf6a339b271912ee97febc677f
2022-12-30 18:02:28 +08:00
wibetter
cfc38340d8 fix(amis-saas-8760): 拖拽细节修正
Change-Id: I06e4335a189fa3c1ad110c48ea6f5fcdb3f8f82f
2022-12-30 10:35:33 +08:00
wibetter
001d89948e fix(amis-saas-8940): 发一版
Change-Id: Ieb8e6eda362dd37b6ebc08938edfe4c7ab5ba78c
2022-12-29 20:56:05 +08:00
wibetter
70959ba666 fix(amis-saas-8940): 自由容器细节完善
Change-Id: I7dd5225a4cfd948f34958eab372f2082747c444b
2022-12-29 20:50:41 +08:00
wibetter
55379cf329 fix(amis-saas-8760): 修复CRUD不能选中问题
Change-Id: Icf7f1f54c57d5ec62a114e78ae0bac86cf81e135
2022-12-29 17:55:44 +08:00
wibetter
f014e45001 Merge branch 'pre-release' of ssh://icode.baidu.com:8235/baidu/amis/editor into pre-release
Change-Id: Ib19edaeef4481ea226ee428c313b9b2d93ae3fa6
2022-12-29 15:50:00 +08:00
wibetter
a87e419cb8 fix(amis-saas-8947): 完善吸附容器对齐方式配置功能
Change-Id: I9d0f818bb5415417f6f3feb2e6f082c3d39750db
2022-12-29 15:39:11 +08:00
2betop
34733db657 amis-saas-7740 发布新版本
Change-Id: I66ba37da51b5f1c0fe68c82dd9c27d7035dbe2ff
2022-12-29 15:16:48 +08:00
liaoxuezhi
3ec1d30030 Merge "amis-saas-7740 优化逻辑 解决 table 拖入新成员新栏不可点的问题" into pre-release 2022-12-29 14:49:22 +08:00
2betop
ff102a97e2 amis-saas-7740 优化逻辑 解决 table 拖入新成员新栏不可点的问题
Change-Id: Idd064a6ba66ed6574d523438b4369b20d3e74f13
2022-12-29 14:46:59 +08:00
igrowp
caa3cbc323 amis-saas-6731 更新版本号
Change-Id: Iaad7c94eaa625aae48708353dc8bd42240765053
2022-12-29 11:10:18 +08:00
igrowp
39ac5ed6ac amis-saas-6731 更新版本号
Change-Id: I07a9286f0ee53fb88e607e7c4a80879bdf07582c
2022-12-29 10:54:41 +08:00
hsm-lv
33f1c9648a [amis-saas-6731]:修复表格相关上下文问题
Change-Id: If4066bb14dbb2cc1012fe727bbf9a88558af3425
2022-12-28 21:54:32 +08:00
2betop
6a077c0ded amis-saas-7740 补充自定义插件示例
Change-Id: Ie7c289607074987a1ab120147537481ade34ea24
2022-12-28 20:33:25 +08:00
wibetter
661bd9fbd3 fix(amis-saas-8947): 细节调整
Change-Id: I4b596843120411f9f0f1ab7dc2b8dad570b86b5f
2022-12-28 20:00:36 +08:00
wibetter
56a6306475 fix(amis-saas-8947): 细节调整
Change-Id: Ib5da167507aac4ddb4958c859f7b50930522323c
2022-12-28 19:55:05 +08:00
wibetter
d9a7b5b83f fix(amis-saas-8984): 简化国际化语料
Change-Id: Ica1af70c6f84ee22e749e04524c5956cd99e67d5
2022-12-28 18:59:31 +08:00
wibetter
143326ac8f fix(amis-saas-8980): 自由容器中分栏组件支持参考位置配置项
Change-Id: I543a7147eb4116abf4a49a116525d083a02e9acc
2022-12-28 18:39:49 +08:00
wibetter
ce3f47d80c feat(amis-saas-8959): 特殊元素添加到自由容器增加默认宽度,避免样式异常
Change-Id: Icf5f4cb358e3fe58bd3252ca471d75ab6be07dda
2022-12-28 18:32:44 +08:00
qkiroc
3029f262da amis-saas-7517 bugfix
Change-Id: Iee8bbc2b3010c1ee1ef54da77064075fc07859f4
2022-12-28 11:43:06 +08:00
2betop
7df504f084 amis-saas-7740 完善 schemaBuilder 逻辑
Change-Id: Ifce2b1b1d459eef82b35b5424c2c906d80c4f8c8
2022-12-27 17:03:04 +08:00
qkiroc
448dc7385d amis-saas-7517 样式修改
Change-Id: I90b68b81b3eab6a1e036a1787329afc9d409c04a
2022-12-27 11:09:08 +08:00
igrowp
abec3dd535 amis-saas-8905 fix: Tabs组件当配置toolbar的组件visibleOn为false时导致页面卡死
Change-Id: I7fa2a952ce12a062c8706d3dd6d5c1d367c368c6
2022-12-26 20:29:23 +08:00
2betop
dd35eaae9a amis-saas-7740 升级 amis
Change-Id: I3fcbdaa39e06600c76fc272ffc78339ac1ef8f1c
2022-12-26 18:53:47 +08:00
wibetter
dc980acb6b fix(amis-saas-8760): 发一版内网
Change-Id: I508b374fee5313fa667c3a054c910b636f25144d
2022-12-26 18:12:36 +08:00
wibetter
8fe5333101 fix(amis-saas-1444): 表格项添加组件搜索问题修复
Change-Id: I1b33d2d612e5e029e131db14c73d0f9f576e28f4
2022-12-26 17:20:48 +08:00
wibetter
b15ec00a86 fix(amis-saas-8916): 布局容器交互细节优化
Change-Id: I67acfb9df2a970b7882b6d36bb5a1279dd5a6b59
2022-12-26 16:51:32 +08:00
wibetter
ef2dafb927 fix(amis-saas-8760): 升级amis版本
Change-Id: I0887bd017ed9ce2dda33c666b68f1291b44ac1a0
2022-12-23 17:07:05 +08:00
qkiroc
33b175e5cc amis-saas-7517 bugfix
Change-Id: Iaa335cdd072372a0f61daef6e96077b16f744569
2022-12-23 15:18:06 +08:00
wibetter
88faceb045 fix(amis-saas-8898): 细节完善
Change-Id: I494ec7f47964fc86c60de22b84244c3888a99400
2022-12-23 14:39:47 +08:00
wibetter
d293cdeaf2 fix(amis-saas-8898): 组件搜索兼容特殊字符
Change-Id: Ie5c922713a002b52be1aff20e3037d09dd6a0a40
2022-12-23 14:35:56 +08:00
qkiroc
e9ac49f352 amis-saas-7517 主题组件
Change-Id: I152a4b4f079e2d8ebc21fbaff5496701d1bdcfa3
2022-12-23 10:42:21 +08:00
wibetter
f353639ab5 fix(amis-saas-2815): 补充国际化语料
Change-Id: I6a372fe353f55e28039215c108140fb92c811d1d
2022-12-22 16:47:58 +08:00
2betop
47c5259db7 amis-saas-7740 补充更多的构建逻辑
Change-Id: I4c0b37eda937340523d5cd32041cff5a4a2695f6
2022-12-21 21:22:01 +08:00
liaoxuezhi
8e9b477a95 Merge "amis-saas-7740 补充更多的构建逻辑" into pre-release 2022-12-21 19:42:11 +08:00
2betop
800ecb2cc8 amis-saas-7740 补充更多的构建逻辑
Change-Id: Ic53da701435f66a7aa41b96c02dd4c1832fc1385
2022-12-21 19:41:07 +08:00
wibetter
a5f56b9931 fix(amis-saas-8828): 所有组件在自由容器中新增[参考位置]配置项
Change-Id: I671ac4aee6e8754e7ebf12c7e796bfa0b479d5f3
2022-12-21 12:02:26 +08:00
qkiroc
4732f384ce amis-saas-7517 bugfix
Change-Id: I5aeb7b93506c18767a6ce21376506b699a37e86e
2022-12-19 16:55:12 +08:00
wibetter
6c3bbbd404 Merge branch 'pre-release' of ssh://icode.baidu.com:8235/baidu/amis/editor into pre-release
Change-Id: Ieb904efaf2e3f739286a3cb13ff12305ec873563
2022-12-19 12:12:49 +08:00
wibetter
d730ca79e2 fix(amis-saas-8763): 布局容器配置项优化
Change-Id: I173e909f50e75f84a04f98e16952bd3ec0bbeb63
2022-12-19 12:12:24 +08:00
wibetter
5f05038995 fix(amis-saas-8761): update
Change-Id: Ice0ffca14a37ebf784237e39a03e9f6989e91efb
2022-12-16 17:27:35 +08:00
wibetter
014568d6cf fix(amis-saas-8761): 吸附容器合并,并禁用拖拽和定位相关配置项
Change-Id: I08051428d71fad5d21c24795219c7d4e215d1b43
2022-12-16 17:21:33 +08:00
kangkai04
0289c292a3 Merge "amis-saas-8338 优化多个loading配置" into pre-release 2022-12-16 15:17:22 +08:00
wibetter
7ac23b8dda feat(amis-saas-8477): 新增自由容器
Change-Id: Id8e363f4f0718421963bd04c0aea4748786cdf23
2022-12-16 11:56:33 +08:00
meerkat-morecats
96d2a4efa7 amis-saas-8338 优化多个loading配置
Change-Id: Ibf187b85fb3aa74c21875b4b0a6ffb9ac6d692a4
2022-12-15 17:14:39 +08:00
qkiroc
ec914837ae amis-saas-7517 页面外观bugfix
Change-Id: Ia3a11ccdcfa93758f59114f65d1984350e0fc17b
2022-12-13 21:11:07 +08:00
pianruijie
84dfdb5d20 放开防抖入口 [amis-saas-8098]
Change-Id: I0569961d4484ac9bc34a90f4fca943319288aeef
2022-12-12 14:28:55 +08:00
2betop
4cbeec24aa amis-saas-7740 升级 amis 版本
Change-Id: I02ee803bbfc080167cb207f2b992ef0c9e639511
2022-12-09 16:32:44 +08:00
wibetter
6fba7924c3 Merge branch 'master' into pre-release
Change-Id: I45f0d7ef51b53c9641d67e2238a889d1b693eb0f
2022-12-07 19:21:05 +08:00
pianruijie
600724cf39 Merge "[amis-saas-8098] [amis-saas-8099] 支持防抖 & 支持阻止冒泡" into pre-release 2022-12-06 10:10:17 +08:00
pianruijie
ea75bd6d91 [amis-saas-8460]修复样式问题
Change-Id: I65b1bc1305f4c2512705161cdd5366e86312a1c9
2022-12-02 16:46:16 +08:00
pianruijie
28615a40af [amis-saas-8098] [amis-saas-8099] 支持防抖 & 支持阻止冒泡
Change-Id: Idba11cc838b4bf612b384c468ff35646f63b3d8e
2022-12-02 16:34:25 +08:00
igrowp
ad2e959534 amis-saas-5995 编辑器升级amis版本
Change-Id: I51c6a31cede1598a53a34d32b124174b2f94972b
2022-12-02 11:30:03 +08:00
wibetter
658396fff8 fix(amis-saas-8078): 支持 postMessage 间接动态注册自定义组件
Change-Id: Ia5de717ec6fbc1bf3489946e7f52dac9b3daef94
2022-12-01 17:57:42 +08:00
wibetter
44041e4c13 fix(amis-saas-8462): amis-editor-core的输出新增static目录
Change-Id: I35496071d5fe62259ee3e7d2ec0e97e9c2fb78c7
2022-12-01 10:51:15 +08:00
wibetter
6e4c97fd2a fix(amis-saas-8462): 细节调整
Change-Id: Iae5d56a3dc51d4c2d616b0650f57d1b6b50d16c8
2022-11-30 18:16:59 +08:00
wibetter
e63785f306 fix(amis-saas-8462): amis-editor-core补充css图片的构建逻辑
Change-Id: I7dafc9591dcc6ffa51275451211050e396fd1121
2022-11-30 18:14:24 +08:00
wibetter
c6131f1d83 fix(amis-saas-8226): render方式改用react18方法
Change-Id: I6bba95700d2262bc074c5a51f8147d95b329f400
2022-11-30 12:33:08 +08:00
wibetter
3978e53e6c fix(amis-saas-2815): update
Change-Id: I7f9334d0d5205d6c410dffd98008e0baf7752c40
2022-11-30 10:29:48 +08:00
wibetter
c63eea5766 fix(amis-saas-6852): amis-editor-core输出的样式名字改回使用style.css
Change-Id: I88f7a51941b74fda0ca5d47bfe8418efcd973491
2022-11-29 20:41:01 +08:00
wibetter
ab313dd65a fix(amis-saas-6852): 完善表单脚手架,自动补全options
Change-Id: Ie4ff0ecf9212a1336af224b70c9d95151037241d
2022-11-29 19:49:46 +08:00
2betop
dbc5d02cf4 amis-saas-7740 补充编译逻辑
Change-Id: I58905fdbba86ea3d77a5ef96fdda16fedc569354
2022-11-29 17:59:35 +08:00
qkiroc
406ddd7e98 amis-saas-7517 postcss
Change-Id: Id8a3cae08bea3bdd4dd8744a795d185a41579a74
2022-11-28 14:31:48 +08:00
jiatianqi
ab4d285d0d Merge "amis-saas-8289 [Bug] 事件动作设置为消息提醒,配置表达式不生效" into pre-release 2022-11-28 10:19:06 +08:00
jiatianqi
455f828040 amis-saas-8289 [Bug] 事件动作设置为消息提醒,配置表达式不生效
Change-Id: I9312918fdfbfefddd4ec3ab74086d3e05b5484af
2022-11-28 10:17:49 +08:00
wibetter
f165da5767 fix(amis-saas-8354): 补充缺失的依赖
Change-Id: I8ae56a0f6d98aefb29ac1956988fc44c53517b91
2022-11-26 22:58:26 +08:00
wibetter
9f8e16ed48 fix(amis-saas-2815): 剔除重复依赖
Change-Id: I8eb9a78155282552b9a1dba7bd611b29e240f2ce
2022-11-26 22:05:20 +08:00
wibetter
59e9b1c238 fix(amis-saas-8354): 调整内间距英文文案,避免撑开配置面板
Change-Id: I9fae6156d94d53ab343188e9eef5f726250495a1
2022-11-26 17:39:48 +08:00
wibetter
2b65417737 fix(amis-saas-8303): 调整弹性比例说么文案
Change-Id: I46e420bc1f5862d1c2da4da62c468e7c55642def
2022-11-26 16:41:29 +08:00
qkiroc
6ca7374c6d amis-saas-7517 扩展外观编辑器
Change-Id: I2fec79d751d8a1936d88a39d3f0f8ec98a5ee48e
2022-11-25 15:01:52 +08:00
wibetter
f298a55f96 feat(amis-saas-8288): amis-editor-core增加构建es m模块
Change-Id: Ie8f33d693ba15acd457571ff6128434b352cc760
2022-11-24 10:42:15 +08:00
wibetter
dedeeb0ada fix(amis-saas-2815): 处理代码冲突
Change-Id: I6c67982a7752104f8a4b23b918e6f205dafb1b3d
2022-11-22 18:30:31 +08:00
wibetter
69e3bc2820 fix(amis-saas-2815): 补上缺失的依赖react-json-view
Change-Id: I28a8fb91f7e6d20999e391904ffdeafa11f0689b
2022-11-22 18:28:35 +08:00
jiatianqi
e02c09dcfe amis-saas-6892 publish 5.2.1-beta.18 提测 fx表达式
Change-Id: I4a70b00fdc06865278e047854e435c27bb7472fe
2022-11-22 17:36:41 +08:00
jiatianqi
8855258d28 amis-saas-8183 [Bug] 组件状态中,表达式展示不一致
Change-Id: I0ed06f93468cb1d84ae82c1526347ec1b425dc43
2022-11-22 16:13:13 +08:00
jiatianqi
6fb983cf97 amis-saas-8254 「editor」打包TS校验错误处理
Change-Id: I3956490a18e24fb7ebf59fb25447b52a25ba3a84
2022-11-22 16:05:02 +08:00
wibetter
a167bdda36 fix(amis-saas-8235/):「占比设置」改成「弹性比例」
Change-Id: I6d3dbe21d2499c0d525b1d1cbf33153c4b925ae1
2022-11-22 09:44:08 +08:00
wibetter
42ded5c37d fix(amis-saas-8235/):「布局容器」配置项细节优化
Change-Id: I878ae91705d0eb6629beb60640e313fc15048272
2022-11-21 22:07:27 +08:00
wibetter
a377bfcf0f fix(布局容器amis-saas-8224): 细节完善
Change-Id: I0282321f279e261e923f416b99ed1dec68814aa4
2022-11-21 17:26:37 +08:00
qkiroc
43ec5061da amis-saas-7517 主题外观
Change-Id: If6d82ef043334e9ffd5e6472e2c7f3b451ce1411
2022-11-20 22:24:38 +08:00
wibetter
80c9b55d54 fix(amis-saas-8191): 细节完善
Change-Id: Icc449a40bdb079f346d7c05f7946a3b27f58866b
2022-11-18 19:22:43 +08:00
wibetter
9e536c2618 fix(amis-saas-8191): 修复固定高度/宽度、最大/小高度宽度设置失效问题
Change-Id: I1202af12f4de84f036233251349832406e2c5f90
2022-11-18 16:44:35 +08:00
wibetter
00d108bc49 fix(amis-saas-2815): 统一react和amis相关依赖版本
Change-Id: I9066c93895ef9213b58205ed1a92b6c367e28965
2022-11-18 15:15:20 +08:00
wibetter
4dbc562f76 docs(amis-saas-2815): 更新国际化语料
Change-Id: I1e17dbd47c7986829319f96bdc9e935dcd07be6b
2022-11-17 19:49:41 +08:00
wibetter
7643a36d83 Merge branch 'pre-release' of ssh://icode.baidu.com:8235/baidu/amis/editor into pre-release
Change-Id: I90903f4d96077c21bbff4901f2bedda1b1fcd3be
2022-11-17 19:35:12 +08:00
wibetter
1cc93e0931 fix(amis-saas-8080): 布局容器设置成公共组件默认样式优化
Change-Id: I627a33349f4efae81d29cf0f6c3dbc8ef468b801
2022-11-17 19:05:36 +08:00
jiatianqi
14b4a84c59 Merge branch 'pre-release' into fix-fx-formula 2022-11-17 17:23:42 +08:00
huangying11
37cc8765cc Merge "amis-saas-8092 improve: 长文本表达式展示" into fix-fx-formula 2022-11-17 17:02:47 +08:00
huangying11
92fb55e5d2 amis-saas-8092 improve: 长文本表达式展示
Change-Id: I6ed6502eb10e9d5c9cf2080471a1297d4a7da012
2022-11-17 15:52:09 +08:00
jiatianqi
354d9105e7 amis-saas-7601 优化细节点
Change-Id: Iaea124b7b346385c87102455e3ddb91177535cf1
2022-11-17 15:17:18 +08:00
liaoxuezhi
1342fc22d0 Merge changes I91fd842b,I6f9aacbc,Icfe66a5c,I133ebe2b,I161a488c, ... into pre-release
* changes:
  amis-saas-7740 [子模块] 模型设计器草稿代码
  amis-saas-7740 [子模块] 模型设计器草稿代码
  amis-saas-7740 [子模块] 模型设计器草稿代码
  amis-saas-7740 [子模块] 模型设计器草稿代码
  amis-saas-7740 [子模块] 模型设计器草稿代码
  amis-saas-7740 [子模块] 模型设计器草稿代码
  amis-saas-7740 [子模块] 模型设计器草稿代码
  amis-saas-7740 [子模块] 模型设计器草稿代码
  amis-saas-7740 [子模块] 模型设计器草稿代码
  amis-saas-7740 [子模块] 模型设计器草稿代码
2022-11-17 14:22:53 +08:00
2betop
4dbbf62f5a amis-saas-7740 [子模块] 模型设计器草稿代码
Change-Id: I91fd842b9358739d51692d907d5f1fce00dab434
2022-11-17 14:18:55 +08:00
jiatianqi
0882c6de3d 替换几个组件属性配置面板 amis-saas-6892
Change-Id: I7d8e05a1d96bd05b2e3fb32d6df70b00f9d69181
2022-11-17 11:41:46 +08:00
jiatianqi
978ccc3188 amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: If18a1e61a3584cdc80a7fe83254539dfa398f20a
2022-11-16 15:49:31 +08:00
jiatianqi
f33b995b05 amis-saas-7601 补充:[表达式]浮层遮挡问题
Change-Id: I1265326b989ec2fb78c6cdad567d10dc2b24b501
2022-11-16 12:44:13 +08:00
jiatianqi
3d599b83a4 amis-saas-6892 merge pre-release分支,解决common.ts一个文件冲突
Change-Id: I24f9841fbe5b07bdf463945245049a74248c2ef1
2022-11-16 11:22:25 +08:00
jiatianqi
30e75272df amis-saas-7601 [Feature] 「编辑器」长文本表达式上下[表达式]浮层遮挡问题
Change-Id: I010b10d33d36bd7b182b3139ccf963ffaea0cd65
2022-11-16 10:58:37 +08:00
qkiroc
0f2a7dffe0 amis-saas-7517 editor
Change-Id: I3165b21aff1f0065ceddf6d025881a7e2b299d6c
2022-11-16 10:25:42 +08:00
hsm-lv
146141a9a0 [amis-saas-7862]:补充Page、Service、Chart初始化事件&选项组件的seletedItems参数
Change-Id: I56b4667a8ab44ea215ee59f822d71a2488aee072
2022-11-15 20:33:08 +08:00
jiatianqi
4fa143a5cb amis-saas-7601 [Feature] 「编辑器」长文本外观样式调整
Change-Id: I5c289b8955bfb9cbb616c90c5c2932c77697ca14
2022-11-15 19:39:36 +08:00
jiatianqi
e5df65e033 amis-saas-7603 [Feature] 「编辑器」纯表达式样式调整
Change-Id: If02a39263529af632b87138a72cff15132c64851
2022-11-15 17:37:37 +08:00
jiatianqi
d627c3f271 amis-saas-7601 [Feature] 「编辑器」长文本外观样式调整
Change-Id: I73800dd805dcbab2a352f648c1b68bf50447ff28
2022-11-15 17:13:31 +08:00
wibetter
f248457baf fix(amis-saas-7727): 内网发一版5.2.1-beta.5
Change-Id: Id5c5c27de5e031e0053bd1011577910ad0ac4f66
2022-11-14 22:24:51 +08:00
wibetter
b98c987b9e fix(amis-saas-7727): 代码编写问题修正
Change-Id: I42d5b784787917bd270590ae5575cf34be26e0cd
2022-11-14 22:21:06 +08:00
wibetter
c0cf011352 style(amis-saas-7727): 代码全局格式化
Change-Id: I280729c60133d151868ec8b4638e6060c5175230
2022-11-14 22:10:23 +08:00
wibetter
6475c2d853 fix(amis-saas-7727): 补充国际化物料
Change-Id: I983221c6b279bf5c5d849e10927c43b17b44f525
2022-11-14 22:06:50 +08:00
wibetter
46d3601eb2 fix(amis-saas-6948): 左侧组件搜索问题优化,避免切换预览模式后丢失搜索字段
Change-Id: I2ca2e88daee1c4602f8a9ad401b7e7a1ee9cf95c
2022-11-14 21:35:36 +08:00
jiatianqi
f176cdcad9 amis-saas-6892 [Feature] 完善短文本tooltip高亮文案
Change-Id: Ifb50a2b5a5dfde6acb6513b5e89b3d43cf012cf1
2022-11-14 17:58:25 +08:00
wibetter
990aa4deb2 fix(amis-saas-4371): 合入布局容器相关代码
Change-Id: I32f0e69e3ba397821561f4881ebc131c9112f065
2022-11-14 17:03:04 +08:00
wibetter
5a54ee55e6 fix(amis-saas-8035): 特殊布局参考位置增加默认值
Change-Id: I230f57f883d51615f54069b7c30e0ae642d05839
2022-11-14 15:31:20 +08:00
wibetter
baab4e90ee fix(amis-saas-4371): 细节完善
Change-Id: Iad351546904bd4503e6a7feda0d7a2f539e96e12
2022-11-14 15:16:51 +08:00
wibetter
168b4d69d4 fix(amis-saas-4371): 细节完善
Change-Id: I438b4604437706ffaf16692174f6f9dd2f603d21
2022-11-14 14:58:48 +08:00
wibetter
58ce5c08f9 fix(amis-saas-4371): 剔除布局容器中重复的状态配置项
Change-Id: I7a3eaa644cdb5c999b2176391d647d3bd1332920
2022-11-14 13:23:07 +08:00
wibetter
b73260b3a6 fix(amis-saas-4371): 细节完善
Change-Id: I71f489635b94740cbd2c23afe41104c9c2f06d22
2022-11-14 12:18:17 +08:00
wibetter
9c7012c467 fix(amis-saas-4371): 补充布局相关国际化语料
Change-Id: Idca195655e90656b37faf74ee21b735607463cb3
2022-11-14 11:52:21 +08:00
wibetter
e37567dabb fix(amis-saas-4371): 完善布局相关配置联动
Change-Id: Ib155fc0d215b98a0ab1e8ffc8ec7c3278a402f1f
2022-11-14 11:44:34 +08:00
lurunze1226
5ff95128ef merge: 合并pre-release分支
Change-Id: I91249304a5c80b68857846cdd2b88744753d7084
2022-11-14 11:03:39 +08:00
lurunze1226
b84dc31d73 amis-saas-5749 merge: 合并master分支
Change-Id: I1bbc94f3eb514663588162f1f31bcfbcf3bd75ce
2022-11-14 10:28:39 +08:00
wibetter
5581a91c57 fix(amis-saas-7819): 同步主干最新代码
Change-Id: Id7cdbc0c38221eb7547c9ea8d1dd897e223b0549
2022-11-11 12:01:28 +08:00
wibetter
4af912f178 fix(布局容器amis-saas-7819): 细节完善
Change-Id: I0a242ebe444fa173f51d74baf97dd943bcf66640
2022-11-11 11:57:50 +08:00
wibetter
57ab3b6a8e fix(amis-saas-7819): 细节优化,并简化前后移动判断逻辑
Change-Id: I4633d53238eb6a673140d04b0007bca60d9d1a61
2022-11-11 10:15:30 +08:00
jiatianqi
bfeb6563f1 amis-saas-6892 [Feature] fx样式优化
Change-Id: I59c6538aa31aba70ec27c6c0a169fe43b369fb1b
2022-11-10 11:30:05 +08:00
wibetter
3e917fdd35 fix(布局组件amis-saas-7939): 细节完善
Change-Id: I3e8202e4c3ae7c591daeaa3665edaf23a1728dce
2022-11-10 00:09:00 +08:00
jiatianqi
53d110ff42 amis-saas-6892 [Feature] 表达式配置后 输入框的样式调整
Change-Id: I9ae53cdd8f55472a563cb89cef27a173df35a2d7
2022-11-09 19:44:21 +08:00
wibetter
7fa28160a5 fix(布局组件amis-saas-7939): 包裹容器上下追加元素icon位置自适应调整
Change-Id: I16b1710885223ee95ede81a0e21ff6360f3bd65a
2022-11-09 18:58:54 +08:00
jiatianqi
547df12e20 amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: If25f25ca4e966b75f71f07d53e8a43add8fdbc5f
2022-11-09 16:21:14 +08:00
jiatianqi
c341db74ca [amis-saas-5962] editor 历史问题修复&优化 ,提测
Change-Id: I477accad22acd0ac5bfb472b2d49d174148d9354
2022-11-09 15:32:41 +08:00
jiatianqi
6fcd1bf1dd 合并pre-release分支,解决一个文件冲突InputDateRange.tsx [amis-saas-6890]
Change-Id: I8432f63f419e383d2e7e646339c5047f4069c6d4
2022-11-09 14:36:47 +08:00
jiatianqi
ad9bb604a1 Merge branch 'master' into pre-release 2022-11-09 14:31:28 +08:00
wibetter
a96aceccd8 fix(amis-saas-7973): 优化multifactor时多配置面板处理逻辑
Change-Id: I71aed9bcc47973717edb7ed0a8f9976b24395730
2022-11-09 11:32:09 +08:00
jiatianqi
2e0ce70a65 amis-saas-7954 [Bug] 「amis 按钮类名更新」导致 button的 size属性类名变更样式混乱
Change-Id: I6ed247d8f923aab087933f21296fdbed7764ee61
2022-11-08 14:32:56 +08:00
jiatianqi
a9b55b7408 amis-saas-7953 [Bug] 「amis版本升级样式问题」升级后 dialog默认左右间距为0
Change-Id: I2e14cc2c77347faaf308cead97d0bf8b341e132e
2022-11-08 14:08:38 +08:00
jiatianqi
efc597b877 Merge branch 'master' into pre-release 2022-11-07 14:14:34 +08:00
wibetter
cef36b0c62 fix(布局能力提升amis-saas-7924): 当wrapper为空插入布局容器时,自动改为置换
Change-Id: Icafb6c50d53ebcb876f82e5f75ca3168ab7989d1
2022-11-06 00:43:17 +08:00
zhou999
ab13e098e8 style: 完善日期范围组件的快捷键-按钮样式 amis-saas-7301
Change-Id: Ife3301697086d42f79accacd66860afe553ce663
2022-11-04 17:47:10 +08:00
igrowp
2eaefb5ad1 amis-saas-6892 fix: fix style
Change-Id: I1c1ebdf7e87e6f5f39281f1862b980644bd9b398
2022-11-04 15:57:01 +08:00
wibetter
92568e1888 fix(amis-saas-7792): region标签展示位置优化
Change-Id: If5ec1c71c53ff436809d20a58a9d6d75b0af3997
2022-11-04 14:05:28 +08:00
jiatianqi
b4fc431786 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
ac679c9cba amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I81ef06573cb468b38cbccd7262a3d527fde7209b
2022-11-03 20:32:26 +08:00
wibetter
752fcdba34 fix(布局能力提升项amis-saas-7852): 「布局组件」fixed和absolute定位时,新增「参考位置」配置项
Change-Id: If3f33a320a8290fb36bce090a794d3619cccc214
2022-11-03 20:31:11 +08:00
jiatianqi
2812802b5f amis-saas-6890 [Story] 标题提示、控件提示的打开弹窗图标背景问题
Change-Id: Idd5d3e65e3a66c4a4ac8871823f4d3f9c7e858cc
2022-11-03 19:23:50 +08:00
jiatianqi
a0b338a380 Merge "amis-saas-6892 [Feature] 编辑器fx 交互优化" into fix-fx-formula 2022-11-03 19:18:28 +08:00
jiatianqi
184e8acbd5 amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: Idea0ed8d9ea5f15a49a2a33e6c0575ae8e932744
2022-11-03 19:16:31 +08:00
jiatianqi
52a5af3e2f Merge "amis-saas-6892 [Feature] 编辑器fx 交互优化" into fix-fx-formula 2022-11-03 18:49:47 +08:00
jiatianqi
1f65b698d6 amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I347e33a08ef6cd4a144de2f640d88d6dea11f17d
2022-11-03 18:31:51 +08:00