From 1ec10991791e941f2237819dc36d56fad915ede2 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Sat, 14 Jun 2025 13:40:15 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(other):=20=E4=BF=AE=E5=A4=8D=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/template/modules/operate-drawer.vue.vm   |  43 ++++++--
 docs/template/modules/search.vue.vm           |  19 ++--
 src/components/custom/file-upload.vue         | 100 +++++++++---------
 src/components/custom/oss-upload.vue          |   2 +-
 src/components/custom/tinymce-editor.vue      |  36 +++++++
 src/constants/business.ts                     |   2 +-
 src/typings/components.d.ts                   |   2 +
 .../notice/modules/notice-operate-drawer.vue  |  24 +----
 8 files changed, 134 insertions(+), 94 deletions(-)
 create mode 100644 src/components/custom/tinymce-editor.vue

diff --git a/docs/template/modules/operate-drawer.vue.vm b/docs/template/modules/operate-drawer.vue.vm
index ca9c071b..b5478c01 100644
--- a/docs/template/modules/operate-drawer.vue.vm
+++ b/docs/template/modules/operate-drawer.vue.vm
@@ -52,7 +52,7 @@ function createDefaultModel(): Model {
   return {
 #foreach($column in $columns)
   #if($column.insert)
-    ${column.javaField}:#if($column.javaType == 'String') ''#else null#end#if($foreach.hasNext),#end
+    ${column.javaField}:#if($column.javaType == 'String' && $!column.dictType && $column.dictType == '') ''#else undefined#end#if($foreach.hasNext),#end
   #end
 #end
   };
@@ -91,16 +91,22 @@ function closeDrawer() {
 async function handleSubmit() {
   await validate();
 
+  #set($operateColumns = [])
+  #foreach($column in $columns)#if($column.insert || $column.edit)#set($dummy = $operateColumns.add($column))#end#end
+  const { #foreach($column in $operateColumns)$column.javaField#if($foreach.hasNext), #end#end } = model;
+
   // request
   if (props.operateType === 'add') {
-    const { #foreach($column in $columns)#if($column.insert)$column.javaField#if($foreach.hasNext), #end#end#end } = model;
-    const { error } = await fetchCreate${BusinessName}({ #foreach($column in $columns)#if($column.insert)$column.javaField#if($foreach.hasNext), #end#end#end });
+    #set($addFields = [])
+    #foreach($column in $columns)#if($column.insert)#set($dummy = $addFields.add($column.javaField))#end#end
+    const { error } = await fetchCreate${BusinessName}({ #foreach($field in $addFields)$field#if($foreach.hasNext), #end#end });
     if (error) return;
   }
 
   if (props.operateType === 'edit') {
-    const { #foreach($column in $columns)#if($column.edit)$column.javaField#if($foreach.hasNext), #end#end#end } = model;
-    const { error } = await fetchUpdate${BusinessName}({ #foreach($column in $columns)#if($column.edit)$column.javaField#if($foreach.hasNext), #end#end#end });
+    #set($editFields = [])
+    #foreach($column in $columns)#if($column.edit)#set($dummy = $editFields.add($column.javaField))#end#end
+    const { error } = await fetchUpdate${BusinessName}({ #foreach($field in $editFields)$field#if($foreach.hasNext), #end#end });
     if (error) return;
   }
 
@@ -170,13 +176,36 @@ watch(visible, () => {
               <NRadio value="0" label="请选择字典生成" />
             </NSpace>
           </NRadioGroup>
-        #elseif($column.htmlType == "datetime")
+        #elseif($column.htmlType == "checkbox" && "" != $dictType)
+          <NCheckboxGroup v-model:value="model.$column.javaField">
+            <NSpace>
+              <NCheckbox
+                v-for="option in ${column.dictType}Options"
+                :key="option.value"
+                :value="option.value"
+                :label="option.label"
+              />
+            </NSpace>
+          </NCheckboxGroup>
+        #elseif($column.htmlType == "checkbox" && $dictType)
+          <NCheckboxGroup v-model:value="model.$column.javaField">
+            <NSpace>
+              <NCheckbox value="0" label="请选择字典生成" />
+            </NSpace>
+          </NCheckboxGroup>
+        #elseif($column.htmlType == 'datetime')
           <NDatePicker
             v-model:formatted-value="model.$column.javaField"
-            type="date"
+            type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss"
             clearable
           />
+        #elseif($column.htmlType == "imageUpload")
+          <OssUpload v-model:value="model.$column.javaField" upload-type="image" />
+        #elseif($column.htmlType == "fileUpload")
+          <OssUpload v-model:value="model.$column.javaField" upload-type="file" />
+        #elseif($column.htmlType == "editor")
+          <TinymceEditor v-model:value="model.$column.javaField" />
 #else          <NInput v-model:value="model.$column.javaField" placeholder="请输入$column.columnComment" />
     #end
         </NFormItem>
diff --git a/docs/template/modules/search.vue.vm b/docs/template/modules/search.vue.vm
index 9f347973..21e56fd5 100644
--- a/docs/template/modules/search.vue.vm
+++ b/docs/template/modules/search.vue.vm
@@ -75,35 +75,28 @@ async function search() {
 #set($comment=$column.columnComment)
 #end
             <NFormItemGi span="24 s:12 m:6" label="$column.columnComment" path="$column.javaField" class="pr-24px">
-            #if(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+            #if(($tool.in($column.htmlType, "select", "radio", "checkbox")) && $dictType && "" != $dictType)
               <NSelect
                 v-model:value="model.$column.javaField"
                 placeholder="请选择$column.columnComment"
                 :options="${column.dictType}Options"
                 clearable
               />
-            #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+            #elseif($tool.in($column.htmlType, "select", "radio", "checkbox"))
               <NSelect
                 v-model:value="model.$column.javaField"
                 placeholder="请选择$column.columnComment"
                 :options="[]"
                 clearable
               />
-            #elseif($column.htmlType.equals('select') || $column.htmlType.equals('radio'))
-              <NSelect
-                v-model:value="model.$column.javaField"
-                placeholder="请选择$column.columnComment"
-                :options="[]"
-                clearable
-              />
-            #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+            #elseif($column.htmlType == 'datetime' && $column.queryType != "BETWEEN")
               <NDatePicker
                 v-model:formatted-value="model.$column.javaField"
-                type="date"
-                value-format="yyyy-MM-dd"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 clearable
               />
-            #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+            #elseif($column.htmlType == 'datetime' && $column.queryType == "BETWEEN")
               <NDatePicker
                 v-model:formatted-value="dateRange${AttrName}"
                 type="datetimerange"
diff --git a/src/components/custom/file-upload.vue b/src/components/custom/file-upload.vue
index 46a4b18c..000aca3a 100644
--- a/src/components/custom/file-upload.vue
+++ b/src/components/custom/file-upload.vue
@@ -127,55 +127,57 @@ async function handleRemove(file: UploadFileInfo) {
 </script>
 
 <template>
-  <NUpload
-    v-bind="attrs"
-    v-model:file-list="fileList"
-    :action="`${baseURL}${action}`"
-    :data="data"
-    :headers="headers"
-    :max="max"
-    :accept="accept"
-    :multiple="max > 1"
-    directory-dnd
-    :default-upload="defaultUpload"
-    :list-type="uploadType === 'image' ? 'image-card' : 'text'"
-    :is-error-state="isErrorState"
-    @finish="handleFinish"
-    @error="handleError"
-    @before-upload="beforeUpload"
-    @remove="({ file }) => handleRemove(file)"
-  >
-    <NUploadDragger v-if="uploadType === 'file'">
-      <div class="mb-12px flex-center">
-        <SvgIcon icon="material-symbols:unarchive-outline" class="text-58px color-#d8d8db dark:color-#a1a1a2" />
-      </div>
-      <NText class="text-16px">点击或者拖动文件到该区域来上传</NText>
-      <NP v-if="showTip" depth="3" class="mt-8px text-center">
-        请上传
-        <template v-if="fileSize">
-          大小不超过
-          <b class="text-red-500">{{ fileSize }}MB</b>
-        </template>
-        <template v-if="accept">
-          ，且格式为
-          <b class="text-red-500">{{ accept.replaceAll(',', '/') }}</b>
-        </template>
-        的文件
-      </NP>
-    </NUploadDragger>
-  </NUpload>
-  <NP v-if="showTip && uploadType === 'image'" depth="3" class="mt-12px">
-    请上传
-    <template v-if="fileSize">
-      大小不超过
-      <b class="text-red-500">{{ fileSize }}MB</b>
-    </template>
-    <template v-if="accept">
-      ，且格式为
-      <b class="text-red-500">{{ accept.replaceAll(',', '/') }}</b>
-    </template>
-    的文件
-  </NP>
+  <div class="w-full flex-col">
+    <NUpload
+      v-bind="attrs"
+      v-model:file-list="fileList"
+      :action="`${baseURL}${action}`"
+      :data="data"
+      :headers="headers"
+      :max="max"
+      :accept="accept"
+      :multiple="max > 1"
+      directory-dnd
+      :default-upload="defaultUpload"
+      :list-type="uploadType === 'image' ? 'image-card' : 'text'"
+      :is-error-state="isErrorState"
+      @finish="handleFinish"
+      @error="handleError"
+      @before-upload="beforeUpload"
+      @remove="({ file }) => handleRemove(file)"
+    >
+      <NUploadDragger v-if="uploadType === 'file'">
+        <div class="mb-12px flex-center">
+          <SvgIcon icon="material-symbols:unarchive-outline" class="text-58px color-#d8d8db dark:color-#a1a1a2" />
+        </div>
+        <NText class="text-16px">点击或者拖动文件到该区域来上传</NText>
+        <NP v-if="showTip" depth="3" class="mt-8px text-center">
+          请上传
+          <template v-if="fileSize">
+            大小不超过
+            <b class="text-red-500">{{ fileSize }}MB</b>
+          </template>
+          <template v-if="accept">
+            ，且格式为
+            <b class="text-red-500">{{ accept.replaceAll(',', '/') }}</b>
+          </template>
+          的文件
+        </NP>
+      </NUploadDragger>
+    </NUpload>
+    <NP v-if="showTip && uploadType === 'image'" depth="3" class="mt-12px">
+      请上传
+      <template v-if="fileSize">
+        大小不超过
+        <b class="text-red-500">{{ fileSize }}MB</b>
+      </template>
+      <template v-if="accept">
+        ，且格式为
+        <b class="text-red-500">{{ accept.replaceAll(',', '/') }}</b>
+      </template>
+      的文件
+    </NP>
+  </div>
 </template>
 
 <style scoped></style>
diff --git a/src/components/custom/oss-upload.vue b/src/components/custom/oss-upload.vue
index 953c7151..d4aa4f65 100644
--- a/src/components/custom/oss-upload.vue
+++ b/src/components/custom/oss-upload.vue
@@ -34,7 +34,7 @@ async function handleFetchOssList(ossIds: string[]) {
 watch(
   value,
   async val => {
-    const ossIds = val.split(',')?.filter(item => isNotNull(item));
+    const ossIds = val?.split(',')?.filter(item => isNotNull(item)) || [];
     const fileIds = new Set(fileList.value.filter(item => item.status === 'finished').map(item => item.id));
     if (ossIds.every(item => fileIds.has(item))) {
       return;
diff --git a/src/components/custom/tinymce-editor.vue b/src/components/custom/tinymce-editor.vue
new file mode 100644
index 00000000..d5bf7ca4
--- /dev/null
+++ b/src/components/custom/tinymce-editor.vue
@@ -0,0 +1,36 @@
+<script setup lang="ts">
+import { Tinymce } from '@sa/tinymce';
+import { getToken } from '@/store/modules/auth/shared';
+import { useAppStore } from '@/store/modules/app';
+import { useThemeStore } from '@/store/modules/theme';
+import { getServiceBaseURL } from '@/utils/service';
+
+defineOptions({
+  name: 'TinymceEditor'
+});
+
+const value = defineModel<string | null>('value', { required: false, default: '' });
+
+const appStore = useAppStore();
+const themeStore = useThemeStore();
+
+const isHttpProxy = import.meta.env.DEV && import.meta.env.VITE_HTTP_PROXY === 'Y';
+const { baseURL } = getServiceBaseURL(import.meta.env, isHttpProxy);
+
+const headers: Record<string, string> = {
+  Authorization: `Bearer ${getToken()}`,
+  clientid: import.meta.env.VITE_APP_CLIENT_ID!
+};
+</script>
+
+<template>
+  <Tinymce
+    v-model="value"
+    :lang="appStore.locale"
+    :is-dark="themeStore.darkMode"
+    :upload-url="`${baseURL}/resource/oss/upload`"
+    :upload-headers="headers"
+  />
+</template>
+
+<style scoped></style>
diff --git a/src/constants/business.ts b/src/constants/business.ts
index a9718f3a..c3cad440 100644
--- a/src/constants/business.ts
+++ b/src/constants/business.ts
@@ -76,7 +76,7 @@ export const genHtmlTypeRecord: Record<Api.Tool.HtmlType, string> = {
   select: '下拉框',
   radio: '单选框',
   checkbox: '复选框',
-  datetime: '日期控件',
+  datetime: '日期时间控件',
   imageUpload: '图片上传',
   fileUpload: '文件上传',
   editor: '富文本控件'
diff --git a/src/typings/components.d.ts b/src/typings/components.d.ts
index 6f73d735..ca6460e8 100644
--- a/src/typings/components.d.ts
+++ b/src/typings/components.d.ts
@@ -69,6 +69,7 @@ declare module 'vue' {
     NButton: typeof import('naive-ui')['NButton']
     NCard: typeof import('naive-ui')['NCard']
     NCheckbox: typeof import('naive-ui')['NCheckbox']
+    NCheckboxGroup: typeof import('naive-ui')['NCheckboxGroup']
     NCode: typeof import('naive-ui')['NCode']
     NCollapse: typeof import('naive-ui')['NCollapse']
     NCollapseItem: typeof import('naive-ui')['NCollapseItem']
@@ -146,6 +147,7 @@ declare module 'vue' {
     TableSiderLayout: typeof import('./../components/advanced/table-sider-layout.vue')['default']
     TenantSelect: typeof import('./../components/custom/tenant-select.vue')['default']
     ThemeSchemaSwitch: typeof import('./../components/common/theme-schema-switch.vue')['default']
+    TinymceEditor: typeof import('./../components/custom/tinymce-editor.vue')['default']
     UserSelect: typeof import('./../components/custom/user-select.vue')['default']
     WaveBg: typeof import('./../components/custom/wave-bg.vue')['default']
   }
diff --git a/src/views/system/notice/modules/notice-operate-drawer.vue b/src/views/system/notice/modules/notice-operate-drawer.vue
index cc05dff5..22e10ee8 100644
--- a/src/views/system/notice/modules/notice-operate-drawer.vue
+++ b/src/views/system/notice/modules/notice-operate-drawer.vue
@@ -1,12 +1,7 @@
 <script setup lang="ts">
 import { computed, reactive, watch } from 'vue';
-import { Tinymce } from '@sa/tinymce';
 import { fetchCreateNotice, fetchUpdateNotice } from '@/service/api/system/notice';
-import { getToken } from '@/store/modules/auth/shared';
-import { useAppStore } from '@/store/modules/app';
-import { useThemeStore } from '@/store/modules/theme';
 import { useFormRules, useNaiveForm } from '@/hooks/common/form';
-import { getServiceBaseURL } from '@/utils/service';
 import { $t } from '@/locales';
 
 defineOptions({
@@ -32,17 +27,6 @@ const visible = defineModel<boolean>('visible', {
   default: false
 });
 
-const appStore = useAppStore();
-const themeStore = useThemeStore();
-
-const isHttpProxy = import.meta.env.DEV && import.meta.env.VITE_HTTP_PROXY === 'Y';
-const { baseURL } = getServiceBaseURL(import.meta.env, isHttpProxy);
-
-const headers: Record<string, string> = {
-  Authorization: `Bearer ${getToken()}`,
-  clientid: import.meta.env.VITE_APP_CLIENT_ID!
-};
-
 const { formRef, validate, restoreValidation } = useNaiveForm();
 const { createRequiredRule } = useFormRules();
 
@@ -139,13 +123,7 @@ watch(visible, () => {
           <DictRadio v-model:value="model.noticeType" dict-code="sys_notice_type" />
         </NFormItem>
         <NFormItem label="公告内容" path="noticeContent">
-          <Tinymce
-            v-model="model.noticeContent"
-            :lang="appStore.locale"
-            :is-dark="themeStore.darkMode"
-            :upload-url="`${baseURL}/resource/oss/upload`"
-            :upload-headers="headers"
-          />
+          <TinymceEditor v-model:value="model.noticeContent" />
         </NFormItem>
         <NFormItem label="公告状态" path="status">
           <DictRadio v-model:value="model.status" dict-code="sys_normal_disable" />

From f0810bce4ca75bb22908b64b5d03766f11d12322 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Sat, 14 Jun 2025 13:42:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix(other):=20=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=A8=A1=E6=9D=BF=20dateRangeTime=20=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/template/modules/search.vue.vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/template/modules/search.vue.vm b/docs/template/modules/search.vue.vm
index 21e56fd5..b6bfa5ce 100644
--- a/docs/template/modules/search.vue.vm
+++ b/docs/template/modules/search.vue.vm
@@ -50,7 +50,7 @@ async function search() {
         #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
   if (dateRange${AttrName}.value?.length) {
     model.value.params!.begin${AttrName} = dateRange${AttrName}.value[0];
-    model.value.params!.end${AttrName} = dateRange${AttrName}.value[0];
+    model.value.params!.end${AttrName} = dateRange${AttrName}.value[1];
   }
     #end
 #end

From 031b7f698a71c59b739d3ebbc9da43602eca7110 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Mon, 16 Jun 2025 17:56:25 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(projects):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9C=AA=E4=BB=8E=E7=8E=AF=E5=A2=83=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E8=8E=B7=E5=8F=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/route/index.ts             | 15 ++-------------
 src/views/_builtin/social-callback/index.vue |  2 +-
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/store/modules/route/index.ts b/src/store/modules/route/index.ts
index d45391bb..21aec092 100644
--- a/src/store/modules/route/index.ts
+++ b/src/store/modules/route/index.ts
@@ -42,16 +42,7 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
   const authRouteMode = ref(import.meta.env.VITE_AUTH_ROUTE_MODE);
 
   /** Home route key */
-  const routeHome = ref(import.meta.env.VITE_ROUTE_HOME);
-
-  /**
-   * Set route home
-   *
-   * @param routeKey Route key
-   */
-  function setRouteHome(routeKey: LastLevelRouteKey) {
-    routeHome.value = routeKey;
-  }
+  const routeHome = ref(import.meta.env.VITE_ROUTE_HOME || 'home');
 
   /** constant routes */
   const constantRoutes = shallowRef<ElegantConstRoute[]>([]);
@@ -303,9 +294,7 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
 
       handleConstantAndAuthRoutes();
 
-      setRouteHome('home');
-
-      handleUpdateRootRouteRedirect('home');
+      handleUpdateRootRouteRedirect(routeHome.value);
 
       setIsInitAuthRoute(true);
     } else {
diff --git a/src/views/_builtin/social-callback/index.vue b/src/views/_builtin/social-callback/index.vue
index d71443df..6b16e248 100644
--- a/src/views/_builtin/social-callback/index.vue
+++ b/src/views/_builtin/social-callback/index.vue
@@ -31,7 +31,7 @@ const processResponse = async () => {
     msg.value = '登录成功，1s 后即将跳转至首页';
   }, 1000);
   setTimeout(() => {
-    routerPushByKey('home');
+    routerPushByKey(import.meta.env.VITE_ROUTE_HOME || 'home');
   }, 1000);
 };