From ff0d855d21ceb65f5b734be58882d79fb2d37bc8 Mon Sep 17 00:00:00 2001
From: maslow <wangfugen@126.com>
Date: Wed, 4 Aug 2021 14:15:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=87=BD=E6=95=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/development/functions.vue       | 26 ++++++++++---------
 .../devops-server/src/router/sys_rules.ts     |  8 +-----
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/packages/devops-admin/src/views/development/functions.vue b/packages/devops-admin/src/views/development/functions.vue
index ddc1bfe0ab..fddebe8aaa 100644
--- 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
index a83195fd28..c89c865349 100644
--- 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')"