Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

crmeb/app/adminapi/controller/v1/setting/SystemCrud.php

@@ -88,9 +88,10 @@ class SystemCrud extends AuthController
      */
     public function getFilePath()
     {
-        [$menuName, $tableName, $fromField, $columnField] = $this->request->postMore([
+        [$menuName, $tableName, $isTable, $fromField, $columnField] = $this->request->postMore([
             ['menuName', ''],
             ['tableName', ''],
+            ['isTable', 0],
             ['fromField', []],
             ['columnField', []],
         ], true);
@@ -108,7 +109,15 @@ class SystemCrud extends AuthController
             $makePath[$key] = $item['path'];
         }
 
-        return app('json')->success($makePath);
+        $tableField = [];
+        if (!$isTable) {
+            $field = $this->services->getColumnNamesList($tableName);
+            foreach ($field as $item) {
+                $tableField[] = ['value' => $item['name'], 'comment' => $item['comment'], 'label' => $item['name']];
+            }
+        }
+
+        return app('json')->success(compact('makePath', 'tableField'));
     }
 
     /**

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;

crmeb/app/adminapi/controller/v1/system/SystemDatabackup.php

@@ -11,6 +11,7 @@
 namespace app\adminapi\controller\v1\system;
 
 use think\facade\App;
+use think\facade\Db;
 use think\facade\Session;
 use app\adminapi\controller\AuthController;
 use app\services\system\SystemDatabackupServices;
@@ -53,6 +54,30 @@ class SystemDatabackup extends AuthController
         return app('json')->success($this->services->getRead($tablename));
     }
 
+    /**
+     * 更新数据表或者表字段备注
+     * @return \think\Response
+     * @author 吴汐
+     * @email 442384644@qq.com
+     * @date 2023/04/11
+     */
+    public function updateMark()
+    {
+        [$table, $field, $type, $mark] = $this->request->postMore([
+            ['table', ''],
+            ['field', ''],
+            ['type', ''],
+            ['mark', ''],
+        ], true);
+        if ($field == '') {
+            $sql = "ALTER TABLE $table COMMENT '$mark'";
+        } else {
+            $sql = "ALTER TABLE $table MODIFY COLUMN $field $type COMMENT '$mark'";
+        }
+        Db::execute($sql);
+        return app('json')->success(100024);
+    }
+
     /**
      * 优化表
      */

crmeb/app/adminapi/route/system.php

@@ -49,6 +49,8 @@ Route::group('system', function () {
     Route::get('backup', 'v1.system.SystemDatabackup/index')->option(['real_name' => '数据库所有表']);
     //数据备份详情
     Route::get('backup/read', 'v1.system.SystemDatabackup/read')->option(['real_name' => '数据备份详情']);
+    //更新数据表或者表字段备注
+    Route::post('database/update_mark', 'v1.system.SystemDatabackup/updateMark')->option(['real_name' => '更新数据表或者表字段备注']);
     //数据备份 优化表
     Route::put('backup/optimize', 'v1.system.SystemDatabackup/optimize')->option(['real_name' => '数据备份优化表']);
     //数据备份 修复表

crmeb/app/services/system/SystemCrudServices.php

@@ -65,11 +65,39 @@ class SystemCrudServices extends BaseServices
         return compact('list', 'count');
     }
 
+    /**
+     * 数据库字段类型
+     * @return \string[][]
+     * @author 等风来
+     * @email 136327134@qq.com
+     * @date 2023/4/11
+     */
     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',
+            ]
         ];
     }
 

crmeb/app/services/system/SystemRouteServices.php

@@ -93,6 +93,18 @@ class SystemRouteServices extends BaseServices
                 }
             ])
             ->toArray();
+
+        foreach ($list as $key => $item) {
+            if (!empty($item['children'])) {
+                foreach ($item['children'] as $k => $v) {
+                    if (isset($v['cate_id']) && isset($v['method']) && $v['method'] === 'DELETE') {
+                        $v['method'] = 'DEL';
+                        $list[$key]['children'][$k] = $v;
+                    }
+                }
+            }
+        }
+
         return get_tree_children($list);
     }
 

crmeb/crmeb/services/crud/Controller.php

@@ -109,7 +109,7 @@ class Controller extends Make
      * @email 136327134@qq.com
      * @date 2023/3/13
      */
-    protected function getStub(string $type = '')
+    protected function getStub(string $type = 'controller')
     {
         $controllerPath = __DIR__ . DS . 'stubs' . DS . 'controller' . DS;
 

crmeb/crmeb/services/crud/Route.php

@@ -80,7 +80,7 @@ class Route extends Make
 
         $contentStr = str_replace($this->var, $this->value, $content);
 
-        $filePath = $this->getFilePathName($path, $this->value['nameCamel']);
+        $filePath = $this->getFilePathName($path, strtolower($name));
 
         return [$this->makeFile($filePath, $contentStr), $filePath];
     }

crmeb/public/mobile.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title><?=$siteName?></title>
+  <style>
+    #page {
+      width: 375px;
+      height: 60vh;
+      margin: 0 auto;
+      display: block;
+      position: absolute;
+      left: 50%;
+      -webkit-transform: translate(-50%,0);
+      -moz-transform: translate(-50%,0);
+      transform: translate(-50%,0);
+    }
+    body {
+      margin-top: 100px;
+    }
+  </style>
+</head>
+<body>
+<iframe id="page" src="<?=$siteUrl?>" frameborder="0"></iframe>
+</body>
+</html>

crmeb/public/static/html/pc.html

@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html lang=zh-CN>
-	<head>
-		<meta charset="utf-8">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge">
-		<meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1">
-		<title>crmeb-PC端</title>
-		<meta name="Copyright" content="helang">
-		<link rel="shortcut icon" type="image/png" href="">
-		<meta name="keywords" content="">
-		<meta name="description" content="">
-		<style type="text/css">
-			body{
-				margin: 0;
-				background-color: #f3f3f3;
-			}
-			iframe{
-				width: 375px;
-				height: 667px;
-				background-color: #fff;
-				box-sizing: content-box;
-				border: none;
-			}
-			
-			@media screen and (min-width: 450px) {
-			    iframe {
-					position: fixed;
-					top: 0;
-					right: 0;
-					bottom: 0;
-					left: 0;
-					margin: auto;
-			        border: rgba(0,0,0,0.1) solid 1px;
-			        border-radius: 4px;
-			    }
-			}
-		</style>
-		<script type="text/javascript">
-			window.isPC = true;
-			
-			window.onload = function(){
-				/* 监听电脑浏览器窗口尺寸改变 */
-				window.onresize = function(){
-					/* 窗口宽度 小于或等于420px 时，跳转回H5页面 */
-					if(window.innerWidth <= 420){
-						window.location.pathname = '/';
-					}
-				}
-			}
-		</script>
-	</head>
-	<body>
-		<iframe src="/"></iframe>
-	</body>
-</html>

crmeb/route/route.php

@@ -24,8 +24,16 @@ Route::miss(function () {
         case 'pages':
             return view(app()->getRootPath() . 'public' . DS . 'index.html');
         default:
-            if (!request()->isMobile() && is_dir(app()->getRootPath() . 'public' . DS . 'home') && !request()->get('type')) {
-                return view(app()->getRootPath() . 'public' . DS . 'home' . DS . 'index.html');
+            if (!request()->isMobile()) {
+                if (is_dir(app()->getRootPath() . 'public' . DS . 'home') && !request()->get('type')) {
+                    return view(app()->getRootPath() . 'public' . DS . 'home' . DS . 'index.html');
+                } else {
+                    if (request()->get('type')) {
+                        return view(app()->getRootPath() . 'public' . DS . 'index.html');
+                    } else {
+                        return view(app()->getRootPath() . 'public' . DS . 'mobile.html', ['siteName' => sys_config('site_name'), 'siteUrl' => sys_config('site_url') . '/pages/index/index']);
+                    }
+                }
             } else {
                 return view(app()->getRootPath() . 'public' . DS . 'index.html');
             }

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

template/admin/src/pages/system/maintain/systemDatabackup/index.vue

@@ -22,7 +22,7 @@
                 size="small"
                 no-filtered-data-text="暂无筛选结果"
             >
-              <template slot-scope="{ row, index }" slot="action">
+              <template slot-scope="{ row }" slot="action">
                 <a @click="Info(row)">详情</a>
               </template>
             </Table>

template/uni-app/App.vue

@@ -246,14 +246,6 @@
 			// #endif
 
 			// #ifdef H5
-			uni.getSystemInfo({
-				success(e) {
-					/* 窗口宽度大于420px且不在PC页面且不在移动设备时跳转至 PC.html 页面 */
-					if (e.windowWidth > 420 && !window.top.isPC && !/iOS|Android/i.test(e.system)) {
-						window.location.pathname = '/static/html/pc.html';
-					}
-				}
-			});
 			if (option.query.hasOwnProperty('type') && option.query.type == "iframeWindow") {
 				this.globalData.isIframe = true;
 			} else {

template/uni-app/static/html/pc.html

@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html lang=zh-CN>
-	<head>
-		<meta charset="utf-8">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge">
-		<meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1">
-		<title>crmeb-PC端</title>
-		<meta name="Copyright" content="helang">
-		<link rel="shortcut icon" type="image/png" href="">
-		<meta name="keywords" content="">
-		<meta name="description" content="">
-		<style type="text/css">
-			body{
-				margin: 0;
-				background-color: #f3f3f3;
-			}
-			iframe{
-				width: 375px;
-				height: 667px;
-				background-color: #fff;
-				box-sizing: content-box;
-				border: none;
-			}
-			
-			@media screen and (min-width: 450px) {
-			    iframe {
-					position: fixed;
-					top: 0;
-					right: 0;
-					bottom: 0;
-					left: 0;
-					margin: auto;
-			        border: rgba(0,0,0,0.1) solid 1px;
-			        border-radius: 4px;
-			    }
-			}
-		</style>
-		<script type="text/javascript">
-			window.isPC = true;
-			
-			window.onload = function(){
-				/* 监听电脑浏览器窗口尺寸改变 */
-				window.onresize = function(){
-					/* 窗口宽度 小于或等于420px 时，跳转回H5页面 */
-					if(window.innerWidth <= 420){
-						window.location.pathname = '/';
-					}
-				}
-			}
-		</script>
-	</head>
-	<body>
-		<iframe src="/"></iframe>
-	</body>
-</html>