diff --git a/apps/web-ele/src/components/cropper/cropper-avatar.vue b/apps/web-ele/src/components/cropper/cropper-avatar.vue index e50085f3c..894169844 100644 --- a/apps/web-ele/src/components/cropper/cropper-avatar.vue +++ b/apps/web-ele/src/components/cropper/cropper-avatar.vue @@ -18,7 +18,7 @@ const props = withDefaults(defineProps(), { width: 200, value: '', showBtn: true, - btnProps: () => ({}), + btnProps: () => ({}) as any, btnText: '', uploadApi: () => Promise.resolve(), size: 5, @@ -27,14 +27,10 @@ const props = withDefaults(defineProps(), { const emit = defineEmits(['update:value', 'change']); const sourceValue = ref(props.value || ''); -// TODO @puhui999:这个有办法去掉么? -const prefixCls = 'cropper-avatar'; const [CropperModal, modalApi] = useVbenModal({ connectedComponent: cropperModal, }); -const getClass = computed(() => [prefixCls]); - const getWidth = computed(() => `${`${props.width}`.replace(/px/, '')}px`); const getIconWidth = computed( @@ -74,34 +70,41 @@ defineExpose({ - - diff --git a/apps/web-ele/src/components/cropper/cropper-modal.vue b/apps/web-ele/src/components/cropper/cropper-modal.vue index 1d949c0aa..2c631185c 100644 --- a/apps/web-ele/src/components/cropper/cropper-modal.vue +++ b/apps/web-ele/src/components/cropper/cropper-modal.vue @@ -36,7 +36,6 @@ const cropper = ref(); let scaleX = 1; let scaleY = 1; -const prefixCls = 'cropper-am'; const [Modal, modalApi] = useVbenModal({ onConfirm: handleOk, onOpenChange(isOpen) { @@ -120,11 +119,34 @@ async function handleOk() { :title="$t('ui.cropper.modalTitle')" class="w-[800px]" > -
+
-
+
-
+
-
+
-
+
-
+
- - diff --git a/apps/web-ele/src/components/cropper/cropper.vue b/apps/web-ele/src/components/cropper/cropper.vue index d371e4a45..5cdf1bc36 100644 --- a/apps/web-ele/src/components/cropper/cropper.vue +++ b/apps/web-ele/src/components/cropper/cropper.vue @@ -33,8 +33,6 @@ const imgElRef = ref>(); const cropper = ref(); const isReady = ref(false); -// TODO @puhui999:这个有办法去掉么? -const prefixCls = 'cropper-image'; const debounceRealTimeCropped = useDebounceFn(realTimeCropped, 80); const getImageStyle = computed((): CSSProperties => { @@ -47,10 +45,9 @@ const getImageStyle = computed((): CSSProperties => { const getClass = computed(() => { return [ - prefixCls, attrs.class, { - [`${prefixCls}--circled`]: props.circled, + 'cropper-image--circled': props.circled, }, ]; }); @@ -158,6 +155,7 @@ function getRoundedCanvas() { :crossorigin="crossorigin" :src="src" :style="getImageStyle" + class="h-auto max-w-full" />
diff --git a/apps/web-ele/src/components/form-create/rules/data.ts b/apps/web-ele/src/components/form-create/rules/data.ts index fa89ec654..2c6cee2ce 100644 --- a/apps/web-ele/src/components/form-create/rules/data.ts +++ b/apps/web-ele/src/components/form-create/rules/data.ts @@ -121,7 +121,7 @@ const apiSelectRule = [ field: 'data', title: '请求参数 JSON 格式', props: { - autosize: true, // TODO @puhui999:这里时 autoSize 还是 autosize 哈?和 antd 不同 + autosize: true, type: 'textarea', placeholder: '{"type": 1}', }, @@ -155,7 +155,7 @@ const apiSelectRule = [ info: `data 为接口返回值,需要写一个匿名函数解析返回值为选择器 options 列表 (data: any)=>{ label: string; value: any }[]`, props: { - autosize: true, // TODO @puhui999:这里时 autoSize 还是 autosize 哈?和 antd 不同 + autosize: true, rows: { minRows: 2, maxRows: 6 }, type: 'textarea', placeholder: ` diff --git a/apps/web-ele/src/components/form-create/rules/use-dict-select.ts b/apps/web-ele/src/components/form-create/rules/use-dict-select.ts index b77af4464..e9eb46e9d 100644 --- a/apps/web-ele/src/components/form-create/rules/use-dict-select.ts +++ b/apps/web-ele/src/components/form-create/rules/use-dict-select.ts @@ -39,7 +39,7 @@ export function useDictSelectRule() { title: label, info: '', $required: false, - // TODO @puhui999:vben 版本里,这里有个 modelField: 'value', 需要添加么? + modelField: 'model-value', }; }, props(_: any, { t }: any) {