Browse Source

Pull request #2255: REPORT-59272 修复查看已选面板国际化环境下放不下换行的问题

Merge in VISUAL/fineui from ~TELLER/fineui:master to master

* commit '3048ec0c8366cf2aaf07be581170c2ac4881db53':
  refactor: 双引号eslint
  REPORT-59272 fix: 全部改为auto
  Revert "fix: beforeRender和beforeMount同时存在时不触发beforeMount"
  REPORT-59272 fix: 修复查看已选面板国际化环境下放不下换行的问题
  fix: beforeRender和beforeMount同时存在时不触发beforeMount
es6
Teller 3 years ago
parent
commit
97a2535cb0
  1. 2
      .eslintrc
  2. 9
      src/widget/multiselect/check/multiselect.check.pane.js
  3. 10
      src/widget/multitree/check/multi.tree.check.pane.js

2
.eslintrc

@ -29,6 +29,8 @@
"files": ["src/*.js","src/**/*.js", "demo/*.js", "demo/**/*.js", "i18n/**/*.js", "i18n/*.js", "test/**/*.js", "test/*.js"], "files": ["src/*.js","src/**/*.js", "demo/*.js", "demo/**/*.js", "i18n/**/*.js", "i18n/*.js", "test/**/*.js", "test/*.js"],
"extends": "plugin:@fui/es5", "extends": "plugin:@fui/es5",
"rules": { "rules": {
"no-param-reassign": "off",
"quotes": [2, "double"],
"comma-dangle": ["error", "never"] // 多行对象字面量中要求拖尾逗号 "comma-dangle": ["error", "never"] // 多行对象字面量中要求拖尾逗号
} }
}, { }, {

9
src/widget/multiselect/check/multiselect.check.pane.js

@ -39,6 +39,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
callback({ callback({
items: BI.map(self.storeValue.value, function (i, v) { items: BI.map(self.storeValue.value, function (i, v) {
var txt = opts.valueFormatter(v) || v; var txt = opts.valueFormatter(v) || v;
return { return {
text: txt, text: txt,
value: v, value: v,
@ -46,6 +47,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
}; };
}) })
}); });
return; return;
} }
opts.itemsCreator(op, callback); opts.itemsCreator(op, callback);
@ -54,6 +56,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
this.continueSelect = BI.createWidget({ this.continueSelect = BI.createWidget({
type: "bi.text_button", type: "bi.text_button",
title: BI.i18nText("BI-Continue_Select"),
text: BI.i18nText("BI-Continue_Select"), text: BI.i18nText("BI-Continue_Select"),
cls: "multi-select-check-selected bi-high-light" cls: "multi-select-check-selected bi-high-light"
}); });
@ -69,18 +72,20 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
height: this.constants.height, height: this.constants.height,
el: { el: {
type: "bi.vertical_adapt", type: "bi.vertical_adapt",
columnSize: ["auto", "auto"],
cls: "multi-select-continue-select", cls: "multi-select-continue-select",
items: [ items: [
{ {
el: { el: {
type: "bi.label", type: "bi.label",
title: BI.i18nText("BI-Selected_Data"),
text: BI.i18nText("BI-Selected_Data") text: BI.i18nText("BI-Selected_Data")
}, },
lgap: this.constants.lgap lgap: this.constants.lgap
}, },
{ {
el: this.continueSelect, el: this.continueSelect,
lgap: this.constants.lgap hgap: this.constants.lgap
}] }]
}, },
tgap: this.constants.tgap tgap: this.constants.tgap
@ -105,4 +110,4 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
} }
}); });
BI.shortcut("bi.multi_select_check_pane", BI.MultiSelectCheckPane); BI.shortcut("bi.multi_select_check_pane", BI.MultiSelectCheckPane);

10
src/widget/multitree/check/multi.tree.check.pane.js

@ -30,6 +30,7 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, {
var continueSelect = BI.createWidget({ var continueSelect = BI.createWidget({
type: "bi.text_button", type: "bi.text_button",
title: BI.i18nText("BI-Continue_Select"),
text: BI.i18nText("BI-Continue_Select"), text: BI.i18nText("BI-Continue_Select"),
cls: "multi-tree-check-selected" cls: "multi-tree-check-selected"
}); });
@ -41,12 +42,14 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, {
}); });
var backToPopup = BI.createWidget({ var backToPopup = BI.createWidget({
type: "bi.left", type: "bi.vertical_adapt",
columnSize: ["auto", "auto"],
cls: "multi-tree-continue-select", cls: "multi-tree-continue-select",
items: [ items: [
{ {
el: { el: {
type: "bi.label", type: "bi.label",
title: BI.i18nText("BI-Selected_Data"),
text: BI.i18nText("BI-Selected_Data") text: BI.i18nText("BI-Selected_Data")
}, },
lgap: this.constants.lgap, lgap: this.constants.lgap,
@ -54,7 +57,7 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, {
}, },
{ {
el: continueSelect, el: continueSelect,
lgap: this.constants.lgap, hgap: this.constants.lgap,
tgap: this.constants.tgap tgap: this.constants.tgap
}] }]
}); });
@ -92,7 +95,6 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, {
el: this.display el: this.display
}] }]
}); });
}, },
empty: function () { empty: function () {
@ -116,4 +118,4 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, {
BI.MultiTreeCheckPane.EVENT_CONTINUE_CLICK = "EVENT_CONTINUE_CLICK"; BI.MultiTreeCheckPane.EVENT_CONTINUE_CLICK = "EVENT_CONTINUE_CLICK";
BI.shortcut("bi.multi_tree_check_pane", BI.MultiTreeCheckPane); BI.shortcut("bi.multi_tree_check_pane", BI.MultiTreeCheckPane);

Loading…
Cancel
Save