优化

app/Controller/Admin/Tools.php

@@ -164,8 +164,12 @@ class Tools extends Base
         preg_match_all('/([a-zA-Z])[a-zA-Z]*/', $table_name, $m);
         $name1 = implode('', $m[1]);
         $name2 = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $table_name))));
+        $parts = explode('_', $table_name);
+        $name3 = end($parts);
         $module_name = $table['module_name'];
         $controller_name = $table['controller_name'];
+
+
         // 搜搜字段
         $query_fields = [];
         $insert_fields = [];
@@ -191,12 +195,12 @@ class Tools extends Base
             }
         }
         $data = [
-            'model.php' => $this->render->getContents('templates/model.php.twig', compact("table_name", "fields", "controller_name", "query_fields", "list_fields")),
+            'model.php' => $this->render->getContents('templates/model.php.twig', compact("table_name", "fields", "controller_name", "query_fields", "list_fields", "name3")),
             'request.php' => $this->render->getContents('templates/request.php.twig', compact("controller_name", "insert_fields", "fields", "required_fields", "edit_fields")),
             'controller.php' => $this->render->getContents('templates/controller.php.twig', compact("controller_name", "module_name", "query_fields", "insert_fields", "edit_fields", "table_name", "name1", "name2")),
             'api.ts' => $this->render->getContents('templates/api.ts.twig', compact('table_name')),
-            'index.vue' => $this->render->getContents('templates/index.vue.twig', compact('table_name', 'list_fields', 'query_fields', 'name2')),
-            'save.vue' => $this->render->getContents('templates/save.vue.twig', compact('table_name', 'insert_fields', 'required_fields', 'edit_fields'))
+            'index.vue' => $this->render->getContents('templates/index.vue.twig', compact('table_name', 'list_fields', 'query_fields', 'name2', 'name3')),
+            'save.vue' => $this->render->getContents('templates/save.vue.twig', compact('table_name', 'insert_fields', 'required_fields', 'edit_fields', 'name3'))
         ];
         return $this->success("模板信息", $data);
     }

static/view/templates/api.ts.twig

@@ -6,7 +6,7 @@ export default {
             return await http.get("{{ table_name }}/list", data);
         },
         info: async function (data = {}) {
-            return await http.get("{{ table_name }}/list", data);
+            return await http.get("{{ table_name }}/info", data);
         },
         add: async function (data = {}) {
             return await http.post("{{ table_name }}/add", data);

static/view/templates/index.vue.twig

@@ -1,5 +1,5 @@
 <template>
-    <pi-table ref="tableRef" :apiObj="api.{{ table_name }}.list" @selection-change="selectionChange">
+    <pi-table ref="tableRef" :api="api.{{ table_name }}.list" @selection-change="selectionChange">
 {% if query_fields|length > 2 %}
         <template #extend>
 {% for field in query_fields %}
@@ -142,7 +142,7 @@
     //删除
     async function del(row) {
         const loading = proxy.$loading();
-        const res = await api.{{ table_name }}.del({ids: [row.{{ table_name }}_id]});
+        const res = await api.{{ table_name }}.del({ids: [row.{{ name3 }}_id]});
         tableRef.value.refresh()
         loading.close();
         proxy.$message.success(res.msg)
@@ -154,7 +154,7 @@
             type: 'warning'
         }).then(async () => {
             const loading = proxy.$loading();
-            const res = await api.{{ table_name }}.del({ids: selection.value.map(item => item.{{ table_name }}_id)});
+            const res = await api.{{ table_name }}.del({ids: selection.value.map(item => item.{{ name3 }}_id)});
             tableRef.value.refresh()
             loading.close();
             proxy.$message.success(res.msg)

static/view/templates/model.php.twig

@@ -16,7 +16,7 @@ class {{ controller_name }} extends Model
      */
     protected ?string $table = '{{ table_name }}';
 
-    protected string $primaryKey = '{{ table_name }}_id';
+    protected string $primaryKey = '{{ name3 }}_id';
 
     /**
      * The attributes that are mass assignable.
@@ -66,13 +66,13 @@ class {{ controller_name }} extends Model
         }
 {% endif %}
 {% endfor %}
-        return $model->orderByDesc("{{ table_name }}_id")
+        return $model->orderByDesc("{{ name3 }}_id")
             ->select([{% for field in list_fields %}"{{ field.column_name }}"{% if not loop.last %}, {% endif %}{% endfor %}])
             ->paginate((int)$param['limit']);
     }
 
     public static function options()
     {
-        return self::select(["{{ table_name }}_id", "{{ table_name }}_name"])->get()->toArray();
+        return self::select(["{{ name3 }}_id", "{{ name3 }}_name"])->get()->toArray();
     }
 }

static/view/templates/save.vue.twig

@@ -91,7 +91,7 @@
         const validate = await formRef.value.validate().catch(() => {});
         if(!validate){ return false }
         isSaveing.value = true;
-        const res = form.value.{{table_name}}_id? await api.{{table_name}}.edit(form.value) : await api.{{table_name}}.add(form.value);
+        const res = form.value.{{name3}}_id? await api.{{table_name}}.edit(form.value) : await api.{{table_name}}.add(form.value);
         isSaveing.value = false;
         emit('success')
         visible.value = false;