Browse Source

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
es6
zsmj 1 year ago
parent
commit
7cb688f4cb

Diff Content Not Available