fix: 修复无法删除函数的问题；

labring · Aug 4, 2021 · ff0d855 · ff0d855
1 parent b664266
commit ff0d855
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/packages/devops-admin/src/views/development/functions.vue b/packages/devops-admin/src/views/development/functions.vue
@@ -172,7 +172,7 @@
 
 <script>
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
-import { db } from '@/api/cloud'
+import { db } from '../../api/cloud'
 
 const defaultCode = `
 import cloud from '@/cloud-sdk'
@@ -183,17 +183,10 @@ exports.main = async function (ctx) {
 
   // 数据库操作
   const db = cloud.database()
-  const db_res = await db.collection('admins').get()
-  console.log(db_res)
+  const r = await db.collection('admins').get()
+  console.log(r)
 
-  // 网络操作
-  const res = await cloud.fetch("https://www.v2ex.com/api/topics/hot.json")
-  console.log(res.status)
-
-  return {
-    data: db_res.data,
-    fetch: res.data
-  }
+  return r.data
 }
 `
 
@@ -416,9 +409,18 @@ export default {
     async handleDelete(row, index) {
       await this.$confirm('确认要删除此数据？', '删除确认')
 
+      if(row.status) {
+        return this.$message.error('请先停用函数，再删除！')
+      }
+
+      const $ = db.command
       // 执行删除请求
       const r = await db.collection('__functions')
-        .where({ _id: row._id })
+        .where({ 
+          _id: row._id, 
+          status: 0, 
+          reserved: $.neq(true)
+        })
         .remove()
 
       if (!r.ok) {

diff --git a/packages/devops-server/src/router/sys_rules.ts b/packages/devops-server/src/router/sys_rules.ts
@@ -49,13 +49,7 @@ export default {
             0
           ]
         },
-        "reserved": {
-          "required": true,
-          "default": false,
-          "in": [
-            false
-          ]
-        }
+        "reserved": "$value !== true"
       }
     },
     "count": "$has('function.read')"