babel config and some html fixed
This commit is contained in:
devezhao-mac 2018-11-14 01:24:33 +08:00
parent f5eafdf644
commit 40d3fa575a
6 changed files with 24 additions and 16 deletions

View file

@ -1 +1,3 @@
{ "presets": [ "env", "react", "stage-2" ] }
{
"presets": ["es2015", "stage-2", "react"]
}

View file

@ -1,13 +1,17 @@
{
"name": "rebuild-babel",
"version": "1.0.0",
"scripts": {
"build": "babel '../src/main/webapp/assets/js' --out-dir '../src/main/webapp/assets/js/dist'"
},
"devDependencies": {
"babel-cli": "^6.26.0",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-2": "^6.24.1"
}
"name": "rebuild-babel",
"version": "1.0.0",
"description": "rebuild jsx transform with babel",
"main": "index.js",
"scripts": {
"build": "babel js -d lib",
"build2": "babel /data/eclipse-workspace/rebuild/src/main/webapp/assets/js -d lib" // Unexpected token ... ???
},
"author": "rebuild",
"license": "GPL-3.0",
"devDependencies": {
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-2": "^6.24.1"
}
}

2
.gitignore vendored
View file

@ -31,3 +31,5 @@ hs_err_pid*
.DS_Store
/.babel/node_modules/
/.babel/package-lock.json
/.babel/js/
/.babel/lib/

View file

@ -602,7 +602,7 @@ rb.AdvFilter = {
})
$(res.data).each(function(){
let item = $('<li class="dropdown-item" data-id="' + this[0] + '"><a class="text-truncate">' + this[1] + '</a></li>')
let item = $('<div class="dropdown-item" data-id="' + this[0] + '"><a class="text-truncate">' + this[1] + '</a></div>')
$('.adv-search .dropdown-divider').before(item)
let data = this

View file

@ -27,9 +27,9 @@
<div class="btn-group">
<button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown"><span class="text-truncate J_name">所有数据</span><i class="icon zmdi zmdi-caret-down"></i></button>
<div class="dropdown-menu">
<li class="dropdown-item" data-id="$ALL$"><a>所有数据</a></li>
<div class="dropdown-item" data-id="$ALL$"><a>所有数据</a></div>
<div class="dropdown-divider"></div>
<a class="dropdown-item J_advfilter"><i class="icon zmdi zmdi-playlist-plus"></i>添加过滤项</a>
<div class="dropdown-item J_advfilter"><i class="icon zmdi zmdi-playlist-plus"></i>添加过滤项</div>
</div>
</div>
</div>

View file

@ -23,7 +23,7 @@
<div class="tab-container">
<ul class="nav nav-tabs">
<li class="nav-item"><a class="nav-link active" href="#tab-rbview" data-toggle="tab">视图</a></li>
<a class="vtab-settings J_for-admin hide" title="配置显示项"><i class="zmdi zmdi-settings"></i> </a>
<a class="vtab-settings J_for-admin hide" title="配置显示项"><i class="zmdi zmdi-settings"></i></a>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="tab-rbview"></div>