easy3wui 1.5.49-beta5 → 1.5.49-beta6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/Easy3wGridPage/index.js +16 -10
- package/package.json +1 -1
|
@@ -169,7 +169,7 @@ var Easy3wGridPage = function (_Component) {
|
|
|
169
169
|
// const arrColumns = this.touchCreateColumns([].concat(columns));
|
|
170
170
|
// const arrColumns = this.touchCreateColumns(JSON.parse(JSON.stringify(columns)));
|
|
171
171
|
|
|
172
|
-
var arrColumns = this.touchCreateColumns(
|
|
172
|
+
var arrColumns = this.touchCreateColumns(columns);
|
|
173
173
|
// const arrColumns = this.touchCreateColumns(columns);
|
|
174
174
|
var _state = this.state,
|
|
175
175
|
selectedRowKeysState = _state.selectedRowKeysState,
|
|
@@ -672,7 +672,8 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
672
672
|
var printValue = _this3.props.printValue || 'print';
|
|
673
673
|
var printFlag = printArr[1] === printValue;
|
|
674
674
|
var recursion = function recursion(arr) {
|
|
675
|
-
arr.
|
|
675
|
+
return arr.map(function (item) {
|
|
676
|
+
var itemNew = {};
|
|
676
677
|
var columnsType = item.type;
|
|
677
678
|
if (item.fixed && printFlag) {
|
|
678
679
|
item.fixed = null;
|
|
@@ -693,12 +694,15 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
693
694
|
break;
|
|
694
695
|
}
|
|
695
696
|
if (item.children) {
|
|
696
|
-
recursion(item.children);
|
|
697
|
+
itemNew.children = [].concat(recursion(item.children));
|
|
697
698
|
}
|
|
699
|
+
itemNew = (0, _extends3['default'])({}, item);
|
|
700
|
+
return itemNew;
|
|
698
701
|
});
|
|
699
702
|
};
|
|
700
703
|
var recursionT = function recursionT(arr) {
|
|
701
|
-
arr.
|
|
704
|
+
return arr.map(function (item) {
|
|
705
|
+
var itemNew = {};
|
|
702
706
|
if (item.fixed && printFlag) {
|
|
703
707
|
item.fixed = null;
|
|
704
708
|
}
|
|
@@ -780,19 +784,21 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
780
784
|
item.minWidth = 5;
|
|
781
785
|
}
|
|
782
786
|
if (item.children) {
|
|
783
|
-
recursionT(item.children);
|
|
787
|
+
itemNew.children = [].concat(recursionT(item.children));
|
|
784
788
|
}
|
|
789
|
+
itemNew = (0, _extends3['default'])({}, item);
|
|
790
|
+
return itemNew;
|
|
785
791
|
});
|
|
786
792
|
};
|
|
787
|
-
recursion(columns);
|
|
793
|
+
var columnsNew = recursion(columns);
|
|
788
794
|
if (dataList) {
|
|
789
795
|
if (dataList.length > 0) {
|
|
790
|
-
recursionT(columns);
|
|
796
|
+
columnsNew = recursionT(columns);
|
|
791
797
|
}
|
|
792
798
|
}
|
|
793
|
-
|
|
799
|
+
// let columnsNew = columns;
|
|
794
800
|
if (autoAddNumber) {
|
|
795
|
-
if (
|
|
801
|
+
if (columnsNew.length > 0) {
|
|
796
802
|
columnsNew = [{
|
|
797
803
|
title: '序号',
|
|
798
804
|
dataIndex: 'number',
|
|
@@ -805,7 +811,7 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
805
811
|
' '
|
|
806
812
|
);
|
|
807
813
|
}
|
|
808
|
-
}].concat(
|
|
814
|
+
}].concat(columnsNew);
|
|
809
815
|
}
|
|
810
816
|
}
|
|
811
817
|
return columnsNew;
|