Browse Source

Merge pull request #41541 in DEC/fineui from master to feature/x

* commit '6e96c3c35acf4a0a96d58b49a19c0929cc5d7653':
  JSY-17849 fix: 【迭代】数据回填,简道云表删除,数据回填-回填表没有保留节点名
  JSY-17849 fix: 【迭代】数据回填,简道云表删除,数据回填-回填表没有保留节点名
es6
superman 3 years ago
parent
commit
28beb6ca1c
  1. 2
      src/less/widget/multilayerselecttree/multilayerselecttree.combo.less
  2. 2
      src/less/widget/multilayersingletree/multilayersingletree.combo.less
  3. 32
      src/widget/multilayersingletree/multilayersingletree.combo.js

2
src/less/widget/multilayerselecttree/multilayerselecttree.combo.less

@ -7,7 +7,7 @@
border-color: @border-color-negative;
}
.bi-trigger .select-text-label {
.bi-trigger .select-text-label, .tip-text-style {
color: @color-bi-text-error-text-trigger;
}
}

2
src/less/widget/multilayersingletree/multilayersingletree.combo.less

@ -6,7 +6,7 @@
border-color: @border-color-negative;
}
.bi-trigger .select-text-label {
.bi-trigger .select-text-label, .tip-text-style {
color: @color-bi-text-error-text-trigger;
}
}

32
src/widget/multilayersingletree/multilayersingletree.combo.js

@ -34,38 +34,6 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
var self = this, o = this.options;
return (o.itemsCreator === BI.emptyFn) ? this._getSyncConfig() : this._getAsyncConfig();
return this._shouldWrapper() ? combo : {
type: "bi.absolute",
height: o.height,
items: [{
el: combo,
left: 0,
right: 0,
top: 0,
bottom: 0
}, {
el: {
type: "bi.trigger_icon_button",
cls: "trigger-icon-button",
ref: function (_ref) {
self.triggerBtn = _ref;
},
width: o.height,
height: o.height,
handler: function () {
if (self.combo.isViewVisible()) {
self.combo.hideView();
} else {
self.combo.showView();
}
}
},
right: 0,
bottom: 0,
top: 0
}]
};
},
_shouldWrapper: function () {

Loading…
Cancel
Save