From 4ef7879ae305f8e9b32ba5c53d883c03404a7f19 Mon Sep 17 00:00:00 2001 From: QiuYiBin <304526003@qq.com> Date: Mon, 6 Jan 2025 18:01:25 +0800 Subject: [PATCH] =?UTF-8?q?feta(admin)=EF=BC=9A=E6=95=B0=E5=AD=97=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=A1=86=E6=B7=BB=E5=8A=A0=E5=8A=A8=E6=80=81=E7=82=B9?= =?UTF-8?q?=E7=BC=80=EF=BC=8C=E6=A0=B7=E5=BC=8F=E6=9B=B4=E5=8A=A0=E5=A5=BD?= =?UTF-8?q?=E7=9C=8B=20feta(admin)=EF=BC=9ACURL=20=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=BD=BF=E7=94=A8=E6=95=B0=E5=AD=97=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/service/curd/BuildCurd.php | 153 ++++++++++-------- .../curd/templates/view/module/sort.code | 7 + app/admin/view/mall/cate/add.html | 2 +- app/admin/view/mall/cate/edit.html | 2 +- app/admin/view/mall/goods/add.html | 2 +- app/admin/view/mall/goods/edit.html | 2 +- app/admin/view/mall/goods/stock.html | 2 +- app/admin/view/system/menu/add.html | 2 +- app/admin/view/system/menu/edit.html | 2 +- app/admin/view/system/quick/add.html | 2 +- app/admin/view/system/quick/edit.html | 2 +- 11 files changed, 101 insertions(+), 77 deletions(-) create mode 100644 app/admin/service/curd/templates/view/module/sort.code diff --git a/app/admin/service/curd/BuildCurd.php b/app/admin/service/curd/BuildCurd.php index 5975d0ad..0c497dd2 100644 --- a/app/admin/service/curd/BuildCurd.php +++ b/app/admin/service/curd/BuildCurd.php @@ -300,7 +300,7 @@ public function setTable($table): static } } $this->tableComment = $this->table; - }catch (Exception $e) { + } catch (Exception $e) { throw new TableException($e->getMessage()); } @@ -308,11 +308,11 @@ public function setTable($table): static $nodeArray = explode('_', $this->table); if (count($nodeArray) == 1) { $this->controllerFilename = ucfirst($nodeArray[0]); - }else { + } else { foreach ($nodeArray as $k => $v) { if ($k == 0) { $this->controllerFilename = "{$v}{$this->DS}"; - }else { + } else { $this->controllerFilename .= ucfirst($v); } } @@ -396,7 +396,7 @@ public function setRelation($relationTable, $foreignKey, $primaryKey = null, $mo } $this->relationArray[$relationTable] = $relation; $this->selectFields[] = $foreignKey; - }catch (Exception $e) { + } catch (Exception $e) { throw new TableException($e->getMessage()); } return $this; @@ -652,7 +652,6 @@ protected function buildStructure(): static if (in_array($key, ['describe', 'content', 'details'])) { $this->editorFields[] = $key; } - } return $this; } @@ -706,7 +705,7 @@ protected function buildColum(&$colum): array } } !empty($formatDefine) && $colum['define'] = $formatDefine; - }else { + } else { $colum['define'] = $define; } } @@ -730,7 +729,8 @@ protected function buildSelectController($field): mixed $this->getTemplate("controller{$this->DS}select"), [ 'name' => $name, - ]); + ] + ); return $selectCode; } @@ -754,7 +754,8 @@ protected function buildSelectModel($field, $array): mixed [ 'name' => $name, 'values' => $values, - ]); + ] + ); return $selectCode; } @@ -775,7 +776,8 @@ protected function buildRelationSelectModel($relation, $field): mixed 'name' => "notes['$field']", 'relation' => $relation, 'values' => $field, - ]); + ] + ); return $selectCode; } @@ -794,7 +796,8 @@ protected function buildOptionView($field, string $select = '') [ 'name' => "notes['$field']", 'select' => $select, - ]); + ] + ); } /** @@ -813,7 +816,8 @@ protected function buildRadioView($field, string $select = ''): mixed 'field' => $field, 'name' => "notes['$field']", 'select' => $select, - ]); + ] + ); } /** @@ -832,7 +836,8 @@ protected function buildCheckboxView($field, string $select = ''): mixed 'field' => $field, 'name' => "notes['$field']", 'select' => $select, - ]); + ] + ); } /** @@ -945,7 +950,6 @@ protected function renderData(): static $this->tableColumns[$field]['formType'] = 'select'; continue; } - } // 关联表 @@ -1018,7 +1022,6 @@ protected function renderData(): static } return $this; - } /** @@ -1031,7 +1034,7 @@ protected function renderController(): static $constructRelation = ''; if (empty($this->relationArray)) { $controllerIndexMethod = ''; - }else { + } else { $relationCode = ''; foreach ($this->relationArray as $key => $val) { $relation = CommonTool::lineToHump($key); @@ -1044,7 +1047,8 @@ protected function renderController(): static $this->getTemplate("controller{$this->DS}indexMethod"), [ 'relationIndexMethod' => $relationCode, - ]); + ] + ); } $selectList = ''; // foreach ($this->relationArray as $relation) { @@ -1071,7 +1075,8 @@ protected function renderController(): static 'indexMethod' => $controllerIndexMethod, 'selectList' => $selectList, 'constructRelation' => $constructRelation, - ]); + ] + ); $this->fileList[$controllerFile] = $controllerValue; return $this; } @@ -1129,7 +1134,8 @@ protected function renderModel(): static 'relationList' => $relationList, // 'selectList' => $selectList, 'selectArrays' => CommonTool::replaceArrayString(var_export($selectArrays, true)), - ]); + ] + ); $this->fileList[$modelFile] = $modelValue; @@ -1165,7 +1171,8 @@ protected function renderModel(): static 'relationList' => '', 'selectList' => '', 'selectArrays' => "[]", - ]); + ] + ); $this->fileList[$relationModelFile] = $relationModelValue; } return $this; @@ -1184,7 +1191,8 @@ protected function renderView(): static [ 'controllerUrl' => $this->controllerUrl, 'notesScript' => $this->formatNotesScript(), - ]); + ] + ); $this->fileList[$viewIndexFile] = $viewIndexValue; // 添加页面 @@ -1202,42 +1210,44 @@ protected function renderView(): static // 根据formType去获取具体模板 if ($val['formType'] == 'image') { $templateFile = "view{$this->DS}module{$this->DS}image"; - }elseif ($val['formType'] == 'images') { + } elseif ($val['formType'] == 'images') { $templateFile = "view{$this->DS}module{$this->DS}images"; $define = $val['define'] ?? '|'; - }elseif ($val['formType'] == 'file') { + } elseif ($val['formType'] == 'file') { $templateFile = "view{$this->DS}module{$this->DS}file"; - }elseif ($val['formType'] == 'files') { + } elseif ($val['formType'] == 'files') { $templateFile = "view{$this->DS}module{$this->DS}files"; $define = $val['define'] ?? '|'; - }elseif ($val['formType'] == 'editor') { + } elseif ($val['formType'] == 'editor') { $templateFile = "view{$this->DS}module{$this->DS}editor"; $val['default'] = '""'; - }elseif ($val['formType'] == 'date') { + } elseif ($val['formType'] == 'date') { $templateFile = "view{$this->DS}module{$this->DS}date"; $define = 'date'; - }elseif ($val['formType'] == 'datetime') { + } elseif ($val['formType'] == 'datetime') { $templateFile = "view{$this->DS}module{$this->DS}date"; $define = 'datetime'; - }elseif ($val['formType'] == 'radio') { + } elseif ($val['formType'] == 'radio') { $templateFile = "view{$this->DS}module{$this->DS}radio"; if (!empty($val['define'])) { $define = $this->buildRadioView($field, '{in name="k" value="' . $val['default'] . '"}checked=""{/in}'); } - }elseif ($val['formType'] == 'checkbox') { + } elseif ($val['formType'] == 'checkbox') { $templateFile = "view{$this->DS}module{$this->DS}checkbox"; if (!empty($val['define'])) { $define = $this->buildCheckboxView($field, '{in name="k" value="' . $val['default'] . '"}checked=""{/in}'); } - }elseif ($val['formType'] == 'select') { + } elseif ($val['formType'] == 'select') { $templateFile = "view{$this->DS}module{$this->DS}select"; if (isset($val['bindRelation'])) { $define = $this->buildOptionView($val['bindRelation']); - }elseif (!empty($val['define'])) { + } elseif (!empty($val['define'])) { $define = $this->buildOptionView($field); } - }elseif ($field == 'remark' || $val['formType'] == 'textarea') { + } elseif ($field == 'remark' || $val['formType'] == 'textarea') { $templateFile = "view{$this->DS}module{$this->DS}textarea"; + } elseif ($field == 'sort') { + $templateFile = "view{$this->DS}module{$this->DS}sort"; } $addFormList .= CommonTool::replaceTemplate( $this->getTemplate($templateFile), @@ -1247,13 +1257,15 @@ protected function renderView(): static 'required' => $this->buildRequiredHtml($val['required']), 'value' => $val['default'], 'define' => $define, - ]); + ] + ); } $viewAddValue = CommonTool::replaceTemplate( $this->getTemplate("view{$this->DS}form"), [ 'formList' => $addFormList, - ]); + ] + ); $this->fileList[$viewAddFile] = $viewAddValue; @@ -1274,41 +1286,43 @@ protected function renderView(): static // 根据formType去获取具体模板 if ($val['formType'] == 'image') { $templateFile = "view{$this->DS}module{$this->DS}image"; - }elseif ($val['formType'] == 'images') { + } elseif ($val['formType'] == 'images') { $templateFile = "view{$this->DS}module{$this->DS}images"; - }elseif ($val['formType'] == 'file') { + } elseif ($val['formType'] == 'file') { $templateFile = "view{$this->DS}module{$this->DS}file"; - }elseif ($val['formType'] == 'files') { + } elseif ($val['formType'] == 'files') { $templateFile = "view{$this->DS}module{$this->DS}files"; - }elseif ($val['formType'] == 'editor') { + } elseif ($val['formType'] == 'editor') { $templateFile = "view{$this->DS}module{$this->DS}editor"; $value = '$row["' . $field . '"]'; - }elseif ($val['formType'] == 'date') { + } elseif ($val['formType'] == 'date') { $templateFile = "view{$this->DS}module{$this->DS}date"; $define = 'date'; - }elseif ($val['formType'] == 'datetime') { + } elseif ($val['formType'] == 'datetime') { $templateFile = "view{$this->DS}module{$this->DS}date"; $define = 'datetime'; - }elseif ($val['formType'] == 'radio') { + } elseif ($val['formType'] == 'radio') { $templateFile = "view{$this->DS}module{$this->DS}radio"; if (!empty($val['define'])) { $define = $this->buildRadioView($field, '{in name="k" value="$row.' . $field . '"}checked=""{/in}'); } - }elseif ($val['formType'] == 'checkbox') { + } elseif ($val['formType'] == 'checkbox') { $templateFile = "view{$this->DS}module{$this->DS}checkbox"; if (!empty($val['define'])) { $define = $this->buildCheckboxView($field, '{in name="k" value="$row.' . $field . '"}checked=""{/in}'); } - }elseif ($val['formType'] == 'select') { + } elseif ($val['formType'] == 'select') { $templateFile = "view{$this->DS}module{$this->DS}select"; if (isset($val['bindRelation'])) { $define = $this->buildOptionView($val['bindRelation'], '{in name="k" value="$row.' . $field . '"}selected=""{/in}'); - }elseif (!empty($val['define'])) { + } elseif (!empty($val['define'])) { $define = $this->buildOptionView($field, '{in name="k" value="$row.' . $field . '"}selected=""{/in}'); } - }elseif ($field == 'remark' || $val['formType'] == 'textarea') { + } elseif ($field == 'remark' || $val['formType'] == 'textarea') { $templateFile = "view{$this->DS}module{$this->DS}textarea"; $value = '{$row.' . $field . '|raw|default=\'\'}'; + } elseif ($field == 'sort') { + $templateFile = "view{$this->DS}module{$this->DS}sort"; } $editFormList .= CommonTool::replaceTemplate( $this->getTemplate($templateFile), @@ -1318,13 +1332,15 @@ protected function renderView(): static 'required' => $this->buildRequiredHtml($val['required']), 'value' => $value, 'define' => $define, - ]); + ] + ); } $viewEditValue = CommonTool::replaceTemplate( $this->getTemplate("view{$this->DS}form"), [ 'formList' => $editFormList, - ]); + ] + ); $this->fileList[$viewEditFile] = $viewEditValue; return $this; @@ -1345,31 +1361,31 @@ protected function renderJs(): static if ($val['formType'] == 'image') { $templateValue = "{field: '{$field}', title: '{$val['comment']}', templet: ea.table.image}"; - }elseif ($val['formType'] == 'images') { + } elseif ($val['formType'] == 'images') { continue; - }elseif ($val['formType'] == 'file') { + } elseif ($val['formType'] == 'file') { $templateValue = "{field: '{$field}', title: '{$val['comment']}', templet: ea.table.url}"; - }elseif ($val['formType'] == 'files') { + } elseif ($val['formType'] == 'files') { continue; - }elseif ($val['formType'] == 'editor') { + } elseif ($val['formType'] == 'editor') { continue; - }elseif (in_array($field, $this->switchFields)) { + } elseif (in_array($field, $this->switchFields)) { if (!empty($val['define'])) { $templateValue = "{field: '{$field}', search: 'select', selectList: notes?.{$field} || {}, title: '{$val['comment']}', templet: ea.table.switch}"; - }else { + } else { $templateValue = "{field: '{$field}', title: '{$val['comment']}', templet: ea.table.switch}"; } - }elseif (in_array($val['formType'], ['select', 'checkbox', 'radio', 'switch'])) { + } elseif (in_array($val['formType'], ['select', 'checkbox', 'radio', 'switch'])) { if (!empty($val['define'])) { $templateValue = "{field: '{$field}', search: 'select', selectList: notes?.{$field} || {}, title: '{$val['comment']}'}"; - }else { + } else { $templateValue = "{field: '{$field}', title: '{$val['comment']}'}"; } - }elseif ($field == 'remark') { + } elseif ($field == 'remark') { $templateValue = "{field: '{$field}', title: '{$val['comment']}', templet: ea.table.text}"; - }elseif (in_array($field, $this->sortFields)) { + } elseif (in_array($field, $this->sortFields)) { $templateValue = "{field: '{$field}', title: '{$val['comment']}', edit: 'text'}"; - }else { + } else { $templateValue = "{field: '{$field}', title: '{$val['comment']}'}"; } @@ -1382,23 +1398,23 @@ protected function renderJs(): static foreach ($tableVal['tableColumns'] as $field => $val) { if ($val['formType'] == 'image') { $templateValue = "{field: '{$table}.{$field}', title: '{$val['comment']}', templet: ea.table.image}"; - }elseif ($val['formType'] == 'images') { + } elseif ($val['formType'] == 'images') { continue; - }elseif ($val['formType'] == 'file') { + } elseif ($val['formType'] == 'file') { $templateValue = "{field: '{$table}.{$field}', title: '{$val['comment']}', templet: ea.table.url}"; - }elseif ($val['formType'] == 'files') { + } elseif ($val['formType'] == 'files') { continue; - }elseif ($val['formType'] == 'editor') { + } elseif ($val['formType'] == 'editor') { continue; - }elseif ($val['formType'] == 'select') { + } elseif ($val['formType'] == 'select') { $templateValue = "{field: '{$table}.{$field}', title: '{$val['comment']}'}"; - }elseif ($field == 'remark') { + } elseif ($field == 'remark') { $templateValue = "{field: '{$table}.{$field}', title: '{$val['comment']}', templet: ea.table.text}"; - }elseif (in_array($field, $this->switchFields)) { + } elseif (in_array($field, $this->switchFields)) { $templateValue = "{field: '{$table}.{$field}', title: '{$val['comment']}', templet: ea.table.switch}"; - }elseif (in_array($field, $this->sortFields)) { + } elseif (in_array($field, $this->sortFields)) { $templateValue = "{field: '{$table}.{$field}', title: '{$val['comment']}', edit: 'text'}"; - }else { + } else { $templateValue = "{field: '{$table}.{$field}', title: '{$val['comment']}'}"; } @@ -1413,7 +1429,8 @@ protected function renderJs(): static [ 'controllerUrl' => $this->controllerUrl, 'indexCols' => $indexCols, - ]); + ] + ); $this->fileList[$jsFile] = $jsValue; return $this; } @@ -1538,4 +1555,4 @@ protected function formatNotesScript(): string { return ' let notes = JSON.parse(\'{$notes|json_encode=256|raw}\');'; } -} \ No newline at end of file +} diff --git a/app/admin/service/curd/templates/view/module/sort.code b/app/admin/service/curd/templates/view/module/sort.code new file mode 100644 index 00000000..1c315f3a --- /dev/null +++ b/app/admin/service/curd/templates/view/module/sort.code @@ -0,0 +1,7 @@ + +
+ +
+ +
+
\ No newline at end of file diff --git a/app/admin/view/mall/cate/add.html b/app/admin/view/mall/cate/add.html index 8dc76f03..19990a1b 100644 --- a/app/admin/view/mall/cate/add.html +++ b/app/admin/view/mall/cate/add.html @@ -22,7 +22,7 @@
- +
diff --git a/app/admin/view/mall/cate/edit.html b/app/admin/view/mall/cate/edit.html index 8ba47634..d6e9e862 100644 --- a/app/admin/view/mall/cate/edit.html +++ b/app/admin/view/mall/cate/edit.html @@ -22,7 +22,7 @@
- +
diff --git a/app/admin/view/mall/goods/add.html b/app/admin/view/mall/goods/add.html index 52b5e3ea..26ae9bf5 100644 --- a/app/admin/view/mall/goods/add.html +++ b/app/admin/view/mall/goods/add.html @@ -78,7 +78,7 @@
- +
diff --git a/app/admin/view/mall/goods/edit.html b/app/admin/view/mall/goods/edit.html index 29930932..8117f9c5 100644 --- a/app/admin/view/mall/goods/edit.html +++ b/app/admin/view/mall/goods/edit.html @@ -78,7 +78,7 @@
- +
diff --git a/app/admin/view/mall/goods/stock.html b/app/admin/view/mall/goods/stock.html index 348583ac..2f42cde2 100644 --- a/app/admin/view/mall/goods/stock.html +++ b/app/admin/view/mall/goods/stock.html @@ -25,7 +25,7 @@
- +
diff --git a/app/admin/view/system/menu/add.html b/app/admin/view/system/menu/add.html index 1035c137..128209f3 100644 --- a/app/admin/view/system/menu/add.html +++ b/app/admin/view/system/menu/add.html @@ -53,7 +53,7 @@
- +
diff --git a/app/admin/view/system/menu/edit.html b/app/admin/view/system/menu/edit.html index 002ffdfc..ba3afb18 100644 --- a/app/admin/view/system/menu/edit.html +++ b/app/admin/view/system/menu/edit.html @@ -53,7 +53,7 @@
- +
diff --git a/app/admin/view/system/quick/add.html b/app/admin/view/system/quick/add.html index 32bf5516..e5e8c705 100644 --- a/app/admin/view/system/quick/add.html +++ b/app/admin/view/system/quick/add.html @@ -31,7 +31,7 @@
- +
diff --git a/app/admin/view/system/quick/edit.html b/app/admin/view/system/quick/edit.html index ef0bb743..716f8576 100644 --- a/app/admin/view/system/quick/edit.html +++ b/app/admin/view/system/quick/edit.html @@ -31,7 +31,7 @@
- +