Commit Graph

938 Commits

Author SHA1 Message Date
wibetter
cae583c810 fix(amis-saas-9318): 布局容器组件设置滚动吸附时,添加一个默认层级。减少遮挡
Change-Id: I7f73a1faa1967d422eae9e85c850818f590ef288
2023-02-21 19:00:09 +08:00
zhou999
b28b4377cd fix: amis-saas-7947 富文本编辑器评审问题修复
Change-Id: I1349761ed6014663c3627a77842108601675f1fe
2023-02-20 21:40:35 +08:00
zhangzhulei
363fb123a4 Merge "amis-saas-7949 fix: input-table 文案调整;表单项校验逻辑;新增按钮区分" into pre-release 2023-02-17 13:00:48 +08:00
zhangzhulei
2a2c087a0f amis-saas-7949 fix: input-table 文案调整;表单项校验逻辑;新增按钮区分
Change-Id: I32cb7f2e3c3378847c946fc64e18ff0851d53868
2023-02-17 11:08:20 +08:00
jinye
1df2d0cab7 amis-saas-9451 Status 配置面板i18n处理
Change-Id: Ic0900e521e071c38883c7c031679a85bd9f76337
2023-02-16 21:03:30 +08:00
zhou999
68dc4137bb fix: amis-saas-9227 测试:【组件优化第六批】combo组件-属性配置下,开启可排序配置项,关闭可多选配置项后,可排序配置项置顶在可多选下;
Change-Id: I4c48c6df7437f36443a5d7cc8e4080d392f366e8
2023-02-16 19:39:16 +08:00
zhangzhulei
db324f1327 amis-saas-7949 fix: input-table 配置面板 快速构建弹窗调整+配置项位置调整
Change-Id: I724d192b9295e7acf99706e7577084efd2acb827
2023-02-16 17:50:48 +08:00
jinye
9486c84443 amis-saas-9451 外观配置面板 表单项静态 改为 静态展示
Change-Id: I955e853754753536aea2c8bd4d90243a04711caa
2023-02-16 16:56:36 +08:00
jinye
3a335b8e25 amis-saas-9451 去掉Status组件子级时的提示
Change-Id: I20d549a6837c1b78a3bc0f59faebe0db7d2745d5
2023-02-16 16:56:36 +08:00
zhoushengqiang01
ab336d68f5 Merge "fix: amis-saas-7947 富文本编辑器评审问题修复" into pre-release 2023-02-16 16:33:28 +08:00
hsm-lv
981f58299d [amis-saas-9314]:表格列事件面板丢失问题
Change-Id: Id3c70c65ad71d358e1c1366dbdabcea7680a24a3
2023-02-16 16:11:12 +08:00
zhou999
e5c64e2a7a fix: amis-saas-7947 富文本编辑器评审问题修复
Change-Id: I3162d55b73a9dad3cbaffa5d3b87298322d1c5ea
2023-02-16 16:10:15 +08:00
jinye
14015be31f Merge branch 'pre-release' into amis-saas-9193 2023-02-16 14:58:34 +08:00
zhangzhulei
4beb8044e2 amis-saas-7949 Merge branch 'feat-input-table' into pre-release
Change-Id: Ib6732a9257e76ea5d01d7f41f1bbbe51596f9258
2023-02-15 20:49:32 +08:00
zhangzhulei
442cf6651d amis-saas-7949 input-table 调整 行高亮规则 属性位置
Change-Id: Ia1b93e754d4a6899a7dce8f000950471ed32671c
2023-02-15 20:42:21 +08:00
zhou999
887df7a09c fix: amis-saas-7947 富文本编辑器 [input-rich-text] 删除内嵌操作配置(由于不生效)
Change-Id: I614c71f2e9ee724a86d6e7d6a85340a471153006
2023-02-15 14:50:20 +08:00
igrowp
79b6c415e8 amis-saas-7947 Merge remote-tracking branch 'origin/feat-input-rich-text-improve' into pre-release
Change-Id: I47a7a30a3d46076ac6e797f8a2069bdd4c0296e5
2023-02-15 12:46:02 +08:00
jinye
a96c195908 Merge changes I7c000d34,Ifea16966 into pre-release
* changes:
  amis-saas-7949 Status选择图标时自动填充label
  amis-saas-7949 修复在amis-saas中无主题的时候,颜色选择器报错的问题
2023-02-15 11:48:11 +08:00
zhangzhulei
6b11263642 amis-saas-7949 fix: input-table组件补充 i8nEnabled逻辑
Change-Id: Ibbb06e1e45d6160022544b625e48bda3c8d7c065
2023-02-15 11:45:18 +08:00
jinye
c5bafcc86c amis-saas-7949 Status选择图标时自动填充label
Change-Id: I7c000d34db584df86a52500d39242c1e2d64eae5
2023-02-15 11:38:59 +08:00
zhangzhulei
5e836ae817 amis-saas-7949 Merge remote-tracking branch 'origin/feat-input-table' into pre-release
Change-Id: I67dfef3c1b9d82bd1339486877c9a8ca2db8b537
2023-02-15 11:04:48 +08:00
igrowp
185247d8da amis-saas-8766 Merge branch 'qatest_feat-5749' into pre-release
Change-Id: Ia7a050ed738ba4523bc12f91a8010f7fcb1a135e
2023-02-14 20:56:38 +08:00
zhangzhulei
9bd7613e1c amis-saas-7949 [Feature] 表格编辑框 [input-table] 组件配置面板优化
Change-Id: Ib81b38df6404081d423d58dfe5cb490cad0d3fe7
2023-02-14 19:33:33 +08:00
qkiroc
082f5cff9e Merge branch 'theme/20230130' into pre-release 2023-02-14 18:36:50 +08:00
jinye
4fa8402861 Merge "amis-saas-9451 [Feature] status组件配置面板优化" into pre-release 2023-02-14 16:06:54 +08:00
wangyuzhen01
1d8bcbccad amis-saas-9640 1. 异步任务的按钮名称增加国际化
Change-Id: Ief2c2e8aa5d0eaaed7a2d8ca2717ee0e8e3450a6
2023-02-14 15:22:15 +08:00
jinye
bd0e29fcb7 amis-saas-9451 [Feature] status组件配置面板优化
Change-Id: I6529f44dece3ef6e6da97d82c261aefcf0576c3a
2023-02-14 15:11:21 +08:00
lurunze1226
a736945485 amis-saas-5996 fix: 默认值控件中缺少页面变量
Change-Id: I46a3830d76e4bd22c43d23e0c3fb0bfa6ea39f51
2023-02-13 17:10:09 +08:00
wibetter
85445c3877 fix(amis-saas-9318): amis-editor-core的exports补上样式文件支持
Change-Id: I5df0b4c59ddd6983cdffee34ded74c49c4dfb152
2023-02-10 17:39:01 +08:00
wibetter
ba38bd8972 fix(amis-saas-9624): 文件上传和图片上传改用默认fileReceptor
Change-Id: Id9d7a099b4e27627dc2182faea8b4f6f5397f1b0
2023-02-10 13:55:27 +08:00
wibetter
1b0e33da82 fix(amis-saas-9624): 语料更新
Change-Id: Iae08772a3c803b3639f0388157a64d33cd754ce3
2023-02-10 11:56:13 +08:00
wibetter
b02850c8e8 Merge branch 'pre-release' of ssh://icode.baidu.com:8235/baidu/amis/editor into pre-release
Change-Id: I674584c326147829395af3de77bff39b4a38c0f8
2023-02-10 11:51:09 +08:00
wibetter
8896ca58ac fix(amis-saas-9624): 调整上传文件和图片上传的默认json数据
Change-Id: Ie2fc48e0d1a53374912c094964fc35d6fd471929
2023-02-10 11:50:50 +08:00
wangyuzhen01
26acf9a4ec amis-saas-8146 1. 修改事件动作/锚点组件和折叠面板组件国际化相关内容
Change-Id: I7861e98da6372ea2a113ec928530301c5e5f3002
2023-02-08 19:05:10 +08:00
wibetter
9143d652c5 fix(amis-saas-9515): 自由容器不显示内部对齐配置项
Change-Id: I6f4e2023077ad6eeea72497b6aa7bf4699eb0e2c
2023-02-06 20:20:18 +08:00
wibetter
b8a1d46f8a feat(amis-saas-9517): 自由容器不显示上下追加功能icon
Change-Id: I82c8a4fe3fed9e70988416a2f1ccde24b605c0c8
2023-02-06 19:49:46 +08:00
2betop
ffb8d714cc amis-saas-7740 esm 模块优化
Change-Id: Iace4a847eac3da8b26c20fc39ac3f9a594162c2f
2023-02-06 15:58:43 +08:00
igrowp
99ff0fa979 amis-saas-9486 feat: 事件动作-变量赋值支持修改页面变量
Change-Id: Iac32cbf05244cd7414d3b39ae5be75f519ef37fc
2023-02-03 11:19:27 +08:00
jinye
a9400a98d8 amis-saas-9413 测试:【组件优化第六批】列表list外观配置下的CSS类名属性配置参数未生效;
Change-Id: I71e0d128888eef24e314d330d292d2e11543e3e5
2023-02-02 16:45:38 +08:00
wibetter
7c4fe1e7e3 feat(amis-saas-9438): 自由容器和特殊布局元素拖拽交互优化,支持点住任何位置进行拖拽调整位置
Change-Id: I73cf2187c5496ce0c1eada7ddfdef18707467078
2023-02-02 15:40:23 +08:00
wibetter
78e4831c83 feat(amis-saas-9364): 优化容器和包裹的内部对齐方式配置项显示条件
Change-Id: Ied4fa9208013e3dccad17611df2883278757c4ec
2023-02-02 14:39:48 +08:00
wibetter
d30edfcfb4 feat(amis-saas-9364): 细节优化
Change-Id: Ic466ce0a2ab360243bc0fe1da0f43f1352aae6a9
2023-02-02 11:40:03 +08:00
liudan21
23fe4599df 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
pianruijie
b29bb2881b Merge "[amis-saas-9393] && [amis-saas-8983]" into pre-release 2023-02-01 16:52:31 +08:00
wibetter
d157f6a08c feat(amis-saas-9364): 布局相关容器组件设置固定宽高后支持宽高可拖拽调整
Change-Id: Id4b83bbef0d3cbd390efe0fc8dc6161dd37ade35
2023-02-01 16:30:48 +08:00
wibetter
ba6cc212e1 fix(amis-saas-9352): 容器和包裹增加内部对齐方式配置项
Change-Id: Ic7dd5945f8cf7f21d9f08d3a31e0dec085b22c56
2023-02-01 11:31:27 +08:00
wibetter
45a5f507e2 fix(amis-saas-9353): 容器增加默认内边距配置项
Change-Id: I93fb46436f08f5412c19af0c23c8ed7fe9c3ce81
2023-02-01 11:08:57 +08:00
lurunze1226
f86063b97d amis-saas-5996 merge: master branch
Change-Id: I8f7ea112d31c810a94138f16de112322faa7761d
2023-01-31 17:45:29 +08:00
lurunze1226
479fc44703 amis-saas-5996 feat: 组件变量&应用变量合并为变量赋值动作
Change-Id: I8d946f3336199055ac82143981beb0ca3c538348
2023-01-31 16:01:55 +08:00
pianruijie
e19db3c338 [amis-saas-9393] && [amis-saas-8983]
Change-Id: I07fd4ad58eec3905a0b1f28795d07bae7038460c
2023-01-31 11:56:00 +08:00
jinye
ff161721d6 amis-saas-9394 [Bug] 测试:【组件优化第六批】纯文本,“type”:“text”,类型-外观配置下的css类名标题栏与配置栏属性名称一致;
Change-Id: Ic056cad246b64050cf3b747aa4ffa16c83f293e1
2023-01-31 11:27:01 +08:00
jinye
7801fd3a68 amis-saas-9400 [Bug] 测试:【组件优化第六批】表格table属性配置下的是否固定表头配置项,“顶”字体出错;
Change-Id: Ib9e9d8166a7b646dedfd566c46b77c006888303e
2023-01-31 11:20:35 +08:00
jinye
59c237134c amis-saas-9402 [Improvement.] 测试:【组件优化第六批】表格table属性配置下的底部默认展开配置项可居中展示;(可优化)
Change-Id: If710473bad796ce22c77eee7d357cae17a5fe310
2023-01-31 11:19:28 +08:00
wangyuzhen01
efb90a2536 amis-saas-8146 1. 补充 Image/Images/List/Table/Tabs 组件国际化属性配置
Change-Id: I88d6d8ce5500e8c1c9005aaa962edca31f26dcd2
2023-01-30 19:30:36 +08:00
lvxiaojiao
62d97d3183 Merge "[amis-saas-9200]:选择组件优化" into pre-release 2023-01-30 10:13:26 +08:00
hsm-lv
554ac67886 [amis-saas-9200]:选择组件优化
Change-Id: I1b429c3582fab79fb914169835287a91333b1953
2023-01-30 10:10:11 +08:00
wangyuzhen01
c25a29700e amis-saas-8146 1. 子编辑器 subEditor 不再重复设置 editorStore; 2. 增加 ListItem 和 ButtonToolbar 属性国际化
Change-Id: I724fcd3569afc57a8fbf010a1a366c998ce1aeeb
2023-01-29 09:33:02 +08:00
wangyuzhen01
72e3637daa amis-saas-8146 1. 更改 i18nEnabled 的获取方式
Change-Id: Ie1c65b3e42054abf3522cd5101513288cc82507d
2023-01-17 17:56:53 +08:00
qkiroc
26d05c09c6 amis-saas-9185 修复图标选择组件
Change-Id: I752bff681bcadd1b2d3f1d452092f9489e075d78
2023-01-17 14:56:17 +08:00
yinchunyu
d9d8209269 [amis-saas-9270] 树组件切换状态时事件处理
Change-Id: I1ad8af4567a9c6e2255205c5addddd349077f515
2023-01-17 11:46:04 +08:00
wibetter
fd6cbbbc48 fix(amis-saas-9318): 同步master分支最新代码
Change-Id: I6fff20f41f718beb00df57fcb8db136beb170bc6
2023-01-16 17:03:36 +08:00
wibetter
0dee6b9b4d fix(amis-saas-9318): 内网发版脚本支持amis-postcss替换
Change-Id: I99a3d01a04a285fb7f49a188ca08a75fcd59ac7e
2023-01-16 16:09:29 +08:00
wibetter
48123f5de0 Merge branch 'master' of ssh://icode.baidu.com:8235/baidu/amis/editor
Change-Id: Ia548c2030e1f315f11fa7a93055ff47ef0377641
2023-01-16 15:26:01 +08:00
wibetter
73307a05b9 fix(amis-saas-9318): 完善发版脚本
Change-Id: I6608f6631e085cb530b8a58d2473ab8ff32ebc79
2023-01-16 15:25:39 +08:00
wibetter
c9b021e261 fix(amis-saas-9318): 补充国际化预料
Change-Id: I79fcb566e40d946c3e60c951df0fd8c301ba2b97
2023-01-16 15:00:58 +08:00
igrowp
b9f68c2a8d amis-saas-8146 系统组件中去除静态展示框组件
Change-Id: I8da3f6ba94ddc28bae28e0bc56a9d8469db230c5
2023-01-16 14:58:49 +08:00
zhou999
c1f27597df fix: amis-saas-8146 编辑器editorStor兼容
Change-Id: Ia1c1cbcb88e1b41558a9919c5f16e1be2d67fa44
2023-01-16 14:28:53 +08:00
wangyuzhen01
7fd4cd2ec7 amis-saas-8146 1. 编辑器 plugin 配置属性补齐国际化
Change-Id: Ic68432c757034dc9cb8f8508b68e36485df4d300
2023-01-15 21:11:34 +08:00
jinye
84ad15659f amis-saas-9193 [Feature] 新拖放组件内置的tpl类型默认从富文本改为普通文本
Change-Id: I2839b0aa510909f4c33f987149daac7bd30dbf45
2023-01-11 21:17:16 +08:00
wibetter
c9062ff9ee fix(amis-saas-2815): 发一个正式版本 5.2.3
Change-Id: I264cff733600005b150517c3708109c8b048409e
2023-01-11 18:04:20 +08:00
qkiroc
6e119b1e0b amis-saas-7517 阴影组件bugfix
Change-Id: I595bddfb9519d404d771b86eb12f274b0c97e5dc
2023-01-11 16:09:59 +08:00
igrowp
6adecebbf7 BCE-FE-1181 fix: 去除对scope中description的定义
Change-Id: Idfba0ea79443ade3915a0bfd9ca83184336cb424
2023-01-11 11:06:42 +08:00
igrowp
4ed1b6e09a BCE-FE-1181 fix: 当组件配置description时,公式编辑器tag展示异常
Change-Id: I2cae42aa00ba5c5b9c7d0b66934826d409400481
2023-01-11 10:48:38 +08:00
wibetter
6d1aa48525 fix(amis-saas-9257): 修复快速构建修改配置未更新问题
Change-Id: I919169c2e90f71e459dbd41c55ad6615f33a5663
2023-01-10 18:25:07 +08:00
wutong25
a7a45ec78f Merge "amis-saas-9257 「Bug」页面设计器增删改查组件通过快速构建修改配置后,重新打开配置未更新" into pre-release 2023-01-10 11:50:05 +08:00
igrowp
681f9d6449 amis-saas-9257 「Bug」页面设计器增删改查组件通过快速构建修改配置后,重新打开配置未更新
Change-Id: I982f1a5528a6600394313ff5fedce9b02c61851a
2023-01-09 21:28:21 +08:00
wangyuzhen01
1fc4958c2e amis-saas-8146 collapase/inputNumber/inputRating 修改属性支持国际化
Change-Id: I914bf056f6d316811df6a98de6d4223ffdd31b45
2023-01-09 20:54:47 +08:00
2betop
e200c299a3 amis-saas-7740 可检索支持配置详情
Change-Id: I37027d10ba4826ca327150e4498340a489db7c7f
2023-01-09 18:06:01 +08:00
zhoushengqiang01
436ffc7a21 Merge "fix: combo配置面板优化提测问题 amis-saas-9239" into pre-release 2023-01-09 17:03:46 +08:00
zhou999
5c3a213b21 fix: combo配置面板优化提测问题 amis-saas-9239
Change-Id: I13571724ef504e2417cdcd5942faadacb3c6d36e
2023-01-09 16:47:55 +08:00
lvxiaojiao
cd0cd5ab84 Merge "[amis-saas-8920]:树结构字段视图构建" into pre-release 2023-01-09 16:01:55 +08:00
hsm-lv
f020957f66 [amis-saas-8920]:树结构字段视图构建
Change-Id: I81a865b463aa5f6fde52d40e58c7d1e04c03262a
2023-01-09 16:00:21 +08:00
meerkat-morecats
9b22e23080 amis-saas-9249 [Story] 「isuda」loading细粒度控制排除inputCity组件
Change-Id: Ib11a9ba5317ec6774bcceaf1cba6367aff4db495
2023-01-09 14:30:31 +08:00
zhou999
48d3686dda fix: combo配置面板优化提测问题 amis-saas-9239 & amis-saas-9227
Change-Id: I38fdf2f67aa567e87117d944d1407eb6d5abd9b0
2023-01-09 14:13:10 +08:00
jinye
aab810b47f amis-saas-9224 解决第六批合入pre-release冲突
Change-Id: Id7f211304d4c26005b34b0fdb81e3f3b858280da
2023-01-07 11:56:40 +08:00
wangyuzhen01
ab40f1f387 amis-saas-8146 1. subEditor 透传 amisEnv; 2. 修复重名 schemaTpl
Change-Id: Ie42a07b6b208121acc99d7a7e9f5a65c86086e03
2023-01-06 15:49:36 +08:00
jinye
875d941607 amis-saas-9142 [Bug] 测试:【组件优化第六批】列表list外观配置下的是否显示头部/底部属性配置未生效,CSS类名下的头部/底部配置未生效
Change-Id: Ie554d09fd218f4b37f67c1f742910bf24b977f7e
2023-01-06 15:43:41 +08:00
wutong25
6b7f4fefff 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
65ffa02394 amis-saas-7517 merge
Change-Id: I258dfda0e134d82a16432cfaffe5de804b64d6c1
2023-01-05 22:49:22 +08:00
igrowp
d0eb88dd6f 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
zhou999
d9c14b20c7 fix: combo组件提测问题&input-city提测问题 amis-saas-8992 amis-saas-8901 amis-saas-8899
Change-Id: I30e0f843bc7ebac014e1b23c52c697ac837adee3
2023-01-05 19:30:26 +08:00
igrowp
e9c68e9011 amis-saas-8885 Merge remote-tracking branch 'origin/pre-release' into feat-optimize-6
Change-Id: I90e4427415bd7686abd21aa916f4737bb20b5a33
2023-01-05 17:19:34 +08:00
jinye
9c1347b20a amis-saas-9142 [Bug] 测试:【组件优化第六批】列表list外观配置下的是否显示头部/底部属性配置未生效,CSS类名下的头部/底部配置未生效
Change-Id: I52c67da3e7af30aba2dda9264c3cfc59bab1e3a3
2023-01-05 11:47:40 +08:00
wibetter
b336f08e06 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
8d3650eb1b fix(amis-saas-2815): 优化addChild方法
Change-Id: If016b68cdf7f8d3b7e42170ac5af89b411d0266c
2023-01-05 10:42:27 +08:00
wutong25
3a6ff794e3 Merge "amis-saas-9158 [Bug] 测试:【组件优化第六批】树选择、树下框配置项反了" into feat-optimize-6 2023-01-05 10:22:33 +08:00
wangyuzhen01
3167a38aee amis-saas-8146 合并应用国际化 feature/app-i18n-8146 分支
Change-Id: I51360874e3ee49f2aa4aa55abed7aadfe16570e6
2023-01-05 10:01:35 +08:00
wibetter
26507dfac2 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
4e95de76eb fix(amis-saas-8285): 修复撤销异常问题
Change-Id: Id3488cfc056fadfdda5ba6807f6bb40af1ef8afd
2023-01-04 20:54:14 +08:00
igrowp
890f883e13 amis-saas-9158 [Bug] 测试:【组件优化第六批】树选择、树下框配置项反了
Change-Id: Icfc50d67d1cebf09952b4b94f82b4cacd95af9c5
2023-01-04 20:54:08 +08:00