Merge branch 'dev' of https://gitee.com/JavaLionLi/plus-ui into dev

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",

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> -->

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 value="4" />
-            <el-radio-button label="8" />
+            <el-radio-button value="8" />
-            <el-radio-button label="12" />
+            <el-radio-button value="12" />
-            <el-radio-button label="24" />
+            <el-radio-button value="24" />
-            <el-radio-button label="自定义" />
+            <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 value="1" />
-            <el-radio-button label="2" />
+            <el-radio-button value="2" />
-            <el-radio-button label="3" />
+            <el-radio-button value="3" />
-            <el-radio-button label="4" />
+            <el-radio-button value="4" />
-            <el-radio-button label="自定义" />
+            <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 value="1" />
-            <el-radio-button label="2" />
+            <el-radio-button value="2" />
-            <el-radio-button label="3" />
+            <el-radio-button value="3" />
-            <el-radio-button label="4" />
+            <el-radio-button value="4" />
-            <el-radio-button label="自定义" />
+            <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 value="1" />
-            <el-radio-button label="2" />
+            <el-radio-button value="2" />
-            <el-radio-button label="3" />
+            <el-radio-button value="3" />
-            <el-radio-button label="4" />
+            <el-radio-button value="4" />
-            <el-radio-button label="自定义" />
+            <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>

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>

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">

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>

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 value="M">目录</el-radio>
-                <el-radio label="C">菜单</el-radio>
+                <el-radio value="C">菜单</el-radio>
-                <el-radio label="F">按钮</el-radio>
+                <el-radio value="F">按钮</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>

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>

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 value="0">private</el-radio>
-            <el-radio label="1">public</el-radio>
+            <el-radio value="1">public</el-radio>
-            <el-radio label="2">custom</el-radio>
+            <el-radio value="2">custom</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="域" prop="region">

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">

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="菜单权限">

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>

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 value="0">男</el-radio>
-        <el-radio label="1">女</el-radio>
+        <el-radio value="1">女</el-radio>
       </el-radio-group>
     </el-form-item>
     <el-form-item>

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" value="0">zip压缩包</el-radio>
-          <el-radio v-model="infoForm.genType" label="1">自定义路径</el-radio>
+          <el-radio v-model="infoForm.genType" value="1">自定义路径</el-radio>
         </el-form-item>
       </el-col>
 

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">