From 749c2b9c1f9a61e1a7491dfb3c25d420ee6fa219 Mon Sep 17 00:00:00 2001
From: zhusai <909883663@qq.com>
Date: Thu, 9 Mar 2023 23:18:22 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development           |   2 +-
 src/views/online/index.vue | 176 ++++++++++++++++++++++++-------------
 2 files changed, 117 insertions(+), 61 deletions(-)

diff --git a/.env.development b/.env.development
index dabc54c..4184b3a 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ NODE_ENV = 'development'
 
 # QuickAdmin管理系统/开发环境
 VUE_APP_BASE_API = ''
-VUE_APP_BASE_URL = 'http://demo-api.quickadmin.icu'
+VUE_APP_BASE_URL = 'http://qa-prod.demo.com'
 
 # 开发环境 跨域匹配请求接口，只有匹配到以下接口，才代理请求
 VUE_APP_BASE_PROXY = ['/admin','/plugins','/addons']
diff --git a/src/views/online/index.vue b/src/views/online/index.vue
index c2738b6..7d41bb5 100644
--- a/src/views/online/index.vue
+++ b/src/views/online/index.vue
@@ -55,94 +55,137 @@
 
         <!-- 添加界面 -->
         <el-dialog fullscreen :title="addPreview.title" :visible.sync="addPreview.open" top="5vh" append-to-body :before-close="beforeClose">
-            <el-form :model="form" ref="form" label-width="140px" :rules="addRules" inline>
+            <el-form :model="form" ref="form" label-width="140px" :rules="addRules">
                 <el-card>
-                    <el-row>
-                        <el-col :lg="8" :md="12" :sm="24" :xs="24">
+                    <el-tabs v-model="activeTab">
+                         <el-tab-pane label="基础信息" name="base">
                             <el-form-item label="表名称" prop="table_name">
-                                <el-select v-model="form.table_name" placeholder="请选择" size="small" @change="tableNameChange" :disabled="id != null">
-                                    <el-option v-for="item in modelOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-                                </el-select>
+                                    <el-select v-model="form.table_name" placeholder="请选择" size="small" @change="tableNameChange" :disabled="id != null">
+                                        <el-option v-for="item in modelOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+                                    </el-select>
                             </el-form-item>
-                        </el-col>
-                        <el-col :lg="8" :md="12" :sm="24" :xs="24">
+                               
                             <el-form-item label="表描述" prop="table_comment">
-                                <el-input v-model="form.table_comment" placeholder="请输入表描述" clearable size="small" />
+                                    <el-input v-model="form.table_comment" placeholder="请输入表描述" clearable size="small" />
                             </el-form-item>
-                        </el-col>
-                        <el-col :lg="8" :md="12" :sm="24" :xs="24">
+                            
+                            <el-form-item label="项目应用" prop="back_module">
+                                    <el-input v-model="form.back_module" placeholder="项目应用" clearable size="small" />
+                            </el-form-item>
+
+                            <el-form-item label="model位置" prop="model_module">
+                                    <el-input v-model="form.model_module" placeholder="model位置" clearable size="small" />
+                            </el-form-item>
+
+                            <el-form-item>
+                                    <span slot="label">
+                                        <el-tooltip content="如果有同名文件将覆盖同名文件" placement="top">
+                                            <i class="el-icon-question"></i>
+                                        </el-tooltip>
+                                        生成模式
+                                    </span>
+                                    <el-checkbox v-model="form.is_force">是否强制生成</el-checkbox>
+                            </el-form-item>
+                                
+                           
+                                
+
+                           
+                              
+                            <el-form-item label="所属应用" prop="back_module" v-if="false">
+                                    <el-input v-model="form.back_module" placeholder="请输入所属应用" clearable size="small" />
+                            </el-form-item>
+                           
                             <el-form-item>
                                 <span slot="label">
-                                    <el-tooltip content="如果有同名文件将覆盖同名文件" placement="top">
+                                    <el-tooltip content="是否位于common模块？" placement="top">
                                         <i class="el-icon-question"></i>
-                                    </el-tooltip>
-                                    生成模式
-                                </span>
-                                <el-checkbox v-model="form.is_force">是否强制生成</el-checkbox>
+                                        </el-tooltip>
+                                            model位置
+                                        </span>
+                                    <el-checkbox v-model="form.model_is_common">是否位于common模块</el-checkbox>
                             </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                          <el-col :lg="8" :md="12" :sm="24" :xs="24">
+                          
+                         </el-tab-pane>
+
+                    <el-tab-pane label="字段" name="table">
+                        <!-- 编辑模型组件 -->
+                        <el-row>
+                            <EditModelCom :editDetail="mainModelDetail" :loading="loadingEdit" @editFormChange="editFormChange"  />
+                        </el-row>
+                        <!-- 追加模型组件 -->
+                        <el-row v-if="!form.only_api">
+                            <AddModelCom ref="addmodelcom" :mainModelDetail="mainModelDetail" :secondaryEditTableData="secondaryEditTableData" :secondaryEditMoreTableData="secondaryEditMoreTableData" @addFormChange="addFormChange" @editMoreFormChange="editMoreFormChangeOut" />
+                        </el-row>
+                    </el-tab-pane>
+
+                    <el-tab-pane label="生成配置" name="curd">
                             <el-form-item>
                                 <span slot="label">
-                                    <el-tooltip content="仅生成后台接口，不生成前端页面" placement="top">
-                                        <i class="el-icon-question"></i>
-                                    </el-tooltip>
-                                    是否生成页面
+                                        <el-tooltip content="controller是否生成，controller的路径（可修改）" placement="top">
+                                            <i class="el-icon-question"></i>
+                                        </el-tooltip>
+                                        controller
                                 </span>
-                                <el-checkbox v-model="form.only_api">不生成前端页面</el-checkbox>
+                                <el-checkbox v-model="form.is_controller">生成controller</el-checkbox>
+
+                                <el-input v-model="form.controller_path" placeholder="controller路径" clearable size="small" v-if="form.is_controller"/>
                             </el-form-item>
-                        </el-col>
 
-                        <el-col :lg="8" :md="12" :sm="24" :xs="24" v-if="!form.only_api">
                             <el-form-item>
                                 <span slot="label">
-                                    <el-tooltip content="生成菜单" placement="top">
-                                        <i class="el-icon-question"></i>
-                                    </el-tooltip>
-                                    生成菜单
+                                        <el-tooltip content="model是否生成，model的路径（可修改）" placement="top">
+                                            <i class="el-icon-question"></i>
+                                        </el-tooltip>
+                                        model
                                 </span>
-                                <el-checkbox v-model="form.is_menu">是否生成菜单</el-checkbox>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :lg="8" :md="12" :sm="24" :xs="24" v-if="form.is_menu && !form.only_api">
-                            <el-form-item label="上级菜单">
-                                <TreeSelect :treeData="menuOptions" :defaultValue="form.menu_pid" :defaultProps="normalizer" @getValue="getTreeValue" placeholder="选择上级菜单" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :lg="8" :md="12" :sm="24" :xs="24" v-if="false">
-                            <el-form-item label="所属应用" prop="back_module">
-                                <el-input v-model="form.back_module" placeholder="请输入所属应用" clearable size="small" />
+                                <el-checkbox v-model="form.is_model">生成model</el-checkbox>
+                                <el-input v-model="form.model_path" placeholder="model路径" clearable size="small" v-if="form.is_model"/>
                             </el-form-item>
-                        </el-col>
-                        <el-col :lg="8" :md="12" :sm="24" :xs="24">
+
                             <el-form-item>
                                 <span slot="label">
-                                    <el-tooltip content="是否位于common模块？" placement="top">
-                                        <i class="el-icon-question"></i>
-                                    </el-tooltip>
-                                    model位置
+                                        <el-tooltip content="validate是否生成，validate的路径（可修改）" placement="top">
+                                            <i class="el-icon-question"></i>
+                                        </el-tooltip>
+                                        validate
                                 </span>
-                                <el-checkbox v-model="form.model_is_common">是否位于common模块</el-checkbox>
+                                <el-checkbox v-model="form.is_validate">生成validate</el-checkbox>
+                                <el-input v-model="form.validate_path" placeholder="model路径" clearable size="small" v-if="form.is_validate"/>
                             </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <!-- 编辑模型组件 -->
-                    <el-row>
-                        <EditModelCom :editDetail="mainModelDetail" :loading="loadingEdit" @editFormChange="editFormChange"  />
-                    </el-row>
-                    <!-- 追加模型组件 -->
-                    <el-row v-if="!form.only_api">
-                        <AddModelCom ref="addmodelcom" :mainModelDetail="mainModelDetail" :secondaryEditTableData="secondaryEditTableData" :secondaryEditMoreTableData="secondaryEditMoreTableData" @addFormChange="addFormChange" @editMoreFormChange="editMoreFormChangeOut" />
-                    </el-row>
 
+                            <el-form-item>
+                                <span slot="label">
+                                        <el-tooltip content="仅生成后台接口，不生成前端页面" placement="top">
+                                            <i class="el-icon-question"></i>
+                                        </el-tooltip>
+                                        是否生成页面
+                                    </span>
+                                    <el-checkbox v-model="form.only_api">不生成前端页面</el-checkbox>
+                            </el-form-item>
+
+
+                            <el-form-item  v-if="!form.only_api">
+                                    <span slot="label">
+                                        <el-tooltip content="生成菜单" placement="top">
+                                                <i class="el-icon-question"></i>
+                                            </el-tooltip>
+                                            生成菜单
+                                        </span>
+                                    <el-checkbox v-model="form.is_menu">是否生成菜单</el-checkbox>
+                            </el-form-item>
+                            
+                            <el-form-item label="上级菜单"  v-if="form.is_menu && !form.only_api">
+                                    <TreeSelect :treeData="menuOptions" :defaultValue="form.menu_pid" :defaultProps="normalizer" @getValue="getTreeValue" placeholder="选择上级菜单" />
+                            </el-form-item>
+                    </el-tab-pane>
                     <el-row type="flex" justify="end">
                         <el-col :offset="10">
                             <el-button type="primary" icon="el-icon-collection" @click="submit">保存</el-button>
                             <el-button icon="el-icon-close" @click="close">关闭</el-button>
                         </el-col>
                     </el-row>
+                    </el-tabs>
                 </el-card>
             </el-form>
         </el-dialog>
@@ -191,6 +234,7 @@ export default {
             loadingEdit: false,
             // 展示搜索
             showSearch: true,
+            activeTab : 'base',
             // 选中表数组
             ids: [],
             // 非单个禁用
@@ -224,7 +268,15 @@ export default {
                 menu_pid: 0,
                 table_name: '',
                 model_is_common: false,
-                back_module: '',
+                back_module: 'admin',
+                model_module: 'common',
+                is_controller:true,
+                controller_path:'',
+                is_model:true,
+                model_path:'',
+
+                is_validate:true,
+                validate_path:'',
             },
             // 添加弹窗参数
             addPreview: {
@@ -318,6 +370,10 @@ export default {
                 this.mainModelDetail = response.data.fieldlist
                 this.form.table_comment = response.data.table_comment
                 this.form.primaryKey = response.data.primaryKey
+
+                this.form.controller_path="app/"+this.form.back_module+"/controller/"+this.form.table_name;
+                this.form.model_path="app/"+this.form.model_module+"/model/"+this.form.table_name;
+                this.form.validate_path="app/"+this.form.back_module+"/validate/"+this.form.table_name;
             })
         },
 
-- 
Gitee


From 7d90ab8c2e1c2dea3325ba87df7c774189c3553c Mon Sep 17 00:00:00 2001
From: zhusai <909883663@qq.com>
Date: Sun, 23 Apr 2023 21:09:27 +0800
Subject: [PATCH 2/5] onlinecurd

---
 src/views/online/EditModelCom.vue |  35 +++---
 src/views/online/index.vue        | 186 +++++++++++++++---------------
 2 files changed, 113 insertions(+), 108 deletions(-)

diff --git a/src/views/online/EditModelCom.vue b/src/views/online/EditModelCom.vue
index 828e873..48c6d67 100644
--- a/src/views/online/EditModelCom.vue
+++ b/src/views/online/EditModelCom.vue
@@ -10,17 +10,17 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column label="字段备注" width="200" align="center">
+                <el-table-column label="字段描述" width="200" align="center">
                     <template slot-scope="scope">
                         <el-form-item :prop="'editDetail.' + scope.$index + '.comment'">
-                            <el-input v-model="scope.row.comment" placeholder="请输入表备注" size="small" @blur="editFormChange" ref="quickadmin" />
+                            <el-input v-model="scope.row.comment" placeholder="请输入字段描述" size="small" @blur="editFormChange" ref="quickadmin" />
                         </el-form-item>
                     </template>
                 </el-table-column>
                 <el-table-column label="控件类型" width="150" align="center">
                     <template slot-scope="scope">
                         <el-form-item :prop="'editDetail.' + scope.$index + '.form_type'">
-                            <el-select v-model="scope.row.form_type" placeholder="请选择" size="small" @blur="editFormChange">
+                            <el-select v-model="scope.row.form_type" placeholder="请选择" size="small" @blur="editFormChange" :disabled="scope.row.is_primary">
                                 <el-option v-for="item in is_subModel.result ? DictFormSubOptions : DictFormOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
                             </el-select>
                         </el-form-item>
@@ -32,15 +32,7 @@
                     </template>
                 </el-table-column>
                 <!-- 附表不需要编辑的字段 -->
-                <template v-if="!is_subModel.result">
-                    <el-table-column label="列表显示" width="100" align="center">
-                        <template slot-scope="scope">
-                            <el-form-item :prop="'editDetail.' + scope.$index + '.index_show'">
-                                <el-checkbox v-model="scope.row.index_show" @change="editFormChange"></el-checkbox>
-                            </el-form-item>
-                        </template>
-                    </el-table-column>
-                </template>
+           
                 <el-table-column label="是否查询" width="100" align="center">
                     <template slot-scope="scope">
                         <el-form-item :prop="'editDetail.' + scope.$index + '.is_query'">
@@ -59,27 +51,36 @@
                 </el-table-column>
                 <!-- 附表不需要编辑的字段 -->
                 <template v-if="!is_subModel.result">
-                    <el-table-column label="添加显示" width="100" align="center" v-if="false">
+
+                     <el-table-column label="列表显示" width="100" align="center">
+                        <template slot-scope="scope">
+                            <el-form-item :prop="'editDetail.' + scope.$index + '.index_show'">
+                                <el-checkbox v-model="scope.row.index_show" @change="editFormChange"></el-checkbox>
+                            </el-form-item>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column label="添加显示" width="100" align="center">
                         <template slot-scope="scope">
                             <el-form-item :prop="'editDetail.' + scope.$index + '.add_show'">
-                                <el-checkbox v-model="scope.row.add_show" @change="editFormChange"></el-checkbox>
+                                <el-checkbox v-model="scope.row.add_show" @change="editFormChange" :disabled="scope.row.is_primary"></el-checkbox>
                             </el-form-item>
                         </template>
                     </el-table-column>
                     <el-table-column label="编辑显示" width="100" align="center">
                         <template slot-scope="scope">
                             <el-form-item :prop="'editDetail.' + scope.$index + '.edit_show'">
-                                <el-checkbox v-model="scope.row.edit_show" @change="editFormChange"></el-checkbox>
+                                <el-checkbox v-model="scope.row.edit_show" @change="editFormChange" :disabled="scope.row.is_primary"></el-checkbox>
                             </el-form-item>
                         </template>
                     </el-table-column>
-                    <el-table-column label="是否只读" width="100" align="center">
+                    <!-- <el-table-column label="是否只读" width="100" align="center">
                         <template slot-scope="scope">
                             <el-form-item :prop="'editDetail.' + scope.$index + '.edit_only_read'">
                                 <el-checkbox v-model="scope.row.edit_only_read" @change="editFormChange" :disabled="!scope.row.edit_show"></el-checkbox>
                             </el-form-item>
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                     <el-table-column label="是否必填" width="100" align="center">
                         <template slot-scope="scope">
                             <el-form-item :prop="'editDetail.' + scope.$index + '.is_required'">
diff --git a/src/views/online/index.vue b/src/views/online/index.vue
index 7d41bb5..718809a 100644
--- a/src/views/online/index.vue
+++ b/src/views/online/index.vue
@@ -59,16 +59,38 @@
                 <el-card>
                     <el-tabs v-model="activeTab">
                          <el-tab-pane label="基础信息" name="base">
-                            <el-form-item label="表名称" prop="table_name">
-                                    <el-select v-model="form.table_name" placeholder="请选择" size="small" @change="tableNameChange" :disabled="id != null">
-                                        <el-option v-for="item in modelOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-                                    </el-select>
-                            </el-form-item>
-                               
-                            <el-form-item label="表描述" prop="table_comment">
-                                    <el-input v-model="form.table_comment" placeholder="请输入表描述" clearable size="small" />
-                            </el-form-item>
+                             <el-row>
+                                 <el-col :lg="8" :md="12" :sm="24" :xs="24">
+                                <el-form-item label="表名称" prop="table_name">
+                                        <el-select v-model="form.table_name" placeholder="请选择" size="small" @change="tableNameChange" :disabled="id != null">
+                                            <el-option v-for="item in modelOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+                                        </el-select>
+                                </el-form-item>
+                                 </el-col>
+                                
+                                 <el-col :lg="8" :md="12" :sm="24" :xs="24">
+                                <el-form-item label="表描述" prop="table_comment">
+                                        <el-input v-model="form.table_comment" placeholder="请输入表描述" clearable size="small" />
+                                </el-form-item>
+                                 </el-col>
+
+                             </el-row>
                             
+                         <!-- 编辑模型组件 -->
+                            <el-row>
+                                <EditModelCom :editDetail="mainModelDetail" :loading="loadingEdit" @editFormChange="editFormChange"  />
+                            </el-row>
+                            <!-- 追加模型组件 -->
+                            <el-row v-if="!form.only_api">
+                                <AddModelCom ref="addmodelcom" :mainModelDetail="mainModelDetail" :secondaryEditTableData="secondaryEditTableData" :secondaryEditMoreTableData="secondaryEditMoreTableData" @addFormChange="addFormChange" @editMoreFormChange="editMoreFormChangeOut" />
+                            </el-row>
+                          
+                         </el-tab-pane>
+
+                    
+
+                        <el-tab-pane label="生成配置" name="curd">
+             
                             <el-form-item label="项目应用" prop="back_module">
                                     <el-input v-model="form.back_module" placeholder="项目应用" clearable size="small" />
                             </el-form-item>
@@ -79,16 +101,36 @@
 
                             <el-form-item>
                                     <span slot="label">
-                                        <el-tooltip content="如果有同名文件将覆盖同名文件" placement="top">
+                                        删除模式
+                                    </span>
+                                    <el-radio-group v-model="form.deleteType" size="small" class="mr5">
+                                        <el-radio-button :label="1">软删除</el-radio-button>
+                                        <el-radio-button :label="2" selected>物理删除</el-radio-button>
+                                    </el-radio-group>
+                            </el-form-item>
+
+                            <el-form-item label="删除字段" prop="delete_time" v-if="form.deleteType==1" :rules="[{required:true,trigger:'blur',message:'请选择删除字段'}]">
+                                <el-select v-model="form.delete_time" placeholder="请选择" size="small" @change="tableNameChange" >
+                                            <el-option v-for="item in mainModelDetail" :key="item.field" :label="item.field" :value="item.field"> </el-option>
+                                        </el-select>
+                                   
+                            </el-form-item>
+
+                       
+                                
+                            <el-form-item>
+                                    <span slot="label">
+                                        <el-tooltip content="如果生成到项目，有同名文件将覆盖同名文件" placement="top">
                                             <i class="el-icon-question"></i>
                                         </el-tooltip>
                                         生成模式
                                     </span>
-                                    <el-checkbox v-model="form.is_force">是否强制生成</el-checkbox>
+                                    <el-radio-group v-model="form.buildType" size="small" class="mr5">
+                                        <el-radio-button :label="1">压缩包下载</el-radio-button>
+                                        <el-radio-button :label="2">生成到项目</el-radio-button>
+                                    </el-radio-group>
                             </el-form-item>
                                 
-                           
-                                
 
                            
                               
@@ -96,63 +138,8 @@
                                     <el-input v-model="form.back_module" placeholder="请输入所属应用" clearable size="small" />
                             </el-form-item>
                            
-                            <el-form-item>
-                                <span slot="label">
-                                    <el-tooltip content="是否位于common模块？" placement="top">
-                                        <i class="el-icon-question"></i>
-                                        </el-tooltip>
-                                            model位置
-                                        </span>
-                                    <el-checkbox v-model="form.model_is_common">是否位于common模块</el-checkbox>
-                            </el-form-item>
                           
-                         </el-tab-pane>
 
-                    <el-tab-pane label="字段" name="table">
-                        <!-- 编辑模型组件 -->
-                        <el-row>
-                            <EditModelCom :editDetail="mainModelDetail" :loading="loadingEdit" @editFormChange="editFormChange"  />
-                        </el-row>
-                        <!-- 追加模型组件 -->
-                        <el-row v-if="!form.only_api">
-                            <AddModelCom ref="addmodelcom" :mainModelDetail="mainModelDetail" :secondaryEditTableData="secondaryEditTableData" :secondaryEditMoreTableData="secondaryEditMoreTableData" @addFormChange="addFormChange" @editMoreFormChange="editMoreFormChangeOut" />
-                        </el-row>
-                    </el-tab-pane>
-
-                    <el-tab-pane label="生成配置" name="curd">
-                            <el-form-item>
-                                <span slot="label">
-                                        <el-tooltip content="controller是否生成，controller的路径（可修改）" placement="top">
-                                            <i class="el-icon-question"></i>
-                                        </el-tooltip>
-                                        controller
-                                </span>
-                                <el-checkbox v-model="form.is_controller">生成controller</el-checkbox>
-
-                                <el-input v-model="form.controller_path" placeholder="controller路径" clearable size="small" v-if="form.is_controller"/>
-                            </el-form-item>
-
-                            <el-form-item>
-                                <span slot="label">
-                                        <el-tooltip content="model是否生成，model的路径（可修改）" placement="top">
-                                            <i class="el-icon-question"></i>
-                                        </el-tooltip>
-                                        model
-                                </span>
-                                <el-checkbox v-model="form.is_model">生成model</el-checkbox>
-                                <el-input v-model="form.model_path" placeholder="model路径" clearable size="small" v-if="form.is_model"/>
-                            </el-form-item>
-
-                            <el-form-item>
-                                <span slot="label">
-                                        <el-tooltip content="validate是否生成，validate的路径（可修改）" placement="top">
-                                            <i class="el-icon-question"></i>
-                                        </el-tooltip>
-                                        validate
-                                </span>
-                                <el-checkbox v-model="form.is_validate">生成validate</el-checkbox>
-                                <el-input v-model="form.validate_path" placeholder="model路径" clearable size="small" v-if="form.is_validate"/>
-                            </el-form-item>
 
                             <el-form-item>
                                 <span slot="label">
@@ -175,7 +162,7 @@
                                     <el-checkbox v-model="form.is_menu">是否生成菜单</el-checkbox>
                             </el-form-item>
                             
-                            <el-form-item label="上级菜单"  v-if="form.is_menu && !form.only_api">
+                            <el-form-item label="所属菜单"  v-if="form.is_menu && !form.only_api" :rules="[{required:true,trigger:'blur',message:'请选择所属菜单'}]">
                                     <TreeSelect :treeData="menuOptions" :defaultValue="form.menu_pid" :defaultProps="normalizer" @getValue="getTreeValue" placeholder="选择上级菜单" />
                             </el-form-item>
                     </el-tab-pane>
@@ -270,13 +257,8 @@ export default {
                 model_is_common: false,
                 back_module: 'admin',
                 model_module: 'common',
-                is_controller:true,
-                controller_path:'',
-                is_model:true,
-                model_path:'',
-
-                is_validate:true,
-                validate_path:'',
+                deleteType:2,
+                buildType:1
             },
             // 添加弹窗参数
             addPreview: {
@@ -335,6 +317,25 @@ export default {
                 }
             },
         },
+        'form.buildType':{
+            handler(val){
+                if(val==2){
+                    this.$confirm(`代码生成到项目,如果有同名文件将会覆盖，确定选择此方式吗?`, '警告', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning',
+                    })
+                    .then(() => {
+                          
+                    }).then((data) => {
+                    //取消操作
+                    
+                    }).catch(err => {
+                        this.form.buildType=1;
+                    })
+                }
+            }
+        }
     },
     created() {
         this.getListTables()
@@ -370,10 +371,6 @@ export default {
                 this.mainModelDetail = response.data.fieldlist
                 this.form.table_comment = response.data.table_comment
                 this.form.primaryKey = response.data.primaryKey
-
-                this.form.controller_path="app/"+this.form.back_module+"/controller/"+this.form.table_name;
-                this.form.model_path="app/"+this.form.model_module+"/model/"+this.form.table_name;
-                this.form.validate_path="app/"+this.form.back_module+"/validate/"+this.form.table_name;
             })
         },
 
@@ -501,10 +498,11 @@ export default {
 
         // 提交
         submit() {
+
             if (process.env.NODE_ENV === 'production') {
                 return this.msgError('请到开发环境生成curd')
             }
-            const loading = this.fullLoading('生成中')
+         
 
             if (this.form.hasOwnProperty('editForm')) {
                 this.form.fieldlist = this.form.editForm.editDetail
@@ -519,16 +517,22 @@ export default {
                 this.form.relations = []
                 this.form.oneToManyRelations  =[];
             }
-
-            saveTable({ form: this.form, id: this.id })
-                .then(response => {
-                    this.msgSuccess('添加成功')
-                    this.close()
-                    windows.location.href = '/index'
-                })
-                .finally(() => {
-                    loading.close()
-                })
+            this.$refs['form'].validate(valid => {
+                if (valid) {
+                    const loading = this.fullLoading('生成中')
+                    saveTable({ form: this.form, id: this.id })
+                        .then(response => {
+                            this.msgSuccess('添加成功')
+                            this.close()
+                            windows.location.href = '/index'
+                        })
+                        .finally(() => {
+                            loading.close()
+                        })
+                }else{
+                    return false;
+                }
+            });
         },
 
         // 弹窗关闭
-- 
Gitee


From e888061dca2e4a3b0a6801445f9c533eb1a4e868 Mon Sep 17 00:00:00 2001
From: sunjiaming <sjm858@163.com>
Date: Thu, 4 May 2023 16:00:34 +0800
Subject: [PATCH 3/5] fix: selectPage component destroy

---
 .env.development                 | 2 +-
 src/views/example/curd/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index 4184b3a..a049679 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ NODE_ENV = 'development'
 
 # QuickAdmin管理系统/开发环境
 VUE_APP_BASE_API = ''
-VUE_APP_BASE_URL = 'http://qa-prod.demo.com'
+VUE_APP_BASE_URL = 'http://api.quickadmin.icu'
 
 # 开发环境 跨域匹配请求接口，只有匹配到以下接口，才代理请求
 VUE_APP_BASE_PROXY = ['/admin','/plugins','/addons']
diff --git a/src/views/example/curd/index.vue b/src/views/example/curd/index.vue
index 91f3952..60c97f1 100644
--- a/src/views/example/curd/index.vue
+++ b/src/views/example/curd/index.vue
@@ -186,7 +186,7 @@
             <pagination :total="total" :page.sync="pageInfo.page" :limit.sync="pageInfo.limit" @pagination="initIndex" />
         </el-card>
         <!-- 编辑弹窗 -->
-        <el-dialog :visible="editOpen" :before-close="beforeClose" :fullscreen="isFullScreen">
+        <el-dialog v-if="editOpen" :visible="editOpen" :before-close="beforeClose" :fullscreen="isFullScreen" >
             <template slot="title">
                 <div class="relative">
                     {{ !disabled ? '编辑' : '详情' }}
-- 
Gitee


From 74105668812998a516b296048a2b037767616ba4 Mon Sep 17 00:00:00 2001
From: sunjiaming <sjm858@163.com>
Date: Thu, 4 May 2023 20:15:11 +0800
Subject: [PATCH 4/5] fix: selectPage

---
 .env.development                            |  2 +-
 src/assets/styles/quickadmin.scss           |  6 +++---
 src/components/QuickAdminCom/selectPage.vue | 16 ++++++++++++++++
 src/views/example/curd/EditFormCom.vue      |  2 +-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/.env.development b/.env.development
index a049679..dabc54c 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ NODE_ENV = 'development'
 
 # QuickAdmin管理系统/开发环境
 VUE_APP_BASE_API = ''
-VUE_APP_BASE_URL = 'http://api.quickadmin.icu'
+VUE_APP_BASE_URL = 'http://demo-api.quickadmin.icu'
 
 # 开发环境 跨域匹配请求接口，只有匹配到以下接口，才代理请求
 VUE_APP_BASE_PROXY = ['/admin','/plugins','/addons']
diff --git a/src/assets/styles/quickadmin.scss b/src/assets/styles/quickadmin.scss
index b46e026..4b260d7 100644
--- a/src/assets/styles/quickadmin.scss
+++ b/src/assets/styles/quickadmin.scss
@@ -356,8 +356,8 @@ h6 {
 }
 
 /*curd--selectPage下拉框编辑 */
-.selectJob {
-    position: relative;
+// .selectJob {
+//     position: relative;
     .el-select-dropdown__list li.el-select-dropdown__item:nth-last-child(2) {
         //处理下拉框最后一个被分页隐藏问题
         height: 70px;
@@ -372,7 +372,7 @@ h6 {
         background: #fff;
         padding: 10px;
     }
-}
+// }
 
 .curd-image {
     width: 30px;
diff --git a/src/components/QuickAdminCom/selectPage.vue b/src/components/QuickAdminCom/selectPage.vue
index e74b3fe..f27bf6d 100644
--- a/src/components/QuickAdminCom/selectPage.vue
+++ b/src/components/QuickAdminCom/selectPage.vue
@@ -49,6 +49,11 @@ export default {
             type: Object,
             default: () => {},
         },
+        // 分页数据回显使用
+        otherData:{
+            type: Object,
+            default: () => {},
+        }
     },
     data() {
         return {
@@ -85,6 +90,12 @@ export default {
     },
     destroyed() {},
     methods: {
+        // 检查selectPage首页数据中是否有回显中的值
+        checkSelectPageDataIsValuable(array){
+           let newArray= array.find(item=>item[this.show_id]==this.value)
+           return Boolean(newArray)
+        },
+
         // 远程分页取值
         remoteMethod(keyword, step, query_value) {
             this.keyword = keyword
@@ -107,6 +118,11 @@ export default {
                     if (response.data.length > 0) {
                         this.has_next = true
                         this.selectPageOptions = response.data
+
+                        if(!this.checkSelectPageDataIsValuable(response.data)&&this.page===1){
+                            this.selectPageOptions.push({id:this.value,name:this.otherData.name})
+                        }
+
                     } else if (step === 'next') {
                         this.has_next = false
                         this.page--
diff --git a/src/views/example/curd/EditFormCom.vue b/src/views/example/curd/EditFormCom.vue
index 93da2cc..f9f1b3c 100644
--- a/src/views/example/curd/EditFormCom.vue
+++ b/src/views/example/curd/EditFormCom.vue
@@ -5,7 +5,7 @@
                 <el-input v-model="form.id" disabled />
             </el-form-item>
             <el-form-item label="分类:" prop="category_id">
-                <SelectPage v-model="form.category_id" :url="editFormParams.selectPage" :multiple="false" />
+                <SelectPage v-model="form.category_id" :otherData="form.category" :url="editFormParams.selectPage" :multiple="false" />
             </el-form-item>
             <el-form-item label="标题:" prop="title">
                 <el-input v-model="form.title" placeholder="请输入标题" clearable />
-- 
Gitee


From dab2dc0ed281948d2ca7056294259c3bfe931230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=B2=E4=BA=BA=E6=9D=B0=E6=A3=AE=E6=98=8E?=
 <sjm858@163.com>
Date: Thu, 19 Sep 2024 10:51:38 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8B=96=E6=8B=BD?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload/index.vue | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 48bb5e2..b6956d2 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -11,11 +11,18 @@
             :on-success="handleUploadSuccess"
             :show-file-list="false"
             :headers="headers"
+            :drag="drag"
             class="upload-file-uploader"
             ref="upload"
         >
             <!-- 上传按钮 -->
-            <el-button size="mini" type="primary" :disabled="disabled">选取文件</el-button>
+            <div v-if="!drag" class="text-left">
+                <el-button size="mini" type="primary" :disabled="disabled">选取文件</el-button>
+            </div>
+            <div v-if="drag" >
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+            </div>
             <!-- 上传提示 -->
             <div class="el-upload__tip" slot="tip" v-if="showTip">
                 请上传
@@ -72,6 +79,11 @@ export default {
             default: true,
         },
         disabled: Boolean,
+        // 是否支持拖拽
+        drag: {
+            type: Boolean,
+            default: false,
+        }
     },
     data() {
         return {
@@ -219,4 +231,10 @@ export default {
 .ele-upload-list__item-content-action .el-link {
     margin-right: 10px;
 }
+::v-deep  .el-upload,::v-deep .el-upload-dragger{
+    width: 100%;
+}
+.text-left{
+    text-align: left;
+}
 </style>
-- 
Gitee