From 9e4268e74686e236ac1b3af6fe742fd2331691c5 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Tue, 11 Apr 2023 17:46:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/v1/setting/SystemMenus.php     |  5 ++-
 .../services/system/SystemCrudServices.php    | 33 +++++++++++++++++--
 .../src/pages/setting/systemMenus/index.vue   | 10 ++++--
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemMenus.php b/crmeb/app/adminapi/controller/v1/setting/SystemMenus.php
index e00e5e15d..331888b5b 100644
--- a/crmeb/app/adminapi/controller/v1/setting/SystemMenus.php
+++ b/crmeb/app/adminapi/controller/v1/setting/SystemMenus.php
@@ -256,13 +256,12 @@ class SystemMenus extends AuthController
     public function ruleList()
     {
         //获取所有的路由
-        $ruleList = app()->make(SystemRouteServices::class)->selectList(['app_name' => 'adminapi'], 'name,path,method,type,id');
+        $ruleList = app()->make(SystemRouteServices::class)->selectList(['app_name' => 'adminapi'], 'name,path,method,type,id')->toArray();
         $menuApiList = $this->services->getColumn(['auth_type' => 2, 'is_del' => 0], "concat(`api_url`,'_',lower(`methods`)) as rule");
         if ($menuApiList) $menuApiList = array_column($menuApiList, 'rule');
         $list = [];
         foreach ($ruleList as $item) {
-            $item['path'] = str_replace('adminapi/', '', $item['path']);
-            if (!in_array($item['path'] . '_' . $item['method'], $menuApiList)) {
+            if (!in_array($item['path'] . '_' . strtolower($item['method']), $menuApiList)) {
                 $item['real_name'] = $item['name'] ?? '';
                 $item['method'] = strtoupper($item['method']);
                 $list[] = $item;
diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php
index cbd4106ec..986a71b0b 100644
--- a/crmeb/app/services/system/SystemCrudServices.php
+++ b/crmeb/app/services/system/SystemCrudServices.php
@@ -65,12 +65,39 @@ class SystemCrudServices extends BaseServices
         return compact('list', 'count');
     }
 
+    /**
+     * 数据库字段类型
+     * @author 等风来
+     * @email 136327134@qq.com
+     * @date 2023/4/11
+     * @return \string[][]
+     */
     public function getTabelRule()
     {
-        $adapter = app()->make(MysqlAdapter::class);
         return [
-            'types' => $adapter->getColumnTypes(),
-        ];
+            'types' => [
+                'string',
+                'char',
+                'text',
+                'integer',
+                'biginteger',
+                'float',
+                'decimal',
+                'datetime',
+                'timestamp',
+                'time',
+                'date',
+                'blob',
+                'binary',
+                'varbinary',
+                'boolean',
+                'uuid',
+                // Geospatial data types
+                'geometry',
+                'point',
+                'linestring',
+                'polygon',
+            ];
     }
 
     /**
diff --git a/template/admin/src/pages/setting/systemMenus/index.vue b/template/admin/src/pages/setting/systemMenus/index.vue
index 8664f1e13..d7cea3c79 100644
--- a/template/admin/src/pages/setting/systemMenus/index.vue
+++ b/template/admin/src/pages/setting/systemMenus/index.vue
@@ -114,8 +114,8 @@
         <Button @click="init">重置</Button>
       </div>
       <Tabs v-model="routeType" @on-click="changTab">
-        <TabPane label="基础接口" name="1"></TabPane>
-        <TabPane label="公共接口" name="0"></TabPane>
+        <TabPane label="公共接口" name="1"></TabPane>
+        <TabPane label="基础接口" name="0"></TabPane>
       </Tabs>
       <div class="rule">
         <div
@@ -128,7 +128,7 @@
         >
           <div>接口名称：{{ item.real_name }}</div>
           <div>请求方式：{{ item.method }}</div>
-          <div>接口地址：{{ item.rule }}</div>
+          <div>接口地址：{{ item.path }}</div>
         </div>
       </div>
     </Modal>
@@ -250,6 +250,10 @@ export default {
     // 获取权限列表
     getRuleList() {
       getRuleList().then((res) => {
+        this.foundationList = [];
+        this.openList = [];
+        this.seletRouteIds = [];
+        this.seletRoute = [];
         res.data.map((e) => {
           if (e.type) {
             this.foundationList.push(e);