Browse Source

Fixed merge conflict

es6
Dailer-刘荣歆 2 years ago
parent
commit
ef03f1a7d4
  1. 2
      package.json
  2. 2
      src/case/trigger/trigger.text.select.js

2
package.json

@ -1,6 +1,6 @@
{
"name": "fineui",
"version": "2.0.20220909180703",
"version": "2.0.20220913131735",
"description": "fineui",
"main": "dist/fineui_without_conflict.min.js",
"types": "dist/lib/index.d.ts",

2
src/case/trigger/trigger.text.select.js

@ -52,7 +52,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
_digest: function (val, items) {
var o = this.options;
// 提升valueFormatter的优先级
if (o.valueFormatter !== BI.emptyFn && BI.isFunction(o.valueFormatter)) {
return {

Loading…
Cancel
Save