Impact-吴家豪
d8e5ffcb0e
Fixed merge conflict
2 years ago
treecat-罗群
ecf38254e5
Pull request #3405 : KERNEL-14076 feat: 脚本修复bug,有的没有xtype,null 也是obj类型
...
Merge in VISUAL/fineui from ~TREECAT/fineui:es6 to es6
* commit '7129532c68ac3d954e853979cbfcd047caaf8412':
KERNEL-14076 feat: 脚本修复bug,有的没有xtype,null 也是obj类型
2 years ago
Treecat
7129532c68
KERNEL-14076 feat: 脚本修复bug,有的没有xtype,null 也是obj类型
2 years ago
treecat-罗群
825f83c574
Pull request #3404 : KERNEL-14076 feat: 脚本循环依赖修复 && 无jira 替换 case 全部 xtype
...
Merge in VISUAL/fineui from ~TREECAT/fineui:es6 to es6
* commit '072054c7cddd7b0b7c32d449a2ce9600d6340cd4':
KERNEL-14076 feat: 循环依赖修复 && 无jira 替换 case 全部 xtype
2 years ago
Treecat
072054c7cd
Merge branch 'es6' of ssh://code.fineres.com:7999/~treecat/fineui into es6
...
# Conflicts:
# src/case/button/index.js
# src/case/button/node/node.first.plus.js
# src/case/button/node/node.last.plus.js
# src/case/button/node/node.mid.plus.js
# src/case/button/node/treenode.js
# src/case/button/treeitem/treeitem.js
2 years ago
Treecat
137d8b1431
KERNEL-14076 feat: 循环依赖修复 && 无jira 替换 case 全部 xtype
2 years ago
Joker.Wang-王顺
fba4fa6212
Pull request #3402 : KERNEL-14100 refactor: widget/yearquarter、yearquarterinterval es6化
...
Merge in VISUAL/fineui from ~JOKER.WANG/fineui:es6 to es6
* commit '176b402e0ba76e43385dd5060573bd466fceaef5':
KERNEL-14100 refactor: widget/yearquarter、yearquarterinterval es6化
2 years ago
Crawford.Zhou-周旭
ffa091c286
Pull request #3399 : KERNEL-14105 feat:searchmultitextvaluecombo 的es6化
...
Merge in VISUAL/fineui from ~CRAWFORD.ZHOU/fineui-crawford:es6 to es6
* commit '2f1b527ee38f61453d355e3b6898a5ad8a0e003d':
KERNEL-14105 feat:searchmultitextvaluecombo 的es6化
2 years ago
Zhenfei.Li-李振飞
708a931e9b
Pull request #3403 : KERNEL-14116 refactor: component/allvaluechooser、allvaluemultitextvaluecombo、form
...
Merge in VISUAL/fineui from ~ZHENFEI.LI/fineui:es6 to es6
* commit '88ebbb75adcc0c22fb3bb34fc67d1decabcece69':
KERNEL-14116 refactor: component/allvaluechooser、allvaluemultitextvaluecombo、form
2 years ago
Zhenfei.Li
88ebbb75ad
Merge branch 'es6' of ssh://code.fineres.com:7999/~zhenfei.li/fineui into es6
2 years ago
Joker.Wang-王顺
176b402e0b
KERNEL-14100 refactor: widget/yearquarter、yearquarterinterval es6化
2 years ago
Zhenfei.Li
6b225705fc
KERNEL-14116 refactor: component/allvaluechooser、allvaluemultitextvaluecombo、form
2 years ago
Dailer-刘荣歆
8920b5aff7
Pull request #3401 : update
...
Merge in VISUAL/fineui from ~DAILER/fineui:es6 to es6
* commit '9335c4ef9387defb6a8badd793272365936b749a':
update
2 years ago
zsmj
9335c4ef93
update
2 years ago
impact
f90147006b
KERNEL-14097 refactor: widget/yearmonth、yearmonthinterval ES6化
2 years ago
crawford.zhou
2f1b527ee3
KERNEL-14105 resolve conflict
2 years ago
Dailer-刘荣歆
66e26f3690
Pull request #3394 : update
...
Merge in VISUAL/fineui from ~DAILER/fineui:es6 to es6
* commit '13582d01da4d51209121845c6bd73e9d3a441d93':
update
update
2 years ago
crawford.zhou
ab2eb1f996
KERNEL-14105 feat:searchmultitextvaluecombo 的es6化
2 years ago
zsmj
13582d01da
Merge branch 'es6' of https://code.fineres.com/scm/visual/fineui into es6
...
# Conflicts:
# src/widget/index.js
# src/widget/multilayersingletree/index.js
# src/widget/multilayersingletree/multilayersingletree.combo.js
# src/widget/multilayersingletree/multilayersingletree.insert.search.pane.js
# src/widget/multilayersingletree/multilayersingletree.leveltree.js
# src/widget/multilayersingletree/multilayersingletree.popup.js
# src/widget/multilayersingletree/multilayersingletree.trigger.js
# src/widget/multilayersingletree/node/node.first.plus.js
# src/widget/multilayersingletree/node/node.last.plus.js
# src/widget/multilayersingletree/node/node.mid.plus.js
# src/widget/multilayersingletree/node/node.plus.js
# src/widget/multilayersingletree/treeitem/item.first.treeleaf.js
# src/widget/multilayersingletree/treeitem/item.last.treeleaf.js
# src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js
2 years ago
Dailer-刘荣歆
ef0d7027f7
Merging in latest from upstream (VISUAL/fineui:refs/heads/master)
...
* commit '4c47fa328d2292a9c8f1caeed70b6e0be0db540c':
auto upgrade version to 2.0.20230113121657
auto upgrade version to 2.0.20230112210841
JSY-25995 feat: TextValueCombo 支持 EVENT_BEFORE_POPUPVIEW 事件监听
REPORT-88341 fix: 【专题】【智能运维-平台日志】用户行为-操作用户和模板热度-被访问资源,在ie浏览器下无法点击
2 years ago
zsmj
19ed4a665f
update
2 years ago
superman
a65197eb3b
Merge pull request #216928 in DEC/fineui from master to feature/x
...
* commit '4c47fa328d2292a9c8f1caeed70b6e0be0db540c':
auto upgrade version to 2.0.20230113121657
2 years ago
data
4c47fa328d
auto upgrade version to 2.0.20230113121657
2 years ago
treecat-罗群
db4fe44a0e
Pull request #3396 : KERNEL-14076 refact: es6 脚本识别循环依赖。完成 base 处理。
...
Merge in VISUAL/fineui from ~TREECAT/fineui:es6 to es6
* commit 'ef32e98be6b3b78cb7581568bd78e88f29dace30':
KERNEL-14076 refact: es6 脚本识别循环依赖。完成 base 处理。
2 years ago
Aeolus.Zhang-张敬峥
416cb188d2
Merge pull request #3397 in VISUAL/fineui from DEC/fineui:release/11.0 to master
...
* commit '7ad3a6c8fd609cc55b47a1ca280ed677051177dc':
REPORT-88341 fix: 【专题】【智能运维-平台日志】用户行为-操作用户和模板热度-被访问资源,在ie浏览器下无法点击
2 years ago
superman
1e575ea4bc
Merge pull request #216923 in DEC/fineui from release/11.0 to feature/x
...
* commit '7ad3a6c8fd609cc55b47a1ca280ed677051177dc':
REPORT-88341 fix: 【专题】【智能运维-平台日志】用户行为-操作用户和模板热度-被访问资源,在ie浏览器下无法点击
2 years ago
superman
7ad3a6c8fd
Merge pull request #216922 in DEC/fineui from final/11.0 to release/11.0
...
* commit '601adb7ea2260ff85ed590f52757de2c98dab61c':
REPORT-88341 fix: 【专题】【智能运维-平台日志】用户行为-操作用户和模板热度-被访问资源,在ie浏览器下无法点击
2 years ago
superman
601adb7ea2
Merge pull request #216921 in DEC/fineui from persist/11.0 to final/11.0
...
* commit '07829c468d9aad27e307235b0703f7d5740cdf66':
2 years ago
Treecat
ef32e98be6
Merge branch 'es6' of ssh://code.fineres.com:7999/~treecat/fineui into es6
2 years ago
Treecat
630be6aea0
KERNEL-14076 refact: es6 脚本识别循环依赖。完成 base 处理。
2 years ago
superman
5f837f828a
Merge pull request #216920 in DEC/fineui from master to feature/x
...
* commit '4d3bafb78b1aba2ca7c556682968c2dfa84ba406':
auto upgrade version to 2.0.20230112210841
JSY-25995 feat: TextValueCombo 支持 EVENT_BEFORE_POPUPVIEW 事件监听
2 years ago
Zhenfei.Li-李振飞
399be46c6e
Pull request #3395 : KERNEL-14101 refactor: widget/singleselect、multilayerdownlist、multilayersingletree
...
Merge in VISUAL/fineui from ~ZHENFEI.LI/fineui:es6 to es6
* commit 'b9900a1dcb4f51082f55c89a5ce31186c8193739':
KERNEL-14101 refactor: multilayerdownlist、multilayersingletree
KERNEL-14101 refactor: widget/singleselect
2 years ago
Zhenfei.Li
b9900a1dcb
Merge branch 'es6' of ssh://code.fineres.com:7999/~zhenfei.li/fineui into es6
...
# Conflicts:
# src/widget/index.js
2 years ago
Zhenfei.Li
7c29cb461c
KERNEL-14101 refactor: multilayerdownlist、multilayersingletree
2 years ago
zsmj
99931d45d8
update
2 years ago
Crawford.Zhou-周旭
c8f5811742
Pull request #3393 : KERNEL-14067 feat:year && yearInterval 的es6化
...
Merge in VISUAL/fineui from ~CRAWFORD.ZHOU/fineui-crawford:es6 to es6
* commit '6b1aeb6d9f49def0d7c773be77f926e1efc61d17':
KERNEL-14067 feat:year && yearInterval 的es6化
2 years ago
data
4d3bafb78b
auto upgrade version to 2.0.20230112210841
2 years ago
Renzo.Ruan-阮宗伟
6530b16574
Pull request #3381 : JSY-25995 feat: TextValueCombo 支持 EVENT_BEFORE_POPUPVIEW 事件监听
...
Merge in VISUAL/fineui from ~RENZO.RUAN/a-fineui-r:master to master
* commit 'eabdc4aafa4a3292adcd5ae68831427ef16507dc':
JSY-25995 feat: TextValueCombo 支持 EVENT_BEFORE_POPUPVIEW 事件监听
2 years ago
Zhenfei.Li
f32af40f0f
KERNEL-14101 refactor: widget/singleselect
2 years ago
crawford.zhou
6b1aeb6d9f
KERNEL-14067 feat:year && yearInterval 的es6化
2 years ago
treecat-罗群
4e38506ea9
Pull request #3392 : 无jira fix: xtype 搞错了
...
Merge in VISUAL/fineui from ~TREECAT/fineui:es6 to es6
* commit 'a6cc9b9ebf78f7ce9aace281036eeee0b44bd335':
无jira fix: xtype 搞错了
2 years ago
Treecat
a6cc9b9ebf
无jira fix: xtype 搞错了
2 years ago
Zhenfei.Li-李振飞
fc04f09227
Pull request #3391 : 无JIRA任务 fix: 修复pane.list的bug
...
Merge in VISUAL/fineui from ~ZHENFEI.LI/fineui:es6 to es6
* commit '8fa373e05250b1520eb903e243e3ffc4c2ada898':
无JIRA任务 fix: 修复pane.list的bug
无JIRA任务 fix: TextValueCombo的引用正常
2 years ago
treecat-罗群
71931c2ff4
Pull request #3389 : KERNEL-14076 feat:递归xtype合并 import
...
Merge in VISUAL/fineui from ~TREECAT/fineui:es6 to es6
* commit '0aee12d56b4d44fbb9f18607e471ad6d0f72a0e5':
KERNEL-14076 feat:递归xtype合并 import
2 years ago
Dailer-刘荣歆
2d36fe30b9
Pull request #3390 : update
...
Merge in VISUAL/fineui from ~DAILER/fineui:es6 to es6
* commit '06eb3bdaed4283a2ee095a85b258e5a09e0fd894':
update
2 years ago
Zhenfei.Li
8fa373e052
Merge branch 'es6' of ssh://code.fineres.com:7999/~zhenfei.li/fineui into es6
2 years ago
zsmj
06eb3bdaed
Merge branch 'es6' of ssh://code.fineres.com:7999/~dailer/fineui into es6
2 years ago
zsmj
c3dd73622f
update
2 years ago
Treecat
0aee12d56b
Merge branch 'es6' of ssh://code.fineres.com:7999/~treecat/fineui into es6
2 years ago
Treecat
27c6956b1d
KERNEL-14076 feat:递归xtype合并 import
2 years ago