feat: 完成代码生成模板(1.0)

docs/java/VelocityUtils.java

@@ -1,3 +1,42 @@
+    /**
+     * 设置模板变量信息
+     *
+     * @return 模板列表
+     */
+    public static VelocityContext prepareContext(GenTable genTable) {
+        String moduleName = genTable.getModuleName();
+        String businessName = genTable.getBusinessName();
+        String packageName = genTable.getPackageName();
+        String tplCategory = genTable.getTplCategory();
+        String functionName = genTable.getFunctionName();
+
+        VelocityContext velocityContext = new VelocityContext();
+        velocityContext.put("tplCategory", genTable.getTplCategory());
+        velocityContext.put("tableName", genTable.getTableName());
+        velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "【请填写功能名称】");
+        velocityContext.put("ClassName", genTable.getClassName());
+        velocityContext.put("className", StringUtils.uncapitalize(genTable.getClassName()));
+        velocityContext.put("moduleName", genTable.getModuleName());
+        velocityContext.put("BusinessName", StringUtils.capitalize(genTable.getBusinessName()));
+        velocityContext.put("businessName", genTable.getBusinessName());
+        velocityContext.put("basePackage", getPackagePrefix(packageName));
+        velocityContext.put("packageName", packageName);
+        velocityContext.put("author", genTable.getFunctionAuthor());
+        velocityContext.put("datetime", DateUtils.getDate());
+        velocityContext.put("pkColumn", genTable.getPkColumn());
+        velocityContext.put("importList", getImportList(genTable));
+        velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName));
+        velocityContext.put("columns", genTable.getColumns());
+        velocityContext.put("table", genTable);
+        velocityContext.put("dicts", getDicts(genTable));
+        velocityContext.put("dictList", getDictList(genTable));
+        setMenuVelocityContext(velocityContext, genTable);
+        if (GenConstants.TPL_TREE.equals(tplCategory)) {
+            setTreeVelocityContext(velocityContext, genTable);
+        }
+        return velocityContext;
+    }
+
     /**
      * 获取模板信息
      *
@@ -26,6 +65,8 @@
         templates.add("vm/ts/types.ts.vm");
         templates.add("vm/soybean/typings/soy.api.d.ts.vm");
         templates.add("vm/soybean/api/soy.api.ts.vm");
+        templates.add("vm/soybean/modules/soy.search.vue.vm");
+        templates.add("vm/soybean/modules/soy.operate-drawer.vue.vm");
         if (GenConstants.TPL_CRUD.equals(tplCategory)) {
             templates.add("vm/vue/index.vue.vm");
             templates.add("vm/soybean/soy.index.vue.vm");
@@ -69,6 +110,10 @@
             fileName = StringUtils.format("soybean/typings/api/{}.d.ts", moduleName);
         } else if (template.contains("soy.api.ts.vm")) {
             fileName = StringUtils.format("soybean/api/{}/{}.ts", moduleName, businessName);
+        } else if (template.contains("soy.search.vue.vm")) {
+            fileName = StringUtils.format("soybean/views/{}/{}/modules/search.vue", moduleName, businessName);
+        } else if (template.contains("soy.operate-drawer.vue.vm")) {
+            fileName = StringUtils.format("soybean/views/{}/{}/modules/operate-drawer.vue", moduleName, businessName);
         } else if (template.contains("mapper.java.vm")) {
             fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className);
         } else if (template.contains("service.java.vm")) {
@@ -92,3 +137,36 @@
         }
         return fileName;
     }
+
+    /**
+     * 根据列类型获取字典组
+     *
+     * @param genTable 业务表对象
+     * @return 返回字典组
+     */
+    public static Set<Map<String, Object>> getDictList(GenTable genTable) {
+        List<GenTableColumn> columns = genTable.getColumns();
+        Set<Map<String, Object>> dicts = new HashSet<>();
+        addDictList(dicts, columns);
+        return dicts;
+    }
+
+    /**
+     * 添加字典列表
+     *
+     * @param dicts   字典列表
+     * @param columns 列集合
+     */
+    public static void addDictList(Set<Map<String, Object>> dicts, List<GenTableColumn> columns) {
+        for (GenTableColumn column : columns) {
+            if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny(
+                column.getHtmlType(),
+                new String[]{GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX})) {
+                Map<String, Object> dict = new HashMap<>();
+                dict.put("type", column.getDictType());
+                dict.put("name", StringUtils.toCamelCase(column.getDictType()));
+                dict.put("immediate", !column.isList());
+                dicts.add(dict);
+            }
+        }
+    }

docs/template/api/soy.api.ts.vm

@@ -1,7 +1,7 @@
 import { request } from '@/service/request';
 
 /** 获取${functionName}列表 */
-export function fetchGet${BusinessName}List(params?: Api.System.${BusinessName}SearchParams) {
+export function fetchGet${BusinessName}List (params?: Api.System.${BusinessName}SearchParams) {
     return request<Api.${ModuleName}.${BusinessName}List>({
         url: '/${moduleName}/${businessName}/list',
         method: 'get',
@@ -10,7 +10,7 @@ export function fetchGet${BusinessName}List(params?: Api.System.${BusinessName}S
 }
 
 /** 新增${functionName} */
-export function fetchCreate${BusinessName}(data: Api.${ModuleName}.${BusinessName}OperateParams) {
+export function fetchCreate${BusinessName} (data: Api.${ModuleName}.${BusinessName}OperateParams) {
     return request<boolean>({
         url: '/${moduleName}/${businessName}',
         method: 'post',
@@ -19,7 +19,7 @@ export function fetchCreate${BusinessName}(data: Api.${ModuleName}.${BusinessNam
 }
 
 /** 修改${functionName} */
-export function fetchUpdate${BusinessName}(data: Api.${ModuleName}.${BusinessName}OperateParams) {
+export function fetchUpdate${BusinessName} (data: Api.${ModuleName}.${BusinessName}OperateParams) {
     return request<boolean>({
         url: '/${moduleName}/${businessName}',
         method: 'put',
@@ -28,7 +28,7 @@ export function fetchUpdate${BusinessName}(data: Api.${ModuleName}.${BusinessNam
 }
 
 /** 批量删除${functionName} */
-export function fetchDelete${BusinessName}(${pkColumn.javaField}s: CommonType.IdType[]) {
+export function fetchDelete${BusinessName} (${pkColumn.javaField}s: CommonType.IdType[]) {
     return request<boolean>({
         url: `/${moduleName}/${businessName}/${${pkColumn.javaField}s.join(',')}`,
         method: 'delete'

docs/template/modules/soy.operate-drawer.vue.vm

@@ -0,0 +1,195 @@
+<script setup lang="ts">
+import { computed, reactive, watch } from 'vue';
+import { useFormRules, useNaiveForm } from '@/hooks/common/form';
+import { $t } from '@/locales';
+import { fetchCreate${BusinessName}, fetchUpdate${BusinessName} } from '@/service/api/${moduleName}/${businessName}';
+
+defineOptions({
+  name: '${BusinessName}OperateDrawer'
+});
+
+interface Props {
+  /** the type of operation */
+  operateType: NaiveUI.TableOperateType;
+  /** the edit row data */
+  rowData?: Api.$ModuleName.${BusinessName} | null;
+}
+
+const props = defineProps<Props>();
+
+interface Emits {
+  (e: 'submitted'): void;
+}
+
+const emit = defineEmits<Emits>();
+
+const visible = defineModel<boolean>('visible', {
+  default: false
+});
+
+#if($dictList && $dictList.size() > 0)
+#foreach($dict in $dictList)
+const { options: ${dict.name}Options } = useDict(${dict.type}#if($dict.immediate), false#end);
+#end#end
+
+const { formRef, validate, restoreValidation } = useNaiveForm();
+const { createRequiredRule } = useFormRules();
+
+const title = computed(() => {
+  const titles: Record<NaiveUI.TableOperateType, string> = {
+    add: '新增${functionName}',
+    edit: '编辑${functionName}'
+  };
+  return titles[props.operateType];
+});
+
+type Model = Api.$ModuleName.${BusinessName}OperateParams;
+
+const model: Model = reactive(createDefaultModel());
+
+function createDefaultModel(): Model {
+  return {
+#foreach($column in $columns)
+  #if($column.insert)
+    ${column.javaField}:#if($column.javaType == 'String') ''#else null#end#if($foreach.hasNext),#end
+  #end
+#end
+  };
+}
+
+type RuleKey = Extract<
+  keyof Model,
+#foreach($column in $columns)
+#if($column.required)
+  | '$column.javaField'#if($foreach.hasNext)#end
+#end#end>;
+
+const rules: Record<RuleKey, App.Global.FormRule> = {
+#foreach($column in $columns)
+#if($column.required)
+  $column.javaField: createRequiredRule('${column.columnComment}不能为空')#if($foreach.hasNext),#end
+#end
+#end
+};
+
+function handleUpdateModelWhenEdit() {
+  if (props.operateType === 'add') {
+    Object.assign(model, createDefaultModel());
+    return;
+  }
+
+  if (props.operateType === 'edit' && props.rowData) {
+    Object.assign(model, props.rowData);
+  }
+}
+
+function closeDrawer() {
+  visible.value = false;
+}
+
+async function handleSubmit() {
+  await validate();
+
+  // request
+  if (props.operateType === 'add') {
+    const { #foreach($column in $columns)#if($column.insert)$column.javaType#if($foreach.hasNext), #end#end#end } = model;
+    const { error } = await fetchCreate${BusinessName}({ #foreach($column in $columns)#if($column.insert)$column.javaType#if($foreach.hasNext), #end#end#end });
+    if (error) return;
+  }
+
+  if (props.operateType === 'edit') {
+    const { #foreach($column in $columns)#if($column.edit)$column.javaType#if($foreach.hasNext), #end#end#end } = model;
+    const { error } = await fetchUpdate${BusinessName}({ #foreach($column in $columns)#if($column.edit)$column.javaType#if($foreach.hasNext), #end#end#end });
+    if (error) return;
+  }
+
+  window.$message?.success($t('common.updateSuccess'));
+  closeDrawer();
+  emit('submitted');
+}
+
+watch(visible, () => {
+  if (visible.value) {
+    handleUpdateModelWhenEdit();
+    restoreValidation();
+  }
+});
+</script>
+
+<template>
+  <NDrawer v-model:show="visible" :title="title" display-directive="show" :width="800" class="max-w-90%">
+    <NDrawerContent :title="title" :native-scrollbar="false" closable>
+      <NForm ref="formRef" :model="model" :rules="rules">
+#foreach($column in $columns)
+#set($field=$column.javaField)
+#if(($column.insert || $column.edit) && !$column.pk)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#set($dictType=$column.dictType)
+        <NFormItem label="$column.columnComment" path="$column.javaField">
+        #if($column.htmlType == "textarea" || $column.htmlType == "editor")
+          <NInput
+            v-model:value="model.$column.javaField"
+            :rows="3"
+            type="textarea"
+            :placeholder="请输入$column.columnComment"
+          />
+        #elseif($column.htmlType == "select" && "" != $dictType)
+          <NSelect
+            v-model:value="model.$column.javaField"
+            placeholder="请选择$column.columnComment"
+            :options="${column.dictType}Options"
+            clearable
+          />
+        #elseif($column.htmlType == "select" && $dictType)
+          <NSelect
+            v-model:value="model.$column.javaField"
+            placeholder="请选择$column.columnComment"
+            :options="[]"
+            clearable
+          />
+        #elseif($column.htmlType == "radio" && "" != $dictType)
+          <NRadioGroup v-model:value="model.$column.javaField">
+            <NSpace>
+              <NRadio
+                v-for="option in ${column.dictType}Options"
+                :key="option.value"
+                :value="option.value"
+                :label="option.label"
+              />
+            </NSpace>
+          </NRadioGroup>
+        #elseif($column.htmlType == "radio" && $dictType)
+          <NRadioGroup v-model:value="model.$column.javaField">
+            <NSpace>
+              <NRadio value="0" label="请选择字典生成" />
+            </NSpace>
+          </NRadioGroup>
+        #elseif($column.htmlType == "datetime")
+          <NDatePicker
+            v-model:formatted-value="model.$column.javaField"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            clearable
+          />
+#else              <NInput v-model:value="model.$column.javaField" placeholder="请输入$column.columnComment" />
+    #end
+        </NFormItem>
+#end
+#end
+      </NForm>
+      <template #footer>
+        <NSpace :size="16">
+          <NButton @click="closeDrawer">{{ $t('common.cancel') }}</NButton>
+          <NButton type="primary" @click="handleSubmit">{{ $t('common.confirm') }}</NButton>
+        </NSpace>
+      </template>
+    </NDrawerContent>
+  </NDrawer>
+</template>
+
+<style scoped></style>

docs/template/modules/soy.search.vue.vm

@@ -0,0 +1,137 @@
+#set($ModuleName=$moduleName.substring(0, 1).toUpperCase() + $moduleName.substring(1))
+<script setup lang="ts">
+import { ref } from 'vue';
+import { $t } from '@/locales';
+import { useNaiveForm } from '@/hooks/common/form';
+
+defineOptions({
+  name: '${BusinessName}Search'
+});
+
+interface Emits {
+  (e: 'reset'): void;
+  (e: 'search'): void;
+}
+
+const emit = defineEmits<Emits>();
+
+const { formRef, validate, restoreValidation } = useNaiveForm();
+
+#foreach ($column in $columns)
+    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+        #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+const dateRange${AttrName} = ref<[string, string]>();
+    #end
+#end
+
+const model = defineModel<Api.$ModuleName.${BusinessName}SearchParams>('model', { required: true });
+
+#if($dictList && $dictList.size() > 0)
+#foreach($dict in $dictList)
+const { options: ${dict.name}Options } = useDict(${dict.type}#if($dict.immediate), false#end);
+#end#end
+async function reset() {
+#foreach ($column in $columns)
+    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+        #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+  const dateRange${AttrName}.value = undefined;
+    #end
+#end
+  await restoreValidation();
+  emit('reset');
+}
+
+async function search() {
+  await validate();
+#foreach ($column in $columns)
+    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+        #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];
+  }
+    #end
+#end
+  emit('search');
+}
+</script>
+
+<template>
+  <NCard :bordered="false" size="small" class="card-wrapper">
+    <NCollapse>
+      <NCollapseItem :title="$t('common.search')" name="user-search">
+        <NForm ref="formRef" :model="model" :rules="rules" label-placement="left" :label-width="80">
+          <NGrid responsive="screen" item-responsive>
+#foreach($column in $columns)
+#if($column.query)
+#set($dictType=$column.dictType)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#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)
+              <NSelect
+                v-model:value="model.$column.javaField"
+                placeholder="请选择$column.columnComment"
+                :options="${column.dictType}Options"
+                clearable
+              />
+            #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+              <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")
+              <NDatePicker
+                v-model:formatted-value="model.$column.javaField"
+                type="date"
+                value-format="yyyy-MM-dd"
+                clearable
+              />
+            #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+              <NDatePicker
+                v-model:formatted-value="dateRange${AttrName}"
+                type="datetimerange"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                clearable
+              />
+#else              <NInput v-model:value="model.$column.javaField" placeholder="请输入$column.columnComment" />
+    #end
+            </NFormItemGi>
+  #end
+#end
+            <NFormItemGi span="24" class="pr-24px">
+              <NSpace class="w-full" justify="end">
+                <NButton @click="reset">
+                  <template #icon>
+                    <icon-ic-round-refresh class="text-icon" />
+                  </template>
+                  {{ $t('common.reset') }}
+                </NButton>
+                <NButton type="primary" ghost @click="search">
+                  <template #icon>
+                    <icon-ic-round-search class="text-icon" />
+                  </template>
+                  {{ $t('common.search') }}
+                </NButton>
+              </NSpace>
+            </NFormItemGi>
+      </NGrid>
+    </NForm>
+  </NCard>
+</template>
+
+<style scoped></style>

docs/template/soy.index.vue.vm

@@ -7,6 +7,10 @@ import { useTable, useTableOperate } from '@/hooks/common/table';
 import ${BusinessName}OperateDrawer from './modules/${businessName}-operate-drawer.vue';
 import ${BusinessName}Search from './modules/${businessName}-search.vue';
 
+defineOptions({
+  name: '${BusinessName}List'
+});
+
 const appStore = useAppStore();
 
 const {
@@ -113,7 +117,7 @@ async function edit(id: number) {
 <template>
   <div class="min-h-500px flex-col-stretch gap-16px overflow-hidden lt-sm:overflow-auto">
     <${BusinessName}Search v-model:model="searchParams" @reset="resetSearchParams" @search="getDataByPage" />
-    <NCard title="${functionName}" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
+    <NCard title="${functionName}列表" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
       <template #header-extra>
         <TableHeaderOperation
           v-model:columns="columnChecks"

docs/template/typings/soy.api.d.ts.vm

@@ -1,4 +1,5 @@
-#set($ModuleName=$moduleName.substring(0, 1).toUpperCase() + $moduleName.substring(1))
+#set($BaseEntity = ['createDept', 'createBy', 'createTime', 'updateBy', 'updateTime'])
+#set($ModuleName = $moduleName.substring(0, 1).toUpperCase() + $moduleName.substring(1))
 /**
  * namespace ${ModuleName}
  *
@@ -7,7 +8,7 @@
 namespace ${ModuleName} {
     /** ${businessName} */
     type ${BusinessName} = Api.Common.CommonRecord<{
-        #foreach($column in $columns)#if($column.insert || $column.edit)
+        #foreach($column in $columns)#if(!$BaseEntity.contains($column.javaField))
         /** $column.columnComment */
         $column.javaField:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) CommonType.IdType; #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number; #elseif($column.javaType == 'Boolean') boolean; #else string; #end
         #end#end
@@ -18,20 +19,24 @@ namespace ${ModuleName} {
       Pick<
         Api.${ModuleName}.${BusinessName},
         #foreach($column in $columns)
-            #if($column.query)
-                #set($dictType=$column.dictType)
-                #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-                #set($parentheseIndex=$column.columnComment.indexOf("（"))
-                #if($parentheseIndex != -1)
-                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
-                #else
-                #set($comment=$column.columnComment)
-                #end
-#if($foreach.hasNext)        |#end '${column.javaField}'
+            #if($column.query && $column.queryType != 'BETWEEN')
+        | '${column.javaField}'
             #end
         #end
       > &
-        Api.Common.CommonSearchParams
+        Api.Common.CommonSearchParams<${BusinessName}>
+    >;
+
+    /** ${businessName} operate params */
+    type ${BusinessName}OperateParams = Api.CommonType.RecordNullable<
+      Pick<
+        Api.${ModuleName}.${BusinessName},
+        #foreach($column in $columns)
+            #if($column.insert || $column.edit)
+        | '${column.javaField}'
+            #end
+        #end
+      >
     >;
 
     /** ${businessName} list */

src/components/common/app-provider.vue

@@ -1,7 +1,9 @@
 <script setup lang="ts">
-import { createTextVNode, defineComponent } from 'vue';
+import { createTextVNode, defineComponent, onMounted } from 'vue';
 import { useDialog, useLoadingBar, useMessage, useNotification } from 'naive-ui';
 import useContentLoading from '@/hooks/common/loading';
+import { initWebSocket } from '@/utils/websocket';
+import { initSSE } from '@/utils/sse';
 
 defineOptions({
   name: 'AppProvider'
@@ -25,6 +27,12 @@ const ContextHolder = defineComponent({
     return () => createTextVNode();
   }
 });
+
+onMounted(() => {
+  const protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://';
+  initWebSocket(`${protocol + window.location.host + import.meta.env.VITE_APP_BASE_API}/resource/websocket`);
+  initSSE(`${import.meta.env.VITE_APP_BASE_API}/resource/sse`);
+});
 </script>
 
 <template>

src/hooks/business/dict.ts

@@ -1,9 +1,11 @@
-import { ref } from 'vue';
+import { ref, watch } from 'vue';
+import { storeToRefs } from 'pinia';
 import { fetchGetDictDataByType } from '@/service/api/system';
 import { useDictStore } from '@/store/modules/dict';
 
 export function useDict(dictType: string, immediate: boolean = true) {
   const dictStore = useDictStore();
+  const { dictData: dictList } = storeToRefs(dictStore);
 
   const data = ref<Api.System.DictData[]>([]);
   const record = ref<Record<string, string>>({});
@@ -43,6 +45,17 @@ export function useDict(dictType: string, immediate: boolean = true) {
       getRecord();
       getOptions();
     });
+  } else {
+    watch(
+      () => dictList.value[dictType],
+      val => {
+        if (val && val.length) {
+          getRecord();
+          getOptions();
+        }
+      },
+      { immediate: true }
+    );
   }
 
   return {

src/layouts/base-layout/index.vue

@@ -1,11 +1,9 @@
 <script setup lang="ts">
-import { computed, defineAsyncComponent, onMounted } from 'vue';
+import { computed, defineAsyncComponent } from 'vue';
 import { AdminLayout, LAYOUT_SCROLL_EL_ID } from '@sa/materials';
 import type { LayoutMode } from '@sa/materials';
 import { useAppStore } from '@/store/modules/app';
 import { useThemeStore } from '@/store/modules/theme';
-import { initWebSocket } from '@/utils/websocket';
-import { initSSE } from '@/utils/sse';
 import GlobalHeader from '../modules/global-header/index.vue';
 import GlobalSider from '../modules/global-sider/index.vue';
 import GlobalTab from '../modules/global-tab/index.vue';
@@ -102,12 +100,6 @@ function getSiderCollapsedWidth() {
 
   return w;
 }
-
-onMounted(() => {
-  const protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://';
-  initWebSocket(`${protocol + window.location.host + import.meta.env.VITE_APP_BASE_API}/resource/websocket`);
-  initSSE(`${import.meta.env.VITE_APP_BASE_API}/resource/sse`);
-});
 </script>
 
 <template>

src/typings/api/api.d.ts

@@ -21,7 +21,12 @@ declare namespace Api {
     }
 
     /** common search params of table */
-    type CommonSearchParams = Pick<Common.PaginatingCommonParams, 'pageNum' | 'pageSize'>;
+    type CommonSearchParams<T = any> = Pick<Common.PaginatingCommonParams, 'pageNum' | 'pageSize'> &
+      CommonType.RecordNullable<{
+        orderByColumn: keyof T;
+        isAsc: 'asc' | 'desc';
+        params: { [key: string]: any };
+      }>;
 
     /**
      * 启用状态

src/typings/api/system.api.d.ts

@@ -10,8 +10,6 @@ declare namespace Api {
    * backend api module: "system"
    */
   namespace System {
-    type CommonSearchParams = Pick<Common.PaginatingCommonParams, 'pageNum' | 'pageSize'>;
-
     /** role */
     type Role = Common.CommonRecord<{
       /** 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限） */
@@ -40,7 +38,7 @@ declare namespace Api {
 
     /** role search params */
     type RoleSearchParams = CommonType.RecordNullable<
-      Pick<Role, 'roleName' | 'roleKey' | 'status'> & CommonSearchParams
+      Pick<Role, 'roleName' | 'roleKey' | 'status'> & Common.CommonSearchParams<Role>
     >;
 
     /** role list */
@@ -93,7 +91,7 @@ declare namespace Api {
 
     /** user search params */
     type UserSearchParams = CommonType.RecordNullable<
-      Pick<User, 'userName' | 'sex' | 'nickName' | 'phonenumber' | 'email' | 'status'> & CommonSearchParams
+      Pick<User, 'userName' | 'sex' | 'nickName' | 'phonenumber' | 'email' | 'status'> & Common.CommonSearchParams<User>
     >;
 
     /** user list */

src/views/system/menu/modules/menu-operate-drawer.vue

@@ -40,8 +40,8 @@ const visible = defineModel<boolean>('visible', {
   default: false
 });
 
-const { options: showHideOptions, getOptions: getShowHideOptions } = useDict('sys_show_hide', false);
-const { options: enableStatusOptions, getOptions: getNormalDisableOptions } = useDict('sys_normal_disable', false);
+const { options: showHideOptions } = useDict('sys_show_hide', false);
+const { options: enableStatusOptions } = useDict('sys_normal_disable');
 
 const iconType = ref<Api.System.IconType>('1');
 const { formRef, validate, restoreValidation } = useNaiveForm();
@@ -217,9 +217,6 @@ watch(visible, () => {
   if (visible.value) {
     handleInitModel();
     restoreValidation();
-    getShowHideOptions();
-    getShowHideOptions();
-    getNormalDisableOptions();
   }
 });
 

src/views/tool/gen/modules/gen-table-preview-drawer.vue

@@ -70,7 +70,9 @@ const genMap: Api.Tool.GenTablePreview = {
   'vm/sql/sql.vm': 'sql',
   'vm/soybean/api/soy.api.ts.vm': 'api.ts',
   'vm/soybean/typings/soy.api.d.ts.vm': 'type.d.ts',
-  'vm/soybean/soy.index.vue.vm': 'index.vue'
+  'vm/soybean/soy.index.vue.vm': 'index.vue',
+  'vm/soybean/modules/soy.search.vue.vm': 'search.vue',
+  'vm/soybean/modules/soy.operate-drawer.vue.vm': 'operate-drawer.vue'
 };
 
 function getGenLanguage(name: string) {