Browse Source

CHART-16154 & CHART-16194 删除搜索框、切换自动时,不修改对齐方式

feature/big-screen
Qinghui.Liu 4 years ago
parent
commit
f70759c06a
  1. 2
      designer-chart/src/main/resources/com/fr/design/editor/script/editor.js
  2. 19
      designer-chart/src/main/resources/com/fr/design/editor/script/insertcombo/combo.insert_param.js

2
designer-chart/src/main/resources/com/fr/design/editor/script/editor.js

@ -194,7 +194,7 @@
content = this.editor.getValue(BI.NicEditor.FormatType.ESCAPE), content = this.editor.getValue(BI.NicEditor.FormatType.ESCAPE),
isEqualToPlaceholder = editorService.isRichTextEqual(content, this.options.placeholder); isEqualToPlaceholder = editorService.isRichTextEqual(content, this.options.placeholder);
var HTML_ONLY_STYLE_TAG = "<font[\\s\\S]*?>|</font>|<span[\\s\\S]*?>|</span>|<b\\s+(.*?)>|<b>|</b>|<u[\\s\\S]*?>|</u>|<i\\s+(.*?)>|<i>|</i>|<strong[\\s\\S]*?>|</strong>|<em[\\s\\S]*?>|</em>|<div[\\s\\S]style(.*?)>|</div>|<p[\\s\\S]style(.*?)>|<p.[\\s\\S]*align(.*?)>|</p>"; var HTML_ONLY_STYLE_TAG = "<font[\\s\\S]*?>|</font>|<span[\\s\\S]*?>|</span>|<b\\s+(.*?)>|<b>|</b>|<u[\\s\\S]*?>|</u>|<i\\s+(.*?)>|<i>|</i>|<strong[\\s\\S]*?>|</strong>|<em[\\s\\S]*?>|</em>|<div[\\s\\S]style(.*?)>|</div>";
if (!isEqualToPlaceholder) { if (!isEqualToPlaceholder) {
content = content.replaceAll(HTML_ONLY_STYLE_TAG, ""); content = content.replaceAll(HTML_ONLY_STYLE_TAG, "");

19
designer-chart/src/main/resources/com/fr/design/editor/script/insertcombo/combo.insert_param.js

@ -30,6 +30,7 @@
items: this.model.items, items: this.model.items,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE, chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
behaviors: {}, behaviors: {},
width: 200,
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"
}], }],
@ -45,27 +46,15 @@
var searchPopup = { var searchPopup = {
type: "bi.vertical", type: "bi.vertical",
cls: "bi-border", cls: "bi-border",
hgap: 15, tgap: 10,
tgap: 5,
bgap: 10, bgap: 10,
items: [{ items: [this.adapter]
type: "bi.searcher",
adapter: this.adapter,
width: 210,
height: 24,
listeners: [{
eventName: BI.Searcher.EVENT_CHANGE,
action: function () {
self.store.changeParam(this.getValue()[0]);
}
}]
}, this.adapter]
}; };
return { return {
type: "bi.combo", type: "bi.combo",
direction: "bottom,left", direction: "bottom,left",
isNeedAdjustWidth: false, isNeedAdjustWidth: true,
el: { el: {
type: "bi.vertical_adapt", type: "bi.vertical_adapt",
items: [{ items: [{

Loading…
Cancel
Save