@chengkejie/form-page 1.0.1 → 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 CHANGED
@@ -1,4 +1,4 @@
1
- # @linkcld/form-page
1
+ # @chengkejie/form-page
2
2
 
3
3
  可配置的 React **搜索表单 + 表格 + 分页** 一体化组件,基于 Fusion Design (`@alifd/next`) 和 `ahooks`。
4
4
 
@@ -26,28 +26,14 @@
26
26
 
27
27
  ## 安装
28
28
 
29
- ### 1. 配置 `.npmrc`
30
-
31
- 在项目根目录创建或编辑 `.npmrc`:
32
-
33
- ```
34
- @linkcld:registry=https://gitlab.linkcld.com/api/v4/projects/2612/packages/npm/
35
- //gitlab.linkcld.com/api/v4/projects/2612/packages/npm/:_authToken=<你的 Token>
36
- ```
37
-
38
- > Token 需要在 GitLab → Preferences → Access Tokens 中创建,勾选 `read_package_registry` 权限。
39
- > 推荐使用 Deploy Token 代替个人 Token。
40
-
41
- ### 2. 安装
42
-
43
29
  ```bash
44
- npm i @linkcld/form-page
30
+ npm i @chengkejie/form-page
45
31
  ```
46
32
 
47
33
  并在入口处引入样式:
48
34
 
49
35
  ```ts
50
- import '@linkcld/form-page/dist/esm/styles/index.module.scss';
36
+ import '@chengkejie/form-page/dist/esm/styles/index.module.scss';
51
37
  ```
52
38
 
53
39
  ---
@@ -55,8 +41,8 @@ import '@linkcld/form-page/dist/esm/styles/index.module.scss';
55
41
  ## 快速开始
56
42
 
57
43
  ```tsx
58
- import { FormPage, FormPageProvider, FormPageRef } from '@linkcld/form-page';
59
- import '@linkcld/form-page/dist/esm/styles/index.module.scss';
44
+ import { FormPage, FormPageProvider, FormPageRef } from '@chengkejie/form-page';
45
+ import '@chengkejie/form-page/dist/esm/styles/index.module.scss';
60
46
 
61
47
  // 1) 查询接口:接收 (表单数据, 分页参数, 是否按钮触发),返回 { data, total }
62
48
  async function fetchList(data: any, params: any) {
@@ -116,6 +102,7 @@ function App() {
116
102
  | `onReset` | `() => void` | `() => {}` | 重置按钮触发的回调(在内部清空逻辑之外额外执行) |
117
103
  | `onFieldChange` | `(name: string, value: any) => void` | `() => {}` | 任意表单字段值变化回调 |
118
104
  | `pageSizeList` | `number[]` | `[10, 20, 50, 100]` | 分页条数可选项 |
105
+ | `alignLabelWidth` | `boolean` | `true` | 标签宽度自动对齐:同一竖列(24 栅格列起点相同)的标签统一取组内最长字数宽度并右对齐。详见 [标签宽度对齐](#标签宽度对齐alignlabelwidth)。传 `false` 退回默认 `75px` 最小宽度 |
119
106
 
120
107
  > `searchFn` 返回值需符合 `ahooks` `useFusionTable` 约定:`{ data: 表格数据数组, total: 总条数 }`。
121
108
 
@@ -208,10 +195,32 @@ columns={[
208
195
  |------|------|------|------|
209
196
  | `col` | `number` | 是 | 占据的栅格列数(24 栅格制,如 `6`、`8`、`12`) |
210
197
  | `label` | `string` | 否 | 表单项标签文本 |
198
+ | `labelWidth` | `number` | 否 | 标签宽度,按「字数」计:传几渲染成几 em(`1em ≈ 1` 个全角字宽)。仅 `label` 为字符串时生效,可突破默认 `75px` 最小宽度;配置后该项不参与自动对齐分组 |
211
199
  | `textAlign` | `'left' \| 'center' \| 'right'` | 否 | 对齐方式,不传则按行内位置自动计算(行首 left / 中间 center / 行尾 right) |
212
200
  | `wrapperCol` | `object` | 否 | `Form.Item` 的 `wrapperCol` |
213
201
  | `labelCol` | `object` | 否 | `Form.Item` 的 `labelCol` |
214
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
+
215
224
  ### 各类型(`type`)
216
225
 
217
226
  | `type` | 渲染控件 | 特有字段 | `customProps` 类型 |
@@ -304,7 +313,11 @@ conditionProps={[
304
313
  interface ButtonConfigProps {
305
314
  /** @deprecated 不再生效;按钮列自动占据本行剩余宽度以紧贴最右侧 */
306
315
  col?: number;
307
- buttons: Array<'submit' | 'reset' | 'export' | 'setting' | ReactNode>;
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' }>>;
308
321
  }
309
322
  ```
310
323
 
@@ -317,12 +330,37 @@ interface ButtonConfigProps {
317
330
  | `'export'` | 导出 | 调用 `exportFn` |
318
331
  | `'setting'` | 设置 | 打开列显示/隐藏设置弹窗(依赖 `tableId`) |
319
332
 
333
+ ### 按钮风格(三级粒度)
334
+
335
+ 风格优先级:**`buttonStyles[name]` > `buttons` 内联对象 > `buttonStyle` > 默认 `primary`**
336
+
337
+ | 风格 | 视觉 | 说明 |
338
+ |------|------|------|
339
+ | `'primary'`(默认) | 搜索 = 主题色实心主按钮;重置/导出/设置 = 普通次按钮 | 突出主操作 |
340
+ | `'ghost'` | 全部 = 白底 + 主题橙(`#ff7e07`)描边幽灵按钮 | 权重一致,见下图风格 |
341
+
320
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(自定义按钮不受风格控制)
321
357
  buttonProps={{
322
358
  buttons: ['submit', 'reset', <Button key="custom" onClick={...}>自定义</Button>, 'setting'],
323
359
  }}
324
360
  ```
325
361
 
362
+ > 内联对象 `{ name, style }` 的 `name` 必须是内置按钮名(`'submit' | 'reset' | 'export' | 'setting'`),否则按未知按钮渲染兜底。
363
+
326
364
  ---
327
365
 
328
366
  ## Ref 方法(FormPageRef)
@@ -359,7 +397,7 @@ ref.current?.selectedRowKeysChange([1, 2]);
359
397
  可选:用 `<FormPageProvider config={...}>` 包裹,注入列设置持久化与公司选择等外部服务。
360
398
 
361
399
  ```ts
362
- import { FormPageProvider, FormPageConfig } from '@linkcld/form-page';
400
+ import { FormPageProvider, FormPageConfig } from '@chengkejie/form-page';
363
401
 
364
402
  const config: FormPageConfig = {
365
403
  // 列设置(显示/隐藏)持久化
@@ -407,7 +445,7 @@ interface SettingDialogProps {
407
445
  - 点「确定」时把**未勾选**的列拼成 `value`(dataIndex 逗号拼接)和 `name`(title 逗号拼接),连同 `tableId`、`tableName`(取自 Provider 的 `getTableName`)调 `onSave`;成功后调 `onChange(id)`。
408
446
 
409
447
  ```tsx
410
- import { SettingDialog } from '@linkcld/form-page';
448
+ import { SettingDialog } from '@chengkejie/form-page';
411
449
  import { useRef } from 'react';
412
450
 
413
451
  const ref = useRef<any>(null);
@@ -436,7 +474,7 @@ ref.current?.show(); // 打开弹窗
436
474
  | `CustomNode` | `CustomNodeCondition` | 渲染 `data.node(field)` |
437
475
 
438
476
  ```tsx
439
- import { Section } from '@linkcld/form-page';
477
+ import { Section } from '@chengkejie/form-page';
440
478
  import { Field } from '@alifd/next';
441
479
 
442
480
  const field = Field.useField();
@@ -452,8 +490,8 @@ const field = Field.useField();
452
490
 
453
491
  ```tsx
454
492
  import { useRef } from 'react';
455
- import { FormPage, FormPageProvider, FormPageRef, FormPageData } from '@linkcld/form-page';
456
- import '@linkcld/form-page/dist/esm/styles/index.module.scss';
493
+ import { FormPage, FormPageProvider, FormPageRef, FormPageData } from '@chengkejie/form-page';
494
+ import '@chengkejie/form-page/dist/esm/styles/index.module.scss';
457
495
 
458
496
  const fetchList = async (data: any, params: any) => {
459
497
  const res = await fetch(`/api/users?q=${data.keyword}&page=${params.current}&size=${params.pageSize}`).then(r => r.json());
@@ -512,8 +550,9 @@ export default function Page() {
512
550
  - **分页器样式**:固定 `pageSizeSelector="dropdown"`、`useFloatLayout`、显示「共 X 条」。可由 `pageSizeList` 改选项、`showPagination={false}` 关闭。
513
551
  - **列宽拖拽**:所有列自动设为 `asyncResizable`(可拖拽调宽),拖拽宽度保留在组件 state(300ms 防抖);`ref.resetWidth()` 重置为初始值。
514
552
  - **列显示/隐藏**:`tableId` 对应的列中,`dataIndex` 命中 `tbKeys`(隐藏列表)即不渲染;持久化依赖 Provider 的 `fetchTableKeys`(读取)/`onSaveTableKeys`(保存)。
515
- - **按钮列宽度**:操作按钮列自动占据本行剩余栅格宽度以紧贴最右侧;条件正好填满整行(24 栅格)时按钮独占一行。
553
+ - **按钮列宽度**:操作按钮列自动占据本行剩余栅格宽度以紧贴最右侧;剩余空间按「模拟逐项摆放后的末行实际占用」计算(非总和取模,避免 flex 提前换行导致按钮列错位);条件正好填满整行(24 栅格)时按钮独占一行。
516
554
  - **条件对齐**:条件项 `textAlign` 未显式设置时,按行内位置自动取 行首 `left` / 中间 `center` / 行尾 `right`。
555
+ - **条件间距**:条件行使用 24 栅格 + `gutter=16`(列内 padding,不影响百分比宽度与换行)。
517
556
 
518
557
  ---
519
558
 
@@ -533,20 +572,20 @@ npm run build
533
572
  npm run lint
534
573
  ```
535
574
 
536
- ### 发布
575
+ ### 发布(公共 npm)
537
576
 
538
- 1. 需要 GitLab 项目 Developer 及以上权限
539
- 2. 需要创建 Personal Access Token(勾选 `api` + `write_package_registry`)
577
+ 1. npm 账号 `chengkejie`(包名 scope 即 `@chengkejie`)。
578
+ 2. 本机认证:`npm login`,或 `npm config set //registry.npmjs.org/:_authToken <token>`。
579
+ > ⚠️ 账号开了 2FA(Windows 通行密钥,不是 TOTP)。命令行发版会要 OTP 而通行密钥给不出 —— 需先把 npmjs.com 的 2FA 调成 **"仅授权 / authorization only"**,或用 Classic **Automation** token(绕过 2FA)。
540
580
 
541
581
  ```bash
542
- # 1. 创建 .npmrc(填入你的 Token)
543
- echo "@linkcld:registry=https://gitlab.linkcld.com/api/v4/projects/2612/packages/npm/" > .npmrc
544
- echo "//gitlab.linkcld.com/api/v4/projects/2612/packages/npm/:_authToken=你的token" >> .npmrc
545
-
546
- # 2. 改 package.json 的 version 后发布(prepublishOnly 会自动构建)
547
- npm publish
582
+ # 1. 改 package.json 的 version
583
+ # 2. 从 release 分支发布(dist 已构建;release 无 src,需跳过 prepublishOnly=father build)
584
+ npm publish --ignore-scripts
548
585
  ```
549
586
 
587
+ > 新包发布后有几分钟 CDN 读延迟,`npm view` 可能短暂 404,以 `npm publish` 输出 `+ @chengkejie/form-page@x.y.z` 为准。
588
+
550
589
  ## 依赖
551
590
 
552
591
  | 依赖 | 版本 |
@@ -1,6 +1,11 @@
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
+ /**
5
+ * 估算字符串在「字数」意义上的宽度(用于 alignLabelWidth 按字数对齐)。
6
+ * 全角字符(中日韩、全角标点)计 1,半角字符两个计 1(最少 1)。
7
+ */
8
+ export declare const stringWidth: (s: string) => number;
4
9
  declare const _default: React.ForwardRefExoticComponent<FormPageProps & React.RefAttributes<FormPageRef>>;
5
10
  export default _default;
6
11
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"FormPage.d.ts","sourceRoot":"","sources":["../src/FormPage.tsx"],"names":[],"mappings":"AAMA,OAAO,KAA2F,MAAM,OAAO,CAAC;AAWhH,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,aAAa,EACb,WAAW,EACZ,MAAM,SAAS,CAAC;AAEjB,YAAY,EACV,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,gBAAgB,EAAE,iBAAiB,EAC9E,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,CAAC;;AAufF,wBAAoC;AAEpC;;;GAGG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;CAexB,CAAC"}
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"}
@@ -1,10 +1,9 @@
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
  });
7
- exports.default = exports.FormPageData = void 0;
6
+ exports.stringWidth = exports.default = exports.FormPageData = void 0;
8
7
  var _next2 = require("@alifd/next");
9
8
  var _ahooks = require("ahooks");
10
9
  var _react = _interopRequireWildcard(require("react"));
@@ -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); }
@@ -40,13 +40,42 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
40
40
  function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
41
41
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
42
42
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
43
- function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
44
- function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
45
43
  function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
46
- function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } /* eslint-disable no-unused-expressions */ /* eslint-disable eqeqeq */ /* eslint-disable react/jsx-props-no-spreading */ /* eslint-disable react-hooks/exhaustive-deps */
44
+ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
45
+ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
46
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
47
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; } /* eslint-disable no-unused-expressions */ /* eslint-disable eqeqeq */ /* eslint-disable react/jsx-props-no-spreading */ /* eslint-disable react-hooks/exhaustive-deps */
47
48
  var Row = _next2.Grid.Row,
48
49
  Col = _next2.Grid.Col;
49
50
 
51
+ /**
52
+ * 估算字符串在「字数」意义上的宽度(用于 alignLabelWidth 按字数对齐)。
53
+ * 全角字符(中日韩、全角标点)计 1,半角字符两个计 1(最少 1)。
54
+ */
55
+ var stringWidth = exports.stringWidth = function stringWidth(s) {
56
+ if (!s) return 0;
57
+ var full = 0;
58
+ var half = 0;
59
+ var _iterator = _createForOfIteratorHelper(s),
60
+ _step;
61
+ try {
62
+ for (_iterator.s(); !(_step = _iterator.n()).done;) {
63
+ var ch = _step.value;
64
+ // 简易判定:码点 >= 0x1100 且非半角区间,视为全角
65
+ if (/[ᄀ-ᅟ⺀-꓏가-힣豈-﫿︰-﹏＀-￯ -〿]/.test(ch)) {
66
+ full += 1;
67
+ } else {
68
+ half += 1;
69
+ }
70
+ }
71
+ } catch (err) {
72
+ _iterator.e(err);
73
+ } finally {
74
+ _iterator.f();
75
+ }
76
+ return full + Math.max(half / 2, half > 0 ? 1 : 0);
77
+ };
78
+
50
79
  /**
51
80
  * 把单元格文本包进 Balloon 气泡并做省略号截断。
52
81
  * fixedWidth 传该列宽度(锁列时必需,否则可能断层);缺省时宽度为 'unset'。
@@ -113,14 +142,41 @@ var FormPage = function FormPage(_ref, ref) {
113
142
  _ref$onFieldChange = _ref.onFieldChange,
114
143
  onFieldChange = _ref$onFieldChange === void 0 ? function () {} : _ref$onFieldChange,
115
144
  _ref$pageSizeList = _ref.pageSizeList,
116
- pageSizeList = _ref$pageSizeList === void 0 ? DEFAULT_PAGE_SIZE_LIST : _ref$pageSizeList;
145
+ pageSizeList = _ref$pageSizeList === void 0 ? DEFAULT_PAGE_SIZE_LIST : _ref$pageSizeList,
146
+ _ref$alignLabelWidth = _ref.alignLabelWidth,
147
+ alignLabelWidth = _ref$alignLabelWidth === void 0 ? true : _ref$alignLabelWidth;
117
148
  /** 从 FormPageProvider 获取外部服务注入 */
118
149
  var _useConfig = (0, _context3.useConfig)(),
119
150
  fetchTableKeys = _useConfig.fetchTableKeys,
120
151
  onSaveTableKeys = _useConfig.onSaveTableKeys;
121
152
 
122
- /** 累计栅格数,用于判断一行是否已满 24 栅格(满则去掉右内边距) */
123
- var colSum = 0;
153
+ /**
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 宽度。
159
+ */
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
+ };
178
+ }, [alignLabelWidth, conditionProps]);
179
+
124
180
  /** 表格容器 ref,用于测量可用高度以自适应 maxBodyHeight */
125
181
  var tableBox = (0, _react.useRef)(null);
126
182
  /** 保留最新的列配置(含拖拽后的宽度),避免拖拽回调中直接 setState 导致性能问题 */
@@ -419,30 +475,51 @@ var FormPage = function FormPage(_ref, ref) {
419
475
  /**
420
476
  * 内置按钮映射,buttonProps.buttons 中的字符串对应此处的 key
421
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 覆盖)
422
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
+ };
423
501
  var button = {
424
- export: /*#__PURE__*/(0, _jsxRuntime.jsx)(_next2.Button, {
425
- loading: loading,
426
- type: "normal",
502
+ export: /*#__PURE__*/(0, _jsxRuntime.jsx)(_next2.Button, _objectSpread(_objectSpread({
503
+ loading: loading
504
+ }, styleOf('export')), {}, {
427
505
  onClick: exportExcel.submit,
428
506
  children: "\u5BFC\u51FA"
429
- }, "export"),
430
- submit: /*#__PURE__*/(0, _jsxRuntime.jsx)(_next2.Button, {
431
- loading: tableLoading,
432
- type: "primary",
507
+ }), 'export'),
508
+ submit: /*#__PURE__*/(0, _jsxRuntime.jsx)(_next2.Button, _objectSpread(_objectSpread({
509
+ loading: tableLoading
510
+ }, styleOf('submit')), {}, {
433
511
  onClick: function onClick() {
434
512
  btnSearchFlag.current = true;
435
513
  _submit();
436
514
  },
437
515
  children: "\u641C\u7D22"
438
- }, "submit"),
439
- reset: /*#__PURE__*/(0, _jsxRuntime.jsx)(_next2.Button, {
440
- type: "normal",
516
+ }), 'submit'),
517
+ reset: /*#__PURE__*/(0, _jsxRuntime.jsx)(_next2.Button, _objectSpread(_objectSpread({}, styleOf('reset')), {}, {
441
518
  onClick: btnReset,
442
519
  children: "\u91CD\u7F6E"
443
- }, "reset"),
520
+ }), 'reset'),
444
521
  setting: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_next2.Button, {
445
- className: _indexModule.default.settingBtn,
522
+ className: [_indexModule.default.settingBtn, styleOf('setting').className].filter(Boolean).join(' '),
446
523
  onClick: function onClick() {
447
524
  settingDialog.current.show();
448
525
  },
@@ -452,7 +529,7 @@ var FormPage = function FormPage(_ref, ref) {
452
529
  }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
453
530
  children: "\u8BBE\u7F6E"
454
531
  })]
455
- }, "setting")
532
+ }, 'setting')
456
533
  };
457
534
 
458
535
  /** 表格行选择变化回调 */
@@ -562,19 +639,20 @@ var FormPage = function FormPage(_ref, ref) {
562
639
  }, [dbColumns, tbKeys]);
563
640
 
564
641
  /**
565
- * 所有筛选条件累计的栅格数
566
- * 独立于渲染期累加的 colSum(colSum 在 conditionProps 为空时会残留旧值),
567
- * 这里用 reduce 每次渲染都干净计算,用于推导按钮列宽度
642
+ * 模拟 24 栅格逐项摆放后的「最后一行实际占用份数」。
643
+ * 不能用总和取模推剩余空间:flex 换行按行计算,单项放不下会整项换行,
644
+ * 末行实际占用可能大于 total % 24(如末行已占 18 份时再来一个 12 份的项会换行)。
645
+ * 若按取模算按钮列宽,按钮列放不进本行 → 换行后只占半宽,无法贴到最右侧。
568
646
  */
569
- var conditionColTotal = conditionProps.reduce(function (acc, item) {
570
- return acc + item.col;
647
+ var lastRowUsed = conditionProps.reduce(function (used, item) {
648
+ return used + item.col > 24 ? item.col : used + item.col;
571
649
  }, 0);
572
650
  /** 按钮列占据本行剩余宽度,使按钮始终紧贴最右侧;条件正好填满整行(24)时按钮独占新的一行 */
573
- var btnColSpan = conditionColTotal % 24 === 0 ? 24 : 24 - conditionColTotal % 24;
651
+ var btnColSpan = lastRowUsed >= 24 ? 24 : 24 - lastRowUsed;
574
652
 
575
653
  /** 保存隐藏列配置到远程,成功后更新本地状态 */
576
654
  var handleSaveTableKeys = /*#__PURE__*/function () {
577
- var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
655
+ var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
578
656
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
579
657
  while (1) switch (_context2.prev = _context2.next) {
580
658
  case 0:
@@ -593,7 +671,7 @@ var FormPage = function FormPage(_ref, ref) {
593
671
  }, _callee2);
594
672
  }));
595
673
  return function handleSaveTableKeys(_x2) {
596
- return _ref5.apply(this, arguments);
674
+ return _ref7.apply(this, arguments);
597
675
  };
598
676
  }();
599
677
  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -606,20 +684,37 @@ var FormPage = function FormPage(_ref, ref) {
606
684
  field: field,
607
685
  children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(Row, {
608
686
  wrap: true,
687
+ gutter: 16,
609
688
  children: [conditionProps.map(function (e, i) {
610
- var _e$textAlign, _tableProps$tableId;
611
- if (i === 0) colSum = 0;
612
- var prevColSum = colSum;
613
- colSum += e.col;
689
+ var _e$textAlign, _e$labelWidth, _gridOffsets$maxByOff, _tableProps$tableId;
690
+ /** 本项的列起点偏移(与 gridOffsets 的模拟摆放一致,含提前换行修正) */
691
+ var start = gridOffsets.offsets[i];
692
+ var end = start + e.col;
614
693
  /** 手动配置优先,否则根据行内位置自动计算:行首 left / 行尾 right / 中间 center */
615
- var textAlign = (_e$textAlign = e.textAlign) !== null && _e$textAlign !== void 0 ? _e$textAlign : prevColSum % 24 === 0 ? 'left' : colSum % 24 === 0 ? 'right' : 'center';
694
+ var textAlign = (_e$textAlign = e.textAlign) !== null && _e$textAlign !== void 0 ? _e$textAlign : start % 24 === 0 ? 'left' : end % 24 === 0 ? 'right' : 'center';
695
+
696
+ /** labelWidth:数字按「字数」转 em;仅当 label 为字符串时生效。
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);
700
+ var labelWidthStyle = lw == null ? undefined : "".concat(lw, "em");
701
+ var useLabelWidth = labelWidthStyle != null && typeof e.label === 'string';
702
+ var labelEl = useLabelWidth ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
703
+ style: {
704
+ display: 'inline-block',
705
+ width: labelWidthStyle,
706
+ textAlign: 'right'
707
+ },
708
+ children: e.label
709
+ }) : e.label;
616
710
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(Col, {
617
711
  span: e.col,
618
712
  style: {
619
713
  textAlign: textAlign
620
714
  },
621
715
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_next2.Form.Item, {
622
- label: e.label,
716
+ className: useLabelWidth ? _indexModule.default.labelWidthItem : undefined,
717
+ label: labelEl,
623
718
  labelAlign: "left",
624
719
  wrapperCol: e.wrapperCol,
625
720
  labelCol: e.labelCol,
@@ -630,8 +725,31 @@ var FormPage = function FormPage(_ref, ref) {
630
725
  span: btnColSpan,
631
726
  className: _indexModule.default.btnCol,
632
727
  children: buttonProps.buttons.map(function (e) {
633
- var _button$e;
634
- return (_button$e = button[e]) !== null && _button$e !== void 0 ? _button$e : e;
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;
635
753
  })
636
754
  }) : null]
637
755
  }), extra !== null && extra !== void 0 ? extra : null]
@@ -16,13 +16,16 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
16
16
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
17
17
  function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } /* eslint-disable react/jsx-props-no-spreading */
18
18
  function Section(_ref) {
19
+ var _data$customProps, _data$customProps2;
19
20
  var field = _ref.field,
20
21
  data = _ref.data;
21
22
  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
22
- children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_next.Input, _objectSpread({}, field.init(data.name[0], _objectSpread({}, data.options[0]), _objectSpread({}, data.customProps[0])))), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
23
+ className: _indexModule.default.section,
24
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_next.Input, _objectSpread({}, field.init(data.name[0], _objectSpread({}, data.options[0]), _objectSpread({}, (_data$customProps = data.customProps) === null || _data$customProps === void 0 ? void 0 : _data$customProps[0])))), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
23
25
  className: _indexModule.default.sep,
24
26
  children: "-"
25
- }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_next.Input, _objectSpread({}, field.init(data.name[1], _objectSpread({}, data.options[1]), _objectSpread({}, data.customProps[1])))), data.unit && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
27
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_next.Input, _objectSpread({}, field.init(data.name[1], _objectSpread({}, data.options[1]), _objectSpread({}, (_data$customProps2 = data.customProps) === null || _data$customProps2 === void 0 ? void 0 : _data$customProps2[1])))), data.unit && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
28
+ className: _indexModule.default.unit,
26
29
  children: data.unit
27
30
  })]
28
31
  });
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/SettingDialog/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAA+D,MAAM,OAAO,CAAC;AAKpF,UAAU,kBAAkB;IAC1B,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,GAAG,EAAE,CAAC;IAClB,SAAS,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IAC/B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CACvC;;AAsFD,wBAAyC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/SettingDialog/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAA+D,MAAM,OAAO,CAAC;AAKpF,UAAU,kBAAkB;IAC1B,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,GAAG,EAAE,CAAC;IAClB,SAAS,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IAC/B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CACvC;;AA0FD,wBAAyC"}