Merge branch 'youlaitech:master' into master

Author: Ninjaxsh

src/api/config.ts

@@ -81,7 +81,7 @@ export interface ConfigForm {
   id?: number;
   /** 配置名称 */
   configName?: string;
-  /** 配置key */
+  /** 配置键 */
   configKey?: string;
   /** 配置值 */
   configValue?: string;
@@ -95,7 +95,7 @@ export interface ConfigPageVO {
   id?: number;
   /** 配置名称 */
   configName?: string;
-  /** 配置key */
+  /** 配置键 */
   configKey?: string;
   /** 配置值 */
   configValue?: string;

src/api/generator.ts

@@ -38,6 +38,14 @@ class GeneratorAPI {
       method: "get",
     });
   }
+
+  /** 重置代码配置 */
+  static resetGenConfig(tableName: string) {
+    return request({
+      url: `${GENERATOR_BASE_URL}/${tableName}/config`,
+      method: "delete",
+    });
+  }
 }
 
 export default GeneratorAPI;
@@ -99,6 +107,9 @@ export interface GenConfigForm {
   /** 作者 */
   author?: string;
 
+  /** 上级菜单 */
+  parentMenuId?: number;
+
   /** 字段配置列表 */
   fieldConfigs?: FieldConfig[];
 }

src/views/generator/index.vue

@@ -45,7 +45,7 @@
         />
         <el-table-column label="创建时间" align="center" prop="createTime" />
 
-        <el-table-column fixed="right" label="操作" width="150">
+        <el-table-column fixed="right" label="操作" width="200">
           <template #default="scope">
             <el-button
               type="primary"
@@ -54,7 +54,17 @@
               @click="handleOpenDialog(scope.row.tableName)"
             >
               <i-ep-MagicStick />
-              生成
+              生成代码
+            </el-button>
+
+            <el-button
+              type="danger"
+              size="small"
+              link
+              @click="handleResetConfig(scope.row.tableName)"
+            >
+              <i-ep-RefreshLeft />
+              重置配置
             </el-button>
           </template>
         </el-table-column>
@@ -72,7 +82,7 @@
     <el-drawer
       v-model="dialog.visible"
       :title="dialog.title"
-      @close="handleCloseDialog"
+      @close="dialog.visible = false"
       size="80%"
     >
       <el-steps :active="active" align-center finish-status="success" simple>
@@ -91,33 +101,51 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="业务名">
-                <el-input v-model="formData.businessName" />
+                <el-input v-model="formData.businessName" placeholder="用户" />
               </el-form-item>
             </el-col>
           </el-row>
 
           <el-row>
             <el-col :span="12">
               <el-form-item label="模块名">
-                <el-input v-model="formData.moduleName" />
+                <el-input v-model="formData.moduleName" placeholder="system" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="包名">
-                <el-input v-model="formData.packageName" />
+                <el-input
+                  v-model="formData.packageName"
+                  placeholder="com.youlai.boot"
+                />
               </el-form-item>
             </el-col>
           </el-row>
 
           <el-row>
             <el-col :span="12">
               <el-form-item label="实体名">
-                <el-input v-model="formData.entityName" />
+                <el-input v-model="formData.entityName" placeholder="User" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="作者">
-                <el-input v-model="formData.author" />
+                <el-input v-model="formData.author" placeholder="youlai" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="父菜单">
+                <el-tree-select
+                  v-model="formData.parentMenuId"
+                  placeholder="选择父菜单"
+                  :data="menuOptions"
+                  filterable
+                  check-strictly
+                  :render-after-expand="false"
+                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -351,6 +379,7 @@ import GeneratorAPI, {
 } from "@/api/generator";
 
 import DictAPI from "@/api/dict";
+import MenuAPI from "@/api/menu";
 
 const queryFormRef = ref(ElForm);
 
@@ -366,6 +395,7 @@ const formData = ref<GenConfigForm>({});
 const formTypeOptions: Record<string, OptionType> = FormTypeEnum;
 const queryTypeOptions: Record<string, OptionType> = QueryTypeEnum;
 const dictOptions = ref<OptionType[]>();
+const menuOptions = ref<OptionType[]>([]);
 
 const dialog = reactive({
   visible: false,
@@ -452,27 +482,42 @@ function handleResetQuery() {
   handleQuery();
 }
 
-function handleCloseDialog() {
-  dialog.visible = false;
-}
-
 /** 打开弹窗 */
-function handleOpenDialog(tableName: string) {
+async function handleOpenDialog(tableName: string) {
   dialog.visible = true;
 
+  menuOptions.value = await MenuAPI.getOptions();
+
   // 获取字典数据
   DictAPI.getList().then((data) => {
     dictOptions.value = data;
+    loading.value = true;
 
-    GeneratorAPI.getGenConfig(tableName).then((data) => {
-      dialog.title = `${tableName} 代码生成`;
-      formData.value = data;
-      if (formData.value.id) {
-        active.value = 2;
-        handlePreview(tableName);
-      } else {
-        active.value = 0;
-      }
+    GeneratorAPI.getGenConfig(tableName)
+      .then((data) => {
+        dialog.title = `${tableName} 代码生成`;
+        formData.value = data;
+        if (formData.value.id) {
+          active.value = 2;
+          handlePreview(tableName);
+        } else {
+          active.value = 0;
+        }
+      })
+      .finally(() => {
+        loading.value = false;
+      });
+  });
+}
+
+/** 重置配置 */
+function handleResetConfig(tableName: string) {
+  ElMessageBox.confirm("确定要重置配置吗？", "提示", {
+    type: "warning",
+  }).then(() => {
+    GeneratorAPI.resetGenConfig(tableName).then(() => {
+      ElMessage.success("重置成功");
+      handleQuery();
     });
   });
 }

src/views/system/config/index.vue

@@ -6,7 +6,7 @@
         <el-form-item label="关键字" prop="keywords">
           <el-input
             v-model="queryParams.keywords"
-            placeholder="请输入配置key\配置名称"
+            placeholder="请输入配置键\配置名称"
             clearable
             @keyup.enter="handleQuery"
           />
@@ -60,7 +60,7 @@
         />
         <el-table-column
           key="configKey"
-          label="配置key"
+          label="配置键"
           prop="configKey"
           min-width="100"
         />
@@ -129,13 +129,22 @@
           <el-input
             v-model="formData.configName"
             placeholder="请输入配置名称"
+            :maxlength="50"
           />
         </el-form-item>
-        <el-form-item label="配置key" prop="configKey">
-          <el-input v-model="formData.configKey" placeholder="请输入配置key" />
+        <el-form-item label="配置键" prop="configKey">
+          <el-input
+            v-model="formData.configKey"
+            placeholder="请输入配置键"
+            :maxlength="50"
+          />
         </el-form-item>
         <el-form-item label="配置值" prop="configValue">
-          <el-input v-model="formData.configValue" placeholder="请输入配置值" />
+          <el-input
+            v-model="formData.configValue"
+            placeholder="请输入配置值"
+            :maxlength="100"
+          />
         </el-form-item>
         <el-form-item label="描述" prop="remark">
           <el-input
@@ -246,6 +255,7 @@ function handleOpenDialog(id?: number) {
     });
   } else {
     dialog.title = "新增系统配置";
+    formData.id = undefined;
   }
 }