Merge remote-tracking branch 'origin/develop' into develop

admin/src/components/overflow-tooltip/index.vue

@@ -1,16 +1,37 @@
 <template>
     <div>
-        <el-tooltip v-bind="props" :disabled="disabled" placement="top" :teleported="false">
-            <div ref="textRef" class="overflow-text truncate">{{ content }}</div>
+        <el-tooltip v-bind="props" :disabled="disabled">
+            <div
+                ref="textRef"
+                class="overflow-text truncate"
+                :style="{ textOverflow: overfloType }"
+            >
+                {{ content }}
+            </div>
         </el-tooltip>
     </div>
 </template>
 
 <script lang="ts" setup>
 import { useEventListener } from '@vueuse/core'
-import { useTooltipContentProps } from 'element-plus'
+import { useTooltipContentProps, type Placement } from 'element-plus'
+import type { PropType } from 'vue'
 
-const props = defineProps(useTooltipContentProps)
+const props = defineProps({
+    ...useTooltipContentProps,
+    teleported: {
+        type: Boolean,
+        default: false
+    },
+    placement: {
+        type: String as PropType<Placement>,
+        default: 'top'
+    },
+    overfloType: {
+        type: String as PropType<'ellipsis' | 'unset' | 'clip'>,
+        default: 'ellipsis'
+    }
+})
 const textRef = shallowRef<HTMLElement>()
 const disabled = ref(false)
 

admin/src/enums/appEnums.ts

@@ -33,7 +33,7 @@ export enum ClientEnum {
 export const ClientMap = {
     [ClientEnum.MP_WEIXIN]: '微信小程序',
     [ClientEnum.OA_WEIXIN]: '微信公众号',
-    [ClientEnum.H5]: '手机H5Z',
+    [ClientEnum.H5]: '手机H5',
     [ClientEnum.PC]: '电脑PC',
     [ClientEnum.IOS]: '苹果APP',
     [ClientEnum.ANDROID]: '安卓APP'

admin/src/layout/default/components/sidebar/logo.vue

@@ -8,7 +8,13 @@
                 :class="{ 'text-white': theme == ThemeEnum.DARK }"
                 :style="{ left: `${szie + 16}px` }"
             >
-                {{ title || config.webName }}
+                <overflow-tooltip
+                    :content="title || config.webName"
+                    :teleported="true"
+                    placement="bottom"
+                    overflo-type="unset"
+                >
+                </overflow-tooltip>
             </div>
         </transition>
     </div>

admin/src/permission.ts

@@ -78,6 +78,5 @@ router.beforeEach(async (to, from, next) => {
 })
 
 router.afterEach(() => {
-    console.log(router.getRoutes())
     NProgress.done()
 })

admin/src/router/index.ts

@@ -84,8 +84,9 @@ export function findFirstValidRoute(routes: RouteRecordRaw[]): string | undefine
         }
     }
 }
-
+//通过权限字符查询路由路径
 export function getRoutePath(perms: string) {
+    console.log(router.getRoutes())
     return router.getRoutes().find((item) => item.meta?.perms == perms)?.path || ''
 }
 

admin/src/styles/element.scss

@@ -112,6 +112,9 @@
     .el-button--danger {
         --el-button-hover-link-text-color: var(--el-color-danger-light-3);
     }
+    .el-image__error {
+        font-size: 12px;
+    }
 }
 @media (max-width: 768px) {
     .el-pagination > .el-pagination__jump {

admin/src/styles/var.css

@@ -32,7 +32,7 @@
     --el-border-color-dark: #d4d7de;
     --el-border-color-darker: #cdd0d6;
     --el-fill-color: #f0f2f5;
-    --el-fill-color-light: #f5f7fa;
+    --el-fill-color-light: #f8f8f8;
     --el-fill-color-lighter: #fafafa;
     --el-fill-color-extra-light: #fafcff;
     --el-fill-color-dark: #ebedf0;

admin/src/views/article/column/edit.vue

@@ -12,9 +12,9 @@
                 <el-form-item label="栏目名称" prop="name">
                     <el-input v-model="formData.name" placeholder="请输入栏目名称" />
                 </el-form-item>
-                <el-form-item label="排序" prop="sort" :min="0">
+                <el-form-item label="排序" prop="sort">
                     <div>
-                        <el-input-number v-model="formData.sort" />
+                        <el-input-number v-model="formData.sort" :min="0" />
                         <div class="form-tips">默认为0， 数值越大越排前</div>
                     </div>
                 </el-form-item>

admin/src/views/article/lists/edit.vue

@@ -112,7 +112,7 @@ const formData = reactive({
 const formRef = shallowRef<FormInstance>()
 const rules = reactive({
     title: [{ required: true, message: '请输入文章标题', trigger: 'blur' }],
-    cid: [{ required: true, message: '请输入文章简介', trigger: 'blur' }]
+    cid: [{ required: true, message: '请选择文章栏目', trigger: 'blur' }]
 })
 
 const getDetails = async () => {

admin/src/views/decoration/pages/index.vue

@@ -7,7 +7,7 @@
                 <attr-setting class="flex-1" :widget="getSelectWidget" />
             </div>
         </el-card>
-        <footer-btns class="mt-4" :fixed="false">
+        <footer-btns class="mt-4" :fixed="false" v-perms="['decorate:pages:save']">
             <el-button type="primary" @click="setData">保存</el-button>
         </footer-btns>
     </div>

admin/src/views/decoration/tabbar.vue

@@ -111,12 +111,14 @@
                                     <color-picker
                                         class="max-w-[400px]"
                                         v-model="tabbar.style.defaultColor"
+                                        default-color="#999999"
                                     />
                                 </el-form-item>
                                 <el-form-item label="选中颜色">
                                     <color-picker
                                         class="max-w-[400px]"
                                         v-model="tabbar.style.selectedColor"
+                                        default-color="#999999"
                                     />
                                 </el-form-item>
                             </el-tab-pane>
@@ -125,7 +127,7 @@
                 </div>
             </div>
         </el-card>
-        <footer-btns class="mt-4" :fixed="false">
+        <footer-btns class="mt-4" :fixed="false" v-perms="['decorate:tabbar:save']">
             <el-button type="primary" @click="setData">保存</el-button>
         </footer-btns>
     </div>

admin/src/views/permission/admin/edit.vue

@@ -95,11 +95,14 @@
                 </el-form-item>
 
                 <el-form-item label="多处登录">
-                    <el-switch
-                        v-model="formData.isMultipoint"
-                        :active-value="1"
-                        :inactive-value="0"
-                    />
+                    <div>
+                        <el-switch
+                            v-model="formData.isMultipoint"
+                            :active-value="1"
+                            :inactive-value="0"
+                        />
+                        <div class="form-tips">允许多人同时在线登录</div>
+                    </div>
                 </el-form-item>
             </el-form>
         </popup>

admin/src/views/setting/search/index.vue

@@ -36,7 +36,7 @@
                             </template>
                         </el-table-column>
                         <el-table-column label="操作" min-width="80" fixed="right">
-                            <template #default="{ row, $index }">
+                            <template #default="{ $index }">
                                 <el-button
                                     v-perms="['setting:storage:edit']"
                                     type="danger"

admin/src/views/setting/user/login_register.vue

@@ -68,7 +68,7 @@
                         <div>
                             <el-checkbox-group v-model="formData.autoLoginAuth">
                                 <el-checkbox :label="1">微信登录</el-checkbox>
-                                <el-checkbox :label="2">QQ登录</el-checkbox>
+                                <!-- <el-checkbox :label="2">QQ登录</el-checkbox> -->
                             </el-checkbox-group>
                         </div>
                     </div>