Comparing version 1.3.9 to 1.4.0
@@ -67,3 +67,3 @@ "use strict"; | ||
var columns_1 = this.buildOption(); | ||
this.param = _.assign({}, { start: 0, count: 10 }, this.props.param); | ||
this.param = _.assign({}, { start_: 0, count_: 10 }, this.props.param); | ||
utils_1.Ajax.POST(this.props.query, this.param, function (json) { | ||
@@ -262,4 +262,4 @@ _this.setState({ | ||
_.assign(this.param, { | ||
start: (pagination.current - 1) * pagination.pageSize, | ||
count: pagination.pageSize, | ||
start_: (pagination.current - 1) * pagination.pageSize, | ||
count_: pagination.pageSize, | ||
}); | ||
@@ -271,8 +271,8 @@ if (!_.isEqual(this.sorter, sorter)) { | ||
if (_.has(sorter, 'field')) { | ||
this.param.order = sorter.field; | ||
this.param.by = sorter.order == 'ascend' ? 'asc' : 'desc'; | ||
this.param.order_ = sorter.field; | ||
this.param.by_ = sorter.order == 'ascend' ? 'asc' : 'desc'; | ||
} | ||
else { | ||
this.param.order = null; | ||
this.param.by = null; | ||
this.param.order_ = null; | ||
this.param.by_ = null; | ||
} | ||
@@ -279,0 +279,0 @@ utils_1.Ajax.POST(this.props.query, this.param, function (json) { |
@@ -51,6 +51,6 @@ "use strict"; | ||
_this.query = { | ||
start: 0, | ||
count: DefaultPageSize, | ||
order: _this.rowKey, | ||
by: 'desc', | ||
start_: 0, | ||
count_: DefaultPageSize, | ||
order_: _this.rowKey, | ||
by_: 'desc', | ||
}; | ||
@@ -72,3 +72,3 @@ _this.reflush = function () { | ||
TableLayout.prototype.onQuery = function (param) { | ||
_.extend(this.query, param, { start: 0 }); | ||
_.extend(this.query, param, { start_: 0 }); | ||
this.setState({ | ||
@@ -85,6 +85,6 @@ current: 1, | ||
TableLayout.prototype.search = function (pagination, filters, sorter) { | ||
var query = __assign({}, this.query, { start: (pagination.current - 1) * pagination.pageSize, count: pagination.pageSize }); | ||
var query = __assign({}, this.query, { start_: (pagination.current - 1) * pagination.pageSize, count_: pagination.pageSize }); | ||
var state = {}; | ||
if (!_.isEqual(this.sorter, sorter)) { | ||
query.start = 0; | ||
query.start_ = 0; | ||
state.current = 1; | ||
@@ -102,8 +102,8 @@ this.setState({ | ||
if (_.has(sorter, 'field')) { | ||
query.order = sorter.field; | ||
query.by = sorter.order == 'ascend' ? 'asc' : 'desc'; | ||
query.order_ = sorter.field; | ||
query.by_ = sorter.order == 'ascend' ? 'asc' : 'desc'; | ||
} | ||
else { | ||
query.order = this.rowKey; | ||
query.by = 'desc'; | ||
query.order_ = this.rowKey; | ||
query.by_ = 'desc'; | ||
} | ||
@@ -130,3 +130,3 @@ this.props.dispatch({ | ||
this.rowKey = this.props.rowKey || 'id'; | ||
this.query.order = this.rowKey; | ||
this.query.order_ = this.rowKey; | ||
var params = {}; | ||
@@ -133,0 +133,0 @@ if (!_.has(this.props, 'size')) { |
@@ -15,5 +15,5 @@ import { TableProps, ColumnProps } from 'antd/lib/table/interface'; | ||
/** | ||
* 类型,默认是Radio | ||
* 类型,默认是Radio 'raido'|'checkbox'|'daterange' | ||
*/ | ||
type?: 'raido' | 'checkbox' | 'daterange'; | ||
type?: string; | ||
/** | ||
@@ -20,0 +20,0 @@ * 过滤器的选项列表,{name:xx,value:xx}[] |
declare const _default: {}; | ||
export default _default; | ||
export { default as MapChart } from './MapChart'; | ||
export { default as LabelChart } from './LabelChart'; |
@@ -35,1 +35,3 @@ "use strict"; | ||
exports.MapChart = MapChart_1.default; | ||
var LabelChart_1 = require("./LabelChart"); | ||
exports.LabelChart = LabelChart_1.default; |
@@ -11,4 +11,4 @@ /// <reference types="react" /> | ||
param: { | ||
start: number; | ||
count: number; | ||
start_: number; | ||
count_: number; | ||
}; | ||
@@ -15,0 +15,0 @@ state: { |
@@ -35,4 +35,4 @@ "use strict"; | ||
_this.param = { | ||
start: 0, | ||
count: 10, | ||
start_: 0, | ||
count_: 10, | ||
}; | ||
@@ -46,7 +46,7 @@ _this.state = { | ||
_this.cleanAndQuery = function (param) { | ||
_this.param = _.assign({ start: 0, count: 10 }, param); | ||
_this.param = _.assign({ start_: 0, count_: 10 }, param); | ||
_this._query(); | ||
}; | ||
_this.query = function (param) { | ||
_.assign(_this.param, { start: 0, count: 10 }, param); | ||
_.assign(_this.param, { start_: 0, count_: 10 }, param); | ||
_this._query(); | ||
@@ -61,3 +61,3 @@ }; | ||
var state = {}; | ||
state.current = _this.param.start === 0 ? 1 : state.current, | ||
state.current = _this.param.start_ === 0 ? 1 : state.current, | ||
state.list = json.list; | ||
@@ -79,6 +79,6 @@ state.total = json.total; | ||
this.setState({ loading: true }); | ||
var param = __assign({}, this.param, { start: (pagination.current - 1) * pagination.pageSize, count: pagination.pageSize }); | ||
var param = __assign({}, this.param, { start_: (pagination.current - 1) * pagination.pageSize, count_: pagination.pageSize }); | ||
var state = {}; | ||
if (!_.isEqual(this.sorter, sorter)) { | ||
param.start = 0; | ||
param.start_ = 0; | ||
state.current = 1; | ||
@@ -92,8 +92,8 @@ this.sorter = sorter; | ||
if (_.has(sorter, 'field')) { | ||
param.order = sorter.field; | ||
param.by = sorter.order == 'ascend' ? 'asc' : 'desc'; | ||
param.order_ = sorter.field; | ||
param.by_ = sorter.order_ == 'ascend' ? 'asc' : 'desc'; | ||
} | ||
else { | ||
param.order = null; | ||
param.by = null; | ||
param.order_ = null; | ||
param.by_ = null; | ||
} | ||
@@ -100,0 +100,0 @@ utils_1.Ajax.POST(this.props.query, param, function (json) { |
{ | ||
"name": "vap", | ||
"version": "1.3.9", | ||
"version": "1.4.0", | ||
"description": "vap", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -102,2 +102,3 @@ "use strict"; | ||
error.name = response.status; | ||
NProgress.done(); | ||
// error.response = response; | ||
@@ -452,3 +453,3 @@ throw error; | ||
urls.map(function (url) { | ||
if (!CACHE_URL.has(url)) { | ||
if (CACHE_URL.has(url)) { | ||
Cache_1.default.sessionDelete(url); | ||
@@ -455,0 +456,0 @@ } |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
233540
101
6120