diff --git a/src/renderer/src/components/Button/src/button.tsx b/src/renderer/src/components/Button/src/button.tsx index 22b4325..8630cd7 100644 --- a/src/renderer/src/components/Button/src/button.tsx +++ b/src/renderer/src/components/Button/src/button.tsx @@ -1,6 +1,8 @@ // Button/index.tsx import { defineComponent, computed, CSSProperties } from 'vue' import './button.scss' // 导入样式文件 +import { config } from '@/config' +import { TButton } from '@wocwin/t-ui-plus' //定义按钮类型 type ButtonType = 'primary' | 'success' | 'warning' | 'danger' | 'info' | 'text' @@ -41,6 +43,8 @@ export default defineComponent({ type: String as () => ButtonNativeType, default: 'button' }, + time: Number, // 按钮点击后禁用时间 + label: String, disabled: Boolean, loading: Boolean, plain: Boolean, @@ -93,21 +97,23 @@ export default defineComponent({ return ( {renderIcon()} + {props?.label} {slots.default?.()} ) } return () => ( - + ) } }) diff --git a/src/renderer/src/components/Form/colorPicker.tsx b/src/renderer/src/components/Form/colorPicker.tsx new file mode 100644 index 0000000..e69de29 diff --git a/src/renderer/src/components/Form/formList.tsx b/src/renderer/src/components/Form/formList.tsx index 54a3a92..930533d 100644 --- a/src/renderer/src/components/Form/formList.tsx +++ b/src/renderer/src/components/Form/formList.tsx @@ -2,7 +2,7 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2025-07-31 10:03:44 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2025-08-01 17:04:27 + * @LastEditTime: 2025-08-07 17:38:15 * @FilePath: \Robot-Al-Platform-Web\src\renderer\src\components\Form\formList.tsx * @Description: 定义 formList 组件 */ @@ -18,6 +18,9 @@ import { Delete } from '@element-plus/icons-vue' // 定义组件属性类型(保留所有 ElInputNumber 属性) type DSFormListProps = { formConfig: FormTypes + isHasPrefix?: boolean + isHasSuffix?: boolean + prefixRender?: (...ags: any[]) => any // 前置内容 render渲染 suffixRender?: (...ags: any[]) => any // 后置内容 render渲染 min?: number @@ -31,6 +34,16 @@ export default defineComponent({ type: Object as FormTypes, default: {} }, + isHasPrefix: { + type: Boolean, + default: true + }, + isHasSuffix: { + type: Boolean, + default: false + }, + prefixRender: Function as DSFormListProps['prefixRender'], + suffixRender: Function as DSFormListProps['suffixRender'], modelValue: { type: Array, default: () => [] @@ -100,7 +113,9 @@ export default defineComponent({ // const canRemove = list.length > props.min // 渲染自定义前缀内容 const renderPrefix = (formItem, index) => { - // props?.suffixRender && + if (!props.isHasPrefix) { + return null + } if (props.prefixRender) { return props?.prefixRender?.() } @@ -112,7 +127,26 @@ export default defineComponent({
removeItem(formItem, index)} - class="flex items-center justify-center ds-dialog-formList-delete" + className="flex items-center justify-center ds-dialog-formList-delete" + > + +
+ + ) + } + // 渲染自定义后缀内容 + const renderSuffix = (formItem, index) => { + if (!props.isHasSuffix) { + return null + } + if (props.suffixRender) { + return props?.suffixRender?.() + } + return ( +
+
removeItem(formItem, index)} + className="flex items-center justify-center ds-dialog-formList-delete" >
@@ -120,17 +154,20 @@ export default defineComponent({ ) } return () => ( -
-