uxcore-table
Advanced tools
Comparing version 1.6.9 to 1.6.10
@@ -292,8 +292,31 @@ "use strict"; | ||
me.ajax = $.ajax(ajaxOptions); | ||
} else if (!!me.props.passedData) { | ||
if (!me.props.queryKeys) { | ||
var data = me.addValuesInData(me.props.processData(deepcopy(me.props.passedData))); | ||
me.setState({ | ||
data: data | ||
}); | ||
me.data = deepcopy(data); | ||
} else { | ||
(function () { | ||
var data = {}; | ||
me.props.queryKeys.forEach(function (key, index) { | ||
if (me.props.passedData[key] !== undefined) { | ||
data[key] = me.props.passedData[key]; | ||
} | ||
}); | ||
var processedData = me.addValuesInData(me.props.processData(deepcopy(data))); | ||
me.setState({ | ||
data: processedData | ||
}); | ||
me.data = deepcopy(processedData); | ||
})(); | ||
} | ||
} else if (!!this.props.jsxdata) { | ||
var data = this.addValuesInData(deepcopy(this.props.jsxdata)); | ||
var _data2 = this.addValuesInData(deepcopy(this.props.jsxdata)); | ||
me.setState({ | ||
data: data | ||
data: _data2 | ||
}); | ||
me.data = deepcopy(data); | ||
me.data = deepcopy(_data2); | ||
switch (from) { | ||
@@ -312,3 +335,3 @@ case "pagination": | ||
//default will create one row | ||
var _data2 = { | ||
var _data3 = { | ||
data: [{ | ||
@@ -321,5 +344,5 @@ jsxid: me.uid++, | ||
}; | ||
me.data = deepcopy(_data2); | ||
me.data = deepcopy(_data3); | ||
me.setState({ | ||
"data": deepcopy(_data2) | ||
"data": deepcopy(_data3) | ||
}); | ||
@@ -326,0 +349,0 @@ } |
@@ -5,2 +5,6 @@ # History | ||
## 1.6.10 | ||
* `CHANGED` recover the logic about passedData in fetchData method. | ||
## 1.6.9 | ||
@@ -7,0 +11,0 @@ |
{ | ||
"name": "uxcore-table", | ||
"version": "1.6.9", | ||
"version": "1.6.10", | ||
"description": "table ui component for react", | ||
@@ -5,0 +5,0 @@ "repository": "https://github.com/uxcore/uxcore-table.git", |
@@ -89,3 +89,3 @@ # uxcore-table | ||
|--- |--- |--- |--- |--- |---| | ||
|SubComp |React Element |optional |- | - |传入二级组件,已废弃,请使用 renderSubComp| | ||
|SubComp |React Element |optional |- | - |传入二级组件,已废弃,请使用 renderSubComp, 自 1.7.0 版本后不再保证此部分功能的完整性。| | ||
|renderSubComp |function(rowData) |optional |1.3.15 | - |传入二级组件,该函数需要返回值,返回 false,表示不渲染二级,返回 jsx,则渲染该 jsx| | ||
@@ -92,0 +92,0 @@ |
@@ -266,2 +266,23 @@ /** | ||
me.ajax = $.ajax(ajaxOptions); | ||
} else if (!!me.props.passedData) { | ||
if (!me.props.queryKeys) { | ||
let data = me.addValuesInData(me.props.processData(deepcopy(me.props.passedData))); | ||
me.setState({ | ||
data: data | ||
}); | ||
me.data = deepcopy(data); | ||
} else { | ||
let data = {}; | ||
me.props.queryKeys.forEach((key, index) => { | ||
if (me.props.passedData[key] !== undefined) { | ||
data[key] = me.props.passedData[key]; | ||
} | ||
}); | ||
let processedData = me.addValuesInData(me.props.processData(deepcopy(data))); | ||
me.setState({ | ||
data: processedData | ||
}); | ||
me.data = deepcopy(processedData); | ||
} | ||
} else if (!!this.props.jsxdata) { | ||
@@ -268,0 +289,0 @@ let data = this.addValuesInData(deepcopy(this.props.jsxdata)); |
386126
62
7034