Commit Graph

348 Commits

Author SHA1 Message Date
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
wutong25
53d637aba0 Merge "amis-saas-6892 fix: 长文本下拉菜单hover移出后未消失问题" into fix-fx-formula 2022-11-03 17:55:45 +08:00
igrowp
814d5b3651 amis-saas-6892 fix: 长文本下拉菜单hover移出后未消失问题
Change-Id: I89042270212884be77a79e63b7c74b2e3fe7c646
2022-11-03 17:54:35 +08:00
jiatianqi
795eae22b4 Merge "amis-saas-6892 [Feature] 编辑器fx 交互优化" into fix-fx-formula 2022-11-03 14:02:36 +08:00
jiatianqi
54319dae2d amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I7df9e9895136678df0eae3bb762c265c9a4a1e4e
2022-11-03 13:16:45 +08:00
wutong25
e6ab70b1ea Merge "amis-saas-6892 fix: 修改事件动作按钮宽度" into fix-fx-formula 2022-11-02 20:28:52 +08:00
igrowp
62659ed6dc amis-saas-6892 fix: 修改事件动作按钮宽度
Change-Id: Id0521a39ad882a101d6dc3e8545c17c645d3b9f6
2022-11-02 20:22:02 +08:00
wibetter
471ee862e8 fix(amis-saas-7727): 细节完善
Change-Id: I3d31df6e101be39a6fbc2372c700b1fcae62b75e
2022-11-02 19:22:29 +08:00
jiatianqi
1128b7f51a amis-saas-6890 [Story] 「editor整体」样式问题修复
Change-Id: Icf8ebfc1ab6a7289758abffe1de5ab25c67e9474
2022-11-02 19:03:02 +08:00
igrowp
fe8a7634de amis-saas-6892 fix: 样式调整
Change-Id: I9f24c898268d8bbdc2c6c4a67b214124008910e2
2022-11-02 17:42:05 +08:00
igrowp
468614a417 amis-saas-6892 fix: 长文本输入框表达式提示样式调整
Change-Id: Ie687148b058931b26f79f93cf0b635faa0d9924d
2022-11-02 16:42:47 +08:00
jiatianqi
96fba371ec Merge branch 'pre-release' into fix-fx-formula 2022-11-02 10:01:35 +08:00
jiatianqi
e470882ee7 amis-saas-6890 [Story] 增加css权重,覆盖amis样式
Change-Id: I87999ed1e09a26004effc090eaae84daf6e8c83e
2022-11-01 20:07:17 +08:00
jiatianqi
2054602566 Merge branch 'pre-release' into fix-fx-formula 2022-11-01 19:22:58 +08:00
wutong25
1057485a3c Merge changes Iaa7a4fb7,Ia0998f0b,Id04fddb5,I7e047a08,Iab086db2 into fix-fx-formula
* changes:
  amis-saas-6892 fix: 长文本输入框支持折行
  amis-saas-6892 fix: 长文本公式输入框支持全屏
  amis-saas-6892 fix: 长文本公式输入框基于codeMirror实现
  amis-saas-7603 feat: 纯表达式输入框
  amis-saas-6892 feat: 长文本公式输入框
2022-11-01 17:52:26 +08:00
igrowp
a5e4ada6ce amis-saas-6892 fix: 长文本输入框支持折行
Change-Id: Iaa7a4fb7c46588fd29e87020af0dcacc1c5d031c
2022-11-01 17:47:33 +08:00
jiatianqi
1c395af774 amis-saas-7731 [Bug] 升级amis版本后,问题不能复现
Change-Id: I9c651fc561ed8a8b896ba0de395dcfb9cc8522a5
2022-11-01 17:36:57 +08:00
jiatianqi
eb6dbe918a amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: I8024b4c76232cc8c2429fc83838cd9bef6bf01f0
2022-11-01 15:16:49 +08:00
jiatianqi
a5427be09d amis-saas-6069 [Improvement.] 测试【编辑器「剪切配置」】剪切配置后ui显示不正确
Change-Id: I3eef34a4a75a768b99242c2d3baad0c3bf0bed9f
2022-11-01 11:44:31 +08:00
wibetter
860f371e83 fix(amis-saas-4371): 常见布局组件改为非内置,放示例中
Change-Id: Ie2791f4f3a942ac40b2321da8f2661782c04f45e
2022-11-01 11:40:23 +08:00
jiatianqi
a85d435fd6 amis-saas-6892 [Feature] 编辑器fx 交互优化
Change-Id: Ia669d4abaed1ac0c19ebb0d09df6ac20f0a9a307
2022-10-31 19:59:40 +08:00
wibetter
11b8e2ecb5 fix: 同步主干最新代码
Change-Id: I1be20cd91bf2bad336df84de8c60ec435027401a
2022-10-31 17:04:02 +08:00
jiatianqi
22b599e3b2 Merge branch 'feature-datapicker-shortcut-improve' into pre-release 2022-10-31 16:31:35 +08:00
igrowp
afc636edff amis-saas-6892 fix: 长文本公式输入框支持全屏
Change-Id: Ia0998f0baeaa4c9e4f359e6b87b77fbb4226d953
2022-10-31 16:21:45 +08:00
igrowp
35c05ef045 amis-saas-6892 fix: 长文本公式输入框基于codeMirror实现
Change-Id: Id04fddb52e9591ba42c66505ea4c00cea3a97122
2022-10-31 16:21:44 +08:00
igrowp
e4103d697d amis-saas-7603 feat: 纯表达式输入框
Change-Id: I7e047a08bfeb638d9d8e21a00d7fe9db66b1d5b1
2022-10-31 16:21:43 +08:00
igrowp
14a12a3fd0 amis-saas-6892 feat: 长文本公式输入框
Change-Id: Iab086db2c39626d0d4e30679f1ed3d0a45b42225
2022-10-31 16:21:43 +08:00
jiatianqi
7be12b4ae8 Auto Resolve Conflict To Branch fix-fx-formula By iCode
Change-Id: I1cd2811b9e3b47bbd51ef712b7adde8cd5c4dac1
2022-10-31 15:52:06 +08:00
jiatianqi
7b0351fba0 publish 5.2.1 [amis-saas-5962]
Change-Id: I811536639134dfb598dc248577bc181ed12b4873
2022-10-31 15:42:46 +08:00
wibetter
59bf4a9c79 fix(amis-saas-7728): 修复右侧配置面板外观样式设置弹窗展示问题
Change-Id: I096803a0ac1406e18f152047bde783296f7336a3
2022-10-27 17:58:21 +08:00
hsm-lv
147da96cb8 [amis-saas-7150]:选择组件下拉字体大小问题
Change-Id: Id3acd1e446c08b8c715dcddcbfc73c342eafa0e6
2022-10-26 20:17:34 +08:00
jiatianqi
5e7a6ecc18 amis-saas-6348 publish 5.2.0-beta.87
Change-Id: I572dc114cf48a4fa595ad89145a76309976b54b0
2022-10-24 21:13:59 +08:00
hsm-lv
faf246d4b9 [amis-saas-7667]:国际化补充
Change-Id: Ia5bbd8b55d99e86da4155876c82b5bf98e599a51
2022-10-24 16:48:44 +08:00
jiatianqi
1cbeff98a4 amis-saas-7665 [Improvement.] 「page页面」当展示区域仅有[内容区] 也展示头部标签
Change-Id: I134fbf5b1e624330c234e8f0064e86fda8add805
2022-10-24 14:53:12 +08:00
qkiroc
9af60f1820 amis-saas-7517 主题国际化
Change-Id: Ia339c54ab19916b2fc90b7e9905efb17c543e06b
2022-10-21 23:53:08 +08:00
jiatianqi
de945447ea amis-saas-5962 发版5.2.0-beta.84 版本,第五批遗留问题的修复
Change-Id: I87d06c97f01c6c84d419653a18c92e20445c0960
2022-10-20 20:42:24 +08:00
jiatianqi
0fb509f75b amis-saas-7072 [Bug] 弹窗配置的时候,如果内容超出页面高度,滚动的时候组件会有点卡
Change-Id: Iac3b0df3f061ef415efccef564f053ca121ba43b
2022-10-20 15:33:33 +08:00
wanglinfang
f569f22c0a amis-saas-7476 table2字段调整
Change-Id: I20cd6c63447a08785ae5de1d3477033a0a98871d
2022-10-19 15:38:10 +08:00
hsm-lv
4089b275e1 [amis-saas-7476]:几个build warging
Change-Id: I4bce64b31260d9f1d53e0f8e9969e5eb8488b5e4
2022-10-18 20:39:38 +08:00
zhuwei11
35c6428065 amis-saas-7483 国际化翻译
Change-Id: I92dd039d927ce5c4b3203af38b75a01ed304452e
2022-10-14 19:42:53 +08:00
qinhaoyan
369ac2229c Merge "amis-saas-2569 图标select回滚" into pre-release 2022-10-14 12:50:05 +08:00
qkiroc
e29a86bd85 amis-saas-2569 图标select回滚
Change-Id: I8c5195e43e5b0a698c65a2b927450422bf4413ef
2022-10-14 12:22:11 +08:00
donglinan
9f2e94f24c Merge "amis-saas-7452 [Feature] 隐藏状态文案未翻译" into pre-release 2022-10-14 11:31:33 +08:00
donglinan
337cca42c1 amis-saas-7452 [Feature] 隐藏状态文案未翻译
Change-Id: I5437fa1500492e005da1bd83df9738eec2401080
2022-10-14 11:25:34 +08:00
2betop
146029bbee amis-saas-638 [项目] 本地开发升级最新的 amis
Change-Id: Iead66c146e0fff228a0b428f5d01251843cafe37
2022-10-13 21:32:47 +08:00
zhuwei11
a3355a31c5 Merge "amis-saas-7483 补充文案翻译" into pre-release 2022-10-13 20:21:45 +08:00
zhuwei11
76f40758df amis-saas-7483 补充文案翻译
Change-Id: I2c89ec96b21f356071a497b333c4cabe38c12cb7
2022-10-13 20:15:30 +08:00
liaoxuezhi
f99dc8e573 Merge "amis-saas-638 [项目] editor 开发环境将 fis3 改成 vite" into pre-release 2022-10-13 17:29:11 +08:00
2betop
e92ea86ff1 amis-saas-638 [项目] editor 开发环境将 fis3 改成 vite
Change-Id: Ibb411ffdd2310b6ae15692e4e874c6f80d11f133
2022-10-13 16:56:30 +08:00
qkiroc
6eaaeb623e amis-saas-2569 修复国际化
Change-Id: Ida8e10dcc47c0087345e7b50dc9eac338b175ed3
2022-10-13 13:10:10 +08:00
qkiroc
4127bf92fa Merge branch 'feat-theme-editor' into pre-release 2022-10-12 14:48:10 +08:00
hongyang03
0554c0f10d amis-saas-6716 样式修复
Change-Id: Idb2de768c90054b64587407884731461f40f4716
2022-10-12 14:46:09 +08:00
qkiroc
5488e920f3 amis-saas-2569 国际化版本
Change-Id: I857f4288467cdb263fde832a62174756d9bfb1ec
2022-10-12 11:45:25 +08:00
qinhaoyan
70a003e98f Merge "amis-saas-2569 修复国际化问题" into pre-release 2022-10-12 11:31:07 +08:00
qkiroc
f85d2669a0 amis-saas-2569 修复国际化问题
Change-Id: Ia73072b6163b2ccf8f5167f236d0688eb01337cd
2022-10-12 11:30:35 +08:00
lvxiaojiao
189f1cd644 Merge "[amis-saas-7408]:优化刷新动作配置,增加数据追加控制" into pre-release 2022-10-11 22:06:06 +08:00
hsm-lv
3298d19a20 [amis-saas-7408]:优化刷新动作配置,增加数据追加控制
Change-Id: If0cab922f8b40b092c22edfc865ceab09a2a83c2
2022-10-11 21:42:28 +08:00
qinhaoyan
4d5d6a2102 Merge changes Id8f1657d,Iabaacca1 into pre-release
* changes:
  amis-saas-6436  国际化翻译更新
  amis-saas-2569 merge
2022-10-09 16:07:09 +08:00
zhuwei11
c82ac0a973 Merge "amis-saas-7346 [Story] switch描述文案展示修复+tooltip title字号调整" into pre-release 2022-09-30 16:02:50 +08:00
zhuwei11
13d7852931 amis-saas-7346 [Story] switch描述文案展示修复+tooltip title字号调整
Change-Id: Id6c080a0981b95c63c0e429c222709041f56207c
2022-09-30 15:51:26 +08:00
lvxiaojiao
9070a3ecc0 Merge "[amis-saas-5165]:恢复分栏占位样式" into pre-release 2022-09-30 15:28:00 +08:00
hsm-lv
6b6061e145 [amis-saas-5165]:恢复分栏占位样式
Change-Id: I1a046da396b632a97667fab464d0a9bc8203caae
2022-09-30 15:21:21 +08:00
jiatianqi
149a5e6349 amis-saas-7377 「commbo提示」存在删除、可拖拽的tooltip提示被遮盖 &导致出现横向滚动条
Change-Id: I8698621b4e87b3de34eb3269ae1f8d7990fce3fb
2022-09-30 11:56:38 +08:00
qkiroc
75d63d8990 amis-saas-2569 merge
Change-Id: Iabaacca109f45a703dadb4b0ebe0b505547e325b
2022-09-30 11:11:08 +08:00
jiatianqi
69c0e4e0d1 amis-saas-7371 「英文换行间距」调整同行文案换行后的行高
Change-Id: I9f7352fefbaa3160f37b7808b295d9706df09852
2022-09-30 10:28:00 +08:00
jiatianqi
3d94c90f26 amis-saas-7370 「文案调整」英文翻译调整
Change-Id: Iba57b6fc375ff4db7c8cd710e172c0e60ffdac8c
2022-09-30 10:24:32 +08:00
zhou999
eb0fb27b32 feat: 「日期范围快捷键」快捷键优化调整 amis-saas-7301
Change-Id: Icc94132831faacb2730e532f5766f7da53084ab1
2022-09-29 14:14:22 +08:00
qinhaoyan
e8dd4030ba Merge changes I32832257,I8a6c16b3,I2fa8fa11 into pre-release
* changes:
  amis-saas-2569 更新国际化
  amis-saas-2569 更新国际化
  amis-saas-2569 修改脚本
2022-09-28 15:58:13 +08:00
qkiroc
69bbdf92a9 amis-saas-2569 更新国际化
Change-Id: I32832257c9c721dc4087ce4f8672f0d8edd3ee40
2022-09-28 15:57:37 +08:00
qkiroc
fe009ce6f9 amis-saas-2569 更新国际化
Change-Id: I8a6c16b3be93ed344043e978912ebe5f1528de12
2022-09-28 14:53:47 +08:00
jiatianqi
eb655b738a Merge branch 'master' into pre-release 2022-09-28 14:47:26 +08:00
qkiroc
7ced2e46c4 amis-saas-6436 国际化翻译更新
Change-Id: Ie5afbf3e26049e2b2c44680f8dd3ee9065bafa3f
2022-09-27 18:41:18 +08:00
qkiroc
9e6a965b71 amis-saas-2569 merge
Change-Id: I82bd022172e13d3a604b7ebb49a4384357f89e24
2022-09-27 16:57:12 +08:00
qkiroc
287364350b amis-saas-2569 国际化更新
Change-Id: I212cbf23f38ec40a05b5d25cc15570282a0f1d52
2022-09-27 16:53:46 +08:00
jiatianqi
2803ad0a6a Merge branch 'pre-release' into master 2022-09-27 10:26:52 +08:00
jiatianqi
41ea48ecec amis-saas-7237 [Bug] dropdown-button组件在使用时传入 popOverContainer: null情况下,buttons属性内容会渲染在当前层级下
Change-Id: I1909b4e11b2b8efff0ee37221c42753d9ee15419
2022-09-23 19:16:58 +08:00
hsm-lv
717074876b [amis-saas-5962]:修复动作列表样式问题
Change-Id: Ia2754d95460b4c39b13cad629eed8979c0879f76
2022-09-23 12:40:23 +08:00
qkiroc
f85a0138f6 amis-saas-7199 国际化翻译更新
Change-Id: Iee05446320fb3dbf39ba07b570a9dec974e7c37a
2022-09-23 10:17:53 +08:00
jiatianqi
3f1a89f26d amis-saas-6892 [Feature] fx公式函数ResultBox回显输入框左间距为0的样式优化
Change-Id: Ia70572c7474562213d360f0f51064cf888f67d61
2022-09-22 19:15:47 +08:00
jiatianqi
3a8477b9e6 amis-saas-5962 [随机卡片] 发版5.2.0-beta.74
Change-Id: Id487117954891bea2971d47515ee20573ea3b188
2022-09-20 16:35:40 +08:00