Merge branch 'master' of https://gitee.com/youlaiorg/vue3-element-admin into feature/noticews

2024-09-05 09:48:33 +08:00
parent d0f31715c4 baab1cc6a1
commit 59db084bf1
9 changed files with 131 additions and 51 deletions
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -77,7 +77,7 @@ class UserAPI {
   */
  static resetPassword(id: number, password: string) {
    return request({
-      url: `${USER_BASE_URL}/${id}/password`,
+      url: `${USER_BASE_URL}/${id}/password/reset`,
      method: "put",
      params: { password: password },
    });
--- a/src/assets/logo.png
+++ b/src/assets/logo.png
--- a/src/components/MenuSearch/index.vue
+++ b/src/components/MenuSearch/index.vue
@@ -147,6 +147,11 @@ interface SearchItem {
  }
 }

+.search-content {
+  max-height: 400px;
+  overflow-y: auto;
+}
+
 .search-space {
  padding: 20px;
  color: #999;
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -96,7 +96,7 @@ function changeLayout(layout: string) {
 /** 重新激活顶部菜单 */
 function againActiveTop(newVal: string) {
  const parent = findOutermostParent(permissionStore.routes, newVal);
-  if (appStore.activeTopMenu !== parent.path) {
+  if (appStore.activeTopMenuPath !== parent.path) {
    appStore.activeTopMenu(parent.path);
  }
 }
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -97,15 +97,16 @@
          v-show="active == 0"
          :model="genConfigFormData"
          :label-width="100"
+          :rules="genConfigFormRules"
        >
          <el-row>
            <el-col :span="12">
-              <el-form-item label="表名">
+              <el-form-item label="表名" prop="tableName">
                <el-input v-model="genConfigFormData.tableName" readonly />
              </el-form-item>
            </el-col>
            <el-col :span="12">
-              <el-form-item label="业务名">
+              <el-form-item label="业务名" prop="businessName">
                <el-input
                  v-model="genConfigFormData.businessName"
                  placeholder="用户"
@@ -116,18 +117,18 @@

          <el-row>
            <el-col :span="12">
-              <el-form-item label="模块名">
+              <el-form-item label="包名" prop="packageName">
                <el-input
-                  v-model="genConfigFormData.moduleName"
-                  placeholder="system"
+                  v-model="genConfigFormData.packageName"
+                  placeholder="com.youlai.boot"
                />
              </el-form-item>
            </el-col>
            <el-col :span="12">
-              <el-form-item label="包名">
+              <el-form-item label="模块名" prop="moduleName">
                <el-input
-                  v-model="genConfigFormData.packageName"
-                  placeholder="com.youlai.boot"
+                  v-model="genConfigFormData.moduleName"
+                  placeholder="system"
                />
              </el-form-item>
            </el-col>
@@ -135,7 +136,7 @@

          <el-row>
            <el-col :span="12">
-              <el-form-item label="实体名">
+              <el-form-item label="实体名" prop="entityName">
                <el-input
                  v-model="genConfigFormData.entityName"
                  placeholder="User"
@@ -154,7 +155,23 @@

          <el-row>
            <el-col :span="12">
-              <el-form-item label="上级菜单">
+              <el-form-item>
+                <template #label>
+                  <div class="flex-y-between">
+                    <span>上级菜单</span>
+                    <el-tooltip effect="dark">
+                      <template #content>
+                        选择上级菜单，生成代码后会自动创建对应菜单。
+                        <br />
+                        注意1：生成菜单后需分配权限给角色，否则菜单将无法显示。
+                        <br />
+                        注意2：演示环境默认不生成菜单，如需生成，请在本地部署数据库。
+                      </template>
+                      <i-ep-QuestionFilled class="cursor-pointer" />
+                    </el-tooltip>
+                  </div>
+                </template>
+
                <el-tree-select
                  v-model="genConfigFormData.parentMenuId"
                  placeholder="选择上级菜单"
@@ -435,6 +452,13 @@ import GeneratorAPI, {
 import DictAPI from "@/api/dict";
 import MenuAPI from "@/api/menu";

+interface TreeNode {
+  label: string;
+  content?: string;
+  children?: TreeNode[];
+}
+const treeData = ref<TreeNode[]>([]);
+
 const queryFormRef = ref(ElForm);
 const queryParams = reactive<TablePageQuery>({
  pageNum: 1,
@@ -455,6 +479,14 @@ const genConfigFormData = ref<GenConfigForm>({
  fieldConfigs: [],
 });

+const genConfigFormRules = {
+  tableName: [{ required: true, message: "请输入表名", trigger: "blur" }],
+  businessName: [{ required: true, message: "请输入业务名", trigger: "blur" }],
+  packageName: [{ required: true, message: "请输入包名", trigger: "blur" }],
+  moduleName: [{ required: true, message: "请输入模块名", trigger: "blur" }],
+  entityName: [{ required: true, message: "请输入实体名", trigger: "blur" }],
+};
+
 const dialog = reactive({
  visible: false,
  title: "",
@@ -473,12 +505,12 @@ const active = ref(0);
 const currentTableName = ref("");
 const sortFlag = ref<Object>();

-interface TreeNode {
-  label: string;
-  content?: string;
-  children?: TreeNode[];
-}
-const treeData = ref<TreeNode[]>([]);
+// 查询是否全选
+const isCheckAllQuery = ref(false);
+// 列表是否全选
+const isCheckAllList = ref(false);
+// 表单是否全选
+const isCheckAllForm = ref(false);

 watch(active, (val) => {
  if (val === 0) {
@@ -550,6 +582,7 @@ const setNodeSort = (oldIndex: number, newIndex: number) => {
  });
 };

+/** 上一步 */
 function handlePrevClick() {
  if (active.value === 2) {
    //这里需要重新获取一次数据，如果第一次生成代码后，再次点击上一步，数据不重新获取，再次点击下一步，会再次插入数据，导致索引重复报错
@@ -571,6 +604,7 @@ function handlePrevClick() {
  if (active.value-- <= 0) active.value = 0;
 }

+/** 下一步 */
 function handleNextClick() {
  if (active.value === 0) {
    initSort();
@@ -680,6 +714,7 @@ function handleResetConfig(tableName: string) {

 type FieldConfigKey = "isShowInQuery" | "isShowInList" | "isShowInForm";

+/** 全选 */
 const toggleCheckAll = (key: FieldConfigKey, value: boolean) => {
  const fieldConfigs = genConfigFormData.value?.fieldConfigs;

@@ -690,10 +725,6 @@ const toggleCheckAll = (key: FieldConfigKey, value: boolean) => {
  }
 };

-const isCheckAllQuery = ref(false);
-const isCheckAllList = ref(false);
-const isCheckAllForm = ref(false);
-
 const checkAllSelected = (key: keyof FieldConfig, isCheckAllRef: any) => {
  const fieldConfigs = genConfigFormData.value?.fieldConfigs || [];
  isCheckAllRef.value = fieldConfigs.every(
@@ -740,7 +771,6 @@ function buildTree(
    const parts = item.path.split(separator);

    // 定义特殊路径
-    // TODO: 如果菜单有多个节点，需要将此菜单作为独立一级的节点，而不是合并到上一级。 按照此规则， com.youlai.system 则是三个节点，而不是合并到一起，但是这里需要将 com.youlai.system 合并到一起，所以需要特殊处理
    const specialPaths = [
      "src" + separator + "main",
      "java",
@@ -753,8 +783,6 @@ function buildTree(
      ).replace(/\./g, separator),
    ];

-    console.log("specialPaths", specialPaths);
-
    // 检查路径中的特殊部分并合并它们
    const mergedParts: string[] = [];
    let buffer: string[] = [];