@chengkejie/form-page 1.0.2 → 1.1.0
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/README.md +55 -2
- package/dist/cjs/FormPage.d.ts +2 -2
- package/dist/cjs/FormPage.d.ts.map +1 -1
- package/dist/cjs/FormPage.js +103 -43
- package/dist/cjs/index.d.ts +1 -1
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/styles/index.module.scss +21 -28
- package/dist/cjs/types.d.ts +28 -1
- package/dist/cjs/types.d.ts.map +1 -1
- package/dist/esm/FormPage.d.ts +2 -2
- package/dist/esm/FormPage.d.ts.map +1 -1
- package/dist/esm/FormPage.js +103 -43
- package/dist/esm/index.d.ts +1 -1
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/styles/index.module.scss +21 -28
- package/dist/esm/types.d.ts +28 -1
- package/dist/esm/types.d.ts.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -102,6 +102,7 @@ function App() {
|
|
|
102
102
|
| `onReset` | `() => void` | `() => {}` | 重置按钮触发的回调(在内部清空逻辑之外额外执行) |
|
|
103
103
|
| `onFieldChange` | `(name: string, value: any) => void` | `() => {}` | 任意表单字段值变化回调 |
|
|
104
104
|
| `pageSizeList` | `number[]` | `[10, 20, 50, 100]` | 分页条数可选项 |
|
|
105
|
+
| `alignLabelWidth` | `boolean` | `true` | 标签宽度自动对齐:同一竖列(24 栅格列起点相同)的标签统一取组内最长字数宽度并右对齐。详见 [标签宽度对齐](#标签宽度对齐alignlabelwidth)。传 `false` 退回默认 `75px` 最小宽度 |
|
|
105
106
|
|
|
106
107
|
> `searchFn` 返回值需符合 `ahooks` `useFusionTable` 约定:`{ data: 表格数据数组, total: 总条数 }`。
|
|
107
108
|
|
|
@@ -194,10 +195,32 @@ columns={[
|
|
|
194
195
|
|------|------|------|------|
|
|
195
196
|
| `col` | `number` | 是 | 占据的栅格列数(24 栅格制,如 `6`、`8`、`12`) |
|
|
196
197
|
| `label` | `string` | 否 | 表单项标签文本 |
|
|
198
|
+
| `labelWidth` | `number` | 否 | 标签宽度,按「字数」计:传几渲染成几 em(`1em ≈ 1` 个全角字宽)。仅 `label` 为字符串时生效,可突破默认 `75px` 最小宽度;配置后该项不参与自动对齐分组 |
|
|
197
199
|
| `textAlign` | `'left' \| 'center' \| 'right'` | 否 | 对齐方式,不传则按行内位置自动计算(行首 left / 中间 center / 行尾 right) |
|
|
198
200
|
| `wrapperCol` | `object` | 否 | `Form.Item` 的 `wrapperCol` |
|
|
199
201
|
| `labelCol` | `object` | 否 | `Form.Item` 的 `labelCol` |
|
|
200
202
|
|
|
203
|
+
### 标签宽度对齐(alignLabelWidth)
|
|
204
|
+
|
|
205
|
+
`<FormPage alignLabelWidth>`(默认 `true`)开启自动对齐。规则:
|
|
206
|
+
|
|
207
|
+
1. 组件模拟 24 栅格逐项摆放(放不下整项换行),得到每个条件项的**列起点偏移**(0/6/12/18…);
|
|
208
|
+
2. **列起点相同的项归为同一竖列**(注意不是按 `col` 值分组——`col: 12` 的项从行首开始,起点为 0,与 `col: 6` 的行首项同组);
|
|
209
|
+
3. 组内取「未单独配 `labelWidth` 的字符串标签」的最长字数(`stringWidth`:全角=1、半角两字=1,`+0.5` 缓冲,向上取整)作为该竖列统一宽度;
|
|
210
|
+
4. 标签在统一宽度内**右对齐**——短标签左侧留白、右缘与组内最长标签对齐,使同一竖列的输入框起点连成一条竖线。
|
|
211
|
+
|
|
212
|
+
```tsx
|
|
213
|
+
// col 6 ×4 + col 12 + col 6 + col 12 + col 6 的竖列分组:
|
|
214
|
+
// 起点 0 → 名称、日期、创建时间(col12)、增强日期(col12) 同组右缘对齐
|
|
215
|
+
// 起点 6 → 状态、月份
|
|
216
|
+
// 起点 12 → 类型(树)、公司、金额区间、自定义
|
|
217
|
+
// 起点 18 → 地区(级联)、远程搜索
|
|
218
|
+
<FormPage alignLabelWidth {...} /> // 传 false 退回默认 75px 最小宽度
|
|
219
|
+
```
|
|
220
|
+
|
|
221
|
+
> 单独配置 `labelWidth` 的项优先用自己的宽度,且不计入组内最长值统计。
|
|
222
|
+
> 字数估算函数 `stringWidth(s)` 已从包内导出,可用于业务侧自行推导展示。
|
|
223
|
+
|
|
201
224
|
### 各类型(`type`)
|
|
202
225
|
|
|
203
226
|
| `type` | 渲染控件 | 特有字段 | `customProps` 类型 |
|
|
@@ -290,7 +313,11 @@ conditionProps={[
|
|
|
290
313
|
interface ButtonConfigProps {
|
|
291
314
|
/** @deprecated 不再生效;按钮列自动占据本行剩余宽度以紧贴最右侧 */
|
|
292
315
|
col?: number;
|
|
293
|
-
buttons: Array<
|
|
316
|
+
buttons: Array<string | ReactNode | { name: string; style?: 'primary' | 'ghost' }>;
|
|
317
|
+
/** 按钮整体风格,默认 'primary';可被单按钮配置覆盖 */
|
|
318
|
+
buttonStyle?: 'primary' | 'ghost';
|
|
319
|
+
/** 按钮级覆盖:key 为内置按钮名,优先级最高 */
|
|
320
|
+
buttonStyles?: Partial<Record<'submit' | 'reset' | 'export' | 'setting', { style?: 'primary' | 'ghost' }>>;
|
|
294
321
|
}
|
|
295
322
|
```
|
|
296
323
|
|
|
@@ -303,12 +330,37 @@ interface ButtonConfigProps {
|
|
|
303
330
|
| `'export'` | 导出 | 调用 `exportFn` |
|
|
304
331
|
| `'setting'` | 设置 | 打开列显示/隐藏设置弹窗(依赖 `tableId`) |
|
|
305
332
|
|
|
333
|
+
### 按钮风格(三级粒度)
|
|
334
|
+
|
|
335
|
+
风格优先级:**`buttonStyles[name]` > `buttons` 内联对象 > `buttonStyle` > 默认 `primary`**
|
|
336
|
+
|
|
337
|
+
| 风格 | 视觉 | 说明 |
|
|
338
|
+
|------|------|------|
|
|
339
|
+
| `'primary'`(默认) | 搜索 = 主题色实心主按钮;重置/导出/设置 = 普通次按钮 | 突出主操作 |
|
|
340
|
+
| `'ghost'` | 全部 = 白底 + 主题橙(`#ff7e07`)描边幽灵按钮 | 权重一致,见下图风格 |
|
|
341
|
+
|
|
306
342
|
```tsx
|
|
343
|
+
// ① 整体风格:全部幽灵描边
|
|
344
|
+
buttonProps={{ buttons: ['submit', 'reset', 'export'], buttonStyle: 'ghost' }}
|
|
345
|
+
|
|
346
|
+
// ② 内联覆盖:整体默认,仅重置单独指定为幽灵
|
|
347
|
+
buttonProps={{ buttons: ['submit', { name: 'reset', style: 'ghost' }, 'export'] }}
|
|
348
|
+
|
|
349
|
+
// ③ 按钮级覆盖:整体幽灵,但搜索保持实心主按钮
|
|
350
|
+
buttonProps={{
|
|
351
|
+
buttons: ['submit', 'reset', 'export'],
|
|
352
|
+
buttonStyle: 'ghost',
|
|
353
|
+
buttonStyles: { submit: { style: 'primary' } },
|
|
354
|
+
}}
|
|
355
|
+
|
|
356
|
+
// ④ 混排自定义 JSX(自定义按钮不受风格控制)
|
|
307
357
|
buttonProps={{
|
|
308
358
|
buttons: ['submit', 'reset', <Button key="custom" onClick={...}>自定义</Button>, 'setting'],
|
|
309
359
|
}}
|
|
310
360
|
```
|
|
311
361
|
|
|
362
|
+
> 内联对象 `{ name, style }` 的 `name` 必须是内置按钮名(`'submit' | 'reset' | 'export' | 'setting'`),否则按未知按钮渲染兜底。
|
|
363
|
+
|
|
312
364
|
---
|
|
313
365
|
|
|
314
366
|
## Ref 方法(FormPageRef)
|
|
@@ -498,8 +550,9 @@ export default function Page() {
|
|
|
498
550
|
- **分页器样式**:固定 `pageSizeSelector="dropdown"`、`useFloatLayout`、显示「共 X 条」。可由 `pageSizeList` 改选项、`showPagination={false}` 关闭。
|
|
499
551
|
- **列宽拖拽**:所有列自动设为 `asyncResizable`(可拖拽调宽),拖拽宽度保留在组件 state(300ms 防抖);`ref.resetWidth()` 重置为初始值。
|
|
500
552
|
- **列显示/隐藏**:`tableId` 对应的列中,`dataIndex` 命中 `tbKeys`(隐藏列表)即不渲染;持久化依赖 Provider 的 `fetchTableKeys`(读取)/`onSaveTableKeys`(保存)。
|
|
501
|
-
-
|
|
553
|
+
- **按钮列宽度**:操作按钮列自动占据本行剩余栅格宽度以紧贴最右侧;剩余空间按「模拟逐项摆放后的末行实际占用」计算(非总和取模,避免 flex 提前换行导致按钮列错位);条件正好填满整行(24 栅格)时按钮独占一行。
|
|
502
554
|
- **条件对齐**:条件项 `textAlign` 未显式设置时,按行内位置自动取 行首 `left` / 中间 `center` / 行尾 `right`。
|
|
555
|
+
- **条件间距**:条件行使用 24 栅格 + `gutter=16`(列内 padding,不影响百分比宽度与换行)。
|
|
503
556
|
|
|
504
557
|
---
|
|
505
558
|
|
package/dist/cjs/FormPage.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import type { ConditionItem, SelectCondition, InputCondition, TreeSelectCondition, CascaderSelectCondition, DatePickerCondition, MonthPickerCondition, RangePickerCondition, SectionCondition, CompanySelectCondition, ExtraDatePickerCondition, SelectSearchCondition, CustomNodeCondition, CustomCondition, TableConfigProps, ButtonConfigProps, FormPageProps, FormPageRef } from './types';
|
|
3
|
-
export type { FormPageProps, FormPageRef, ConditionItem, TableConfigProps, ButtonConfigProps, SelectCondition, InputCondition, TreeSelectCondition, CascaderSelectCondition, DatePickerCondition, MonthPickerCondition, RangePickerCondition, SectionCondition, CompanySelectCondition, ExtraDatePickerCondition, SelectSearchCondition, CustomNodeCondition, CustomCondition, };
|
|
2
|
+
import type { ConditionItem, SelectCondition, InputCondition, TreeSelectCondition, CascaderSelectCondition, DatePickerCondition, MonthPickerCondition, RangePickerCondition, SectionCondition, CompanySelectCondition, ExtraDatePickerCondition, SelectSearchCondition, CustomNodeCondition, CustomCondition, TableConfigProps, ButtonConfigProps, ButtonItemConfig, FormPageProps, FormPageRef } from './types';
|
|
3
|
+
export type { FormPageProps, FormPageRef, ConditionItem, TableConfigProps, ButtonConfigProps, ButtonItemConfig, SelectCondition, InputCondition, TreeSelectCondition, CascaderSelectCondition, DatePickerCondition, MonthPickerCondition, RangePickerCondition, SectionCondition, CompanySelectCondition, ExtraDatePickerCondition, SelectSearchCondition, CustomNodeCondition, CustomCondition, };
|
|
4
4
|
/**
|
|
5
5
|
* 估算字符串在「字数」意义上的宽度(用于 alignLabelWidth 按字数对齐)。
|
|
6
6
|
* 全角字符(中日韩、全角标点)计 1,半角字符两个计 1(最少 1)。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormPage.d.ts","sourceRoot":"","sources":["../src/FormPage.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"FormPage.d.ts","sourceRoot":"","sources":["../src/FormPage.tsx"],"names":[],"mappings":"AAoBA,OAAO,KAQN,MAAM,OAAO,CAAC;AAWf,OAAO,KAAK,EACV,aAAa,EACb,eAAe,EACf,cAAc,EACd,mBAAmB,EACnB,uBAAuB,EACvB,mBAAmB,EACnB,oBAAoB,EACpB,oBAAoB,EACpB,gBAAgB,EAChB,sBAAsB,EACtB,wBAAwB,EACxB,qBAAqB,EACrB,mBAAmB,EACnB,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,WAAW,EACZ,MAAM,SAAS,CAAC;AAEjB,YAAY,EACV,aAAa,EACb,WAAW,EACX,aAAa,EACb,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,cAAc,EACd,mBAAmB,EACnB,uBAAuB,EACvB,mBAAmB,EACnB,oBAAoB,EACpB,oBAAoB,EACpB,gBAAgB,EAChB,sBAAsB,EACtB,wBAAwB,EACxB,qBAAqB,EACrB,mBAAmB,EACnB,eAAe,GAChB,CAAC;AAIF;;;GAGG;AACH,eAAO,MAAM,WAAW,MAAO,MAAM,KAAG,MAavC,CAAC;;AAyqBF,wBAAoC;AAEpC;;;GAGG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;CAexB,CAAC"}
|
package/dist/cjs/FormPage.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
4
3
|
Object.defineProperty(exports, "__esModule", {
|
|
5
4
|
value: true
|
|
6
5
|
});
|
|
@@ -24,6 +23,7 @@ var _excluded = ["columns"],
|
|
|
24
23
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
25
24
|
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); }
|
|
26
25
|
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; }
|
|
26
|
+
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
27
27
|
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
28
28
|
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
29
29
|
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
@@ -151,20 +151,32 @@ var FormPage = function FormPage(_ref, ref) {
|
|
|
151
151
|
onSaveTableKeys = _useConfig.onSaveTableKeys;
|
|
152
152
|
|
|
153
153
|
/**
|
|
154
|
-
*
|
|
155
|
-
*
|
|
154
|
+
* 模拟 24 栅格逐项摆放(剩余空间放不下则换行),得到两份与 flex 实际换行一致的结果:
|
|
155
|
+
* 1. offsets:每个条件项的列起点偏移(0/6/12/18...)。col=12 的"创建时间"与
|
|
156
|
+
* col=6 的"名称"都在行首(起点 0),归入同一竖列;
|
|
157
|
+
* 2. maxByOffset(仅 alignLabelWidth 时):同一竖列起点下、未单独配 labelWidth 的
|
|
158
|
+
* 字符串标签的最长字数(+0.5 字缓冲),作为该竖列统一的 label 宽度。
|
|
156
159
|
*/
|
|
157
|
-
var
|
|
158
|
-
|
|
159
|
-
var
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
160
|
+
var gridOffsets = (0, _react.useMemo)(function () {
|
|
161
|
+
var offsets = [];
|
|
162
|
+
var maxByOffset = alignLabelWidth ? new Map() : undefined;
|
|
163
|
+
var offset = 0;
|
|
164
|
+
conditionProps.forEach(function (e) {
|
|
165
|
+
if (offset + e.col > 24) offset = 0; // 放不下则换行,列起点回到 0
|
|
166
|
+
offsets.push(offset);
|
|
167
|
+
if (maxByOffset && e.labelWidth == null && typeof e.label === 'string') {
|
|
168
|
+
var _maxByOffset$get;
|
|
169
|
+
var w = Math.ceil(stringWidth(e.label) + 0.5);
|
|
170
|
+
maxByOffset.set(offset, Math.max((_maxByOffset$get = maxByOffset.get(offset)) !== null && _maxByOffset$get !== void 0 ? _maxByOffset$get : 0, w));
|
|
171
|
+
}
|
|
172
|
+
offset += e.col;
|
|
173
|
+
});
|
|
174
|
+
return {
|
|
175
|
+
offsets: offsets,
|
|
176
|
+
maxByOffset: maxByOffset
|
|
177
|
+
};
|
|
164
178
|
}, [alignLabelWidth, conditionProps]);
|
|
165
179
|
|
|
166
|
-
/** 累计栅格数,用于判断一行是否已满 24 栅格(满则去掉右内边距) */
|
|
167
|
-
var colSum = 0;
|
|
168
180
|
/** 表格容器 ref,用于测量可用高度以自适应 maxBodyHeight */
|
|
169
181
|
var tableBox = (0, _react.useRef)(null);
|
|
170
182
|
/** 保留最新的列配置(含拖拽后的宽度),避免拖拽回调中直接 setState 导致性能问题 */
|
|
@@ -463,30 +475,51 @@ var FormPage = function FormPage(_ref, ref) {
|
|
|
463
475
|
/**
|
|
464
476
|
* 内置按钮映射,buttonProps.buttons 中的字符串对应此处的 key
|
|
465
477
|
* 未匹配的字符串会直接作为 ReactNode 渲染(支持传入自定义 JSX)
|
|
478
|
+
*
|
|
479
|
+
* 风格解析(优先级从高到低):
|
|
480
|
+
* 1. buttonProps.buttonStyles[name].style —— 按钮级覆盖
|
|
481
|
+
* 2. buttons 数组中的对象形式 { name, style } —— 内联覆盖
|
|
482
|
+
* 3. buttonProps.buttonStyle —— 整体风格(默认 'primary')
|
|
483
|
+
* - 'primary':搜索为主题色实心主按钮,其余为普通次按钮
|
|
484
|
+
* - 'ghost':白底主题橙描边幽灵按钮(配色由 SCSS 的 ghostBtn 覆盖)
|
|
466
485
|
*/
|
|
486
|
+
var btnStyle = function btnStyle(name, inline) {
|
|
487
|
+
var _ref5, _ref6, _buttonProps$buttonSt, _buttonProps$buttonSt2;
|
|
488
|
+
return (_ref5 = (_ref6 = (_buttonProps$buttonSt = (_buttonProps$buttonSt2 = buttonProps.buttonStyles) === null || _buttonProps$buttonSt2 === void 0 || (_buttonProps$buttonSt2 = _buttonProps$buttonSt2[name]) === null || _buttonProps$buttonSt2 === void 0 ? void 0 : _buttonProps$buttonSt2.style) !== null && _buttonProps$buttonSt !== void 0 ? _buttonProps$buttonSt : inline) !== null && _ref6 !== void 0 ? _ref6 : buttonProps.buttonStyle) !== null && _ref5 !== void 0 ? _ref5 : 'primary';
|
|
489
|
+
};
|
|
490
|
+
/** 按风格生成 Button 的 type / className */
|
|
491
|
+
var styleOf = function styleOf(name, inline) {
|
|
492
|
+
var ghost = btnStyle(name, inline) === 'ghost';
|
|
493
|
+
return ghost ? {
|
|
494
|
+
type: 'normal',
|
|
495
|
+
className: _indexModule.default.ghostBtn
|
|
496
|
+
} : {
|
|
497
|
+
type: name === 'submit' ? 'primary' : 'normal',
|
|
498
|
+
className: undefined
|
|
499
|
+
};
|
|
500
|
+
};
|
|
467
501
|
var button = {
|
|
468
|
-
export: /*#__PURE__*/(0, _jsxRuntime.jsx)(_next2.Button, {
|
|
469
|
-
loading: loading
|
|
470
|
-
|
|
502
|
+
export: /*#__PURE__*/(0, _jsxRuntime.jsx)(_next2.Button, _objectSpread(_objectSpread({
|
|
503
|
+
loading: loading
|
|
504
|
+
}, styleOf('export')), {}, {
|
|
471
505
|
onClick: exportExcel.submit,
|
|
472
506
|
children: "\u5BFC\u51FA"
|
|
473
|
-
},
|
|
474
|
-
submit: /*#__PURE__*/(0, _jsxRuntime.jsx)(_next2.Button, {
|
|
475
|
-
loading: tableLoading
|
|
476
|
-
|
|
507
|
+
}), 'export'),
|
|
508
|
+
submit: /*#__PURE__*/(0, _jsxRuntime.jsx)(_next2.Button, _objectSpread(_objectSpread({
|
|
509
|
+
loading: tableLoading
|
|
510
|
+
}, styleOf('submit')), {}, {
|
|
477
511
|
onClick: function onClick() {
|
|
478
512
|
btnSearchFlag.current = true;
|
|
479
513
|
_submit();
|
|
480
514
|
},
|
|
481
515
|
children: "\u641C\u7D22"
|
|
482
|
-
},
|
|
483
|
-
reset: /*#__PURE__*/(0, _jsxRuntime.jsx)(_next2.Button, {
|
|
484
|
-
type: "normal",
|
|
516
|
+
}), 'submit'),
|
|
517
|
+
reset: /*#__PURE__*/(0, _jsxRuntime.jsx)(_next2.Button, _objectSpread(_objectSpread({}, styleOf('reset')), {}, {
|
|
485
518
|
onClick: btnReset,
|
|
486
519
|
children: "\u91CD\u7F6E"
|
|
487
|
-
},
|
|
520
|
+
}), 'reset'),
|
|
488
521
|
setting: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_next2.Button, {
|
|
489
|
-
className: _indexModule.default.settingBtn,
|
|
522
|
+
className: [_indexModule.default.settingBtn, styleOf('setting').className].filter(Boolean).join(' '),
|
|
490
523
|
onClick: function onClick() {
|
|
491
524
|
settingDialog.current.show();
|
|
492
525
|
},
|
|
@@ -496,7 +529,7 @@ var FormPage = function FormPage(_ref, ref) {
|
|
|
496
529
|
}), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
|
|
497
530
|
children: "\u8BBE\u7F6E"
|
|
498
531
|
})]
|
|
499
|
-
},
|
|
532
|
+
}, 'setting')
|
|
500
533
|
};
|
|
501
534
|
|
|
502
535
|
/** 表格行选择变化回调 */
|
|
@@ -606,19 +639,20 @@ var FormPage = function FormPage(_ref, ref) {
|
|
|
606
639
|
}, [dbColumns, tbKeys]);
|
|
607
640
|
|
|
608
641
|
/**
|
|
609
|
-
*
|
|
610
|
-
*
|
|
611
|
-
*
|
|
642
|
+
* 模拟 24 栅格逐项摆放后的「最后一行实际占用份数」。
|
|
643
|
+
* 不能用总和取模推剩余空间:flex 换行按行计算,单项放不下会整项换行,
|
|
644
|
+
* 末行实际占用可能大于 total % 24(如末行已占 18 份时再来一个 12 份的项会换行)。
|
|
645
|
+
* 若按取模算按钮列宽,按钮列放不进本行 → 换行后只占半宽,无法贴到最右侧。
|
|
612
646
|
*/
|
|
613
|
-
var
|
|
614
|
-
return
|
|
647
|
+
var lastRowUsed = conditionProps.reduce(function (used, item) {
|
|
648
|
+
return used + item.col > 24 ? item.col : used + item.col;
|
|
615
649
|
}, 0);
|
|
616
650
|
/** 按钮列占据本行剩余宽度,使按钮始终紧贴最右侧;条件正好填满整行(24)时按钮独占新的一行 */
|
|
617
|
-
var btnColSpan =
|
|
651
|
+
var btnColSpan = lastRowUsed >= 24 ? 24 : 24 - lastRowUsed;
|
|
618
652
|
|
|
619
653
|
/** 保存隐藏列配置到远程,成功后更新本地状态 */
|
|
620
654
|
var handleSaveTableKeys = /*#__PURE__*/function () {
|
|
621
|
-
var
|
|
655
|
+
var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
|
|
622
656
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
|
623
657
|
while (1) switch (_context2.prev = _context2.next) {
|
|
624
658
|
case 0:
|
|
@@ -637,7 +671,7 @@ var FormPage = function FormPage(_ref, ref) {
|
|
|
637
671
|
}, _callee2);
|
|
638
672
|
}));
|
|
639
673
|
return function handleSaveTableKeys(_x2) {
|
|
640
|
-
return
|
|
674
|
+
return _ref7.apply(this, arguments);
|
|
641
675
|
};
|
|
642
676
|
}();
|
|
643
677
|
return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
|
|
@@ -650,23 +684,26 @@ var FormPage = function FormPage(_ref, ref) {
|
|
|
650
684
|
field: field,
|
|
651
685
|
children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(Row, {
|
|
652
686
|
wrap: true,
|
|
687
|
+
gutter: 16,
|
|
653
688
|
children: [conditionProps.map(function (e, i) {
|
|
654
|
-
var _e$textAlign, _e$labelWidth, _tableProps$tableId;
|
|
655
|
-
|
|
656
|
-
var
|
|
657
|
-
|
|
689
|
+
var _e$textAlign, _e$labelWidth, _gridOffsets$maxByOff, _tableProps$tableId;
|
|
690
|
+
/** 本项的列起点偏移(与 gridOffsets 的模拟摆放一致,含提前换行修正) */
|
|
691
|
+
var start = gridOffsets.offsets[i];
|
|
692
|
+
var end = start + e.col;
|
|
658
693
|
/** 手动配置优先,否则根据行内位置自动计算:行首 left / 行尾 right / 中间 center */
|
|
659
|
-
var textAlign = (_e$textAlign = e.textAlign) !== null && _e$textAlign !== void 0 ? _e$textAlign :
|
|
694
|
+
var textAlign = (_e$textAlign = e.textAlign) !== null && _e$textAlign !== void 0 ? _e$textAlign : start % 24 === 0 ? 'left' : end % 24 === 0 ? 'right' : 'center';
|
|
660
695
|
|
|
661
696
|
/** labelWidth:数字按「字数」转 em;仅当 label 为字符串时生效。
|
|
662
|
-
* alignLabelWidth
|
|
663
|
-
|
|
697
|
+
* alignLabelWidth 时,未单独配置的项回退到「同竖列(列起点偏移相同)」内
|
|
698
|
+
* 最长的标签字数,使同一竖列的标签右缘对齐。 */
|
|
699
|
+
var lw = (_e$labelWidth = e.labelWidth) !== null && _e$labelWidth !== void 0 ? _e$labelWidth : (_gridOffsets$maxByOff = gridOffsets.maxByOffset) === null || _gridOffsets$maxByOff === void 0 ? void 0 : _gridOffsets$maxByOff.get(start);
|
|
664
700
|
var labelWidthStyle = lw == null ? undefined : "".concat(lw, "em");
|
|
665
701
|
var useLabelWidth = labelWidthStyle != null && typeof e.label === 'string';
|
|
666
702
|
var labelEl = useLabelWidth ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
|
|
667
703
|
style: {
|
|
668
704
|
display: 'inline-block',
|
|
669
|
-
width: labelWidthStyle
|
|
705
|
+
width: labelWidthStyle,
|
|
706
|
+
textAlign: 'right'
|
|
670
707
|
},
|
|
671
708
|
children: e.label
|
|
672
709
|
}) : e.label;
|
|
@@ -688,8 +725,31 @@ var FormPage = function FormPage(_ref, ref) {
|
|
|
688
725
|
span: btnColSpan,
|
|
689
726
|
className: _indexModule.default.btnCol,
|
|
690
727
|
children: buttonProps.buttons.map(function (e) {
|
|
691
|
-
var _button
|
|
692
|
-
|
|
728
|
+
var _button;
|
|
729
|
+
/** 对象形式 { name, style }:按内联 style 覆盖整体风格后渲染内置按钮 */
|
|
730
|
+
if (_typeof(e) === 'object' && e !== null && 'name' in e && !('$$typeof' in e)) {
|
|
731
|
+
var _ref8 = e,
|
|
732
|
+
name = _ref8.name,
|
|
733
|
+
inline = _ref8.style;
|
|
734
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_next2.Button, _objectSpread(_objectSpread({
|
|
735
|
+
loading: name === 'submit' ? tableLoading : name === 'export' ? loading : undefined
|
|
736
|
+
}, styleOf(name, inline)), {}, {
|
|
737
|
+
onClick: name === 'submit' ? function () {
|
|
738
|
+
btnSearchFlag.current = true;
|
|
739
|
+
_submit();
|
|
740
|
+
} : name === 'export' ? exportExcel.submit : name === 'reset' ? btnReset : function () {
|
|
741
|
+
return settingDialog.current.show();
|
|
742
|
+
},
|
|
743
|
+
className: name === 'setting' ? [_indexModule.default.settingBtn, styleOf(name, inline).className].filter(Boolean).join(' ') : styleOf(name, inline).className,
|
|
744
|
+
children: name === 'submit' ? '搜索' : name === 'reset' ? '重置' : name === 'export' ? '导出' : name === 'setting' ? [/*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
|
|
745
|
+
src: _setting.default,
|
|
746
|
+
alt: ""
|
|
747
|
+
}, 'img'), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
|
|
748
|
+
children: "\u8BBE\u7F6E"
|
|
749
|
+
}, 'txt')] : name
|
|
750
|
+
}), name);
|
|
751
|
+
}
|
|
752
|
+
return (_button = button[e]) !== null && _button !== void 0 ? _button : e;
|
|
693
753
|
})
|
|
694
754
|
}) : null]
|
|
695
755
|
}), extra !== null && extra !== void 0 ? extra : null]
|
package/dist/cjs/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { default as FormPage } from './FormPage';
|
|
2
2
|
export { FormPageData, stringWidth } from './FormPage';
|
|
3
|
-
export type { FormPageRef, FormPageProps, ConditionItem, TableConfigProps, ButtonConfigProps, SelectCondition, InputCondition, TreeSelectCondition, CascaderSelectCondition, DatePickerCondition, MonthPickerCondition, RangePickerCondition, SectionCondition, CompanySelectCondition, ExtraDatePickerCondition, SelectSearchCondition, CustomNodeCondition, CustomCondition, } from './FormPage';
|
|
3
|
+
export type { FormPageRef, FormPageProps, ConditionItem, TableConfigProps, ButtonConfigProps, ButtonItemConfig, SelectCondition, InputCondition, TreeSelectCondition, CascaderSelectCondition, DatePickerCondition, MonthPickerCondition, RangePickerCondition, SectionCondition, CompanySelectCondition, ExtraDatePickerCondition, SelectSearchCondition, CustomNodeCondition, CustomCondition, } from './FormPage';
|
|
4
4
|
export { FormPageProvider } from './context';
|
|
5
5
|
export type { FormPageConfig } from './context';
|
|
6
6
|
export { default as CustomNode } from './components/CustomNode';
|
package/dist/cjs/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACvD,YAAY,EACV,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,gBAAgB,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACvD,YAAY,EACV,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAChG,eAAe,EAAE,cAAc,EAAE,mBAAmB,EAAE,uBAAuB,EAC7E,mBAAmB,EAAE,oBAAoB,EACzC,oBAAoB,EAAE,gBAAgB,EACtC,sBAAsB,EAAE,wBAAwB,EAAE,qBAAqB,EACvE,mBAAmB,EAAE,eAAe,GACrC,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,YAAY,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAEhD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAC"}
|
|
@@ -12,19 +12,19 @@
|
|
|
12
12
|
// // cursor: pointer;
|
|
13
13
|
// display: flex !important;
|
|
14
14
|
// align-items: center;
|
|
15
|
-
img{
|
|
16
|
-
vertical-align:middle;
|
|
15
|
+
img {
|
|
16
|
+
vertical-align: middle;
|
|
17
17
|
}
|
|
18
18
|
span {
|
|
19
19
|
font-family: SourceHanSansCN, SourceHanSansCN;
|
|
20
20
|
font-weight: 400;
|
|
21
21
|
font-size: 14px;
|
|
22
|
-
color: #
|
|
22
|
+
color: #ff7e07;
|
|
23
23
|
margin-left: 4px;
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
|
|
27
|
+
> .header {
|
|
28
28
|
flex-shrink: 0;
|
|
29
29
|
|
|
30
30
|
.noPaddingRight {
|
|
@@ -32,24 +32,6 @@
|
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
:global {
|
|
35
|
-
|
|
36
|
-
.next-row {
|
|
37
|
-
|
|
38
|
-
.next-col.next-col-8,
|
|
39
|
-
.next-col.next-col-16 {
|
|
40
|
-
padding-right: 20px;
|
|
41
|
-
box-sizing: border-box;
|
|
42
|
-
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
.next-col.next-col-6,
|
|
46
|
-
.next-col.next-col-12,
|
|
47
|
-
.next-col.next-col-18 {
|
|
48
|
-
padding-right: 16px;
|
|
49
|
-
box-sizing: border-box;
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
|
|
53
35
|
.next-form-item.next-left {
|
|
54
36
|
width: 100%;
|
|
55
37
|
display: flex !important;
|
|
@@ -83,7 +65,7 @@
|
|
|
83
65
|
height: 30px;
|
|
84
66
|
|
|
85
67
|
.next-input-text-field,
|
|
86
|
-
>input {
|
|
68
|
+
> input {
|
|
87
69
|
height: 28px;
|
|
88
70
|
}
|
|
89
71
|
|
|
@@ -107,7 +89,6 @@
|
|
|
107
89
|
width: 100%;
|
|
108
90
|
}
|
|
109
91
|
|
|
110
|
-
|
|
111
92
|
input,
|
|
112
93
|
textarea {
|
|
113
94
|
width: 100%;
|
|
@@ -127,7 +108,6 @@
|
|
|
127
108
|
}
|
|
128
109
|
|
|
129
110
|
.btnCol {
|
|
130
|
-
padding: 0 !important;
|
|
131
111
|
display: flex;
|
|
132
112
|
justify-content: flex-end;
|
|
133
113
|
margin-bottom: 16px;
|
|
@@ -139,9 +119,23 @@
|
|
|
139
119
|
}
|
|
140
120
|
}
|
|
141
121
|
|
|
122
|
+
/* ghost 风格按钮:白底 + 主题橙描边/文字(含 hover/点击),权重一致 */
|
|
123
|
+
.ghostBtn {
|
|
124
|
+
background-color: #fff;
|
|
125
|
+
border-color: #ff7e07 !important;
|
|
126
|
+
color: #ff7e07;
|
|
127
|
+
|
|
128
|
+
&:hover,
|
|
129
|
+
&:focus,
|
|
130
|
+
&:active {
|
|
131
|
+
background-color: #fff;
|
|
132
|
+
border-color: #ff7e07 !important;
|
|
133
|
+
color: #ff7e07;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
142
136
|
}
|
|
143
137
|
|
|
144
|
-
|
|
138
|
+
> .body {
|
|
145
139
|
flex: 1;
|
|
146
140
|
overflow: hidden;
|
|
147
141
|
position: relative;
|
|
@@ -154,11 +148,10 @@
|
|
|
154
148
|
line-height: 38px;
|
|
155
149
|
}
|
|
156
150
|
}
|
|
157
|
-
|
|
158
151
|
}
|
|
159
152
|
}
|
|
160
153
|
|
|
161
|
-
|
|
154
|
+
> .pagination {
|
|
162
155
|
text-align: right;
|
|
163
156
|
flex-shrink: 0;
|
|
164
157
|
}
|
package/dist/cjs/types.d.ts
CHANGED
|
@@ -172,10 +172,37 @@ export interface TableConfigProps {
|
|
|
172
172
|
defaultPageSize?: number;
|
|
173
173
|
[key: string]: any;
|
|
174
174
|
}
|
|
175
|
+
/** 单个按钮的样式覆盖:优先级高于 buttonStyle 整体风格 */
|
|
176
|
+
export interface ButtonItemConfig {
|
|
177
|
+
/**
|
|
178
|
+
* 该按钮的风格(覆盖 buttonStyle 整体设置):
|
|
179
|
+
* - 'primary':主题色实心主按钮
|
|
180
|
+
* - 'ghost':白底主题橙描边幽灵按钮
|
|
181
|
+
*/
|
|
182
|
+
style?: 'primary' | 'ghost';
|
|
183
|
+
}
|
|
175
184
|
export interface ButtonConfigProps {
|
|
176
185
|
/** @deprecated 不再用于定位;按钮列自动占据本行剩余宽度以紧贴最右侧 */
|
|
177
186
|
col?: number;
|
|
178
|
-
|
|
187
|
+
/**
|
|
188
|
+
* 按钮列表:字符串为内置按钮名(submit/reset/export/setting),
|
|
189
|
+
* 也可传 ReactNode 自定义按钮;对象形式 { name, style } 可单独指定该按钮的风格
|
|
190
|
+
*/
|
|
191
|
+
buttons: Array<string | ReactNode | {
|
|
192
|
+
name: string;
|
|
193
|
+
style?: 'primary' | 'ghost';
|
|
194
|
+
}>;
|
|
195
|
+
/**
|
|
196
|
+
* 按钮整体风格(全局默认,可被单个按钮的 style 覆盖):
|
|
197
|
+
* - 'primary'(默认):搜索为主题色实心主按钮,重置/导出为白底灰字次按钮
|
|
198
|
+
* - 'ghost':全部为主题色描边幽灵按钮(白底橙字橙框),搜索与重置同权重
|
|
199
|
+
*/
|
|
200
|
+
buttonStyle?: 'primary' | 'ghost';
|
|
201
|
+
/**
|
|
202
|
+
* 按钮级覆盖:key 为内置按钮名(submit/reset/export/setting),
|
|
203
|
+
* 配置优先级 单按钮 style > buttons 中的对象配置 > buttonStyle
|
|
204
|
+
*/
|
|
205
|
+
buttonStyles?: Partial<Record<'submit' | 'reset' | 'export' | 'setting', ButtonItemConfig>>;
|
|
179
206
|
}
|
|
180
207
|
export interface FormPageProps {
|
|
181
208
|
searchFn?: (...args: any[]) => any;
|
package/dist/cjs/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,KAAK,UAAU,GAAG,GAAG,CAAC;AACtB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACvF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAIrE,sBAAsB;AACtB,UAAU,iBAAiB;IACzB,qBAAqB;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,cAAc;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,6DAA6D;IAC7D,SAAS,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;IACxC,2BAA2B;IAC3B,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,yBAAyB;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB;AAID,sBAAsB;AACtB,MAAM,WAAW,eAAgB,SAAQ,iBAAiB;IACxD,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;CACpC;AAED,qBAAqB;AACrB,MAAM,WAAW,cAAe,SAAQ,iBAAiB;IACvD,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;CACnC;AAED,yBAAyB;AACzB,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC5D,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;CACxC;AAED,8BAA8B;AAC9B,MAAM,WAAW,uBAAwB,SAAQ,iBAAiB;IAChE,IAAI,EAAE,gBAAgB,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;CAC5C;AAED,0BAA0B;AAC1B,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC5D,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;CACxC;AAED,sCAAsC;AACtC,MAAM,WAAW,oBAAqB,SAAQ,iBAAiB;IAC7D,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;CACzC;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAqB,SAAQ,iBAAiB;IAC7D,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvB,OAAO,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAClC,WAAW,CAAC,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;CACpE;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAiB,SAAQ,iBAAiB;IACzD,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvB,OAAO,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAClC,WAAW,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IACzD,mBAAmB;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAuB,SAAQ,iBAAiB;IAC/D,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACnC,gDAAgD;IAChD,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,WAAW,wBAAyB,SAAQ,iBAAiB;IACjE,IAAI,EAAE,iBAAiB,CAAC;IACxB,iCAAiC;IACjC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,WAAW,CAAC,EAAE,OAAO,CAAC,eAAe,GAAG,gBAAgB,GAAG,eAAe,CAAC,EAAE,CAAC;IAC9E,qBAAqB;IACrB,KAAK,EAAE;QACL,qBAAqB;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,gBAAgB;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,aAAa;QACb,OAAO,EAAE,KAAK,CAAC;YACb,aAAa;YACb,IAAI,EAAE,MAAM,CAAC;YACb,+BAA+B;YAC/B,IAAI,EAAE,GAAG,EAAE,CAAC;YACZ,cAAc;YACd,cAAc,CAAC,EAAE,YAAY,GAAG,aAAa,GAAG,YAAY,CAAC;YAC7D,6BAA6B;YAC7B,KAAK,CAAC,EAAE,OAAO,CAAC,eAAe,GAAG,gBAAgB,GAAG,eAAe,CAAC,CAAC;SACvE,CAAC,CAAC;KACJ,CAAC;CACH;AAED;;;GAGG;AACH,MAAM,WAAW,qBAAsB,SAAQ,iBAAiB;IAC9D,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACnC,yBAAyB;IACzB,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;CAC9C;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC5D,IAAI,EAAE,YAAY,CAAC;IACnB,kCAAkC;IAClC,IAAI,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,SAAS,CAAC;CACjC;AAED;;;GAGG;AACH,MAAM,WAAW,eAAgB,SAAQ,iBAAiB;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,SAAS,CAAC;CACnB;AAED,2BAA2B;AAC3B,MAAM,MAAM,aAAa,GACrB,eAAe,GACf,cAAc,GACd,mBAAmB,GACnB,uBAAuB,GACvB,mBAAmB,GACnB,oBAAoB,GACpB,oBAAoB,GACpB,gBAAgB,GAChB,sBAAsB,GACtB,wBAAwB,GACxB,qBAAqB,GACrB,mBAAmB,GACnB,eAAe,CAAC;AAIpB,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,iBAAiB;IAChC,6CAA6C;IAC7C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,KAAK,UAAU,GAAG,GAAG,CAAC;AACtB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACvF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAIrE,sBAAsB;AACtB,UAAU,iBAAiB;IACzB,qBAAqB;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,cAAc;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,6DAA6D;IAC7D,SAAS,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;IACxC,2BAA2B;IAC3B,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,yBAAyB;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB;AAID,sBAAsB;AACtB,MAAM,WAAW,eAAgB,SAAQ,iBAAiB;IACxD,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;CACpC;AAED,qBAAqB;AACrB,MAAM,WAAW,cAAe,SAAQ,iBAAiB;IACvD,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;CACnC;AAED,yBAAyB;AACzB,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC5D,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;CACxC;AAED,8BAA8B;AAC9B,MAAM,WAAW,uBAAwB,SAAQ,iBAAiB;IAChE,IAAI,EAAE,gBAAgB,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;CAC5C;AAED,0BAA0B;AAC1B,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC5D,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;CACxC;AAED,sCAAsC;AACtC,MAAM,WAAW,oBAAqB,SAAQ,iBAAiB;IAC7D,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;CACzC;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAqB,SAAQ,iBAAiB;IAC7D,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvB,OAAO,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAClC,WAAW,CAAC,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;CACpE;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAiB,SAAQ,iBAAiB;IACzD,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvB,OAAO,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAClC,WAAW,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IACzD,mBAAmB;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAuB,SAAQ,iBAAiB;IAC/D,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACnC,gDAAgD;IAChD,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,WAAW,wBAAyB,SAAQ,iBAAiB;IACjE,IAAI,EAAE,iBAAiB,CAAC;IACxB,iCAAiC;IACjC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,WAAW,CAAC,EAAE,OAAO,CAAC,eAAe,GAAG,gBAAgB,GAAG,eAAe,CAAC,EAAE,CAAC;IAC9E,qBAAqB;IACrB,KAAK,EAAE;QACL,qBAAqB;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,gBAAgB;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,aAAa;QACb,OAAO,EAAE,KAAK,CAAC;YACb,aAAa;YACb,IAAI,EAAE,MAAM,CAAC;YACb,+BAA+B;YAC/B,IAAI,EAAE,GAAG,EAAE,CAAC;YACZ,cAAc;YACd,cAAc,CAAC,EAAE,YAAY,GAAG,aAAa,GAAG,YAAY,CAAC;YAC7D,6BAA6B;YAC7B,KAAK,CAAC,EAAE,OAAO,CAAC,eAAe,GAAG,gBAAgB,GAAG,eAAe,CAAC,CAAC;SACvE,CAAC,CAAC;KACJ,CAAC;CACH;AAED;;;GAGG;AACH,MAAM,WAAW,qBAAsB,SAAQ,iBAAiB;IAC9D,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACnC,yBAAyB;IACzB,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;CAC9C;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC5D,IAAI,EAAE,YAAY,CAAC;IACnB,kCAAkC;IAClC,IAAI,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,SAAS,CAAC;CACjC;AAED;;;GAGG;AACH,MAAM,WAAW,eAAgB,SAAQ,iBAAiB;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,SAAS,CAAC;CACnB;AAED,2BAA2B;AAC3B,MAAM,MAAM,aAAa,GACrB,eAAe,GACf,cAAc,GACd,mBAAmB,GACnB,uBAAuB,GACvB,mBAAmB,GACnB,oBAAoB,GACpB,oBAAoB,GACpB,gBAAgB,GAChB,sBAAsB,GACtB,wBAAwB,GACxB,qBAAqB,GACrB,mBAAmB,GACnB,eAAe,CAAC;AAIpB,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,uCAAuC;AACvC,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,KAAK,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,iBAAiB;IAChC,6CAA6C;IAC7C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,OAAO,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,SAAS,GAAG,OAAO,CAAA;KAAE,CAAC,CAAC;IACnF;;;;OAIG;IACH,WAAW,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC;IAClC;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC;CAC7F;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;IACnC,QAAQ,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;IACnC,cAAc,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC;IAChE,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC;IACjC,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IACnD,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,GAAG,CAAC;IACX,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,qBAAqB,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;CAC/D"}
|
package/dist/esm/FormPage.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import type { ConditionItem, SelectCondition, InputCondition, TreeSelectCondition, CascaderSelectCondition, DatePickerCondition, MonthPickerCondition, RangePickerCondition, SectionCondition, CompanySelectCondition, ExtraDatePickerCondition, SelectSearchCondition, CustomNodeCondition, CustomCondition, TableConfigProps, ButtonConfigProps, FormPageProps, FormPageRef } from './types';
|
|
3
|
-
export type { FormPageProps, FormPageRef, ConditionItem, TableConfigProps, ButtonConfigProps, SelectCondition, InputCondition, TreeSelectCondition, CascaderSelectCondition, DatePickerCondition, MonthPickerCondition, RangePickerCondition, SectionCondition, CompanySelectCondition, ExtraDatePickerCondition, SelectSearchCondition, CustomNodeCondition, CustomCondition, };
|
|
2
|
+
import type { ConditionItem, SelectCondition, InputCondition, TreeSelectCondition, CascaderSelectCondition, DatePickerCondition, MonthPickerCondition, RangePickerCondition, SectionCondition, CompanySelectCondition, ExtraDatePickerCondition, SelectSearchCondition, CustomNodeCondition, CustomCondition, TableConfigProps, ButtonConfigProps, ButtonItemConfig, FormPageProps, FormPageRef } from './types';
|
|
3
|
+
export type { FormPageProps, FormPageRef, ConditionItem, TableConfigProps, ButtonConfigProps, ButtonItemConfig, SelectCondition, InputCondition, TreeSelectCondition, CascaderSelectCondition, DatePickerCondition, MonthPickerCondition, RangePickerCondition, SectionCondition, CompanySelectCondition, ExtraDatePickerCondition, SelectSearchCondition, CustomNodeCondition, CustomCondition, };
|
|
4
4
|
/**
|
|
5
5
|
* 估算字符串在「字数」意义上的宽度(用于 alignLabelWidth 按字数对齐)。
|
|
6
6
|
* 全角字符(中日韩、全角标点)计 1,半角字符两个计 1(最少 1)。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormPage.d.ts","sourceRoot":"","sources":["../src/FormPage.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"FormPage.d.ts","sourceRoot":"","sources":["../src/FormPage.tsx"],"names":[],"mappings":"AAoBA,OAAO,KAQN,MAAM,OAAO,CAAC;AAWf,OAAO,KAAK,EACV,aAAa,EACb,eAAe,EACf,cAAc,EACd,mBAAmB,EACnB,uBAAuB,EACvB,mBAAmB,EACnB,oBAAoB,EACpB,oBAAoB,EACpB,gBAAgB,EAChB,sBAAsB,EACtB,wBAAwB,EACxB,qBAAqB,EACrB,mBAAmB,EACnB,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,WAAW,EACZ,MAAM,SAAS,CAAC;AAEjB,YAAY,EACV,aAAa,EACb,WAAW,EACX,aAAa,EACb,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,cAAc,EACd,mBAAmB,EACnB,uBAAuB,EACvB,mBAAmB,EACnB,oBAAoB,EACpB,oBAAoB,EACpB,gBAAgB,EAChB,sBAAsB,EACtB,wBAAwB,EACxB,qBAAqB,EACrB,mBAAmB,EACnB,eAAe,GAChB,CAAC;AAIF;;;GAGG;AACH,eAAO,MAAM,WAAW,MAAO,MAAM,KAAG,MAavC,CAAC;;AAyqBF,wBAAoC;AAEpC;;;GAGG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;CAexB,CAAC"}
|
package/dist/esm/FormPage.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
2
1
|
var _excluded = ["columns"],
|
|
3
2
|
_excluded2 = ["ellipsis", "cell"];
|
|
3
|
+
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
4
4
|
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
5
5
|
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
6
6
|
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
@@ -148,20 +148,32 @@ var FormPage = function FormPage(_ref, ref) {
|
|
|
148
148
|
onSaveTableKeys = _useConfig.onSaveTableKeys;
|
|
149
149
|
|
|
150
150
|
/**
|
|
151
|
-
*
|
|
152
|
-
*
|
|
151
|
+
* 模拟 24 栅格逐项摆放(剩余空间放不下则换行),得到两份与 flex 实际换行一致的结果:
|
|
152
|
+
* 1. offsets:每个条件项的列起点偏移(0/6/12/18...)。col=12 的"创建时间"与
|
|
153
|
+
* col=6 的"名称"都在行首(起点 0),归入同一竖列;
|
|
154
|
+
* 2. maxByOffset(仅 alignLabelWidth 时):同一竖列起点下、未单独配 labelWidth 的
|
|
155
|
+
* 字符串标签的最长字数(+0.5 字缓冲),作为该竖列统一的 label 宽度。
|
|
153
156
|
*/
|
|
154
|
-
var
|
|
155
|
-
|
|
156
|
-
var
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
157
|
+
var gridOffsets = useMemo(function () {
|
|
158
|
+
var offsets = [];
|
|
159
|
+
var maxByOffset = alignLabelWidth ? new Map() : undefined;
|
|
160
|
+
var offset = 0;
|
|
161
|
+
conditionProps.forEach(function (e) {
|
|
162
|
+
if (offset + e.col > 24) offset = 0; // 放不下则换行,列起点回到 0
|
|
163
|
+
offsets.push(offset);
|
|
164
|
+
if (maxByOffset && e.labelWidth == null && typeof e.label === 'string') {
|
|
165
|
+
var _maxByOffset$get;
|
|
166
|
+
var w = Math.ceil(stringWidth(e.label) + 0.5);
|
|
167
|
+
maxByOffset.set(offset, Math.max((_maxByOffset$get = maxByOffset.get(offset)) !== null && _maxByOffset$get !== void 0 ? _maxByOffset$get : 0, w));
|
|
168
|
+
}
|
|
169
|
+
offset += e.col;
|
|
170
|
+
});
|
|
171
|
+
return {
|
|
172
|
+
offsets: offsets,
|
|
173
|
+
maxByOffset: maxByOffset
|
|
174
|
+
};
|
|
161
175
|
}, [alignLabelWidth, conditionProps]);
|
|
162
176
|
|
|
163
|
-
/** 累计栅格数,用于判断一行是否已满 24 栅格(满则去掉右内边距) */
|
|
164
|
-
var colSum = 0;
|
|
165
177
|
/** 表格容器 ref,用于测量可用高度以自适应 maxBodyHeight */
|
|
166
178
|
var tableBox = useRef(null);
|
|
167
179
|
/** 保留最新的列配置(含拖拽后的宽度),避免拖拽回调中直接 setState 导致性能问题 */
|
|
@@ -460,30 +472,51 @@ var FormPage = function FormPage(_ref, ref) {
|
|
|
460
472
|
/**
|
|
461
473
|
* 内置按钮映射,buttonProps.buttons 中的字符串对应此处的 key
|
|
462
474
|
* 未匹配的字符串会直接作为 ReactNode 渲染(支持传入自定义 JSX)
|
|
475
|
+
*
|
|
476
|
+
* 风格解析(优先级从高到低):
|
|
477
|
+
* 1. buttonProps.buttonStyles[name].style —— 按钮级覆盖
|
|
478
|
+
* 2. buttons 数组中的对象形式 { name, style } —— 内联覆盖
|
|
479
|
+
* 3. buttonProps.buttonStyle —— 整体风格(默认 'primary')
|
|
480
|
+
* - 'primary':搜索为主题色实心主按钮,其余为普通次按钮
|
|
481
|
+
* - 'ghost':白底主题橙描边幽灵按钮(配色由 SCSS 的 ghostBtn 覆盖)
|
|
463
482
|
*/
|
|
483
|
+
var btnStyle = function btnStyle(name, inline) {
|
|
484
|
+
var _ref5, _ref6, _buttonProps$buttonSt, _buttonProps$buttonSt2;
|
|
485
|
+
return (_ref5 = (_ref6 = (_buttonProps$buttonSt = (_buttonProps$buttonSt2 = buttonProps.buttonStyles) === null || _buttonProps$buttonSt2 === void 0 || (_buttonProps$buttonSt2 = _buttonProps$buttonSt2[name]) === null || _buttonProps$buttonSt2 === void 0 ? void 0 : _buttonProps$buttonSt2.style) !== null && _buttonProps$buttonSt !== void 0 ? _buttonProps$buttonSt : inline) !== null && _ref6 !== void 0 ? _ref6 : buttonProps.buttonStyle) !== null && _ref5 !== void 0 ? _ref5 : 'primary';
|
|
486
|
+
};
|
|
487
|
+
/** 按风格生成 Button 的 type / className */
|
|
488
|
+
var styleOf = function styleOf(name, inline) {
|
|
489
|
+
var ghost = btnStyle(name, inline) === 'ghost';
|
|
490
|
+
return ghost ? {
|
|
491
|
+
type: 'normal',
|
|
492
|
+
className: styles.ghostBtn
|
|
493
|
+
} : {
|
|
494
|
+
type: name === 'submit' ? 'primary' : 'normal',
|
|
495
|
+
className: undefined
|
|
496
|
+
};
|
|
497
|
+
};
|
|
464
498
|
var button = {
|
|
465
|
-
export: /*#__PURE__*/_jsx(Button, {
|
|
466
|
-
loading: loading
|
|
467
|
-
|
|
499
|
+
export: /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
|
|
500
|
+
loading: loading
|
|
501
|
+
}, styleOf('export')), {}, {
|
|
468
502
|
onClick: exportExcel.submit,
|
|
469
503
|
children: "\u5BFC\u51FA"
|
|
470
|
-
},
|
|
471
|
-
submit: /*#__PURE__*/_jsx(Button, {
|
|
472
|
-
loading: tableLoading
|
|
473
|
-
|
|
504
|
+
}), 'export'),
|
|
505
|
+
submit: /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
|
|
506
|
+
loading: tableLoading
|
|
507
|
+
}, styleOf('submit')), {}, {
|
|
474
508
|
onClick: function onClick() {
|
|
475
509
|
btnSearchFlag.current = true;
|
|
476
510
|
_submit();
|
|
477
511
|
},
|
|
478
512
|
children: "\u641C\u7D22"
|
|
479
|
-
},
|
|
480
|
-
reset: /*#__PURE__*/_jsx(Button, {
|
|
481
|
-
type: "normal",
|
|
513
|
+
}), 'submit'),
|
|
514
|
+
reset: /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, styleOf('reset')), {}, {
|
|
482
515
|
onClick: btnReset,
|
|
483
516
|
children: "\u91CD\u7F6E"
|
|
484
|
-
},
|
|
517
|
+
}), 'reset'),
|
|
485
518
|
setting: /*#__PURE__*/_jsxs(Button, {
|
|
486
|
-
className: styles.settingBtn,
|
|
519
|
+
className: [styles.settingBtn, styleOf('setting').className].filter(Boolean).join(' '),
|
|
487
520
|
onClick: function onClick() {
|
|
488
521
|
settingDialog.current.show();
|
|
489
522
|
},
|
|
@@ -493,7 +526,7 @@ var FormPage = function FormPage(_ref, ref) {
|
|
|
493
526
|
}), /*#__PURE__*/_jsx("span", {
|
|
494
527
|
children: "\u8BBE\u7F6E"
|
|
495
528
|
})]
|
|
496
|
-
},
|
|
529
|
+
}, 'setting')
|
|
497
530
|
};
|
|
498
531
|
|
|
499
532
|
/** 表格行选择变化回调 */
|
|
@@ -603,19 +636,20 @@ var FormPage = function FormPage(_ref, ref) {
|
|
|
603
636
|
}, [dbColumns, tbKeys]);
|
|
604
637
|
|
|
605
638
|
/**
|
|
606
|
-
*
|
|
607
|
-
*
|
|
608
|
-
*
|
|
639
|
+
* 模拟 24 栅格逐项摆放后的「最后一行实际占用份数」。
|
|
640
|
+
* 不能用总和取模推剩余空间:flex 换行按行计算,单项放不下会整项换行,
|
|
641
|
+
* 末行实际占用可能大于 total % 24(如末行已占 18 份时再来一个 12 份的项会换行)。
|
|
642
|
+
* 若按取模算按钮列宽,按钮列放不进本行 → 换行后只占半宽,无法贴到最右侧。
|
|
609
643
|
*/
|
|
610
|
-
var
|
|
611
|
-
return
|
|
644
|
+
var lastRowUsed = conditionProps.reduce(function (used, item) {
|
|
645
|
+
return used + item.col > 24 ? item.col : used + item.col;
|
|
612
646
|
}, 0);
|
|
613
647
|
/** 按钮列占据本行剩余宽度,使按钮始终紧贴最右侧;条件正好填满整行(24)时按钮独占新的一行 */
|
|
614
|
-
var btnColSpan =
|
|
648
|
+
var btnColSpan = lastRowUsed >= 24 ? 24 : 24 - lastRowUsed;
|
|
615
649
|
|
|
616
650
|
/** 保存隐藏列配置到远程,成功后更新本地状态 */
|
|
617
651
|
var handleSaveTableKeys = /*#__PURE__*/function () {
|
|
618
|
-
var
|
|
652
|
+
var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
|
|
619
653
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
|
620
654
|
while (1) switch (_context2.prev = _context2.next) {
|
|
621
655
|
case 0:
|
|
@@ -634,7 +668,7 @@ var FormPage = function FormPage(_ref, ref) {
|
|
|
634
668
|
}, _callee2);
|
|
635
669
|
}));
|
|
636
670
|
return function handleSaveTableKeys(_x2) {
|
|
637
|
-
return
|
|
671
|
+
return _ref7.apply(this, arguments);
|
|
638
672
|
};
|
|
639
673
|
}();
|
|
640
674
|
return /*#__PURE__*/_jsxs("div", {
|
|
@@ -647,23 +681,26 @@ var FormPage = function FormPage(_ref, ref) {
|
|
|
647
681
|
field: field,
|
|
648
682
|
children: [/*#__PURE__*/_jsxs(Row, {
|
|
649
683
|
wrap: true,
|
|
684
|
+
gutter: 16,
|
|
650
685
|
children: [conditionProps.map(function (e, i) {
|
|
651
|
-
var _e$textAlign, _e$labelWidth, _tableProps$tableId;
|
|
652
|
-
|
|
653
|
-
var
|
|
654
|
-
|
|
686
|
+
var _e$textAlign, _e$labelWidth, _gridOffsets$maxByOff, _tableProps$tableId;
|
|
687
|
+
/** 本项的列起点偏移(与 gridOffsets 的模拟摆放一致,含提前换行修正) */
|
|
688
|
+
var start = gridOffsets.offsets[i];
|
|
689
|
+
var end = start + e.col;
|
|
655
690
|
/** 手动配置优先,否则根据行内位置自动计算:行首 left / 行尾 right / 中间 center */
|
|
656
|
-
var textAlign = (_e$textAlign = e.textAlign) !== null && _e$textAlign !== void 0 ? _e$textAlign :
|
|
691
|
+
var textAlign = (_e$textAlign = e.textAlign) !== null && _e$textAlign !== void 0 ? _e$textAlign : start % 24 === 0 ? 'left' : end % 24 === 0 ? 'right' : 'center';
|
|
657
692
|
|
|
658
693
|
/** labelWidth:数字按「字数」转 em;仅当 label 为字符串时生效。
|
|
659
|
-
* alignLabelWidth
|
|
660
|
-
|
|
694
|
+
* alignLabelWidth 时,未单独配置的项回退到「同竖列(列起点偏移相同)」内
|
|
695
|
+
* 最长的标签字数,使同一竖列的标签右缘对齐。 */
|
|
696
|
+
var lw = (_e$labelWidth = e.labelWidth) !== null && _e$labelWidth !== void 0 ? _e$labelWidth : (_gridOffsets$maxByOff = gridOffsets.maxByOffset) === null || _gridOffsets$maxByOff === void 0 ? void 0 : _gridOffsets$maxByOff.get(start);
|
|
661
697
|
var labelWidthStyle = lw == null ? undefined : "".concat(lw, "em");
|
|
662
698
|
var useLabelWidth = labelWidthStyle != null && typeof e.label === 'string';
|
|
663
699
|
var labelEl = useLabelWidth ? /*#__PURE__*/_jsx("span", {
|
|
664
700
|
style: {
|
|
665
701
|
display: 'inline-block',
|
|
666
|
-
width: labelWidthStyle
|
|
702
|
+
width: labelWidthStyle,
|
|
703
|
+
textAlign: 'right'
|
|
667
704
|
},
|
|
668
705
|
children: e.label
|
|
669
706
|
}) : e.label;
|
|
@@ -685,8 +722,31 @@ var FormPage = function FormPage(_ref, ref) {
|
|
|
685
722
|
span: btnColSpan,
|
|
686
723
|
className: styles.btnCol,
|
|
687
724
|
children: buttonProps.buttons.map(function (e) {
|
|
688
|
-
var _button
|
|
689
|
-
|
|
725
|
+
var _button;
|
|
726
|
+
/** 对象形式 { name, style }:按内联 style 覆盖整体风格后渲染内置按钮 */
|
|
727
|
+
if (_typeof(e) === 'object' && e !== null && 'name' in e && !('$$typeof' in e)) {
|
|
728
|
+
var _ref8 = e,
|
|
729
|
+
name = _ref8.name,
|
|
730
|
+
inline = _ref8.style;
|
|
731
|
+
return /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
|
|
732
|
+
loading: name === 'submit' ? tableLoading : name === 'export' ? loading : undefined
|
|
733
|
+
}, styleOf(name, inline)), {}, {
|
|
734
|
+
onClick: name === 'submit' ? function () {
|
|
735
|
+
btnSearchFlag.current = true;
|
|
736
|
+
_submit();
|
|
737
|
+
} : name === 'export' ? exportExcel.submit : name === 'reset' ? btnReset : function () {
|
|
738
|
+
return settingDialog.current.show();
|
|
739
|
+
},
|
|
740
|
+
className: name === 'setting' ? [styles.settingBtn, styleOf(name, inline).className].filter(Boolean).join(' ') : styleOf(name, inline).className,
|
|
741
|
+
children: name === 'submit' ? '搜索' : name === 'reset' ? '重置' : name === 'export' ? '导出' : name === 'setting' ? [/*#__PURE__*/_jsx("img", {
|
|
742
|
+
src: setting,
|
|
743
|
+
alt: ""
|
|
744
|
+
}, 'img'), /*#__PURE__*/_jsx("span", {
|
|
745
|
+
children: "\u8BBE\u7F6E"
|
|
746
|
+
}, 'txt')] : name
|
|
747
|
+
}), name);
|
|
748
|
+
}
|
|
749
|
+
return (_button = button[e]) !== null && _button !== void 0 ? _button : e;
|
|
690
750
|
})
|
|
691
751
|
}) : null]
|
|
692
752
|
}), extra !== null && extra !== void 0 ? extra : null]
|
package/dist/esm/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { default as FormPage } from './FormPage';
|
|
2
2
|
export { FormPageData, stringWidth } from './FormPage';
|
|
3
|
-
export type { FormPageRef, FormPageProps, ConditionItem, TableConfigProps, ButtonConfigProps, SelectCondition, InputCondition, TreeSelectCondition, CascaderSelectCondition, DatePickerCondition, MonthPickerCondition, RangePickerCondition, SectionCondition, CompanySelectCondition, ExtraDatePickerCondition, SelectSearchCondition, CustomNodeCondition, CustomCondition, } from './FormPage';
|
|
3
|
+
export type { FormPageRef, FormPageProps, ConditionItem, TableConfigProps, ButtonConfigProps, ButtonItemConfig, SelectCondition, InputCondition, TreeSelectCondition, CascaderSelectCondition, DatePickerCondition, MonthPickerCondition, RangePickerCondition, SectionCondition, CompanySelectCondition, ExtraDatePickerCondition, SelectSearchCondition, CustomNodeCondition, CustomCondition, } from './FormPage';
|
|
4
4
|
export { FormPageProvider } from './context';
|
|
5
5
|
export type { FormPageConfig } from './context';
|
|
6
6
|
export { default as CustomNode } from './components/CustomNode';
|
package/dist/esm/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACvD,YAAY,EACV,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,gBAAgB,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACvD,YAAY,EACV,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAChG,eAAe,EAAE,cAAc,EAAE,mBAAmB,EAAE,uBAAuB,EAC7E,mBAAmB,EAAE,oBAAoB,EACzC,oBAAoB,EAAE,gBAAgB,EACtC,sBAAsB,EAAE,wBAAwB,EAAE,qBAAqB,EACvE,mBAAmB,EAAE,eAAe,GACrC,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,YAAY,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAEhD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAC"}
|
|
@@ -12,19 +12,19 @@
|
|
|
12
12
|
// // cursor: pointer;
|
|
13
13
|
// display: flex !important;
|
|
14
14
|
// align-items: center;
|
|
15
|
-
img{
|
|
16
|
-
vertical-align:middle;
|
|
15
|
+
img {
|
|
16
|
+
vertical-align: middle;
|
|
17
17
|
}
|
|
18
18
|
span {
|
|
19
19
|
font-family: SourceHanSansCN, SourceHanSansCN;
|
|
20
20
|
font-weight: 400;
|
|
21
21
|
font-size: 14px;
|
|
22
|
-
color: #
|
|
22
|
+
color: #ff7e07;
|
|
23
23
|
margin-left: 4px;
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
|
|
27
|
+
> .header {
|
|
28
28
|
flex-shrink: 0;
|
|
29
29
|
|
|
30
30
|
.noPaddingRight {
|
|
@@ -32,24 +32,6 @@
|
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
:global {
|
|
35
|
-
|
|
36
|
-
.next-row {
|
|
37
|
-
|
|
38
|
-
.next-col.next-col-8,
|
|
39
|
-
.next-col.next-col-16 {
|
|
40
|
-
padding-right: 20px;
|
|
41
|
-
box-sizing: border-box;
|
|
42
|
-
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
.next-col.next-col-6,
|
|
46
|
-
.next-col.next-col-12,
|
|
47
|
-
.next-col.next-col-18 {
|
|
48
|
-
padding-right: 16px;
|
|
49
|
-
box-sizing: border-box;
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
|
|
53
35
|
.next-form-item.next-left {
|
|
54
36
|
width: 100%;
|
|
55
37
|
display: flex !important;
|
|
@@ -83,7 +65,7 @@
|
|
|
83
65
|
height: 30px;
|
|
84
66
|
|
|
85
67
|
.next-input-text-field,
|
|
86
|
-
>input {
|
|
68
|
+
> input {
|
|
87
69
|
height: 28px;
|
|
88
70
|
}
|
|
89
71
|
|
|
@@ -107,7 +89,6 @@
|
|
|
107
89
|
width: 100%;
|
|
108
90
|
}
|
|
109
91
|
|
|
110
|
-
|
|
111
92
|
input,
|
|
112
93
|
textarea {
|
|
113
94
|
width: 100%;
|
|
@@ -127,7 +108,6 @@
|
|
|
127
108
|
}
|
|
128
109
|
|
|
129
110
|
.btnCol {
|
|
130
|
-
padding: 0 !important;
|
|
131
111
|
display: flex;
|
|
132
112
|
justify-content: flex-end;
|
|
133
113
|
margin-bottom: 16px;
|
|
@@ -139,9 +119,23 @@
|
|
|
139
119
|
}
|
|
140
120
|
}
|
|
141
121
|
|
|
122
|
+
/* ghost 风格按钮:白底 + 主题橙描边/文字(含 hover/点击),权重一致 */
|
|
123
|
+
.ghostBtn {
|
|
124
|
+
background-color: #fff;
|
|
125
|
+
border-color: #ff7e07 !important;
|
|
126
|
+
color: #ff7e07;
|
|
127
|
+
|
|
128
|
+
&:hover,
|
|
129
|
+
&:focus,
|
|
130
|
+
&:active {
|
|
131
|
+
background-color: #fff;
|
|
132
|
+
border-color: #ff7e07 !important;
|
|
133
|
+
color: #ff7e07;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
142
136
|
}
|
|
143
137
|
|
|
144
|
-
|
|
138
|
+
> .body {
|
|
145
139
|
flex: 1;
|
|
146
140
|
overflow: hidden;
|
|
147
141
|
position: relative;
|
|
@@ -154,11 +148,10 @@
|
|
|
154
148
|
line-height: 38px;
|
|
155
149
|
}
|
|
156
150
|
}
|
|
157
|
-
|
|
158
151
|
}
|
|
159
152
|
}
|
|
160
153
|
|
|
161
|
-
|
|
154
|
+
> .pagination {
|
|
162
155
|
text-align: right;
|
|
163
156
|
flex-shrink: 0;
|
|
164
157
|
}
|
package/dist/esm/types.d.ts
CHANGED
|
@@ -172,10 +172,37 @@ export interface TableConfigProps {
|
|
|
172
172
|
defaultPageSize?: number;
|
|
173
173
|
[key: string]: any;
|
|
174
174
|
}
|
|
175
|
+
/** 单个按钮的样式覆盖:优先级高于 buttonStyle 整体风格 */
|
|
176
|
+
export interface ButtonItemConfig {
|
|
177
|
+
/**
|
|
178
|
+
* 该按钮的风格(覆盖 buttonStyle 整体设置):
|
|
179
|
+
* - 'primary':主题色实心主按钮
|
|
180
|
+
* - 'ghost':白底主题橙描边幽灵按钮
|
|
181
|
+
*/
|
|
182
|
+
style?: 'primary' | 'ghost';
|
|
183
|
+
}
|
|
175
184
|
export interface ButtonConfigProps {
|
|
176
185
|
/** @deprecated 不再用于定位;按钮列自动占据本行剩余宽度以紧贴最右侧 */
|
|
177
186
|
col?: number;
|
|
178
|
-
|
|
187
|
+
/**
|
|
188
|
+
* 按钮列表:字符串为内置按钮名(submit/reset/export/setting),
|
|
189
|
+
* 也可传 ReactNode 自定义按钮;对象形式 { name, style } 可单独指定该按钮的风格
|
|
190
|
+
*/
|
|
191
|
+
buttons: Array<string | ReactNode | {
|
|
192
|
+
name: string;
|
|
193
|
+
style?: 'primary' | 'ghost';
|
|
194
|
+
}>;
|
|
195
|
+
/**
|
|
196
|
+
* 按钮整体风格(全局默认,可被单个按钮的 style 覆盖):
|
|
197
|
+
* - 'primary'(默认):搜索为主题色实心主按钮,重置/导出为白底灰字次按钮
|
|
198
|
+
* - 'ghost':全部为主题色描边幽灵按钮(白底橙字橙框),搜索与重置同权重
|
|
199
|
+
*/
|
|
200
|
+
buttonStyle?: 'primary' | 'ghost';
|
|
201
|
+
/**
|
|
202
|
+
* 按钮级覆盖:key 为内置按钮名(submit/reset/export/setting),
|
|
203
|
+
* 配置优先级 单按钮 style > buttons 中的对象配置 > buttonStyle
|
|
204
|
+
*/
|
|
205
|
+
buttonStyles?: Partial<Record<'submit' | 'reset' | 'export' | 'setting', ButtonItemConfig>>;
|
|
179
206
|
}
|
|
180
207
|
export interface FormPageProps {
|
|
181
208
|
searchFn?: (...args: any[]) => any;
|
package/dist/esm/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED