Merge branch 'main' into feature/plugin-runtime

halo-dev · Sep 11, 2023 · 57d8662 · 57d8662
2 parents fed1636 + e13563b
commit 57d8662
Show file tree

Hide file tree

Showing 15 changed files with 123 additions and 19 deletions.
diff --git a/api/src/main/java/run/halo/app/infra/SystemSetting.java b/api/src/main/java/run/halo/app/infra/SystemSetting.java
@@ -79,6 +79,7 @@ public static class Post {
         Integer categoryPageSize;
         Integer tagPageSize;
         Boolean review;
+        String slugGenerationStrategy;
     }
 
     @Data

diff --git a/application/src/main/java/run/halo/app/actuator/GlobalInfoEndpoint.java b/application/src/main/java/run/halo/app/actuator/GlobalInfoEndpoint.java
@@ -53,6 +53,7 @@ public GlobalInfo globalInfo() {
                 handleCommentSetting(info, configMap);
                 handleUserSetting(info, configMap);
                 handleBasicSetting(info, configMap);
+                handlePostSlugGenerationStrategy(info, configMap);
             }));
 
         return info;
@@ -81,6 +82,8 @@ public static class GlobalInfo {
 
         private boolean dataInitialized;
 
+        private String postSlugGenerationStrategy;
+
         private List<SocialAuthProvider> socialAuthProviders;
     }
 
@@ -123,6 +126,13 @@ private void handleUserSetting(GlobalInfo info, ConfigMap configMap) {
         }
     }
 
+    private void handlePostSlugGenerationStrategy(GlobalInfo info, ConfigMap configMap) {
+        var post = SystemSetting.get(configMap, SystemSetting.Post.GROUP, SystemSetting.Post.class);
+        if (post != null) {
+            info.setPostSlugGenerationStrategy(post.getSlugGenerationStrategy());
+        }
+    }
+
     private void handleBasicSetting(GlobalInfo info, ConfigMap configMap) {
         var basic = SystemSetting.get(configMap, Basic.GROUP, Basic.class);
         if (basic != null) {

diff --git a/application/src/main/resources/extensions/system-configurable-configmap.yaml b/application/src/main/resources/extensions/system-configurable-configmap.yaml
@@ -31,7 +31,8 @@ data:
       "postPageSize": 10,
       "archivePageSize": 10,
       "categoryPageSize": 10,
-      "tagPageSize": 10
+      "tagPageSize": 10,
+      "slugGenerationStrategy": "generateByTitle"
     }
   comment: |
     {
@@ -42,4 +43,4 @@ data:
   menu: |
     {
       "primary": "primary"
-    }
+    }
diff --git a/application/src/main/resources/extensions/system-setting.yaml b/application/src/main/resources/extensions/system-setting.yaml
@@ -55,6 +55,19 @@ spec:
           min: 1
           max: 100
           validation: required
+        - $formkit: select
+          label: "别名生成策略"
+          name: slugGenerationStrategy
+          value: 'generateByTitle'
+          options:
+            - label: '根据标题'
+              value: 'generateByTitle'
+            - label: '时间戳'
+              value: 'timestamp'
+            - label: 'Short UUID'
+              value: 'shortUUID'
+            - label: 'UUID'
+              value: 'UUID'
     - group: seo
       label: SEO 设置
       formSchema:

diff --git a/console/package.json b/console/package.json
@@ -92,6 +92,7 @@
     "pinia": "^2.1.6",
     "pretty-bytes": "^6.0.0",
     "qs": "^6.11.1",
+    "short-unique-id": "^5.0.2",
     "transliteration": "^2.3.5",
     "vue": "^3.3.4",
     "vue-demi": "^0.14.5",

diff --git a/console/pnpm-lock.yaml b/console/pnpm-lock.yaml
diff --git a/console/src/composables/use-slugify.ts b/console/src/composables/use-slugify.ts
@@ -1,26 +1,63 @@
 import { slugify } from "transliteration";
 import { watch, type Ref } from "vue";
+import ShortUniqueId from "short-unique-id";
+import { FormType } from "@/types/slug";
+import { useGlobalInfoStore } from "@/stores/global-info";
+import { randomUUID } from "@/utils/id";
+const uid = new ShortUniqueId();
+const Strategy = {
+  generateByTitle: (value: string) => {
+    if (!value) return "";
+    return slugify(value, { trim: true });
+  },
+  shortUUID: (value: string) => {
+    if (!value) return "";
+    return uid.randomUUID(8);
+  },
+  UUID: (value: string) => {
+    if (!value) return "";
+    return randomUUID();
+  },
+  timestamp: (value: string) => {
+    if (!value) return "";
+    return new Date().getTime().toString();
+  },
+};
+
+const onceList = ["shortUUID", "UUID", "timestamp"];
+
 export default function useSlugify(
   source: Ref<string>,
   target: Ref<string>,
-  auto: Ref<boolean>
+  auto: Ref<boolean>,
+  formType: FormType
 ) {
   watch(
     () => source.value,
     () => {
       if (auto.value) {
-        handleGenerateSlug();
+        handleGenerateSlug(false, formType);
       }
     }
   );
 
-  const handleGenerateSlug = () => {
-    if (!source.value) {
+  const handleGenerateSlug = (forceUpdate = false, formType: FormType) => {
+    const globalInfoStore = useGlobalInfoStore();
+    const mode = globalInfoStore.globalInfo?.postSlugGenerationStrategy;
+
+    if (!mode) {
+      return;
+    }
+    if (formType != FormType.POST) {
+      target.value = Strategy["generateByTitle"](source.value);
+      return;
+    }
+    if (forceUpdate) {
+      target.value = Strategy[mode](source.value);
       return;
     }
-    target.value = slugify(source.value, {
-      trim: true,
-    });
+    if (onceList.includes(mode) && target.value) return;
+    target.value = Strategy[mode](source.value);
   };
 
   return {

diff --git a/console/src/modules/contents/pages/components/SinglePageSettingModal.vue b/console/src/modules/contents/pages/components/SinglePageSettingModal.vue
@@ -19,6 +19,7 @@ import AnnotationsForm from "@/components/form/AnnotationsForm.vue";
 import useSlugify from "@/composables/use-slugify";
 import { useI18n } from "vue-i18n";
 import { usePageUpdateMutate } from "../composables/use-page-update-mutate";
+import { FormType } from "@/types/slug";
 
 const initialFormState: SinglePage = {
   spec: {
@@ -277,7 +278,8 @@ const { handleGenerateSlug } = useSlugify(
       formState.value.spec.slug = value;
     },
   }),
-  computed(() => !isUpdateMode.value)
+  computed(() => !isUpdateMode.value),
+  FormType.SINGLE_PAGE
 );
 </script>
 
@@ -331,7 +333,7 @@ const { handleGenerateSlug } = useSlugify(
                     $t('core.page.settings.fields.slug.refresh_message')
                   "
                   class="group flex h-full cursor-pointer items-center border-l px-3 transition-all hover:bg-gray-100"
-                  @click="handleGenerateSlug"
+                  @click="handleGenerateSlug(true, FormType.SINGLE_PAGE)"
                 >
                   <IconRefreshLine
                     class="h-4 w-4 text-gray-500 group-hover:text-gray-700"

diff --git a/console/src/modules/contents/posts/categories/components/CategoryEditingModal.vue b/console/src/modules/contents/posts/categories/components/CategoryEditingModal.vue
@@ -24,6 +24,7 @@ import { useThemeCustomTemplates } from "@/modules/interface/themes/composables/
 import AnnotationsForm from "@/components/form/AnnotationsForm.vue";
 import useSlugify from "@/composables/use-slugify";
 import { useI18n } from "vue-i18n";
+import { FormType } from "@/types/slug";
 
 const props = withDefaults(
   defineProps<{
@@ -199,7 +200,8 @@ const { handleGenerateSlug } = useSlugify(
       formState.value.spec.slug = value;
     },
   }),
-  computed(() => !isUpdateMode.value)
+  computed(() => !isUpdateMode.value),
+  FormType.CATEGORY
 );
 </script>
 <template>
@@ -260,7 +262,7 @@ const { handleGenerateSlug } = useSlugify(
                     )
                   "
                   class="group flex h-full cursor-pointer items-center border-l px-3 transition-all hover:bg-gray-100"
-                  @click="handleGenerateSlug"
+                  @click="handleGenerateSlug(true, FormType.CATEGORY)"
                 >
                   <IconRefreshLine
                     class="h-4 w-4 text-gray-500 group-hover:text-gray-700"

diff --git a/console/src/modules/contents/posts/components/PostSettingModal.vue b/console/src/modules/contents/posts/components/PostSettingModal.vue
@@ -19,6 +19,7 @@ import { submitForm } from "@formkit/core";
 import useSlugify from "@/composables/use-slugify";
 import { useI18n } from "vue-i18n";
 import { usePostUpdateMutate } from "../composables/use-post-update-mutate";
+import { FormType } from "@/types/slug";
 
 const initialFormState: Post = {
   spec: {
@@ -240,7 +241,8 @@ const { handleGenerateSlug } = useSlugify(
       formState.value.spec.slug = value;
     },
   }),
-  computed(() => !isUpdateMode.value)
+  computed(() => !isUpdateMode.value),
+  FormType.POST
 );
 </script>
 <template>
@@ -293,7 +295,7 @@ const { handleGenerateSlug } = useSlugify(
                     $t('core.post.settings.fields.slug.refresh_message')
                   "
                   class="group flex h-full cursor-pointer items-center border-l px-3 transition-all hover:bg-gray-100"
-                  @click="handleGenerateSlug"
+                  @click="handleGenerateSlug(true, FormType.POST)"
                 >
                   <IconRefreshLine
                     class="h-4 w-4 text-gray-500 group-hover:text-gray-700"