php/houde_web_api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 合并

Browse Source
This commit is contained in:
lwh 2023-05-06 10:10:31 +08:00
parent cd484d6f8d
commit eebef086e8
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/admin/controller/Gen/Gen.php
View File

@ -345,13 +345,11 @@ class Gen extends BaseController
try { try {
if ($table['tplCategory'] == "web_static") { if ($table['tplCategory'] == "web_static") {
$this->createAdminController($columns, $table); $this->createAdminController($columns, $table);
// $this->createNewModel($columns, $table);
(new Model($columns, $table))->createNewModel(); (new Model($columns, $table))->createNewModel();
$this->createJsWebStaticIndex($columns, $table); $this->createJsWebStaticIndex($columns, $table);
$this->createJsApi($columns, $table); $this->createJsApi($columns, $table);
} else if ($table['tplCategory'] == "crud") { } else if ($table['tplCategory'] == "crud") {
$this->createAdminController($columns, $table); $this->createAdminController($columns, $table);
// $this->createNewModel($columns, $table);
(new Model($columns, $table))->createNewModel(); (new Model($columns, $table))->createNewModel();
$this->createJsVue($columns, $table); $this->createJsVue($columns, $table);
$this->createJsAdd($columns, $table); $this->createJsAdd($columns, $table);
@ -824,6 +822,7 @@ class Gen extends BaseController
$className = $table['className']; $className = $table['className'];
if ($isSort == 1) { if ($isSort == 1) {
$sortTemplate = " $sortTemplate = "
<!-- 排序 --> <!-- 排序 -->
<template #{$columnName}='scope'> <template #{$columnName}='scope'>
@ -1991,7 +1990,7 @@ class Gen extends BaseController
\$params = \$request->param(); \$params = \$request->param();
\$select = Model{$class_name}::field({$init_fields_arr_str}) \$select = Model{$class_name}::field({$init_fields_arr_str})
->order({$order_field}, $order_mode ) ->order({$order_field}, $order_mode )
->select()->toArray(); ->select();
return Model{$class_name}::exportExcel(\$select); return Model{$class_name}::exportExcel(\$select);
}"; }";
case 'export_mod': case 'export_mod':