diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php index e458c5897..83f04e891 100644 --- a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php +++ b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php @@ -247,11 +247,22 @@ class SystemCrud extends AuthController $item['name'] = $item['path']; try { $item['content'] = file_get_contents($path, LOCK_EX); - $data[] = $item; + $data[$key] = $item; } catch (\Throwable $e) { } } + + //调整排序 + $makeData = []; + $names = ['model', 'dao', 'service', 'controller', 'validate', 'router', 'api', 'pages']; + foreach ($names as $name) { + if (isset($data[$name])) { + $makeData[] = $data[$name]; + } + } + $data = $makeData; + $info = $info->toArray(); //记录没有修改之前的数据 foreach ((array)$info['field']['tableField'] as $key => $item) { diff --git a/template/admin/src/pages/system/codeGeneration/index.vue b/template/admin/src/pages/system/codeGeneration/index.vue index 1aeee11d7..bf0aaa70a 100644 --- a/template/admin/src/pages/system/codeGeneration/index.vue +++ b/template/admin/src/pages/system/codeGeneration/index.vue @@ -193,7 +193,14 @@ export default { }, }) }else{ - this.saveCodeCrud(data); + this.$Modal.confirm({ + title: '生成提醒', + content: '生成后本地开发调试会直接加载生成的vue页面;如果是上线后进行生成,可以进行浏览,代码生成列表中的修改文件将不生效。需要重新打包上线!', + loading: true, + onOk:() => { + this.saveCodeCrud(data,true); + }, + }) } } else { if (this.currentTab < 3) this.currentTab++;