所有 Link 链接 :underline="false" 统一更改为 :underline="never"

所有 Pagination 分页 small 统一更改为 size="small"
所有 Button 按钮 <el-button type="text" /> 更改位 <el-button type="primary" link />
优化 .my-query-box 样式，新增 .my-search-box 样式

Author: zhontai

src/modules/admin/ZhonTai.Admin.Core/HostApp.cs

@@ -421,6 +421,10 @@ private void ConfigureServices(IServiceCollection services, IWebHostEnvironment
             options.DefaultChallengeScheme = nameof(ResponseAuthenticationHandler); //401
             options.DefaultForbidScheme = nameof(ResponseAuthenticationHandler);    //403
         })
+        //.AddCookie(options =>
+        //{
+        //    options.Cookie.SameSite = SameSiteMode.Lax;
+        //})
         .AddJwtBearer(options =>
         {
             //ids4
@@ -889,13 +893,15 @@ private void ConfigureMiddleware(WebApplication app, IWebHostEnvironment env, IC
         //静态文件
         app.UseDefaultFiles();
         app.UseStaticFiles();
-      
+
         //路由
         app.UseRouting();
 
         //跨域
         app.UseCors();
 
+        //app.UseCookiePolicy(new CookiePolicyOptions { MinimumSameSitePolicy = SameSiteMode.Lax });
+
         //认证
         app.UseAuthentication();
 

ui/zhontai.ui.admin.vue3/src/api/login/index.ts

@@ -15,8 +15,8 @@
               <el-radio label="And">并且</el-radio>
               <el-radio label="Or">或者</el-radio>
             </el-radio-group>
-            <el-button type="text" icon="ele-Plus" @click="onAddGroup(data)" class="ml16">分组</el-button>
-            <el-button type="text" icon="ele-Plus" @click="onAddCondition(data)">条件</el-button>
+            <el-button type="primary" link icon="ele-Plus" @click="onAddGroup(data)" class="ml16">分组</el-button>
+            <el-button type="primary" link icon="ele-Plus" @click="onAddCondition(data)">条件</el-button>
             <el-button v-if="!data.root" icon="ele-Minus" class="ml8" @click="onDelete(node, data)" />
           </div>
         </template>

ui/zhontai.ui.admin.vue3/src/api/menu/index.ts

@@ -1,5 +1,5 @@
 <template>
-  <el-link :class="{ 'my-link--bold': bold }" type="primary" :underline="false" :href="href" v-bind="$attrs" @click.prevent.stop="onToPage()">
+  <el-link :class="{ 'my-link--bold': bold }" type="primary" underline="never" :href="href" v-bind="$attrs" @click.prevent.stop="onToPage()">
     <slot> </slot>
   </el-link>
 </template>

ui/zhontai.ui.admin.vue3/src/components/my-filter/index.vue

@@ -1,29 +1,29 @@
 <template>
   <div v-if="props.searchItems.length > 0">
     <el-form ref="formRef" :model="formState" :inline="true" label-width="auto" size="default">
-      <el-row>
+      <el-row :gutter="16">
         <!-- 动态渲染表单项 -->
         <el-col
           v-for="(item, index) in searchItems"
           v-show="index < visibleCount || isExpanded"
           :key="index"
-          :xs="24"
-          :sm="12"
-          :md="8"
-          :lg="6"
-          :xl="4"
-          class="my-flex"
+          :xs="col.xs"
+          :sm="col.sm"
+          :md="col.md"
+          :lg="col.lg"
+          :xl="col.xl"
+          class="w100"
         >
-          <el-form-item :label="item.label" :prop="item.field" :rules="item.rules" class="my-flex-fill">
+          <el-form-item :label="item.label" :prop="item.field" :rules="item.rules" class="w100">
             <component :is="item.componentName" v-model="formState[item.field]" clearable v-bind="item.attrs" class="w100" />
           </el-form-item>
         </el-col>
 
         <!-- 操作按钮区域 -->
-        <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="my-flex">
-          <el-form-item label-width="0px" class="my-flex-fill">
-            <div class="my-flex my-flex-fill">
-              <el-button v-if="showToggle" type="text" @click="onToggleExpanded">
+        <el-col :xs="col.xs" :sm="col.sm" :md="col.md" :lg="col.lg" :xl="col.xl">
+          <el-form-item label-width="0px">
+            <div class="my-flex">
+              <el-button v-if="showToggle" type="primary" link @click="onToggleExpanded">
                 {{ isExpanded ? '收起' : '展开' }}
                 <SvgIcon :name="isExpanded ? 'ele-ArrowUp' : 'ele-ArrowDown'" />
               </el-button>
@@ -38,20 +38,38 @@
 </template>
 
 <script setup lang="ts" name="coms/my-search">
-import { reactive, ref, computed, watchEffect } from 'vue'
+import { reactive, ref, computed, PropType } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
-import { cloneDeep } from 'lodash-es'
+import { cloneDeep, isInteger, mergeWith } from 'lodash-es'
 
 interface SearchItem {
+  label: string
   field: string
   operator: OperatorEnum
-  label: string
   rules?: FormRules
   componentName: string
   attrs?: EmptyObjectType
   defaultValue?: any
 }
 
+type BreakpointKey = 'xs' | 'sm' | 'md' | 'lg' | 'xl'
+
+type ColConfigType = {
+  [key in BreakpointKey]?: number
+}
+
+// 默认的 colConfig
+const defaultColConfig = {
+  xs: 24,
+  sm: 12,
+  md: 12,
+  lg: 8,
+  xl: 6,
+} as ColConfigType
+
+// 默认显示数量
+const DEFAULT_VISIBLE_COUNT = 3
+
 // 定义父组件传过来的值
 const props = defineProps({
   // 查询条件配置项
@@ -74,6 +92,28 @@ const props = defineProps({
     type: Boolean,
     default: () => true,
   },
+  colConfig: {
+    type: Object as PropType<ColConfigType>,
+    validator: (value: ColConfigType) => {
+      const invalidEntries = Object.entries(value).filter(([k, v]) => {
+        if (!['xs', 'sm', 'md', 'lg', 'xl'].includes(k)) {
+          console.warn(`无效的断点配置: ${k}`)
+          return true
+        }
+        if (!isInteger(v)) {
+          console.warn(`非整数值: ${k}=${v} (类型: ${typeof v})`)
+          return true
+        }
+        if (v < 1 || v > 24) {
+          console.warn(`超出范围: ${k}=${v} (允许范围: 1-24)`)
+          return true
+        }
+        return false
+      })
+
+      return invalidEntries.length === 0
+    },
+  },
 })
 
 // 定义子组件向父组件传值/事件
@@ -90,8 +130,9 @@ const formState = reactive<EmptyObjectType>(
   }, {})
 )
 
-// 默认显示数量
-const DEFAULT_VISIBLE_COUNT = 3
+const col = computed(() => {
+  return mergeWith({}, defaultColConfig, props.colConfig)
+})
 
 // 处理可见数量配置
 const visibleCount = computed(() => {

ui/zhontai.ui.admin.vue3/src/components/my-link/index.vue

@@ -9,7 +9,7 @@
       <LayoutParentView />
       <LayoutFooter v-if="isFooter" />
     </el-scrollbar>
-    <el-backtop :target="setBacktopClass" right="15" />
+    <el-backtop :target="setBacktopClass" :right="15" />
   </el-main>
 </template>
 

ui/zhontai.ui.admin.vue3/src/components/my-search/index.vue

@@ -3,7 +3,7 @@
     <template #header="{ titleId, titleClass }">
       <div class="my-flex my-flex-between mr20">
         <span :id="titleId" :class="titleClass">{{ $t('站内信') }}</span>
-        <el-link :underline="false" type="primary" class="f12" @click="onShowMore">查看更多</el-link>
+        <el-link underline="never" type="primary" class="f12" @click="onShowMore">查看更多</el-link>
       </div>
     </template>
 

ui/zhontai.ui.admin.vue3/src/layout/component/main.vue

@@ -137,16 +137,6 @@ export async function getBackEndControlRoutes() {
   } else {
     return []
   }
-  /*
-  // 模拟 admin 与 test
-  const stores = useUserInfo(pinia)
-  const { userInfos } = storeToRefs(stores)
-  const auth = userInfos.value.roles[0]
-  // 管理员 admin
-  if (auth === 'admin') return menuApi.getAdminMenu()
-  // 其它用户 test
-  else return menuApi.getTestMenu()
-  */
 }
 
 /**

ui/zhontai.ui.admin.vue3/src/layout/navBars/topBar/msg.vue

@@ -375,3 +375,6 @@
 .el-button--default i.fa {
   margin-right: 0px;
 }
+.el-button.is-link:hover {
+  color: var(--el-color-primary-light-3);
+}