Browse Source

[1.3.7-prepare][Fix-5467][UI] Fix UI cannot be displayed normally in some browsers (#5914)

* [Fix-4335][UI] Fix IE 9-11 not supported #4336

* [FIx-4338][UI] Fix invalid date problem in IE #4339
Shiwen Cheng 3 years ago committed by GitHub
parent
commit
e5c4be3ca6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      dolphinscheduler-ui/.babelrc
  2. 2
      dolphinscheduler-ui/build/config.js
  3. 12
      dolphinscheduler-ui/package.json
  4. 1
      dolphinscheduler-ui/src/js/conf/home/index.js
  5. 1
      dolphinscheduler-ui/src/js/conf/login/index.js
  6. 12
      dolphinscheduler-ui/src/js/module/filter/filter.js

10
dolphinscheduler-ui/.babelrc

@ -5,7 +5,15 @@
"debug": false,
"useBuiltIns": true,
"targets": {
"browsers": [ "ie > 8", "last 2 version", "safari >= 9" ]
"browsers": [
"> 1%",
"last 2 versions",
"ie >= 10",
"edge >= 12",
"firefox >= 28",
"chrome >= 29",
"opera >= 17"
]
},
"production": {
"plugins": ["transform-remove-console"]

2
dolphinscheduler-ui/build/config.js

@ -47,7 +47,7 @@ const jsEntry = (() => {
parts.shift()
let modules = parts.join('/')
let entry = moduleName(modules)
obj[entry] = val
obj[entry] = ['babel-polyfill', val]
})
return obj
})()

12
dolphinscheduler-ui/package.json

@ -47,6 +47,7 @@
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-plugin-transform-vue-jsx": "^3.5.0",
"babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.6.1",
"copy-webpack-plugin": "^4.5.2",
"cross-env": "^5.2.0",
@ -79,5 +80,14 @@
"webpack-cli": "^3.3.10",
"webpack-dev-server": "^3.9.0",
"webpack-merge": "^4.2.2"
}
},
"browserslist": [
"> 1%",
"last 2 versions",
"ie >= 10",
"edge >= 12",
"firefox >= 28",
"chrome >= 29",
"opera >= 17"
]
}

1
dolphinscheduler-ui/src/js/conf/home/index.js

@ -17,6 +17,7 @@
// The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
import 'babel-polyfill'
import Vue from 'vue'
import App from './App'
import router from './router'

1
dolphinscheduler-ui/src/js/conf/login/index.js

@ -18,6 +18,7 @@
// The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
// import $ from 'jquery'
import 'babel-polyfill'
import Vue from 'vue'
import App from './App'
import i18n from '@/module/i18n'

12
dolphinscheduler-ui/src/js/module/filter/filter.js

@ -22,7 +22,17 @@ import dayjs from 'dayjs'
*/
const formatDate = (value, fmt) => {
fmt = fmt || 'YYYY-MM-DD HH:mm:ss'
return dayjs(value).format(fmt)
return dayjs(formatISODate(value)).format(fmt)
}
/**
* Formatting iso date
*/
const formatISODate = date => {
let [datetime, timezone] = date.split('+')
if (!timezone || timezone.indexOf(':') >= 0) return date
let hourOfTz = timezone.substring(0, 2) || '00'
let secondOfTz = timezone.substring(2, 4) || '00'
return `${datetime}+${hourOfTz}:${secondOfTz}`
}
export {

Loading…
Cancel
Save