From 62b4bf5d209a10d4b6684f9a28fb1b0431625e4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=ADvier?= <vier@j7yx.com>
Date: Fri, 29 Mar 2024 04:03:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?'=E5=85=B3=E8=81=94=E8=A1=A8=E6=95=B0=E6=8D=AE'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/components/ds-select/index.vue      | 102 ++++++++++++++++++
 admin/src/views/dev_tools/code/edit.vue       |   5 +
 .../service/generator/core/ModelGenerator.php |  26 +++++
 .../generator/core/VueEditGenerator.php       |   6 ++
 .../generator/core/VueIndexGenerator.php      |  90 +++++++++++++++-
 .../generator/stub/php/controller.stub        |  19 ++++
 .../service/generator/stub/php/logic.stub     |  12 +++
 .../stub/php/model/relation_data.stub         |  25 +++++
 .../service/generator/stub/vue/api.stub       |   5 +
 .../service/generator/stub/vue/edit.stub      |   2 +-
 .../stub/vue/form_item/relationData.stub      |  10 ++
 .../service/generator/stub/vue/index.stub     |   6 +-
 .../stub/vue/other_item/fetchFun.stub         |  10 ++
 .../stub/vue/other_item/fetchFunItem.stub     |   5 +
 .../stub/vue/search_item/relationData.stub    |  10 ++
 .../stub/vue/table_item/relationData.stub     |   5 +
 16 files changed, 332 insertions(+), 6 deletions(-)
 create mode 100644 admin/src/components/ds-select/index.vue
 create mode 100644 server/app/common/service/generator/stub/php/model/relation_data.stub
 create mode 100644 server/app/common/service/generator/stub/vue/form_item/relationData.stub
 create mode 100644 server/app/common/service/generator/stub/vue/other_item/fetchFun.stub
 create mode 100644 server/app/common/service/generator/stub/vue/other_item/fetchFunItem.stub
 create mode 100644 server/app/common/service/generator/stub/vue/search_item/relationData.stub
 create mode 100644 server/app/common/service/generator/stub/vue/table_item/relationData.stub

diff --git a/admin/src/components/ds-select/index.vue b/admin/src/components/ds-select/index.vue
new file mode 100644
index 000000000..a389d02f2
--- /dev/null
+++ b/admin/src/components/ds-select/index.vue
@@ -0,0 +1,102 @@
+<template>
+    <el-select
+        v-model="selectedValue"
+        filterable
+        :filter-method="handleFilter"
+        @visible-change="handleVisibleChange"
+        @change="handleChange"
+        >
+        <el-option
+            v-for="item in rows"
+            :key="item.id"
+            :label="item.title"
+            :value="item.id"
+            />
+        <el-pagination
+            :current-page="current"
+            :page-sizes="[props.pageSize]"
+            :page-size="props.pageSize"
+            :total="total"
+            hide-on-single-page
+            layout="prev,slot,next"
+            style="justify-content: space-between;"
+            @current-change="handleCurrentChange"
+            >
+            <span>{{current}} / {{Math.ceil(total/props.pageSize)}}</span>
+        </el-pagination>
+    </el-select>
+</template>
+
+<script setup>
+const props = defineProps({
+        modelValue:{
+            type:String,
+            default:'',
+        },
+        field: {
+            type:String
+        },
+        show_field: {
+            type:String
+        },
+        pageSize: {
+            type:Number,
+            default:5
+        },
+        apiRelationDatas:{
+            type:Function
+        },
+    });
+
+const selectedValue = ref(props.modelValue||'');
+
+const total = ref(0);
+const rows = ref([]);
+const current = ref(1);
+
+// 请求接口加载数据
+const loadData = async (page=1,ids='',title='')=>{
+    let data = await props.apiRelationDatas({
+        field: props.field,
+        show_field: props.show_field,
+        ids:ids,
+        title:title,
+        page:page,
+        pageSize:props.pageSize
+    })
+    total.value = data.total
+    rows.value = data.rows
+    current.value = page
+}
+
+// 下拉框显示事件
+const handleVisibleChange = async e=>{
+    if (e) {// 下拉框显示
+        loadData(1)
+    }else{// 下拉框隐藏
+
+    }
+}
+
+// 翻页事件
+const handleCurrentChange = async e=>{
+    loadData(e)
+}
+
+// 搜索事件
+const handleFilter = async e=>{
+    loadData(1,'',e)
+}
+
+
+// 返回选中结果
+const emit = defineEmits(['update:modelValue']);
+const handleChange = e=>{
+    console.log(e)
+    emit('update:modelValue',selectedValue.value)
+}
+
+// 渲染默认值
+props.modelValue && loadData(1,props.modelValue);
+
+</script>
diff --git a/admin/src/views/dev_tools/code/edit.vue b/admin/src/views/dev_tools/code/edit.vue
index 676408863..d05aa3f87 100644
--- a/admin/src/views/dev_tools/code/edit.vue
+++ b/admin/src/views/dev_tools/code/edit.vue
@@ -129,12 +129,17 @@
                                         <el-option label="日期控件" value="datetime" />
                                         <el-option label="图片选择控件" value="imageSelect" />
                                         <el-option label="富文本控件" value="editor" />
+                                        <el-option label="关联表" value="relationData" />
                                     </el-select>
                                 </template>
                             </el-table-column>
                             <el-table-column label="字典类型" min-width="120">
                                 <template v-slot="{ row }">
+                                    <el-input v-model="row.dict_type" clearable
+                                        placeholder="关联表的显示字段名"
+                                        v-if="row.view_type=='relationData'"/>
                                     <el-select
+                                        v-else
                                         v-model="row.dict_type"
                                         clearable
                                         :disabled="
diff --git a/server/app/common/service/generator/core/ModelGenerator.php b/server/app/common/service/generator/core/ModelGenerator.php
index 3d32ff454..22841886c 100644
--- a/server/app/common/service/generator/core/ModelGenerator.php
+++ b/server/app/common/service/generator/core/ModelGenerator.php
@@ -205,6 +205,32 @@ class ModelGenerator extends BaseGenerator implements GenerateInterface
             $tpl .= $this->replaceFileData($needReplace, $waitReplace, $templatePath) . PHP_EOL;
         }
 
+        if ($tpl) {
+            $templatePath = $this->getTemplatePath('php/model/relation_data');
+            if (file_exists($templatePath)) {
+                $relations = '';
+                foreach ($this->relationConfig as $config) {
+                    if (empty($config) || empty($config['name']) || empty($config['model'])) {
+                        continue;
+                    }
+                    $relations.= "            case '{$config['local_key']}':".PHP_EOL;
+                    $relations.= "                \$model = new {$config['model']};".PHP_EOL;
+                    $relations.= "                break;".PHP_EOL;
+                }
+                $needReplace = [
+                    '{AUTHOR}',
+                    '{DATE}',
+                    '{RELATIONS}',
+                ];
+                $waitReplace = [
+                    $this->getAuthorContent(),
+                    $this->getNoteDateContent(),
+                    trim($relations),
+                ];
+                $tpl .= $this->replaceFileData($needReplace, $waitReplace, $templatePath) . PHP_EOL;
+            }
+        }
+
         return $tpl;
     }
 
diff --git a/server/app/common/service/generator/core/VueEditGenerator.php b/server/app/common/service/generator/core/VueEditGenerator.php
index 9a1fcea17..151218610 100644
--- a/server/app/common/service/generator/core/VueEditGenerator.php
+++ b/server/app/common/service/generator/core/VueEditGenerator.php
@@ -258,6 +258,12 @@ class VueEditGenerator extends BaseGenerator implements GenerateInterface
                 array_push($waitReplace, $stubItemValue);
             }
 
+            // 关联表字段处理
+            if ($column['view_type'] == 'relationData') {
+                array_push($needReplace, '{UPPER_CAMEL_NAME}');
+                array_push($waitReplace, $this->getUpperCamelName());
+            }
+
             $content .= $this->replaceFileData($needReplace, $waitReplace, $templatePath) . PHP_EOL;
         }
 
diff --git a/server/app/common/service/generator/core/VueIndexGenerator.php b/server/app/common/service/generator/core/VueIndexGenerator.php
index a3c5b4fbe..eb1ac92eb 100644
--- a/server/app/common/service/generator/core/VueIndexGenerator.php
+++ b/server/app/common/service/generator/core/VueIndexGenerator.php
@@ -48,7 +48,9 @@ class VueIndexGenerator extends BaseGenerator implements GenerateInterface
             '{PERMS_ADD}',
             '{PERMS_EDIT}',
             '{PERMS_DELETE}',
-            '{SETUP_NAME}'
+            '{SETUP_NAME}',
+            '{RELATION_DATA_REF}',
+            '{FETCH_FUN}',
         ];
 
         // 等待替换的内容
@@ -63,7 +65,9 @@ class VueIndexGenerator extends BaseGenerator implements GenerateInterface
             $this->getPermsContent(),
             $this->getPermsContent('edit'),
             $this->getPermsContent('delete'),
-            $this->getLowerCamelName()
+            $this->getLowerCamelName(),
+            $this->getRealtionDataRef(),
+            $this->getFetchFun(),
         ];
 
         $templatePath = $this->getTemplatePath('vue/index');
@@ -116,6 +120,13 @@ class VueIndexGenerator extends BaseGenerator implements GenerateInterface
             if (!file_exists($templatePath)) {
                 continue;
             }
+
+            // 关联表字段处理
+            if ($column['view_type'] == 'relationData') {
+                array_push($needReplace, '{UPPER_CAMEL_NAME}');
+                array_push($waitReplace, $this->getUpperCamelName());
+            }
+
             $content .= $this->replaceFileData($needReplace, $waitReplace, $templatePath) . PHP_EOL;
         }
 
@@ -163,6 +174,9 @@ class VueIndexGenerator extends BaseGenerator implements GenerateInterface
             if ($column['column_type'] == 'int' && $column['view_type'] == 'datetime') {
                 $templatePath = $this->getTemplatePath('vue/table_item/datetime');
             }
+            if ($column['view_type'] == 'relationData') {
+                $templatePath = $this->getTemplatePath('vue/table_item/relationData');
+            }
             if (!file_exists($templatePath)) {
                 continue;
             }
@@ -215,6 +229,9 @@ class VueIndexGenerator extends BaseGenerator implements GenerateInterface
         $content = '';
         $isExist = [];
         foreach ($this->tableColumn as $column) {
+            if ($column['view_type'] == 'relationData') {
+                continue;
+            }
             if (empty($column['dict_type']) || $column['is_pk']) {
                 continue;
             }
@@ -230,6 +247,75 @@ class VueIndexGenerator extends BaseGenerator implements GenerateInterface
         return $this->setBlankSpace($content, '');
     }
 
+    /**
+     * @notes 获取关联表数据
+     * @return string
+     * @author 心衍
+     * @date 2022/6/23 11:58
+     */
+    public function getRealtionDataRef(){
+        $columns = array_filter($this->tableColumn,fn($column)=>
+            $column['view_type'] == 'relationData'
+        );
+        if ($columns){
+            $content = '// 数据源数据'.PHP_EOL;
+            $content.= 'const relationData = ref({'.PHP_EOL;
+            foreach ($columns as $column) {
+                $content.= "    {$column['column_name']}: [],".PHP_EOL;
+            }
+            $content.= '});'.PHP_EOL;
+            return $this->setBlankSpace($content, '');
+        }
+        return '';
+    }
+
+    /**
+     * @notes 获取加载数据的Api接口
+     * @return string
+     * @author 心衍
+     * @date 2022/6/23 11:58
+     */
+    public function getFetchFun(){
+        $content = 'api'.$this->getUpperCamelName().'Lists';
+        $columns = array_filter($this->tableColumn,fn($column)=>
+            $column['view_type'] == 'relationData'
+        );
+        if ($columns){
+            $templatePath = $this->getTemplatePath('vue/other_item/fetchFunItem');
+            if (!file_exists($templatePath)) {
+                return $content;
+            }
+            $fetchFunItem = '';
+            foreach ($columns as $column) {
+                $needReplace = [
+                    '{UPPER_CAMEL_NAME}',
+                    '{COLUMN_NAME}',
+                    '{DICT_TYPE}',
+                ];
+                $waitReplace = [
+                    $this->getUpperCamelName(),
+                    $column['column_name'],
+                    $column['dict_type'],
+                ];
+                $fetchFunItem.= '            '.$this->replaceFileData($needReplace, $waitReplace, $templatePath) . PHP_EOL;
+            }
+            $templatePath = $this->getTemplatePath('vue/other_item/fetchFun');
+            if (!file_exists($templatePath)) {
+                return $content;
+            }
+            $needReplace = [
+                '{UPPER_CAMEL_NAME}',
+                '{RELATION_DATAS}',
+            ];
+            $waitReplace = [
+                $this->getUpperCamelName(),
+                trim($fetchFunItem),
+            ];
+            $content = $this->replaceFileData($needReplace, $waitReplace, $templatePath) . PHP_EOL;
+        }
+        return $content;
+    }
+
 
     /**
      * @notes 权限规则
diff --git a/server/app/common/service/generator/stub/php/controller.stub b/server/app/common/service/generator/stub/php/controller.stub
index 44622d25a..c84c47723 100644
--- a/server/app/common/service/generator/stub/php/controller.stub
+++ b/server/app/common/service/generator/stub/php/controller.stub
@@ -101,5 +101,24 @@ class {UPPER_CAMEL_NAME}Controller extends {EXTENDS_CONTROLLER}
         return $this->data($result);
     }
 
+    /**
+     * @notes 获取关联表数据列表
+     * @return \think\response\Json
+     * @author {AUTHOR}
+     * @date {DATE}
+     **/
+    public function relationDatas()
+    {
+        $field = input('field/s','');//关联字段名
+        $show_field = input('show_field/s','');//显示字段名
+        $title = input('title/s','');//模糊搜索
+        $ids = input('ids/s','');//指定ID列表
+        $page = input('page/i',1);
+        $pageSize = input('pageSize/i',10);
+        $ids = $ids?explode(',',$ids):null;
+        list($total,$rows) = {UPPER_CAMEL_NAME}Logic::relationDatas($field,$show_field,$ids,$title,$page,$pageSize);
+        return $this->success('',['total'=>$total,'rows'=>$rows]);
+    }
+
 
 }
\ No newline at end of file
diff --git a/server/app/common/service/generator/stub/php/logic.stub b/server/app/common/service/generator/stub/php/logic.stub
index 4d4b7a6a3..08023fc75 100644
--- a/server/app/common/service/generator/stub/php/logic.stub
+++ b/server/app/common/service/generator/stub/php/logic.stub
@@ -103,4 +103,16 @@ class {UPPER_CAMEL_NAME}Logic extends BaseLogic
     {
         return {UPPER_CAMEL_NAME}::findOrEmpty($params['{PK}'])->toArray();
     }
+
+    /**
+     * @notes 获取关联表数据列表
+     * @param $params
+     * @return array
+     * @author {AUTHOR}
+     * @date {DATE}
+     **/
+    public static function relationDatas($field,$show_field,$ids=null,$title='',$page=1,$pageSize=10): array
+    {
+        return {UPPER_CAMEL_NAME}::relationDatas($field,$show_field,$ids,$title,$page,$pageSize);
+    }
 }
\ No newline at end of file
diff --git a/server/app/common/service/generator/stub/php/model/relation_data.stub b/server/app/common/service/generator/stub/php/model/relation_data.stub
new file mode 100644
index 000000000..453d82361
--- /dev/null
+++ b/server/app/common/service/generator/stub/php/model/relation_data.stub
@@ -0,0 +1,25 @@
+
+    /**
+     * @notes 获取关联表数据列表
+     * @return array
+     * @author {AUTHOR}
+     * @date {DATE}
+     **/
+    public static function relationDatas(string $field,string $show_field,int|array|null $ids,string $title,int $page=1,int $pageSize=10): array
+    {
+        switch($field){
+            {RELATIONS}
+            default:
+                return [0,[]];
+        }
+        $model = $model->field([
+                        $model->getPk().' as id',
+                        $show_field.' as title'
+                    ]);
+        $ids && $model = $model->where([$model->getPk()=>$ids]);
+        $title && $model = $model->where($show_field,'like','%'.$title.'%');
+        $total = $model->count();
+        $ids || $model = $model->limit(($page-1)*$pageSize,$pageSize);
+        $rows = array_map(fn($x)=>['id'=>$x['id'],'title'=>$x['title']],$model->select()->toArray());
+        return [$total,$rows];
+    }
\ No newline at end of file
diff --git a/server/app/common/service/generator/stub/vue/api.stub b/server/app/common/service/generator/stub/vue/api.stub
index 1858e9a12..40016fd99 100644
--- a/server/app/common/service/generator/stub/vue/api.stub
+++ b/server/app/common/service/generator/stub/vue/api.stub
@@ -23,4 +23,9 @@ export function api{UPPER_CAMEL_NAME}Delete(params: any) {
 // {COMMENT}详情
 export function api{UPPER_CAMEL_NAME}Detail(params: any) {
     return request.get({ url: '/{ROUTE}/detail', params })
+}
+
+// {COMMENT}关联数据
+export function api{UPPER_CAMEL_NAME}RelationDatas(params: any){
+    return request.get({ url: '/{ROUTE}/relationDatas', params });
 }
\ No newline at end of file
diff --git a/server/app/common/service/generator/stub/vue/edit.stub b/server/app/common/service/generator/stub/vue/edit.stub
index 3928bf8f4..80ef9b0fc 100644
--- a/server/app/common/service/generator/stub/vue/edit.stub
+++ b/server/app/common/service/generator/stub/vue/edit.stub
@@ -18,7 +18,7 @@
 <script lang="ts" setup name="{SETUP_NAME}Edit">
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
-import {{IMPORT_LISTS} api{UPPER_CAMEL_NAME}Add, api{UPPER_CAMEL_NAME}Edit, api{UPPER_CAMEL_NAME}Detail } from '@/api/{API_DIR}'
+import {{IMPORT_LISTS} api{UPPER_CAMEL_NAME}Add, api{UPPER_CAMEL_NAME}Edit, api{UPPER_CAMEL_NAME}Detail, api{UPPER_CAMEL_NAME}RelationDatas } from '@/api/{API_DIR}'
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
 defineProps({
diff --git a/server/app/common/service/generator/stub/vue/form_item/relationData.stub b/server/app/common/service/generator/stub/vue/form_item/relationData.stub
new file mode 100644
index 000000000..261f0cb9f
--- /dev/null
+++ b/server/app/common/service/generator/stub/vue/form_item/relationData.stub
@@ -0,0 +1,10 @@
+<el-form-item label="{COLUMN_COMMENT}" prop="{COLUMN_NAME}">
+    <ds-select
+        v-model="formData.{COLUMN_NAME}"
+        clearable
+        placeholder="请选择{COLUMN_COMMENT}"
+        :apiRelationDatas="api{UPPER_CAMEL_NAME}RelationDatas"
+        field="{COLUMN_NAME}"
+        show_field="{DICT_TYPE}"
+        />
+</el-form-item>
\ No newline at end of file
diff --git a/server/app/common/service/generator/stub/vue/index.stub b/server/app/common/service/generator/stub/vue/index.stub
index 3c9a71bc1..923b3d4ff 100644
--- a/server/app/common/service/generator/stub/vue/index.stub
+++ b/server/app/common/service/generator/stub/vue/index.stub
@@ -64,7 +64,7 @@
 <script lang="ts" setup name="{SETUP_NAME}Lists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { api{UPPER_CAMEL_NAME}Lists, api{UPPER_CAMEL_NAME}Delete } from '@/api/{API_DIR}'
+import { api{UPPER_CAMEL_NAME}Lists, api{UPPER_CAMEL_NAME}Delete, api{UPPER_CAMEL_NAME}RelationDatas } from '@/api/{API_DIR}'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
@@ -89,10 +89,10 @@ const handleSelectionChange = (val: any[]) => {
 
 // 获取字典数据
 const { dictData } = useDictData('{DICT_DATA}')
-
+{RELATION_DATA_REF}
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: api{UPPER_CAMEL_NAME}Lists,
+    fetchFun: {FETCH_FUN},
     params: queryParams
 })
 
diff --git a/server/app/common/service/generator/stub/vue/other_item/fetchFun.stub b/server/app/common/service/generator/stub/vue/other_item/fetchFun.stub
new file mode 100644
index 000000000..872b6bd63
--- /dev/null
+++ b/server/app/common/service/generator/stub/vue/other_item/fetchFun.stub
@@ -0,0 +1,10 @@
+(params: any)=>{
+    return new Promise((resolv,reject)=>{
+        const r = api{UPPER_CAMEL_NAME}Lists(params);
+        r.then(async r=>{
+            {RELATION_DATAS}
+            resolv(r);
+        })
+        return r;
+    });
+}
\ No newline at end of file
diff --git a/server/app/common/service/generator/stub/vue/other_item/fetchFunItem.stub b/server/app/common/service/generator/stub/vue/other_item/fetchFunItem.stub
new file mode 100644
index 000000000..e4ba3ccce
--- /dev/null
+++ b/server/app/common/service/generator/stub/vue/other_item/fetchFunItem.stub
@@ -0,0 +1,5 @@
+relationData.value.{COLUMN_NAME} = (await api{UPPER_CAMEL_NAME}RelationDatas({
+                        field:'{COLUMN_NAME}',
+                        show_field:'{DICT_TYPE}',
+                        ids: Array.from(new Set(r.lists.map((x:any)=>x.{COLUMN_NAME}))).join(',')
+                    })).rows.reduce((o:any,i:any)=>{o[i.id]=i.title;return o},{});
\ No newline at end of file
diff --git a/server/app/common/service/generator/stub/vue/search_item/relationData.stub b/server/app/common/service/generator/stub/vue/search_item/relationData.stub
new file mode 100644
index 000000000..b6547c78d
--- /dev/null
+++ b/server/app/common/service/generator/stub/vue/search_item/relationData.stub
@@ -0,0 +1,10 @@
+<el-form-item label="{COLUMN_COMMENT}" prop="{COLUMN_NAME}">
+    <ds-select class="w-[280px]"
+        v-model="queryParams.{COLUMN_NAME}"
+        clearable
+        placeholder="请选择{COLUMN_COMMENT}"
+        :apiRelationDatas="api{UPPER_CAMEL_NAME}RelationDatas"
+        field='{COLUMN_NAME}'
+        show_field="{DICT_TYPE}"
+        />
+</el-form-item>
\ No newline at end of file
diff --git a/server/app/common/service/generator/stub/vue/table_item/relationData.stub b/server/app/common/service/generator/stub/vue/table_item/relationData.stub
new file mode 100644
index 000000000..2394fadb3
--- /dev/null
+++ b/server/app/common/service/generator/stub/vue/table_item/relationData.stub
@@ -0,0 +1,5 @@
+<el-table-column label="{COLUMN_COMMENT}" prop="{COLUMN_NAME}">
+    <template #default="{ row }">
+        {{relationData.{COLUMN_NAME}[row.{COLUMN_NAME}]}}
+    </template>
+</el-table-column>
\ No newline at end of file
-- 
Gitee