Browse Source

Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui

es6
zsmj 2 years ago
parent
commit
252dcea0ef
  1. 2
      package.json
  2. 4
      src/widget/dynamicdate/dynamicdate.trigger.js
  3. 4
      src/widget/time/time.trigger.js
  4. 4
      src/widget/yearmonth/trigger.yearmonth.js
  5. 4
      src/widget/yearquarter/trigger.yearquarter.js

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "fineui", "name": "fineui",
"version": "2.0.20220914135738", "version": "2.0.20220914200441",
"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",

4
src/widget/dynamicdate/dynamicdate.trigger.js

@ -9,7 +9,7 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, {
iconWidth: 24 iconWidth: 24
}, },
props: { props: () => ({
extraCls: "bi-date-trigger", extraCls: "bi-date-trigger",
min: "1900-01-01", // 最小日期 min: "1900-01-01", // 最小日期
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
@ -18,7 +18,7 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, {
format: "", // 显示的日期格式化方式 format: "", // 显示的日期格式化方式
allowEdit: true, // 是否允许编辑 allowEdit: true, // 是否允许编辑
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.i18nText("BI-Basic_Unrestricted"),
}, }),
_init: function () { _init: function () {
BI.DynamicDateTrigger.superclass._init.apply(this, arguments); BI.DynamicDateTrigger.superclass._init.apply(this, arguments);

4
src/widget/time/time.trigger.js

@ -23,13 +23,13 @@
DEFAULT_HOUR: "00" DEFAULT_HOUR: "00"
}, },
props: { props: () => ({
extraCls: "bi-time-trigger", extraCls: "bi-time-trigger",
value: {}, value: {},
format: "", format: "",
allowEdit: false, allowEdit: false,
watermark: BI.i18nText("BI-Basic_Unrestricted"), watermark: BI.i18nText("BI-Basic_Unrestricted"),
}, }),
render: function () { render: function () {
var self = this, o = this.options; var self = this, o = this.options;

4
src/widget/yearmonth/trigger.yearmonth.js

@ -5,7 +5,7 @@ BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
iconWidth: 24 iconWidth: 24
}, },
props: { props: () => ({
extraCls: "bi-year-month-trigger", extraCls: "bi-year-month-trigger",
min: "1900-01-01", // 最小日期 min: "1900-01-01", // 最小日期
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
@ -14,7 +14,7 @@ BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
year: BI.i18nText("BI-Basic_Unrestricted"), year: BI.i18nText("BI-Basic_Unrestricted"),
month: BI.i18nText("BI-Basic_Unrestricted"), month: BI.i18nText("BI-Basic_Unrestricted"),
}, },
}, }),
beforeInit: function (callback) { beforeInit: function (callback) {
var o = this.options; var o = this.options;

4
src/widget/yearquarter/trigger.yearquarter.js

@ -5,7 +5,7 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
iconWidth: 24 iconWidth: 24
}, },
props: { props: () => ({
extraCls: "bi-year-quarter-trigger", extraCls: "bi-year-quarter-trigger",
min: "1900-01-01", // 最小日期 min: "1900-01-01", // 最小日期
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
@ -14,7 +14,7 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
year: BI.i18nText("BI-Basic_Unrestricted"), year: BI.i18nText("BI-Basic_Unrestricted"),
quarter: BI.i18nText("BI-Basic_Unrestricted"), quarter: BI.i18nText("BI-Basic_Unrestricted"),
}, },
}, }),
_init: function () { _init: function () {
BI.DynamicYearQuarterTrigger.superclass._init.apply(this, arguments); BI.DynamicYearQuarterTrigger.superclass._init.apply(this, arguments);

Loading…
Cancel
Save