From d67bd493c1618b924cf0021fd818b137e3588d21 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期日, 21 四月 2024 16:50:01 +0800
Subject: [PATCH] Merge branch 'dev' of https://gitee.com/JavaLionLi/plus-ui into dev
---
src/views/system/client/index.vue | 2
src/views/system/config/index.vue | 2
src/views/system/role/index.vue | 2
src/views/system/oss/config.vue | 8 ++--
src/views/system/dept/index.vue | 2
src/views/system/post/index.vue | 2
src/views/workflow/formManage/index.vue | 2
src/bpmn/panel/property/DueDate.vue | 40 ++++++++++----------
src/bpmn/panel/TaskPanel.vue | 2
src/views/system/menu/index.vue | 6 +-
src/views/system/user/index.vue | 2
src/views/tool/gen/genInfoForm.vue | 4 +-
src/views/system/user/profile/userInfo.vue | 4 +-
package.json | 2
src/views/system/notice/index.vue | 2
15 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/package.json b/package.json
index d824fe1..aaec162 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
"diagram-js": "12.3.0",
"didi": "9.0.2",
"echarts": "5.5.0",
- "element-plus": "2.6.3",
+ "element-plus": "2.7.1",
"file-saver": "2.0.5",
"fuse.js": "7.0.0",
"highlight.js": "11.9.0",
diff --git a/src/bpmn/panel/TaskPanel.vue b/src/bpmn/panel/TaskPanel.vue
index 9ece85f..253d3f9 100644
--- a/src/bpmn/panel/TaskPanel.vue
+++ b/src/bpmn/panel/TaskPanel.vue
@@ -95,7 +95,7 @@
</div>
<el-form-item v-if="formData.allocationType === AllocationTypeEnum.SPECIFY && showConfig.specifyDesc" style="">
<el-radio-group v-model="formData.specifyDesc" class="ml-4">
- <el-radio v-for="item in SpecifyDesc" :key="item.id" :label="item.value" size="large">{{ item.label }}</el-radio>
+ <el-radio v-for="item in SpecifyDesc" :key="item.id" :value="item.value" size="large">{{ item.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-tab-pane> -->
diff --git a/src/bpmn/panel/property/DueDate.vue b/src/bpmn/panel/property/DueDate.vue
index 4825a1c..69f00a0 100644
--- a/src/bpmn/panel/property/DueDate.vue
+++ b/src/bpmn/panel/property/DueDate.vue
@@ -4,41 +4,41 @@
<el-form label-width="100px">
<el-form-item label="灏忔椂">
<el-radio-group v-model="hourValue" @change="hourChange">
- <el-radio-button label="4" />
- <el-radio-button label="8" />
- <el-radio-button label="12" />
- <el-radio-button label="24" />
- <el-radio-button label="鑷畾涔�" />
+ <el-radio-button value="4" />
+ <el-radio-button value="8" />
+ <el-radio-button value="12" />
+ <el-radio-button value="24" />
+ <el-radio-button value="鑷畾涔�" />
<el-input-number v-show="hourValue === '鑷畾涔�'" v-model="customHourValue" :min="1" @change="customHourValueChange"></el-input-number>
</el-radio-group>
</el-form-item>
<el-form-item label="澶�">
<el-radio-group v-model="dayValue" @change="dayChange">
- <el-radio-button label="1" />
- <el-radio-button label="2" />
- <el-radio-button label="3" />
- <el-radio-button label="4" />
- <el-radio-button label="鑷畾涔�" />
+ <el-radio-button value="1" />
+ <el-radio-button value="2" />
+ <el-radio-button value="3" />
+ <el-radio-button value="4" />
+ <el-radio-button value="鑷畾涔�" />
<el-input-number v-show="dayValue === '鑷畾涔�'" v-model="customDayValue" :min="1" @change="customDayValueChange"></el-input-number>
</el-radio-group>
</el-form-item>
<el-form-item label="鍛�">
<el-radio-group v-model="weekValue" @change="weekChange">
- <el-radio-button label="1" />
- <el-radio-button label="2" />
- <el-radio-button label="3" />
- <el-radio-button label="4" />
- <el-radio-button label="鑷畾涔�" />
+ <el-radio-button value="1" />
+ <el-radio-button value="2" />
+ <el-radio-button value="3" />
+ <el-radio-button value="4" />
+ <el-radio-button value="鑷畾涔�" />
<el-input-number v-show="weekValue === '鑷畾涔�'" v-model="customWeekValue" :min="1" @change="customWeekValueChange"></el-input-number>
</el-radio-group>
</el-form-item>
<el-form-item label="鏈�">
<el-radio-group v-model="monthValue" @change="monthChange">
- <el-radio-button label="1" />
- <el-radio-button label="2" />
- <el-radio-button label="3" />
- <el-radio-button label="4" />
- <el-radio-button label="鑷畾涔�" />
+ <el-radio-button value="1" />
+ <el-radio-button value="2" />
+ <el-radio-button value="3" />
+ <el-radio-button value="4" />
+ <el-radio-button value="鑷畾涔�" />
<el-input-number v-show="monthValue === '鑷畾涔�'" v-model="customMonthValue" :min="1" @change="customMonthValueChange"></el-input-number>
</el-radio-group>
</el-form-item>
diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue
index 6463307..af8696b 100644
--- a/src/views/system/client/index.vue
+++ b/src/views/system/client/index.vue
@@ -125,7 +125,7 @@
</el-form-item>
<el-form-item label="鐘舵��">
<el-radio-group v-model="form.status">
- <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">
+ <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">
{{ dict.label }}
</el-radio>
</el-radio-group>
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 3d0f396..138068e 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -105,7 +105,7 @@
</el-form-item>
<el-form-item label="绯荤粺鍐呯疆" prop="configType">
<el-radio-group v-model="form.configType">
- <el-radio v-for="dict in sys_yes_no" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+ <el-radio v-for="dict in sys_yes_no" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 23e29de..30942df 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -115,7 +115,7 @@
<el-col :span="12">
<el-form-item label="閮ㄩ棬鐘舵��">
<el-radio-group v-model="form.status">
- <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+ <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 1d65a5b..9e5b5c3 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -95,9 +95,9 @@
<el-col :span="24">
<el-form-item label="鑿滃崟绫诲瀷" prop="menuType">
<el-radio-group v-model="form.menuType">
- <el-radio label="M">鐩綍</el-radio>
- <el-radio label="C">鑿滃崟</el-radio>
- <el-radio label="F">鎸夐挳</el-radio>
+ <el-radio value="M">鐩綍</el-radio>
+ <el-radio value="C">鑿滃崟</el-radio>
+ <el-radio value="F">鎸夐挳</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 98960a6..7d4bbe0 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -97,7 +97,7 @@
<el-col :span="24">
<el-form-item label="鐘舵��">
<el-radio-group v-model="form.status">
- <el-radio v-for="dict in sys_notice_status" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+ <el-radio v-for="dict in sys_notice_status" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue
index 94d6e03..41766f6 100644
--- a/src/views/system/oss/config.vue
+++ b/src/views/system/oss/config.vue
@@ -106,14 +106,14 @@
</el-form-item>
<el-form-item label="鏄惁HTTPS">
<el-radio-group v-model="form.isHttps">
- <el-radio v-for="dict in sys_yes_no" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+ <el-radio v-for="dict in sys_yes_no" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="妗舵潈闄愮被鍨�">
<el-radio-group v-model="form.accessPolicy">
- <el-radio label="0">private</el-radio>
- <el-radio label="1">public</el-radio>
- <el-radio label="2">custom</el-radio>
+ <el-radio value="0">private</el-radio>
+ <el-radio value="1">public</el-radio>
+ <el-radio value="2">custom</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="鍩�" prop="region">
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index f282c99..172c386 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -89,7 +89,7 @@
</el-form-item>
<el-form-item label="宀椾綅鐘舵��" prop="status">
<el-radio-group v-model="form.status">
- <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+ <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 6743992..bd84af3 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -120,7 +120,7 @@
</el-form-item>
<el-form-item label="鐘舵��">
<el-radio-group v-model="form.status">
- <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+ <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="鑿滃崟鏉冮檺">
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index e87e10b..e656191 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -202,7 +202,7 @@
<el-col :span="12">
<el-form-item label="鐘舵��">
<el-radio-group v-model="form.status">
- <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+ <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
diff --git a/src/views/system/user/profile/userInfo.vue b/src/views/system/user/profile/userInfo.vue
index 289f8d4..d5b8a4c 100644
--- a/src/views/system/user/profile/userInfo.vue
+++ b/src/views/system/user/profile/userInfo.vue
@@ -11,8 +11,8 @@
</el-form-item>
<el-form-item label="鎬у埆">
<el-radio-group v-model="userForm.sex">
- <el-radio label="0">鐢�</el-radio>
- <el-radio label="1">濂�</el-radio>
+ <el-radio value="0">鐢�</el-radio>
+ <el-radio value="1">濂�</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item>
diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index a8d7e13..0ee9f1d 100644
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -90,8 +90,8 @@
<el-icon><question-filled /></el-icon>
</el-tooltip>
</template>
- <el-radio v-model="infoForm.genType" label="0">zip鍘嬬缉鍖�</el-radio>
- <el-radio v-model="infoForm.genType" label="1">鑷畾涔夎矾寰�</el-radio>
+ <el-radio v-model="infoForm.genType" value="0">zip鍘嬬缉鍖�</el-radio>
+ <el-radio v-model="infoForm.genType" value="1">鑷畾涔夎矾寰�</el-radio>
</el-form-item>
</el-col>
diff --git a/src/views/workflow/formManage/index.vue b/src/views/workflow/formManage/index.vue
index 45dc0c5..5057b3a 100644
--- a/src/views/workflow/formManage/index.vue
+++ b/src/views/workflow/formManage/index.vue
@@ -69,7 +69,7 @@
</el-form-item>
<el-form-item label="琛ㄥ崟绫诲瀷" prop="formType">
<el-radio-group v-model="form.formType" @change="form.router = ''">
- <el-radio v-for="dict in wf_form_type" :key="dict.value" border :label="dict.value">{{ dict.label }}</el-radio>
+ <el-radio v-for="dict in wf_form_type" :key="dict.value" border :value="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.formType === 'static'" label="璺敱鍦板潃" prop="router">
--
Gitblit v1.9.3