Browse Source

KERNEL-14316 chore: 代码同步

es6
Treecat 2 years ago
parent
commit
4cf8c27203
  1. 9
      packages/fineui/src/case/trigger/trigger.editor.js
  2. 7
      packages/fineui/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js

9
packages/fineui/src/case/trigger/trigger.editor.js

@ -23,9 +23,10 @@ export class EditorTrigger extends Trigger {
const conf = super._defaultConfig(...arguments);
return extend(conf, {
baseCls: `${conf.baseCls || ""} bi-editor-trigger bi-border-radius ${
config.simple ? "bi-border-bottom" : "bi-border"
}`,
baseCls:
(conf.baseCls || "") +
" bi-editor-trigger " +
(config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
height: 24,
validationChecker: emptyFn,
quitChecker: emptyFn,
@ -83,7 +84,7 @@ export class EditorTrigger extends Trigger {
width: o.triggerWidth || toPix(o.height, 2),
},
width: "",
}
},
],
});
}

7
packages/fineui/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js

@ -11,7 +11,7 @@ import {
deepClone,
each,
flatten,
has
has,
} from "@/core";
import { DownListCombo } from "../downlist";
@ -23,9 +23,8 @@ export class TextValueDownListCombo extends Widget {
_defaultConfig(config) {
return extend(super._defaultConfig(...arguments), {
baseCls: `bi-text-value-down-list-combo bi-border-radius ${
config.simple ? "bi-border-bottom" : "bi-border"
}`,
baseCls:
"bi-text-value-down-list-combo " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
height: 24,
});
}

Loading…
Cancel
Save