poi-plugin-akashic-records
Advanced tools
Comparing version 7.1.2 to 7.2.0
{ | ||
"name": "poi-plugin-akashic-records", | ||
"version": "7.1.2", | ||
"version": "7.2.0", | ||
"description": "logbook plugin for poi", | ||
@@ -35,4 +35,4 @@ "main": "index.js", | ||
"dependencies": { | ||
"iconv-lite": "^0.4.11", | ||
"jschardet": "^1.3.0" | ||
"iconv-lite": "^0.4.24", | ||
"jschardet": "^1.6.0" | ||
}, | ||
@@ -44,4 +44,4 @@ "devDependencies": { | ||
"eslint-plugin-react": "^6.2.0", | ||
"poi-util-transpile": "^7.6.1", | ||
"redux-devtools": "^3.1.1" | ||
"poi-util-transpile": "^7.6.2", | ||
"redux-devtools": "^3.5.0" | ||
}, | ||
@@ -48,0 +48,0 @@ "poiPlugin": { |
@@ -165,35 +165,2 @@ 'use strict'; | ||
) | ||
), | ||
_react2.default.createElement( | ||
_reactBootstrap.Col, | ||
{ xs: 5 }, | ||
Array(3).fill().map((_, index) => { | ||
const checkedVal = this.props.configList[index]; | ||
return _react2.default.createElement( | ||
_reactBootstrap.Col, | ||
{ key: index, xs: 4 }, | ||
_react2.default.createElement( | ||
_reactBootstrap.Checkbox, | ||
{ | ||
value: index, | ||
onChange: this.handleClickConfigCheckbox.bind(this, index), | ||
checked: this.props.configListChecked[index], style: { verticalAlign: 'middle' } | ||
}, | ||
checkedVal | ||
) | ||
); | ||
}) | ||
), | ||
_react2.default.createElement( | ||
_reactBootstrap.Col, | ||
{ xs: 3 }, | ||
_react2.default.createElement( | ||
_reactBootstrap.Checkbox, | ||
{ | ||
value: 3, | ||
onChange: this.handleClickConfigCheckbox.bind(this, 3), | ||
checked: this.props.configListChecked[3], | ||
style: { verticalAlign: 'middle' } }, | ||
this.props.configList[3] | ||
) | ||
) | ||
@@ -200,0 +167,0 @@ ) |
@@ -205,3 +205,3 @@ 'use strict'; | ||
) }, | ||
_react2.default.createElement(_reactFontawesome2.default, { name: 'question-circle' }) | ||
_react2.default.createElement(_reactFontawesome2.default, { name: 'question-circle', style: { marginLeft: "3px" } }) | ||
) | ||
@@ -211,21 +211,12 @@ ) : this.props.tabVisibility[index] ? _react2.default.createElement( | ||
{ key: index, className: 'table-search' }, | ||
_react2.default.createElement( | ||
_reactBootstrap.FormGroup, | ||
{ controlId: index }, | ||
_react2.default.createElement( | ||
_reactBootstrap.ControlLabel, | ||
null, | ||
showLabel ? this.props.tableTab[index] : '' | ||
), | ||
_react2.default.createElement(_reactBootstrap.FormControl, { | ||
type: 'text', | ||
placeholder: this.props.tableTab[index], | ||
ref: (() => { | ||
const tmp = index; | ||
return ref => this.input[`input${tmp}`] = ref; | ||
})(), | ||
groupClassName: 'filter-area', | ||
value: `${this.props.filterKeys[index - 1]}`, | ||
onChange: this.handleKeyWordChange.bind(this, index) }) | ||
) | ||
_react2.default.createElement(_reactBootstrap.FormControl, { | ||
type: 'text', | ||
placeholder: this.props.tableTab[index], | ||
ref: (() => { | ||
const tmp = index; | ||
return ref => this.input[`input${tmp}`] = ref; | ||
})(), | ||
groupClassName: 'filter-area', | ||
value: `${this.props.filterKeys[index - 1]}`, | ||
onChange: this.handleKeyWordChange.bind(this, index) }) | ||
) : null) | ||
@@ -232,0 +223,0 @@ ) : null |
@@ -66,4 +66,4 @@ 'use strict'; | ||
try { | ||
const { window } = props; | ||
window.document.getElementById('ECharts').style.height = `${window.innerHeight - 150}px`; | ||
// const { window } = props | ||
// window.document.getElementById('ECharts').style.height = `${window.innerHeight - 150}px` | ||
if (this.resourceChart !== 0) { | ||
@@ -316,3 +316,4 @@ this.resourceChart.resize(); | ||
data: this.showData.map((logitem, index) => [logitem[0], logitem[8], index]) | ||
}] | ||
}], | ||
animation: false | ||
}; | ||
@@ -385,3 +386,3 @@ } | ||
{ xs: 12 }, | ||
_react2.default.createElement('div', { id: 'ECharts', style: { height: "500px" }, ref: ref => this.chart = ref }) | ||
_react2.default.createElement('div', { id: 'ECharts', style: { height: "calc(100vh - 150px)", width: "calc(100vw - 30px)" }, ref: ref => this.chart = ref }) | ||
) | ||
@@ -388,0 +389,0 @@ ) |
@@ -27,25 +27,4 @@ "use strict"; | ||
function configListChecked(state, action) { | ||
if (state == null) { | ||
state = JSON.parse(config.get(`plugin.Akashic.${action.dataType}.configChecked`, JSON.stringify([true, false, false, true]))); | ||
} | ||
if (action.type === '@@poi-plugin-akashic-records/SET_CONFIG_LIST') { | ||
let newState = state; | ||
if (state[action.index]) { | ||
newState = [...state.slice(0, action.index), false, ...state.slice(action.index + 1)]; | ||
} else { | ||
if (action.index < 2) { | ||
newState = [...state.slice(0, action.index), true, ...state.slice(action.index + 1, 2), false, state.slice[3]]; | ||
} else if (action.index === 2) { | ||
newState = [false, false, true, state[3]]; | ||
} else { | ||
newState = [...state.slice(0, 3), true]; | ||
} | ||
} | ||
if (newState !== state) { | ||
config.set(`plugin.Akashic.${action.dataType}.configChecked`, JSON.stringify(state)); | ||
} | ||
return newState; | ||
} else { | ||
return state; | ||
} | ||
state = JSON.parse(config.get(`plugin.Akashic.${action.dataType}.configChecked`, JSON.stringify([false, true, false, false]))); | ||
return state; | ||
} | ||
@@ -52,0 +31,0 @@ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
1222287
8138
Updatediconv-lite@^0.4.24
Updatedjschardet@^1.6.0