superman
985f5347e7
Merge pull request #37836 in DEC/fineui from master to feature/x
...
* commit '576e5a61b543a85b597b5ec87f159051843c35e5':
无JIRA任务 路由问题
无JIRA任务 格式
无JIRA任务 router支持base和mode
无JIRA任务 router支持base和mode
3 years ago
Kobi
576e5a61b5
Pull request #2701 : 无JIRA任务 路由问题
...
Merge in VISUAL/fineui from ~KOBI/fineui:master to master
* commit 'b36b1a4690ead1975157263f5d6efc6ab8e75662':
无JIRA任务 路由问题
无JIRA任务 格式
无JIRA任务 router支持base和mode
无JIRA任务 router支持base和mode
3 years ago
Kobi
b36b1a4690
无JIRA任务 路由问题
3 years ago
Kobi
9fbbff7dea
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/router/router.js
3 years ago
zsmj
46a7c0406b
无jira SearchTextValueCombo 的布局修正
3 years ago
zsmj
38d6513473
Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui
3 years ago
zsmj
b99ef8a9bc
无JIRA item存在el的情况下,也同时支持_lgap和lgap
3 years ago
data
8979681c34
auto upgrade version to 2.0.20220513150627
3 years ago
superman
7554ff51df
Merge pull request #34644 in DEC/fineui from master to feature/x
...
* commit '8979681c34f938abb472ca016751a847dd6115f6':
auto upgrade version to 2.0.20220513150627
3 years ago
superman
e936afcd38
Merge pull request #34636 in DEC/fineui from master to feature/x
...
* commit '358bb81b9c6c5eaae2f7cf0d86c76654dcc35045':
3 years ago
Aeolus.Zhang
358bb81b9c
Merge pull request #2699 in VISUAL/fineui from DEC/fineui:feature/x to master
...
* commit '07d9a0acfb70fa1075abbe69be2c833d7dcc87c6':
3 years ago
superman
07d9a0acfb
Merge pull request #34632 in DEC/fineui from master to feature/x
...
* commit '5d6b48046ecf575f287790fb2eb9eaba90413427':
无jira任务 删除树组件iconWrapperWidth属性
无jira任务,selecttree组件没传iconWidth:o.height导致全局配置尺寸后icon大小没变
3 years ago
Aeolus.Zhang
5d6b48046e
Pull request #2685 : 无jira任务,selecttree组件没传iconWidth:o.height导致全局配置尺寸后icon大小没变
...
Merge in VISUAL/fineui from ~AEOLUS.ZHANG/fineui:master to master
* commit '511ebb73abd53e54e484727441ee33af1f7f7aeb':
无jira任务 删除树组件iconWrapperWidth属性
无jira任务,selecttree组件没传iconWidth:o.height导致全局配置尺寸后icon大小没变
3 years ago
data
8520baf219
auto upgrade version to 2.0.20220513141559
3 years ago
superman
f6a1d98866
Merge pull request #34608 in DEC/fineui from master to feature/x
...
* commit '8520baf219155d3f83d996fbcab435b28183b759':
auto upgrade version to 2.0.20220513141559
3 years ago
superman
6e0008cd5f
Merge pull request #34595 in DEC/fineui from master to feature/x
...
* commit 'f96401b737776a8d5d053be71edd28cd674ba894':
3 years ago
Aeolus.Zhang
f96401b737
Merge pull request #2698 in VISUAL/fineui from DEC/fineui:feature/x to master
...
* commit 'c90442b517923c08b7779a3178926d27531b7e80':
3 years ago
superman
c90442b517
Merge pull request #34591 in DEC/fineui from master to feature/x
...
* commit '2bcdb80e2f8ece41b876a0db4cc3cc8bc41d1f5b':
DESIGN-4103 feat: 补充可搜索trigger的less
3 years ago
Dailer
2bcdb80e2f
Pull request #2697 : DESIGN-4103 feat: 补充可搜索trigger的less
...
Merge in VISUAL/fineui from ~DAILER/fineui:master to master
* commit '3518e6038a2f4f1665543fb87eb74b2288449a28':
DESIGN-4103 feat: 补充可搜索trigger的less
3 years ago
superman
3f2d26be4b
Merge pull request #34587 in DEC/fineui from master to feature/x
...
* commit 'e7583741769ea806e74bc1cd3f0bd188176ed9d6':
3 years ago
zsmj
3518e6038a
Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui
3 years ago
zsmj
cbc86f1589
DESIGN-4103 feat: 补充可搜索trigger的less
3 years ago
Aeolus.Zhang
e758374176
Merge pull request #2696 in VISUAL/fineui from DEC/fineui:feature/x to master
...
* commit '4e6f33bc0fed3b5b1da63f91da7f20b044436e3c':
3 years ago
superman
4e6f33bc0f
Merge pull request #34583 in DEC/fineui from master to feature/x
...
* commit '2c3bf54dd696dc3bc240ed813023a67738e1dc8d':
feature: 布局优化写法,提供系统配置
feature: 布局优化写法,提供系统配置
3 years ago
guy
2c3bf54dd6
Pull request #2695 : 无JIRA任务 feature: 布局优化写法,提供系统配置
...
Merge in VISUAL/fineui from ~GUY/fineui:master to master
* commit '0cb5d35b243edbeb5b1cc8371787aed7a66fdf78':
feature: 布局优化写法,提供系统配置
feature: 布局优化写法,提供系统配置
3 years ago
guy
0cb5d35b24
feature: 布局优化写法,提供系统配置
3 years ago
guy
b2abf387d5
feature: 布局优化写法,提供系统配置
3 years ago
data
c69f37ed5e
auto upgrade version to 2.0.20220513105417
3 years ago
superman
1e758b7e1c
Merge pull request #34439 in DEC/fineui from master to feature/x
...
* commit 'c69f37ed5e8af0c27e6d11c54b74838995bfaff1':
auto upgrade version to 2.0.20220513105417
3 years ago
superman
b6e3c9b09f
Merge pull request #34431 in DEC/fineui from master to feature/x
...
* commit 'ffd6d5f571fb7207fd6d32aadd61163364524d8a':
3 years ago
Aeolus.Zhang
ffd6d5f571
Merge pull request #2694 in VISUAL/fineui from DEC/fineui:feature/x to master
...
* commit '0dead20bd020db1e91e634efb8d91ac281f03775':
3 years ago
superman
0dead20bd0
Merge pull request #34427 in DEC/fineui from master to feature/x
...
* commit '5eab7cfce9a22eec2e8d050fcf6903be9a6b6e11':
feature: 布局优化写法,为系统配置做准备
feature: 布局优化写法,为系统配置做准备
feature: 布局优化写法,为系统配置做准备
3 years ago
guy
5eab7cfce9
Pull request #2693 : 无JIRA任务 feature: 布局优化写法,为系统配置做准备
...
Merge in VISUAL/fineui from ~GUY/fineui:master to master
* commit 'cfc3a7e318caf9747e1590cbf25c16497fac74df':
feature: 布局优化写法,为系统配置做准备
feature: 布局优化写法,为系统配置做准备
feature: 布局优化写法,为系统配置做准备
3 years ago
guy
cfc3a7e318
feature: 布局优化写法,为系统配置做准备
3 years ago
guy
06e450d1ef
feature: 布局优化写法,为系统配置做准备
3 years ago
superman
b2c565870e
Merge pull request #34407 in DEC/fineui from bugfix/11.0 to feature/x
...
* commit 'f7f5ada2940fdfc96cdb4eefb5c4f759926dcdd2':
3 years ago
superman
f7f5ada294
Merge pull request #34406 in DEC/fineui from release/11.0 to bugfix/11.0
...
* commit '79981dc7d794348faf7eacc9843bc5cabe255bd3':
Pull request #2666 : REPORT-70807 修复年份日期控件水印只显示无限制
3 years ago
guy
ff22d7cb2e
feature: 布局优化写法,为系统配置做准备
3 years ago
data
8fcbd10459
auto upgrade version to 2.0.20220512173520
3 years ago
superman
d4ca2841c9
Merge pull request #33603 in DEC/fineui from master to feature/x
...
* commit '8fcbd104593e93e17807439087e9be624c8bba02':
auto upgrade version to 2.0.20220512173520
3 years ago
superman
a78163d89b
Merge pull request #33591 in DEC/fineui from master to feature/x
...
* commit '8a3728ed2b63f9249cf0ac2aec8923074bff5dad':
3 years ago
Aeolus.Zhang
8a3728ed2b
Merge pull request #2692 in VISUAL/fineui from DEC/fineui:feature/x to master
...
* commit '6cc70f16f82bdd551ede233e0d82b714a24e247c':
3 years ago
superman
6cc70f16f8
Merge pull request #33587 in DEC/fineui from master to feature/x
...
* commit 'e8ca9e71b15e4683e1126e9a8fbab6c45c5aa34a':
Revert "feature: 布局支持_lgap"
Revert "feature: 布局支持_lgap"
3 years ago
Dailer
e8ca9e71b1
Pull request #2691 : Revert "feature: 布局支持_lgap"
...
Merge in VISUAL/fineui from ~DAILER/fineui:master to master
* commit '6b4d0dbb3417319311bbcd86706b37cce935d582':
Revert "feature: 布局支持_lgap"
Revert "feature: 布局支持_lgap"
3 years ago
zsmj
6b4d0dbb34
Revert "feature: 布局支持_lgap"
...
This reverts commit 6cce574f7e
.
3 years ago
zsmj
490cf3ff2e
Revert "feature: 布局支持_lgap"
...
This reverts commit 5eeec69323
.
3 years ago
data
39a8714d8d
auto upgrade version to 2.0.20220512151342
3 years ago
superman
77b98a7dac
Merge pull request #33491 in DEC/fineui from master to feature/x
...
* commit '39a8714d8d15d45166ebe45338cd5ea96ebf28b2':
auto upgrade version to 2.0.20220512151342
3 years ago
superman
5a557ef89d
Merge pull request #33479 in DEC/fineui from master to feature/x
...
* commit '8e9ac80e2f1367c18798f0ab43b2536786d48d51':
3 years ago
Aeolus.Zhang
8e9ac80e2f
Merge pull request #2690 in VISUAL/fineui from DEC/fineui:feature/x to master
...
* commit '93b556477a627453495587ada88c1b753f86af76':
3 years ago