Browse Source

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

es6
zsmj 3 years ago
parent
commit
3667c798c9
  1. 3
      bi.lessconfig.json
  2. 2
      package.json
  3. 4
      src/widget/datetime/datetime.combo.js

3
bi.lessconfig.json

@ -12,10 +12,13 @@
"@border-color-dark-line": "#2E3A4D",
"@color-sliver-theme-dark": "#363E55",
"@border-color-disabled": "rgba(9, 30, 64, 0.07)",
"@font-color-normal": "#091E40",
"@font-color-gray": "rgba(9, 30, 64, 0.9)",
"@font-color-light-gray": "rgba(9, 30, 64, 0.66)",
"@font-color-tips": "rgba(9, 30, 64, 0.47)",
"@font-color-disabled": "rgba(9, 30, 64, 0.25)",
"@background-color-normal": "#EEF1F6",
"@color-bi-background-active-radio": "transparent",
"@color-bi-border-radio": "rgba(9, 30, 64, 0.37)",
"@color-bi-border-disabled-radio": "rgba(9, 30, 64, 0.19)",

2
package.json

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

4
src/widget/datetime/datetime.combo.js

@ -9,9 +9,9 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
border: 1,
iconWidth: 24
},
_defaultConfig: function () {
_defaultConfig: function (conf) {
return BI.extend(BI.DateTimeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-date-time-combo bi-border bi-border-radius",
baseCls: "bi-date-time-combo bi-focus-shadow " + (conf.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
width: 200,
height: 24,
minDate: "1900-01-01",

Loading…
Cancel
Save