@nokecy/qc-ui 1.0.37 → 1.0.38

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.
@@ -22,7 +22,7 @@ var _setting = _interopRequireDefault(require("./setting"));
22
22
  var _ = require(".");
23
23
  var _customGroupCellRenderer = _interopRequireDefault(require("./_utils/customGroupCellRenderer"));
24
24
  var _processColumnGroups = _interopRequireDefault(require("./_utils/processColumnGroups"));
25
- var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText"];
25
+ var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText", "queryDefaultRows"];
26
26
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
27
27
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
28
28
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -64,6 +64,7 @@ function AgGridPlus(props) {
64
64
  children = props.children,
65
65
  defaultSearchExpand = props.defaultSearchExpand,
66
66
  overlayNoRowsTemplateText = props.overlayNoRowsTemplateText,
67
+ queryDefaultRows = props.queryDefaultRows,
67
68
  rest = _objectWithoutProperties(props, _excluded);
68
69
  var _useGridPlusColumnSta = (0, _.useGridPlusColumnState)(),
69
70
  onSaveColumnState = _useGridPlusColumnSta.onSaveColumnState,
@@ -505,6 +506,7 @@ function AgGridPlus(props) {
505
506
  }
506
507
  }, search == false ? null : /*#__PURE__*/_react.default.createElement(_queryForm.default, {
507
508
  colDefs: allColDefs,
509
+ defaultRows: queryDefaultRows,
508
510
  columnStates: columnState || [],
509
511
  defaultExpand: defaultSearchExpand,
510
512
  gridApi: apiRef.current,
@@ -31,6 +31,10 @@ interface GridProps extends AgGridReactProps {
31
31
  * 列表空数据文字提示
32
32
  */
33
33
  overlayNoRowsTemplateText?: string;
34
+ /**
35
+ * 查询Form默认展示行数
36
+ */
37
+ queryDefaultRows?: number;
34
38
  /**
35
39
  * 列表分页选择配置
36
40
  */
@@ -7,6 +7,7 @@ declare const FormRender: (props: {
7
7
  colDefs: ColDef[];
8
8
  columnStates: ColumnState[];
9
9
  defaultExpand?: Boolean | undefined;
10
+ defaultRows?: number | undefined;
10
11
  onQuery: (formValue: any) => void;
11
12
  }) => React.JSX.Element;
12
13
  export default FormRender;
@@ -33,7 +33,9 @@ var FormRender = function FormRender(props) {
33
33
  gridApi = props.gridApi,
34
34
  colDefs = props.colDefs,
35
35
  columnStates = props.columnStates,
36
- onQuery = props.onQuery;
36
+ onQuery = props.onQuery,
37
+ _props$defaultRows = props.defaultRows,
38
+ defaultRows = _props$defaultRows === void 0 ? 1 : _props$defaultRows; // 设置默认值为1行
37
39
  var _useState = (0, _react2.useState)({
38
40
  type: 'object',
39
41
  properties: {}
@@ -120,7 +122,9 @@ var FormRender = function FormRender(props) {
120
122
  "name": 'queryForm',
121
123
  "x-component": 'QueryForm',
122
124
  properties: {},
123
- "x-component-props": {}
125
+ "x-component-props": {
126
+ defaultRows: defaultRows // 在这里添加defaultRows参数
127
+ }
124
128
  };
125
129
  var columns = colDefs === null || colDefs === void 0 ? void 0 : colDefs.map(function (colDef) {
126
130
  var state = columnStates.find(function (x) {
@@ -17,15 +17,15 @@ var useCollapseGrid = function useCollapseGrid(maxRows, defaultExpand) {
17
17
  return _antdV.FormGrid.createFormGrid({
18
18
  maxColumns: 5,
19
19
  maxWidth: 240,
20
- maxRows: maxRows,
20
+ maxRows: defaultExpand ? Infinity : maxRows,
21
21
  shouldVisible: function shouldVisible(node, grid) {
22
- if (defaultExpand) return true;
23
22
  if (node.index === grid.childSize - 1) return true;
24
23
  if (grid.maxRows === Infinity) return true;
25
- return node.shadowRow < maxRows + 1 && node.index < grid.maxColumns - 1;
24
+ return node.shadowRow < maxRows + 1;
26
25
  }
27
26
  });
28
- }, []);
27
+ }, [maxRows, defaultExpand] // 添加依赖项
28
+ );
29
29
  var expanded = grid.maxRows === Infinity;
30
30
  var realRows = grid.shadowRows;
31
31
  var computeRows = grid.fullnessLastColumn ? grid.shadowRows - 1 : grid.shadowRows;
@@ -50,12 +50,17 @@ var useCollapseGrid = function useCollapseGrid(maxRows, defaultExpand) {
50
50
  };
51
51
  var QueryForm = (0, _react.observer)(function (props) {
52
52
  var onReset = props.onReset,
53
- defaultExpand = props.defaultExpand;
54
- var _useCollapseGrid = useCollapseGrid(1, defaultExpand),
53
+ _props$defaultExpand = props.defaultExpand,
54
+ defaultExpand = _props$defaultExpand === void 0 ? false : _props$defaultExpand,
55
+ _props$defaultRows = props.defaultRows,
56
+ defaultRows = _props$defaultRows === void 0 ? 1 : _props$defaultRows; // 给defaultExpand添加默认值
57
+
58
+ var _useCollapseGrid = useCollapseGrid(defaultRows, defaultExpand),
55
59
  grid = _useCollapseGrid.grid,
56
60
  expanded = _useCollapseGrid.expanded,
57
61
  toggle = _useCollapseGrid.toggle,
58
- type = _useCollapseGrid.type;
62
+ type = _useCollapseGrid.type; // 使用defaultRows替代硬编码的1
63
+
59
64
  var renderActions = function renderActions() {
60
65
  return /*#__PURE__*/_react2.default.createElement(_react2.Fragment, null, /*#__PURE__*/_react2.default.createElement(_antdV.Submit, {
61
66
  type: "default",
@@ -82,7 +87,7 @@ var QueryForm = (0, _react.observer)(function (props) {
82
87
  var renderButtonGroup = function renderButtonGroup() {
83
88
  return /*#__PURE__*/_react2.default.createElement(_react2.Fragment, null, /*#__PURE__*/_react2.default.createElement(_antdV.FormButtonGroup, {
84
89
  align: "right"
85
- }, renderActions(), defaultExpand ? null : type === "collapsible" ? renderExpanded() : null));
90
+ }, renderActions(), type === "collapsible" ? renderExpanded() : null));
86
91
  };
87
92
  return /*#__PURE__*/_react2.default.createElement(_antdV.FormGrid, {
88
93
  grid: grid,
@@ -2,7 +2,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
2
2
  import _sumBy from "lodash/sumBy";
3
3
  import _uniqueId from "lodash/uniqueId";
4
4
  import _isArray from "lodash/isArray";
5
- var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText"];
5
+ var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText", "queryDefaultRows"];
6
6
  function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
7
7
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
8
8
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -55,6 +55,7 @@ function AgGridPlus(props) {
55
55
  children = props.children,
56
56
  defaultSearchExpand = props.defaultSearchExpand,
57
57
  overlayNoRowsTemplateText = props.overlayNoRowsTemplateText,
58
+ queryDefaultRows = props.queryDefaultRows,
58
59
  rest = _objectWithoutProperties(props, _excluded);
59
60
  var _useGridPlusColumnSta = useGridPlusColumnState(),
60
61
  onSaveColumnState = _useGridPlusColumnSta.onSaveColumnState,
@@ -496,6 +497,7 @@ function AgGridPlus(props) {
496
497
  }
497
498
  }, search == false ? null : /*#__PURE__*/React.createElement(FormRender, {
498
499
  colDefs: allColDefs,
500
+ defaultRows: queryDefaultRows,
499
501
  columnStates: columnState || [],
500
502
  defaultExpand: defaultSearchExpand,
501
503
  gridApi: apiRef.current,
@@ -31,6 +31,10 @@ interface GridProps extends AgGridReactProps {
31
31
  * 列表空数据文字提示
32
32
  */
33
33
  overlayNoRowsTemplateText?: string;
34
+ /**
35
+ * 查询Form默认展示行数
36
+ */
37
+ queryDefaultRows?: number;
34
38
  /**
35
39
  * 列表分页选择配置
36
40
  */
@@ -7,6 +7,7 @@ declare const FormRender: (props: {
7
7
  colDefs: ColDef[];
8
8
  columnStates: ColumnState[];
9
9
  defaultExpand?: Boolean | undefined;
10
+ defaultRows?: number | undefined;
10
11
  onQuery: (formValue: any) => void;
11
12
  }) => React.JSX.Element;
12
13
  export default FormRender;
@@ -25,7 +25,9 @@ var FormRender = function FormRender(props) {
25
25
  gridApi = props.gridApi,
26
26
  colDefs = props.colDefs,
27
27
  columnStates = props.columnStates,
28
- onQuery = props.onQuery;
28
+ onQuery = props.onQuery,
29
+ _props$defaultRows = props.defaultRows,
30
+ defaultRows = _props$defaultRows === void 0 ? 1 : _props$defaultRows; // 设置默认值为1行
29
31
  var _useState = useState({
30
32
  type: 'object',
31
33
  properties: {}
@@ -112,7 +114,9 @@ var FormRender = function FormRender(props) {
112
114
  "name": 'queryForm',
113
115
  "x-component": 'QueryForm',
114
116
  properties: {},
115
- "x-component-props": {}
117
+ "x-component-props": {
118
+ defaultRows: defaultRows // 在这里添加defaultRows参数
119
+ }
116
120
  };
117
121
  var columns = colDefs === null || colDefs === void 0 ? void 0 : colDefs.map(function (colDef) {
118
122
  var state = columnStates.find(function (x) {
@@ -8,15 +8,15 @@ var useCollapseGrid = function useCollapseGrid(maxRows, defaultExpand) {
8
8
  return FormGrid.createFormGrid({
9
9
  maxColumns: 5,
10
10
  maxWidth: 240,
11
- maxRows: maxRows,
11
+ maxRows: defaultExpand ? Infinity : maxRows,
12
12
  shouldVisible: function shouldVisible(node, grid) {
13
- if (defaultExpand) return true;
14
13
  if (node.index === grid.childSize - 1) return true;
15
14
  if (grid.maxRows === Infinity) return true;
16
- return node.shadowRow < maxRows + 1 && node.index < grid.maxColumns - 1;
15
+ return node.shadowRow < maxRows + 1;
17
16
  }
18
17
  });
19
- }, []);
18
+ }, [maxRows, defaultExpand] // 添加依赖项
19
+ );
20
20
  var expanded = grid.maxRows === Infinity;
21
21
  var realRows = grid.shadowRows;
22
22
  var computeRows = grid.fullnessLastColumn ? grid.shadowRows - 1 : grid.shadowRows;
@@ -41,12 +41,17 @@ var useCollapseGrid = function useCollapseGrid(maxRows, defaultExpand) {
41
41
  };
42
42
  var QueryForm = observer(function (props) {
43
43
  var onReset = props.onReset,
44
- defaultExpand = props.defaultExpand;
45
- var _useCollapseGrid = useCollapseGrid(1, defaultExpand),
44
+ _props$defaultExpand = props.defaultExpand,
45
+ defaultExpand = _props$defaultExpand === void 0 ? false : _props$defaultExpand,
46
+ _props$defaultRows = props.defaultRows,
47
+ defaultRows = _props$defaultRows === void 0 ? 1 : _props$defaultRows; // 给defaultExpand添加默认值
48
+
49
+ var _useCollapseGrid = useCollapseGrid(defaultRows, defaultExpand),
46
50
  grid = _useCollapseGrid.grid,
47
51
  expanded = _useCollapseGrid.expanded,
48
52
  toggle = _useCollapseGrid.toggle,
49
- type = _useCollapseGrid.type;
53
+ type = _useCollapseGrid.type; // 使用defaultRows替代硬编码的1
54
+
50
55
  var renderActions = function renderActions() {
51
56
  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Submit, {
52
57
  type: "default",
@@ -73,7 +78,7 @@ var QueryForm = observer(function (props) {
73
78
  var renderButtonGroup = function renderButtonGroup() {
74
79
  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(FormButtonGroup, {
75
80
  align: "right"
76
- }, renderActions(), defaultExpand ? null : type === "collapsible" ? renderExpanded() : null));
81
+ }, renderActions(), type === "collapsible" ? renderExpanded() : null));
77
82
  };
78
83
  return /*#__PURE__*/React.createElement(FormGrid, {
79
84
  grid: grid,