From 832c0f94d821c48286cf862498546d2ca5bb82f8 Mon Sep 17 00:00:00 2001 From: yaoyn Date: Tue, 11 Jun 2024 17:09:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E9=A1=B9?= =?UTF-8?q?=20=E5=80=BC=E5=8F=98=E6=9B=B4=E5=9B=9E=E8=B0=83=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=A2=9E=E5=8A=A0=E4=BC=A0=E5=8F=82=20=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E4=B8=8D=E7=BB=91=E8=A1=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E6=AD=A3=20=E5=AD=90=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=B0=86formModel=E4=BC=A0=E7=BB=99=E7=88=B6=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 5 + src/components/Select/src/Select.vue | 2 +- src/components/SimpleForm/src/SimpleForm.vue | 1265 +++++++++-------- .../src/components/SimpleFormItem.vue | 16 +- src/utils/env.ts | 62 +- .../components/FormDesignStep.vue | 3 +- types/config.d.ts | 288 ++-- 7 files changed, 823 insertions(+), 818 deletions(-) diff --git a/.env.development b/.env.development index 501d3fa..ebab6e3 100644 --- a/.env.development +++ b/.env.development @@ -16,6 +16,8 @@ VITE_DROP_CONSOLE = false # 接口地址 # 如果没有跨域问题,直接在这里配置即可 VITE_GLOB_API_URL=http://10.133.96.105:8077 +# 报表系统地址 +VITE_GLOB_REPORT_URL=http://10.133.96.105:3100 # 文件上传接口 可选 VITE_GLOB_UPLOAD_URL = /system/oss/upload @@ -31,3 +33,6 @@ VITE_GLOB_PRINT_BASE_URL = http://114.116.210.204:3300 # 接口地址前缀,有些系统所有接口地址都有前缀,可以在这里统一加,方便切换 VITE_GLOB_API_URL_PREFIX = + +# 屏蔽通知消息的轮询 +VITE_DISABLE_NEWS=false diff --git a/src/components/Select/src/Select.vue b/src/components/Select/src/Select.vue index 767f9a3..7c5f7bb 100644 --- a/src/components/Select/src/Select.vue +++ b/src/components/Select/src/Select.vue @@ -259,7 +259,7 @@ const val = Array.isArray(value) ? value.join(',') : value; emitData.value = args; emit('update:value', val); - emit('change', val); + emit('change', val, args); selectedValue.value = props.value === undefined ? val : (((typeof props.value === 'string' && !!props.value ? props.value?.split(',') : props.value) || undefined) as any); updateSepTextField(Array.isArray(value) ? value : [value]); } diff --git a/src/components/SimpleForm/src/SimpleForm.vue b/src/components/SimpleForm/src/SimpleForm.vue index 4486a78..f920557 100644 --- a/src/components/SimpleForm/src/SimpleForm.vue +++ b/src/components/SimpleForm/src/SimpleForm.vue @@ -1,16 +1,20 @@ diff --git a/src/components/SimpleForm/src/components/SimpleFormItem.vue b/src/components/SimpleForm/src/components/SimpleFormItem.vue index a32a698..ad8f008 100644 --- a/src/components/SimpleForm/src/components/SimpleFormItem.vue +++ b/src/components/SimpleForm/src/components/SimpleFormItem.vue @@ -84,7 +84,17 @@ :wrapperCol="itemLabelWidthProp.wrapperCol" >