Browse Source

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

* commit '6c51c8ef35c0bc5b5f16ff2f6d9c3a8ab18f6459':
  auto upgrade version to 2.0.20230508162556
  REPORT-80311 fix: 给一下默认值
master
superman 2 years ago
parent
commit
3bc104ef93
  1. 2
      package.json
  2. 3
      src/base/combination/searcher.js
  3. 2
      src/widget/multiselectlist/multiselectlist.insert.js
  4. 4
      src/widget/multiselecttree/multiselecttree.js
  5. 2
      src/widget/singleselect/singleselectlist.insert.js
  6. 1
      src/widget/timeinterval/dateinterval.js
  7. 4
      src/widget/yearmonthinterval/yearmonthinterval.js

2
package.json

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

3
src/base/combination/searcher.js

@ -39,6 +39,8 @@ BI.Searcher = BI.inherit(BI.Widget, {
masker: { // masker层 masker: { // masker层
offset: {}, offset: {},
}, },
simple: false,
}); });
}, },
@ -47,6 +49,7 @@ BI.Searcher = BI.inherit(BI.Widget, {
this.editor = BI.createWidget(o.el, { this.editor = BI.createWidget(o.el, {
type: "bi.search_editor", type: "bi.search_editor",
simple: o.simple,
}); });
BI.createWidget({ BI.createWidget({

2
src/widget/multiselectlist/multiselectlist.insert.js

@ -9,6 +9,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcherHeight: BI.SIZE_CONSANTS.TRIGGER_HEIGHT, searcherHeight: BI.SIZE_CONSANTS.TRIGGER_HEIGHT,
itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
simple: false,
}); });
}, },
_init: function () { _init: function () {
@ -70,6 +71,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
el: { el: {
type: "bi.search_editor", type: "bi.search_editor",
watermark: BI.i18nText("BI-Basic_Search_And_Patch_Paste"), watermark: BI.i18nText("BI-Basic_Search_And_Patch_Paste"),
simple: o.simple,
}, },
ref: function (ref) { ref: function (ref) {
self.editor = ref; self.editor = ref;

4
src/widget/multiselecttree/multiselecttree.js

@ -9,7 +9,8 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectTree.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-tree", baseCls: "bi-multi-select-tree",
itemsCreator: BI.emptyFn itemsCreator: BI.emptyFn,
simple: false,
}); });
}, },
@ -51,6 +52,7 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
type: "bi.searcher", type: "bi.searcher",
isAutoSearch: false, isAutoSearch: false,
isAutoSync: false, isAutoSync: false,
simple: o.simple,
onSearch: function (op, callback) { onSearch: function (op, callback) {
callback({ callback({
keyword: self.searcher.getKeyword() keyword: self.searcher.getKeyword()

2
src/widget/singleselect/singleselectlist.insert.js

@ -12,6 +12,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, {
itemWrapper: BI.emptyFn, itemWrapper: BI.emptyFn,
valueFormatter: BI.emptyFn, valueFormatter: BI.emptyFn,
searcherHeight: 24, searcherHeight: 24,
simple: false,
}); });
}, },
_init: function () { _init: function () {
@ -70,6 +71,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, {
el: { el: {
type: "bi.search_editor", type: "bi.search_editor",
watermark: BI.i18nText("BI-Basic_Search_And_Patch_Paste"), watermark: BI.i18nText("BI-Basic_Search_And_Patch_Paste"),
simple: o.simple,
}, },
ref: function (ref) { ref: function (ref) {
self.editor = ref; self.editor = ref;

1
src/widget/timeinterval/dateinterval.js

@ -17,6 +17,7 @@ BI.DateInterval = BI.inherit(BI.Single, {
maxDate: "2099-12-31", maxDate: "2099-12-31",
height: 24, height: 24,
supportDynamic: true, supportDynamic: true,
simple: false,
}); });
}, },

4
src/widget/yearmonthinterval/yearmonthinterval.js

@ -11,7 +11,8 @@ BI.YearMonthInterval = BI.inherit(BI.Single, {
minDate: "1900-01-01", minDate: "1900-01-01",
maxDate: "2099-12-31", maxDate: "2099-12-31",
supportDynamic: true, supportDynamic: true,
height: 24 height: 24,
simple: false,
}, },
render: function () { render: function () {
@ -45,6 +46,7 @@ BI.YearMonthInterval = BI.inherit(BI.Single, {
var self = this, o = this.options; var self = this, o = this.options;
var combo = BI.createWidget({ var combo = BI.createWidget({
type: "bi.dynamic_year_month_combo", type: "bi.dynamic_year_month_combo",
simple: o.simple,
supportDynamic: o.supportDynamic, supportDynamic: o.supportDynamic,
height: o.height, height: o.height,
minDate: o.minDate, minDate: o.minDate,

Loading…
Cancel
Save