From f4e6a890da2884777281031a9c736c7659c2a74a Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期四, 02 一月 2025 14:20:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/model/mpk/file/MpkForm.vue |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/views/model/mpk/file/MpkForm.vue b/src/views/model/mpk/file/MpkForm.vue
index 102765c..8dfbae9 100644
--- a/src/views/model/mpk/file/MpkForm.vue
+++ b/src/views/model/mpk/file/MpkForm.vue
@@ -210,6 +210,7 @@
                         @click="updateSetting(scope.row)"
                         key="danger"
                         type="primary"
+                        :disabled="scope.row.settingKey === 'pyFile'"
                         link
                       >修改
                       </el-button>
@@ -217,6 +218,7 @@
                         @click="deleteSetting(props.row.methodSettings,scope.$index)"
                         key="danger"
                         type="danger"
+                        :disabled="scope.row.settingKey === 'pyFile'"
                         link
                       >删除
                       </el-button>
@@ -330,6 +332,9 @@
     ],
     menuAndGroup: [
       {required: true, message: '所属目录不能为空', trigger: 'blur'}
+    ],
+    icon: [
+      {required: true, message: 'icon不能为空', trigger: 'blur'}
     ],
   })
 
@@ -449,7 +454,9 @@
     if (id) {
       formLoading.value = true
       try {
+        debugger
         formData.value = await MpkApi.getMpk(id)
+        debugger
       } finally {
         formLoading.value = false
       }

--
Gitblit v1.9.3