diff --git a/packages/flow-approval-presenter/CHANGELOG.md b/packages/flow-approval-presenter/CHANGELOG.md index 2c3a9406..e739ea03 100644 --- a/packages/flow-approval-presenter/CHANGELOG.md +++ b/packages/flow-approval-presenter/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-approval-presenter +## 0.2.17 + +### Patch Changes + +- @coding-flow/flow-types@0.2.17 + ## 0.2.16 ### Patch Changes diff --git a/packages/flow-approval-presenter/package.json b/packages/flow-approval-presenter/package.json index 4b84ce8b..c8cbebfb 100644 --- a/packages/flow-approval-presenter/package.json +++ b/packages/flow-approval-presenter/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-approval-presenter", - "version": "0.2.16", + "version": "0.2.17", "description": "flow-engine approval presenter framework ", "type": "module", "sideEffects": [ diff --git a/packages/flow-core/CHANGELOG.md b/packages/flow-core/CHANGELOG.md index c00da16b..8f8c81ad 100644 --- a/packages/flow-core/CHANGELOG.md +++ b/packages/flow-core/CHANGELOG.md @@ -1,5 +1,7 @@ # @coding-flow/flow-core +## 0.2.17 + ## 0.2.16 ## 0.2.15 diff --git a/packages/flow-core/package.json b/packages/flow-core/package.json index ec4f0413..a2edbaa8 100644 --- a/packages/flow-core/package.json +++ b/packages/flow-core/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-core", - "version": "0.2.16", + "version": "0.2.17", "description": "flow-engine core lib framework ", "type": "module", "sideEffects": [ diff --git a/packages/flow-design/CHANGELOG.md b/packages/flow-design/CHANGELOG.md index b2a655ec..ed406c6c 100644 --- a/packages/flow-design/CHANGELOG.md +++ b/packages/flow-design/CHANGELOG.md @@ -1,5 +1,15 @@ # @coding-flow/flow-design +## 0.2.17 + +### Patch Changes + +- 修复动作按钮样式保存不生效:背景色、边框色、圆角、边框大小统一保存到 `display.style`,并兼容历史平铺数据,重新进入设计器后可正确回显(codingapi/flow-engine#244) +- 修复动作按钮图标保存不生效:图标写入 `display.icon` 并在编辑弹窗回显,修改按钮名称时同步 `display.title`(codingapi/flow-engine#244) +- @coding-flow/flow-icons@0.2.17 +- @coding-flow/flow-pc-ui@0.2.17 +- @coding-flow/flow-types@0.2.17 + ## 0.2.16 ### Patch Changes diff --git a/packages/flow-design/package.json b/packages/flow-design/package.json index 51e6f7b3..560b000d 100644 --- a/packages/flow-design/package.json +++ b/packages/flow-design/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-design", - "version": "0.2.16", + "version": "0.2.17", "description": "flow-engine design components ", "type": "module", "sideEffects": [ diff --git a/packages/flow-design/src/components/design-editor/node-components/action/index.tsx b/packages/flow-design/src/components/design-editor/node-components/action/index.tsx index 148dc33c..9e38a394 100644 --- a/packages/flow-design/src/components/design-editor/node-components/action/index.tsx +++ b/packages/flow-design/src/components/design-editor/node-components/action/index.tsx @@ -13,6 +13,18 @@ interface ActionTableProps { onChange: (data: any[]) => void; } +/** + * 编辑动作时回填表单数据。 + *

+ * 按钮图标在后端模型中保存在 display.icon 上,表单字段为顶层 icon,需要回填才能正确回显。 + */ +const toFormValues = (action: any) => { + return { + ...action, + icon: action.icon || action.display?.icon, + } +} + export const ActionTable: React.FC = (props) => { const { node } = useNodeRenderContext(); const presenter = new FlowActionListPresenter(props.value, props.onChange); @@ -77,7 +89,7 @@ export const ActionTable: React.FC = (props) => { { form.resetFields(); - form.setFieldsValue(record); + form.setFieldsValue(toFormValues(record)); setVisible(true); }} > @@ -128,7 +140,7 @@ export const ActionTable: React.FC = (props) => { createCustomAction().then(res => { if (res.success) { const data = res.data; - form.setFieldsValue(data); + form.setFieldsValue(toFormValues(data)); setVisible(true); } }) diff --git a/packages/flow-design/src/components/design-editor/node-components/action/presenter.ts b/packages/flow-design/src/components/design-editor/node-components/action/presenter.ts index 7917dba4..7f0e7b36 100644 --- a/packages/flow-design/src/components/design-editor/node-components/action/presenter.ts +++ b/packages/flow-design/src/components/design-editor/node-components/action/presenter.ts @@ -57,6 +57,13 @@ export class FlowActionListPresenter { const actionIdList = this.data.map(action => action.id); + // 按钮名称、图标在后端模型中只存在于 display 上,表单编辑的是顶层字段,此处同步回 display + const display = { + ...action.display, + title: action.title || action.display?.title, + icon: action.icon || action.display?.icon, + }; + if (actionIdList.includes(actionId)) { const data = this.data.map(item => { if (item.id === actionId) { @@ -65,7 +72,7 @@ export class FlowActionListPresenter { ...action, display: { ...item.display, - ...action.display, + ...display, } } } @@ -75,6 +82,7 @@ export class FlowActionListPresenter { } else { this.onChange([...this.data, { ...action, + display, type: "CUSTOM" }]); } diff --git a/packages/flow-design/src/script-components/components/action/style.tsx b/packages/flow-design/src/script-components/components/action/style.tsx index 05f437f3..083fc3ad 100644 --- a/packages/flow-design/src/script-components/components/action/style.tsx +++ b/packages/flow-design/src/script-components/components/action/style.tsx @@ -9,11 +9,85 @@ import { EditOutlined } from "@ant-design/icons"; import { DisplayStyle } from "@coding-flow/flow-types"; +/** + * 按钮展示数据(对应后端 ActionDisplay),样式保存在 style 的 JSON 字符串中 + */ +export interface ActionDisplayValue { + // 标题 + title?: string; + // 样式(DisplayStyle 的 JSON 字符串) + style?: string; + // 图标 + icon?: string; + // 显示条件脚本key + script?: string; + // 兼容历史数据:样式字段曾经直接挂在 display 上 + backgroundColor?: string; + // 兼容历史数据:样式字段曾经直接挂在 display 上 + borderColor?: string; + // 兼容历史数据:样式字段曾经直接挂在 display 上 + borderRadius?: string; + // 兼容历史数据:样式字段曾经直接挂在 display 上 + borderSize?: string; +} + interface ActionStyleProps { - value?: any; - onChange?: (value: any) => void; + value?: ActionDisplayValue; + onChange?: (value: ActionDisplayValue) => void; } +/** + * 样式数据中的颜色统一不带 # 保存(审批端渲染时补全),此处用于兼容历史数据中的 # 前缀 + */ +const toStoreColor = (color?: string): string | undefined => { + if (!color) { + return undefined; + } + return color.startsWith('#') ? color.slice(1) : color; +}; + +/** + * 颜色选择器回显的颜色值需要带 # + */ +const toPickerColor = (color?: string): string | undefined => { + if (!color) { + return undefined; + } + return color.startsWith('#') ? color : `#${color}`; +}; + +/** + * 解析动作按钮样式。 + *

+ * 样式统一保存在 display.style 的 JSON 字符串中(后端 ActionDisplay.style), + * 同时兼容历史上把样式字段直接挂在 display 上的数据。 + */ +export const parseActionDisplayStyle = (display?: ActionDisplayValue): DisplayStyle => { + if (!display) { + return {}; + } + if (typeof display.style === 'string' && display.style) { + try { + const data = JSON.parse(display.style); + if (data && typeof data === 'object') { + return { + ...data, + backgroundColor: toStoreColor(data.backgroundColor), + borderColor: toStoreColor(data.borderColor), + } as DisplayStyle; + } + } catch (e) { + // 非 JSON 样式数据,继续按扁平字段解析 + } + } + return { + backgroundColor: toStoreColor(display.backgroundColor), + borderColor: toStoreColor(display.borderColor), + borderRadius: display.borderRadius, + borderSize: display.borderSize, + }; +}; + const ActionScriptContent: React.FC = (props) => { return ( @@ -78,11 +152,24 @@ const ActionScript: React.FC = (props) => { export const ActionStyle: React.FC = (props) => { - const [style, setStyle] = React.useState(props.value || {} as any); + const [display, setDisplay] = React.useState(props.value || {}); + + const style = React.useMemo(() => parseActionDisplayStyle(display), [display]); - React.useEffect(() => { - props.onChange && props.onChange(style); - }, [style]); + const emit = (next: ActionDisplayValue) => { + setDisplay(next); + props.onChange?.(next); + } + + const updateStyle = (patch: Partial) => { + emit({ + ...display, + style: JSON.stringify({ + ...style, + ...patch, + }), + }); + } return (

@@ -97,16 +184,11 @@ export const ActionStyle: React.FC = (props) => { 背景颜色 { - if (value) { - setStyle(prevState => { - return { - ...prevState, - backgroundColor: value.toHex() - } - }) - } + updateStyle({ + backgroundColor: toStoreColor(value.toHex()) + }); }} /> @@ -121,16 +203,11 @@ export const ActionStyle: React.FC = (props) => { 边框颜色 { - if (value) { - setStyle(prevState => { - return { - ...prevState, - borderColor: value.toHex() - } - }) - } + updateStyle({ + borderColor: toStoreColor(value.toHex()) + }); }} /> @@ -152,12 +229,9 @@ export const ActionStyle: React.FC = (props) => { placeholder={"请输入边框圆角"} value={style.borderRadius} onChange={(event) => { - setStyle(prevState => { - return { - ...prevState, - borderRadius: event.target.value - } - }) + updateStyle({ + borderRadius: event.target.value + }); }} /> @@ -179,12 +253,9 @@ export const ActionStyle: React.FC = (props) => { placeholder={"请输入边框大小"} value={style.borderSize} onChange={(event) => { - setStyle(prevState => { - return { - ...prevState, - borderSize: event.target.value - } - }) + updateStyle({ + borderSize: event.target.value + }); }} /> @@ -192,11 +263,17 @@ export const ActionStyle: React.FC = (props) => { { + emit({ + ...display, + script: scriptKey, + }); + }} />
) -} \ No newline at end of file +} diff --git a/packages/flow-design/tests/components/design-editor/node-components/action/presenter.test.ts b/packages/flow-design/tests/components/design-editor/node-components/action/presenter.test.ts new file mode 100644 index 00000000..30f56fbf --- /dev/null +++ b/packages/flow-design/tests/components/design-editor/node-components/action/presenter.test.ts @@ -0,0 +1,88 @@ +import {describe, expect, it} from '@rstest/core'; +import {FlowAction} from '@coding-flow/flow-types'; +import {FlowActionListPresenter} from '@/components/design-editor/node-components/action/presenter'; + +const buildAction = (): FlowAction => ({ + id: 'action-1', + title: '通过', + type: 'PASS', + enable: true, + display: { + title: '通过', + style: '', + icon: '', + }, +}); + +describe('FlowActionListPresenter', () => { + + it('编辑图标后应写入 display.icon(issue #244)', () => { + let result: FlowAction[] = []; + const presenter = new FlowActionListPresenter([buildAction()], (data) => { + result = data as FlowAction[]; + }); + + presenter.update({ + id: 'action-1', + title: '通过', + icon: 'check-circle', + display: { + title: '通过', + style: '', + icon: '', + }, + }); + + expect(result).toHaveLength(1); + expect(result[0].display.icon).toEqual('check-circle'); + }); + + it('编辑名称后应同步 display.title,并保留样式与图标', () => { + let result: FlowAction[] = []; + const action = buildAction(); + action.display.icon = 'check-circle'; + action.display.style = '{"backgroundColor":"1677ff"}'; + + const presenter = new FlowActionListPresenter([action], (data) => { + result = data as FlowAction[]; + }); + + presenter.update({ + id: 'action-1', + title: '同意', + display: { + title: '通过', + style: '{"backgroundColor":"1677ff"}', + icon: 'check-circle', + }, + }); + + expect(result[0].title).toEqual('同意'); + expect(result[0].display.title).toEqual('同意'); + expect(result[0].display.icon).toEqual('check-circle'); + expect(result[0].display.style).toEqual('{"backgroundColor":"1677ff"}'); + }); + + it('新增自定义按钮时应带上表单中编辑的 display 数据', () => { + let result: FlowAction[] = []; + const presenter = new FlowActionListPresenter([buildAction()], (data) => { + result = data as FlowAction[]; + }); + + presenter.update({ + id: 'action-2', + title: '自定义', + icon: 'check-circle', + display: { + title: '自定义', + style: '{"borderRadius":"4"}', + icon: '', + }, + }); + + expect(result).toHaveLength(2); + expect(result[1].type).toEqual('CUSTOM'); + expect(result[1].display.icon).toEqual('check-circle'); + expect(result[1].display.style).toEqual('{"borderRadius":"4"}'); + }); +}); diff --git a/packages/flow-design/tests/script/action_style.test.ts b/packages/flow-design/tests/script/action_style.test.ts new file mode 100644 index 00000000..b607dde5 --- /dev/null +++ b/packages/flow-design/tests/script/action_style.test.ts @@ -0,0 +1,54 @@ +import {describe, expect, it} from '@rstest/core'; +import {parseActionDisplayStyle} from '@/script-components/components/action/style'; + +describe('parseActionDisplayStyle', () => { + + it('应解析 display.style 中保存的 JSON 样式(issue #244)', () => { + const style = parseActionDisplayStyle({ + title: '通过', + style: JSON.stringify({ + backgroundColor: '1677ff', + borderColor: 'ff4d4f', + borderRadius: '4', + borderSize: '1', + }), + }); + + expect(style.backgroundColor).toEqual('1677ff'); + expect(style.borderColor).toEqual('ff4d4f'); + expect(style.borderRadius).toEqual('4'); + expect(style.borderSize).toEqual('1'); + }); + + it('display.style 中带 # 的颜色应统一去掉前缀,避免审批端重复补全', () => { + const style = parseActionDisplayStyle({ + style: JSON.stringify({ + backgroundColor: '#1677ff', + borderColor: '#ff4d4f', + }), + }); + + expect(style.backgroundColor).toEqual('1677ff'); + expect(style.borderColor).toEqual('ff4d4f'); + }); + + it('样式字段直接挂在 display 上时应兼容解析,并去掉颜色的 # 前缀', () => { + const style = parseActionDisplayStyle({ + backgroundColor: '#1677ff', + borderColor: '#ff4d4f', + borderRadius: '6', + borderSize: '2', + }); + + expect(style.backgroundColor).toEqual('1677ff'); + expect(style.borderColor).toEqual('ff4d4f'); + expect(style.borderRadius).toEqual('6'); + expect(style.borderSize).toEqual('2'); + }); + + it('未配置样式或样式数据非法时应返回空样式', () => { + expect(parseActionDisplayStyle(undefined)).toEqual({}); + expect(parseActionDisplayStyle({})).toEqual({}); + expect(parseActionDisplayStyle({style: 'primary'})).toEqual({}); + }); +}); diff --git a/packages/flow-icons/CHANGELOG.md b/packages/flow-icons/CHANGELOG.md index e52fb0bf..c99ef6d4 100644 --- a/packages/flow-icons/CHANGELOG.md +++ b/packages/flow-icons/CHANGELOG.md @@ -1,5 +1,7 @@ # @coding-flow/flow-icons +## 0.2.17 + ## 0.2.16 ### Patch Changes diff --git a/packages/flow-icons/package.json b/packages/flow-icons/package.json index ce732645..3b2aa174 100644 --- a/packages/flow-icons/package.json +++ b/packages/flow-icons/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-icons", - "version": "0.2.16", + "version": "0.2.17", "description": "flow-engine icons ", "type": "module", "sideEffects": [ diff --git a/packages/flow-mobile/flow-mobile-approval/CHANGELOG.md b/packages/flow-mobile/flow-mobile-approval/CHANGELOG.md index e969ad1e..2ee21a6d 100644 --- a/packages/flow-mobile/flow-mobile-approval/CHANGELOG.md +++ b/packages/flow-mobile/flow-mobile-approval/CHANGELOG.md @@ -1,5 +1,17 @@ # @coding-flow/flow-mobile-approval +## 0.2.17 + +### Patch Changes + +- 修复审批按钮样式不生效:按 `display.style` 渲染背景色、边框色、圆角与边框大小,颜色自动补全 `#` 且不重复补全,样式数据非法时降级为默认样式(codingapi/flow-engine#244) +- 审批按钮名称优先取动作标题,与 PC 端保持一致 +- @coding-flow/flow-approval-presenter@0.2.17 +- @coding-flow/flow-icons@0.2.17 +- @coding-flow/flow-mobile-form@0.2.17 +- @coding-flow/flow-mobile-ui@0.2.17 +- @coding-flow/flow-types@0.2.17 + ## 0.2.16 ### Patch Changes diff --git a/packages/flow-mobile/flow-mobile-approval/package.json b/packages/flow-mobile/flow-mobile-approval/package.json index a3e8a389..29d29d0f 100644 --- a/packages/flow-mobile/flow-mobile-approval/package.json +++ b/packages/flow-mobile/flow-mobile-approval/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-mobile-approval", - "version": "0.2.16", + "version": "0.2.17", "description": "flow-engine pc mobile approval components", "type": "module", "sideEffects": [ diff --git a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/custom-style-button.tsx b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/custom-style-button.tsx index c57f6e87..7d7a4eb9 100644 --- a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/custom-style-button.tsx +++ b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/custom-style-button.tsx @@ -11,32 +11,54 @@ interface CustomStyleButtonProps { disabled?: boolean; } +/** + * 解析按钮样式,颜色值不带 # 时补全 #,避免与历史数据中的 # 前缀重复 + */ +const toCssColor = (color?: string): string | undefined => { + if (!color) { + return undefined; + } + return color.startsWith('#') ? color : `#${color}`; +}; + +/** + * 解析后端返回的样式 JSON 字符串,非法数据按无样式处理 + */ +const parseDisplayStyle = (style?: string): DisplayStyle => { + if (!style) { + return {}; + } + try { + const data = JSON.parse(style); + return data && typeof data === 'object' ? data as DisplayStyle : {}; + } catch (e) { + return {}; + } +}; + export const CustomStyleButton: React.FC = (props) => { const display = props.display; - const title = display?.title || props.title; + const title = props.title || display?.title; const style = React.useMemo(() => { - if (display) { - const data = JSON.parse(display.style) as DisplayStyle | undefined; - if (data) { - let style = {} - if (data.backgroundColor) { - style = Object.assign(data, {backgroundColor: `#${data.backgroundColor}`}); - } - if (data.borderColor) { - style = Object.assign(data, {borderColor: `#${data.borderColor}`}); - } - if (data.borderRadius) { - style = Object.assign(data, {borderRadius: Number.parseInt(data.borderRadius)}); - } - if (data.borderSize) { - style = Object.assign(data, {borderWidth: Number.parseInt(data.borderSize)}); - } - return style; - } + const data = parseDisplayStyle(display?.style); + const style: React.CSSProperties = {}; + const backgroundColor = toCssColor(data.backgroundColor); + if (backgroundColor) { + style.backgroundColor = backgroundColor; + } + const borderColor = toCssColor(data.borderColor); + if (borderColor) { + style.borderColor = borderColor; } - return {} + if (data.borderRadius) { + style.borderRadius = Number.parseInt(data.borderRadius); + } + if (data.borderSize) { + style.borderWidth = Number.parseInt(data.borderSize); + } + return style; }, [display]); @@ -53,9 +75,9 @@ export const CustomStyleButton: React.FC = (props) => { }} > - {props.display?.icon && ()} + {display?.icon && ()} {title} ) -} \ No newline at end of file +} diff --git a/packages/flow-mobile/flow-mobile-approval/tests/custom-style-button.test.tsx b/packages/flow-mobile/flow-mobile-approval/tests/custom-style-button.test.tsx new file mode 100644 index 00000000..53518893 --- /dev/null +++ b/packages/flow-mobile/flow-mobile-approval/tests/custom-style-button.test.tsx @@ -0,0 +1,48 @@ +import {afterEach, describe, expect, test} from "@rstest/core"; +import {cleanup, render} from "@testing-library/react"; +import {CustomStyleButton} from "@/components/flow-approval/components/custom-style-button"; + +describe.sequential('移动端 CustomStyleButton 审批按钮样式', () => { + + afterEach(() => { + cleanup(); + }); + + test('按钮名称优先取动作标题,与 PC 端保持一致', () => { + const {container} = render( + undefined} + /> + ); + + expect(container.textContent).toEqual('同意'); + }); + + test('display.style 中的颜色应渲染为带 # 的 CSS 颜色', () => { + const {container} = render( + undefined} + /> + ); + + const button = container.querySelector('.adm-button') as HTMLButtonElement; + expect(button).toBeTruthy(); + expect(button.style.backgroundColor).toEqual('rgb(22, 119, 255)'); + }); + + test('display.style 非法时不应抛异常', () => { + const {container} = render( + undefined} + /> + ); + + expect(container.textContent).toEqual('通过'); + }); +}); diff --git a/packages/flow-mobile/flow-mobile-form/CHANGELOG.md b/packages/flow-mobile/flow-mobile-form/CHANGELOG.md index da4395da..36b9e234 100644 --- a/packages/flow-mobile/flow-mobile-form/CHANGELOG.md +++ b/packages/flow-mobile/flow-mobile-form/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-mobile-form +## 0.2.17 + +### Patch Changes + +- @coding-flow/flow-types@0.2.17 + ## 0.2.16 ### Patch Changes diff --git a/packages/flow-mobile/flow-mobile-form/package.json b/packages/flow-mobile/flow-mobile-form/package.json index e17bd4e8..9dacb5fd 100644 --- a/packages/flow-mobile/flow-mobile-form/package.json +++ b/packages/flow-mobile/flow-mobile-form/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-mobile-form", - "version": "0.2.16", + "version": "0.2.17", "description": "flow-engine mobile form engine", "type": "module", "sideEffects": [ diff --git a/packages/flow-mobile/flow-mobile-ui/CHANGELOG.md b/packages/flow-mobile/flow-mobile-ui/CHANGELOG.md index b8562209..3e58695a 100644 --- a/packages/flow-mobile/flow-mobile-ui/CHANGELOG.md +++ b/packages/flow-mobile/flow-mobile-ui/CHANGELOG.md @@ -1,5 +1,7 @@ # @coding-flow/flow-mobile-ui +## 0.2.17 + ## 0.2.16 ### Patch Changes diff --git a/packages/flow-mobile/flow-mobile-ui/package.json b/packages/flow-mobile/flow-mobile-ui/package.json index d94166ed..cea85a48 100644 --- a/packages/flow-mobile/flow-mobile-ui/package.json +++ b/packages/flow-mobile/flow-mobile-ui/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-mobile-ui", - "version": "0.2.16", + "version": "0.2.17", "description": "flow-engine mobile ui components", "type": "module", "sideEffects": [ diff --git a/packages/flow-pc/flow-pc-approval/CHANGELOG.md b/packages/flow-pc/flow-pc-approval/CHANGELOG.md index c1365b08..91f86a5c 100644 --- a/packages/flow-pc/flow-pc-approval/CHANGELOG.md +++ b/packages/flow-pc/flow-pc-approval/CHANGELOG.md @@ -1,5 +1,16 @@ # @coding-flow/flow-pc-approval +## 0.2.17 + +### Patch Changes + +- 修复审批按钮样式不生效:按 `display.style` 渲染背景色、边框色、圆角与边框大小,颜色自动补全 `#` 且不重复补全,样式数据非法时降级为默认样式(codingapi/flow-engine#244) +- @coding-flow/flow-approval-presenter@0.2.17 +- @coding-flow/flow-icons@0.2.17 +- @coding-flow/flow-pc-form@0.2.17 +- @coding-flow/flow-pc-ui@0.2.17 +- @coding-flow/flow-types@0.2.17 + ## 0.2.16 ### Patch Changes diff --git a/packages/flow-pc/flow-pc-approval/package.json b/packages/flow-pc/flow-pc-approval/package.json index 18a00fb4..1dbd4b92 100644 --- a/packages/flow-pc/flow-pc-approval/package.json +++ b/packages/flow-pc/flow-pc-approval/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-pc-approval", - "version": "0.2.16", + "version": "0.2.17", "description": "flow-engine pc form approval components", "type": "module", "sideEffects": [ diff --git a/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/custom-style-button.tsx b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/custom-style-button.tsx index 997a941b..354ce7d3 100644 --- a/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/custom-style-button.tsx +++ b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/custom-style-button.tsx @@ -6,37 +6,59 @@ import {Icon} from "@coding-flow/flow-icons"; interface CustomStyleButtonProps { onClick: () => void; title: string; - display: FlowActionDisplay; + display?: FlowActionDisplay; loading?: boolean; disabled?: boolean; } +/** + * 解析按钮样式,颜色值不带 # 时补全 #,避免与历史数据中的 # 前缀重复 + */ +const toCssColor = (color?: string): string | undefined => { + if (!color) { + return undefined; + } + return color.startsWith('#') ? color : `#${color}`; +}; + +/** + * 解析后端返回的样式 JSON 字符串,非法数据按无样式处理 + */ +const parseDisplayStyle = (style?: string): DisplayStyle => { + if (!style) { + return {}; + } + try { + const data = JSON.parse(style); + return data && typeof data === 'object' ? data as DisplayStyle : {}; + } catch (e) { + return {}; + } +}; + export const CustomStyleButton: React.FC = (props) => { const display = props.display; - const title = props.title || display.title; + const title = props.title || display?.title; const style = React.useMemo(() => { - if (display) { - const data = JSON.parse(display.style) as DisplayStyle | undefined; - if (data) { - let style = {} - if (data.backgroundColor) { - style = Object.assign(data, {backgroundColor: `#${data.backgroundColor}`}); - } - if (data.borderColor) { - style = Object.assign(data, {borderColor: `#${data.borderColor}`}); - } - if (data.borderRadius) { - style = Object.assign(data, {borderRadius: Number.parseInt(data.borderRadius)}); - } - if (data.borderSize) { - style = Object.assign(data, {borderWidth: Number.parseInt(data.borderSize)}); - } - return style; - } + const data = parseDisplayStyle(display?.style); + const style: React.CSSProperties = {}; + const backgroundColor = toCssColor(data.backgroundColor); + if (backgroundColor) { + style.backgroundColor = backgroundColor; + } + const borderColor = toCssColor(data.borderColor); + if (borderColor) { + style.borderColor = borderColor; } - return {} + if (data.borderRadius) { + style.borderRadius = Number.parseInt(data.borderRadius); + } + if (data.borderSize) { + style.borderWidth = Number.parseInt(data.borderSize); + } + return style; }, [display]); return ( @@ -45,9 +67,9 @@ export const CustomStyleButton: React.FC = (props) => { style={style} loading={props.loading} disabled={props.disabled} - icon={display.icon?:undefined} + icon={display?.icon?:undefined} > {title} ) -} \ No newline at end of file +} diff --git a/packages/flow-pc/flow-pc-approval/tests/custom-style-button.test.tsx b/packages/flow-pc/flow-pc-approval/tests/custom-style-button.test.tsx new file mode 100644 index 00000000..c8e28b45 --- /dev/null +++ b/packages/flow-pc/flow-pc-approval/tests/custom-style-button.test.tsx @@ -0,0 +1,59 @@ +import {afterEach, describe, expect, test} from "@rstest/core"; +import {cleanup, render} from "@testing-library/react"; +import {CustomStyleButton} from "@/components/flow-approval/components/custom-style-button"; +import {FlowActionDisplay} from "@coding-flow/flow-types"; + +const buildDisplay = (style?: string): FlowActionDisplay => ({ + title: '通过', + style: style as string, + icon: '', +}); + +describe.sequential('CustomStyleButton 审批按钮样式', () => { + + afterEach(() => { + cleanup(); + }); + + test('display.style 中的颜色应渲染为带 # 的 CSS 颜色', () => { + const {container} = render( + undefined} + /> + ); + + const button = container.querySelector('button') as HTMLButtonElement; + expect(button).toBeTruthy(); + expect(button.style.backgroundColor).toEqual('rgb(22, 119, 255)'); + expect(button.style.borderColor).toEqual('rgb(255, 77, 79)'); + }); + + test('display.style 非法时不应抛异常,按无自定义样式渲染', () => { + const {container} = render( + undefined} + /> + ); + + const button = container.querySelector('button') as HTMLButtonElement; + expect(button).toBeTruthy(); + expect(button.style.backgroundColor).toEqual(''); + }); + + test('未传 display 时使用按钮名称渲染,不抛异常', () => { + const {container} = render( + undefined} + /> + ); + + const button = container.querySelector('button') as HTMLButtonElement; + // antd 会在两个中文字符之间插入空格,此处忽略空白字符 + expect(button.textContent?.replace(/\s+/g, '')).toEqual('通过'); + }); +}); diff --git a/packages/flow-pc/flow-pc-form/CHANGELOG.md b/packages/flow-pc/flow-pc-form/CHANGELOG.md index cd947708..cfb95b3a 100644 --- a/packages/flow-pc/flow-pc-form/CHANGELOG.md +++ b/packages/flow-pc/flow-pc-form/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-pc-form +## 0.2.17 + +### Patch Changes + +- @coding-flow/flow-types@0.2.17 + ## 0.2.16 ### Patch Changes diff --git a/packages/flow-pc/flow-pc-form/package.json b/packages/flow-pc/flow-pc-form/package.json index e642bfce..54bd5a26 100644 --- a/packages/flow-pc/flow-pc-form/package.json +++ b/packages/flow-pc/flow-pc-form/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-pc-form", - "version": "0.2.16", + "version": "0.2.17", "description": "flow-engine pc form engine", "type": "module", "sideEffects": [ diff --git a/packages/flow-pc/flow-pc-ui/CHANGELOG.md b/packages/flow-pc/flow-pc-ui/CHANGELOG.md index e7daf29b..ba05688f 100644 --- a/packages/flow-pc/flow-pc-ui/CHANGELOG.md +++ b/packages/flow-pc/flow-pc-ui/CHANGELOG.md @@ -1,5 +1,7 @@ # @coding-flow/flow-pc-ui +## 0.2.17 + ## 0.2.16 ### Patch Changes diff --git a/packages/flow-pc/flow-pc-ui/package.json b/packages/flow-pc/flow-pc-ui/package.json index f8de6859..bf01c0e3 100644 --- a/packages/flow-pc/flow-pc-ui/package.json +++ b/packages/flow-pc/flow-pc-ui/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-pc-ui", - "version": "0.2.16", + "version": "0.2.17", "description": "flow-engine pc ui components", "type": "module", "sideEffects": [ diff --git a/packages/flow-types/CHANGELOG.md b/packages/flow-types/CHANGELOG.md index 69b61829..6e03948c 100644 --- a/packages/flow-types/CHANGELOG.md +++ b/packages/flow-types/CHANGELOG.md @@ -1,5 +1,7 @@ # @coding-flow/flow-types +## 0.2.17 + ## 0.2.16 ### Patch Changes diff --git a/packages/flow-types/package.json b/packages/flow-types/package.json index 3618d51b..59541964 100644 --- a/packages/flow-types/package.json +++ b/packages/flow-types/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-types", - "version": "0.2.16", + "version": "0.2.17", "description": "flow-engine types", "type": "module", "sideEffects": [