7cb688f4cb
Merge branch 'master' into es6
...
# Conflicts:
# dist/fix/fix.js
# dist/font/iconfont.woff
# dist/font/iconfont.woff2
# package.json
# packages/fineui/src/core/wrapper/layout/adapt/adapt.leftrightvertical.js
# packages/fineui/src/core/wrapper/layout/layout.border.js
# src/base/collection/collection.js
# src/base/combination/group.combo.js
# src/base/combination/loader.js
# src/base/combination/searcher.js
# src/base/pager/pager.js
# src/base/single/input/input.js
# src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
# src/case/combo/textvaluecombo/combo.textvaluesmall.js
# src/case/combo/textvaluecombo/popup.textvalue.js
# src/case/layer/pane.list.js
# src/case/loader/loader.list.js
# src/case/trigger/trigger.editor.js
# src/case/trigger/trigger.text.js
# src/case/trigger/trigger.text.select.js
# src/component/allvaluechooser/combo.allvaluechooser.js
# src/core/2.base.js
# src/core/4.widget.js
# src/core/5.inject.js
# src/core/6.plugin.js
# src/core/listener/listener.show.js
# src/core/platform/web/dom.js
# src/core/structure/tree.js
# src/core/utils/events/mousemovetracker.js
# src/core/wrapper/layout/adapt/absolute.leftrightvertical.js
# src/core/wrapper/layout/fill/float.fill.horizontal.js
# src/core/wrapper/layout/flex/flex.leftrightvertical.center.js
# src/core/wrapper/layout/float/float.absolute.leftrightvertical.js
# src/core/wrapper/layout/layout.card.js
# src/core/wrapper/layout/layout.division.js
# src/core/wrapper/layout/layout.grid.js
# src/core/wrapper/layout/layout.tape.js
# src/core/wrapper/layout/layout.window.js
# src/core/wrapper/layout/middle/middle.center.js
# src/core/wrapper/layout/middle/middle.float.center.js
# src/core/wrapper/layout/middle/middle.horizontal.js
# src/core/wrapper/layout/middle/middle.vertical.js
# src/less/base/single/text.less
# src/widget/intervalslider/intervalslider.js
# src/widget/multiselect/loader.js
# src/widget/multiselectlist/multiselectlist.insert.js
# src/widget/multiselecttree/multiselecttree.js
# src/widget/multitree/check/multi.tree.check.pane.js
# src/widget/singleselect/singleselectlist.insert.js
# src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
# src/widget/timeinterval/dateinterval.js
# src/widget/yearmonthinterval/yearmonthinterval.js
# webpack/webpack.prod.js
2 years ago
1dae060c87
Pull request #3564 : 无jira: 别名跳转
...
Merge in VISUAL/fineui from ~TREECAT/fineui:es6 to es6
* commit 'bb58d5dc22b611f21f5c6e9c2c01a7d2f6d8f264':
无jira: 别名跳转
2 years ago
bb58d5dc22
Merge branch 'es6' of ssh://code.fineres.com:7999/~treecat/fineui into es6
2 years ago
d03601f2b3
无jira: 别名跳转
2 years ago
Dailer-刘荣歆
14999fdcbb
Pull request #3563 : 无JIRA 支持对组件config依赖资源
...
Merge in VISUAL/fineui from ~DAILER/fineui:es6 to es6
* commit '6b670da2f02d4d1d6bc044ca5baa815d0eb3afba':
无JIRA 支持对组件config依赖资源
2 years ago
6b670da2f0
无JIRA 支持对组件config依赖资源
2 years ago
d07f9fdc0c
auto upgrade version to 2.0.20230519095630
2 years ago
037f62866d
Merge pull request #3562 in VISUAL/fineui from DEC/fineui:release/11.0 to master
...
* commit 'eeebb1a623c01a745ad9ebfe9402900e31bf4aeb':
BI-126486 fix: 分组表滚动条拖不动【样板客户】
2 years ago
Dailer-刘荣歆
eeebb1a623
Pull request #238967 : BI-126486 fix: 分组表滚动条拖不动【样板客户】
...
Merge in DEC/fineui from ~DAILER/fineui-decision:release/11.0 to release/11.0
* commit '9f92e1cb715c50e1f2b46bd20443d7560655ea10':
BI-126486 fix: 分组表滚动条拖不动【样板客户】
2 years ago
Dailer-刘荣歆
9f92e1cb71
BI-126486 fix: 分组表滚动条拖不动【样板客户】
2 years ago
Dailer-刘荣歆
4694f554da
Pull request #3561 : BI-126486 fix: 分组表滚动条拖不动【样板客户】
...
Merge in VISUAL/fineui from ~DAILER/fineui:es6 to es6
* commit 'cc075cc34cab2a451e96320e7c38dc2e255fdca4':
BI-126486 fix: 分组表滚动条拖不动【样板客户】
2 years ago
cc075cc34c
Merge branch 'es6' of ssh://code.fineres.com:7999/~dailer/fineui into es6
2 years ago
6c5f5dd4f4
BI-126486 fix: 分组表滚动条拖不动【样板客户】
2 years ago
fb1e39d88a
Pull request #3560 : 无jira chore:类型补充
...
Merge in VISUAL/fineui from ~TREECAT/fineui:es6 to es6
* commit '5e28bce21088a8cbe525ce7abef6d35f90f021f8':
无jira chore:类型补充
2 years ago
5e28bce210
Merge branch 'es6' of ssh://code.fineres.com:7999/~treecat/fineui into es6
2 years ago
319fe62cd2
无jira chore:类型补充
2 years ago
af0081d73f
Merge pull request #238914 in DEC/fineui from master to feature/x
...
* commit '0f89570ec5ff2f73ffb75f9e70f608ccaf4c13c1':
auto upgrade version to 2.0.20230518101454
JSY-29426 fix:绑定空值时与刷新后展示不同
2 years ago
0f89570ec5
auto upgrade version to 2.0.20230518101454
2 years ago
75d9094bd2
Pull request #3556 : JSY-29426 fix:绑定空值时与刷新后展示不同
...
Merge in VISUAL/fineui from ~CLAIRE.TANG/fineui:master to master
* commit 'd51f921317ea09cf482ce1808978f225e461c549':
JSY-29426 fix:绑定空值时与刷新后展示不同
2 years ago
Dailer-刘荣歆
fc4c1b3f47
Pull request #3558 : update
...
Merge in VISUAL/fineui from ~DAILER/fineui:es6 to es6
* commit '9c0eeea546624d2a9a0cbf9a5a3341a7bc82a84e':
update
2 years ago
9c0eeea546
update
2 years ago
Dailer-刘荣歆
3500534a70
Pull request #3557 : update 导出el
...
Merge in VISUAL/fineui from ~DAILER/fineui:es6 to es6
* commit '941c1b955333178451c2443e2836acdca8257c0d':
update 导出el
2 years ago
941c1b9553
update 导出el
2 years ago
d51f921317
JSY-29426 fix:绑定空值时与刷新后展示不同
2 years ago
Dailer-刘荣歆
b1f2a92bbf
Pull request #3555 : 无JIRA 抽象类就不用shortcut了
...
Merge in VISUAL/fineui from ~DAILER/fineui:es6 to es6
* commit 'a867349e9811230b7f6c5cf94ef1fa09504cf242':
无JIRA 抽象类就不用shortcut了
无JIRA 整理一下
2 years ago
a867349e98
无JIRA 抽象类就不用shortcut了
2 years ago
d94ec24f15
Pull request #3554 : KERNEL-14316 fix:给每 个可修改属性添加 Set 方法
...
Merge in VISUAL/fineui from ~TREECAT/fineui:es6 to es6
* commit 'aac665e4c01148ec2e2bf371ec31a80a0c014238':
KERNEL-14316 fix:给每 个可修改属性添加 Set 方法
无jira fix:pixFormat
2 years ago
aac665e4c0
KERNEL-14316 fix:给每 个可修改属性添加 Set 方法
2 years ago
2634e6de2b
Merge remote-tracking branch 'fineui/es6' into es6
...
# Conflicts:
# packages/fineui/src/core/constant/var.js
2 years ago
03295ddda4
无JIRA 整理一下
2 years ago
Dailer-刘荣歆
ff10d4e239
Pull request #3553 : BI-126203 fix: 【6.0.10冒烟】设置周开始于周日，日期面板仍然以周一开始
...
Merge in VISUAL/fineui from ~DAILER/fineui:es6 to es6
* commit 'cffd97f4508f7b6fcc2add0e0f7ed94b457ed412':
BI-126203 fix: 【6.0.10冒烟】设置周开始于周日，日期面板仍然以周一开始
2 years ago
cffd97f450
BI-126203 fix: 【6.0.10冒烟】设置周开始于周日，日期面板仍然以周一开始
2 years ago
c1ffe3cd3e
Merge branch 'es6' of ssh://code.fineres.com:7999/~treecat/fineui into es6
...
# Conflicts:
# packages/fineui/typescript/core/var.ts
2 years ago
4a434809e2
无jira fix:pixFormat
2 years ago
Dailer-刘荣歆
3a5fabe9c9
Pull request #3551 : update 类型补充
...
Merge in VISUAL/fineui from ~DAILER/fineui:es6 to es6
* commit '1fef4864b56b6a04773c35138a86ca37757179cd':
update 类型补充
2 years ago
1fef4864b5
update 类型补充
2 years ago
5924ba2105
Merge pull request #238398 in DEC/fineui from master to feature/x
...
* commit 'e5fb86f0564cb246a68a266f39f5bc5ff20f17da':
auto upgrade version to 2.0.20230515174710
2 years ago
fdb000eee9
Merge pull request #238397 in DEC/fineui from release/11.0 to feature/x
...
* commit '7daf263087fb9040b1aee81d3334c0572a31ddaf':
BI-126352 fix: 仪表板预览空白
BI-126227 feat: 图标更新
2 years ago
e5fb86f056
auto upgrade version to 2.0.20230515174710
2 years ago
8dc8619e3e
Merge pull request #3549 in VISUAL/fineui from DEC/fineui:release/11.0 to master
...
* commit '7daf263087fb9040b1aee81d3334c0572a31ddaf':
BI-126352 fix: 仪表板预览空白
BI-126227 feat: 图标更新
2 years ago
7daf263087
Merge pull request #238396 in DEC/fineui from final/11.0 to release/11.0
...
* commit '837c5e1d9aa3d1a05f0d708fb9f6a69c6b2972d2':
BI-126352 fix: 仪表板预览空白
BI-126227 feat: 图标更新
2 years ago
837c5e1d9a
Merge pull request #238395 in DEC/fineui from persist/11.0 to final/11.0
...
* commit '47d1e2dca2c730dc9d85583a70776ce28b86f8bb':
2 years ago
90ab5fc4d3
Merge pull request #238394 in DEC/fineui from master to feature/x
...
* commit '1cbed791abd2366d31331548fa517ac25272cfc1':
auto upgrade version to 2.0.20230510152618
BI-126227 feat: 图标更新
2 years ago
Dailer-刘荣歆
475c2dcff7
Pull request #3548 : update
...
Merge in VISUAL/fineui from ~DAILER/fineui:es6 to es6
* commit 'd767ec71c8b79961b00194f149f02fc5b5cf38ac':
update
2 years ago
d767ec71c8
update
2 years ago
Dailer-刘荣歆
d4a00e2484
Pull request #3547 : KERNEL-15181 feat: typescript 类型描述文件适配
...
Merge in VISUAL/fineui from ~DAILER/fineui:es6 to es6
* commit '9271754b4c903a2bc89ffc1444cfdbef298ae691':
KERNEL-15181 feat: typescript 类型描述文件适配
2 years ago
9271754b4c
KERNEL-15181 feat: typescript 类型描述文件适配
2 years ago
0ae0e28e5e
Pull request #3546 : 无jira: 打包调整
...
Merge in VISUAL/fineui from ~TREECAT/fineui:es6 to es6
* commit '7e27700d1e1999bffb871ba4bcb503b0f290ec7b':
无jira fix:删除没有用到的东西
无jira fix:按需引入也导出Decorators
无jira: 打包调整
2 years ago
Jimmy.Chai-柴嘉明
73b43a435f
Pull request #238392 : BI-126352 fix: 仪表板预览空白
...
Merge in DEC/fineui from ~JIMMY.CHAI/dec-fineui:final/11.0 to final/11.0
* commit 'bf9492def62bc5aec625675996409b15465f9af0':
BI-126352 fix: 仪表板预览空白
2 years ago
Jimmy.Chai
bf9492def6
BI-126352 fix: 仪表板预览空白
2 years ago
zsmj
treecat-罗群
Dailer-刘荣歆
data
Aeolus.Zhang-张敬峥
superman
Claire.Tang-唐锦霞
Claire
Jimmy.Chai-柴嘉明