@luck-design-biz/luckda 0.0.14-1 → 0.0.15
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/es/utils/grid.js +3 -2
- package/lib/utils/grid.js +3 -2
- package/package.json +1 -1
package/es/utils/grid.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
1
2
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
2
3
|
var _excluded = ["comName", "property"],
|
|
3
4
|
_excluded2 = ["name"],
|
|
@@ -95,11 +96,11 @@ export var getGridColumn = function getGridColumn() {
|
|
|
95
96
|
filter = _merge.filter,
|
|
96
97
|
filterParams = _merge.filterParams,
|
|
97
98
|
_props = _objectWithoutProperties(_merge, _excluded3);
|
|
98
|
-
var data = {
|
|
99
|
+
var data = _objectSpread(_objectSpread({}, _props), {}, {
|
|
99
100
|
field: name,
|
|
100
101
|
title: _props.label,
|
|
101
102
|
render: _props.render || getColumnRender(name, comName || defaultComName[property], _props)
|
|
102
|
-
};
|
|
103
|
+
});
|
|
103
104
|
if (isTreeGrid || isVirtual || includes(['user', 'select', 'group', 'switch', 'color', 'region'], comName || defaultComName[property])) data.sortable = false;
|
|
104
105
|
// data.filter = false;
|
|
105
106
|
if (!isNil(filter)) {
|
package/lib/utils/grid.js
CHANGED
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.getColumnRender = getColumnRender;
|
|
8
8
|
exports.getGridColumn = void 0;
|
|
9
|
+
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
9
10
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
10
11
|
var _react = _interopRequireDefault(require("react"));
|
|
11
12
|
var _umi = require("umi");
|
|
@@ -102,11 +103,11 @@ var getGridColumn = function getGridColumn() {
|
|
|
102
103
|
filter = _merge.filter,
|
|
103
104
|
filterParams = _merge.filterParams,
|
|
104
105
|
_props = (0, _objectWithoutProperties2.default)(_merge, _excluded3);
|
|
105
|
-
var data = {
|
|
106
|
+
var data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
|
|
106
107
|
field: name,
|
|
107
108
|
title: _props.label,
|
|
108
109
|
render: _props.render || getColumnRender(name, comName || _form.defaultComName[property], _props)
|
|
109
|
-
};
|
|
110
|
+
});
|
|
110
111
|
if (isTreeGrid || isVirtual || (0, _lodash.includes)(['user', 'select', 'group', 'switch', 'color', 'region'], comName || _form.defaultComName[property])) data.sortable = false;
|
|
111
112
|
// data.filter = false;
|
|
112
113
|
if (!(0, _lodash.isNil)(filter)) {
|