Browse Source

Pull request #8: Feature/x

Merge in DEC/fineui from ~AEOLUS.ZHANG/decision-fineui:feature/x to feature/x

* commit '42c786952e337b038df949eeee4d269c89ab942b':
  KERNEL-10698 删除自动合并测试文件
  auto upgrade version to 2.0.20220323114543
  无JIRA任务 国际化key更换
  auto upgrade version to 2.0.20220323101508
  auto upgrade version to 2.0.20220322175540
  REPORT-68011 fix:修复年月控件联动问题
es6
Aeolus.Zhang 3 years ago
parent
commit
c682965cb6
  1. 4
      i18n/i18n.cn.js
  2. 2
      package.json
  3. 4
      src/case/button/switch.js
  4. 2
      src/widget/date/calendar/combo.month.date.js
  5. 1
      test.js

4
i18n/i18n.cn.js

@ -199,6 +199,6 @@ BI.i18n = {
"BI-Basic_Search_And_Patch_Paste": "搜索,支持批量粘贴、粘贴值通过换行识别",
"BI-Basic_Recommend_Color": "推荐色",
"BI-Basic_Too_Much_Value_Get_Two_Thousand": "粘贴的值过多,只能识别出前2000个值",
"BI-Basic_Open": "开",
"BI-Basic_Close": "关",
"BI-Basic_Simple_Open": "开",
"BI-Basic_Simple_Close": "关",
};

2
package.json

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

4
src/case/button/switch.js

@ -39,7 +39,7 @@ BI.Switch = BI.inherit(BI.BasicButton, {
left: this.options.selected ? 28 : 4
}, {
type: "bi.label",
text: BI.i18nText("BI-Basic_Open"),
text: BI.i18nText("BI-Basic_Simple_Open"),
cls: "content-tip",
left: 8,
top: tgap - 2,
@ -49,7 +49,7 @@ BI.Switch = BI.inherit(BI.BasicButton, {
}
}, {
type: "bi.label",
text: BI.i18nText("BI-Basic_Close"),
text: BI.i18nText("BI-Basic_Simple_Close"),
cls: "content-tip",
right: 8,
top: tgap - 2,

2
src/widget/date/calendar/combo.month.date.js

@ -59,7 +59,7 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, {
},
populate: function () {
this.combo.populate.apply(this.combo, arguments);
this.popup.populate.apply(this.popup, arguments);
},
setValue: function (v) {

1
test.js

@ -1 +0,0 @@
测试自动提交
Loading…
Cancel
Save