优化移动端适配和路由处理逻辑

- 移除 nuxt-swiper、tinymce 等相关未使用的依赖
- 优化频道关注接口的请求头配置
- 在频道操作中添加登录验证
- 修复样式类名中的语法错误

.prettierrc.cjs

@@ -0,0 +1,17 @@
+module.exports = {
+  singleQuote: true, // 使用单引号
+  printWidth: 160,
+  tabWidth: 2,
+  useTabs: false,
+  semi: false,
+  vueIndentScriptAndStyle: true,
+  quoteProps: 'as-needed',
+  bracketSpacing: true,
+  arrowParens: 'always',
+  insertPragma: false,
+  requirePragma: false,
+  trailingComma: 'es5',
+  proseWrap: 'never',
+  htmlWhitespaceSensitivity: 'strict',
+  endOfLine: 'auto',
+}

.vscode/settings.json

@@ -1,5 +1,5 @@
-{
-  "editor.formatOnSave": true,
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "prettier.configPath": "./.prettierrc"
-}
+// {
+//   "editor.formatOnSave": true,
+//   "editor.defaultFormatter": "esbenp.prettier-vscode",
+//   "prettier.configPath": "../.prettierrc",
+// }

api/channel/index.ts

@@ -20,7 +20,7 @@ import type {
  * @return {Promise}
  */
 export const page = (params: TpageReq) => {
-  return useDollarFetchRequest.get<IResponse<TpageRes>>('/prod-api/app-api/business/posts/page', {query: params})
+  return useDollarFetchRequest.get<IResponse<TpageRes>>('/prod-api/app-api/business/posts/page', { query: params })
 }
 
 /**
@@ -56,7 +56,7 @@ export const postsDelete = (params: { id: number }) => {
  * @return {Promise}
  */
 export const getChannelDetail = (params: { id: string }) => {
-  return useFetchRequest.get<IResponse<TGetChannelPostsRes>>('/prod-api/app-api/business/posts/get', params)
+  return useFetchRequest.get<IResponse<TGetChannelPostsRes>>('/prod-api/app-api/business/posts/get', { query: params })
 }
 
 /**
@@ -64,7 +64,7 @@ export const getChannelDetail = (params: { id: string }) => {
  * @return {Promise}
  */
 export const postscommentpage = (params: { postsId: string; pageNo: number; pageSize: number }) => {
-  return useFetchRequest.get<IResponse<PageResultPostsCommentRespVO>>('/prod-api/app-api/business/posts-comment/page', params)
+  return useFetchRequest.get<IResponse<PageResultPostsCommentRespVO>>('/prod-api/app-api/business/posts-comment/page', { query: params })
 }
 /**
  * 创建帖子评论
@@ -93,42 +93,47 @@ export const sendKefuMessage = (params: SingleMessageVo) => {
  * 获得消息记录分页
  */
 export const getMessagePage = (params: { pageNo: number; pageSize: number; fromId?: number; msgType?: number; topic: string }) => {
-  return useDollarFetchRequest.get<IResponse<PageResultMessageRespVO>>('/prod-api/app-api/mqtt/message/page', {query:params})
+  return useDollarFetchRequest.get<IResponse<PageResultMessageRespVO>>('/prod-api/app-api/mqtt/message/page', { query: params })
 }
 
 /**
  * 会话列表
  */
 export const conversationList = () => {
-  return useFetchRequest.get<IResponse<PageResultSessionRespVO[]>>('/prod-api/app-api/mqtt/session/list')
+  return useDollarFetchRequest.get<IResponse<PageResultSessionRespVO[]>>('/prod-api/app-api/mqtt/session/list')
 }
 
 /**
  * 获取聊天记录
  */
 export const getChatDetail = (params: { sessionId: number; pageNo: number; pageSize: number }) => {
-  return useFetchRequest.get<IResponse<PageResultMessageRespVO>>('/prod-api/app-api/mqtt/message/pageBySession', params)
+  return useDollarFetchRequest.get<IResponse<PageResultMessageRespVO>>('/prod-api/app-api/mqtt/message/pageBySession', { query: params })
 }
 
 /**
  * 清空未读信息
  */
 export const clearUnreadMessage = (params: { id: number }) => {
-  return useDollarFetchRequest.put<IResponse<boolean>>('/prod-api/app-api/mqtt/session/clear', { params })
+  return useDollarFetchRequest.put<IResponse<boolean>>('/prod-api/app-api/mqtt/session/clear?id=' + params.id, params)
 }
 
 /**
  * 获得论坛频道
  */
 export const getChannelLunTanDetail = (params: { id: string }) => {
-  return useDollarFetchRequest.get<IResponse<ChannelRespVO>>('/prod-api/app-api/business/channel/get', {query:params})
+  return useDollarFetchRequest.get<IResponse<ChannelRespVO>>('/prod-api/app-api/business/channel/get', { query: params })
 }
 
 /**
  * 创建论坛关注
  */
 export const createChannelFollow = (params: { channelId: string }) => {
-  return useDollarFetchRequest.post<IResponse<boolean>>('/prod-api/app-api/business/channel-follow/create', params)
+  return useDollarFetchRequest.post<IResponse<boolean>>(`/prod-api/app-api/business/channel-follow/create?channelId=${params.channelId}`, {}, {
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+      'Accept': 'application/json'
+    },
+  })
 }
 
 /**

api/common/index.ts

@@ -59,5 +59,5 @@ export const sendSms = (params: { mobile: string; scene: number }) => {
  * 获得站内信
  */
 export const getMessage = (params: { id: number }) => {
-  return useFetchRequest.get<IResponse<NotifyMessageRespVO>>('/prod-api/app-api/system/notify-message/get', { params })
+  return useDollarFetchRequest.get<IResponse<NotifyMessageRespVO>>('/prod-api/app-api/system/notify-message/get', { query:params })
 }

api/drawe-detail/index.ts

@@ -7,7 +7,7 @@ import type { ProjectRespVO, PageResultProjectCommentResVO, ProjectDrawPageRespV
  * @return {Promise}
  */
 export const getDetail = (params: { id?: number | string }) => {
-  return useFetchRequest.get<IResponse<ProjectRespVO>>('/prod-api/app-api/business/app/project-draw/preview', { params })
+  return useFetchRequest.get<IResponse<ProjectRespVO>>('/prod-api/app-api/business/app/project-draw/preview', { query:params })
 }
 
 /**
@@ -15,7 +15,7 @@ export const getDetail = (params: { id?: number | string }) => {
  * @return {Promise}
  */
 export const getCommentList = (params: { relationId?: number | string; pageNum?: number; pageSize?: number }) => {
-  return useFetchRequest.get<IResponse<PageResultProjectCommentResVO>>('/prod-api/app-api/business/app/project-comment/page', { params })
+  return useDollarFetchRequest.get<IResponse<PageResultProjectCommentResVO>>('/prod-api/app-api/business/app/project-comment/page', { query:params })
 }
 
 /**

api/home/index.ts

@@ -15,7 +15,7 @@ import type {
  * @returns
  */
 export const hotTop = (params: ThotTopReq) => {
-  return useFetchRequest.get<IResponse<ProjectDrawPageRespVO[]>>('/prod-api/app-api/business/app/project-draw/hot-top', { query:params })
+  return useDollarFetchRequest.get<IResponse<ProjectDrawPageRespVO[]>>('/prod-api/app-api/business/app/project-draw/hot-top', { query: params })
 }
 
 /**
@@ -24,21 +24,21 @@ export const hotTop = (params: ThotTopReq) => {
  * @returns
  */
 export const recommendTop = (params: ThotTopReq) => {
-  return useFetchRequest.get<IResponse<ProjectDrawPageRespVO[]>>('/prod-api/app-api/business/app/project-draw/recommend-top', { query:params })
+  return useFetchRequest.get<IResponse<ProjectDrawPageRespVO[]>>('/prod-api/app-api/business/app/project-draw/recommend-top', { query: params })
 }
 
 /**
  * 获取最新图纸信息
  */
 export const newDraw = (params: { type: number; limit: number }) => {
-  return useFetchRequest.get<IResponse<ProjectDrawPageRespVO[]>>('/prod-api/app-api/business/project/index/draw-new', { query:params })
+  return useFetchRequest.get<IResponse<ProjectDrawPageRespVO[]>>('/prod-api/app-api/business/project/index/draw-new', { query: params })
 }
 
 /**
  * 首页-热点标签
  */
 export const hotTag = (params: { type: number; limit: number; size: number }) => {
-  return useFetchRequest.get<IResponse<ProjectDictNodeVO[]>>('/prod-api/app-api/business/project/index/index-hot-tab', { query:params })
+  return useFetchRequest.get<IResponse<ProjectDictNodeVO[]>>('/prod-api/app-api/business/project/index/index-hot-tab', { query: params })
 }
 
 /**
@@ -59,7 +59,7 @@ export const top = (params: { type: number; limit: number }) => {
  * 获取用户top数据
  */
 export const userTop = (params: { type?: number }) => {
-  return useFetchRequest.get<IResponse<ProjectTrendingScoreUserInfoVO[]>>('/prod-api/app-api/business/project/index/user-top', { query:params })
+  return useFetchRequest.get<IResponse<ProjectTrendingScoreUserInfoVO[]>>('/prod-api/app-api/business/project/index/user-top', { query: params })
 }
 
 /**
@@ -81,3 +81,10 @@ export const getSettingPage = (params: { type: number }) => {
 export const tab2 = () => {
   return useFetchRequest.get<IResponse<ProjectDictNodeVO[]>>('/prod-api/app-api/business/project/index/index-tab2', {})
 }
+
+/**
+ * 获取具有上下级关系的当前的名称
+ */
+export const getDictTree = (params: { type: number, id: number}) => {
+  return useDollarFetchRequest.get<IResponse<ProjectDictNodeVO[]>>('/prod-api/app-api/business/app/dict/path-by-id', { query: params })
+}

api/pay/index.ts

@@ -36,7 +36,7 @@ export const createOrder = (params: { spuId: number }) => {
  * 获得钱包充值套餐列表
  */
 export const listWalletRechargePackage = () => {
-  return useFetchRequest.get<IResponse<AppPayWalletPackageRespVO[]>>('/prod-api/app-api/pay/wallet-recharge-package/list', {})  
+  return useDollarFetchRequest.get<IResponse<AppPayWalletPackageRespVO[]>>('/prod-api/app-api/pay/wallet-recharge-package/list', {})  
 }
 
 /**
@@ -71,5 +71,5 @@ export const socialLoginByCode = (params: { type: number; code: string; state: s
  * 获得钱包充值记录分页
  */
 export const getWalletRechargeRecordPage = (params: { pageNo: number; pageSize: number }) => {
-  return useFetchRequest.get<IResponse<PageResultAppPayWalletRechargeRespVO>>('/prod-api/app-api/pay/wallet-transaction/page', params)
+  return useDollarFetchRequest.get<IResponse<PageResultAppPayWalletRechargeRespVO>>('/prod-api/app-api/pay/wallet-transaction/page', {query:params})
 }

api/personal-center/index.ts

@@ -17,7 +17,7 @@ import type {
  * @returns
  */
 export const getUserInfo = () => {
-  return useFetchRequest.get<IResponse<UserExtendRespVO>>('/prod-api/app-api/member/user-extend/get', {})
+  return useDollarFetchRequest.get<IResponse<UserExtendRespVO>>('/prod-api/app-api/member/user-extend/get', {})
 }
 
 /**
@@ -66,13 +66,13 @@ export const updateUserAuthInfo = (params: UserAuthInfoRespVO) => {
  * 获得内容信息分页
  */
 export const getContentPage = (params: { type: number }) => {
-  return useFetchRequest.get<IResponse<PageResultProjectHistoryResVO>>('/prod-api/app-api/business/project-history/page', params)
+  return useDollarFetchRequest.get<IResponse<PageResultProjectHistoryResVO>>('/prod-api/app-api/business/project-history/page', {query:params})
 }
 /**
  * 获得用户项目工具箱下载分页
  */
 export const getUserToolBoxPage = (params: { pageNum: number; pageSize: number; type?: number }) => {
-  return useFetchRequest.get<IResponse<PageResultProjectHistoryResVO>>('/prod-api/app-api/business/project-member-file/page', params)
+  return useDollarFetchRequest.get<IResponse<PageResultProjectHistoryResVO>>('/prod-api/app-api/business/project-member-file/page', {query:params})
 }
 
 /**
@@ -92,54 +92,54 @@ export const signIn = () => {
  * 获得用户积分记录分页
  */
 export const getUserPointPage = (params: { pageNo: number; pageSize: number }) => {
-  return useFetchRequest.get<IResponse<PageResultMemberPointRecordRespVO>>('/prod-api/app-api/member/point/record/page', {query:params})
+  return useDollarFetchRequest.get<IResponse<PageResultMemberPointRecordRespVO>>('/prod-api/app-api/member/point/record/page', {query:params})
 }
 /**
  * 近期收益和近期活跃
  */
 export const getRecentIncomeAndActive = (params: { type: number; limit: number }) => {
-  return useFetchRequest.get<IResponse<UserStatisticsLineRespVO>>('/prod-api/app-api/member/statistics/line', params)
+  return useDollarFetchRequest.get<IResponse<UserStatisticsLineRespVO>>('/prod-api/app-api/member/statistics/line', {query:params})
 }
 /**
  * 
 资源下载分布
  */
 export const getResourceDistribution = (params: { type: number; limit: number }) => {
-  return useFetchRequest.get<IResponse<UserStatisticsBarRespVO>>('/prod-api/app-api/member/statistics/bar', params)
+  return useDollarFetchRequest.get<IResponse<UserStatisticsBarRespVO>>('/prod-api/app-api/member/statistics/bar', {query:params})
 }
 /**
  * 我的数据统计 包括我的金币 我的关注 我的发布等等
  */
 export const getUserStatistics = () => {
-  return useFetchRequest.get<IResponse<UserStatisticsCountRespVO>>('/prod-api/app-api/member/statistics/count', {})
+  return useDollarFetchRequest.get<IResponse<UserStatisticsCountRespVO>>('/prod-api/app-api/member/statistics/count', {})
 }
 
 /**
  * 获得项目订单用户收藏信息分页
  */
 export const getUserFavoritePage = (params: { pageNo: number; pageSize: number; userId: any; type: number }) => {
-  return useFetchRequest.get<IResponse<PageResultProjectMemberFavoritesRespVO>>('/prod-api/app-api/business/project-member-favorites/page', params)
+  return useDollarFetchRequest.get<IResponse<PageResultProjectMemberFavoritesRespVO>>('/prod-api/app-api/business/project-member-favorites/page', {query:params})
 }
 
 /***
  * 自己发布的-内容信息分页
  */
 export const getOwnContentPage = (params: { pageNo: number; pageSize: number; type: number }) => {
-  return useFetchRequest.get<IResponse<PageResultProjectHistoryResVO>>('/prod-api/app-api/business/app/project-draw/my-page', params)
+  return useDollarFetchRequest.get<IResponse<PageResultProjectHistoryResVO>>('/prod-api/app-api/business/app/project-draw/my-page', {query:params})
 }
 
 /**
  * 下架
  */
 export const offShelf = (params: { id: number }) => {
-  return useDollarFetchRequest.put<IResponse<boolean>>('/prod-api/app-api/business/app/project-draw/down', params)
+  return useDollarFetchRequest.put<IResponse<boolean>>('/prod-api/app-api/business/app/project-draw/down?id=' + params.id, params)
 }
 
 /**
  * 删除资源
  */
 export const deleteResource = (params: { id: number }) => {
-  return useDollarFetchRequest.del<IResponse<boolean>>('/prod-api/app-api/business/app/project-draw/delete', params)
+  return useDollarFetchRequest.del<IResponse<boolean>>('/prod-api/app-api/business/app/project-draw/delete?id=' + params.id, params)
 }
 
 /**

api/upnew/index.ts

@@ -16,7 +16,7 @@ export const create = (params: TcreateReq) => {
  * @returns
  */
 export const parent = (params: { type: string | number; parentId: number | string }) => {
-  return useFetchRequest.get<IResponse<parentRes[]>>('/prod-api/app-api/business/app/dict/parent', { query:params })
+  return useFetchRequest.get<IResponse<parentRes[]>>('/prod-api/app-api/business/app/dict/parent', { query: params })
 }
 /**
  * 获取具有上下级的字典信息
@@ -24,7 +24,7 @@ export const parent = (params: { type: string | number; parentId: number | strin
  * @returns
  */
 export const parentV2 = (params: { type: string | number; parentId: number | string }) => {
-  return useDollarFetchRequest.get<IResponse<parentRes[]>>('/prod-api/app-api/business/app/dict/parent', { query:params })
+  return useDollarFetchRequest.get<IResponse<parentRes[]>>('/prod-api/app-api/business/app/dict/parent', { query: params })
 }
 /**
  * 获取具有上下级的字典信息
@@ -40,7 +40,7 @@ export const indexTabs = () => {
  * @returns
  */
 export const keywords = (params: { type: string | number; keywords: string }) => {
-  return useFetchRequest.get<IResponse<boolean>>('/prod-api/app-api/business/app/dict/label-keywords', params)
+  return useFetchRequest.get<IResponse<boolean>>('/prod-api/app-api/business/app/dict/label-keywords', {query:params})
 }
 /**
  * 获取格式类型字典信息
@@ -56,7 +56,7 @@ export const labels = (params: { type: string | number }) => {
  * @returns
  */
 export const page = (params: pageReq) => {
-  return useFetchRequest.get<IResponse<pageRes>>('/prod-api/app-api/business/app/project-draw/page', {query:params})
+  return useFetchRequest.get<IResponse<pageRes>>('/prod-api/app-api/business/app/project-draw/page', { query: params })
 }
 /**
  * 获得项目表内容信息分页

app.vue

@@ -1,12 +1,33 @@
 <template>
-     <div>
-       <NuxtLoadingIndicator />
-       <NuxtLayout>
-         <NuxtPage />
-       </NuxtLayout>
-     </div>
+  <div class="flex flex-col flex-1">
+    <NuxtLoadingIndicator />
+    <NuxtLayout>
+      <NuxtPage />
+    </NuxtLayout>
+  </div>
 </template>
 
 <script setup lang="ts">
-import zhCn from 'element-plus/es/locale/lang/zh-cn'
+  import refreshToken from '~/utils/RefreshToken'
+  import useUserStore from '~/stores/user'
+  const userStore = useUserStore()
+
+  onMounted(() => {
+    if (!userStore.mqttClient) {
+      // 判断建立连接没 刷新会走这儿
+      userStore.connectMqtt()
+    }
+
+    // 浏览器打开新的tab页，防止数据不一致
+    document.addEventListener('visibilitychange', () => {
+      if (userStore.token !== refreshToken.getToken().token) {
+        location.reload()
+      }
+    })
+  })
+
+  onUnmounted(() => {
+    // 断开连接
+    userStore.mqttClient?.disconnect()
+  })
 </script>

assets/scss/app.scss

@@ -5,12 +5,20 @@ ul,
 li {
   margin: 0;
   padding: 0;
-  font-family: Microsoft YaHei, PingFang SC, Helvetica Neue, Helvetica, Hiragino Sans GB, Arial, sans-serif;
+  font-family:
+    Microsoft YaHei,
+    PingFang SC,
+    Helvetica Neue,
+    Helvetica,
+    Hiragino Sans GB,
+    Arial,
+    sans-serif;
   font-weight: normal;
   word-break: break-all;
 }
 body {
   min-width: 1500px;
+  font-size: 14px;
 }
 img {
   user-select: none;
@@ -26,7 +34,7 @@ a {
   --el-color-primary-light-1: rgba(8, 88, 247, 0.9);
 }
 
-#app {
+#__nuxt {
   min-height: 100vh;
   display: flex;
   flex-direction: column;

components/comment-section/index.vue

@@ -1,15 +1,15 @@
 <template>
-  <div class="mt-30px">
-    <div class="h-48px w-938px rounded-1px bg-[#F8F8F8] pl-10px text-16px text-[#333333] font-normal line-height-50px"> 共有{{ result.total || 0 }}条评论 </div>
-    <div v-for="item in result.list" :key="item.id" class="mt-20px border-b-1px border-b-[#eee] border-b-solid pb-14px">
+  <div class="mt-[30px] w-[100%]">
+    <div class="h-[48px] w-[100%] rounded-[1px] bg-[#F8F8F8] pl-[10px] text-[16px] text-[#333333] font-normal line-height-[50px]"> 共有{{ result.total || 0 }}条评论 </div>
+    <div v-for="item in result.list" :key="item.id" class="mt-[20px] border-b-[1px] border-b-[#eee] border-b-solid pb-[14px]">
       <div class="flex items-start">
-        <el-avatar :src="item.creatorInfo.avatar" alt="" srcset="" class="h-50px w-49px rounded-full" />
-        <div class="flex-1 pl-8px">
+        <el-avatar :src="item.creatorInfo.avatar" alt="" srcset="" class="h-[50px] w-[49px] rounded-full" />
+        <div class="flex-1 pl-[8px]">
           <div class="flex items-center justify-between">
-            <div class="relative top-4px text-14px!">{{ item.creatorInfo.nickName }}</div>
-            <div class="text-12px text-[#999999] font-normal">发表时间：{{ dayjs(item.creatorInfo.createTime).format('YYYY-MM-DD HH:mm:ss') }}</div>
+            <div class="relative top-[4px] text-[14px]!">{{ item.creatorInfo.nickName }}</div>
+            <div class="text-[12px] text-[#999999] font-normal">发表时间：{{ dayjs(item.creatorInfo.createTime).format('YYYY-MM-DD HH:mm:ss') }}</div>
           </div>
-          <div class="mt-10px box-border rd-4px bg-[#f8f8f8] px-18px py-10px text-14px text-[#999999] font-normal">{{ item.content }}</div>
+          <div class="mt-[10px] box-border rd-[4px] bg-[#f8f8f8] px-[12px] py-[10px] text-[13px] text-[#999999] font-normal">{{ item.content }}</div>
         </div>
       </div>
     </div>
@@ -19,12 +19,12 @@
       :page-size="query.pageSize"
       layout="prev, pager, next"
       :total="result.total"
-      class="mt-10px"
+      class="mt-[10px]"
       @current-change="handleCurrentChange"
     />
-    <el-input v-model="commentContent" type="textarea" :rows="6" placeholder="请输入内容" class="mt-20px w-100%"></el-input>
+    <el-input v-model="commentContent" type="textarea" :rows="6" placeholder="请输入内容" class="mt-[20px] w-[100%]"></el-input>
     <div>
-      <el-button type="primary" class="mt-10px h-40px w-101px rounded-4px text-16px text-[#FFFFFF] font-bold" @click="handleCreateComment">
+      <el-button type="primary" class="mt-[10px] h-[40px] w-[101px] rounded-[4px] text-[16px] text-[#FFFFFF] font-bold" @click="handleCreateComment">
         发表评论
       </el-button>
     </div>
@@ -87,6 +87,8 @@
     () => props.relationId,
     () => {
       handleGetCommentList()
+    },{
+      immediate: true
     }
   )
 </script>

components/drawe-components/RecommendedColumnsV2.vue

@@ -34,7 +34,7 @@
   const tabBar = ref([
     {
       label: '图纸推荐',
-      value: '',
+      value: -1,
     },
     {
       label: '原创图纸',

components/foreign-components/RecommendedColumnsV2.vue

@@ -20,6 +20,7 @@
 <script lang="ts" setup>
   import KlTabBar from '~/components/kl-tab-bar/index.vue'
   import CardPicture from '~/components/kl-card-picture/index.vue'
+  import KlWallpaperCategory from '~/components/kl-wallpaper-category/index.vue'
   import { ref } from 'vue'
   import type { pageRes } from '~/api/upnew/types'
 
@@ -38,19 +39,19 @@
     required: true,
   })
 
-  const tabIndex = ref(1)
+  const tabIndex = ref(-1)
   const tabBar = ref([
     {
       label: '图纸推荐',
-      value: 1,
+      value: -1,
     },
     {
       label: '原创图纸',
-      value: 2,
+      value: 1,
     },
     {
       label: '最新上传',
-      value: 3,
+      value: 2,
     },
   ])
 </script>

components/kl-card-picture/index.vue

@@ -1,33 +1,33 @@
 <template>
-  <div class="mb-20px w-100% cursor-pointer overflow-hidden border border-[#EEEEEE] rounded-10px border-solid bg-[#FFFFFF]" @click="handleClick">
+  <div class="mb-[20px] w-[100%] cursor-pointer overflow-hidden border border-[#EEEEEE] rounded-[10px] border-solid bg-[#FFFFFF]" @click="handleClick">
     <div>
-      <el-image :src="props.itemInfo.iconUrl" class="h-216px w-100%" fit="cover"></el-image>
+      <el-image :src="props.itemInfo.iconUrl" class="h-[216px] w-[100%]" fit="cover"></el-image>
     </div>
-    <div class="box-border p-16px">
+    <div class="box-border p-[16px]">
       <div class="flex items-center justify-between">
         <div>
-          <div class="title mr-38px text-16px text-[#333333] font-bold">{{ props.itemInfo.title }}</div>
-          <div class="mt-8px text-15px text-[#999999] font-normal">by {{ props.itemInfo?.ownedUserIdInfo?.nickName }}</div>
+          <div class="title mr-[38px] text-[16px] text-[#333333] font-bold">{{ props.itemInfo.title }}</div>
+          <div class="mt-[8px] text-[15px] text-[#999999] font-normal">by {{ props.itemInfo?.ownedUserIdInfo?.nickName }}</div>
         </div>
-        <div><img :src="props.itemInfo?.ownedUserIdInfo?.avatar" alt="" srcset="" class="h-40px w-40px rd-50%" /></div>
+        <div><img :src="props.itemInfo?.ownedUserIdInfo?.avatar" alt="" srcset="" class="h-[40px] w-[40px] rd-[50%]" /></div>
       </div>
-      <div class="mt-24px flex items-center justify-between">
-        <div class="flex items-center justify-between text-14px text-[#666666] font-normal">
-          <div class="mr-9px flex items-center">
-            <img src="~/assets/images/look.png" alt="" srcset="" class="mr-2px h-17px" />
-            <span class="color-#666">{{ props.itemInfo.previewPoint }}</span>
+      <div class="mt-[24px] flex items-center justify-between">
+        <div class="flex items-center justify-between text-[14px] text-[#666666] font-normal">
+          <div class="mr-[9px] flex items-center">
+            <img src="~/assets/images/look.png" alt="" srcset="" class="mr-[2px] h-[17px]" />
+            <span class="color-[#666]">{{ props.itemInfo.previewPoint }}</span>
           </div>
-          <div class="mr-9px flex items-center">
-            <img src="~/assets/images/add.png" alt="" srcset="" class="mr-2px h-22px" />
-            <span class="color-#666">{{ props.itemInfo.hotPoint }}</span>
+          <div class="mr-[9px] flex items-center">
+            <img src="~/assets/images/add.png" alt="" srcset="" class="mr-[2px] h-[22px]" />
+            <span class="color-[#666]">{{ props.itemInfo.hotPoint }}</span>
           </div>
           <div class="flex items-center">
-            <img src="~/assets/images/chat.png" alt="" srcset="" class="mr-4px h-17px" />
-            <span class="color-#666">{{ props.itemInfo.commentsPoint }}</span>
+            <img src="~/assets/images/chat.png" alt="" srcset="" class="mr-[4px] h-[17px]" />
+            <span class="color-[#666]">{{ props.itemInfo.commentsPoint }}</span>
           </div>
         </div>
-        <div class="h-30px w-90px cursor-pointer border border-[#1A65FF] rounded-15px border-solid text-center line-height-30px"
-          ><span class="text-14px text-[#1A65FF] font-normal">查看详情</span></div
+        <div class="h-[30px] w-[90px] cursor-pointer border border-[#1A65FF] rounded-[15px] border-solid text-center line-height-[30px]"
+          ><span class="text-[14px] text-[#1A65FF] font-normal">查看详情</span></div
         >
       </div>
     </div>
@@ -46,11 +46,11 @@
     },
   })
 
-  const handleClick = () => {
+  const handleClick = async () => {
     console.log(props.itemInfo)
 
     // 跳转到下载详情页 并且是单独开标签
-    window.open(`/down-drawe-detail?id=${props.itemInfo.id}`, '_blank') // 修改为在新窗口打开
+    await navigateTo(`/down-drawe-detail/${props.itemInfo.id}`) // 修改为在新窗口打开
   }
 </script>
 

components/kl-email/index.vue

@@ -87,7 +87,7 @@
   import { login, sendEmailCode, loginByEmail } from '~/api/login/index'
   import refreshToken from '~/utils/RefreshToken'
   import { handleLoginQQ, handleLoginWechat, generateRandomString } from '~/utils/login'
-  import useUserStore from '~/store/user'
+  import useUserStore from '~/stores/user'
   const userStore = useUserStore()
   const { $openRegister, $openLogin } = useNuxtApp()
 

components/kl-login/index.vue

@@ -88,7 +88,7 @@
   import { sendSms } from '~/api/common/index'
   import REFRESHTOKEN from '~/utils/RefreshToken'
   import { handleLoginQQ, handleLoginWechat } from '~/utils/login'
-  import useUserStore from '~/store/user'
+  import useUserStore from '~/stores/user'
   const app = useNuxtApp()
   const token = useToken();
 
@@ -211,24 +211,25 @@
       loading.value = true
       try {
         const res = await login(loginForm)
-        const { code, data, msg } = res
-        if (code !== 0) return ElMessage.error(msg)
-        // 设置cookie
-        tokenCookie.value = data.accessToken;
-        // 更新state
-        token.value = data.accessToken;
-        REFRESHTOKEN.setToken(data.accessToken, data.refreshToken)
-        REFRESHTOKEN.setUserId(data.userId.toString())
-        REFRESHTOKEN.setUserName(loginForm.mobile)
-        userStore.setToken(data.accessToken)
-        userStore.setUserId(data.userId.toString())
-        userStore.setUserName(loginForm.mobile)
-        userStore.setRefreshToken(data.refreshToken)
-        ElMessage.success('登录成功')
-        props.onClose()
-        // 获取用户信息
-        userStore.getUserInfo()
-        // 登录成功
+        const { code, data} = res
+        if (code === 0) {
+          // 设置cookie
+          tokenCookie.value = data.accessToken;
+          // 更新state
+          token.value = data.accessToken;
+          REFRESHTOKEN.setToken(data.accessToken, data.refreshToken)
+          REFRESHTOKEN.setUserId(data.userId.toString())
+          REFRESHTOKEN.setUserName(loginForm.mobile)
+          userStore.setToken(data.accessToken)
+          userStore.setUserId(data.userId.toString())
+          userStore.setUserName(loginForm.mobile)
+          userStore.setRefreshToken(data.refreshToken)
+          ElMessage.success('登录成功')
+          props.onClose()
+          // 获取用户信息
+          userStore.getUserInfo()
+          // 登录成功
+        }
       } finally {
         loading.value = false
       }

components/kl-menus-v2/index.vue

@@ -19,7 +19,7 @@
         </div>
       </div>
       <div v-if="isLogin" class="flex flex-1 items-center justify-end">
-        <div class="h-[36px] w-[36px] cursor-pointer border-rd-[50%] bg-[#F5F5F5] text-center line-height-[44px]" @click="handleUserCenter">
+        <div class="h-[36px] w-[36px] cursor-pointer border-rd-[50%] bg-[#F5F5F5] text-center flex items-center justify-center" @click="handleUserCenter">
           <img src="~/assets/images/user.png" alt="" srcset="" class="h-[19px] w-[17px]" />
         </div>
         <div class="ml-[8px] h-[36px] w-[36px] cursor-pointer border-rd-[50%] text-center line-height-[44px]" @click="handleMessageCenter">
@@ -30,7 +30,7 @@
   </div>
 </template>
 <script setup lang="ts">
-  import useUserStore from '~/store/user'
+  import useUserStore from '~/stores/user'
   const userStore = useUserStore()
   import { BellFilled } from '@element-plus/icons-vue'
   import { ref, computed } from 'vue'
@@ -52,12 +52,12 @@
 
   // 用户中心
   const handleUserCenter = () => {
-    navigateTo('/personal/center/info')
+    navigateTo('/personal-Center/info')
   }
 
   // 消息中心
   const handleMessageCenter = () => {
-    navigateTo('/personal/center/message')
+    navigateTo('/personal-Center/message-center')
   }
 </script>
 <style scoped>

components/kl-nav-tab/index.vue

@@ -11,7 +11,7 @@
           placeholder="电子产品"
           :prefix-icon="Search"
           class="search-input h-[40px] w-[328px]"
-          @focus="handleHot(), (showHotList = true)"
+          @focus="(handleHot(), (showHotList = true))"
           @input="handleInput"
         ></el-input>
         <!-- 搜索框 获取到焦点 显示热门列表 -->
@@ -37,7 +37,7 @@
       </div>
       <div class="absolute right-[10px] flex items-center">
         <div class="h-[36px] w-[36px] border-rd-[50%] bg-[#F5F5F5] text-center line-height-[44px]">
-          <img v-if="!isLogin" src="~/assets/images/user.png" alt="" srcset="" class="h-[19px] w-[17px] relative top-[7px] left-[10px]" />
+          <img v-if="!isLogin" src="~/assets/images/user.png" alt="" srcset="" class="h-[19px] w-[17px] relative top-[0px] left-[0px]" />
           <img v-else :src="userStore.userInfoRes.avatar" alt="" srcset="" class="h-[19px] w-[17px] rd-[50%]" />
         </div>
         <span v-if="!isLogin" class="ml-[14px] cursor-pointer text-[14px] text-[#1A65FF] font-normal" @click="handleLogin">立即登录</span>
@@ -67,8 +67,8 @@
   import { top } from '~/api/home/index'
   import type { ProjectDrawStatisticAppRespVO } from '~/api/home/type'
   import { Search } from '@element-plus/icons-vue'
-  import refreshToken from "~/utils/RefreshToken";
-  import useUserStore from '~/store/user'
+  import refreshToken from '~/utils/RefreshToken'
+  import useUserStore from '~/stores/user'
   const userStore = useUserStore()
   const app = useNuxtApp()
 
@@ -89,8 +89,6 @@
 
   // 是否登录
   const isLogin = computed(() => {
-    console.log('userStore.token', refreshToken.getToken());
-    
     return !!userStore.token
   })
 
@@ -133,22 +131,25 @@
   }
 
   const handleHotItem = (item: ProjectDrawStatisticAppRespVO) => {
-    const normal = { id: '0', name: '图纸库', isChildren: false }
-    const level = item.pairs?.filter(Boolean).map((item) => ({ id: item?.id, name: item?.name, isChildren: false })) || []
-    level.unshift(normal)
+    // const normal = { id: '0', name: '图纸库', isChildren: false }
+    // const level = item.pairs?.filter(Boolean).map((item) => ({ id: item?.id, name: item?.name, isChildren: false })) || []
+    // level.unshift(normal)
     if (item.type === 1) {
-      navigateTo(`/drawe?level=${JSON.stringify(level)}&keywords=${item.title || ''}`)
+      navigateTo(`/drawe/${item.projectType}/1/12/-1`)
+      // navigateTo(`/drawe?level=${JSON.stringify(level)}&keywords=${item.title || ''}`)
     } else if (item.type === 2) {
-      navigateTo(`/text?level=${JSON.stringify(level)}&keywords=${item.title || ''}`)
+      navigateTo(`/text/${item.projectType}/1/12/-1`)
+      // navigateTo(`/text?level=${JSON.stringify(level)}&keywords=${item.title || ''}`)
     } else if (item.type === 3) {
-      navigateTo(`/model?level=${JSON.stringify(level)}&keywords=${item.title || ''}`)
+      navigateTo(`/model/${item.projectType}/1/12/-1`)
+      // navigateTo(`/model?level=${JSON.stringify(level)}&keywords=${item.title || ''}`)
     }
   }
 
   const handleClick = (item: string) => {
     switch (item) {
       case '首页':
-        navigateTo({ path: '/'}) // 修改为在新窗口打开
+        navigateTo({ path: '/' }) // 修改为在新窗口打开
         break
       case '图纸':
         navigateTo('/drawe') // 修改为在新窗口打开
@@ -180,10 +181,11 @@
   }
   const handleCommand = (command: string) => {
     if (command === '退出') {
+      clearNuxtState(['token', 'userInfo'])
       userStore.logout()
       userStore.$reset()
     } else if (command === '个人中心') {
-      navigateTo('/personal/center/info')
+      navigateTo('/personal-Center/info')
     }
   }
 

components/kl-quick-menu/components/kl-service.vue

@@ -91,7 +91,7 @@
   import { upload } from '~/api/common'
   import { sendKefuMessage, getMessagePage } from '~/api/channel/index'
   import type { msgType, PageResultMessageRespVO } from '~/api/channel/types'
-  import useUserStore from '~/store/user'
+  import useUserStore from '~/stores/user'
   const userStore = useUserStore()
   import dayjs from 'dayjs'
 

components/kl-quick-menu/components/kl-vip.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="visible" width="800px" class="vip-dialog" align-center>
+  <el-dialog v-model="visible" width="800px" class="vip-dialog" align-center @close="handleClose">
     <template #header>
       <div class="vip-modal-title">VIP套餐</div>
     </template>
@@ -41,7 +41,7 @@
   import type { AppPayWalletPackageRespVO } from '~/api/pay/types'
   // @ts-ignore
   import QrcodeVue from 'qrcode.vue'
-  import useUserStore from '~/store/user'
+  import useUserStore from '~/stores/user'
   const userStore = useUserStore()
   const props = defineProps({
     modelValue: {
@@ -133,6 +133,14 @@
     clearInterval(interval.value)
     interval.value = undefined
   }
+
+  /** 关闭弹窗 */
+  const handleClose = () => {
+    visible.value = false
+    // 清空任务
+    clearInterval(interval.value)
+    interval.value = undefined
+  }
 </script>
 
 <style scoped>
@@ -239,7 +247,7 @@
 
   :deep(.el-dialog__header) {
     .el-dialog__close {
-      top: -10px !important
+      top: -10px !important;
     }
   }
 </style>

components/kl-quick-menu/index.vue

@@ -1,23 +1,23 @@
 <template>
   <div class="fixed-button-group">
     <div class="button-item" @click="handleVip">
-      <el-badge :is-dot="readCount" class="item">
-        <el-icon class="icon-item color-[#10c55b!]"><Trophy /></el-icon>
+      <el-badge class="item">
+        <el-icon class="icon-item !color-[#10c55b]"><Trophy /></el-icon>
       </el-badge>
       <span class="button-text">VIP</span>
     </div>
     <div class="button-item" @click="handleService">
       <el-badge :is-dot="readCount" class="item">
-        <el-icon class="icon-item color-[#10c55b!]"><Service /></el-icon>
+        <el-icon class="icon-item !color-[#10c55b]"><Service /></el-icon>
       </el-badge>
       <span class="button-text">客服</span>
     </div>
     <div class="button-item" @click="handleSign">
-      <el-icon class="icon-item color-[#10c55b!]"><Checked /></el-icon>
+      <el-icon class="icon-item !color-[#10c55b]"><Checked /></el-icon>
       <span class="button-text">签到</span>
     </div>
     <div class="button-item" @click="handlePublish">
-      <el-icon class="icon-item color-[#C561F9!]"><Promotion /></el-icon>
+      <el-icon class="icon-item !color-[#C561F9]"><Promotion /></el-icon>
       <span class="button-text">发布</span>
     </div>
     <div class="button-item mt-[10px]" @click="scrollToTop">
@@ -33,7 +33,7 @@
 
 <script setup lang="ts">
   import { ref, onMounted } from 'vue'
-  import useUserStore from '~/store/user'
+  import useUserStore from '~/stores/user'
   import { Service, Top, Promotion, Checked, Trophy } from '@element-plus/icons-vue'
   import KlService from './components/kl-service.vue'
   import KlVip from './components/kl-vip.vue'
@@ -64,7 +64,7 @@
       return
     }
     // 新开窗口 用router跳转 新窗口打开
-    navigateTo('/upnew/drawe')
+    navigateTo('/upnew')
   }
 
   const dialogVisible = ref(false)

components/kl-register/index.vue

@@ -58,7 +58,7 @@
   const { $openLogin } = useNuxtApp()
 
   import REFRESHTOKEN from '~/utils/RefreshToken'
-  import useUserStore from '~/store/user'
+  import useUserStore from '~/stores/user'
   const userStore = useUserStore()
 
   const props = defineProps({

components/kl-search/index.vue

@@ -1,20 +1,20 @@
 <template>
   <div>
-    <header class="h-106px">
-      <div class="mx-a ml--250px h-full flex items-center justify-center">
+    <header class="h-[106px]">
+      <div class="mx-a ml-[-250px] h-full flex items-center justify-center">
         <!-- Logo区域 -->
-        <div class="h-100% flex cursor-pointer items-center" @click="navigateTo('/')">
-          <img src="~/assets/images/logo5.png" alt="图夕夕" class="h-51px w-182px" />
+        <div class="h-[100%] flex cursor-pointer items-center" @click="navigateTo('/')">
+          <img src="~/assets/images/logo5.png" alt="图夕夕" class="h-[51px] w-[182px]" />
         </div>
         <!-- 搜索区域 -->
-        <div class="relative ml-49px w-647px px4 p-r-0px!">
-          <div class="search-input relative w-100%">
+        <div class="relative ml-[49px] w-[647px] px-4 p-r-[0px]!">
+          <div class="search-input relative w-[100%]">
             <el-input
               v-model="searchQuery"
               type="text"
               placeholder="搜一搜"
               :prefix-icon="Search"
-              class="no-right-border box-border h-40px w-100% rounded-bl-4px rounded-br-0px rounded-tl-4px rounded-tr-0px bg-[#F8F8F8] text-14px outline-#999"
+              class="no-right-border box-border h-[40px] w-[100%] rounded-bl-[4px] rounded-br-[0px] rounded-tl-[4px] rounded-tr-[0px] bg-[#F8F8F8] text-[14px] outline-[#999]"
               @focus="handleHot(), (showHotList = true)"
               @input="handleInput"
             />
@@ -23,32 +23,32 @@
           <div
             v-if="showHotList"
             v-loading="loading"
-            class="absolute z-100 w-625px border-width-1px border-color-#1A65FF rounded-bl-4px rounded-br-4px rounded-tl-0px rounded-tr-0px border-solid bg-[#fff] pa-10px"
+            class="absolute z-100 w-[625px] border-width-[1px] border-color-[#1A65FF] rounded-bl-[4px] rounded-br-[4px] rounded-tl-[0px] rounded-tr-[0px] border-solid bg-[#fff] pa-[10px]"
           >
             <!-- 这里放置热门列表的内容 -->
-            <ul class="flex flex-col gap-6px">
+            <ul class="flex flex-col gap-[6px]">
               <li
                 v-for="(item, index) in hotItems"
                 :key="index"
-                class="flex flex-row cursor-pointer items-center justify-between text-13px"
+                class="flex flex-row cursor-pointer items-center justify-between text-[13px]"
                 @click="handleHotItem(item)"
               >
-                <span class="color-#333333">{{ item.projectTypeName }}</span>
-                <span v-if="item.count" class="color-#999999">{{ item.count }}份图纸</span>
+                <span class="color-[#333333]">{{ item.projectTypeName }}</span>
+                <span v-if="item.count" class="color-[#999999]">{{ item.count }}份图纸</span>
               </li>
             </ul>
-            <div v-if="!hotItems.length" class="text-12px color-#999">无数据</div>
+            <div v-if="!hotItems.length" class="text-[12px] color-[#999]">无数据</div>
           </div>
         </div>
         <!-- 按钮区域 -->
         <div class="flex items-center">
           <button
-            class="h-40px w-111px cursor-pointer border-width-1px border-color-#1A65FF rounded-bl-0px rounded-br-4px rounded-tl-0px rounded-tr-4px border-none border-solid text-center text-14px color-#fff bg-#1A65FF!"
+            class="h-[40px] w-[111px] cursor-pointer border-width-[1px] border-color-[#1A65FF] rounded-bl-[0px] rounded-br-[4px] rounded-tl-[0px] rounded-tr-[4px] border-none border-solid text-center text-[14px] color-[#fff] !bg-[#1A65FF]"
           >
             搜索
           </button>
           <button
-            class="m-l-16px h-40px w-111px cursor-pointer border-width-1px border-color-#E7B03B rounded-bl-6px rounded-br-6px rounded-tl-4px rounded-tr-6px border-none border-solid text-14px color-#fff bg-#E7B03B!"
+            class="m-l-[16px] h-[40px] w-[111px] cursor-pointer border-width-[1px] border-color-[#E7B03B] rounded-bl-[6px] rounded-br-[6px] rounded-tl-[4px] rounded-tr-[6px] border-none border-solid text-[14px] color-[#fff] !bg-[#E7B03B]"
             @click="handleUpload"
           >
             上传图纸
@@ -61,7 +61,7 @@
 <script setup lang="ts">
   import { onMounted, ref } from 'vue'
   import { Search } from '@element-plus/icons-vue'
-  import useUserStore from '~/store/user'
+  import useUserStore from '~/stores/user'
   const userStore = useUserStore()
 
   import { top } from '~/api/home/index'
@@ -76,7 +76,7 @@
     // 是否登录
     if (!userStore.token) return ElMessage.error('请先登录')
     // 新开窗口 用router跳转 新窗口打开
-    navigateTo('/upnew/drawe')
+    navigateTo('/upnew')
   }
 
   const loading = ref(false)
@@ -116,16 +116,17 @@
   }
 
   const handleHotItem = (item: ProjectDrawStatisticAppRespVO) => {
-    const normal = { id: '0', name: '图纸库', isChildren: false }
-    const level = item.pairs?.filter(Boolean).map((item) => ({ id: item?.id, name: item?.name, isChildren: false })) || []
-    level.unshift(normal)
-    if (item.type === 1) {
-      navigateTo(`/drawe?level=${JSON.stringify(level)}&keywords=${item.title || ''}`,)
-    } else if (item.type === 2) {
-      navigateTo(`/text?level=${JSON.stringify(level)}&keywords=${item.title || ''}`,)
-    } else if (item.type === 3) {
-      navigateTo(`/model?level=${JSON.stringify(level)}&keywords=${item.title || ''}`,)
-    }
+    // const normal = { id: '0', name: '图纸库', isChildren: false }
+    // const level = item.pairs?.filter(Boolean).map((item) => ({ id: item?.id, name: item?.name, isChildren: false })) || []
+    // level.unshift(normal)
+    // if (item.type === 1) {
+    //   navigateTo(`/drawe?level=${JSON.stringify(level)}&keywords=${item.title || ''}`,)
+    // } else if (item.type === 2) {
+    //   navigateTo(`/text?level=${JSON.stringify(level)}&keywords=${item.title || ''}`,)
+    // } else if (item.type === 3) {
+    //   navigateTo(`/model?level=${JSON.stringify(level)}&keywords=${item.title || ''}`,)
+    // }
+    navigateTo(`/drawe/${item.projectType}/1/12/-1`)
   }
 
   onMounted(() => {

components/kl-wallpaper-category/index.vue

@@ -1,30 +1,38 @@
 <template>
   <!-- 面包屑 -->
-  <div v-if="level.length > 1" class="mb-[-10px] mt-[20px] pl-[20px]">
+  <div v-if="breadList && breadList.length > 1" class="mb-[-10px] mt-[20px] pl-[20px]">
     <el-breadcrumb :separator-icon="ArrowRight">
-      <el-breadcrumb-item v-for="(item, index) in level" :key="item.name" class="cursor-pointer"
-        @click="handleClickBread(item, index)">{{
-          item.name
-        }}</el-breadcrumb-item>
+      <el-breadcrumb-item v-for="(item, index) in breadList" :key="item.name" class="cursor-pointer" @click="handleClickBread(item, index)">{{
+        item.name
+      }}</el-breadcrumb-item>
     </el-breadcrumb>
   </div>
   <div class="mt-[30px] box-border w-[100%] border border-[#EEEEEE] rounded-[12px] border-solid bg-[#FFFFFF] px-[20px] py-[26px]">
     <div class="mb-[14px] flex items-start">
       <div class="flex-shrink-0 text-[15px] text-[#333333] font-normal">{{ computType }}分类</div>
       <div class="ml-[30px] mt-[-6px] flex flex-wrap">
-        <div v-for="(item, index) in projectTypeList" :key="index"
+        <div
+          v-for="(item, index) in projectTypeList"
+          :key="index"
           class="mb-[8px] mr-[26px] cursor-pointer rounded-[15px] px-[15px] py-[6px] text-[14px] text-[#666666] font-normal"
-          :class="item.id === query.projectType ? '!bg-[#ebeefe] !text-[#1A65FF]' : ''" @click="handleClick(item)">{{
-            item.name }}</div>
+          :class="item.id === query.projectType ? '!bg-[#ebeefe] !text-[#1A65FF]' : ''"
+          @click="handleClick(item)"
+          >{{ item.name }}</div
+        >
       </div>
     </div>
     <div class="flex items-start">
       <div class="flex-shrink-0 text-[15px] text-[#333333] font-normal">软件分类</div>
       <div class="ml-[30px] mt-[-6px] flex flex-wrap">
-        <div v-for="(item, index) in editionsList" :key="index"
+        <div
+          v-for="(item, index) in editionsList"
+          :key="index"
           class="mb-[8px] mr-[26px] cursor-pointer rounded-[15px] px-[15px] py-[6px] text-[14px] text-[#666666] font-normal"
-          :class="item.id === query.editions ? '!bg-[#ebeefe] !text-[#1A65FF]' : ''" @click="query.editions = item.id">
-          {{ item.name }}</div>
+          :class="item.id === query.editions ? '!bg-[#ebeefe] !text-[#1A65FF]' : ''"
+          @click="query.editions = item.id"
+        >
+          {{ item.name }}</div
+        >
       </div>
     </div>
     <!-- <div class="mb-14px flex items-start">
@@ -43,123 +51,140 @@
   </div>
 </template>
 <script setup lang="ts">
-import { computed, ref } from 'vue'
-import { parent } from '~/api/upnew/index'
-import type { pageReq } from '~/api/upnew/types'
-import { ArrowRight } from '@element-plus/icons-vue'
+  import { computed, ref } from 'vue'
+  import { parent } from '~/api/upnew/index'
+  import type { pageReq } from '~/api/upnew/types'
+  import { getDictTree } from '~/api/home/index'
+  import { ArrowRight } from '@element-plus/icons-vue'
 
-const props = defineProps({
-  type: {
-    type: Number,
-    default: 1,
-  },
-  id: {
-    type: String,
-    default: '',
-  },
-  groundId: {
-    type: String,
-    default: '',
-  },
-})
+  const props = defineProps({
+    type: {
+      type: Number,
+      default: 1,
+    },
+    id: {
+      type: String,
+      default: '',
+    },
+    groundId: {
+      type: String,
+      default: '',
+    },
+  })
 
-const query = defineModel<pageReq>('modelValue', {
-  required: true,
-})
-const level = defineModel<{ id: string; name: string; isChildren?: boolean }[]>('level', {
-  required: true,
-})
+  const query = defineModel<pageReq>('modelValue', {
+    required: true,
+  })
+  // const level = defineModel<{ id: string; name: string; isChildren?: boolean }[]>('level', {
+  //   required: true,
+  // })
 
-const computType = computed(() => {
-  return props.type === 1 ? '图纸' : props.type === 3 ? '模型' : '文本'
-})
+  const computType = computed(() => {
+    return props.type === 1 ? '图纸' : props.type === 3 ? '模型' : '文本'
+  })
 
-
-
-
-
-
-
-const handleParentId = (type?: string) => {
-  if (level?.value?.length > 1) {
-    if (type === 'init' && level.value.find((c: any) => c.isChildren)) {
-      return level.value[level.value.length - 2].id || '' // 获取最后一个元素的 id 或 defaul
+  // 获取面包屑
+  const { data: breadList } = await useAsyncData(
+    `breadList-${props.type}-${props.id}-${query.value.projectType}-${Date.now()}`,
+    async () => {
+      const res = await getDictTree({ type: 1, id: query.value.projectType })
+      const all = [
+        {
+          id: -1,
+          name: props.type === 1 ? '图纸库' : props.type === 3 ? '模型库' : '文本库',
+          isChildren: false,
+        },
+      ]
+      const arr = [...res.data, ...all]
+      return arr.reverse()
+    },
+    {
+      immediate: true,
     }
-    return level.value[level.value.length - 1].id || '' // 获取最后一个元素的 id 或 defaul
+  )
+
+  console.log('breadList', breadList);
+  
+  // const projectTypeList = ref<any>([])
+  /** 获取分类下拉框 */
+  // const getParent = (type?: string) => {
+  //   parent({
+  //     type: 1,
+  //     parentId: handleParentId(type),
+  //   }).then((res) => {
+  //     if (Array.isArray(res.data)) {
+  //       // projectTypeList.value = [...[{ id: handleParentId(type), name: '全部' }], ...res.data]
+  //     }
+  //   })
+  // }
+  // getParent('init')
+
+  /** 版本 */
+  // const editionsList = ref<any>([])
+  // const getEditionsList = () => {
+  //   parent({
+  //     type: 2,
+  //     parentId: 0,
+  //   }).then((res) => {
+  //     if (Array.isArray(res.data)) {
+  //       // editionsList.value = [...[{ id: '', name: '全部' }], ...res.data]
+  //     }
+  //   })
+  // }
+  // getEditionsList()
+
+  /**获取分类下拉框 */
+  const { data: projectTypeList } = await useAsyncData(
+    `projectType-draw-${props.type}-${query.value.projectType}`,
+    async () => {
+      let parentId: any = '0'
+      if (breadList?.value && breadList?.value.length > 1) {
+        if (breadList.value.length > 2) {
+          const length = breadList.value?.length
+          parentId = breadList?.value[length - 2].id
+        } else {
+          const length = breadList.value?.length
+          parentId = breadList?.value[length - 1].id
+        }
+      }
+      const res = await parent({ type: 1, parentId: parentId })
+      const all = [{ id: parentId === '0' ? '-1' : parentId, name: '全部' }]
+      return [...all, ...res.data]
+    },
+    {
+      immediate: true,
+    }
+  )
+
+  /** 版本 */
+  const { data: editionsList } = useAsyncData(`editionsList-${props.type}-${Date.now()}`, async () => {
+    const res = await parent({ type: 2, parentId: 0 })
+    const all = [{ id: '-1', name: '全部' }]
+    return [...all, ...res.data]
+  })
+
+  const handleClick = (row: any) => {
+    query.value.title = ''
+    query.value.projectType = row.id
+    // if (row.name === '全部') return
+    // const isChildren = breadList.value.find((c: any) => c.isChildren)
+    // if (!row.isChildren && isChildren) {
+    //   const index = breadList.value.length - 1
+    //   breadList.value[index] = { id: row.id, name: row.name, isChildren: true }
+    // } else if (!row.isChildren && !isChildren) {
+    //   breadList.value.push({ id: row.id, name: row.name, isChildren: true })
+    // } else {
+    //   breadList.value.push({ id: row.id, name: row.name })
+    //   // getParent()
+    //   refresh()
+    // }
   }
-  return '0'
-}
 
-// const projectTypeList = ref<any>([])
-/** 获取分类下拉框 */
-// const getParent = (type?: string) => {
-//   parent({
-//     type: 1,
-//     parentId: handleParentId(type),
-//   }).then((res) => {
-//     if (Array.isArray(res.data)) {
-//       // projectTypeList.value = [...[{ id: handleParentId(type), name: '全部' }], ...res.data]
-//     }
-//   })
-// }
-// getParent('init')
-
-/** 版本 */
-// const editionsList = ref<any>([])
-// const getEditionsList = () => {
-//   parent({
-//     type: 2,
-//     parentId: 0,
-//   }).then((res) => {
-//     if (Array.isArray(res.data)) {
-//       // editionsList.value = [...[{ id: '', name: '全部' }], ...res.data]
-//     }
-//   })
-// }
-// getEditionsList()
-
-
-
-/** 是否是初始化 */
-const queryType = ref('init')
-/**获取分类下拉框 */
-const { data: projectTypeList, refresh } = useAsyncData(`projectType-draw-${props.type}-${Date.now()}`, async () => {
-   const res = await parent({ type: 1, parentId: handleParentId(queryType.value) })
-   const all= [{ id: handleParentId(queryType.value), name: '全部' }]
-   return [...all, ...res.data]
-})
-
-/** 版本 */
-const { data: editionsList } = useAsyncData(`editionsList-${props.type}-${Date.now()}`, async () => {
-  const res = await parent({ type: 2, parentId: 0 })
-  const all = [{ id: '', name: '全部' }]
-  return [...all, ...res.data]
-})
-
-const handleClick = (row: any) => {
-  query.value.title = ''
-  query.value.projectType = row.id
-  if (row.name === '全部') return
-  const isChildren = level.value.find((c: any) => c.isChildren)
-  if (!row.isChildren && isChildren) {
-    const index = level.value.length - 1
-    level.value[index] = { id: row.id, name: row.name, isChildren: true }
-  } else if (!row.isChildren && !isChildren) {
-    level.value.push({ id: row.id, name: row.name, isChildren: true })
-  } else {
-    level.value.push({ id: row.id, name: row.name })
+  const handleClickBread = (row: any, index: number) => {
+    // breadList.value.splice(index + 1)
+    query.value.title = ''
+    query.value.projectType = row.id
     // getParent()
-    queryType.value = ''
-    refresh()
+    // refresh()
   }
-}
-
-const handleClickBread = (row: any, index: number) => {
-  level.value.splice(index + 1)
-  query.value.title = ''
-  query.value.projectType = row.id
-  // getParent()
-  queryType.value = ''
-  refresh()
-}
 </script>

components/model-components/RecommendedColumnsV2.vue

@@ -1,17 +1,17 @@
 <template>
-  <div class="relative mt-34px w-100%">
+  <div class="relative mt-[34px] w-[100%]">
     <KlTabBar v-model="query.source" :data="tabBar" />
-    <div class="absolute right-0px top-10px text-16px text-[#999999] font-normal"
-      >共<span class="color-#1A65FF">{{ result.total }}</span
+    <div class="absolute right-[0px] top-[10px] text-[16px] text-[#999999] font-normal"
+      >共<span class="color-[#1A65FF]">{{ result?.total }}</span
       >个筛选结果</div
     >
-    <div class="content mt-10px">
+    <div class="content mt-[10px]">
       <el-row :gutter="20">
-        <el-col v-for="(item, index) in result.list" :key="index" :span="6">
+        <el-col v-for="(item, index) in result?.list" :key="index" :span="6">
           <CardPicture :item-info="item" />
         </el-col>
       </el-row>
-      <el-empty v-if="!result.list.length" :image="emptyImg"></el-empty>
+      <el-empty v-if="!result?.list.length" :image="emptyImg"></el-empty>
     </div>
   </div>
 </template>
@@ -26,14 +26,14 @@
   const query = defineModel<pageReq>('modelValue', {
     required: true,
   })
-  const result = defineModel<pageRes>('result', {
+  const result = defineModel<pageRes| null>('result', {
     required: true,
   })
 
   const tabBar = ref([
     {
       label: '模型推荐',
-      value: '',
+      value: -1,
     },
     {
       label: '原创模型',

components/seo-head/index.vue

@@ -0,0 +1,25 @@
+<script setup lang="ts">
+  const props = defineProps({
+    title: {
+      type: String,
+      required: true,
+      default: '图夕夕-世界图纸 夕夕共享',
+    },
+    description: {
+      type: String,
+      default: '图夕夕是一家图纸素材分享交易平台，提供AutoCAD/ProE/Creo/CATIA/UG/inventor/CAXA/等建筑图纸的素材下载及免费教程。',
+    },
+    keywords: {
+      type: String,
+      default: '图纸,图纸下载,设计素材,图纸大全,设计图纸,,工程图纸,cad图纸',
+    },
+  })
+
+  useHead({
+    title: `${props.title} - 图夕夕`,
+    meta: [
+      { name: 'description', content: `${props.description}`},
+      { name: 'keywords', content: props.keywords },
+    ],
+  })
+</script>

components/text-components/RecommendedColumnsV2.vue

@@ -1,17 +1,17 @@
 <template>
-  <div class="relative mt-34px w-100%">
+  <div class="relative mt-[34px] w-[100%]">
     <KlTabBar v-model="query.source" :data="tabBar" />
-    <div class="absolute right-0px top-10px text-16px text-[#999999] font-normal"
-      >共<span class="color-#1A65FF">{{ result.total }}</span
+    <div class="absolute right-[0px] top-[10px] text-[16px] text-[#999999] font-normal"
+      >共<span class="color-[#1A65FF]">{{ result?.total }}</span
       >个筛选结果</div
     >
-    <div class="content mt-10px">
+    <div class="content mt-[10px]">
       <el-row :gutter="20">
-        <el-col v-for="(item, index) in result.list" :key="index" :span="6">
+        <el-col v-for="(item, index) in result?.list" :key="index" :span="6">
           <CardPicture :item-info="item" />
         </el-col>
       </el-row>
-      <el-empty v-if="!result.list.length" :image="emptyImg"></el-empty>
+      <el-empty v-if="!result?.list?.length" :image="emptyImg"></el-empty>
     </div>
   </div>
 </template>
@@ -27,14 +27,14 @@
     required: true,
   })
 
-  const result = defineModel<pageRes>('result', {
+  const result = defineModel<pageRes | null>('result', {
     required: true,
   })
 
   const tabBar = ref([
     {
       label: '文本推荐',
-      value: '',
+      value: -1
     },
     {
       label: '原创文本',

composables/states.ts

@@ -13,6 +13,7 @@ export const useToken = () =>
     vipLevel: number | undefined,
     sex: number | undefined,
   }
+  /** 用户信息 */
   export const useUserInfo = () => useState<UserInfo>('userInfo', () => {
     return {
       nickname: '',

composables/useDollarFetchRequest.ts

@@ -1,5 +1,5 @@
 import { isArray } from "~/utils/utils";
-import refreshToken from "~/utils/RefreshToken";
+// import refreshToken from "~/utils/RefreshToken";
 
 type FetchType = typeof $fetch;
 export type FetchOptions = Parameters<FetchType>[1];
@@ -8,15 +8,15 @@ const useClientRequest = async <T = unknown>(
   url: string,
   opts?: FetchOptions
 ) => {
-  // const token = useCookie<string | undefined>("token");
+  const token = useCookie<string | undefined>("token");
   const runtimeConfig = useRuntimeConfig();
 
   const defaultOptions: FetchOptions = {
     baseURL: runtimeConfig.public.apiBase,
     onRequest({ options }) {
       options.headers = options.headers || 'application/json';
-      if (refreshToken.getToken().token) {
-        options.headers.set("Authorization", `Bearer ${refreshToken.getToken().token}`);
+      if (token.value) {
+        options.headers.set("Authorization", `Bearer ${token.value}`);
       }
     },
     onResponse({ response }) {
@@ -71,5 +71,7 @@ const useClientRequest = async <T = unknown>(
     body?: any, 
     config?: Omit<FetchOptions, 'method' | 'body'>
   ): Promise<T> => {
+    console.log({ ...config, method: 'PUT', body });
+    
     return useClientRequest<T>(endpoint, { ...config, method: 'PUT', body })
   }

composables/useFetchRequest.ts

@@ -1,84 +1,51 @@
-import { useFetch } from "#app";
-import type { UseFetchOptions } from "#app";
-import { isArray } from "~/utils/utils";
+import { useFetch } from '#app'
+import type { UseFetchOptions } from '#app'
+import { isArray } from '~/utils/utils'
 
-const useServerRequest = async <T>(
-  url: string,
-  opts?: UseFetchOptions<T, unknown>
-) => {
-  const token = useToken();
-  const user = useUserInfo();
-  const runtimeConfig = useRuntimeConfig();
+const useServerRequest = async <T>(url: string, opts?: UseFetchOptions<T, unknown>) => {
+  const token = useToken()
+  const runtimeConfig = useRuntimeConfig()
 
   const defaultOptions: UseFetchOptions<unknown> = {
     baseURL: runtimeConfig.public.apiBase,
     onRequest({ options }) {
-      options.headers = options.headers || "application/json";
+      options.headers = options.headers || {}
       if (token.value) {
-        console.log('user----', user.value);
-        
-        console.log('token----', "Bearer " + token.value)
-        // @ts-ignore
-        options.headers["authorization"] = "Bearer " + token.value;
+        options.headers.set('Authorization', `Bearer ${token.value}`)
       }
-
-      console.log(url +'-----' +'options----', options);
-      
     },
     onResponse({ response }) {
       if (+response.status === 200 && +response._data.code !== 0) {
-        process.client && ElMessage.error(response._data.msg);
+        process.client && ElMessage.error(response._data.msg)
       }
     },
     onResponseError({ response }) {
-      process.client &&
-        ElMessage.error(
-          isArray(response._data.data.msg)
-            ? response._data.data.msg[0]
-            : response._data.data.msg
-        );
+      process.client && ElMessage.error(isArray(response._data.data.msg) ? response._data.data.msg[0] : response._data.data.msg)
     },
-  };
+  }
+
   // return useFetch<T>(url, { ...defaultOptions, ...opts } as any);
   // 明确转换返回类型
-  const response = await useFetch<T>(url, { ...defaultOptions, ...opts } as any);
-  console.log(url +'-----' + 'response----', response.data.value);
-  return response.data.value as unknown as T;
-};
+  const response = await useFetch<T>(url, { ...defaultOptions, ...opts } as any)
+  return response.data.value as unknown as T
+}
 
-  // GET请求
-  export const get = <T = unknown>(
-    endpoint: string, 
-    config?: Omit<FetchOptions, 'method'>
-  ): Promise<T> => {
-    console.log(endpoint + '----' + 'config----', config);
+// GET请求
+export const get = <T = unknown>(endpoint: string, config?: Omit<FetchOptions, 'method'>): Promise<T> => {
+  return useServerRequest<T>(endpoint, { ...config, method: 'GET' })
+}
 
-    return useServerRequest<T>(endpoint, { ...config, method: 'GET' })
-  }
+// POST请求
+export const post = <T = unknown>(endpoint: string, body?: any, config?: Omit<FetchOptions, 'method' | 'body'>): Promise<T> => {
+  return useServerRequest<T>(endpoint, { ...config, method: 'POST', body })
+}
 
-    // POST请求
-  export const post = <T = unknown>(
-    endpoint: string, 
-    body?: any, 
-    config?: Omit<FetchOptions, 'method' | 'body'>
-  ): Promise<T> => {
-    return useServerRequest<T>(endpoint, { ...config, method: 'POST', body })
-  }
+// DELETE请求
+export const del = <T = unknown>(endpoint: string, config?: Omit<FetchOptions, 'method'>): Promise<T> => {
+  return useServerRequest<T>(endpoint, { ...config, method: 'DELETE' })
+}
 
-  
-  // DELETE请求
-  export const del = <T = unknown>(
-    endpoint: string, 
-    config?: Omit<FetchOptions, 'method'>
-  ): Promise<T> => {
-    return useServerRequest<T>(endpoint, { ...config, method: 'DELETE' })
-  }
-
-    // PUT请求
-  export const put = <T = unknown>(
-    endpoint: string, 
-    body?: any, 
-    config?: Omit<FetchOptions, 'method' | 'body'>
-  ): Promise<T> => {
-    return useServerRequest<T>(endpoint, { ...config, method: 'PUT', body })
-  }
+// PUT请求
+export const put = <T = unknown>(endpoint: string, body?: any, config?: Omit<FetchOptions, 'method' | 'body'>): Promise<T> => {
+  return useServerRequest<T>(endpoint, { ...config, method: 'PUT', body })
+}

middleware/auth.global.ts

@@ -0,0 +1,22 @@
+// 区分是手机端还是移动端
+
+export default defineNuxtRouteMiddleware((to, from) => {
+  if (import.meta.client) {
+    // 在客户端处理路由
+    // 是否是移动端设备
+    const isMobile = /(Android|webOS|iPhone|iPod|tablet|BlackBerry|Mobile)/i.test(navigator.userAgent)
+    // 是否是手机端路由开头
+    const isRouterMobile = to.path.startsWith('/m')
+
+    console.log(isMobile, isRouterMobile);
+    
+    // 移动端并且 不是/m开头路由
+    if (isMobile && !isRouterMobile) {
+      return navigateTo(`/m`)
+    }
+    // 不是移动端 是/m开头路由
+    if (!isMobile && isRouterMobile) {
+      return navigateTo(`/`)
+    }
+  }
+})

middleware/auth.ts

@@ -1 +0,0 @@
-// 从微信登录重定向到项目 需要获取code值

nuxt.config.ts

@@ -1,18 +1,26 @@
 // import { base_api } from '~/constants/index'
 // https://nuxt.com/docs/api/configuration/nuxt-config
+import postcsspxtoviewport from 'postcss-px-to-viewport'
 export default defineNuxtConfig({
   // devServer: {
   //   port: 6188,
   // },
 
   devtools: {
-    enabled: process.env.NODE_ENV === "development",
+    enabled: process.env.NODE_ENV === 'development',
   },
-  debug: process.env.NODE_ENV === "development",   // 开启详细调试日志
+  debug: process.env.NODE_ENV === 'development', // 开启详细调试日志
 
   ssr: true,
-  modules: ["@unocss/nuxt", "@pinia/nuxt", "@element-plus/nuxt"],
-  css: ["@unocss/reset/tailwind.css", "element-plus/dist/index.css","~/assets/scss/app.scss"],
+  modules: ['@unocss/nuxt', '@pinia/nuxt', '@element-plus/nuxt', 'pinia-plugin-persistedstate/nuxt'],
+  unocss: {
+    nuxtLayers: true,
+  },
+  elementPlus: {
+    importStyle: 'scss', // 或 'css'，确保样式被全局导入
+    themes: ['dark'], // 按需配置主题
+  },
+  css: ['element-plus/dist/index.css', '~/assets/scss/app.scss'],
   vite: {
     css: {
       preprocessorOptions: {
@@ -22,28 +30,37 @@ export default defineNuxtConfig({
       },
       postcss: {
         plugins: [
-          // postCssPxToRem({
-          //   rootValue: 16, // 结果为：设计稿元素尺寸/16，比如元素宽320px,最终页面会换算成 20rem
-          //   mediaQuery: false, //（布尔值）允许在媒体查询中转换px。
-          //   // exclude: /node_modules/, //node_modules目录下样式全部不转义
-          //   propList: ['*'] //需要做转化处理的属性如`hight`、`width`、`margin`等，`*`表示全部
-          // })
+          postcsspxtoviewport({
+            unitToConvert: 'px', // 要转化的单位
+            viewportWidth: 750, // UI设计稿的宽度
+            unitPrecision: 6, // 转换后的精度，即小数点位数
+            propList: ['*'], // 指定转换的css属性的单位，*代表全部css属性的单位都进行转换
+            viewportUnit: 'vw', // 指定需要转换成的视窗单位，默认vw
+            fontViewportUnit: 'vw', // 指定字体需要转换成的视窗单位，默认vw
+            selectorBlackList: ['el-'], // 指定不转换为视窗单位的类名,例如van-（vantUI组件），
+            minPixelValue: 1, // 默认值1，小于或等于1px则不进行转换
+            mediaQuery: true, // 是否在媒体查询的css代码中也进行转换，默认false
+            replace: true, // 是否转换后直接更换属性值
+            exclude: [/node_modules/, /^(?!.*\/pages\/m\/).*$/], // 排除node_modules和非pages/m目录下的文件
+            landscape: false, // 是否处理横屏情况
+            // 只转换pages下的m文件
+            include: [/pages\/m/],
+          }),
         ],
       },
     },
     optimizeDeps: {
-      include: ["naive-ui"],
+      include: ['naive-ui'],
     },
     // 生产环境构建优化
     build: {
       // 生产环境移除 console 和 debugger
-      minify: "esbuild",
-      target: "es2020",
+      minify: 'esbuild',
+      target: 'es2020',
     },
     esbuild: {
       // 生产环境下移除所有 console 语句和 debugger
-      drop:
-        process.env.NODE_ENV === "production" ? ["console", "debugger"] : [],
+      drop: process.env.NODE_ENV === 'production' ? ['console', 'debugger'] : [],
     },
   },
 
@@ -60,34 +77,44 @@ export default defineNuxtConfig({
     //   duration: 400,
     // },
     head: {
-      title: "图夕夕-世界图纸 夕夕共享",
+      title: '图夕夕-世界图纸 夕夕共享',
       htmlAttrs: {
-        lang: "en",
+        lang: 'en',
       },
       meta: [
-        { charset: "utf-8" },
-        { name: "viewport", content: "width=device-width, initial-scale=1" },
+        { charset: 'utf-8' },
+        { name: 'viewport', content: 'width=device-width, initial-scale=1' },
         {
-          name: "description",
-          content: "图夕夕是一家图纸素材分享交易平台，提供AutoCAD/ProE/Creo/CATIA/UG/inventor/CAXA/等建筑图纸的素材下载及免费教程。",
+          name: 'description',
+          content: '图夕夕是一家图纸素材分享交易平台，提供AutoCAD/ProE/Creo/CATIA/UG/inventor/CAXA/等建筑图纸的素材下载及免费教程。',
         },
-        { name: "keywords", content: "图纸,图纸下载,设计素材,图纸大全,设计图纸,,工程图纸,cad图纸" },
-        { name: "author", content: "图夕夕" },
+        { name: 'keywords', content: '图纸,图纸下载,设计素材,图纸大全,设计图纸,,工程图纸,cad图纸' },
+        { name: 'author', content: '图夕夕' },
         // SEO meta tags
-        { property: "og:title", content: "图纸,图纸下载,设计素材,图纸大全,设计图纸,,工程图纸,cad图纸" },
-        {
-          property: "og:description",
-          content: "图夕夕是一家图纸素材分享交易平台，提供AutoCAD/ProE/Creo/CATIA/UG/inventor/CAXA/等建筑图纸的素材下载及免费教程。",
-        },
-        { property: "og:type", content: "website" },
-        { property: "og:url", content: "https://www.xlcig.cn" },
-        { property: "og:site_name", content: "xlCig" },
-        { name: "theme-color", content: "#00f5ff" },
-        // robots meta
-        { name: "robots", content: "index, follow" },
+        // {
+        //   property: 'og:title',
+        //   content: '图纸,图纸下载,设计素材,图纸大全,设计图纸,,工程图纸,cad图纸',
+        // },
+        // {
+        //   property: 'og:description',
+        //   content: '图夕夕是一家图纸素材分享交易平台，提供AutoCAD/ProE/Creo/CATIA/UG/inventor/CAXA/等建筑图纸的素材下载及免费教程。',
+        // },
+        // { property: 'og:type', content: 'website' },
+        // { property: 'og:url', content: 'https://www.xlcig.cn' },
+        // { property: 'og:site_name', content: 'xlCig' },
+        // { name: 'theme-color', content: '#00f5ff' },
+        // // robots meta
+        // { name: 'robots', content: 'index, follow' },
       ],
       link: [
-        { rel: "icon", type: "image/x-icon", href: "/favicon2.ico" },
+        { rel: 'icon', type: 'image/x-icon', href: '/favicon2.ico' },
+        { rel: 'stylesheet', type: 'text/css', href: 'https://unpkg.com/swiper@8/swiper-bundle.css' },
+      ],
+      script: [
+        {
+          type: 'text/javascript',
+          src: 'https://unpkg.com/swiper@8/swiper-bundle.js',
+        },
       ],
     },
   },
@@ -98,22 +125,28 @@ export default defineNuxtConfig({
       apiBase: 'https://tuxixi.net',
 
       // 应用信息
-      appName: "xlCig",
-      appVersion: "1.0.0",
+      appName: 'xlCig',
+      appVersion: '1.0.0',
 
       // 调试模式
-      debug: process.env.NODE_ENV === "development",
+      debug: process.env.NODE_ENV === 'development',
 
       // 环境标识
-      environment: process.env.NODE_ENV || "development",
+      environment: process.env.NODE_ENV || 'development',
     },
   },
 
   build: {
-    transpile: ["vueuc", "@css-render/vue3-ssr","@unocss","@tinymce/tinymce-vue","tinymce"],
+    transpile: ['vueuc', '@css-render/vue3-ssr', '@tinymce/tinymce-vue', 'tinymce'],
   },
   plugins: [
     // 在这里引入插件
-    // { src: "~plugins/tinymce" ,ssr: false},
-  ]
-});
+    {
+      src: '~/plugins/wang-editor',
+      mode: 'client',
+    },
+  ],
+  piniaPluginPersistedstate: {
+    storage: 'localStorage',
+  },
+})

package.json

@@ -12,16 +12,16 @@
   "dependencies": {
     "@nuxtjs/axios": "^5.13.6",
     "@pinia/nuxt": "^0.11.2",
-    "@tinymce/tinymce-vue": "^5.0.0",
-    "@types/tinymce": "^5.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "decimal.js": "^10.6.0",
     "echarts": "^6.0.0",
     "mqtt": "^5.14.0",
     "nuxt": "^3.18.1",
     "pdfjs-dist": "^5.4.54",
     "pinia": "^3.0.3",
+    "postcss-px-to-viewport": "^1.1.1",
     "qrcode.vue": "^3.6.0",
-    "tinymce": "^6.2.0",
     "vue": "^3.5.18",
     "vue-pdf-embed": "^2.1.3",
     "vue-router": "^4.5.1",
@@ -30,8 +30,13 @@
   "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610",
   "devDependencies": {
     "@element-plus/nuxt": "^1.1.4",
+    "@pinia-plugin-persistedstate/nuxt": "^1.2.1",
+    "@types/prettier": "^3.0.0",
     "@unocss/nuxt": "^66.4.2",
+    "@vant/nuxt": "^1.0.7",
     "element-plus": "^2.10.7",
+    "postcss": "^8.5.6",
+    "prettier": "3.6.2",
     "sass": "^1.90.0",
     "unocss": "^66.4.2"
   }

pages/channel/[channelId]/[pageNo].vue

@@ -0,0 +1,99 @@
+<template>
+  <!-- 导航 -->
+  <KlNavTab active="交流频道" />
+  <div class="ma-auto mt-[30px] w-[1440px] flex">
+    <LeftContent v-model="pageReq.channelId" v-model:channelIdList="channelIdList"></LeftContent>
+    <RightContent v-model="pageRes" v-model:lun-tan-res="lunTanRes" v-model:page-no="pageReq.pageNo" @update-page-no="handleUpdatePageNo"></RightContent>
+  </div>
+</template>
+
+<script setup lang="ts">
+  import KlNavTab from '~/components/kl-nav-tab/index.vue'
+  import LeftContent from '../components/LeftContent.vue'
+  import RightContent from '../components/RightContent.vue'
+  import { page, getChannelLunTanDetail, list } from '~/api/channel/index'
+  import { reactive, watch, ref } from 'vue'
+  import type { TpageRes, ChannelRespVO } from '~/api/channel/types'
+
+  const route = useRoute()
+  const channelId = computed(() => (route.params.channelId as string) || '')
+  const pageNo = computed(() => Number(route.params.pageNo) || 1)
+
+  const pageReq = reactive({
+    pageNo: pageNo.value,
+    pageSize: 10,
+    channelId: channelId.value, //  频道ID
+  })
+  //   const pageRes = reactive<TpageRes>({
+  //     list: [],
+  //     total: 0,
+  //   })
+
+  // 获取频道列表
+  const { data: channelIdList } = await useAsyncData(`prod-api/app-api/business/channel/list-${Date.now()}`, async () => {
+    const res = await list()
+    return res.data as any[]
+  })
+
+  console.log(channelIdList)
+
+  // 获取第一个论坛详情
+  // if (!channelIdList.value?.length) return
+  const { data: lunTanRes, execute: refreshLunTanDetail } = await useAsyncData(
+    `prod-api/app-api/business/channel/detail-${Date.now()}`,
+    async () => {
+      if (!channelId.value) return null // 无参数时不请求
+      const res = await getChannelLunTanDetail({
+        id: channelId.value,
+      })
+      return res.data as ChannelRespVO
+    },
+    {
+      immediate: true,
+    }
+  )
+
+  const { data: pageRes, refresh: getPage } = await useAsyncData(`prod-api/app-api/business/posts/page-${Date.now()}`, async () => {
+    const res = await page(pageReq)
+    return res.data as TpageRes
+  })
+  // 获得频道帖子分页
+  //   const getPage = () => {
+  //     page(pageReq).then((res) => {
+  //       pageRes.list = res.data.list
+  //       pageRes.total = res.data.total
+  //     })
+  //   }
+  //   getPage()
+
+  const handleUpdatePageNo = (pageNo: number) => {
+    pageReq.pageNo = pageNo
+    navigateTo(`/channel/${channelId.value}/${pageNo}`)
+    // getPage()
+  }
+
+  // 获取论坛详情
+  // const lunTanRes = ref({} as ChannelRespVO)
+  // const getLunTanDetaiil = (val: string) => {
+  //   getChannelLunTanDetail({
+  //     id: val,
+  //   }).then((res) => {
+  //     lunTanRes.value = res.data
+  //   })
+  // }
+
+  //   watch(
+  //     () => channelId.value,
+  //     (val) => {
+  //       if (val) {
+  //         // 更新分页请求的channelId
+  //         pageReq.channelId = val
+  //         // 重新请求分页数据和论坛详情
+  //         getPage()
+  //         refreshLunTanDetail() // 刷新论坛详情
+  //       }
+  //     }
+  //   )
+</script>
+
+<style lang="scss" scoped></style>

pages/channel/components/ChannelHeader.vue

@@ -4,12 +4,12 @@
       <!-- Logo and Title Section -->
       <div class="logo-title-section">
         <div class="logo">
-          <img :src="lunTanRes.channelIcon" alt="JRS Logo" />
+          <img :src="lunTanRes?.channelIcon" alt="JRS Logo" />
         </div>
         <div class="title-section">
-          <h1 class="main-title">#{{ lunTanRes.channelTitle }}</h1>
+          <h1 class="main-title">#{{ lunTanRes?.channelTitle }}</h1>
           <div class="action-buttons">
-            <el-button v-if="!lunTanRes.isFollow" type="danger" class="subscribe-btn" @click="handleFollow"
+            <el-button v-if="!lunTanRes?.isFollow" type="danger" class="subscribe-btn" @click="handleFollow"
               ><el-icon class="mr-[4px] color-[#fff!]"><Plus /></el-icon> 关注
             </el-button>
             <el-button v-else type="danger" class="subscribe-btn" @click="handleUnfollow"> 取消关注 </el-button>
@@ -21,7 +21,7 @@
           <!-- Channel Info -->
           <div class="channel-info">
             <span class="info-item">话题介绍</span>
-            <span class="info-item">{{ lunTanRes.channelProfile }}</span>
+            <span class="info-item">{{ lunTanRes?.channelProfile }}</span>
           </div>
 
           <!-- Stats -->
@@ -32,20 +32,20 @@
             </div>
             <div class="stats-item">
               <span class="stats-label">关注人数</span>
-              <span class="stats-value"><i class="el-icon-arrow-up"></i> {{ lunTanRes.followCount }}人</span>
+              <span class="stats-value"><i class="el-icon-arrow-up"></i> {{ lunTanRes?.followCount }}人</span>
             </div>
             <div class="stats-item">
               <span class="stats-label">当前有</span>
-              <span class="stats-value"><i class="el-icon-arrow-up"></i> {{ lunTanRes.chatUserCount }}人聊天</span>
-              <span class="stats-value ml-[2px] cursor-pointer color-[#1a65ff!]" @click="handleChat">立即加入</span>
+              <span class="stats-value"><i class="el-icon-arrow-up"></i> {{ lunTanRes?.chatUserCount }}人聊天</span>
+              <span class="stats-value ml-[2px] cursor-pointer !color-[#1a65ff]" @click="handleChat">立即加入</span>
             </div>
           </div>
 
           <!-- Tags -->
           <div class="channel-tags">
             <span class="tag-label">标签:</span>
-            <span v-for="(item, index) in lunTanRes.hotTags" :key="index" class="tag-item"
-              >{{ item }}{{ index === lunTanRes.hotTags.length - 1 ? '' : '、' }}</span
+            <span v-for="(item, index) in lunTanRes?.hotTags" :key="index" class="tag-item"
+              >{{ item }}{{ index === lunTanRes!.hotTags.length - 1 ? '' : '、' }}</span
             >
           </div>
         </div>
@@ -55,9 +55,9 @@
     <ChatPage
       v-if="isChat"
       v-model:is-chat="isChat"
-      :chat-title="lunTanRes.channelTitle"
-      :chat-description="lunTanRes.channelProfile"
-      :channel-id="lunTanRes.channelId"
+      :chat-title="lunTanRes!.channelTitle"
+      :chat-description="lunTanRes!.channelProfile"
+      :channel-id="lunTanRes!.channelId"
     />
   </div>
 </template>
@@ -68,28 +68,40 @@
   import type { ChannelRespVO } from '~/api/channel/types'
   import { createChannelFollow, deleteChannelFollow } from '~/api/channel/index'
   import ChatPage from '~/pages/chat-page/index.vue'
-  import useUserStore from '~/store/user'
+  import useUserStore from '~/stores/user'
   const userStore = useUserStore()
 
-  const lunTanRes = defineModel<ChannelRespVO>('modelValue', {
+  const lunTanRes = defineModel<ChannelRespVO | null>('modelValue', {
     required: true,
   })
 
   const handleClick = () => {
-    navigateTo('/channel/create?channelId=' + lunTanRes.value.channelId)
+    if (!userStore.token) {
+      ElMessage.warning('请先登录')
+      return
+    }
+    navigateTo('/channel/create?channelId=' + lunTanRes.value?.channelId)
   }
   const handleFollow = () => {
-    createChannelFollow({ channelId: lunTanRes.value.channelId }).then((res) => {
+    if (!userStore.token) {
+      ElMessage.warning('请先登录')
+      return
+    }
+    createChannelFollow({ channelId: lunTanRes.value!.channelId }).then((res) => {
       if (res.code === 0) {
-        lunTanRes.value.isFollow = true
+        lunTanRes.value!.isFollow = true
         ElMessage.success('关注成功')
       }
     })
   }
   const handleUnfollow = () => {
-    deleteChannelFollow({ channelId: lunTanRes.value.channelId }).then((res) => {
+    if (!userStore.token) {
+      ElMessage.warning('请先登录')
+      return
+    }
+    deleteChannelFollow({ channelId: lunTanRes.value!.channelId }).then((res) => {
       if (res.code === 0) {
-        lunTanRes.value.isFollow = false
+        lunTanRes.value!.isFollow = false
         ElMessage.success('取消关注成功')
       }
     })
@@ -103,7 +115,7 @@
       ElMessage.warning('请先登录')
       return
     }
-    await userStore.mqttClient?.subscribe(`zbjk_message_group/${lunTanRes.value.channelId}`)
+    await userStore.mqttClient?.subscribe(`zbjk_message_group/${lunTanRes.value!.channelId}`)
     isChat.value = true
   }
 </script>

pages/channel/components/HotLlabel.vue

@@ -16,27 +16,32 @@
   </div>
 </template>
 <script setup lang="ts">
-  import { ref } from 'vue'
-  import { list } from '~/api/channel/index'
+  // import { ref } from 'vue'
+  // import { list } from '~/api/channel/index'
 
   const channelId = defineModel('modelValue', {
     required: true,
   })
+
+  const channelIdList = defineModel<any[]>('channelIdList', {
+    required: true,
+  })
   /** 获取频道列表 */
-  const channelIdList = ref<any>([])
-  const getChannelIdList = () => {
-    list().then((res) => {
-      channelIdList.value = res.data
-      if (channelIdList.value.length > 0) {
-        channelId.value = channelIdList.value[0].channelId
-      }
-    })
-  }
-  getChannelIdList()
+  // const channelIdList = ref<any>([])
+  // const getChannelIdList = () => {
+  //   list().then((res) => {
+  //     channelIdList.value = res.data
+  //     if (channelIdList.value.length > 0) {
+  //       channelId.value = channelIdList.value[0].channelId
+  //     }
+  //   })
+  // }
+  // getChannelIdList()
 
   const handleClick = (id: number) => {
     console.log(id)
     channelId.value = id
+    navigateTo(`/channel/${id}/1`)
   }
 </script>
 

pages/channel/components/LeftContent.vue

@@ -2,7 +2,7 @@
   <!-- 用户信息 -->
   <div class="flex flex-col">
     <UserInfo></UserInfo>
-    <HotLlabel v-model="channelId" class="mt-18px"></HotLlabel>
+    <HotLlabel v-model="channelId" class="mt-18px" v-model:channelIdList="channelIdList"></HotLlabel>
   </div>
 </template>
 
@@ -13,6 +13,10 @@
   const channelId = defineModel('modelValue', {
     required: true,
   })
+
+  const channelIdList = defineModel<any>('channelIdList', {
+    required: true,
+  })
 </script>
 
 <style scoped></style>

pages/channel/components/RightContent.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="ml-[19px] w-[100%]">
-    <ChannelHeader v-if="Object.keys(lunTanRes).length" v-model="lunTanRes"></ChannelHeader>
-    <div class="mb-[13px] box-border flex flex-1 flex-col cursor-pointer gap-[12px] border border-[#EEEEEE] rounded-[8px] border-solid bg-[#FFFFFF] px-[20px] py-[16px]">
+    <ChannelHeader v-if="Object.keys(lunTanRes || {}).length" v-model="lunTanRes"></ChannelHeader>
+    <div
+      class="mb-[13px] box-border flex flex-1 flex-col cursor-pointer gap-[12px] border border-[#EEEEEE] rounded-[8px] border-solid bg-[#FFFFFF] px-[20px] py-[16px]"
+    >
       <div
         v-for="(item, index) in pageRes?.list"
         :key="index"
@@ -46,7 +48,7 @@
   const pageRes = defineModel<TpageRes | null>('modelValue', {
     required: true,
   })
-  const lunTanRes = defineModel<ChannelRespVO>('lunTanRes', {
+  const lunTanRes = defineModel<ChannelRespVO | null>('lunTanRes', {
     required: true,
   })
   const pageNo = defineModel<number>('pageNo', {
@@ -73,7 +75,7 @@
 
   const handleClick = (channelId: number) => {
     // 新开窗口
-    window.open(`/chat-detail?channelId=${channelId}`, '_blank')
+    navigateTo(`/chat-detail/${channelId}-1`)
   }
 </script>
 

pages/channel/components/UserInfo.vue

@@ -36,7 +36,7 @@
 </template>
 
 <script setup lang="ts">
-  import useUserStore from '~/store/user'
+  import useUserStore from '~/stores/user'
   const userStore = useUserStore()
   const handleClick = () => {
     // 判断是否登录
@@ -44,6 +44,6 @@
       ElMessage.warning('请先登录')
       return
     }
-    window.open('/channel/create', '_blank')
+    navigateTo('/channel/create')
   }
 </script>

pages/channel/create/index.vue

@@ -35,53 +35,46 @@
         <KlUploader v-model:file-list="formData.postsCover" :limit="1" :size="1" tips="上传图片支持jpg/gif/png格式"> </KlUploader>
       </el-form-item> -->
     </el-form>
+    <div style="border: 1px solid #eeeeee; margin-top: 10px" class="rounded">
+      <WeToolbar style="border-bottom: 1px solid #eeeeee" :editor="editorRef" :defaultConfig="toolbarConfig" :mode="mode" />
 
-    <ClientOnly>
-      <Editor :id="tinymceId" v-model="myValue" :init="init" :disabled="disabled" :placeholder="placeholder" />
-    </ClientOnly>
+      <WeEditor
+        style="min-height: 300px; overflow-y: hidden"
+        v-model="valueHtml"
+        :defaultConfig="editorConfig"
+        :mode="mode"
+        @onCreated="handleCreated"
+        @onChange="handleChange"
+        @onDestroyed="handleDestroyed"
+        @onFocus="handleFocus"
+        @onBlur="handleBlur"
+        @customAlert="customAlert"
+        @customPaste="customPaste"
+      />
+    </div>
     <!-- 按钮区域 -->
     <div class="mt-[20px] flex justify-end">
-      <el-button :loading="post_loading" class="mr-[10px]" @click="previewContent">预览</el-button>
+      <!-- <el-button :loading="post_loading" class="mr-10px" @click="previewContent">预览</el-button> -->
       <el-button :loading="post_loading" type="primary" @click="saveContent">发表</el-button>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-  import { keywords } from '~/api/upnew/index'
+  import { keywords } from '@/api/upnew/index'
   import { reactive, ref, onMounted } from 'vue'
   import { useRouter, useRoute } from 'vue-router'
   const router = useRouter()
   const route = useRoute()
-  import { create, list } from '~/api/channel/index'
-  import { parent,parentV2 } from '~/api/upnew/index'
-  import { upload } from '~/api/common/index' // 自定义上传方法
-  import Editor from '@tinymce/tinymce-vue'
-  import tinymce from 'tinymce/tinymce'
-  import 'tinymce/themes/silver'
-  import 'tinymce/themes/silver/theme'
-  import 'tinymce/models/dom'
-  import 'tinymce/icons/default'
-  import 'tinymce/icons/default/icons'
-  // 引入编辑器插件
-  import 'tinymce/plugins/code' //编辑源码
-  import 'tinymce/plugins/image' //插入编辑图片
-  import 'tinymce/plugins/media' //插入视频
-  import 'tinymce/plugins/link' //超链接
-  import 'tinymce/plugins/preview' //预览
-  // import 'tinymce/plugins/template' //模板
-  import 'tinymce/plugins/table' //表格
-  import 'tinymce/plugins/pagebreak' //分页
-  import 'tinymce/plugins/lists' //列
-  import 'tinymce/plugins/advlist' //列
-  import 'tinymce/plugins/quickbars' //快速工具条
-  import 'tinymce/plugins/wordcount' // 字数统计插件
-  // import 'tinymce/langs/zh-Hans'
-//   import 'tinymce/skins/ui/oxide/skin.min.css'  
-// import 'tinymce/skins/ui/oxide/content.min.css'
-// import 'tinymce/skins/content/default/content.css'
-  // import '~/assets/tinymce/langs/zh-Hans.js' //下载后的语言包
-  // import 'tinymce/skins/content/default/content.css'
+  import { create, list } from '@/api/channel/index'
+  import { parent } from '@/api/upnew/index'
+  import { upload } from '@/api/common/index' // 自定义上传方法
+  import '@wangeditor/editor/dist/css/style.css' // 引入 css
+  // import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
+  import { onBeforeUnmount, shallowRef } from 'vue'
+
+  import useUserStore from '~/stores/user'
+  const userStore = useUserStore()
   // 获取从其他地方传过来的参数
   const channelId = route.query.channelId as string
 
@@ -122,112 +115,60 @@
       default: () => ({}),
     },
   })
-  //用于接收外部传递进来的富文本
-  const myValue = ref(props.value)
-  const tinymceId = ref('vue-tinymce-' + +new Date() + ((Math.random() * 1000).toFixed(0) + ''))
-  const init = reactive({
-    selector: '#' + tinymceId.value, //富文本编辑器的id,
-    language_url: '/_nuxt/static/tinymce/langs/zh_CN.js', // 语言包的路径，具体路径看自己的项目，文档后面附上中文js文件
-    language: 'zh-Hans', //语言
-    skin_url: '/_nuxt/static/tinymce/skins/ui/oxide', // skin路径，具体路径看自己的项目
-    content_css: '/_nuxt/static/tinymce/skins/content/default/content.css',
-    menubar: true, //顶部菜单栏显示
-    statusbar: true, // 底部的状态栏
-    plugins: props.plugins,
-    toolbar: props.toolbar,
-    toolbar_mode: 'sliding',
-    font_formats: 'Arial=arial,helvetica,sans-serif; 宋体=SimSun; 微软雅黑=Microsoft Yahei; Impact=impact,chicago;', //字体
-    paste_convert_word_fake_lists: false, // 插入word文档需要该属性
-    font_size_formats: '12px 14px 16px 18px 22px 24px 36px 72px', //文字大小
-    height: props.height, //编辑器高度
-    placeholder: props.placeholder,
-    branding: false, //是否禁用"Powered by TinyMCE"
-    promotion: false, //禁用升级按钮
-    image_dimensions: false, //去除宽高属性
-    paste_webkit_styles: 'all',
-    paste_merge_formats: true,
-    nonbreaking_force_tab: false,
-    paste_auto_cleanup_on_paste: false,
-    file_picker_types: 'file',
-    resize: true,
-    elementpath: true,
-    content_style: `img {max-width:100%;} body{background-color: #fff;}`, // 直接自定义可编辑区域的css样式
-    templates: props.templates,
-    quickbars_selection_toolbar: 'forecolor backcolor bold italic underline strikethrough link',
-    quickbars_image_toolbar: 'alignleft aligncenter alignright',
-    quickbars_insert_toolbar: false,
-    image_caption: true,
-    image_advtab: true,
-    convert_urls: false,
-    images_upload_url: import.meta.env.VITE_BASE_API,
-    images_upload_handler: function (blobInfo: any, progress: any) {
-      console.log(blobInfo, progress)
-      return new Promise((resolve, reject) => {
-        const data = new FormData()
-        data.append('file', blobInfo.blob())
-        data.append('fieldName', blobInfo.filename())
-        upload('/prod-api/app-api/infra/file/upload', data)
-          .then((res) => {
-            resolve(res.data)
-          })
-          .catch(() => {
-            reject('Image upload failed')
-          })
-      })
-    },
 
-    // 添加自定义按钮
-    setup: function (editor: any) {
-      if (process.client) {
-          // 注册一个新的视频上传按钮
-          editor.ui.registry.addButton('customvideoupload', {
-            icon: 'embed', // 使用嵌入媒体图标
-            tooltip: '上传视频',
-            onAction: function () {
-              // 创建文件输入元素
-              const input = document.createElement('input')
-              input.setAttribute('type', 'file')
-              input.setAttribute('accept', 'video/*')
+  const mode = 'default'
 
-              // 处理文件选择事件
-              input.onchange = function () {
-                if (input.files && input.files[0]) {
-                  const file = input.files[0]
-                  const data = new FormData()
-                  data.append('file', file)
-                  data.append('fieldName', file.name)
+  const isClient = ref(false)
+  if (import.meta.client) {
+    isClient.value = true
+  }
 
-                  // 可以在这里添加上传进度显示
+  // 编辑器实例，必须用 shallowRef
+  const editorRef = shallowRef()
 
-                  upload('/prod-api/app-api/infra/file/upload', data)
-                    .then((res) => {
-                      // 插入视频到编辑器
-                      editor.insertContent(`
-                      <video controls width="400">
-                        <source src="${res.data}" type="video/${file.name.split('.').pop()}">
-                        您的浏览器不支持视频标签
-                      </video>
-                    `)
-                    })
-                    .catch((error) => {
-                      console.error('视频上传失败:', error)
-                      // 可以添加错误提示
-                    })
-                }
-              }
+  // 内容 HTML
+  const valueHtml = ref('<p></p>')
 
-              // 触发文件选择
-              input.click()
-            },
-          })
-
-      }
-    },
-
-    preview_styles: true,
-    ...props.options,
+  // 模拟 ajax 异步获取内容
+  onMounted(() => {
+    setTimeout(() => {
+      valueHtml.value = '<p></p>'
+    }, 1500)
   })
 
+  const toolbarConfig = {}
+  const editorConfig = {
+    placeholder: '请输入内容...',
+    // 上传图片的配置
+    MENU_CONF: {
+      uploadImage: {
+        server: 'https://tuxixi.net/prod-api/app-api/infra/file/upload',
+        fieldName: 'file', //这个是参数名字
+        headers: {
+          //配置token 接口需要就配 不需要就不用
+          Authorization: `Bearer ${userStore.token}`,
+        },
+        customInsert(res: any, insertFn: any) {
+          // 这个是获取接口返回的数据
+          insertFn(res.data) // 从 res 中找到 url（也就是接口返回的图片地址），然后插入图片
+        },
+      },
+      uploadVideo: {
+        server: 'https://tuxixi.net/prod-api/app-api/infra/file/upload',
+        fieldName: 'file', //这个是参数名字
+        maxFileSize: 1200 * 1024 * 1024, // 1200M
+        headers: {
+          //配置token 接口需要就配 不需要就不用
+          Authorization: `Bearer ${userStore.token}`,
+        },
+        customInsert(res: any, insertFn: any) {
+          // 这个是获取接口返回的数据
+          insertFn(res.data) // 从 res 中找到 url（也就是接口返回的图片地址），然后插入图片
+        },
+      },
+    },
+  }
+
   // 表单数据
   const formData = ref({
     projectDicId: undefined,
@@ -241,7 +182,7 @@
   const post_loading = ref(false)
   const saveContent = () => {
     formRef.value.validate().then(() => {
-      if (!myValue.value) {
+      if (!valueHtml.value) {
         ElMessage.error('请输入帖子内容')
         return
       }
@@ -250,7 +191,7 @@
         postsTitle: formData.value.postsTitle,
         // postsCover: formData.value.postsCover[0].url,
         postsTags: formData.value.postsTags.join(','),
-        postsContent: myValue.value,
+        postsContent: valueHtml.value,
         projectDicId: formData.value.projectDicId,
         channelId: formData.value.channelId,
       })
@@ -258,7 +199,8 @@
           console.log(res)
           if (res.code === 0) {
             ElMessage.success('发表成功')
-            router.push('/communication/channel')
+            router.back()
+            // router.push('/communication/channel')
           }
         })
         .catch((err) => {
@@ -269,23 +211,53 @@
         })
     })
   }
-  const previewContent = () => {
-    // 获取编辑器实例
-    const editor = tinymce.get(tinymceId.value)
-    // 调用编辑器的预览命令
-    if (editor) {
-      editor.execCommand('mcePreview')
-    }
-  }
-  //在onMounted中初始化编辑器
-  onMounted(async () => {
-    if (process.client) {
-          getParent()
-          getChannelIdList()
-          tinymce.init({})
-      }
+
+  // 组件销毁时，也及时销毁编辑器
+  onBeforeUnmount(() => {
+    const editor = editorRef.value
+    if (editor == null) return
+    editor.destroy()
   })
 
+  const handleCreated = (editor: any) => {
+    editorRef.value = editor // 记录 editor 实例，重要！
+  }
+
+  const handleChange = (editor: any) => {
+    console.log('change:', editor.getHtml())
+  }
+
+  const handleDestroyed = (editor: any) => {
+    console.log('destroyed', editor)
+  }
+
+  const handleFocus = (editor: any) => {
+    console.log('focus', editor)
+  }
+
+  const handleBlur = (editor: any) => {
+    console.log('blur', editor)
+  }
+  const customAlert = (info: any, type: any) => {
+    alert(`【自定义提示】${type} - ${info}`)
+  }
+  const customPaste = (editor: any, event: any, callback: any) => {
+    console.log('ClipboardEvent 粘贴事件对象', event)
+    // const html = event.clipboardData.getData('text/html') // 获取粘贴的 html
+    const text = event.clipboardData.getData('text/plain') // 获取粘贴的纯文本
+    // const rtf = event.clipboardData.getData('text/rtf') // 获取 rtf 数据（如从 word wsp 复制粘贴）
+
+    // 自定义插入内容
+    editor.insertText(text)
+
+    // 返回 false ，阻止默认粘贴行为
+    event.preventDefault()
+    callback(false) // 返回值（注意，vue 事件的返回值，不能用 return）
+
+    // 返回 true ，继续默认的粘贴行为
+    // callback(true)
+  }
+
   /** 获取频道列表 */
   const channelIdList = ref<any>([])
   const getChannelIdList = () => {
@@ -293,19 +265,19 @@
       channelIdList.value = res.data
     })
   }
-
+  getChannelIdList()
 
   const projectTypeList = ref<any>([])
   /** 获取分类下拉框 */
   const getParent = () => {
-      parentV2({
+    parent({
       type: 1,
       parentId: 0,
     }).then((res) => {
       projectTypeList.value = res.data
     })
   }
-
+  getParent()
 
   const loading = ref(false)
   /** 获取标签 */

pages/channel/index.vue

@@ -2,8 +2,8 @@
   <!-- 导航 -->
   <KlNavTab active="交流频道" />
   <div class="ma-auto mt-[30px] w-[1440px] flex">
-    <LeftContent v-model="pageReq.channelId"></LeftContent>
-    <RightContent v-model="pageRes" v-model:lun-tan-res="lunTanRes" v-model:page-no="pageReq.pageNo" @update-page-no="handleUpdatePageNo"></RightContent>
+    <LeftContent v-model="pageReq.channelId" v-model:channelIdList="channelIdList"></LeftContent>
+    <!-- <RightContent v-model="pageRes" v-model:lun-tan-res="lunTanRes" v-model:page-no="pageReq.pageNo" @update-page-no="handleUpdatePageNo"></RightContent> -->
   </div>
 </template>
 
@@ -11,7 +11,7 @@
   import KlNavTab from '~/components/kl-nav-tab/index.vue'
   import LeftContent from './components/LeftContent.vue'
   import RightContent from './components/RightContent.vue'
-  import { page, getChannelLunTanDetail } from '~/api/channel/index'
+  import { page, getChannelLunTanDetail, list } from '~/api/channel/index'
   import { reactive, watch, ref } from 'vue'
   import type { TpageRes, ChannelRespVO } from '~/api/channel/types'
 
@@ -25,44 +25,59 @@
     total: 0,
   })
 
+  // 获取频道列表
+  const { data: channelIdList } = await useAsyncData(`prod-api/app-api/business/channel/list-${Date.now()}`, async () => {
+    const res = await list()
+    return res.data as any[]
+  })
+
+  // console.log(channelIdList)
+
+  // 获取第一个论坛详情
+  // if (!channelIdList.value?.length) return
+  // const { data: lunTanRes, execute } = await useAsyncData(`prod-api/app-api/business/channel/detail-${Date.now()}`, async () => {
+  //   const res = await getChannelLunTanDetail({
+  //     id: channelIdList.value?.[0].channelId,
+  //   })
+  //   return res.data as ChannelRespVO
+  // })
+
   // const {data:pageRes, refresh:getPage} = await useAsyncData(`prod-api/app-api/business/posts/page-${Date.now()}`, async () => {
   //   const res = await page(pageReq)
   //   return res.data as TpageRes
   // })
- // 获得频道帖子分页
-  const getPage = () => {
-    page(pageReq).then((res) => {
-      pageRes.list = res.data.list
-      pageRes.total = res.data.total
-    })
-  }
-  getPage()
+  // 获得频道帖子分页
+  // const getPage = () => {
+  //   page(pageReq).then((res) => {
+  //     pageRes.list = res.data.list
+  //     pageRes.total = res.data.total
+  //   })
+  // }
+  // getPage()
 
-  const handleUpdatePageNo = (pageNo: number) => {
-    pageReq.pageNo = pageNo
-    getPage()
-  }
+  // const handleUpdatePageNo = (pageNo: number) => {
+  //   pageReq.pageNo = pageNo
+  //   getPage()
+  // }
 
   // 获取论坛详情
-  const lunTanRes = ref({} as ChannelRespVO)
-  const getLunTanDetaiil = (val: string) => {
-    getChannelLunTanDetail({
-      id: val,
-    }).then((res) => {
-      lunTanRes.value = res.data
-    })
-  }
+  // const lunTanRes = ref({} as ChannelRespVO)
+  // const getLunTanDetaiil = (val: string) => {
+  //   getChannelLunTanDetail({
+  //     id: val,
+  //   }).then((res) => {
+  //     lunTanRes.value = res.data
+  //   })
+  // }
 
   watch(
-    () => pageReq.channelId,
+    () => channelIdList.value,
     (val) => {
       if (val) {
-        console.log(val);
-        
-        getPage()
-        getLunTanDetaiil(val)
+        navigateTo(`/channel/${val[0].channelId}/1`)
       }
-    }
+    },
+    { immediate: true }
   )
 </script>
 

pages/chat-detail/[channelId]-[pageNo].vue

@@ -1,70 +1,70 @@
 <template>
   <KlNavTab />
-  <div class="ml-auto mr-auto mt-20px w1440 flex">
-    <div class="left box-border w-1019px border border-[#EEEEEE] rounded-12px border-solid bg-[#FFFFFF] px-42px py-30px">
-      <div class="title text-24px text-[#333333] font-bold">{{ channelDetail?.postsTitle }}</div>
-      <div class="mt-20px flex items-center justify-between border-b-1px border-b-[#eee] border-b-solid pb-14px">
+  <div class="ml-auto mr-auto mt-[20px] w-[1440px] flex">
+    <div class="left box-border w-[100%] border border-[#EEEEEE] rounded-[12px] border-solid bg-[#FFFFFF] px-[42px] py-[30px]">
+      <div class="title text-[20px] text-[#333333] font-bold">{{ channelDetail?.postsTitle }}</div>
+      <div class="mt-[20px] flex items-center justify-between border-b-[1px] border-b-[#eee] border-b-solid pb-[14px]">
         <div class="flex items-center">
-          <img :src="channelDetail?.creatorAvatar" alt="" srcset="" class="h-50px w-49px rounded-full" />
-          <div class="ml-10px">
-            <div class="text-16px text-[#333333] font-normal">{{ channelDetail?.creatorName }}</div>
-            <div class="text-12px text-[#999999] font-normal">发表时间：{{ dayjs(channelDetail?.createTime).format('YYYY-MM-DD HH:mm:ss') }}</div>
+          <img :src="channelDetail?.creatorAvatar" alt="" srcset="" class="h-[50px] w-[49px] rounded-full" />
+          <div class="ml-[10px]">
+            <div class="text-[16px] text-[#333333] font-normal">{{ channelDetail?.creatorName }}</div>
+            <div class="text-[12px] text-[#999999] font-normal">发表时间：{{ dayjs(channelDetail?.createTime).format('YYYY-MM-DD HH:mm:ss') }}</div>
           </div>
         </div>
-        <div class="mt-19px flex items-center justify-between">
+        <div class="mt-[19px] flex items-center justify-between">
           <div class="flex items-center">
-            <img src="~/assets/images/look.png" alt="" srcset="" class="mr-4px h-17px" />
+            <img src="~/assets/images/look.png" alt="" srcset="" class="mr-[4px] h-[17px]" />
             <span class="text-[#666666]">{{ channelDetail?.likeNum || 0 }}人赞过</span>
-            <div class="ml-16px flex items-center">
-              <img src="~/assets/images/add.png" alt="" class="mr-4px h-23px" />
+            <div class="ml-[16px] flex items-center">
+              <img src="~/assets/images/add.png" alt="" class="mr-[4px] h-[23px]" />
               <span class="text-[#666666]">{{ channelDetail?.commentNum || 0 }}评论</span>
             </div>
           </div>
-          <div class="ml-16px flex items-center">
-            <img src="~/assets/images/chat.png" alt="" srcset="" class="mr-4px h-17px" />
+          <div class="ml-[16px] flex items-center">
+            <img src="~/assets/images/chat.png" alt="" srcset="" class="mr-[4px] h-[17px]" />
             <span class="text-[#666666]">{{ channelDetail?.browseNum || 0 }}人看过</span>
           </div>
         </div>
       </div>
       <div>
-        <img :src="channelDetail?.postsCover" alt="" srcset="" class="h-396px w-auto" />
-        <div class="mt-20px text-14px text-[#333333] font-normal" v-html="channelDetail?.postsContent"></div>
+        <img :src="channelDetail?.postsCover" alt="" srcset="" class="h-[396px] w-auto" />
+        <div class="mt-[20px] text-[14px] text-[#333333] font-normal" v-html="channelDetail?.postsContent"></div>
       </div>
-      <div class="mt-30px">
-        <div class="h-48px w-938px rounded-1px bg-[#F8F8F8] pl-10px text-16px text-[#333333] font-normal line-height-50px"
-          >共有{{ commentList.total || 0 }}条评论</div
+      <div class="mt-[30px]">
+        <div class="h-[48px] w-[100%] rounded-[1px] bg-[#F8F8F8] pl-[10px] text-[16px] text-[#333333] font-normal line-height-[50px]"
+          >共有{{ commentList?.total || 0 }}条评论</div
         >
-        <div v-for="item in commentList.list" :key="item.commentId" class="mt-10px border-b-1px border-b-[#eee] border-b-solid pb-14px">
+        <div v-for="item in commentList?.list" :key="item.commentId" class="mt-[10px] border-b-[1px] border-b-[#eee] border-b-solid pb-[14px]">
           <div class="flex items-center justify-between">
             <div class="flex items-center">
-              <img :src="item.creatorAvatar" alt="" srcset="" class="relative top-12px h-50px w-49px rounded-full" />
-              <div class="ml-10px">
+              <img :src="item.creatorAvatar" alt="" srcset="" class="relative top-[12px] h-[50px] w-[49px] rounded-full" />
+              <div class="ml-[10px]">
                 <span>{{ item.creatorName }}</span>
               </div>
             </div>
-            <div class="text-12px text-[#999999] font-normal">发表时间：{{ dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss') }}</div>
+            <div class="text-[12px] text-[#999999] font-normal">发表时间：{{ dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss') }}</div>
           </div>
-          <div class="ml-60px mt--10px box-border rd-4px bg-[#F8F8F8] pa-6px px-8px text-14px text-[#999999] font-normal">{{ item.content }}</div>
+          <div class="ml-[60px] mt-[-10px] box-border rd-[4px] bg-[#F8F8F8] pa-[6px] px-[8px] text-[14px] text-[#999999] font-normal">{{ item.content }}</div>
         </div>
         <!-- 添加element-plus分页 -->
         <el-pagination
           v-model:current-page="query.pageNo"
           :page-size="query.pageSize"
           layout="prev, pager, next"
-          :total="commentList.total"
-          class="mt-10px"
+          :total="commentList?.total"
+          class="mt-[10px]"
           @current-change="handleCurrentChange"
         />
-        <el-input v-model="commentContent" type="textarea" :rows="6" placeholder="请输入内容" class="mt-20px w-100%"></el-input>
+        <el-input v-model="commentContent" type="textarea" :rows="6" placeholder="请输入内容" class="mt-[20px] w-[100%]"></el-input>
       </div>
 
       <div>
-        <el-button type="primary" class="mt-10px h-40px w-101px rounded-4px text-16px text-[#FFFFFF] font-bold" @click="handleCreateComment"
+        <el-button type="primary" class="mt-[10px] h-[40px] w-[101px] rounded-[4px] text-[16px] text-[#FFFFFF] font-bold" @click="handleCreateComment"
           >发表评论</el-button
         >
       </div>
     </div>
-    <div class="right ml-23px w-100%">
+    <!-- <div class="right ml-23px w-100%">
       <div class="mt-20px w-398px border border-[#EEEEEE] border-rd-[10px_10px_0px_0px] border-solid bg-[#FFFFFF]">
         <img src="~/assets/images/sign.png" alt="" srcset="" class="h-206px w-100%" />
         <div class="box-border border border-[#EEEEEE] border-rd-[10px_10px_0px_0px] border-solid border-t-none bg-[#FFFFFF] pa-18px">
@@ -89,7 +89,7 @@
           </div>
         </div>
       </div>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -101,50 +101,69 @@
   import { getChannelDetail, postscommentpage, createPostsComment } from '~/api/channel'
   import type { TGetChannelPostsRes, PageResultPostsCommentRespVO } from '~/api/channel/types'
   const route = useRoute()
-  const channelId = route.query.channelId as string
+  const channelId = computed(() => route.params.channelId as string)
+  const pageNo = computed(() => Number(route.params.pageNo))
 
-  const channelDetail = ref<TGetChannelPostsRes>()
-  const commentList = reactive<PageResultPostsCommentRespVO>({
-    list: [],
-    total: 0,
-  })
-  const getChannel = () => {
-    getChannelDetail({
-      id: channelId,
-    }).then((res) => {
-      if (res.code === 0) {
-        channelDetail.value = res.data
-      }
+  console.log(channelId.value, pageNo.value)
+
+  // const channelDetail = ref<TGetChannelPostsRes>()
+  // const commentList = reactive<PageResultPostsCommentRespVO>({
+  //   list: [],
+  //   total: 0,
+  // })
+
+  const { data: channelDetail } = await useAsyncData(`prod-api/app-api/business/posts/detail-${Date.now()}`, async () => {
+    const res = await getChannelDetail({
+      id: channelId.value,
     })
-  }
+    return res.data as TGetChannelPostsRes
+  })
+  // const getChannel = () => {
+  //   getChannelDetail({
+  //     id: channelId,
+  //   }).then((res) => {
+  //     if (res.code === 0) {
+  //       channelDetail.value = res.data
+  //     }
+  //   })
+  // }
   const query = reactive({
-    pageNo: 1,
+    pageNo: pageNo.value,
     pageSize: 4,
   })
-  const getComment = () => {
-    postscommentpage({
-      postsId: channelId,
-      pageNo: query.pageNo,
-      pageSize: query.pageSize,
-    }).then((res) => {
-      if (res.code === 0) {
-        commentList.list = res.data.list
-        commentList.total = res.data.total
-      }
+
+  const { data: commentList, refresh } = await useAsyncData(`prod-api/app-api/business/posts/comment/page-${Date.now()}`, async () => {
+    const res = await postscommentpage({
+      postsId: channelId.value,
+      pageNo: pageNo.value,
+      pageSize: 4,
     })
-  }
-  watch(
-    () => channelId,
-    (val) => {
-      if (val) {
-        getChannel()
-        getComment()
-      }
-    },
-    {
-      immediate: true,
-    }
-  )
+    return res.data as PageResultPostsCommentRespVO
+  })
+  // const getComment = () => {
+  //   postscommentpage({
+  //     postsId: channelId,
+  //     pageNo: query.pageNo,
+  //     pageSize: query.pageSize,
+  //   }).then((res) => {
+  //     if (res.code === 0) {
+  //       commentList.list = res.data.list
+  //       commentList.total = res.data.total
+  //     }
+  //   })
+  // }
+  // watch(
+  //   () => channelId,
+  //   (val) => {
+  //     if (val) {
+  //       getChannel()
+  //       getComment()
+  //     }
+  //   },
+  //   {
+  //     immediate: true,
+  //   }
+  // )
 
   const commentContent = ref('')
   const handleCreateComment = () => {
@@ -153,17 +172,18 @@
       return
     }
     createPostsComment({
-      postsId: channelId,
+      postsId: channelId.value,
       content: commentContent.value,
     }).then((res) => {
       if (res.code === 0) {
-        getComment()
+        refresh()
         commentContent.value = ''
       }
     })
   }
   const handleCurrentChange = (pageNo: number) => {
-    query.pageNo = pageNo
-    getComment()
+    // query.pageNo = pageNo
+    // getComment()
+    navigateTo(`/chat-detail/${channelId.value}-${pageNo}`)
   }
 </script>

pages/chat-page/index.vue

@@ -106,7 +106,7 @@
   import type { msgType, PageResultMessageRespVO, MemberUserRespDTO } from '~/api/channel/types'
   import { ref, onMounted, nextTick, watch, onUnmounted } from 'vue'
   // import dayjs from 'dayjs'
-  import useUserStore from '~/store/user'
+  import useUserStore from '~/stores/user'
   const userStore = useUserStore()
 
   const props = defineProps({

pages/down-drawe-detail/[id].vue

@@ -0,0 +1,372 @@
+<template>
+  <SeoHead :title="detail?.title" :description="detail?.description" :keywords="detail?.labels?.toString()" />
+  <KlNavTab />
+  <div class="ml-auto mr-auto mt-[20px] w-[1440px]">
+    <div class="flex items-center">
+      <div
+        class="box-border h-[60px] w-[1019px] flex items-center justify-between border border-[#EEEEEE] rounded-[12px] border-solid bg-[#FFFFFF] px-[27px] py-[24px]"
+      >
+        <div class="text-[20px] text-[#333333] font-normal"> {{ detail?.title }}</div>
+        <div class="flex items-center">
+          <img :src="detail?.ownedUserIdInfo?.avatar" alt="" srcset="" class="h-[30px] w-[30px] rd-[50%]" />
+          <span class="ml-[12px] color-[#999999]">by {{ detail?.ownedUserIdInfo?.nickName }}</span>
+        </div>
+      </div>
+
+      <div class="ml-[23px] flex flex-1 text-[18px] text-[#FFFFFF] font-normal">
+        <div class="h-[60px] w-[160px] flex cursor-pointer items-center justify-center rounded-[8px] bg-[#1A65FF]" @click="handleDownload">
+          <img src="~/assets/images/download.png" alt="" srcset="" class="mr-[4px] h-[22px] w-[27px]" />
+          {{ detail?.points === 0 ? '免费下载' : '立即下载' }}
+        </div>
+        <div
+          v-if="!detail?.favoriteId"
+          class="ml-[11px] h-[60px] flex flex-1 cursor-pointer items-center justify-center rounded-[8px] bg-[#E7B03B]"
+          @click="handleCollect"
+          ><img src="~/assets/images/collect.png" alt="" srcset="" class="mr-[4px] h-[24px] w-[24px]" /> 收藏</div
+        >
+        <div v-else class="ml-[11px] h-[60px] flex flex-1 cursor-pointer items-center justify-center rounded-[8px] bg-[#E7B03B]" @click="handleCollect"
+          ><img src="~/assets/images/wjx2.png" alt="" srcset="" class="mr-[4px] h-[18px] w-[18px]" /> 已收藏</div
+        >
+
+        <div class="ml-[11px] h-[60px] flex flex-1 cursor-pointer items-center justify-center rounded-[8px] bg-[#F56C6C]" @click="handleReport"
+          ><el-icon class="mr-[4px] mt-[4px]"><Warning /></el-icon> 举报</div
+        >
+      </div>
+    </div>
+  </div>
+  <!--  -->
+  <div class="ma-auto mt-[21px] flex">
+    <div class="w-[1019px]">
+      <div>
+        <ThumBnail :data="detail?.coverImages" :type="detail?.type"></ThumBnail>
+      </div>
+      <div class="mb-[20px] mt-[34px] flex items-center text-[16px] text-[#333333] font-normal">
+        <div class="h-[24px] w-[4px] rounded-[1px] bg-[#1A65FF]"></div><span class="ml-[10px]">{{ detail?.title }}描述</span></div
+      >
+      <div
+        class="box-border min-h-[90px] w-[1019px] border border-[#EEEEEE] rounded-[6px] border-solid bg-[#FFFFFF] pa-[24px] text-[14px] text-[#333333] font-normal"
+      >
+        {{ detail?.description }}
+      </div>
+      <div id="section1" class="mb-[20px] mt-[34px] flex items-center text-[16px] text-[#333333] font-normal">
+        <div class="h-[24px] w-[4px] rounded-[1px] bg-[#1A65FF]"></div><span class="ml-[10px]">{{ detail?.title }}附件</span></div
+      >
+      <div class="box-border w-[1019px] border border-[#EEEEEE] rounded-[6px] border-solid bg-[#FFFFFF] pa-[24px]">
+        <div class="border-b-[1px] border-b-[#eee] border-b-solid p-b-[10px]">
+          {{ detail?.type === 1 ? '图纸' : detail?.type === 2 ? '文本' : '模型' }}中包含的文件
+        </div>
+        <div>
+          <div v-for="item in detail?.files" :key="item.id" class="flex items-center justify-between border-b-[1px] border-b-[#eee] border-b-solid py-[10px]">
+            <!-- <img src="~/assets/images/avater.png" alt="" srcset="" class="h-30px w-30px" /> -->
+            <div>
+              <!-- <span class="ml-[10px] cursor-pointer" @click="handleDownloadPreview(item)">{{ item.title }}</span> -->
+              <span class="ml-[10px]">{{ item.title }}</span>
+              <span v-if="item.size" class="ml-[200px] color-[#999]">{{ item.size || '-' }}</span>
+            </div>
+            <el-button
+              v-if="detail?.downloadId || detail?.points === 0"
+              type="text"
+              tag="a"
+              target="download"
+              :href="item.url"
+              @click="handleDownloadFile(item.url, item.title)"
+            >
+              下载
+            </el-button>
+          </div>
+        </div>
+      </div>
+      <!-- 关联项目 -->
+      <div class="mb-[20px] mt-[34px] flex items-center text-[16px] text-[#333333] font-normal">
+        <div class="h-[24px] w-[4px] rounded-[1px] bg-[#1A65FF]"></div
+        ><span class="ml-[10px]">关联{{ detail?.type === 1 ? '图纸' : detail?.type === 2 ? '文本' : '模型' }}</span></div
+      >
+      <el-row :gutter="20">
+        <el-col v-for="(item, index) in detail?.relationDraws" :key="index" :span="12">
+          <CardPicture :item-info="item" />
+        </el-col>
+      </el-row>
+      <el-empty v-if="!detail?.relationDraws?.length" description="暂无数据"></el-empty>
+      <!-- 关联模型 -->
+      <div class="mb-[20px] mt-[34px] flex items-center text-[16px] text-[#333333] font-normal">
+        <div class="h-[24px] w-[4px] rounded-[1px] bg-[#1A65FF]"></div
+        ><span class="ml-[10px]">相关{{ detail?.type === 1 ? '图纸' : detail?.type === 2 ? '文本' : '模型' }}推荐</span></div
+      >
+      <el-row :gutter="20">
+        <el-col v-for="(item, index) in relationRecommend" :key="index" :span="12">
+          <CardPicture :item-info="item" />
+        </el-col>
+      </el-row>
+      <!-- 评论 -->
+      <CommentSection :relation-id="detail!.id" :project-id="detail!.projectId" />
+    </div>
+    <div class="ml-[22px]">
+      <div class="box-border min-h-[269px] w-[397px] border border-[#EEEEEE] rounded-[12px] border-solid bg-[#FFFFFF] pa-[22px]">
+        <div class="mb-[10px]">图纸ID: {{ detail?.id }}</div>
+        <div class="mb-[10px]">文件大小：{{ detail?.filesInfo?.fileSize || 0 }} </div>
+        <!-- <div class="mb-10px">图纸版本：{{ detail.editionsName }} </div> -->
+        <div class="mb-[10px]">图纸格式：{{ detail?.formatType?.toString() }}</div>
+        <div class="mb-[10px]">所需金币：{{ detail?.points }}金币</div>
+        <div class="mb-[10px]">发布时间：{{ dayjs(detail?.createTime).format('YYYY-MM-DD HH:mm:ss') }}</div>
+        <div class="mb-[10px]">图纸参数：{{ detail?.editTypeName }}</div>
+        <div class="mb-[10px]">图纸分类：{{ detail?.projectTypeName }}</div>
+        <div class="mb-[10px]">软件分类：{{ detail?.editionsName }}</div>
+      </div>
+      <div class="mt-[20px] w-[398px] border border-[#EEEEEE] border-rd-[10px_10px_0px_0px] border-solid bg-[#FFFFFF]">
+        <img src="~/assets/images/banner.png" alt="" srcset="" class="w-[100%]" />
+        <div class="box-border border border-[#EEEEEE] border-rd-[10px_10px_0px_0px] border-solid border-t-none bg-[#FFFFFF] pa-[18px]">
+          <div class="flex flex-wrap items-start">
+            <div v-if="userInfo.nickname" class="text-[18px] text-[#333333] font-bold">{{ userInfo.nickname }}</div>
+            <div
+              v-for="item in userInfo.labels"
+              :key="item"
+              class="mb-[10px] ml-[10px] box-border border border-[#1A65FF] rounded-[13px] border-solid px-[8px] py-[3px] color-[#1a65ff]"
+              >{{ item }}</div
+            >
+          </div>
+          <div v-if="userInfo.description" class="mb-[20px] text-[14px] text-[#333333] font-normal">{{ userInfo.description }}</div>
+          <!-- 显示作品 粉丝 荣誉证书 -->
+          <div class="flex items-center gap-[40px]">
+            <div class="flex items-center">
+              <div class="h-[20px]">
+                <img src="~/assets/images/folder.png" alt="works" class="w-[80%]" />
+              </div>
+              <div class="ml-[8px] mt-[-4px] text-[14px] text-[#666] font-normal">作品: {{ userInfo.projectCount || 0 }}</div>
+            </div>
+            <div class="flex items-center">
+              <div class="h-[20px]">
+                <img src="~/assets/images/user4.png" alt="fans" class="w-[80%] rounded-full vertical-top" />
+              </div>
+              <div class="relative top-[-3px] ml-[8px] text-[14px] text-[#666] font-normal">粉丝: {{ userInfo.fansCount || 0 }}</div>
+            </div>
+          </div>
+
+          <!-- 3个图片一排 超过换下一行 -->
+          <div v-if="userInfo.files?.length" class="mt-[20px] flex flex-wrap gap-[16px]">
+            <div v-for="i in userInfo.files" :key="i" class="flex-1">
+              <div
+                class="box-border h-[200px] w-full overflow-hidden border border-[#E5E7EB] rounded-[8px] border-solid from-[#FFFFFF] to-[#F5F7FA] bg-gradient-to-b p-[16px]"
+              >
+                <el-image :src="i.url" fit="cover" alt="" srcset="" class="h-full object-cover" />
+              </div>
+            </div>
+          </div>
+
+          <div class="mt-[20px] h-[1px] w-[336px] rounded-[1px] bg-[#EEEEEE]"></div>
+          <div class="mt-[20px] flex items-center">
+            <div class="h-[24px] w-[4px] rounded-[1px] bg-[#1A65FF]"></div>
+            <span class="ml-[10px] text-[16px]">最新发布</span>
+          </div>
+          <div class="mt-[10px]">
+            <div
+              v-for="item in mainWork"
+              :key="item.id"
+              class="flex cursor-pointer items-center justify-between px-[10px] py-[10px] hover:bg-[#f5f5f5]"
+              @click="handleClick(item.id)"
+            >
+              <div class="ellipsis text-[15px] text-[#333333] font-normal">{{ item.title }}</div>
+              <span class="ml-[10px] flex-shrink-0 color-[#999999]">{{ dayjs(item.createTime).format('MM-DD') }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+  import dayjs from 'dayjs'
+  import { downloadFile } from '~/utils/utils'
+  import { useMessage } from '~/utils/useMessage'
+  import { Warning } from '@element-plus/icons-vue'
+  import SeoHead from '~/components/seo-head/index.vue'
+  import CardPicture from '~/components/kl-card-picture/index.vue'
+  import { getDetail, getRelationRecommend, report, getUserInfo, getMainWork, createContent, createUserProject, deleteProject } from '~/api/drawe-detail/index'
+  import KlNavTab from '~/components/kl-nav-tab/index.vue'
+  import ThumBnail from './components/swiper.vue'
+  import CommentSection from '~/components/comment-section/index.vue'
+  import { useRoute } from 'vue-router'
+  import { onMounted } from 'vue'
+  import type { ProjectRespVO, ProjectDrawPageRespVO, UserExtendSimpleRespDTO, ProjectDrawMemberRespVO } from '~/api/drawe-detail/types'
+  import useUserStore from '~/stores/user'
+  const message = useMessage()
+  const userStore = useUserStore()
+  // 获取路由参数
+  const route = useRoute()
+  const id = route.params.id as string
+
+  // 获取详情
+  // const detail = ref<ProjectRespVO>({} as ProjectRespVO)
+
+  const { data: detail, refresh: refreshDetail } = await useAsyncData(`getDetail${id}`, async () => {
+    const res = await getDetail({ id })
+    return res.data
+  })
+
+  console.log('==', detail.value)
+
+  if (!detail.value) {
+    throw createError({
+      statusCode: 404,
+      statusMessage: 'Page Not Found',
+      fatal: true,
+    })
+  }
+
+  // const init = () => {
+  //   getDetail({ id }).then((res) => {
+  //     if (res.code === 0) {
+  //       detail.value = res.data
+  //       // 获取推荐信息
+  //       getRelationRecommendList()
+  //       // 获取用户信息
+  //       handleGetUserInfo()
+  //       // 最新发布
+  //       handleGetMainWork()
+  //     }
+  //   })
+  // }
+
+  // init()
+
+  const [{ data: mainWork }, { data: userInfo }, { data: relationRecommend }] = await Promise.all([
+    getMainWork({ id: detail.value?.id, limit: 10, memberId: detail.value?.ownedUserId }),
+    getUserInfo({ id: detail.value?.id }),
+    getRelationRecommend({ type: detail.value?.type, projectType: detail.value?.projectType[0] }),
+  ])
+
+  // 获取最新发布
+  // const mainWork = ref<ProjectDrawMemberRespVO[]>([])
+  // const handleGetMainWork = () => {
+  //   getMainWork({ id: detail.value?.id, limit: 10, memberId: detail.value?.ownedUserId }).then((res) => {
+  //     if (res.code === 0) {
+  //       mainWork.value = res.data
+  //     }
+  //   })
+  // }
+  // 获取用户信息
+  // const userInfo = ref<UserExtendSimpleRespDTO>({} as UserExtendSimpleRespDTO)
+  // const handleGetUserInfo = () => {
+  //   getUserInfo({ id: detail.value?.id }).then((res) => {
+  //     if (res.code === 0) {
+  //       userInfo.value = res.data
+  //     }
+  //   })
+  // }
+
+  // 获取关联推荐
+  // const relationRecommend = ref<ProjectDrawPageRespVO[]>([])
+  // const getRelationRecommendList = () => {
+  //   getRelationRecommend({ type: detail.value?.type, projectType: detail.value?.projectType[0] }).then((res) => {
+  //     if (res.code === 0) {
+  //       relationRecommend.value = res.data
+  //     }
+  //   })
+  // }
+
+  const handleDownloadPreview = (item: any) => {
+    // 预览pdf
+    navigateTo(`/pdf-preview?url=${item.url}`)
+  }
+
+  /** 获取下载类型 */
+  const getType = (type: number) => {
+    if (type === 1 || type === 2 || type === 3) {
+      // 图纸 文本 模型都传1
+      return 1
+    }
+    // 工具箱传
+    return 2
+  }
+
+  const handleDownload = async () => {
+    if (!userStore.token) {
+      ElMessage.error('请先登录')
+      return
+    }
+
+    if (detail.value?.points === 0) {
+      scrollTo()
+      return
+    }
+
+    if (detail.value?.downloadId) {
+      ElMessage.success('您已获取下载权限')
+      scrollTo()
+      return
+    }
+
+    const res = await message.confirm(`是否花费${detail.value?.points}金币下载此资源，是否继续？`, '提示')
+    if (res) {
+      createUserProject({ relationId: detail.value?.id, type: getType(detail.value?.type as number) }).then((res) => {
+        if (res.code === 0) {
+          ElMessage.success('获取下载权限成功')
+          detail.value!.downloadId = res.data
+          scrollTo()
+        }
+      })
+    }
+  }
+
+  const scrollTo = () => {
+    const element = document.getElementById('section1')
+    if (element) {
+      element.scrollIntoView({
+        behavior: 'smooth',
+      })
+    }
+  }
+
+  const handleReport = () => {
+    if (!userStore.token) {
+      ElMessage.error('请先登录')
+      return
+    }
+    console.log('举报')
+    ElMessageBox.prompt('说明内容', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      inputPlaceholder: '请输入举报内容',
+      inputErrorMessage: '请输入举报内容',
+    }).then(({ value }) => {
+      report({
+        id: detail.value?.id,
+        title: detail.value?.title,
+        files: detail.value?.files,
+        comments: value,
+        projectId: detail.value?.projectId,
+        drawId: detail.value?.id,
+      }).then((res) => {
+        if (res.code === 0) {
+          ElMessage.success('举报成功')
+        }
+      })
+    })
+  }
+
+  const handleCollect = async () => {
+    if (!userStore.token) {
+      ElMessage.error('请先登录')
+      return
+    }
+
+    const res = detail.value?.favoriteId
+      ? await deleteProject({ id: detail.value.favoriteId })
+      : await createContent({
+          projectId: detail.value?.projectId,
+          drawId: detail.value?.id,
+        })
+    if (res.code === 0) {
+      ElMessage.success(`${detail.value?.favoriteId ? '取消' : '收藏'}成功`)
+      refreshDetail()
+    }
+  }
+
+  const handleClick = (id: string | number) => {
+    navigateTo(`/down-drawe-detail/${id}`) // 修改为在新窗口打开
+  }
+
+  const handleDownloadFile = (url: string, name: string) => {
+    downloadFile(url, name)
+  }
+</script>

pages/down-drawe-detail/components/swiper.vue

@@ -1,64 +1,32 @@
 <template>
-  <div class="box-border h-631px w-1019px border border-[#EEEEEE] rounded-12px border-solid bg-[#FFFFFF] pa-30px">
-    <swiper
-      :style="{
-        '--swiper-navigation-color': '#666',
-        '--swiper-pagination-color': '#666',
-      }"
-      :space-between="10"
-      disabled-class=""
-      :thumbs="{ swiper: thumbsSwiper }"
-      :modules="modules"
-      class="mySwiper2"
-      @swiper="onSwiper"
-      @slide-change="changeSwiper"
-    >
-      <swiper-slide v-for="(item, index) in props.data" :key="index"><el-image fit="cover" :src="item.url" /></swiper-slide>
-      <div class="swiper-button-prev color-#fff" @click="handlePrev"></div
-      ><!--左箭头。如果放置在swiper外面，需要自定义样式。-->
-      <div class="swiper-button-next color-#fff" @click="handleNext"></div
-      ><!--右箭头。如果放置在swiper外面，需要自定义样式。-->
-    </swiper>
-  </div>
-  <div class="mb-20px mt-34px flex items-center text-16px text-[#333333] font-normal">
-    <div class="h-24px w-4px rounded-1px bg-[#1A65FF]"></div
-    ><span class="ml-10px">{{ props.type === 1 ? '图纸' : props.type === 2 ? '文本' : '模型' }}</span></div
-  >
-  <div class="box-border h-126px w-1019px border border-[#EEEEEE] rounded-6px border-solid bg-[#FFFFFF] pa-23px">
-    <swiper
-      :space-between="10"
-      :slides-per-view="4"
-      :free-mode="true"
-      :watch-slides-progress="true"
-      :modules="modules"
-      class="mySwiper"
-      @swiper="setThumbsSwiper"
-    >
-      <swiper-slide v-for="(item, index) in props.data" :key="index">
-        <div class="Thumbs">
-          <el-image fit="cover" :src="item.url" />
+  <div class="box-border h-[631px] w-[1019px] border border-[#EEEEEE] rounded-[12px] border-solid bg-[#FFFFFF] pa-[30px]">
+    <div style="--swiper-navigation-color: #fff; --swiper-pagination-color: #fff" class="swiper mySwiper2">
+      <div class="swiper-wrapper">
+        <div class="swiper-slide" v-for="(item, index) in props.data" :key="index">
+          <img :src="item.url" />
         </div>
-      </swiper-slide>
-    </swiper>
+      </div>
+      <div class="swiper-button-next"></div>
+      <div class="swiper-button-prev"></div>
+    </div>
+  </div>
+  <div class="mb-[20px] mt-[34px] flex items-center text-[16px] text-[#333333] font-normal">
+    <div class="h-[24px] w-[4px] rounded-[1px] bg-[#1A65FF]"></div>
+    <span class="ml-[10px]">{{ props.type === 1 ? '图纸' : props.type === 2 ? '文本' : '模型' }}</span>
+  </div>
+  <div class="box-border h-[126px] w-[1019px] border border-[#EEEEEE] rounded-[6px] border-solid bg-[#FFFFFF] pa-[23px]">
+    <div thumbsSlider="" class="swiper mySwiper">
+      <div class="swiper-wrapper">
+        <div class="swiper-slide" v-for="(item, index) in props.data" :key="index">
+          <img :src="item.url" />
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 <script setup lang="ts">
-  import type { PropType} from 'vue'
-  import { ref, watch, nextTick } from 'vue'
-  // @ts-ignore
-  import { Swiper, SwiperSlide } from 'swiper/vue'
-
-  import 'swiper/css'
-
-  import 'swiper/css/free-mode'
-  import 'swiper/css/navigation'
-  import 'swiper/css/thumbs'
-
-  // import required modules
-  // @ts-ignore
-  import { FreeMode, Navigation, Thumbs } from 'swiper/modules'
-
-  const modules = [FreeMode, Navigation, Thumbs]
+  import type { PropType } from 'vue'
+  import { ref, watch, nextTick, onMounted } from 'vue'
 
   const props = defineProps({
     data: {
@@ -71,50 +39,27 @@
     },
   })
 
-  const emit = defineEmits(['changeSwiper', 'nextSwiper'])
-
-  const thumbsSwiper = ref<any>(null)
-  const useSwiper = ref<any>(null)
-  const activeIndex = ref<number>(0)
-
-  watch(
-    () => props.data,
-    (value) => {
-      if (value.length) {
-        nextTick(() => {
-          const thumb_active = document.querySelector(`.mySwiper .swiper-slide`)
-          thumb_active?.classList.add('swiper-slide-thumb-active')
-        })
-      }
-    }
-  )
-
-  const setThumbsSwiper = (swiper: any) => {
-    thumbsSwiper.value = swiper
-  }
-
-  const handlePrev = () => {
-    if (activeIndex.value === 0 || props.data.length === 0) {
-      emit('nextSwiper', false)
-    }
-    useSwiper.value.slidePrev()
-  }
-
-  const handleNext = () => {
-    if (activeIndex.value === props.data.length - 1 || props.data.length === 0) {
-      emit('nextSwiper', true)
-    }
-    useSwiper.value.slideNext()
-  }
-
-  const onSwiper = (swiper: any) => {
-    useSwiper.value = swiper
-  }
-
-  const changeSwiper = (e: any) => {
-    activeIndex.value = e.activeIndex
-    emit('changeSwiper', e.activeIndex)
-  }
+  onMounted(() => {
+    // Initialize Swiper
+    // @ts-ignore
+    var swiper = new Swiper('.mySwiper', {
+      spaceBetween: 10,
+      slidesPerView: 4,
+      freeMode: true,
+      watchSlidesProgress: true,
+    })
+    // @ts-ignore
+    var swiper2 = new Swiper('.mySwiper2', {
+      spaceBetween: 10,
+      navigation: {
+        nextEl: '.swiper-button-next',
+        prevEl: '.swiper-button-prev',
+      },
+      thumbs: {
+        swiper: swiper,
+      },
+    })
+  })
 </script>
 
 <style scoped>
@@ -210,4 +155,9 @@
     height: 100%;
     pointer-events: none;
   }
+
+  .swiper-button-next,
+  .swiper-button-prev {
+    color: #666 !important;
+  }
 </style>

pages/down-drawe-detail/index.vue

@@ -1,350 +0,0 @@
-<template>
-  <KlNavTab />
-  <div class="ml-auto mr-auto mt-20px w1440">
-    <div class="flex items-center">
-      <div class="box-border h-60px w-1019px flex items-center justify-between border border-[#EEEEEE] rounded-12px border-solid bg-[#FFFFFF] px-27px py-24px">
-        <div class="text-20px text-[#333333] font-normal"> {{ detail.title }}</div>
-        <div class="flex items-center">
-          <img :src="detail.ownedUserIdInfo?.avatar" alt="" srcset="" class="h-30px w-30px rd-50%" />
-          <span class="ml-12px color-#999999">by {{ detail.ownedUserIdInfo?.nickName }}</span>
-        </div>
-      </div>
-
-      <div class="ml-23px flex flex-1 text-18px text-[#FFFFFF] font-normal">
-        <div class="h-60px w-160px flex cursor-pointer items-center justify-center rounded-8px bg-[#1A65FF]" @click="handleDownload">
-          <img src="~/assets/images/download.png" alt="" srcset="" class="mr-4px h-22px w-27px" />
-          {{ detail.points === 0 ? '免费下载' : '立即下载' }}
-        </div>
-        <div
-          v-if="!detail.favoriteId"
-          class="ml-11px h-60px flex flex-1 cursor-pointer items-center justify-center rounded-8px bg-[#E7B03B]"
-          @click="handleCollect"
-          ><img src="~/assets/images/collect.png" alt="" srcset="" class="mr-4px h-24px w-24px" /> 收藏</div
-        >
-        <div v-else class="ml-11px h-60px flex flex-1 cursor-pointer items-center justify-center rounded-8px bg-[#E7B03B]" @click="handleCollect"
-          ><img src="~/assets/images/wjx2.png" alt="" srcset="" class="mr-4px h-18px w-18px" /> 已收藏</div
-        >
-
-        <div class="ml-11px h-60px flex flex-1 cursor-pointer items-center justify-center rounded-8px bg-[#F56C6C]" @click="handleReport"
-          ><el-icon class="mr-4px mt-4px"><Warning /></el-icon> 举报</div
-        >
-      </div>
-    </div>
-  </div>
-  <!--  -->
-  <div class="ma-auto mt-21px flex">
-    <div class="w-1019px">
-      <div>
-        <ThumBnail :data="detail.coverImages" :type="detail.type" @change-swiper="changeSwiper" @next-swiper="nextSwiper"></ThumBnail>
-      </div>
-      <div class="mb-20px mt-34px flex items-center text-16px text-[#333333] font-normal">
-        <div class="h-24px w-4px rounded-1px bg-[#1A65FF]"></div><span class="ml-10px">{{ detail.title }}描述</span></div
-      >
-      <div class="box-border min-h-90px w-1019px border border-[#EEEEEE] rounded-6px border-solid bg-[#FFFFFF] pa-24px text-14px text-[#333333] font-normal">
-        {{ detail.description }}
-      </div>
-      <div id="section1" class="mb-20px mt-34px flex items-center text-16px text-[#333333] font-normal">
-        <div class="h-24px w-4px rounded-1px bg-[#1A65FF]"></div><span class="ml-10px">{{ detail.title }}附件</span></div
-      >
-      <div class="box-border w-1019px border border-[#EEEEEE] rounded-6px border-solid bg-[#FFFFFF] pa-24px">
-        <div class="border-b-1px border-b-[#eee] border-b-solid p-b-10px">
-          {{ detail.type === 1 ? '图纸' : detail.type === 2 ? '文本' : '模型' }}中包含的文件
-        </div>
-        <div>
-          <div v-for="item in detail.files" :key="item.id" class="flex items-center justify-between border-b-1px border-b-[#eee] border-b-solid py-10px">
-            <!-- <img src="~/assets/images/avater.png" alt="" srcset="" class="h-30px w-30px" /> -->
-            <div>
-              <span class="ml-10px cursor-pointer" @click="handleDownloadPreview(item)">{{ item.title }}</span>
-              <span v-if="item.size" class="ml-200px color-#999">{{ item.size || '-' }}</span>
-            </div>
-            <el-button
-              v-if="detail.downloadId || detail.points === 0"
-              type="text"
-              tag="a"
-              target="download"
-              :href="item.url"
-              @click="handleDownloadFile(item.url, item.title)"
-            >
-              下载
-            </el-button>
-          </div>
-        </div>
-      </div>
-      <!-- 关联项目 -->
-      <div class="mb-20px mt-34px flex items-center text-16px text-[#333333] font-normal">
-        <div class="h-24px w-4px rounded-1px bg-[#1A65FF]"></div
-        ><span class="ml-10px">关联{{ detail.type === 1 ? '图纸' : detail.type === 2 ? '文本' : '模型' }}</span></div
-      >
-      <el-row :gutter="20">
-        <el-col v-for="(item, index) in detail.relationDraws" :key="index" :span="12">
-          <CardPicture :item-info="item" />
-        </el-col>
-      </el-row>
-      <el-empty v-if="!detail.relationDraws?.length" description="暂无数据"></el-empty>
-      <!-- 关联模型 -->
-      <div class="mb-20px mt-34px flex items-center text-16px text-[#333333] font-normal">
-        <div class="h-24px w-4px rounded-1px bg-[#1A65FF]"></div
-        ><span class="ml-10px">相关{{ detail.type === 1 ? '图纸' : detail.type === 2 ? '文本' : '模型' }}推荐</span></div
-      >
-      <el-row :gutter="20">
-        <el-col v-for="(item, index) in relationRecommend" :key="index" :span="12">
-          <CardPicture :item-info="item" />
-        </el-col>
-      </el-row>
-      <!-- 评论 -->
-      <CommentSection :relation-id="detail.id" :project-id="detail.projectId" />
-    </div>
-    <div class="ml-22px">
-      <div class="box-border h-269px w-397px border border-[#EEEEEE] rounded-12px border-solid bg-[#FFFFFF] pa-22px">
-        <div class="mb-10px">图纸ID: {{ detail.id }}</div>
-        <div class="mb-10px">文件大小：{{ detail.filesInfo?.fileSize || 0 }} </div>
-        <!-- <div class="mb-10px">图纸版本：{{ detail.editionsName }} </div> -->
-        <div class="mb-10px">图纸格式：{{ detail.formatType?.toString() }}</div>
-        <div class="mb-10px">所需金币：{{ detail.points }}金币</div>
-        <div class="mb-10px">发布时间：{{ dayjs(detail.createTime).format('YYYY-MM-DD HH:mm:ss') }}</div>
-        <div class="mb-10px">图纸参数：{{ detail.editTypeName }}</div>
-        <div class="mb-10px">图纸分类：{{ detail.projectTypeName }}</div>
-        <div class="mb-10px">软件分类：{{ detail.editionsName }}</div>
-      </div>
-      <div class="mt-20px w-398px border border-[#EEEEEE] border-rd-[10px_10px_0px_0px] border-solid bg-[#FFFFFF]">
-        <img src="~/assets/images/banner.png" alt="" srcset="" class="w-100%" />
-        <div class="box-border border border-[#EEEEEE] border-rd-[10px_10px_0px_0px] border-solid border-t-none bg-[#FFFFFF] pa-18px">
-          <div class="flex flex-wrap items-start">
-            <div v-if="userInfo.nickname" class="mt-10px text-18px text-[#333333] font-bold">{{ userInfo.nickname }}</div>
-            <div
-              v-for="item in userInfo.labels"
-              :key="item"
-              class="mb-10px ml-10px box-border border border-[#1A65FF] rounded-13px border-solid px-8px py-3px color-#1a65ff"
-              >{{ item }}</div
-            >
-          </div>
-          <div v-if="userInfo.description" class="mb-20px text-14px text-[#333333] font-normal">{{ userInfo.description }}</div>
-          <!-- 显示作品 粉丝 荣誉证书 -->
-          <div class="flex items-center gap-40px">
-            <div class="flex items-center">
-              <div class="h-20px">
-                <img src="~/assets/images/folder.png" alt="works" class="w-80%" />
-              </div>
-              <div class="ml-8px mt--4px text-14px text-[#666] font-normal">作品: {{ userInfo.projectCount || 0 }}</div>
-            </div>
-            <div class="flex items-center">
-              <div class="h-20px">
-                <img src="~/assets/images/user4.png" alt="fans" class="w-80% rounded-full vertical-top" />
-              </div>
-              <div class="relative top--3px ml-8px text-14px text-[#666] font-normal">粉丝: {{ userInfo.fansCount || 0 }}</div>
-            </div>
-          </div>
-
-          <!-- 3个图片一排 超过换下一行 -->
-          <div v-if="userInfo.files?.length" class="mt-20px flex flex-wrap gap-16px">
-            <div v-for="i in userInfo.files" :key="i" class="flex-1">
-              <div
-                class="box-border h-200px w-full overflow-hidden border border-[#E5E7EB] rounded-8px border-solid from-[#FFFFFF] to-[#F5F7FA] bg-gradient-to-b p-16px"
-              >
-                <el-image :src="i.url" fit="cover" alt="" srcset="" class="h-full object-cover" />
-              </div>
-            </div>
-          </div>
-
-          <div class="mt-20px h-1px w-336px rounded-1px bg-[#EEEEEE]"></div>
-          <div class="mt-20px flex items-center">
-            <div class="h-24px w-4px rounded-1px bg-[#1A65FF]"></div>
-            <span class="ml-10px text-16px">最新发布</span>
-          </div>
-          <div class="mt-10px">
-            <div
-              v-for="item in mainWork"
-              :key="item.id"
-              class="flex cursor-pointer items-center justify-between px-10px py-10px hover:bg-#f5f5f5"
-              @click="handleClick(item.id)"
-            >
-              <div class="ellipsis text-15px text-[#333333] font-normal">{{ item.title }}</div>
-              <span class="ml-10px flex-shrink-0 color-#999999">{{ dayjs(item.createTime).format('MM-DD') }}</span>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-  import dayjs from 'dayjs'
-  import { downloadFile } from '~/utils/utils'
-  import { useMessage } from '~/utils/useMessage'
-  import { Warning } from '@element-plus/icons-vue'
-  import CardPicture from '~/components/kl-card-picture/index.vue'
-  import { getDetail, getRelationRecommend, report, getUserInfo, getMainWork, createContent, createUserProject, deleteProject } from '~/api/drawe-detail/index'
-  import KlNavTab from '~/components/kl-nav-tab/index.vue'
-  import ThumBnail from './components/swiper.vue'
-  import CommentSection from '~/components/comment-section/index.vue'
-  import { useRoute } from 'vue-router'
-  import { ref } from 'vue'
-  import type { ProjectRespVO, ProjectDrawPageRespVO, UserExtendSimpleRespDTO, ProjectDrawMemberRespVO } from '~/api/drawe-detail/types'
-  import useUserStore from '~/store/user'
-  const message = useMessage()
-  const userStore = useUserStore()
-  // 获取路由参数
-  const route = useRoute()
-  const id = route.query.id as string
-
-  // 获取详情
-  const detail = ref<ProjectRespVO>({} as ProjectRespVO)
-  const init = () => {
-    getDetail({ id }).then((res) => {
-      if (res.code === 0) {
-        detail.value = res.data
-        // 获取推荐信息
-        getRelationRecommendList()
-        // 获取用户信息
-        handleGetUserInfo()
-        // 最新发布
-        handleGetMainWork()
-      }
-    })
-  }
-
-  init()
-
-  // 获取最新发布
-  const mainWork = ref<ProjectDrawMemberRespVO[]>([])
-  const handleGetMainWork = () => {
-    getMainWork({ id: detail.value.id, limit: 10, memberId: detail.value.ownedUserId }).then((res) => {
-      if (res.code === 0) {
-        mainWork.value = res.data
-      }
-    })
-  }
-  // 获取用户信息
-  const userInfo = ref<UserExtendSimpleRespDTO>({} as UserExtendSimpleRespDTO)
-  const handleGetUserInfo = () => {
-    getUserInfo({ id: detail.value.id }).then((res) => {
-      if (res.code === 0) {
-        userInfo.value = res.data
-      }
-    })
-  }
-
-  // 获取关联推荐
-  const relationRecommend = ref<ProjectDrawPageRespVO[]>([])
-  const getRelationRecommendList = () => {
-    getRelationRecommend({ type: detail.value.type, projectType: detail.value.projectType[0] }).then((res) => {
-      if (res.code === 0) {
-        relationRecommend.value = res.data
-      }
-    })
-  }
-
-  const changeSwiper = (index: number) => {
-    console.log(index)
-  }
-
-  const nextSwiper = (val: any) => {
-    console.log(val)
-  }
-  const handleDownloadPreview = (item: any) => {
-    // 预览pdf
-    navigateTo(`/pdf-preview?url=${item.url}`)
-  }
-
-  /** 获取下载类型 */
-  const getType = (type: number) => {
-    if (type === 1 || type === 2 || type === 3) {
-      // 图纸 文本 模型都传1
-      return 1
-    }
-    // 工具箱传
-    return 2
-  }
-
-  const handleDownload = async () => {
-    if (!userStore.token) {
-      ElMessage.error('请先登录')
-      return
-    }
-
-    if (detail.value.points === 0) {
-      scrollTo()
-      return
-    }
-
-    if (detail.value.downloadId) {
-      ElMessage.success('您已获取下载权限')
-      scrollTo()
-      return
-    }
-
-    const res = await message.confirm(`是否花费${detail.value.points}金币下载此资源，是否继续？`, '提示')
-    if (res) {
-      createUserProject({ relationId: detail.value.id, type: getType(detail.value.type) }).then((res) => {
-        if (res.code === 0) {
-          ElMessage.success('获取下载权限成功')
-          detail.value.downloadId = res.data
-          scrollTo()
-        }
-      })
-    }
-  }
-
-  const scrollTo = () => {
-    const element = document.getElementById('section1')
-    if (element) {
-      element.scrollIntoView({
-        behavior: 'smooth',
-      })
-    }
-  }
-
-  const handleReport = () => {
-    if (!userStore.token) {
-      ElMessage.error('请先登录')
-      return
-    }
-    console.log('举报')
-    ElMessageBox.prompt('说明内容', '提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      inputPlaceholder: '请输入举报内容',
-      inputErrorMessage: '请输入举报内容',
-    }).then(({ value }) => {
-      report({
-        id: detail.value.id,
-        title: detail.value.title,
-        files: detail.value.files,
-        comments: value,
-        projectId: detail.value.projectId,
-        drawId: detail.value.id,
-      }).then((res) => {
-        if (res.code === 0) {
-          ElMessage.success('举报成功')
-        }
-      })
-    })
-  }
-
-  const handleCollect = async () => {
-    if (!userStore.token) {
-      ElMessage.error('请先登录')
-      return
-    }
-
-    const res = detail.value.favoriteId
-      ? await deleteProject({ id: detail.value.favoriteId })
-      : await createContent({
-          projectId: detail.value.projectId,
-          drawId: detail.value.id,
-        })
-    if (res.code === 0) {
-      ElMessage.success(`${detail.value.favoriteId ? '取消' : '收藏'}成功`)
-      init()
-    }
-  }
-
-  const handleClick = (id: string | number) => {
-    navigateTo(`/down-drawe-detail?id=${id}`) // 修改为在新窗口打开
-  }
-
-  const handleDownloadFile = (url: string, name: string) => {
-    downloadFile(url, name)
-  }
-</script>

pages/drawe/[projectType]/[pageNo]/[pageSize]/[[editions]]/[[source]].vue

@@ -0,0 +1,126 @@
+<template>
+  <!-- 导航 -->
+  <SeoHead title="工程设计图纸下载_CAD设计图纸资源库" />
+  <KlNavTab active="图纸" :type="1" />
+  <div class="ma-auto w-[1440px]">
+    <!-- 图纸分类 -->
+    <KlWallpaperCategory v-model="query" v-model:level="level" :type="1" />
+    <!-- 推荐栏目 -->
+    <RecommendedColumnsV2 v-model="query" v-model:result="result"></RecommendedColumnsV2>
+    <!-- 精选专题 -->
+    <!-- <FeaturedSpecials></FeaturedSpecials> -->
+    <!-- 分页 -->
+    <div class="mt-[10px] flex justify-center">
+      <el-pagination
+        v-model:current-page="query.pageNo"
+        v-model:page-size="query.pageSize"
+        :page-sizes="[12, 24, 48]"
+        :total="result?.total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleClickSize"
+        @current-change="handeClickCurrent"
+      />
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+  import KlNavTab from '~/components/kl-nav-tab/index.vue'
+  import KlWallpaperCategory from '~/components/kl-wallpaper-category/index.vue'
+  import RecommendedColumnsV2 from '~/components/drawe-components/RecommendedColumnsV2.vue'
+  // import FeaturedSpecials from './components/FeaturedSpecials.vue'
+  import { useRoute } from 'vue-router'
+  import { reactive, watch, ref } from 'vue'
+  import { page } from '~/api/upnew/index'
+  import { getDictTree } from '~/api/home/index'
+  import type { pageRes, pageReq } from '~/api/upnew/types'
+  const route = useRoute()
+  const projectType = computed(() => (route.params?.projectType ? route.params?.projectType : ''))
+  const pageNo = computed(() => Number(route.params?.pageNo))
+  const pageSize = computed(() => Number(route.params?.pageSize))
+  const editions = computed(() => (route.params?.editions ? route.params?.editions : ''))
+  const source = computed(() => (route.params?.source ? Number(route.params?.source) : ''))
+
+  console.log('route.params----', route.params)
+
+  const level = ref(
+    route.query?.valuelevel
+      ? JSON.parse(route.query.valuelevel as string)
+      : [
+          {
+            id: -1,
+            name: '图纸库',
+            isChildren: false,
+          },
+        ]
+  )
+  const keywords = ref((route.query?.valuekeywords as string) || '')
+
+  const query = ref<pageReq>({
+    pageNo: pageNo.value || 1,
+    pageSize: pageSize.value || 12,
+    projectType: projectType.value || '-1',
+    editions: editions.value || '-1',
+    source: source.value || -1,
+    type: 1,
+    title: keywords.value,
+  })
+  // const result = reactive<pageRes>({
+  //   list: [],
+  //   total: 0,
+  // })
+
+  // 如果id存在，则设置projectType
+  if (level.value.length) {
+    // query.value.projectType = level.value[level.value.length - 1].id || ''
+  }
+
+  const handleClickSize = (val: number) => {
+    query.value.pageSize = val
+    // getPage()
+    navigateTo(`/drawe/${query.value.projectType}/${query.value.pageNo}/${val}/${query.value.editions}/${query.value.source}`)
+  }
+
+  const handeClickCurrent = (val: number) => {
+    query.value.pageNo = val
+    // getPage()
+    navigateTo(`/drawe/${query.value.projectType}/${val}/${query.value.pageSize}/${query.value.editions}/${query.value.source}`)
+  }
+
+  const { data: result, refresh: getPage } = useAsyncData(
+    `draw-page-list-${query.value.projectType}-${query.value.editions}-${query.value.source}-${query.value.pageNo}-${query.value.pageSize}-${query.value.title}`,
+    async () => {
+      const res = await page({
+        ...query.value,
+        editions: query.value.editions === '-1' ? '' : query.value.editions,
+        source: query.value.source === -1 ? '' : query.value.source,
+        projectType: query.value.projectType === '-1' ? '' : query.value.projectType,
+      })
+      return res.data
+    },
+    {
+      immediate: true,
+    }
+  )
+  // const getPage = () => {
+  //   page(query).then((res) => {
+  //     const { data, code } = res
+  //     if (code === 0) {
+  //       result.list = data.list
+  //       result.total = data.total
+  //     }
+  //   })
+  // }
+
+  watch([() => query.value.projectType, () => query.value.editions, () => query.value.source], (val) => {
+    if (val) {
+      navigateTo(`/drawe/${query.value.projectType}/1/${query.value.pageSize}/${query.value.editions}/${query.value.source}`)
+    }
+  })
+</script>
+<style lang="scss" scoped>
+  :deep(.el-pagination) {
+    .el-input__inner {
+      text-align: center !important;
+    }
+  }
+</style>

pages/drawe/index.vue

@@ -1,5 +1,6 @@
 <template>
   <!-- 导航 -->
+  <SeoHead title="工程设计图纸下载_CAD设计图纸资源库" />
   <KlNavTab active="图纸" :type="1" />
   <div class="ma-auto w-[1440px]">
     <!-- 图纸分类 -->
@@ -30,27 +31,29 @@
   import { useRoute } from 'vue-router'
   import { reactive, watch, ref } from 'vue'
   import { page } from '~/api/upnew/index'
+  import { getDictTree } from '~/api/home/index'
   import type { pageRes, pageReq } from '~/api/upnew/types'
   const route = useRoute()
+
   const level = ref(
     route.query?.valuelevel
       ? JSON.parse(route.query.valuelevel as string)
       : [
           {
-            id: '0',
+            id: -1,
             name: '图纸库',
             isChildren: false,
           },
         ]
   )
-  const keywords = ref(route.query?.valuekeywords as string || '')
+  const keywords = ref((route.query?.valuekeywords as string) || '')
 
   const query = ref<pageReq>({
     pageNo: 1,
     pageSize: 12,
-    projectType: '',
-    editions: '',
-    source: '',
+    projectType: '-1',
+    editions: '-1',
+    source: -1,
     type: 1,
     title: keywords.value,
   })
@@ -61,27 +64,36 @@
 
   // 如果id存在，则设置projectType
   if (level.value.length) {
-    query.value.projectType = level.value[level.value.length - 1].id || ''
+    // query.value.projectType = level.value[level.value.length - 1].id || ''
   }
 
   const handleClickSize = (val: number) => {
     query.value.pageSize = val
-    getPage()
+    // getPage()
+    navigateTo(`/drawe/${query.value.projectType}/${query.value.pageNo}/${val}/${query.value.editions}/${query.value.source}`)
   }
 
   const handeClickCurrent = (val: number) => {
     query.value.pageNo = val
-    getPage()
+    // getPage()
+    navigateTo(`/drawe/${query.value.projectType}/${val}/${query.value.pageSize}/${query.value.editions}/${query.value.source}`)
   }
 
-
-  const { data:result, refresh:getPage } = await useAsyncData(`draw-page-list-${Date.now()}`, async () => {
-    const res = await page(query.value)
-    return res.data
-    
-  },{
-    immediate: true,
-  })
+  const { data: result, refresh: getPage } = useAsyncData(
+    `draw-page-list-${query.value.projectType}-${query.value.editions}-${query.value.source}-${query.value.pageNo}-${query.value.pageSize}-${query.value.title}`,
+    async () => {
+      const res = await page({
+        ...query.value,
+        editions: query.value.editions === '-1' ? '' : query.value.editions,
+        source: query.value.source === -1 ? '' : query.value.source,
+        projectType: query.value.projectType === '-1' ? '' : query.value.projectType,
+      })
+      return res.data
+    },
+    {
+      immediate: true,
+    }
+  )
   // const getPage = () => {
   //   page(query).then((res) => {
   //     const { data, code } = res
@@ -94,7 +106,7 @@
 
   watch([() => query.value.projectType, () => query.value.editions, () => query.value.source], (val) => {
     if (val) {
-      getPage()
+      navigateTo(`/drawe/${query.value.projectType}/1/${query.value.pageSize}/${query.value.editions}/${query.value.source}`)
     }
   })
 </script>

pages/foreign/[projectType]/[pageNo]/[pageSize]/[[editions]]/[[source]].vue

@@ -0,0 +1,128 @@
+<template>
+  <!-- 导航 -->
+  <KlNavTab active="国外专区" />
+  <!-- banneer提示 -->
+  <BannerTips />
+  <div class="ma-auto w-[1440px]">
+    <!-- 图片展示鼠标移上去展示提示语 -->
+    <!-- <ImageTips /> -->
+    <!-- 推荐栏目 -->
+    <RecommendedColumnsV2 v-model:query="query" v-model="result"></RecommendedColumnsV2>
+    <!-- 精选专题 -->
+    <!-- <FeaturedSpecials></FeaturedSpecials> -->
+    <!-- 分页 -->
+    <div class="mt-[10px] flex justify-center">
+      <el-pagination
+        v-model:current-page="query.pageNo"
+        v-model:page-size="query.pageSize"
+        :page-sizes="[10, 20, 30]"
+        :total="result?.total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleChangeSize"
+        @current-change="handleChangeCurrent"
+      />
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+  import KlNavTab from '~/components/kl-nav-tab/index.vue'
+  import KlWallpaperCategory from '~/components/kl-wallpaper-category/index.vue'
+  import RecommendedColumnsV2 from '~/components/foreign-components/RecommendedColumnsV2.vue'
+  import BannerTips from '~/components/foreign-components/BannerTips.vue'
+  // import FeaturedSpecials from './components/FeaturedSpecials.vue'
+  import { useRoute } from 'vue-router'
+  import { reactive, watch, ref } from 'vue'
+  import { page } from '~/api/upnew/index'
+  import { getDictTree } from '~/api/home/index'
+  import type { pageRes, pageReq } from '~/api/upnew/types'
+  const route = useRoute()
+  const projectType = computed(() => (route.params?.projectType ? route.params?.projectType : ''))
+  const pageNo = computed(() => Number(route.params?.pageNo))
+  const pageSize = computed(() => Number(route.params?.pageSize))
+  const editions = computed(() => (route.params?.editions ? route.params?.editions : ''))
+  const source = computed(() => (route.params?.source ? Number(route.params?.source) : ''))
+
+  console.log('route.params----', route.params)
+
+  const level = ref(
+    route.query?.valuelevel
+      ? JSON.parse(route.query.valuelevel as string)
+      : [
+          {
+            id: -1,
+            name: '图纸库',
+            isChildren: false,
+          },
+        ]
+  )
+  const keywords = ref((route.query?.valuekeywords as string) || '')
+
+  const query = ref<pageReq>({
+    pageNo: pageNo.value || 1,
+    pageSize: pageSize.value || 12,
+    projectType: projectType.value || '-1',
+    editions: editions.value || '-1',
+    source: source.value || -1,
+    type: 1,
+    title: keywords.value,
+  })
+  // const result = reactive<pageRes>({
+  //   list: [],
+  //   total: 0,
+  // })
+
+  // 如果id存在，则设置projectType
+  if (level.value.length) {
+    // query.value.projectType = level.value[level.value.length - 1].id || ''
+  }
+
+  const handleChangeSize = (val: number) => {
+    query.value.pageSize = val
+    // getPage()
+    navigateTo(`/foreign/${query.value.projectType}/${query.value.pageNo}/${val}/${query.value.editions}/${query.value.source}`)
+  }
+
+  const handleChangeCurrent = (val: number) => {
+    query.value.pageNo = val
+    // getPage()
+    navigateTo(`/foreign/${query.value.projectType}/${val}/${query.value.pageSize}/${query.value.editions}/${query.value.source}`)
+  }
+
+  const { data: result, refresh: getPage } = useAsyncData(
+    `foreign-page-list-${query.value.projectType}-${query.value.editions}-${query.value.source}-${query.value.pageNo}-${query.value.pageSize}-${query.value.title}`,
+    async () => {
+      const res = await page({
+        ...query.value,
+        editions: query.value.editions === '-1' ? '' : query.value.editions,
+        source: query.value.source === -1 ? '' : query.value.source,
+        projectType: query.value.projectType === '-1' ? '' : query.value.projectType,
+      })
+      return res.data
+    },
+    {
+      immediate: true,
+    }
+  )
+  // const getPage = () => {
+  //   page(query).then((res) => {
+  //     const { data, code } = res
+  //     if (code === 0) {
+  //       result.list = data.list
+  //       result.total = data.total
+  //     }
+  //   })
+  // }
+
+  watch([() => query.value.projectType, () => query.value.editions, () => query.value.source], (val) => {
+    if (val) {
+      navigateTo(`/foreign/${query.value.projectType}/1/${query.value.pageSize}/${query.value.editions}/${query.value.source}`)
+    }
+  })
+</script>
+<style lang="scss" scoped>
+  :deep(.el-pagination) {
+    .el-input__inner {
+      text-align: center !important;
+    }
+  }
+</style>

pages/foreign/index.vue

@@ -26,9 +26,9 @@
 </template>
 <script setup lang="ts">
   import KlNavTab from '~/components/kl-nav-tab/index.vue'
-  import RecommendedColumnsV2 from './components/RecommendedColumnsV2.vue'
+  import RecommendedColumnsV2 from '~/components/foreign-components/RecommendedColumnsV2.vue'
   // import FeaturedSpecials from './components/FeaturedSpecials.vue'
-  import BannerTips from './components/BannerTips.vue'
+  import BannerTips from '~/components/foreign-components/BannerTips.vue'
   // import ImageTips from './components/ImageTips.vue'
 
   import { reactive, watch } from 'vue'
@@ -38,9 +38,9 @@
   const query = reactive<pageReq>({
     pageNo: 1,
     pageSize: 10,
-    projectType: '',
-    editions: '',
-    source: '',
+    projectType: '-1',
+    editions: '-1',
+    source: -1,
     type: 1,
   })
   // const result = reactive<pageRes>({
@@ -48,8 +48,13 @@
   //   total: 0,
   // })
 
-  const {data:result, refresh:getPage } = await useAsyncData(`draw-page-list-${Date.now()}`, async () => {
-    const res = await page(query)
+  const { data: result } = await useAsyncData(`draw-page-list-${Date.now()}`, async () => {
+    const res = await page({
+      ...query,
+      editions: query.editions === '-1' ? '' : query.editions,
+      source: query.source === -1 ? '' : query.source,
+      projectType: query.projectType === '-1' ? '' : query.projectType,
+    })
     return res.data
   })
   // const getPage = () => {
@@ -66,18 +71,23 @@
 
   const handleChangeSize = (val: number) => {
     query.pageSize = val
-    query.pageNo = 1
-    getPage()
+    // query.pageNo = 1
+    // getPage()
+
+    navigateTo(`/foreign/${query.projectType}/${query.pageNo}/${val}/${query.editions}/${query.source}`)
   }
 
   const handleChangeCurrent = (val: number) => {
     query.pageNo = val
-    getPage()
+    // getPage()
+    navigateTo(`/foreign/${query.projectType}/${val}/${query.pageSize}/${query.editions}/${query.source}`)
   }
 
   watch([() => query.projectType, () => query.editions, () => query.source], (val) => {
     if (val) {
-      getPage()
+      // getPage()
+
+      navigateTo(`/foreign/${query.projectType}/1/${query.pageSize}/${query.editions}/${query.source}`)
     }
   })
 </script>

pages/home/components/Leaderboard.vue

@@ -134,7 +134,7 @@
   // handleuserTop()
 
   const handleClick = (item: ProjectDrawPageRespVO) => {
-    window.open(`/down-drawe-detail?id=${item.id}`, '_blank') // 修改为在新窗口打开
+    navigateTo(`/down-drawe-detail/${item.id}`) // 修改为在新窗口打开
   }
 </script>
 

pages/home/components/LoginForm.vue

@@ -10,10 +10,10 @@
         fit="cover"
         @click="handleUserInfo"
       />
-      <div class="mt-[10px] text-[16px] text-[#333333] font-normal">
-        <img v-if="userStore.userInfoRes.vipLevel === 1" src="~/assets/svg/vip.svg" alt="" class="relative top-[12px]" />
-        <img v-if="userStore.userInfoRes.vipLevel === 2" src="~/assets/svg/svip.svg" alt="" class="relative top-[12px]" />
+      <div class="mt-[10px] text-[16px] text-[#333333] font-normal flex items-center">
         Hi，{{ userStore.userInfoRes.nickname || '欢迎访问~' }}
+        <img v-if="userStore.userInfoRes.vipLevel === 1" src="~/assets/svg/vip.svg" alt="" class="relative top-[1px]" />
+        <img v-if="userStore.userInfoRes.vipLevel === 2" src="~/assets/svg/svip.svg" alt="" class="relative top-[1px]" />
       </div>
     </div>
     <div v-if="isLogin" class="mt-[20px] flex flex-col gap-[20px] px-[20px] text-[14px] text-[#333333] font-normal">
@@ -38,7 +38,7 @@
         </div>
       </div>
     </div>
-    <div v-if="!isLogin" class="mt-[48px] box-border flex justify-between px-[18px]">
+    <div v-if="!isLogin" class="mt-[46px] box-border flex justify-between px-[18px]">
       <div
         class="h-[37px] w-[101px] cursor-pointer border border-[#1A65FF] rounded-[2px] border-solid bg-[#1A65FF] text-center text-[14px] text-[#FFFFFF] font-normal line-height-[37px]"
         @click="handleLogin"
@@ -50,7 +50,7 @@
         >免费注册</div
       >
     </div>
-    <div v-else class="mt-[30px] box-border flex justify-between px-[18px]">
+    <div v-else class="mt-[24px] box-border flex justify-between px-[18px]">
       <div
         class="h-[37px] w-[101px] cursor-pointer border border-[#1A65FF] rounded-[2px] border-solid bg-[#1A65FF] text-center text-[14px] text-[#FFFFFF] font-normal line-height-[37px]"
         @click="handleDrawe"
@@ -69,7 +69,7 @@
       <img src="~/assets/images/phone-v2.png" alt="手机登录" class="social-icon" @click="handleLoginPhone" />
     </div>
 
-    <div class="sign-bonus mt-[18px]" @click="handleSign">
+    <div class="sign-bonus mt-[18px] cursor-pointer" @click="handleSign">
       <img src="~/assets/images/sign.png" alt="签到奖励" class="bonus-image" />
     </div>
   </div>
@@ -81,7 +81,7 @@
   import { handleLoginQQ, handleLoginWechat } from '~/utils/login'
   import type { UserStatisticsCountRespVO } from '~/api/personal-center/types'
   import { getUserStatistics } from '~/api/personal-center/index'
-  import useUserStore from '~/store/user'
+  import useUserStore from '~/stores/user'
   const userStore = useUserStore()
   const app = useNuxtApp()
 
@@ -124,7 +124,7 @@
 
   // 发布图纸
   const handleDrawe = () => {
-    navigateTo('/upnew/drawe') // 修改为在新窗口打开
+    navigateTo('/upnew') // 修改为在新窗口打开
   }
 
   // 推出登录
@@ -137,11 +137,11 @@
   }
 
   const handleSign = () => {
-    navigateTo('/sign-page') // 修改为在新窗口打开
+    navigateTo('/sign-content') // 修改为在新窗口打开
   }
 
   watchEffect(() => {
-    if (isLogin.value) {
+    if (isLogin.value && import.meta.client) {
       fetchUserStatistics()
     }
   })

pages/home/components/MainContent.vue

@@ -20,46 +20,40 @@
     <div
       class="box-border h-56px w-1219px flex items-center border border-[#EEEEEE] border-solid border-t-none bg-[#FFFFFF] pl-10px line-height-46px"
     >
-      <img
-        src="~/assets/images/voice.png"
-        alt=""
-        srcset=""
-        class="mr-10px h-15px w-16px"
-      />
-      <Vue3Marquee :duration="10" direction="normal" pause-on-hover
-        >· 经典来袭，SolidWorks装配经典案例之气动发动机
+      <img src="~/assets/images/voice.png" alt="" srcset="" class="mr-10px h-15px w-16px" />
+      <Vue3Marquee :duration="10" direction="normal" pause-on-hover>
+        · 经典来袭，SolidWorks装配经典案例之气动发动机
       </Vue3Marquee>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { reactive, ref } from "vue";
-import LoginForm from "./LoginForm.vue";
-import { Vue3Marquee } from "vue3-marquee";
+  import { reactive, ref } from 'vue'
+  import LoginForm from './LoginForm.vue'
+  import { Vue3Marquee } from 'vue3-marquee'
 
-import { getSettingPage } from "~/api/home/index";
+  import { getSettingPage } from '~/api/home/index'
 
-const pageReq = reactive({
-  type: 1,
-  status: 0,
-});
+  const pageReq = reactive({
+    type: 1,
+    status: 0,
+  })
 
-const { data: bannerList } = useAsyncData("get-setting-Page-main-content", async () => {
+  const { data: bannerList } = useAsyncData('get-setting-Page-main-content', async () => {
+    const res = await getSettingPage(pageReq)
+    return res.data
+  })
 
-  const res = await getSettingPage(pageReq);
-  return res.data;
-});
-
-const handleClick = (url: string) => {
-  if (url) {
-    navigateTo(url);
+  const handleClick = (url: string) => {
+    if (url) {
+      navigateTo(url)
+    }
   }
-};
 </script>
 
 <style scoped lang="scss">
-.main-content {
-  flex: 1;
-}
+  .main-content {
+    flex: 1;
+  }
 </style>

pages/home/components/PopularDrawings.vue

@@ -110,7 +110,7 @@
   /** 点击卡片 */
   const handleCardClick = (item: ProjectDrawPageRespVO) => {
     // 跳转到下载详情页 并且是单独开标签
-    navigateTo(`/down-drawe-detail?id=${item.id}`) // 修改为在新窗口打开
+    navigateTo(`/down-drawe-detail/${item.id}`) // 修改为在新窗口打开
   }
 
   const handleClickType = (primary?: ProjectDictNodeVO, secondary?: ProjectDictNodeVO) => {
@@ -146,7 +146,7 @@
   //   })
   // }
 
-  const { data: projectTypeList, refresh: getParent } = useAsyncData('projectTypeListChildren-PopularDrawings-popularDrawings', async () => {
+  const { data: projectTypeList, refresh: getParent } = await useAsyncData('projectTypeListChildren-PopularDrawings-popularDrawings', async () => {
     const res = await hotTag({
       type: query.type,
       limit: 6,
@@ -154,7 +154,7 @@
     })
     const all = [{ id: '0', name: '全部分类', children: [] }]
     if (Array.isArray(res.data) && res.data?.length > 0) {
-      const total = [...res.data,...all]
+      const total = [...res.data, ...all]
       // query.projectTypeDay = total[0]?.id || ''
       // query.projectType = total[0]!.children?.[0]?.id || ''
       return total
@@ -162,13 +162,21 @@
     return []
   })
 
-  const {data: hotTopList, refresh: getHotTop} = useAsyncData('hotTop-PopularDrawings-popularDrawings', async () => {
+  // if (!projectTypeList.value?.length) {
+  //   throw createError({
+  //     statusCode: 404,
+  //     statusMessage: 'Page Not Found',
+  //     fatal: true,
+  //   })
+  // }
+
+  const { data: hotTopList, refresh: getHotTop } = useAsyncData('hotTop-PopularDrawings-popularDrawings', async () => {
     const res = await hotTop({
       type: query.type,
       // @ts-ignore
-      projectType: query.projectTypeDay,
+      projectType: query.projectTypeDay || projectTypeList.value[0].id,
       isDomestic: query.isDomestic || 1,
-      projectTypeTop: query.projectTypeDay,
+      projectTypeTop: query.projectTypeDay || projectTypeList.value?.[0].id,
     })
     return res.data || []
   })
@@ -197,8 +205,6 @@
   //   })
   // }
 
-
-
   const handleHover = (item: ProjectDictNodeVO) => {
     query.projectTypeDay = item.id || ''
     if (item.name === '全部分类') return
@@ -217,8 +223,8 @@
   watch(
     () => query.type,
     async () => {
-     await getParent();
-     await getHotTop();
+      await getParent()
+      await getHotTop()
     },
     {
       // immediate: true,

pages/home/components/SideMenu.vue

@@ -11,30 +11,16 @@
       <!-- @click="handleSubmenuClick(item)" -->
       {{ item.name }}
       <!-- 悬浮浮窗 -->
-      <div
-        v-if="activeIndex === index"
-        class="submenu-panel"
-        :style="{ top: submenuTop + 'px' }"
-        @mouseenter="keepSubmenuVisible"
-        @mouseleave="hideSubMenu"
-      >
+      <div v-if="activeIndex === index" class="submenu-panel" :style="{ top: submenuTop + 'px' }" @mouseenter="keepSubmenuVisible" @mouseleave="hideSubMenu">
         <div class="submenu-content">
           <!-- <div class="text-right">更多</div> -->
           <div class="submenu-group">
             <template v-for="group in item.children" :key="group.id">
-              <div
-                class="submenu-group-title"
-                @click.stop="handleSubmenuClick(group)"
-              >
+              <div class="submenu-group-title" @click.stop="handleSubmenuClick(group)">
                 {{ group.name }}
               </div>
               <div class="submenu-group-items">
-                <div
-                  v-for="sub in group.children"
-                  :key="sub.id"
-                  class="submenu-item"
-                  @click.stop="handleSubmenuClick(group, sub)"
-                >
+                <div v-for="sub in group.children" :key="sub.id" class="submenu-item" @click.stop="handleSubmenuClick(sub)">
                   {{ sub.name }}
                 </div>
               </div>
@@ -47,134 +33,126 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from "vue";
-import type { ComponentPublicInstance } from "vue";
-import { tab2 } from "~/api/home/index";
-import type { ProjectDictNodeVO } from "~/api/home/type";
+  import { ref, onMounted } from 'vue'
+  import type { ComponentPublicInstance } from 'vue'
+  import { tab2 } from '~/api/home/index'
+  import type { ProjectDictNodeVO } from '~/api/home/type'
 
-const activeIndex = ref(-1);
-const submenuTop = ref(0);
-// const submenuLeft = ref(0)
-const sideMenu = ref();
-const menuItemRefs = ref<HTMLElement[]>([]);
+  const activeIndex = ref(-1)
+  const submenuTop = ref(0)
+  // const submenuLeft = ref(0)
+  const sideMenu = ref()
+  const menuItemRefs = ref<HTMLElement[]>([])
 
-// const menuItems = ref<ProjectDictNodeVO[]>([]);
+  // const menuItems = ref<ProjectDictNodeVO[]>([]);
 
-// 等待数据加载完成再进行渲染 :courseData 对data进行别名赋值
-const { data: menuItems, pending, error } = useAsyncData(
-  'tab2-list',
-  async () => {
+  // 等待数据加载完成再进行渲染 :courseData 对data进行别名赋值
+  const {
+    data: menuItems,
+    pending,
+    error,
+  } = useAsyncData('tab2-list', async () => {
     const res = await tab2()
-      const arr = [];
-      for (let i = 0; i < res.data?.length; i += 2) {
-        arr.push({
-          children: res.data.slice(i, i + 2),
-          name: getName(res.data.slice(i, i + 2)),
-        });
-      }
+    const arr = []
+    for (let i = 0; i < res.data?.length; i += 2) {
+      arr.push({
+        children: res.data.slice(i, i + 2),
+        name: getName(res.data.slice(i, i + 2)),
+      })
+    }
     return arr
-  }
-)
+  })
 
-
-
-
-const showSubMenu = (index: number) => {
-  // if (menuItems.value.length === index + 1) {
-  //   return
-  // }
-  activeIndex.value = index;
-  const dom = menuItemRefs.value[index].getBoundingClientRect();
-  console.log(dom);
-  // submenuTop.value = window.scrollY
-};
-
-const hideSubMenu = () => {
-  activeIndex.value = -1;
-};
-
-const handleSubmenuClick = (
-  primary?: ProjectDictNodeVO,
-  secondary?: ProjectDictNodeVO,
-  tertiary?: ProjectDictNodeVO
-) => {
-  const normal = { id: "0", name: "图纸库", isChildren: false };
-  const level = [primary, secondary, tertiary]
-    .filter(Boolean)
-    .map((item) => ({
-      id: item?.id,
-      name: item?.name,
-      isChildren: item?.children?.length ? false : true,
-    }));
-  if (primary?.id === "0") {
-    level[0].name = "图纸库";
-  } else {
-    level.unshift(normal);
+  const showSubMenu = (index: number) => {
+    // if (menuItems.value.length === index + 1) {
+    //   return
+    // }
+    activeIndex.value = index
+    const dom = menuItemRefs.value[index].getBoundingClientRect()
+    console.log(dom)
+    // submenuTop.value = window.scrollY
   }
 
-  navigateTo(`/drawe?level=${JSON.stringify(level)}`);
-};
-
-const keepSubmenuVisible = () => {
-  // activeIndex.value = activeIndex.value // 保持当前索引
-};
-
-const setMenuItemRef = (
-  el: Element | ComponentPublicInstance | null,
-  index: number
-) => {
-  if (el && "offsetTop" in el) {
-    menuItemRefs.value[index] = el as HTMLElement;
+  const hideSubMenu = () => {
+    activeIndex.value = -1
   }
-};
 
-const getName = (arr: any[]) => {
-  if (arr.length === 1) {
-    return arr[0].name;
-  } else {
-    return arr[0].name + " / " + arr[1].name;
+  const handleSubmenuClick = (primary: ProjectDictNodeVO) => {
+    // const normal = { id: "0", name: "图纸库", isChildren: false };
+    // const level = [primary, secondary, tertiary]
+    //   .filter(Boolean)
+    //   .map((item) => ({
+    //     id: item?.id,
+    //     name: item?.name,
+    //     isChildren: item?.children?.length ? false : true,
+    //   }));
+    // if (primary?.id === "0") {
+    //   level[0].name = "图纸库";
+    // } else {
+    //   level.unshift(normal);
+    // }
+
+    // navigateTo(`/drawe?level=${JSON.stringify(level)}`)
+    navigateTo(`/drawe/${primary.id}/1/12/-1`)
   }
-};
 
-const init = () => {
-  // 获取标签
-  // getLabel()
-};
+  const keepSubmenuVisible = () => {
+    // activeIndex.value = activeIndex.value // 保持当前索引
+  }
 
-onMounted(() => {
-  // init();
-});
+  const setMenuItemRef = (el: Element | ComponentPublicInstance | null, index: number) => {
+    if (el && 'offsetTop' in el) {
+      menuItemRefs.value[index] = el as HTMLElement
+    }
+  }
+
+  const getName = (arr: any[]) => {
+    if (arr.length === 1) {
+      return arr[0].name
+    } else {
+      return arr[0].name + ' / ' + arr[1].name
+    }
+  }
+
+  const init = () => {
+    // 获取标签
+    // getLabel()
+  }
+
+  onMounted(() => {
+    // init();
+  })
 </script>
 
 <style scoped>
-.side-menu {
-  width: 221px;
-  background-color: #fff;
-  /* padding: 10px 0; */
-  /* box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); */
-  /* overflow: visible; */
-  box-sizing: border-box;
-  position: relative; /* 添加定位上下文 */
-  /* overflow-y: auto; */
-  /* 隐藏滚动条 */
-  scrollbar-width: none; /* Firefox */
-  -ms-overflow-style: none; /* IE and Edge */
-  z-index: 9;
-  /* padding-top: 10px; */
-}
+  .side-menu {
+    width: 221px;
+    background-color: #fff;
+    /* padding: 10px 0; */
+    /* box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); */
+    /* overflow: visible; */
+    box-sizing: border-box;
+    position: relative; /* 添加定位上下文 */
+    /* overflow-y: auto; */
+    /* 隐藏滚动条 */
+    scrollbar-width: none; /* Firefox */
+    -ms-overflow-style: none; /* IE and Edge */
+    z-index: 9;
+    /* padding-top: 10px; */
+  }
 
-/* 隐藏 Webkit 浏览器的滚动条 */
-.side-menu::-webkit-scrollbar {
-  display: none;
-}
+  /* 隐藏 Webkit 浏览器的滚动条 */
+  .side-menu::-webkit-scrollbar {
+    display: none;
+  }
 
-/* 鼠标悬停时显示滚动条 */
-.side-menu:hover {
-  scrollbar-width: none; /* Firefox */
-  -ms-overflow-style: none; /* IE and Edge */
-}
+  /* 鼠标悬停时显示滚动条 */
+  .side-menu:hover {
+    scrollbar-width: none; /* Firefox */
+    -ms-overflow-style: none; /* IE and Edge */
+  }
 
-/* .side-menu:hover::-webkit-scrollbar {
+  /* .side-menu:hover::-webkit-scrollbar {
     display: block;
     width: 8px !important;
   }
@@ -188,44 +166,44 @@ onMounted(() => {
     background-color: #fff;
   } */
 
-.menu-item {
-  /* position: relative; */
-  text-align: center;
-  padding: 4px 24px;
-  cursor: pointer;
-  /* transition: all 0.3s ease; */
-  color: #333;
-  font-size: 14px;
-  border: 1px solid transparent;
-  z-index: 9;
-}
+  .menu-item {
+    /* position: relative; */
+    text-align: center;
+    padding: 10px 24px;
+    cursor: pointer;
+    /* transition: all 0.3s ease; */
+    color: #333;
+    font-size: 14px;
+    border: 1px solid transparent;
+    z-index: 9;
+  }
 
-.menu-item:hover {
-  background-color: #fff;
-  color: #1890ff;
-  border: 1px solid #1890ff;
-  border-right: transparent !important;
-}
+  .menu-item:hover {
+    background-color: #fff;
+    color: #1890ff;
+    border: 1px solid #1890ff;
+    border-right: transparent !important;
+  }
 
-.submenu-panel {
-  position: absolute;
-  left: 220px;
-  top: 0;
-  width: 957px;
-  background: #fff;
-  /* box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1); */
-  border: 1px solid #1890ff;
-  /* border-radius: 4px; */
-  display: flex;
-  padding: 20px;
-  z-index: -1;
-  box-sizing: border-box;
-  min-height: 480px;
-  overflow-y: auto;
-}
+  .submenu-panel {
+    position: absolute;
+    left: 220px;
+    top: 0;
+    width: 957px;
+    background: #fff;
+    /* box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1); */
+    border: 1px solid #1890ff;
+    /* border-radius: 4px; */
+    display: flex;
+    padding: 20px;
+    z-index: -1;
+    box-sizing: border-box;
+    min-height: 480px;
+    overflow-y: auto;
+  }
 
-.submenu-panel::before {
-  /* content: '';
+  .submenu-panel::before {
+    /* content: '';
     position: absolute;
     left: -6px;
     top: 50%;
@@ -236,61 +214,61 @@ onMounted(() => {
     border-bottom: 8px solid transparent;
     border-right: 8px solid #fff;
     filter: drop-shadow(-2px 0 2px rgba(0, 0, 0, 0.1)); */
-}
+  }
 
-.submenu-content {
-  /* flex: 1; */
-  /* display: grid; */
-  /* grid-template-columns: repeat(3, 1fr); */
-  /* gap: 15px; */
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  .submenu-group {
+  .submenu-content {
+    /* flex: 1; */
+    /* display: grid; */
+    /* grid-template-columns: repeat(3, 1fr); */
+    /* gap: 15px; */
+    width: 100%;
     display: flex;
     flex-direction: column;
-    align-items: flex-start;
-    flex-wrap: wrap;
-    -webkit-column-break-inside: avoid; /* 兼容webkit内核 */
-    /* border: 1px solid #e6e8eb; */
-    .submenu-group-title {
-      font-size: 15px;
-      /* font-weight: 700; */
-      padding: 10px 16px;
-      color: #000;
-      font-weight: 600;
-      transition: all 0.2s;
-      /* border-bottom: 1px solid #e6e8eb; */
-    }
-    .submenu-group-title:hover {
-      color: #1890ff;
-      /* border-bottom: 1px solid #e6e8eb; */
-    }
-    .submenu-group-items {
-      display: flex !important;
-      flex-direction: row;
+    .submenu-group {
+      display: flex;
+      flex-direction: column;
       align-items: flex-start;
       flex-wrap: wrap;
-      color: #666;
-      padding: 0px 16px;
-      gap: 10px;
-      .submenu-item {
-        cursor: pointer;
+      -webkit-column-break-inside: avoid; /* 兼容webkit内核 */
+      /* border: 1px solid #e6e8eb; */
+      .submenu-group-title {
+        font-size: 15px;
+        /* font-weight: 700; */
+        padding: 10px 16px;
+        color: #000;
+        font-weight: 600;
+        transition: all 0.2s;
+        /* border-bottom: 1px solid #e6e8eb; */
+      }
+      .submenu-group-title:hover {
+        color: #1890ff;
+        /* border-bottom: 1px solid #e6e8eb; */
+      }
+      .submenu-group-items {
+        display: flex !important;
+        flex-direction: row;
+        align-items: flex-start;
+        flex-wrap: wrap;
+        color: #666;
+        padding: 0px 16px;
+        gap: 10px;
+        .submenu-item {
+          cursor: pointer;
+        }
       }
     }
   }
-}
 
-.submenu-item {
-  cursor: pointer;
-  transition: all 0.2s;
-  display: inline-block; /* 改为行内块元素 */
-  /* padding: 8px 12px; */
-  padding-right: 12px;
-  /* padding-bottom: 8px; */
-}
+  .submenu-item {
+    cursor: pointer;
+    transition: all 0.2s;
+    display: inline-block; /* 改为行内块元素 */
+    /* padding: 8px 12px; */
+    padding-right: 12px;
+    /* padding-bottom: 8px; */
+  }
 
-.submenu-item:hover {
-  color: #1890ff;
-}
+  .submenu-item:hover {
+    color: #1890ff;
+  }
 </style>

pages/m/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div>
+    <h1>Mobile Page</h1>
+  </div>
+</template>
+
+<script setup lang="ts">
+  // Mobile specific logic can be added here
+</script>
+
+<style lang="scss" scoped></style>

pages/model/[projectType]/[pageNo]/[pageSize]/[[editions]]/[[source]].vue

@@ -0,0 +1,126 @@
+<template>
+  <!-- 导航 -->
+  <SeoHead title="工程设计模型下载_CAD设计图纸资源库" />
+  <KlNavTab active="模型" :type="3" />
+  <div class="ma-auto w-[1440px]">
+    <!-- 图纸分类 -->
+    <KlWallpaperCategory v-model="query" v-model:level="level" :type="3" />
+    <!-- 推荐栏目 -->
+    <RecommendedColumnsV2 v-model="query" v-model:result="result"></RecommendedColumnsV2>
+    <!-- 精选专题 -->
+    <!-- <FeaturedSpecials></FeaturedSpecials> -->
+    <!-- 分页 -->
+    <div class="mt-[10px] flex justify-center">
+      <el-pagination
+        v-model:current-page="query.pageNo"
+        v-model:page-size="query.pageSize"
+        :page-sizes="[12, 24, 48]"
+        :total="result?.total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleClickSize"
+        @current-change="handeClickCurrent"
+      />
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+  import KlNavTab from '~/components/kl-nav-tab/index.vue'
+  import KlWallpaperCategory from '~/components/kl-wallpaper-category/index.vue'
+  import RecommendedColumnsV2 from '~/components/model-components/RecommendedColumnsV2.vue'
+  // import FeaturedSpecials from './components/FeaturedSpecials.vue'
+  import { useRoute } from 'vue-router'
+  import { reactive, watch, ref } from 'vue'
+  import { page } from '~/api/upnew/index'
+  import { getDictTree } from '~/api/home/index'
+  import type { pageRes, pageReq } from '~/api/upnew/types'
+  const route = useRoute()
+  const projectType = computed(() => (route.params?.projectType ? route.params?.projectType : ''))
+  const pageNo = computed(() => Number(route.params?.pageNo))
+  const pageSize = computed(() => Number(route.params?.pageSize))
+  const editions = computed(() => (route.params?.editions ? route.params?.editions : ''))
+  const source = computed(() => (route.params?.source ? Number(route.params?.source) : ''))
+
+  console.log('route.params----', route.params)
+
+  const level = ref(
+    route.query?.valuelevel
+      ? JSON.parse(route.query.valuelevel as string)
+      : [
+          {
+            id: -1,
+            name: '模型库',
+            isChildren: false,
+          },
+        ]
+  )
+  const keywords = ref((route.query?.valuekeywords as string) || '')
+
+  const query = ref<pageReq>({
+    pageNo: pageNo.value || 1,
+    pageSize: pageSize.value || 12,
+    projectType: projectType.value || '-1',
+    editions: editions.value || '-1',
+    source: source.value || -1,
+    type: 3,
+    title: keywords.value,
+  })
+  // const result = reactive<pageRes>({
+  //   list: [],
+  //   total: 0,
+  // })
+
+  // 如果id存在，则设置projectType
+  if (level.value.length) {
+    // query.value.projectType = level.value[level.value.length - 1].id || ''
+  }
+
+  const handleClickSize = (val: number) => {
+    query.value.pageSize = val
+    // getPage()
+    navigateTo(`/model/${query.value.projectType}/${query.value.pageNo}/${val}/${query.value.editions}/${query.value.source}`)
+  }
+
+  const handeClickCurrent = (val: number) => {
+    query.value.pageNo = val
+    // getPage()
+    navigateTo(`/model/${query.value.projectType}/${val}/${query.value.pageSize}/${query.value.editions}/${query.value.source}`)
+  }
+
+  const { data: result, refresh: getPage } = useAsyncData(
+    `draw-page-list-${query.value.projectType}-${query.value.editions}-${query.value.source}-${query.value.pageNo}-${query.value.pageSize}`,
+    async () => {
+      const res = await page({
+        ...query.value,
+        editions: query.value.editions === '-1' ? '' : query.value.editions,
+        source: query.value.source === -1 ? '' : query.value.source,
+        projectType: query.value.projectType === '-1' ? '' : query.value.projectType,
+      })
+      return res.data
+    },
+    {
+      immediate: true,
+    }
+  )
+  // const getPage = () => {
+  //   page(query).then((res) => {
+  //     const { data, code } = res
+  //     if (code === 0) {
+  //       result.list = data.list
+  //       result.total = data.total
+  //     }
+  //   })
+  // }
+
+  watch([() => query.value.projectType, () => query.value.editions, () => query.value.source], (val) => {
+    if (val) {
+      navigateTo(`/model/${query.value.projectType}/1/${query.value.pageSize}/${query.value.editions}/${query.value.source}`)
+    }
+  })
+</script>
+<style lang="scss" scoped>
+  :deep(.el-pagination) {
+    .el-input__inner {
+      text-align: center !important;
+    }
+  }
+</style>

pages/model/index.vue

@@ -1,7 +1,8 @@
 <template>
   <!-- 导航 -->
+  <SeoHead title="工程设计模型下载_CAD设计图纸资源库" />
   <KlNavTab active="模型" :type="3" />
-  <div class="ma-auto w-1440px">
+  <div class="ma-auto w-[1440px]">
     <!-- 图纸分类 -->
     <KlWallpaperCategory v-model="query" v-model:level="level" :type="3" />
     <!-- 推荐栏目 -->
@@ -9,12 +10,12 @@
     <!-- 精选专题 -->
     <!-- <FeaturedSpecials></FeaturedSpecials> -->
     <!-- 分页 -->
-    <div class="mt-10px flex justify-center">
+    <div class="mt-[10px] flex justify-center">
       <el-pagination
         v-model:current-page="query.pageNo"
         v-model:page-size="query.pageSize"
         :page-sizes="[12, 24, 48]"
-        :total="result.total"
+        :total="result?.total"
         layout="total, sizes, prev, pager, next, jumper"
         @size-change="handleChangeSize"
         @current-change="handleChangeCurrent"
@@ -25,7 +26,7 @@
 <script setup lang="ts">
   import KlNavTab from '~/components/kl-nav-tab/index.vue'
   import KlWallpaperCategory from '~/components/kl-wallpaper-category/index.vue'
-  import RecommendedColumnsV2 from './components/RecommendedColumnsV2.vue'
+  import RecommendedColumnsV2 from '~/components/model-components/RecommendedColumnsV2.vue'
   // import FeaturedSpecials from './components/FeaturedSpecials.vue'
 
   import { reactive, watch, ref } from 'vue'
@@ -38,57 +39,76 @@
       ? JSON.parse(route.query.level as string)
       : [
           {
-            id: '0',
+            id: -1,
             name: '模型库',
             isChildren: false,
           },
         ]
   )
 
-  const query = reactive<pageReq>({
+  const query = ref<pageReq>({
     pageNo: 1,
     pageSize: 12,
-    projectType: '',
-    editions: '',
-    source: '',
+    projectType: '-1',
+    editions: '-1',
+    source: -1,
     type: 3,
   })
-  const result = reactive<pageRes>({
-    list: [],
-    total: 0,
-  })
+  // const result = reactive<pageRes>({
+  //   list: [],
+  //   total: 0,
+  // })
 
   // 如果id存在，则设置projectType
   if (level.value.length) {
-    query.projectType = level.value[level.value.length - 1].id || ''
+    // query.projectType = level.value[level.value.length - 1].id || ''
   }
 
-  const getPage = () => {
-    page(query).then((res) => {
-      const { data, code } = res
-      if (code === 0) {
-        result.list = data.list
-        result.total = data.total
-      }
-    })
-  }
+  const { data: result } = useAsyncData(
+    `draw-page-list-${query.value.projectType}-${query.value.editions}-${query.value.source}-${query.value.pageNo}-${query.value.pageSize}`,
+    async () => {
+      const res = await page({
+        ...query.value,
+        editions: query.value.editions === '-1' ? '' : query.value.editions,
+        source: query.value.source === -1 ? '' : query.value.source,
+        projectType: query.value.projectType === '-1' ? '' : query.value.projectType,
+      })
+      return res.data
+    },
+    {
+      immediate: true,
+    }
+  )
 
-  getPage()
+  // const getPage = () => {
+  //   page(query).then((res) => {
+  //     const { data, code } = res
+  //     if (code === 0) {
+  //       result.list = data.list
+  //       result.total = data.total
+  //     }
+  //   })
+  // }
 
-  const handleChangeSize = (size: number) => {
-    query.pageSize = size
-    query.pageNo = 1
-    getPage()
+  // getPage()
+
+  const handleChangeSize = (val: number) => {
+    query.value.pageSize = val
+    // query.pageNo = 1
+    // getPage()
+    navigateTo(`/model/${query.value.projectType}/${query.value.pageNo}/${val}/${query.value.editions}/${query.value.source}`)
   }
 
   const handleChangeCurrent = (current: number) => {
-    query.pageNo = current
-    getPage()
+    query.value.pageNo = current
+    // getPage()
+    navigateTo(`/model/${query.value.projectType}/${current}/${query.value.pageSize}/${query.value.editions}/${query.value.source}`)
   }
 
-  watch([() => query.projectType, () => query.editions, () => query.source], (val) => {
+  watch([() => query.value.projectType, () => query.value.editions, () => query.value.source], (val) => {
     if (val) {
-      getPage()
+      // getPage()
+      navigateTo(`/model/${query.value.projectType}/1/${query.value.pageSize}/${query.value.editions}/${query.value.source}`)
     }
   })
 </script>

pages/personal-Center/index.vue

@@ -1,70 +1,72 @@
 <template>
   <KlNavTab />
-  <div class="ma-auto w-1198px flex justify-between">
-    <div class="left mt-25px box-border h-370px w-260px border border-[#EEEEEE] rounded-4px border-solid bg-[#FFFFFF] text-15px text-[#333333] font-medium">
-      <nuxt-link to="/personal/center/info" class="flex items-center justify-between py-14px">
-        <div class="flex items-center pl-20px">
-          <img v-if="route.path.startsWith('/personal/center/info')" src="~/assets/images/user3.png" alt="" srcset="" class="h-20px" />
-          <img v-else src="~/assets/images/个人.png" alt="" srcset="" class="h-20px" />
-          <span class="ml-10px">个人中心</span>
+  <div class="ma-auto w-[1198px] flex justify-between">
+    <div
+      class="left mt-[25px] box-border h-[370px] w-[260px] border border-[#EEEEEE] rounded-[4px] border-solid bg-[#FFFFFF] text-[15px] text-[#333333] font-medium"
+    >
+      <nuxt-link to="/personal-Center/info" class="flex items-center justify-between py-[14px]">
+        <div class="flex items-center pl-[20px]">
+          <img v-if="route.path.startsWith('/personal-Center/info')" src="~/assets/images/user3.png" alt="" srcset="" class="h-[20px]" />
+          <img v-else src="~/assets/images/个人.png" alt="" srcset="" class="h-[20px]" />
+          <span class="ml-[10px]">个人中心</span>
         </div>
-        <div class="pr-20px">
+        <div class="pr-[20px]">
           <el-icon><ArrowRight /></el-icon>
         </div>
       </nuxt-link>
 
-      <nuxt-link to="/personal/profile" class="flex items-center justify-between py-14px">
-        <div class="flex items-center pl-20px">
-          <img v-if="!route.path.startsWith('/personal/profile')" src="~/assets/images/user_zl.png" alt="" srcset="" class="h-16px" />
-          <img v-else src="~/assets/images/个人资料 (1).png" alt="" srcset="" class="h-16px" />
-          <span class="ml-10px">个人资料</span>
+      <nuxt-link to="/personal-Center/personal-profile" class="flex items-center justify-between py-[14px]">
+        <div class="flex items-center pl-[20px]">
+          <img v-if="!route.path.startsWith('/personal-Center/personal-profile')" src="~/assets/images/user_zl.png" alt="" srcset="" class="h-[16px]" />
+          <img v-else src="~/assets/images/个人资料 (1).png" alt="" srcset="" class="h-[16px]" />
+          <span class="ml-[10px]">个人资料</span>
         </div>
-        <div class="pr-20px">
+        <div class="pr-[20px]">
           <el-icon><ArrowRight /></el-icon>
         </div>
       </nuxt-link>
-      <nuxt-link to="/personal/account/security" class="flex items-center justify-between py-14px">
-        <div class="flex items-center pl-20px">
-          <img v-if="!route.path.startsWith('/personal/account/security')" src="~/assets/images/account.png" alt="" srcset="" class="h-20px" />
-          <img v-else src="~/assets/images/账户安全.png" alt="" srcset="" class="h-20px" />
-          <span class="ml-14px">账户与安全</span>
+      <nuxt-link to="/personal-Center/account-security" class="flex items-center justify-between py-[14px]">
+        <div class="flex items-center pl-[20px]">
+          <img v-if="!route.path.startsWith('/personal-Center/account-security')" src="~/assets/images/account.png" alt="" srcset="" class="h-[20px]" />
+          <img v-else src="~/assets/images/账户安全.png" alt="" srcset="" class="h-[20px]" />
+          <span class="ml-[14px]">账户与安全</span>
         </div>
-        <div class="pr-20px">
+        <div class="pr-[20px]">
           <el-icon><ArrowRight /></el-icon>
         </div>
       </nuxt-link>
-      <nuxt-link to="/personal/resource/center" class="flex items-center justify-between py-14px">
-        <div class="flex items-center pl-20px">
-          <img v-if="!route.path.startsWith('/personal/resource/center')" src="~/assets/images/ziyuan.png" alt="" srcset="" class="h-18px" />
-          <img v-else src="~/assets/images/资源.png" alt="" srcset="" class="h-18px" />
-          <span class="ml-12px">资源中心</span>
+      <nuxt-link to="/personal-Center/resource-center" class="flex items-center justify-between py-[14px]">
+        <div class="flex items-center pl-[20px]">
+          <img v-if="!route.path.startsWith('/personal-Center/resource-center')" src="~/assets/images/ziyuan.png" alt="" srcset="" class="h-[18px]" />
+          <img v-else src="~/assets/images/资源.png" alt="" srcset="" class="h-[18px]" />
+          <span class="ml-[12px]">资源中心</span>
         </div>
-        <div class="pr-20px">
+        <div class="pr-[20px]">
           <el-icon><ArrowRight /></el-icon>
         </div>
       </nuxt-link>
-      <nuxt-link to="/personal/trading/center" class="flex items-center justify-between py-14px">
-        <div class="flex items-center pl-20px">
-          <img v-if="!route.path.startsWith('/personal/trading/center')" src="~/assets/images/pay.png" alt="" srcset="" class="h-20px" />
-          <img v-else src="~/assets/images/交易管理.png" alt="" srcset="" class="h-20px" />
-          <span class="ml-12px">交易中心</span>
+      <nuxt-link to="/personal-Center/trading-center" class="flex items-center justify-between py-[14px]">
+        <div class="flex items-center pl-[20px]">
+          <img v-if="!route.path.startsWith('/personal-Center/trading-center')" src="~/assets/images/pay.png" alt="" srcset="" class="h-[20px]" />
+          <img v-else src="~/assets/images/交易管理.png" alt="" srcset="" class="h-[20px]" />
+          <span class="ml-[12px]">交易中心</span>
         </div>
-        <div class="pr-20px">
+        <div class="pr-[20px]">
           <el-icon><ArrowRight /></el-icon>
         </div>
       </nuxt-link>
-      <nuxt-link to="/personal/center/message" class="flex items-center justify-between py-14px">
-        <div class="flex items-center pl-20px">
-          <img v-if="!route.path.startsWith('/personal/center/message')" src="~/assets/images/message.png" alt="" srcset="" class="h-18px" />
-          <img v-else src="~/assets/images/消息.png" alt="" srcset="" class="h-18px" />
-          <span class="ml-14px">消息通知</span>
+      <nuxt-link to="/personal-Center/message-center" class="flex items-center justify-between py-[14px]">
+        <div class="flex items-center pl-[20px]">
+          <img v-if="!route.path.startsWith('/personal-Center/message-center')" src="~/assets/images/message.png" alt="" srcset="" class="h-[18px]" />
+          <img v-else src="~/assets/images/消息.png" alt="" srcset="" class="h-[18px]" />
+          <span class="ml-[14px]">消息通知</span>
         </div>
-        <div class="pr-20px">
+        <div class="pr-[20px]">
           <el-icon><ArrowRight /></el-icon>
         </div>
       </nuxt-link>
     </div>
-    <div class="right mt-25px">
+    <div class="right mt-[25px]">
       <NuxtPage />
     </div>
   </div>

pages/personal-Center/index/account-security.vue

@@ -54,9 +54,9 @@
 
 <script lang="ts" setup>
   import { reactive, ref } from 'vue'
-  import { resetPassoword } from '~/api/login/index'
+  import { resetPassword } from '~/api/login/index'
   import { sendSms } from '~/api/common/index'
-  import useUserStore from '~/store/user'
+  import useUserStore from '~/stores/user'
   const userStore = useUserStore()
 
   const activeName = ref('修改密码')
@@ -75,7 +75,7 @@
     await formRef.value.validate()
     if (form.password !== form.passwordV2) return ElMessage.error('两次密码不一致')
     try {
-      const res = await resetPassoword(form)
+      const res = await resetPassword(form)
       const { code } = res
       if (code === 0) {
         ElMessage.success(`修改密码成功，请重新登录`)

pages/personal-Center/index/components/message.vue

@@ -131,7 +131,7 @@
   import { upload } from '~/api/common'
   import { sendSingleChat, conversationList, getChatDetail, clearUnreadMessage } from '~/api/channel/index'
   import type { chatMessagesReq, msgType, PageResultSessionRespVO, PageResultMessageRespVO } from '~/api/channel/types'
-  import useUserStore from '~/store/user'
+  import useUserStore from '~/stores/user'
   const userStore = useUserStore()
   import dayjs from 'dayjs'
 

pages/personal-Center/index/components/pay.vue

@@ -1,11 +1,11 @@
 <template>
-  <el-dialog v-model="visible" width="800px" class="vip-dialog" align-center>
+  <el-dialog v-model="visible" width="800px" class="vip-dialog" align-center @close="handleClose">
     <template #header>
       <div class="vip-modal-title">钱包充值</div>
     </template>
     <div v-loading="loading" class="vip-cards">
       <div v-for="item in viplist" :key="item.id" class="vip-card">
-        <div class="relative w-100% flex flex-col items-center">
+        <div class="relative w-[100%] flex flex-col items-center">
           <div class="vip-card-header basic">
             <div class="vip-card-title">{{ item.name }}</div>
             <!-- <div class="vip-card-subtitle">中小微企业</div> -->
@@ -25,8 +25,8 @@
           > -->
           </ul>
           <div v-if="item.qrCodeUrl" class="vip-card-qrcode">
-            <el-icon class="absolute right--10px top-0px cursor-pointer" @click="item.qrCodeUrl = ''"><Close /></el-icon>
-            <qrcode-vue :value="item.qrCodeUrl" :size="140" level="H" />
+            <el-icon class="absolute! right-[-10px] top-[0px] cursor-pointer" @click="item.qrCodeUrl = ''"><Close /></el-icon>
+            <qrcode-vue :value="item.qrCodeUrl" :size="140" level="H" class="relative! left-[12px]" />
             <div>请使用微信扫二维码</div>
           </div>
         </div>
@@ -44,7 +44,7 @@
   import type { AppPayWalletPackageRespVO } from '~/api/pay/types'
   // @ts-ignore
   import QrcodeVue from 'qrcode.vue'
-  import useUserStore from '~/store/user'
+  import useUserStore from '~/stores/user'
   const userStore = useUserStore()
 
   const props = defineProps({
@@ -135,6 +135,14 @@
     clearInterval(interval.value)
     interval.value = undefined
   }
+
+  /** 关闭弹窗 */
+  const handleClose = () => {
+    visible.value = false
+    // 清空任务
+    clearInterval(interval.value)
+    interval.value = undefined
+  }
 </script>
 
 <style scoped>

pages/personal-Center/index/info.vue

@@ -1,45 +1,45 @@
 <template>
-  <div class="box-border w-913px border border-[#EEEEEE] rounded-6px border-solid bg-[#FFFFFF] px-30px py-18px">
+  <div class="box-border w-[913px] border border-[#EEEEEE] rounded-[6px] border-solid bg-[#FFFFFF] px-[30px] py-[18px]">
     <div class="flex items-center">
-      <img :src="userStore.userInfoRes.avatar" alt="" srcset="" class="h-105px w-105px rounded-full" />
-      <div class="ml-29px">
+      <img :src="userStore.userInfoRes.avatar" alt="" srcset="" class="h-[105px] w-[105px] rounded-full" />
+      <div class="ml-[29px]">
         <div class="flex items-center">
-          <span class="text-20px text-[#333333] font-normal">Hi，{{ userStore.userInfoRes.nickname }}</span>
-          <img v-if="userStore.userInfoRes.vipLevel === 1" src="~/assets/svg/vip.svg" alt="" class="relative top-2px ml-5px" />
-          <img v-if="userStore.userInfoRes.vipLevel === 2" src="~/assets/svg/svip.svg" alt="" class="relative top-2px ml-5px" />
+          <span class="text-[20px] text-[#333333] font-normal">Hi，{{ userStore.userInfoRes.nickname }}</span>
+          <img v-if="userStore.userInfoRes.vipLevel === 1" src="~/assets/svg/vip.svg" alt="" class="relative top-[2px] ml-[5px]" />
+          <img v-if="userStore.userInfoRes.vipLevel === 2" src="~/assets/svg/svip.svg" alt="" class="relative top-[2px] ml-[5px]" />
           <div
-            class="ml-18px h-30px w-80px cursor-pointer border border-[#1A65FF] rounded-15px border-solid text-center text-14px text-[#1A65FF] font-normal line-height-30px"
+            class="ml-[18px] h-[30px] w-[80px] cursor-pointer border border-[#1A65FF] rounded-[15px] border-solid text-center text-[14px] text-[#1A65FF] font-normal line-height-[30px]"
             @click="handleClick"
             >编辑资料</div
           >
         </div>
-        <div class="mt-20px flex items-center text-14px text-[#333333] font-normal">
+        <div class="mt-[20px] flex items-center text-[14px] text-[#333333] font-normal">
           <div class="flex items-center">
             <img src="~/assets/images/cad_0 (1).png" alt="" srcset="" />
-            <span class="ml-4px">我的积分: {{ userStaticInfo?.pointCount || 0 }}</span>
+            <span class="ml-[4px]">我的积分: {{ userStaticInfo?.pointCount || 0 }}</span>
           </div>
-          <div class="ml-37px flex items-center">
+          <div class="ml-[37px] flex items-center">
             <img src="~/assets/images/cad_0 (2).png" alt="" srcset="" />
-            <span class="ml-4px">我的收藏: {{ userStaticInfo?.followCount || 0 }}</span>
+            <span class="ml-[4px]">我的收藏: {{ userStaticInfo?.followCount || 0 }}</span>
           </div>
-          <div class="ml-37px flex items-center">
+          <div class="ml-[37px] flex items-center">
             <img src="~/assets/images/cad_0 (3).png" alt="" srcset="" />
-            <span class="ml-4px">我的发布: {{ userStaticInfo?.projectCount || 0 }}</span>
+            <span class="ml-[4px]">我的发布: {{ userStaticInfo?.projectCount || 0 }}</span>
           </div>
-          <div class="ml-37px flex items-center">
+          <div class="ml-[37px] flex items-center">
             <img src="~/assets/images/cad_0 (4).png" alt="" srcset="" />
-            <span class="ml-4px">我的下载: {{ userStaticInfo?.downloadCount || 0 }}</span>
+            <span class="ml-[4px]">我的下载: {{ userStaticInfo?.downloadCount || 0 }}</span>
           </div>
         </div>
       </div>
     </div>
-    <div class="mt-30px flex items-center justify-around">
+    <div class="mt-[30px] flex items-center justify-around">
       <div class="flex items-center">
         <div class="relative">
           <img src="~/assets/images/info_1 (3).png" alt="" srcset="" />
-          <img src="~/assets/images/info_1 (4).png" alt="" srcset="" class="absolute left-18px top-18px" />
+          <img src="~/assets/images/info_1 (4).png" alt="" srcset="" class="absolute left-[18px] top-[18px]" />
         </div>
-        <div class="ml-18px">
+        <div class="ml-[18px]">
           <div class="flex items-center">
             <span class="info_num text-[#17A86D]">{{ userStaticInfo?.currencyCount || 0 }}</span>
             <div class="info_pay cursor-pointer" @click="handlePay">充值</div>
@@ -50,9 +50,9 @@
       <div class="flex items-center">
         <div class="relative">
           <img src="~/assets/images/info_1 (5).png" alt="" srcset="" />
-          <img src="~/assets/images/info_1 (6).png" alt="" srcset="" class="absolute left-18px top-22px" />
+          <img src="~/assets/images/info_1 (6).png" alt="" srcset="" class="absolute left-[18px] top-[22px]" />
         </div>
-        <div class="ml-18px">
+        <div class="ml-[18px]">
           <div>
             <span class="info_num text-[#328CD7]">{{ userStaticInfo?.previewCount || 0 }}</span>
           </div>
@@ -62,9 +62,9 @@
       <div class="flex items-center">
         <div class="relative">
           <img src="~/assets/images/info_1 (1).png" alt="" srcset="" />
-          <img src="~/assets/images/info_1 (2).png" alt="" srcset="" class="absolute left-20px top-18px" />
+          <img src="~/assets/images/info_1 (2).png" alt="" srcset="" class="absolute left-[20px] top-[18px]" />
         </div>
-        <div class="ml-18px">
+        <div class="ml-[18px]">
           <div>
             <span class="info_num text-[#FFC415]">{{ userStaticInfo?.revenueCount || 0 }}</span>
           </div>
@@ -74,20 +74,20 @@
     </div>
   </div>
   <!--  -->
-  <div class="mt-23px box-border h-183px w-913px border border-[#EEEEEE] rounded-6px border-solid bg-[#FFFFFF] px-30px py-21px">
+  <div class="mt-[23px] box-border h-[183px] w-[913px] border border-[#EEEEEE] rounded-[6px] border-solid bg-[#FFFFFF] px-[30px] py-[21px]">
     <div class="title">快捷入口</div>
-    <div class="mt-20px flex items-center">
-      <div class="info_item cursor-pointer" @click="handleClickPush('/upnew/drawe')">
+    <div class="mt-[20px] flex items-center">
+      <div class="info_item cursor-pointer" @click="handleClickPush('/upnew')">
         <img src="~/assets/images/fabu_2 (3).png" alt="" srcset="" />
-        <div class="mt-10px">发布资源</div>
+        <div class="mt-[10px]">发布资源</div>
       </div>
-      <div class="info_item ml-31px cursor-pointer" @click="handleClickPush('/communication/channel')">
+      <div class="info_item ml-[31px] cursor-pointer" @click="handleClickPush('/channel')">
         <img src="~/assets/images/fabu_2 (1).png" alt="" srcset="" />
-        <div class="mt-10px">交流频道</div>
+        <div class="mt-[10px]">交流频道</div>
       </div>
-      <div class="info_item ml-31px cursor-pointer" @click="handleService">
+      <div class="info_item ml-[31px] cursor-pointer" @click="handleService">
         <img src="~/assets/images/fabu_2 (2).png" alt="" srcset="" />
-        <div class="mt-10px">消息</div>
+        <div class="mt-[10px]">消息</div>
       </div>
     </div>
   </div>
@@ -107,7 +107,7 @@
   import Message from './components/message.vue'
   import InfoEcharts from './info-echarts.vue'
   import Pay from './components/pay.vue'
-  import useUserStore from '~/store/user'
+  import useUserStore from '~/stores/user'
   const userStore = useUserStore()
 
   // 路由跳转
@@ -123,7 +123,7 @@
   fetchUserStatistics()
 
   const handleClick = () => {
-    router.push({ path: '/personal/profile' })
+    router.push({ path: '/personal-Center/personal-profile' })
   }
 
   const payVisible = ref(false)

pages/personal-Center/index/personal-profile.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="box-border h-1082px w-913px border border-[#EEEEEE] rounded-6px border-solid bg-[#FFFFFF] px-30px py-21px">
-    <div class="flex items-center justify-between border-b-1px border-b-[#eeeeee] border-b-solid pb-18px">
-      <div class="text-16px text-[#333333] font-normal">个人资料</div>
+  <div class="box-border h-[782px] w-[913px] border border-[#EEEEEE] rounded-[6px] border-solid bg-[#FFFFFF] px-[30px] py-[21px]">
+    <div class="flex items-center justify-between border-b-[1px] border-b-[#eeeeee] border-b-solid pb-[18px]">
+      <div class="text-[16px] text-[#333333] font-normal">个人资料</div>
       <div class="flex items-center">
         <!-- <img src="~/assets/images/fans.png" alt="" srcset="" /> -->
-        <span class="ml-8px text-14px text-[#333333] font-normal"></span>
+        <span class="ml-[8px] text-[14px] text-[#333333] font-normal"></span>
       </div>
     </div>
     <div class="user-profile-container">
@@ -12,7 +12,7 @@
         <el-upload class="avatar-uploader" action="#" :show-file-list="false" :auto-upload="false" :on-change="handleAvatarChange">
           <div class="flex flex-col items-center">
             <el-avatar :size="100" :src="userForm.avatar" />
-            <div class="mt-15px">
+            <div class="mt-[15px]">
               <el-button type="primary" plain>更改头像</el-button>
             </div>
           </div>
@@ -24,7 +24,7 @@
         <!-- User information section -->
         <el-form-item label="用户名:" prop="nickname">
           <div class="flex items-center">
-            <el-input v-model="userForm.nickname" class="w-247px" />
+            <el-input v-model="userForm.nickname" class="w-[247px]" />
             <el-button type="primary" class="verify-btn" @click="handleVerify">实名认证</el-button>
           </div>
         </el-form-item>
@@ -38,37 +38,37 @@
 
         <el-form-item label="手机号:" prop="phone">
           <div class="flex items-center">
-            <el-input v-model="userForm.phone" disabled class="w-247px" />
+            <el-input v-model="userForm.phone" disabled class="w-[247px]" />
             <!-- <el-link type="primary" class="modify-link">修改</el-link> -->
           </div>
         </el-form-item>
 
         <el-form-item label="电子邮箱:" prop="email">
           <div class="flex items-center">
-            <el-input v-model="userForm.email" placeholder="请输入电子邮箱" class="w-247px" />
+            <el-input v-model="userForm.email" placeholder="请输入电子邮箱" class="w-[247px]" />
             <!-- <el-link type="primary" class="modify-link">绑定</el-link> -->
           </div>
         </el-form-item>
 
         <div class="flex items-center">
           <el-form-item label="所在地区:" prop="isDomestic">
-            <el-select v-model="userForm.isDomestic" placeholder="请选择" class="w-120px!" @change="handleCountryChange">
+            <el-select v-model="userForm.isDomestic" placeholder="请选择" class="w-[120px]!" @change="handleCountryChange">
               <el-option label="国内" :value="1"></el-option>
               <el-option label="国外" :value="0"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label-width="6px" prop="province">
-            <el-select v-model="userForm.province" placeholder="请选择省份" class="w-120px" @change="handleProvinceChange">
+            <el-select v-model="userForm.province" placeholder="请选择省份" class="w-[120px]!" @change="handleProvinceChange">
               <el-option v-for="item in provinceList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
           <el-form-item label-width="6px" prop="city">
-            <el-select v-model="userForm.city" placeholder="请选择城市" class="w-120px" @change="handleCityChange">
+            <el-select v-model="userForm.city" placeholder="请选择城市" class="w-[120px]!" @change="handleCityChange">
               <el-option v-for="item in cityList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
           <el-form-item label-width="6px" prop="county">
-            <el-select v-model="userForm.county" placeholder="请选择区县" class="w-120px">
+            <el-select v-model="userForm.county" placeholder="请选择区县" class="w-[120px]!">
               <el-option v-for="item in countyList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
@@ -83,7 +83,7 @@
             filterable
             remote
             placeholder="请输入搜索标签"
-            class="w-498px!"
+            class="w-[498px]!"
           >
             <el-option v-for="(item, index) in labelsList" :key="index" :label="item" :value="item" />
           </el-select>
@@ -97,9 +97,9 @@
             :size="1"
             tips="上传图片支持jpg/gif/png格式、第一张为封面图片、每张图片大小不得超过1M"
           >
-            <div class="h-77px w-161px flex items-center justify-center bg-[#fafafa]">
+            <div class="h-[77px] w-[161px] flex items-center justify-center bg-[#fafafa]">
               <el-icon class="text-[#999999]"><Plus /></el-icon>
-              <div class="ml-4px mt-2px text-14px text-[#999999] font-normal">上传图纸</div>
+              <div class="ml-[4px] mt-[2px] text-[14px] text-[#999999] font-normal">上传图纸</div>
             </div>
           </KlUploader>
         </el-form-item>
@@ -109,27 +109,27 @@
         </el-form-item>
 
         <el-form-item>
-          <el-button type="primary" class="w-120px !h-37px" @click="submitForm">提交</el-button>
+          <el-button type="primary" class="w-[120px] !h-[37px]" :loading="submitLoading" @click="submitForm">提交</el-button>
         </el-form-item>
       </el-form>
     </div>
-    <div class="flex items-center justify-between border-b-1px border-b-[#eeeeee] border-b-solid pb-18px">
-      <div class="text-16px text-[#333333] font-normal">社交帐号绑定</div>
+    <!-- <div class="flex items-center justify-between border-b-[1px] border-b-[#eeeeee] border-b-solid pb-[18px]">
+      <div class="text-[16px] text-[#333333] font-normal">社交帐号绑定</div>
     </div>
-    <div class="flex flex-col justify-center text-14px text-[#333333] font-normal">
-      <div class="mt-30px flex items-center">
-        <img src="~/assets/images/qq-v2.png" alt="" srcset="" class="h-35px w-34px" />
-        <div class="ml-19px">QQ</div>
-        <div class="ml-100px flex items-center"><div class="w-90px">QQ昵称：</div><div class="w-180px">xxx</div></div>
+    <div class="flex flex-col justify-center text-[14px] text-[#333333] font-normal">
+      <div class="mt-[30px] flex items-center">
+        <img src="~/assets/images/qq-v2.png" alt="" srcset="" class="h-[35px] w-[34px]" />
+        <div class="ml-[19px]">QQ</div>
+        <div class="ml-[100px] flex items-center"><div class="w-[90px]">QQ昵称：</div><div class="w-[180px]">xxx</div></div>
         <div class="btn">绑定</div>
       </div>
-      <div class="mt-30px flex items-center">
-        <img src="~/assets/images/weixin-v2.png" alt="" srcset="" class="h-35px w-34px" />
-        <div class="ml-19px">微信</div>
-        <div class="ml-95px flex items-center"><div class="w-90px">微信昵称：</div><div class="w-180px">xxx</div></div>
+      <div class="mt-[30px] flex items-center">
+        <img src="~/assets/images/weixin-v2.png" alt="" srcset="" class="h-[35px] w-[34px]" />
+        <div class="ml-[19px]">微信</div>
+        <div class="ml-[95px] flex items-center"><div class="w-[90px]">微信昵称：</div><div class="w-[180px]">xxx</div></div>
         <div class="btn">绑定</div>
       </div>
-    </div>
+    </div> -->
   </div>
   <verifyDialog ref="verifyDialogRef" />
 </template>
@@ -281,11 +281,13 @@
   }
 
   // 提交表单
+  const submitLoading = ref(false)
   const submitForm = async () => {
     if (!userFormRef.value) return
 
     try {
       await userFormRef.value.validate()
+      submitLoading.value = true
       const res = userForm.id ? await updateUserExtend(userForm) : await userExtend(userForm)
       if (res.code === 0) {
         ElMessage.success('个人信息提交成功')
@@ -295,6 +297,8 @@
     } catch (error) {
       console.error('Validation failed:', error)
       ElMessage.error('表单验证失败，请检查输入')
+    } finally {
+      submitLoading.value = false
     }
   }
 

pages/personal-Center/index/resource-center.vue

@@ -40,7 +40,7 @@
   import downloadTable from './components/download-table.vue'
   import favoriteTable from './components/favorite-table.vue'
   import browseTable from './components/browse-table.vue'
-  import useUserStore from '~/store/user'
+  import useUserStore from '~/stores/user'
   const userStore = useUserStore()
 
   const activeName = ref('我的上传')

pages/personal-detail/index.vue

@@ -5,20 +5,20 @@
     <div class="profile-header">
       <div class="profile-container">
         <div class="avatar-container">
-          <el-image :src="userForm.avatar" alt="用户头像" class="avatar mt-4px" fit="cover" />
+          <el-image :src="userForm.avatar" alt="用户头像" class="avatar mt-[4px]" fit="cover" />
         </div>
         <div class="user-info">
           <h2 class="username">{{ userForm.nickname }}</h2>
           <!-- <div class="education">手机号码：{{ userForm.phone }}</div> -->
           <div class="stats">
-            技能标签：<el-tag v-for="label in userForm.labels" :key="label" type="primary" class="mr-10px" size="small">{{ label }}</el-tag>
+            技能标签：<el-tag v-for="label in userForm.labels" :key="label" type="primary" class="mr-[10px]" size="small">{{ label }}</el-tag>
           </div>
           <div class="description">{{ userForm.description }}</div>
         </div>
       </div>
     </div>
 
-    <div class="items-flex-start mx-auto mt-20px max-w-[1200px] flex justify-center">
+    <div class="items-flex-start mx-auto mt-[20px] max-w-[1200px] flex justify-center">
       <div class="flex-1">
         <!-- 导航标签 -->
         <div class="nav-tabs">
@@ -30,27 +30,27 @@
         </div>
 
         <!-- 作品展示区 -->
-        <div class="content w-800px">
-          <el-table v-loading="result.loading" :data="result.tableList" style="width: 100%" class="mt-14px">
+        <div class="content w-[800px]">
+          <el-table v-loading="result.loading" :data="result.tableList" style="width: 100%" class="mt-[14px]">
             <el-table-column prop="date" label="文件信息">
               <template #default="scope">
                 <div class="flex items-center">
-                  <el-image :src="scope.row.iconUrl" fit="cover" alt="" srcset="" class="h-91px w-181px rd-4px" />
-                  <div class="ml-17px">
-                    <div class="text-16px text-[#333333] font-normal">{{ scope.row.title }}</div>
-                    <div class="text-14px text-[#666] font-normal my-10px!">{{ dayjs(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</div>
+                  <el-image :src="scope.row.iconUrl" fit="cover" alt="" srcset="" class="h-[91px] w-[181px] rd-[4px]" />
+                  <div class="ml-[17px]">
+                    <div class="text-[16px] text-[#333333] font-normal">{{ scope.row.title }}</div>
+                    <div class="text-[14px] text-[#666] font-normal my-[10px]!">{{ dayjs(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</div>
                     <div class="flex items-center">
                       <div class="flex items-center">
-                        <img src="~/assets/images/look.png" alt="" srcset="" class="h-17px" />
-                        <span class="ml-4px">{{ scope.row.previewPoint }}</span>
+                        <img src="~/assets/images/look.png" alt="" srcset="" class="h-[17px]" />
+                        <span class="ml-[4px]">{{ scope.row.previewPoint }}</span>
                       </div>
-                      <div class="ml-13px flex items-center">
-                        <img src="~/assets/images/add.png" alt="" srcset="" class="h-23px" />
-                        <span class="ml-4px">{{ scope.row.hotPoint }}</span>
+                      <div class="ml-[13px] flex items-center">
+                        <img src="~/assets/images/add.png" alt="" srcset="" class="h-[23px]" />
+                        <span class="ml-[4px]">{{ scope.row.hotPoint }}</span>
                       </div>
-                      <div class="ml-13px flex items-center">
-                        <img src="~/assets/images/chat.png" alt="" srcset="" class="h-17px" />
-                        <span class="ml-4px">{{ scope.row.commentsPoint }}</span>
+                      <div class="ml-[13px] flex items-center">
+                        <img src="~/assets/images/chat.png" alt="" srcset="" class="h-[17px]" />
+                        <span class="ml-[4px]">{{ scope.row.commentsPoint }}</span>
                       </div>
                     </div>
                   </div>
@@ -70,7 +70,7 @@
             </el-table-column>
           </el-table>
           <!-- 分页 -->
-          <div class="mt-10px flex justify-center">
+          <div class="mt-[10px] flex justify-center">
             <el-pagination
               v-model:current-page="query.pageNo"
               v-model:page-size="query.pageSize"
@@ -91,10 +91,10 @@
           <div
             v-for="item in mainWork"
             :key="item.id"
-            class="flex cursor-pointer items-center justify-between px-10px py-4px hover:bg-#f5f5f5"
+            class="flex cursor-pointer items-center justify-between px-[10px] py-[4px] hover:bg-[#f5f5f5]"
             @click="handleClickV2(item.id)"
           >
-            <div class="ellipsis text-15px text-[#333333] font-normal">{{ item.title }}发货速度发货速度开发还是看东方航空</div>
+            <div class="ellipsis text-[15px] text-[#333333] font-normal">{{ item.title }}发货速度发货速度开发还是看东方航空</div>
           </div>
         </div>
       </div>
@@ -249,7 +249,7 @@
   }
 
   const handleClickV2 = (id: string | number) => {
-    navigateTo(`/down-drawe-detail?id=${id}`) // 修改为在新窗口打开
+    navigateTo(`/down-drawe-detail/${id}`) // 修改为在新窗口打开
   }
   // 获取最新发布
   const mainWork = ref<ProjectDrawMemberRespVO[]>([])

pages/sign-content/index.vue

@@ -1,6 +1,6 @@
 <template>
   <KlNavTab />
-  <div class="sign-content">
+  <div class="sign-content w-1440px ma-auto">
     <!-- 顶部统计 -->
     <div class="sign-header">
       <div class="sign-icon">
@@ -69,10 +69,9 @@
   import { Search } from '@element-plus/icons-vue'
   import { signIn, getUserPointPage } from '~/api/personal-center/index'
   import type { PageResultMemberPointRecordRespVO } from '~/api/personal-center/types'
-  import useUserStore from '~/store/user'
+  import useUserStore from '~/stores/user'
   import dayjs from 'dayjs'
-  const userStore = useUserStore()
-  const user = useUserInfo();
+  const user = useUserInfo()
 
   const query = reactive({
     pageNo: 1,
@@ -116,12 +115,16 @@
     getUserPointPageList()
   }
 
-  const {data: result, refresh: getUserPointPageList } = await useAsyncData('getUserPointPage', async () => {
-    const res = await getUserPointPage(query)
-    return res.data
-  }, {
-    immediate: true, // 立即请求
-  })
+  const { data: result, refresh: getUserPointPageList } = await useAsyncData(
+    'getUserPointPage',
+    async () => {
+      const res = await getUserPointPage(query)
+      return res.data
+    },
+    {
+      immediate: true, // 立即请求
+    }
+  )
 
   // const getUserPointPageList = async () => {
   //   const res = await getUserPointPage(query)

pages/text/[projectType]/[pageNo]/[pageSize]/[[editions]]/[[source]].vue

@@ -0,0 +1,126 @@
+<template>
+  <!-- 导航 -->
+  <SeoHead title="工程设计文本下载_CAD设计图纸资源库" />
+  <KlNavTab active="文本" :type="2" />
+  <div class="ma-auto w-[1440px]">
+    <!-- 图纸分类 -->
+    <KlWallpaperCategory v-model="query" v-model:level="level" :type="2" />
+    <!-- 推荐栏目 -->
+    <RecommendedColumnsV2 v-model="query" v-model:result="result"></RecommendedColumnsV2>
+    <!-- 精选专题 -->
+    <!-- <FeaturedSpecials></FeaturedSpecials> -->
+    <!-- 分页 -->
+    <div class="mt-[10px] flex justify-center">
+      <el-pagination
+        v-model:current-page="query.pageNo"
+        v-model:page-size="query.pageSize"
+        :page-sizes="[12, 24, 48]"
+        :total="result?.total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleClickSize"
+        @current-change="handeClickCurrent"
+      />
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+  import KlNavTab from '~/components/kl-nav-tab/index.vue'
+  import KlWallpaperCategory from '~/components/kl-wallpaper-category/index.vue'
+  import RecommendedColumnsV2 from '~/components/text-components/RecommendedColumnsV2.vue'
+  // import FeaturedSpecials from './components/FeaturedSpecials.vue'
+  import { useRoute } from 'vue-router'
+  import { reactive, watch, ref } from 'vue'
+  import { page } from '~/api/upnew/index'
+  import { getDictTree } from '~/api/home/index'
+  import type { pageRes, pageReq } from '~/api/upnew/types'
+  const route = useRoute()
+  const projectType = computed(() => (route.params?.projectType ? route.params?.projectType : ''))
+  const pageNo = computed(() => Number(route.params?.pageNo))
+  const pageSize = computed(() => Number(route.params?.pageSize))
+  const editions = computed(() => (route.params?.editions ? route.params?.editions : ''))
+  const source = computed(() => (route.params?.source ? Number(route.params?.source) : ''))
+
+  console.log('route.params----', route.params)
+
+  const level = ref(
+    route.query?.valuelevel
+      ? JSON.parse(route.query.valuelevel as string)
+      : [
+          {
+            id: -1,
+            name: '文本库',
+            isChildren: false,
+          },
+        ]
+  )
+  const keywords = ref((route.query?.valuekeywords as string) || '')
+
+  const query = ref<pageReq>({
+    pageNo: pageNo.value || 1,
+    pageSize: pageSize.value || 12,
+    projectType: projectType.value || '-1',
+    editions: editions.value || '-1',
+    source: source.value || -1,
+    type: 2,
+    title: keywords.value,
+  })
+  // const result = reactive<pageRes>({
+  //   list: [],
+  //   total: 0,
+  // })
+
+  // 如果id存在，则设置projectType
+  if (level.value.length) {
+    // query.value.projectType = level.value[level.value.length - 1].id || ''
+  }
+
+  const handleClickSize = (val: number) => {
+    query.value.pageSize = val
+    // getPage()
+    navigateTo(`/text/${query.value.projectType}/${query.value.pageNo}/${val}/${query.value.editions}/${query.value.source}`)
+  }
+
+  const handeClickCurrent = (val: number) => {
+    query.value.pageNo = val
+    // getPage()
+    navigateTo(`/text/${query.value.projectType}/${val}/${query.value.pageSize}/${query.value.editions}/${query.value.source}`)
+  }
+
+  const { data: result, refresh: getPage } = useAsyncData(
+    `draw-page-list-${query.value.projectType}-${query.value.editions}-${query.value.source}-${query.value.pageNo}-${query.value.pageSize}`,
+    async () => {
+      const res = await page({
+        ...query.value,
+        editions: query.value.editions === '-1' ? '' : query.value.editions,
+        source: query.value.source === -1 ? '' : query.value.source,
+        projectType: query.value.projectType === '-1' ? '' : query.value.projectType,
+      })
+      return res.data
+    },
+    {
+      immediate: true,
+    }
+  )
+  // const getPage = () => {
+  //   page(query).then((res) => {
+  //     const { data, code } = res
+  //     if (code === 0) {
+  //       result.list = data.list
+  //       result.total = data.total
+  //     }
+  //   })
+  // }
+
+  watch([() => query.value.projectType, () => query.value.editions, () => query.value.source], (val) => {
+    if (val) {
+      navigateTo(`/text/${query.value.projectType}/1/${query.value.pageSize}/${query.value.editions}/${query.value.source}`)
+    }
+  })
+</script>
+<style lang="scss" scoped>
+  :deep(.el-pagination) {
+    .el-input__inner {
+      text-align: center !important;
+    }
+  }
+</style>

pages/text/index.vue

@@ -1,7 +1,8 @@
 <template>
   <!-- 导航 -->
+  <SeoHead title="工程设计文本下载_CAD设计图纸资源库" />
   <KlNavTab active="文本" :type="2" />
-  <div class="ma-auto w-1440px">
+  <div class="ma-auto w-[1440px]">
     <!-- 图纸分类 -->
     <KlWallpaperCategory v-model="query" v-model:level="level" :type="2" />
     <!-- 推荐栏目 -->
@@ -9,12 +10,12 @@
     <!-- 精选专题 -->
     <!-- <FeaturedSpecials></FeaturedSpecials> -->
     <!-- 分页 -->
-    <div class="mt-10px flex justify-center">
+    <div class="mt-[10px] flex justify-center">
       <el-pagination
         v-model:current-page="query.pageNo"
         v-model:page-size="query.pageSize"
         :page-sizes="[12, 24, 48]"
-        :total="result.total"
+        :total="result?.total"
         layout="total, sizes, prev, pager, next, jumper"
         @size-change="handeChangeSize"
         @current-change="handeChangeCurrent"
@@ -25,7 +26,7 @@
 <script setup lang="ts">
   import KlNavTab from '~/components/kl-nav-tab/index.vue'
   import KlWallpaperCategory from '~/components/kl-wallpaper-category/index.vue'
-  import RecommendedColumnsV2 from './components/RecommendedColumnsV2.vue'
+  import RecommendedColumnsV2 from '~/components/text-components/RecommendedColumnsV2.vue'
   // import FeaturedSpecials from './components/FeaturedSpecials.vue'
 
   import { reactive, watch, ref } from 'vue'
@@ -39,57 +40,76 @@
       ? JSON.parse(route.query.level as string)
       : [
           {
-            id: '0',
+            id: -1,
             name: '文本库',
             isChildren: false,
           },
         ]
   )
 
-  const query = reactive<pageReq>({
+  const query = ref<pageReq>({
     pageNo: 1,
     pageSize: 12,
-    projectType: '',
-    editions: '',
-    source: '',
+    projectType: '-1',
+    editions: '-1',
+    source: -1,
     type: 2,
   })
-  const result = reactive<pageRes>({
-    list: [],
-    total: 0,
-  })
+  // const result = reactive<pageRes>({
+  //   list: [],
+  //   total: 0,
+  // })
 
   // 如果id存在，则设置projectType
   if (level.value.length) {
-    query.projectType = level.value[level.value.length - 1].id || ''
+    // query.projectType = level.value[level.value.length - 1].id || ''
   }
 
-  const getPage = () => {
-    page(query).then((res) => {
-      const { data, code } = res
-      if (code === 0) {
-        result.list = data.list
-        result.total = data.total
-      }
-    })
-  }
+  const { data: result } = useAsyncData(
+    `draw-page-list-${query.value.projectType}-${query.value.editions}-${query.value.source}-${query.value.pageNo}-${query.value.pageSize}`,
+    async () => {
+      const res = await page({
+        ...query.value,
+        editions: query.value.editions === '-1' ? '' : query.value.editions,
+        source: query.value.source === -1 ? '' : query.value.source,
+        projectType: query.value.projectType === '-1' ? '' : query.value.projectType,
+      })
+      return res.data
+    },
+    {
+      immediate: true,
+    }
+  )
 
-  getPage()
+  // const getPage = () => {
+  //   page(query).then((res) => {
+  //     const { data, code } = res
+  //     if (code === 0) {
+  //       result.list = data.list
+  //       result.total = data.total
+  //     }
+  //   })
+  // }
+
+  // getPage()
 
   const handeChangeSize = (val: number) => {
-    query.pageSize = val
-    query.pageNo = 1
-    getPage()
+    query.value.pageSize = val
+    // query.pageNo = 1
+    // getPage()
+    navigateTo(`/text/${query.value.projectType}/${query.value.pageNo}/${val}/${query.value.editions}/${query.value.source}`)
   }
 
   const handeChangeCurrent = (val: number) => {
-    query.pageNo = val
-    getPage()
+    query.value.pageNo = val
+    // getPage()
+    navigateTo(`/text/${query.value.projectType}/${val}/${query.value.pageSize}/${query.value.editions}/${query.value.source}`)
   }
 
-  watch([() => query.projectType, () => query.editions, () => query.source], (val) => {
+  watch([() => query.value.projectType, () => query.value.editions, () => query.value.source], (val) => {
     if (val) {
-      getPage()
+      // getPage()
+      navigateTo(`/text/${query.value.projectType}/1/${query.value.pageSize}/${query.value.editions}/${query.value.source}`)
     }
   })
 </script>

pages/toolbox-publish/index.vue

@@ -1,12 +1,12 @@
 <template>
   <KlNavTab />
-  <div class="mx-auto mt-30px box-border w-1200px border border-[#EEEEEE] rounded-12px border-solid bg-white px-30px py-40px">
+  <div class="mx-auto mt-[30px] box-border w-[1200px] border border-[#EEEEEE] rounded-[12px] border-solid bg-white px-[30px] py-[40px]">
     <el-form ref="formRef" :model="form" label-width="110px" size="large">
       <el-form-item label-width="110px" label="标题：" prop="title" :rules="{ required: true, message: '请输入标题', trigger: ['blur', 'change'] }">
-        <el-input v-model="form.title" placeholder="请输入标题" class="w-361px!" maxlength="128"></el-input>
+        <el-input v-model="form.title" placeholder="请输入标题" class="w-[361px]!" maxlength="128"></el-input>
       </el-form-item>
       <el-form-item label-width="110px" label="分类：" prop="projectType" :rules="{ required: true, message: '请选择分类', trigger: ['blur', 'change'] }">
-        <el-select v-model="form.projectType" placeholder="请选择分类" class="w-361px!" multiple>
+        <el-select v-model="form.projectType" placeholder="请选择分类" class="w-[361px]!" multiple>
           <el-option v-for="(item, index) in projectTypeList" :key="index" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -20,13 +20,13 @@
           filterable
           remote
           placeholder="请输入搜索标签"
-          class="w-361px!"
+          class="w-[361px]!"
         >
           <el-option v-for="(item, index) in labelsList" :key="index" :label="item" :value="item" />
         </el-select>
       </el-form-item>
       <el-form-item label-width="110px" label="金币：" prop="points" :rules="{ required: true, message: '请输入金币', trigger: ['blur', 'change'] }">
-        <el-input-number v-model="form.points" :controls="false" :precision="0" :min="0" placeholder="请输入金币" class="w-361px! text-left!"></el-input-number>
+        <el-input-number v-model="form.points" :controls="false" :precision="0" :min="0" placeholder="请输入金币" class="w-[361px]! text-left!"></el-input-number>
       </el-form-item>
 
       <el-form-item
@@ -43,9 +43,9 @@
           tips="上传图片支持jpg/gif/png格式、第一张为封面图片、每张图片大小不得超过1M"
           @validate="formRef.validateField('coverImages')"
         >
-          <div class="h-77px w-161px flex items-center justify-center border border-[#cdd0d6] rounded-1px border-dashed bg-[#fafafa]">
+          <div class="h-[77px] w-[161px] flex items-center justify-center border border-[#cdd0d6] rounded-[1px] border-dashed bg-[#fafafa]">
             <el-icon class="text-[#999999]"><Plus /></el-icon>
-            <div class="ml-4px mt-2px text-14px text-[#999999] font-normal">上传图纸</div>
+            <div class="ml-[4px] mt-[2px] text-[14px] text-[#999999] font-normal">上传图纸</div>
           </div>
         </KlUploader>
       </el-form-item>
@@ -72,7 +72,7 @@
           },
         ]"
       >
-        <el-input v-model="form.description" type="textarea" :rows="6" placeholder="请输入描述" class="w-361px!" minlength="70" show-word-limit></el-input>
+        <el-input v-model="form.description" type="textarea" :rows="6" placeholder="请输入描述" class="w-[361px]!" minlength="70" show-word-limit></el-input>
       </el-form-item>
       <!-- 添加预览和保存按钮 -->
       <el-form-item label-width="110px" label=" ">
@@ -92,6 +92,7 @@
   import { parent, keywords, labels } from '~/api/upnew/index'
   import { create } from '~/api/toolbox/index.js'
   import type { TcreateReq } from '~/api/toolbox/types'
+  const router = useRouter() // 导入路由实例，用于跳转页面
 
   const form = reactive<TcreateReq>({
     title: '',
@@ -170,9 +171,10 @@
             console.log(res)
             if (res.code === 0) {
               ElMessage.success('发布成功')
-              window.setTimeout(() => {
-                window.close()
-              }, 1000)
+              router.back()
+              // window.setTimeout(() => {
+              //   window.close()
+              // }, 1000)
             }
           })
           .finally(() => {

pages/toolbox/components/search.vue

@@ -37,7 +37,7 @@
 <script setup lang="ts">
   import { ref } from 'vue'
   import { Search } from '@element-plus/icons-vue'
-  import useUserStore from '~/store/user'
+  import useUserStore from '~/stores/user'
   const userStore = useUserStore()
 
   const emits = defineEmits(['search'])

pages/toolbox/index.vue

@@ -115,7 +115,6 @@
   //   total: 0,
   // })
 
-
   const {data: pageRes, refresh: getPage } = await useAsyncData(`draw-page-list-${Date.now()}`, async () => {
     const res = await page(pageReq)
     return res.data

pages/upnew/components/Preview.vue

@@ -1,24 +1,25 @@
 <template>
-  <div class="ml-23px box-border min-h-930px w-516px border border-[#EEEEEE] rounded-12px border-solid bg-[#FFFFFF] px-33px py-22px">
+  <div class="ml-[23px] box-border min-h-[930px] w-[516px] border border-[#EEEEEE] rounded-[12px] border-solid bg-[#FFFFFF] px-[33px] py-[22px]">
     <div class="flex items-center">
-      <img src="~/assets/images/preview.png" alt="" srcset="" width="16px" height="19px" /><span class="ml-7px text-18px text-[#333333] font-normal"
+      <img src="~/assets/images/preview.png" alt="" srcset="" width="16px" height="19px" /><span class="ml-[7px] text-[18px] text-[#333333] font-normal"
         >预览</span
       ></div
     >
-    <div class="mt-20px">
-      <el-image :src="previewUrl" class="mb-16px max-h-320px max-w-460px min-h-200px" fit="contain"></el-image>
-      <span class="text-16px text-[#333333] font-normal">{{ previewName || '图纸标题' }}</span></div
+    <div class="mt-[20px]">
+      <el-image :src="previewUrl" class="mb-[16px] max-h-[320px] max-w-[460px] min-h-[200px]" fit="contain"></el-image>
+      <span class="text-[16px] text-[#333333] font-normal">{{ previewName || '图纸标题' }}</span></div
     >
-    <div class="my-30px h-1px w-460px rounded-1px bg-[#EEEEEE]"></div>
-    <div class="flex items-center"
-      ><img src="~/assets/images/tip.png" width="20px" height="20px" /><span class="ml-7px text-18px text-[#333333] font-normal"
-        >上传遇到问题可以咨询</span
-      ></div
-    >
-    <div class="mt-20px text-center"><el-image src="https://picsum.photos/290/290?_t" alt="" srcset="" class="h-290px w290" /></div>
-    <div class="mt-30px text-center text-16px text-[#333333] font-normal">
+    <div class="my-[30px] h-[1px] w-[460px] rounded-[1px] bg-[#EEEEEE]"></div>
+    <div class="flex items-center">
+      <img src="~/assets/images/tip.png" width="20px" height="20px" />
+      <span class="ml-[7px] text-[18px] text-[#333333] font-normal">
+        上传遇到问题可以咨询
+      </span>
+    </div>
+    <div class="mt-[20px] text-center"><el-image src="https://picsum.photos/290/290?_t" alt="" srcset="" class="h-[290px] w-[290px]" /></div>
+    <div class="mt-[30px] text-center text-[16px] text-[#333333] font-normal">
       <div>TEL：13315189735 </div>
-      <div class="mt-4px">在线时间：8:30-18:00</div>
+      <div class="mt-[4px]">在线时间：8:30-18:00</div>
     </div>
   </div>
 </template>

pages/upnew/index.vue

@@ -2,20 +2,20 @@
   <!-- 导航 -->
   <KlNavTab />
   <!-- 发布图纸 -->
-  <div class="ma-auto mt-30px w-1440px flex">
-    <div class="w-900px">
+  <div class="ma-auto mt-[30px] w-[1440px] flex">
+    <div class="w-[900px]">
       <el-form ref="formRef" :model="form" label-width="120px">
         <!-- 图纸分类 -->
         <DrawType ref="drawTypeRef" v-model="form" />
-        <div class="mt-24px box-border border border-[#EEEEEE] rounded-12px border-solid bg-[#FFFFFF] px-33px py-22px">
+        <div class="mt-[24px] box-border border border-[#EEEEEE] rounded-[12px] border-solid bg-[#FFFFFF] px-[33px] py-[22px]">
           <el-tabs v-model="form.activeName" class="demo-tabs">
             <el-tab-pane v-for="(item, index) in form.draws" :key="item.type" :label="computLabel(item.type)" :name="item.type">
               <DrawForm v-if="form.draws[index]" v-model="form.draws[index]" :vaild-rules="'draws.' + index" :form-ref="formRef" @preview="handlePreview" />
             </el-tab-pane>
           </el-tabs>
-          <el-form-item label-width="110px" class="mt-20px">
+          <el-form-item label-width="110px" class="mt-[20px]">
             <!-- <el-button class="w-121px h-37px!" :loading="loading" @click="handleSubmit">预览</el-button> -->
-            <el-button type="primary" class="w-121px h-37px!" :loading="loading" @click="handleSubmit">发布</el-button>
+            <el-button type="primary" class="w-[121px] h-[37px]!" :loading="loading" @click="handleSubmit">发布</el-button>
           </el-form-item>
         </div>
       </el-form>
@@ -33,6 +33,7 @@
 
   import type { TcreateReq } from '~/api/upnew/types'
   import { create } from '~/api/upnew/index'
+  const router = useRouter() // 导入路由实例，用于跳转页面
 
   const form = reactive<TcreateReq>({
     activeName: '', // 标签
@@ -83,23 +84,20 @@
   const loading = ref(false)
   const formRef = ref()
   const handleSubmit = () => {
-    console.log(form)
-
     formRef.value.validate((valid: boolean, val: any) => {
-      console.log('00000----', val)
       if (valid) {
         loading.value = true
         create(form)
           .then((res) => {
-            console.log(res)
             const { code } = res
             if (code === 0) {
               // 弹窗提示
               ElMessage.success('操作成功')
+              router.back()
               // 关闭弹窗
-              setTimeout(() => {
-                window.close()
-              }, 100)
+              // setTimeout(() => {
+              //   window.close()
+              // }, 300)
             }
           })
           .finally(() => {

plugins/wang-editor.ts

@@ -0,0 +1,6 @@
+import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
+
+export default defineNuxtPlugin((nuxt) => {
+  nuxt.vueApp.component('WeEditor', Editor)
+  nuxt.vueApp.component('WeToolbar', Toolbar)
+})

static/tinymce/icons/default/icons.js

@@ -1,228 +0,0 @@
-tinymce.IconManager.add('default', {
-  icons: {
-    'accessibility-check': '<svg width="24" height="24"><path d="M12 2a2 2 0 0 1 2 2 2 2 0 0 1-2 2 2 2 0 0 1-2-2c0-1.1.9-2 2-2Zm8 7h-5v12c0 .6-.4 1-1 1a1 1 0 0 1-1-1v-5c0-.6-.4-1-1-1a1 1 0 0 0-1 1v5c0 .6-.4 1-1 1a1 1 0 0 1-1-1V9H4a1 1 0 1 1 0-2h16c.6 0 1 .4 1 1s-.4 1-1 1Z" fill-rule="nonzero"/></svg>',
-    'accordion-toggle': '<svg width="24" height="24"><path fill-rule="evenodd" clip-rule="evenodd" d="M12 15c0-.6.4-1 1-1h6c.6 0 1 .4 1 1s-.4 1-1 1h-6a1 1 0 0 1-1-1Z"/><path opacity=".2" fill-rule="evenodd" clip-rule="evenodd" d="M4 15c0-.6.4-1 1-1h6c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 0 1-1-1Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M12 19c0-.6.4-1 1-1h6c.6 0 1 .4 1 1s-.4 1-1 1h-6a1 1 0 0 1-1-1Z"/><path opacity=".2" fill-rule="evenodd" clip-rule="evenodd" d="M4 19c0-.6.4-1 1-1h6c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 0 1-1-1Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M12.3 7.3a1 1 0 0 1 1.4 0L16 9.6l2.3-2.3a1 1 0 1 1 1.4 1.4L16 12.4l-3.7-3.7a1 1 0 0 1 0-1.4ZM4.3 11.7a1 1 0 0 1 0-1.4L6.6 8 4.3 5.7a1 1 0 0 1 1.4-1.4L9.4 8l-3.7 3.7a1 1 0 0 1-1.4 0Z"/></svg>',
-    'accordion': '<svg width="24" height="24"><rect x="12" y="7" width="10" height="2" rx="1"/><rect x="12" y="11" width="10" height="2" rx="1"/><rect x="12" y="15" width="6" height="2" rx="1"/><path fill-rule="evenodd" clip-rule="evenodd" d="M2.3 7.3a1 1 0 0 1 1.4 0L6 9.6l2.3-2.3a1 1 0 0 1 1.4 1.4L6 12.4 2.3 8.7a1 1 0 0 1 0-1.4Z"/></svg>',
-    'action-next': '<svg width="24" height="24"><path fill-rule="nonzero" d="M5.7 7.3a1 1 0 0 0-1.4 1.4l7.7 7.7 7.7-7.7a1 1 0 1 0-1.4-1.4L12 13.6 5.7 7.3Z"/></svg>',
-    'action-prev': '<svg width="24" height="24"><path fill-rule="nonzero" d="M18.3 15.7a1 1 0 0 0 1.4-1.4L12 6.6l-7.7 7.7a1 1 0 0 0 1.4 1.4L12 9.4l6.3 6.3Z"/></svg>',
-    'addtag': '<svg width="24" height="24"><path fill-rule="evenodd" clip-rule="evenodd" d="M15 5a2 2 0 0 1 1.6.8L21 12l-4.4 6.2a2 2 0 0 1-1.6.8h-3v-2h3l3.5-5L15 7H5v3H3V7c0-1.1.9-2 2-2h10Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M6 12a1 1 0 0 0-1 1v2H3a1 1 0 1 0 0 2h2v2a1 1 0 1 0 2 0v-2h2a1 1 0 1 0 0-2H7v-2c0-.6-.4-1-1-1Z"/></svg>',
-    'ai-prompt': '<svg width="24" height="24"><g clip-path="url(#a)"><path fill-rule="evenodd" clip-rule="evenodd" d="M15 6.7a1 1 0 0 0-1.4 0l-9.9 10a1 1 0 0 0 0 1.3l2.1 2.1c.4.4 1 .4 1.4 0l10-9.9c.3-.3.3-1 0-1.4l-2.2-2Zm1.4 2.8-2-2-3 2.7 2.2 2.2 2.8-2.9Z"/><path d="m18.5 7.3-.7-1.5-1.5-.8 1.5-.7.7-1.5.7 1.5 1.5.7-1.5.8-.7 1.5ZM18.5 16.5l-.7-1.6-1.5-.7 1.5-.7.7-1.6.7 1.6 1.5.7-1.5.7-.7 1.6ZM9.7 7.3 9 5.8 7.5 5 9 4.3l.7-1.5.7 1.5L12 5l-1.5.8-.7 1.5Z"/></g><defs><clipPath id="a"><path d="M0 0h24v24H0z"/></clipPath></defs></svg>',
-    'ai': '<svg width="24" height="24"><path fill-rule="evenodd" clip-rule="evenodd" d="M5 3a3 3 0 0 0-3 3v12a3 3 0 0 0 3 3h14a3 3 0 0 0 3-3V6a3 3 0 0 0-3-3H5Zm6.8 11.5.5 1.2a68.3 68.3 0 0 0 .7 1.1l.4.1c.3 0 .5 0 .7-.3.2-.1.3-.3.3-.6l-.3-1-2.6-6.2a20.4 20.4 0 0 0-.5-1.3l-.5-.4-.7-.2c-.2 0-.5 0-.6.2-.2 0-.4.2-.5.4l-.3.6-.3.7L5.7 15l-.2.6-.1.4c0 .3 0 .5.3.7l.6.2c.3 0 .5 0 .7-.2l.4-1 .5-1.2h3.9ZM9.8 9l1.5 4h-3l1.5-4Zm5.6-.9v7.6c0 .4 0 .7.2 1l.7.2c.3 0 .6 0 .8-.3l.2-.9V8.1c0-.4 0-.7-.2-.9a1 1 0 0 0-.8-.3c-.2 0-.5.1-.7.3l-.2 1Z"/></svg>',
-    'align-center': '<svg width="24" height="24"><path d="M5 5h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 1 1 0-2Zm3 4h8c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 1 1 0-2Zm0 8h8c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 0 1 0-2Zm-3-4h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 0 1 0-2Z" fill-rule="evenodd"/></svg>',
-    'align-justify': '<svg width="24" height="24"><path d="M5 5h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 1 1 0-2Zm0 4h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 1 1 0-2Zm0 4h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 0 1 0-2Zm0 4h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 0 1 0-2Z" fill-rule="evenodd"/></svg>',
-    'align-left': '<svg width="24" height="24"><path d="M5 5h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 1 1 0-2Zm0 4h8c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 1 1 0-2Zm0 8h8c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 0 1 0-2Zm0-4h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 0 1 0-2Z" fill-rule="evenodd"/></svg>',
-    'align-none': '<svg width="24" height="24"><path d="M14.2 5 13 7H5a1 1 0 1 1 0-2h9.2Zm4 0h.8a1 1 0 0 1 0 2h-2l1.2-2Zm-6.4 4-1.2 2H5a1 1 0 0 1 0-2h6.8Zm4 0H19a1 1 0 0 1 0 2h-4.4l1.2-2Zm-6.4 4-1.2 2H5a1 1 0 0 1 0-2h4.4Zm4 0H19a1 1 0 0 1 0 2h-6.8l1.2-2ZM7 17l-1.2 2H5a1 1 0 0 1 0-2h2Zm4 0h8a1 1 0 0 1 0 2H9.8l1.2-2Zm5.2-13.5 1.3.7-9.7 16.3-1.3-.7 9.7-16.3Z" fill-rule="evenodd"/></svg>',
-    'align-right': '<svg width="24" height="24"><path d="M5 5h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 1 1 0-2Zm6 4h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 0 1 0-2Zm0 8h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 0 1 0-2Zm-6-4h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 0 1 0-2Z" fill-rule="evenodd"/></svg>',
-    'arrow-left': '<svg width="24" height="24"><path d="m5.6 13 12 6a1 1 0 0 0 1.4-1V6a1 1 0 0 0-1.4-.9l-12 6a1 1 0 0 0 0 1.8Z" fill-rule="evenodd"/></svg>',
-    'arrow-right': '<svg width="24" height="24"><path d="m18.5 13-12 6A1 1 0 0 1 5 18V6a1 1 0 0 1 1.4-.9l12 6a1 1 0 0 1 0 1.8Z" fill-rule="evenodd"/></svg>',
-    'bold': '<svg width="24" height="24"><path d="M7.8 19c-.3 0-.5 0-.6-.2l-.2-.5V5.7c0-.2 0-.4.2-.5l.6-.2h5c1.5 0 2.7.3 3.5 1 .7.6 1.1 1.4 1.1 2.5a3 3 0 0 1-.6 1.9c-.4.6-1 1-1.6 1.2.4.1.9.3 1.3.6s.8.7 1 1.2c.4.4.5 1 .5 1.6 0 1.3-.4 2.3-1.3 3-.8.7-2.1 1-3.8 1H7.8Zm5-8.3c.6 0 1.2-.1 1.6-.5.4-.3.6-.7.6-1.3 0-1.1-.8-1.7-2.3-1.7H9.3v3.5h3.4Zm.5 6c.7 0 1.3-.1 1.7-.4.4-.4.6-.9.6-1.5s-.2-1-.7-1.4c-.4-.3-1-.4-2-.4H9.4v3.8h4Z" fill-rule="evenodd"/></svg>',
-    'bookmark': '<svg width="24" height="24"><path d="M6 4v17l6-4 6 4V4c0-.6-.4-1-1-1H7a1 1 0 0 0-1 1Z" fill-rule="nonzero"/></svg>',
-    'border-style': '<svg width="24" height="24"><g fill-rule="evenodd"><rect width="18" height="2" x="3" y="6" rx="1"/><rect width="2.8" height="2" x="3" y="16" rx="1"/><rect width="2.8" height="2" x="6.8" y="16" rx="1"/><rect width="2.8" height="2" x="10.6" y="16" rx="1"/><rect width="2.8" height="2" x="14.4" y="16" rx="1"/><rect width="2.8" height="2" x="18.2" y="16" rx="1"/><rect width="8" height="2" x="3" y="11" rx="1"/><rect width="8" height="2" x="13" y="11" rx="1"/></g></svg>',
-    'border-width': '<svg width="24" height="24"><g fill-rule="evenodd"><rect width="18" height="5" x="3" y="5" rx="1"/><rect width="18" height="3.5" x="3" y="11.5" rx="1"/><rect width="18" height="2" x="3" y="17" rx="1"/></g></svg>',
-    'brightness': '<svg width="24" height="24"><path d="M12 17c.3 0 .5.1.7.3.2.2.3.4.3.7v1c0 .3-.1.5-.3.7a1 1 0 0 1-.7.3 1 1 0 0 1-.7-.3 1 1 0 0 1-.3-.7v-1c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3Zm0-10a1 1 0 0 1-.7-.3A1 1 0 0 1 11 6V5c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3.3 0 .5.1.7.3.2.2.3.4.3.7v1c0 .3-.1.5-.3.7a1 1 0 0 1-.7.3Zm7 4c.3 0 .5.1.7.3.2.2.3.4.3.7 0 .3-.1.5-.3.7a1 1 0 0 1-.7.3h-1a1 1 0 0 1-.7-.3 1 1 0 0 1-.3-.7c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3h1ZM7 12c0 .3-.1.5-.3.7a1 1 0 0 1-.7.3H5a1 1 0 0 1-.7-.3A1 1 0 0 1 4 12c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3h1c.3 0 .5.1.7.3.2.2.3.4.3.7Zm10 3.5.7.8c.2.1.3.4.3.6 0 .3-.1.6-.3.8a1 1 0 0 1-.8.3 1 1 0 0 1-.6-.3l-.8-.7a1 1 0 0 1-.3-.8c0-.2.1-.5.3-.7a1 1 0 0 1 1.4 0Zm-10-7-.7-.8a1 1 0 0 1-.3-.6c0-.3.1-.6.3-.8.2-.2.5-.3.8-.3.2 0 .5.1.7.3l.7.7c.2.2.3.5.3.8 0 .2-.1.5-.3.7a1 1 0 0 1-.7.3 1 1 0 0 1-.8-.3Zm10 0a1 1 0 0 1-.8.3 1 1 0 0 1-.7-.3 1 1 0 0 1-.3-.7c0-.3.1-.6.3-.8l.8-.7c.1-.2.4-.3.6-.3.3 0 .6.1.8.3.2.2.3.5.3.8 0 .2-.1.5-.3.7l-.7.7Zm-10 7c.2-.2.5-.3.8-.3.2 0 .5.1.7.3a1 1 0 0 1 0 1.4l-.8.8a1 1 0 0 1-.6.3 1 1 0 0 1-.8-.3 1 1 0 0 1-.3-.8c0-.2.1-.5.3-.6l.7-.8ZM12 8a4 4 0 0 1 3.7 2.4 4 4 0 0 1 0 3.2A4 4 0 0 1 12 16a4 4 0 0 1-3.7-2.4 4 4 0 0 1 0-3.2A4 4 0 0 1 12 8Zm0 6.5c.7 0 1.3-.2 1.8-.7.5-.5.7-1.1.7-1.8s-.2-1.3-.7-1.8c-.5-.5-1.1-.7-1.8-.7s-1.3.2-1.8.7c-.5.5-.7 1.1-.7 1.8s.2 1.3.7 1.8c.5.5 1.1.7 1.8.7Z" fill-rule="evenodd"/></svg>',
-    'browse': '<svg width="24" height="24"><path d="M19 4a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2h-4v-2h4V8H5v10h4v2H5a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h14Zm-8 9.4-2.3 2.3a1 1 0 1 1-1.4-1.4l4-4a1 1 0 0 1 1.4 0l4 4a1 1 0 0 1-1.4 1.4L13 13.4V20a1 1 0 0 1-2 0v-6.6Z" fill-rule="nonzero"/></svg>',
-    'cancel': '<svg width="24" height="24"><path d="M12 4.6a7.4 7.4 0 1 1 0 14.8 7.4 7.4 0 0 1 0-14.8ZM12 3a9 9 0 1 0 0 18 9 9 0 0 0 0-18Zm0 8L14.8 8l1 1.1-2.7 2.8 2.7 2.7-1.1 1.1-2.7-2.7-2.7 2.7-1-1.1 2.6-2.7-2.7-2.7 1-1.1 2.8 2.7Z" fill-rule="nonzero"/></svg>',
-    'cell-background-color': '<svg width="24" height="24"><path d="m15.7 2 1.6 1.6-2.7 2.6 5.9 5.8c.7.7.7 1.7 0 2.4l-6.3 6.1a1.7 1.7 0 0 1-2.4 0l-6.3-6.1c-.7-.7-.7-1.7 0-2.4L15.7 2ZM18 12l-4.5-4L9 12h9ZM4 16s2 2.4 2 3.8C6 21 5.1 22 4 22s-2-1-2-2.2C2 18.4 4 16 4 16Z"/></svg>',
-    'cell-border-color': '<svg width="24" height="24"><g fill-rule="evenodd"><path fill-rule="nonzero" d="M5 13v5h2v2H5a2 2 0 0 1-2-2v-5h2zm8-7V4h6a2 2 0 0 1 2 2h-8z" opacity=".2"/><path fill-rule="nonzero" d="M13 4v2H5v7H3V6c0-1.1.9-2 2-2h8zm-2.6 14.1.1-.1.1.1.2.3.2.2.2.2c.4.6.8 1.2.8 1.7 0 .8-.7 1.5-1.5 1.5S9 21.3 9 20.5c0-.5.4-1.1.8-1.7l.2-.2.2-.2.2-.3z"/><path d="m13 11-2 2H5v-2h6V6h2z"/><path fill-rule="nonzero" d="m18.4 8 1 1-1.8 1.9 4 4c.5.4.5 1.1 0 1.6l-4.3 4.2a1.2 1.2 0 0 1-1.6 0l-4.4-4.2c-.4-.5-.4-1.2 0-1.7l7-6.8Zm1.6 7-3-3-3 3h6Z"/></g></svg>',
-    'change-case': '<svg width="24" height="24"><path d="M18.4 18.2v-.6c-.5.8-1.3 1.2-2.4 1.2-2.2 0-3.3-1.6-3.3-4.8 0-3.1 1-4.7 3.3-4.7 1.1 0 1.8.3 2.4 1.1v-.6c0-.5.4-.8.8-.8s.8.3.8.8v8.4c0 .5-.4.8-.8.8a.8.8 0 0 1-.8-.8zm-2-7.4c-1.3 0-1.8.9-1.8 3.2 0 2.4.5 3.3 1.7 3.3 1.3 0 1.8-.9 1.8-3.2 0-2.4-.5-3.3-1.7-3.3zM10 15.7H5.5l-.8 2.6a1 1 0 0 1-1 .7h-.2a.7.7 0 0 1-.7-1l4-12a1 1 0 0 1 2 0l4 12a.7.7 0 0 1-.8 1h-.2a1 1 0 0 1-1-.7l-.8-2.6zm-.3-1.5-2-6.5-1.9 6.5h3.9z" fill-rule="evenodd"/></svg>',
-    'character-count': '<svg width="24" height="24"><path d="M4 11.5h16v1H4v-1Zm4.8-6.8V10H7.7V5.8h-1v-1h2ZM11 8.3V9h2v1h-3V7.7l2-1v-.9h-2v-1h3v2.4l-2 1Zm6.3-3.4V10h-3.1V9h2.1V8h-2.1V6.8h2.1v-1h-2.1v-1h3.1ZM5.8 16.4c0-.5.2-.8.5-1 .2-.2.6-.3 1.2-.3l.8.1c.2 0 .4.2.5.3l.4.4v2.8l.2.3H8.2V18.7l-.6.3H7c-.4 0-.7 0-1-.2a1 1 0 0 1-.3-.9c0-.3 0-.6.3-.8.3-.2.7-.4 1.2-.4l.6-.2h.3v-.2l-.1-.2a.8.8 0 0 0-.5-.1 1 1 0 0 0-.4 0l-.3.4h-1Zm2.3.8h-.2l-.2.1-.4.1a1 1 0 0 0-.4.2l-.2.2.1.3.5.1h.4l.4-.4v-.6Zm2-3.4h1.2v1.7l.5-.3h.5c.5 0 .9.1 1.2.5.3.4.5.8.5 1.4 0 .6-.2 1.1-.5 1.5-.3.4-.7.6-1.3.6l-.6-.1-.4-.4v.4h-1.1v-5.4Zm1.1 3.3c0 .3 0 .6.2.8a.7.7 0 0 0 1.2 0l.2-.8c0-.4 0-.6-.2-.8a.7.7 0 0 0-.6-.3l-.6.3-.2.8Zm6.1-.5c0-.2 0-.3-.2-.4a.8.8 0 0 0-.5-.2c-.3 0-.5.1-.6.3l-.2.9c0 .3 0 .6.2.8.1.2.3.3.6.3.2 0 .4 0 .5-.2l.2-.4h1.1c0 .5-.3.8-.6 1.1a2 2 0 0 1-1.3.4c-.5 0-1-.2-1.3-.6a2 2 0 0 1-.5-1.4c0-.6.1-1.1.5-1.5.3-.4.8-.5 1.4-.5.5 0 1 0 1.2.3.4.3.5.7.5 1.2h-1v-.1Z" fill-rule="evenodd"/></svg>',
-    'checklist-rtl': '<svg width="24" height="24"><path d="M5 17h8c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 0 1 0-2zm0-6h8c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 0 1 0-2zm0-6h8c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 1 1 0-2zm14.2 11c.2-.4.6-.5.9-.3.3.2.4.6.2 1L18 20c-.2.3-.7.4-1 0l-1.3-1.3a.7.7 0 0 1 0-1c.3-.2.7-.2 1 0l.7.9 1.7-2.8zm0-6c.2-.4.6-.5.9-.3.3.2.4.6.2 1L18 14c-.2.3-.7.4-1 0l-1.3-1.3a.7.7 0 0 1 0-1c.3-.2.7-.2 1 0l.7.9 1.7-2.8zm0-6c.2-.4.6-.5.9-.3.3.2.4.6.2 1L18 8c-.2.3-.7.4-1 0l-1.3-1.3a.7.7 0 0 1 0-1c.3-.2.7-.2 1 0l.7.9 1.7-2.8z" fill-rule="evenodd"/></svg>',
-    'checklist': '<svg width="24" height="24"><path d="M11 17h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 0 1 0-2Zm0-6h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 0 1 0-2Zm0-6h8a1 1 0 0 1 0 2h-8a1 1 0 0 1 0-2ZM7.2 16c.2-.4.6-.5.9-.3.3.2.4.6.2 1L6 20c-.2.3-.7.4-1 0l-1.3-1.3a.7.7 0 0 1 0-1c.3-.2.7-.2 1 0l.7.9 1.7-2.8Zm0-6c.2-.4.6-.5.9-.3.3.2.4.6.2 1L6 14c-.2.3-.7.4-1 0l-1.3-1.3a.7.7 0 0 1 0-1c.3-.2.7-.2 1 0l.7.9 1.7-2.8Zm0-6c.2-.4.6-.5.9-.3.3.2.4.6.2 1L6 8c-.2.3-.7.4-1 0L3.8 6.9a.7.7 0 0 1 0-1c.3-.2.7-.2 1 0l.7.9 1.7-2.8Z" fill-rule="evenodd"/></svg>',
-    'checkmark': '<svg width="24" height="24"><path d="M18.2 5.4a1 1 0 0 1 1.6 1.2l-8 12a1 1 0 0 1-1.5.1l-5-5a1 1 0 1 1 1.4-1.4l4.1 4.1 7.4-11Z" fill-rule="nonzero"/></svg>',
-    'chevron-down': '<svg width="10" height="10"><path d="M8.7 2.2c.3-.3.8-.3 1 0 .4.4.4.9 0 1.2L5.7 7.8c-.3.3-.9.3-1.2 0L.2 3.4a.8.8 0 0 1 0-1.2c.3-.3.8-.3 1.1 0L5 6l3.7-3.8Z" fill-rule="nonzero"/></svg>',
-    'chevron-left': '<svg width="10" height="10"><path d="M7.8 1.3 4 5l3.8 3.7c.3.3.3.8 0 1-.4.4-.9.4-1.2 0L2.2 5.7a.8.8 0 0 1 0-1.2L6.6.2C7 0 7.4 0 7.8.2c.3.3.3.8 0 1.1Z" fill-rule="nonzero"/></svg>',
-    'chevron-right': '<svg width="10" height="10"><path d="M2.2 1.3a.8.8 0 0 1 0-1c.4-.4.9-.4 1.2 0l4.4 4.1c.3.4.3.9 0 1.2L3.4 9.8c-.3.3-.8.3-1.2 0a.8.8 0 0 1 0-1.1L6 5 2.2 1.3Z" fill-rule="nonzero"/></svg>',
-    'chevron-up': '<svg width="10" height="10"><path d="M8.7 7.8 5 4 1.3 7.8c-.3.3-.8.3-1 0a.8.8 0 0 1 0-1.2l4.1-4.4c.3-.3.9-.3 1.2 0l4.2 4.4c.3.3.3.9 0 1.2-.3.3-.8.3-1.1 0Z" fill-rule="nonzero"/></svg>',
-    'close': '<svg width="24" height="24"><path d="M17.3 8.2 13.4 12l3.9 3.8a1 1 0 0 1-1.5 1.5L12 13.4l-3.8 3.9a1 1 0 0 1-1.5-1.5l3.9-3.8-3.9-3.8a1 1 0 0 1 1.5-1.5l3.8 3.9 3.8-3.9a1 1 0 0 1 1.5 1.5Z" fill-rule="evenodd"/></svg>',
-    'code-sample': '<svg width="24" height="26"><path d="M7.1 11a2.8 2.8 0 0 1-.8 2 2.8 2.8 0 0 1 .8 2v1.7c0 .3.1.6.4.8.2.3.5.4.8.4.3 0 .4.2.4.4v.8c0 .2-.1.4-.4.4-.7 0-1.4-.3-2-.8-.5-.6-.8-1.3-.8-2V15c0-.3-.1-.6-.4-.8-.2-.3-.5-.4-.8-.4a.4.4 0 0 1-.4-.4v-.8c0-.2.2-.4.4-.4.3 0 .6-.1.8-.4.3-.2.4-.5.4-.8V9.3c0-.7.3-1.4.8-2 .6-.5 1.3-.8 2-.8.3 0 .4.2.4.4v.8c0 .2-.1.4-.4.4-.3 0-.6.1-.8.4-.3.2-.4.5-.4.8V11Zm9.8 0V9.3c0-.3-.1-.6-.4-.8-.2-.3-.5-.4-.8-.4a.4.4 0 0 1-.4-.4V7c0-.2.1-.4.4-.4.7 0 1.4.3 2 .8.5.6.8 1.3.8 2V11c0 .3.1.6.4.8.2.3.5.4.8.4.2 0 .4.2.4.4v.8c0 .2-.2.4-.4.4-.3 0-.6.1-.8.4-.3.2-.4.5-.4.8v1.7c0 .7-.3 1.4-.8 2-.6.5-1.3.8-2 .8a.4.4 0 0 1-.4-.4v-.8c0-.2.1-.4.4-.4.3 0 .6-.1.8-.4.3-.2.4-.5.4-.8V15a2.8 2.8 0 0 1 .8-2 2.8 2.8 0 0 1-.8-2Zm-3.3-.4c0 .4-.1.8-.5 1.1-.3.3-.7.5-1.1.5-.4 0-.8-.2-1.1-.5-.4-.3-.5-.7-.5-1.1 0-.5.1-.9.5-1.2.3-.3.7-.4 1.1-.4.4 0 .8.1 1.1.4.4.3.5.7.5 1.2ZM12 13c.4 0 .8.1 1.1.5.4.3.5.7.5 1.1 0 1-.1 1.6-.5 2a3 3 0 0 1-1.1 1c-.4.3-.8.4-1.1.4a.5.5 0 0 1-.5-.5V17a3 3 0 0 0 1-.2l.6-.6c-.6 0-1-.2-1.3-.5-.2-.3-.3-.7-.3-1 0-.5.1-1 .5-1.2.3-.4.7-.5 1.1-.5Z" fill-rule="evenodd"/></svg>',
-    'color-levels': '<svg width="24" height="24"><path d="M17.5 11.4A9 9 0 0 1 18 14c0 .5 0 1-.2 1.4 0 .4-.3.9-.5 1.3a6.2 6.2 0 0 1-3.7 3 5.7 5.7 0 0 1-3.2 0A5.9 5.9 0 0 1 7.6 18a6.2 6.2 0 0 1-1.4-2.6 6.7 6.7 0 0 1 0-2.8c0-.4.1-.9.3-1.3a13.6 13.6 0 0 1 2.3-4A20 20 0 0 1 12 4a26.4 26.4 0 0 1 3.2 3.4 18.2 18.2 0 0 1 2.3 4Zm-2 4.5c.4-.7.5-1.4.5-2a7.3 7.3 0 0 0-1-3.2c.2.6.2 1.2.2 1.9a4.5 4.5 0 0 1-1.3 3 5.3 5.3 0 0 1-2.3 1.5 4.9 4.9 0 0 1-2 .1 4.3 4.3 0 0 0 2.4.8 4 4 0 0 0 2-.6 4 4 0 0 0 1.5-1.5Z" fill-rule="evenodd"/></svg>',
-    'color-picker': '<svg width="24" height="24"><path d="M12 3a9 9 0 0 0 0 18 1.5 1.5 0 0 0 1.1-2.5c-.2-.3-.4-.6-.4-1 0-.8.7-1.5 1.5-1.5H16a5 5 0 0 0 5-5c0-4.4-4-8-9-8Zm-5.5 9a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3Zm3-4a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3Zm5 0a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3Zm3 4a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3Z" fill-rule="nonzero"/></svg>',
-    'color-swatch-remove-color': '<svg width="24" height="24"><path stroke="#000" stroke-width="2" d="M21 3 3 21" fill-rule="evenodd"/></svg>',
-    'color-swatch': '<svg width="24" height="24"><rect x="3" y="3" width="18" height="18" rx="1" fill-rule="evenodd"/></svg>',
-    'comment-add': '<svg width="24" height="24"><g fill-rule="nonzero"><path d="m9 19 3-2h7c.6 0 1-.4 1-1V6c0-.6-.4-1-1-1H5a1 1 0 0 0-1 1v10c0 .6.4 1 1 1h4v2Zm-2 4v-4H5a3 3 0 0 1-3-3V6a3 3 0 0 1 3-3h14a3 3 0 0 1 3 3v10a3 3 0 0 1-3 3h-6.4L7 23Z"/><path d="M13 10h2a1 1 0 0 1 0 2h-2v2a1 1 0 0 1-2 0v-2H9a1 1 0 0 1 0-2h2V8a1 1 0 0 1 2 0v2Z"/></g></svg>',
-    'comment': '<svg width="24" height="24"><path fill-rule="nonzero" d="m9 19 3-2h7c.6 0 1-.4 1-1V6c0-.6-.4-1-1-1H5a1 1 0 0 0-1 1v10c0 .6.4 1 1 1h4v2Zm-2 4v-4H5a3 3 0 0 1-3-3V6a3 3 0 0 1 3-3h14a3 3 0 0 1 3 3v10a3 3 0 0 1-3 3h-6.4L7 23Z"/></svg>',
-    'contrast': '<svg width="24" height="24"><path d="M12 4a7.8 7.8 0 0 1 5.7 2.3A8 8 0 1 1 12 4Zm-6 8a6 6 0 0 0 6 6V6a6 6 0 0 0-6 6Z" fill-rule="evenodd"/></svg>',
-    'copy': '<svg width="24" height="24"><path d="M16 3H6a2 2 0 0 0-2 2v11h2V5h10V3Zm1 4a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2h-7a2 2 0 0 1-2-2V9c0-1.2.9-2 2-2h7Zm0 12V9h-7v10h7Z" fill-rule="nonzero"/></svg>',
-    'crop': '<svg width="24" height="24"><path d="M17 8v7h2c.6 0 1 .4 1 1s-.4 1-1 1h-2v2c0 .6-.4 1-1 1a1 1 0 0 1-1-1v-2H7V9H5a1 1 0 1 1 0-2h2V5c0-.6.4-1 1-1s1 .4 1 1v2h7l3-3 1 1-3 3ZM9 9v5l5-5H9Zm1 6h5v-5l-5 5Z" fill-rule="evenodd"/></svg>',
-    'cut-column': '<svg width="24" height="24"><path fill-rule="evenodd" d="M7.2 4.5c.9 0 1.6.4 2.2 1A3.7 3.7 0 0 1 10.5 8v.5l1 1 4-4 1-.5a3.3 3.3 0 0 1 2 0c.4 0 .7.3 1 .5L17 8h4v13h-6V10l-1.5 1.5.5.5v4l-2.5-2.5-1 1v.5c0 .4 0 .8-.3 1.2-.2.5-.4.9-.8 1.2-.6.7-1.3 1-2.2 1-.8.2-1.5 0-2-.6l-.5-.8-.2-1c0-.4 0-.8.3-1.2A3.9 3.9 0 0 1 7 12.7c.5-.2 1-.3 1.5-.2l1-1-1-1c-.5 0-1 0-1.5-.2-.5-.1-1-.4-1.4-.9-.4-.3-.6-.7-.8-1.2L4.5 7c0-.4 0-.7.2-1 0-.3.3-.6.5-.8.5-.5 1.2-.8 2-.7Zm12.3 5h-3v10h3v-10ZM8 13.8h-.3l-.4.2a2.8 2.8 0 0 0-.7.4v.1a2.8 2.8 0 0 0-.6.8l-.1.4v.7l.2.5.5.2h.7a2.6 2.6 0 0 0 .8-.3 2.4 2.4 0 0 0 .7-.7 2.5 2.5 0 0 0 .3-.8 1.5 1.5 0 0 0 0-.8 1 1 0 0 0-.2-.4 1 1 0 0 0-.5-.2H8Zm3.5-3.7c-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1s.1.7.4 1c.3.3.6.4 1 .4s.7-.1 1-.4c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4ZM7 5.8h-.4a1 1 0 0 0-.5.3 1 1 0 0 0-.2.5v.7a2.5 2.5 0 0 0 .3.8l.2.3h.1l.4.4.4.2.4.1h.7L9 9l.2-.4a1.6 1.6 0 0 0 0-.8 2.6 2.6 0 0 0-.3-.8A2.5 2.5 0 0 0 7.7 6l-.4-.1H7Z"/></svg>',
-    'cut-row': '<svg width="24" height="24"><path fill-rule="evenodd" d="M22 3v5H9l3 3 2-2h4l-4 4 1 1h.5c.4 0 .8 0 1.2.3.5.2.9.4 1.2.8.7.6 1 1.3 1 2.2.2.8 0 1.5-.6 2l-.8.5-1 .2c-.4 0-.8 0-1.2-.3a3.9 3.9 0 0 1-2.1-2.2c-.2-.5-.3-1-.2-1.5l-1-1-1 1c0 .5 0 1-.2 1.5-.1.5-.4 1-.9 1.4-.3.4-.7.6-1.2.8l-1.2.3c-.4 0-.7 0-1-.2-.3 0-.6-.3-.8-.5-.5-.5-.8-1.2-.7-2 0-.9.4-1.6 1-2.2A3.7 3.7 0 0 1 8.6 14H9l1-1-4-4-.5-1a3.3 3.3 0 0 1 0-2c0-.4.3-.7.5-1l2 2V3h14ZM8.5 15.3h-.3a2.6 2.6 0 0 0-.8.4 2.5 2.5 0 0 0-.9 1.1l-.1.4v.7l.2.5.5.2h.7a2.5 2.5 0 0 0 .8-.3L9 18V18l.4-.4.2-.4.1-.4v-.7a1 1 0 0 0-.2-.5 1 1 0 0 0-.4-.2h-.5Zm7 0H15a1 1 0 0 0-.4.3 1 1 0 0 0-.2.5 1.5 1.5 0 0 0 0 .7v.4a2.8 2.8 0 0 0 .5.7h.1a2.8 2.8 0 0 0 .8.6l.4.1h.7l.5-.2.2-.5v-.7a2.6 2.6 0 0 0-.3-.8 2.4 2.4 0 0 0-.7-.7 2.5 2.5 0 0 0-.8-.3h-.3ZM12 11.6c-.4 0-.7.1-1 .4-.3.3-.4.6-.4 1s.1.7.4 1c.3.3.6.4 1 .4s.7-.1 1-.4c.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4Zm8.5-7.1h-11v2h11v-2Z"/></svg>',
-    'cut': '<svg width="24" height="24"><path d="M18 15c.6.7 1 1.4 1 2.3 0 .8-.2 1.5-.7 2l-.8.5-1 .2c-.4 0-.8 0-1.2-.3a3.9 3.9 0 0 1-2.1-2.2c-.2-.5-.3-1-.2-1.5l-1-1-1 1c0 .5 0 1-.2 1.5-.1.5-.4 1-.9 1.4-.3.4-.7.6-1.2.8l-1.2.3c-.4 0-.7 0-1-.2-.3 0-.6-.3-.8-.5-.5-.5-.8-1.2-.7-2 0-.9.4-1.6 1-2.2A3.7 3.7 0 0 1 8.6 14H9l1-1-4-4-.5-1a3.3 3.3 0 0 1 0-2c0-.4.3-.7.5-1l6 6 6-6 .5 1a3.3 3.3 0 0 1 0 2c0 .4-.3.7-.5 1l-4 4 1 1h.5c.4 0 .8 0 1.2.3.5.2.9.4 1.2.8Zm-8.5 2.2.1-.4v-.7a1 1 0 0 0-.2-.5 1 1 0 0 0-.4-.2 1.6 1.6 0 0 0-.8 0 2.6 2.6 0 0 0-.8.3 2.5 2.5 0 0 0-.9 1.1l-.1.4v.7l.2.5.5.2h.7a2.5 2.5 0 0 0 .8-.3 2.8 2.8 0 0 0 1-1Zm2.5-2.8c.4 0 .7-.1 1-.4.3-.3.4-.6.4-1s-.1-.7-.4-1c-.3-.3-.6-.4-1-.4s-.7.1-1 .4c-.3.3-.4.6-.4 1s.1.7.4 1c.3.3.6.4 1 .4Zm5.4 4 .2-.5v-.7a2.6 2.6 0 0 0-.3-.8 2.4 2.4 0 0 0-.7-.7 2.5 2.5 0 0 0-.8-.3 1.5 1.5 0 0 0-.8 0 1 1 0 0 0-.4.2 1 1 0 0 0-.2.5 1.5 1.5 0 0 0 0 .7v.4l.3.4.3.4a2.8 2.8 0 0 0 .8.5l.4.1h.7l.5-.2Z" fill-rule="evenodd"/></svg>',
-    'document-properties': '<svg width="24" height="24"><path d="M14.4 3H7a2 2 0 0 0-2 2v14c0 1.1.9 2 2 2h10a2 2 0 0 0 2-2V7.6L14.4 3ZM17 19H7V5h6v4h4v10Z" fill-rule="nonzero"/></svg>',
-    'drag': '<svg width="24" height="24"><path d="M13 5h2v2h-2V5Zm0 4h2v2h-2V9ZM9 9h2v2H9V9Zm4 4h2v2h-2v-2Zm-4 0h2v2H9v-2Zm0 4h2v2H9v-2Zm4 0h2v2h-2v-2ZM9 5h2v2H9V5Z" fill-rule="evenodd"/></svg>',
-    'duplicate-column': '<svg width="24" height="24"><path d="M17 6v16h-7V6h7Zm-2 2h-3v12h3V8Zm-2-6v2H8v15H6V2h7Z"/></svg>',
-    'duplicate-row': '<svg width="24" height="24"><path d="M22 11v7H6v-7h16Zm-2 2H8v3h12v-3Zm-1-6v2H4v5H2V7h17Z"/></svg>',
-    'duplicate': '<svg width="24" height="24"><g fill-rule="nonzero"><path d="M16 3v2H6v11H4V5c0-1.1.9-2 2-2h10Zm3 8h-2V9h-7v10h9a2 2 0 0 1-2 2h-7a2 2 0 0 1-2-2V9c0-1.2.9-2 2-2h7a2 2 0 0 1 2 2v2Z"/><path d="M17 14h1a1 1 0 0 1 0 2h-1v1a1 1 0 0 1-2 0v-1h-1a1 1 0 0 1 0-2h1v-1a1 1 0 0 1 2 0v1Z"/></g></svg>',
-    'edit-block': '<svg width="24" height="24"><path fill-rule="nonzero" d="m19.8 8.8-9.4 9.4c-.2.2-.5.4-.9.4l-5.4 1.2 1.2-5.4.5-.8 9.4-9.4c.7-.7 1.8-.7 2.5 0l2.1 2.1c.7.7.7 1.8 0 2.5Zm-2-.2 1-.9v-.3l-2.2-2.2a.3.3 0 0 0-.3 0l-1 1L18 8.5Zm-1 1-2.5-2.4-6 6 2.5 2.5 6-6Zm-7 7.1-2.6-2.4-.3.3-.1.2-.7 3 3.1-.6h.1l.4-.5Z"/></svg>',
-    'edit-image': '<svg width="24" height="24"><path d="M18 16h2V7a2 2 0 0 0-2-2H7v2h11v9ZM6 17h15a1 1 0 0 1 0 2h-1v1a1 1 0 0 1-2 0v-1H6a2 2 0 0 1-2-2V7H3a1 1 0 1 1 0-2h1V4a1 1 0 1 1 2 0v13Zm3-5.3 1.3 2 3-4.7 3.7 6H7l2-3.3Z" fill-rule="nonzero"/></svg>',
-    'embed-page': '<svg width="24" height="24"><path d="M19 6V5H5v14h2A13 13 0 0 1 19 6Zm0 1.4c-.8.8-1.6 2.4-2.2 4.6H19V7.4Zm0 5.6h-2.4c-.4 1.8-.6 3.8-.6 6h3v-6Zm-4 6c0-2.2.2-4.2.6-6H13c-.7 1.8-1.1 3.8-1.1 6h3Zm-4 0c0-2.2.4-4.2 1-6H9.6A12 12 0 0 0 8 19h3ZM4 3h16c.6 0 1 .4 1 1v16c0 .6-.4 1-1 1H4a1 1 0 0 1-1-1V4c0-.6.4-1 1-1Zm11.8 9c.4-1.9 1-3.4 1.8-4.5a9.2 9.2 0 0 0-4 4.5h2.2Zm-3.4 0a12 12 0 0 1 2.8-4 12 12 0 0 0-5 4h2.2Z" fill-rule="nonzero"/></svg>',
-    'embed': '<svg width="24" height="24"><path d="M4 3h16c.6 0 1 .4 1 1v16c0 .6-.4 1-1 1H4a1 1 0 0 1-1-1V4c0-.6.4-1 1-1Zm1 2v14h14V5H5Zm4.8 2.6 5.6 4a.5.5 0 0 1 0 .8l-5.6 4A.5.5 0 0 1 9 16V8a.5.5 0 0 1 .8-.4Z" fill-rule="nonzero"/></svg>',
-    'emoji': '<svg width="24" height="24"><path d="M9 11c.6 0 1-.4 1-1s-.4-1-1-1a1 1 0 0 0-1 1c0 .6.4 1 1 1Zm6 0c.6 0 1-.4 1-1s-.4-1-1-1a1 1 0 0 0-1 1c0 .6.4 1 1 1Zm-3 5.5c2.1 0 4-1.5 4.4-3.5H7.6c.5 2 2.3 3.5 4.4 3.5ZM12 4a8 8 0 1 0 0 16 8 8 0 0 0 0-16Zm0 14.5a6.5 6.5 0 1 1 0-13 6.5 6.5 0 0 1 0 13Z" fill-rule="nonzero"/></svg>',
-    'export': '<svg width="24" height="24"><g fill-rule="nonzero"><path d="M14.4 3 18 7v1h-5V5H7v14h9a1 1 0 0 1 2 0c0 1-.8 2-1.9 2H7c-1 0-2-.8-2-1.9V5c0-1 .8-2 1.9-2h7.5Z"/><path d="M18.1 12c.5 0 .9.4.9 1 0 .5-.3 1-.8 1h-7.3c-.5 0-.9-.4-.9-1 0-.5.3-1 .8-1h7.3Z"/><path d="M16.4 9.2a1 1 0 0 1 1.4.2l2.4 3.6-2.4 3.6a1 1 0 0 1-1.7-1v-.2l1.7-2.4-1.6-2.4a1 1 0 0 1 .2-1.4Z"/></g></svg>',
-    'fill': '<svg width="24" height="26"><path d="m16.6 12-9-9-1.4 1.4 2.4 2.4-5.2 5.1c-.5.6-.5 1.6 0 2.2L9 19.6a1.5 1.5 0 0 0 2.2 0l5.5-5.5c.5-.6.5-1.6 0-2.2ZM5.2 13 10 8.2l4.8 4.8H5.2ZM19 14.5s-2 2.2-2 3.5c0 1.1.9 2 2 2a2 2 0 0 0 2-2c0-1.3-2-3.5-2-3.5Z" fill-rule="nonzero"/></svg>',
-    'flip-horizontally': '<svg width="24" height="24"><path d="M14 19h2v-2h-2v2Zm4-8h2V9h-2v2ZM4 7v10c0 1.1.9 2 2 2h3v-2H6V7h3V5H6a2 2 0 0 0-2 2Zm14-2v2h2a2 2 0 0 0-2-2Zm-7 16h2V3h-2v18Zm7-6h2v-2h-2v2Zm-4-8h2V5h-2v2Zm4 12a2 2 0 0 0 2-2h-2v2Z" fill-rule="nonzero"/></svg>',
-    'flip-vertically': '<svg width="24" height="24"><path d="M5 14v2h2v-2H5Zm8 4v2h2v-2h-2Zm4-14H7a2 2 0 0 0-2 2v3h2V6h10v3h2V6a2 2 0 0 0-2-2Zm2 14h-2v2a2 2 0 0 0 2-2ZM3 11v2h18v-2H3Zm6 7v2h2v-2H9Zm8-4v2h2v-2h-2ZM5 18c0 1.1.9 2 2 2v-2H5Z" fill-rule="nonzero"/></svg>',
-    'footnote': '<svg width="24" height="24"><path d="M19 13c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 1 1 0-2h14Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M19 4v6h-1V5h-1.5V4h2.6Z"/><path d="M12 18c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 1 1 0-2h7ZM14 8c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 0 1 0-2h9Z"/></svg>',
-    'format-code': '<svg width="24" height="24"><path d="m10 22 2-7H6l9-13h2l-2 8h7L12 22h-2ZM6 2h7l-1.4 2H6V2Zm4.2 4H4v2h4.8l1.4-2Zm-2.7 4H2v2h4l1.5-2Z"/></svg>',
-    'format-painter': '<svg width="24" height="24"><path d="M18 5V4c0-.5-.4-1-1-1H5a1 1 0 0 0-1 1v4c0 .6.5 1 1 1h12c.6 0 1-.4 1-1V7h1v4H9v9c0 .6.4 1 1 1h2c.6 0 1-.4 1-1v-7h8V5h-3Z" fill-rule="nonzero"/></svg>',
-    'format': '<svg width="24" height="24"><path fill-rule="evenodd" d="M17 5a1 1 0 0 1 0 2h-4v11a1 1 0 0 1-2 0V7H7a1 1 0 1 1 0-2h10Z"/></svg>',
-    'fullscreen': '<svg width="24" height="24"><path d="m15.3 10-1.2-1.3 2.9-3h-2.3a.9.9 0 1 1 0-1.7H19c.5 0 .9.4.9.9v4.4a.9.9 0 1 1-1.8 0V7l-2.9 3Zm0 4 3 3v-2.3a.9.9 0 1 1 1.7 0V19c0 .5-.4.9-.9.9h-4.4a.9.9 0 1 1 0-1.8H17l-3-2.9 1.3-1.2ZM10 15.4l-2.9 3h2.3a.9.9 0 1 1 0 1.7H5a.9.9 0 0 1-.9-.9v-4.4a.9.9 0 1 1 1.8 0V17l2.9-3 1.2 1.3ZM8.7 10 5.7 7v2.3a.9.9 0 0 1-1.7 0V5c0-.5.4-.9.9-.9h4.4a.9.9 0 0 1 0 1.8H7l3 2.9-1.3 1.2Z" fill-rule="nonzero"/></svg>',
-    'gallery': '<svg width="24" height="24"><path fill-rule="nonzero" d="m5 15.7 2.3-2.2c.3-.3.7-.3 1 0L11 16l5.1-5c.3-.4.8-.4 1 0l2 1.9V8H5v7.7ZM5 18V19h3l1.8-1.9-2-2L5 17.9Zm14-3-2.5-2.4-6.4 6.5H19v-4ZM4 6h16c.6 0 1 .4 1 1v13c0 .6-.4 1-1 1H4a1 1 0 0 1-1-1V7c0-.6.4-1 1-1Zm6 7a2 2 0 1 1 0-4 2 2 0 0 1 0 4ZM4.5 4h15a.5.5 0 1 1 0 1h-15a.5.5 0 0 1 0-1Zm2-2h11a.5.5 0 1 1 0 1h-11a.5.5 0 0 1 0-1Z"/></svg>',
-    'gamma': '<svg width="24" height="24"><path d="M4 3h16c.6 0 1 .4 1 1v16c0 .6-.4 1-1 1H4a1 1 0 0 1-1-1V4c0-.6.4-1 1-1Zm1 2v14h14V5H5Zm6.5 11.8V14L9.2 8.7a5.1 5.1 0 0 0-.4-.8l-.1-.2H8v-1l.3-.1.3-.1h.7a1 1 0 0 1 .6.5l.1.3a8.5 8.5 0 0 1 .3.6l1.9 4.6 2-5.2a1 1 0 0 1 1-.6.5.5 0 0 1 .5.6L13 14v2.8a.7.7 0 0 1-1.4 0Z" fill-rule="nonzero"/></svg>',
-    'help': '<svg width="24" height="24"><g fill-rule="evenodd"><path d="M12 5.5a6.5 6.5 0 0 0-6 9 6.3 6.3 0 0 0 1.4 2l1 1a6.3 6.3 0 0 0 3.6 1 6.5 6.5 0 0 0 6-9 6.3 6.3 0 0 0-1.4-2l-1-1a6.3 6.3 0 0 0-3.6-1ZM12 4a7.8 7.8 0 0 1 5.7 2.3A8 8 0 1 1 12 4Z"/><path d="M9.6 9.7a.7.7 0 0 1-.7-.8c0-1.1 1.5-1.8 3.2-1.8 1.8 0 3.2.8 3.2 2.4 0 1.4-.4 2.1-1.5 2.8-.2 0-.3.1-.3.2a2 2 0 0 0-.8.8.8.8 0 0 1-1.4-.6c.3-.7.8-1 1.3-1.5l.4-.2c.7-.4.8-.6.8-1.5 0-.5-.6-.9-1.7-.9-.5 0-1 .1-1.4.3-.2 0-.3.1-.3.2v-.2c0 .4-.4.8-.8.8Z" fill-rule="nonzero"/><circle cx="12" cy="16" r="1"/></g></svg>',
-    'highlight-bg-color': '<svg width="24" height="24"><g fill-rule="evenodd"><path class="tox-icon-highlight-bg-color__color" d="M3 18h18v3H3z"/><path fill-rule="nonzero" d="M7.7 16.7H3l3.3-3.3-.7-.8L10.2 8l4 4.1-4 4.2c-.2.2-.6.2-.8 0l-.6-.7-1.1 1.1zm5-7.5L11 7.4l3-2.9a2 2 0 0 1 2.6 0L18 6c.7.7.7 2 0 2.7l-2.9 2.9-1.8-1.8-.5-.6"/></g></svg>',
-    'home': '<svg width="24" height="24"><path fill-rule="nonzero" d="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"/></svg>',
-    'horizontal-rule': '<svg width="24" height="24"><path d="M4 11h16v2H4z" fill-rule="evenodd"/></svg>',
-    'image-options': '<svg width="24" height="24"><path d="M6 10a2 2 0 0 0-2 2c0 1.1.9 2 2 2a2 2 0 0 0 2-2 2 2 0 0 0-2-2Zm12 0a2 2 0 0 0-2 2c0 1.1.9 2 2 2a2 2 0 0 0 2-2 2 2 0 0 0-2-2Zm-6 0a2 2 0 0 0-2 2c0 1.1.9 2 2 2a2 2 0 0 0 2-2 2 2 0 0 0-2-2Z" fill-rule="nonzero"/></svg>',
-    'image': '<svg width="24" height="24"><path d="m5 15.7 3.3-3.2c.3-.3.7-.3 1 0L12 15l4.1-4c.3-.4.8-.4 1 0l2 1.9V5H5v10.7ZM5 18V19h3l2.8-2.9-2-2L5 17.9Zm14-3-2.5-2.4-6.4 6.5H19v-4ZM4 3h16c.6 0 1 .4 1 1v16c0 .6-.4 1-1 1H4a1 1 0 0 1-1-1V4c0-.6.4-1 1-1Zm6 8a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z" fill-rule="nonzero"/></svg>',
-    'indent': '<svg width="24" height="24"><path d="M7 5h12c.6 0 1 .4 1 1s-.4 1-1 1H7a1 1 0 1 1 0-2Zm5 4h7c.6 0 1 .4 1 1s-.4 1-1 1h-7a1 1 0 0 1 0-2Zm0 4h7c.6 0 1 .4 1 1s-.4 1-1 1h-7a1 1 0 0 1 0-2Zm-5 4h12a1 1 0 0 1 0 2H7a1 1 0 0 1 0-2Zm-2.6-3.8L6.2 12l-1.8-1.2a1 1 0 0 1 1.2-1.6l3 2a1 1 0 0 1 0 1.6l-3 2a1 1 0 1 1-1.2-1.6Z" fill-rule="evenodd"/></svg>',
-    'info': '<svg width="24" height="24"><path d="M12 4a7.8 7.8 0 0 1 5.7 2.3A8 8 0 1 1 12 4Zm-1 3v2h2V7h-2Zm3 10v-1h-1v-5h-3v1h1v4h-1v1h4Z" fill-rule="evenodd"/></svg>',
-    'insert-character': '<svg width="24" height="24"><path d="M15 18h4l1-2v4h-6v-3.3l1.4-1a6 6 0 0 0 1.8-2.9 6.3 6.3 0 0 0-.1-4.1 5.8 5.8 0 0 0-3-3.2c-.6-.3-1.3-.5-2.1-.5a5.1 5.1 0 0 0-3.9 1.8 6.3 6.3 0 0 0-1.3 6 6.2 6.2 0 0 0 1.8 3l1.4.9V20H4v-4l1 2h4v-.5l-2-1L5.4 15A6.5 6.5 0 0 1 4 11c0-1 .2-1.9.6-2.7A7 7 0 0 1 6.3 6C7.1 5.4 8 5 9 4.5c1-.3 2-.5 3.1-.5a8.8 8.8 0 0 1 5.7 2 7 7 0 0 1 1.7 2.3 6 6 0 0 1 .2 4.8c-.2.7-.6 1.3-1 1.9a7.6 7.6 0 0 1-3.6 2.5v.5Z" fill-rule="evenodd"/></svg>',
-    'insert-time': '<svg width="24" height="24"><g fill-rule="nonzero"><path d="M12 19a7 7 0 1 0 0-14 7 7 0 0 0 0 14Zm0 2a9 9 0 1 1 0-18 9 9 0 0 1 0 18Z"/><path d="M16 12h-3V7c0-.6-.4-1-1-1a1 1 0 0 0-1 1v7h5c.6 0 1-.4 1-1s-.4-1-1-1Z"/></g></svg>',
-    'invert': '<svg width="24" height="24"><path d="M18 19.3 16.5 18a5.8 5.8 0 0 1-3.1 1.9 6.1 6.1 0 0 1-5.5-1.6A5.8 5.8 0 0 1 6 14v-.3l.1-1.2A13.9 13.9 0 0 1 7.7 9l-3-3 .7-.8 2.8 2.9 9 8.9 1.5 1.6-.7.6Zm0-5.5v.3l-.1 1.1-.4 1-1.2-1.2a4.3 4.3 0 0 0 .2-1v-.2c0-.4 0-.8-.2-1.3l-.5-1.4a14.8 14.8 0 0 0-3-4.2L12 6a26.1 26.1 0 0 0-2.2 2.5l-1-1a20.9 20.9 0 0 1 2.9-3.3L12 4l1 .8a22.2 22.2 0 0 1 4 5.4c.6 1.2 1 2.4 1 3.6Z" fill-rule="evenodd"/></svg>',
-    'italic': '<svg width="24" height="24"><path d="m16.7 4.7-.1.9h-.3c-.6 0-1 0-1.4.3-.3.3-.4.6-.5 1.1l-2.1 9.8v.6c0 .5.4.8 1.4.8h.2l-.2.8H8l.2-.8h.2c1.1 0 1.8-.5 2-1.5l2-9.8.1-.5c0-.6-.4-.8-1.4-.8h-.3l.2-.9h5.8Z" fill-rule="evenodd"/></svg>',
-    'language': '<svg width="24" height="24"><path d="M12 3a9 9 0 1 1 0 18 9 9 0 0 1 0-18Zm4.3 13.3c-.5 1-1.2 2-2 2.9a7.5 7.5 0 0 0 3.2-2.1l-.2-.2a6 6 0 0 0-1-.6Zm-8.6 0c-.5.2-.9.5-1.2.8.9 1 2 1.7 3.2 2a10 10 0 0 1-2-2.8Zm3.6-.8c-.8 0-1.6.1-2.2.3.5 1 1.2 1.9 2.1 2.7Zm1.5 0v3c.9-.8 1.6-1.7 2.1-2.7-.6-.2-1.4-.3-2.1-.3Zm-6-2.7H4.5c.2 1 .5 2.1 1 3h.3l1.3-1a10 10 0 0 1-.3-2Zm12.7 0h-2.3c0 .7-.1 1.4-.3 2l1.6 1.1c.5-1 .9-2 1-3.1Zm-3.8 0h-3V14c1 0 2 .1 2.7.4.2-.5.3-1 .3-1.6Zm-4.4 0h-3l.3 1.6c.8-.3 1.7-.4 2.7-.4v-1.3Zm-5.5-5c-.7 1-1.1 2.2-1.3 3.5h2.3c0-1 .2-1.8.5-2.6l-1.5-1Zm2.9 1.4v.1c-.2.6-.4 1.3-.4 2h3V9.4c-1 0-1.8-.1-2.6-.3Zm6.6 0h-.1l-2.4.3v1.8h3l-.5-2.1Zm3-1.4-.3.1-1.3.8c.3.8.5 1.6.5 2.6h2.3a7.5 7.5 0 0 0-1.3-3.5Zm-9 0 2 .2V5.5a9 9 0 0 0-2 2.2Zm3.5-2.3V8c.6 0 1.3 0 1.9-.2a9 9 0 0 0-2-2.3Zm-3-.7h-.1c-1.1.4-2.1 1-3 1.8l1.2.7a10 10 0 0 1 1.9-2.5Zm4.4 0 .1.1a10 10 0 0 1 1.8 2.4l1.1-.7a7.5 7.5 0 0 0-3-1.8Z"/></svg>',
-    'line-height': '<svg width="24" height="24"><path d="M21 5a1 1 0 0 1 .1 2H13a1 1 0 0 1-.1-2H21zm0 4a1 1 0 0 1 .1 2H13a1 1 0 0 1-.1-2H21zm0 4a1 1 0 0 1 .1 2H13a1 1 0 0 1-.1-2H21zm0 4a1 1 0 0 1 .1 2H13a1 1 0 0 1-.1-2H21zM7 3.6l3.7 3.7a1 1 0 0 1-1.3 1.5h-.1L8 7.3v9.2l1.3-1.3a1 1 0 0 1 1.3 0h.1c.4.4.4 1 0 1.3v.1L7 20.4l-3.7-3.7a1 1 0 0 1 1.3-1.5h.1L6 16.7V7.4L4.7 8.7a1 1 0 0 1-1.3 0h-.1a1 1 0 0 1 0-1.3v-.1L7 3.6z"/></svg>',
-    'line': '<svg width="24" height="24"><path d="m15 9-8 8H4v-3l8-8 3 3Zm1-1-3-3 1-1h1c-.2 0 0 0 0 0l2 2s0 .2 0 0v1l-1 1ZM4 18h16v2H4v-2Z" fill-rule="evenodd"/></svg>',
-    'link': '<svg width="24" height="24"><path d="M6.2 12.3a1 1 0 0 1 1.4 1.4l-2 2a2 2 0 1 0 2.6 2.8l4.8-4.8a1 1 0 0 0 0-1.4 1 1 0 1 1 1.4-1.3 2.9 2.9 0 0 1 0 4L9.6 20a3.9 3.9 0 0 1-5.5-5.5l2-2Zm11.6-.6a1 1 0 0 1-1.4-1.4l2-2a2 2 0 1 0-2.6-2.8L11 10.3a1 1 0 0 0 0 1.4A1 1 0 1 1 9.6 13a2.9 2.9 0 0 1 0-4L14.4 4a3.9 3.9 0 0 1 5.5 5.5l-2 2Z" fill-rule="nonzero"/></svg>',
-    'list-bull-circle': '<svg width="48" height="48"><g fill-rule="evenodd"><path d="M11 16a2 2 0 1 0 0-4 2 2 0 0 0 0 4Zm0 1a3 3 0 1 1 0-6 3 3 0 0 1 0 6ZM11 26a2 2 0 1 0 0-4 2 2 0 0 0 0 4Zm0 1a3 3 0 1 1 0-6 3 3 0 0 1 0 6ZM11 36a2 2 0 1 0 0-4 2 2 0 0 0 0 4Zm0 1a3 3 0 1 1 0-6 3 3 0 0 1 0 6Z" fill-rule="nonzero"/><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/></g></svg>',
-    'list-bull-default': '<svg width="48" height="48"><g fill-rule="evenodd"><circle cx="11" cy="14" r="3"/><circle cx="11" cy="24" r="3"/><circle cx="11" cy="34" r="3"/><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/></g></svg>',
-    'list-bull-square': '<svg width="48" height="48"><g fill-rule="evenodd"><path d="M8 11h6v6H8zM8 21h6v6H8zM8 31h6v6H8z"/><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/></g></svg>',
-    'list-num-default-rtl': '<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M8 12h22v4H8zM8 22h22v4H8zM8 32h22v4H8z"/><path d="M37.4 17v-4.8h-.1l-1.5 1v-1.1l1.6-1.1h1.2v6zM33.3 17.1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zm1.7 5.7c0-1.2 1-2 2.2-2 1.3 0 2.1.8 2.1 1.8 0 .7-.3 1.2-1.3 2.2l-1.2 1v.2h2.6v1h-4.3v-.9l2-1.9c.8-.8 1-1.1 1-1.5 0-.5-.4-.8-1-.8-.5 0-.9.3-.9.9H35zm-1.7 4.3c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7zm3.2 7.3v-1h.7c.6 0 1-.3 1-.8 0-.4-.4-.7-1-.7s-1 .3-1 .8H35c0-1.1 1-1.8 2.2-1.8 1.2 0 2.1.6 2.1 1.6 0 .7-.4 1.2-1 1.3v.1c.7.1 1.3.7 1.3 1.4 0 1-1 1.9-2.4 1.9-1.3 0-2.2-.8-2.3-2h1.2c0 .6.5 1 1.1 1 .6 0 1-.4 1-1 0-.5-.3-.8-1-.8h-.7zm-3.3 2.7c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .8.3.8.7 0 .4-.3.7-.8.7z"/></g></svg>',
-    'list-num-default': '<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/><path d="M10 17v-4.8l-1.5 1v-1.1l1.6-1h1.2V17h-1.2Zm3.6.1c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .7.3.7.7 0 .4-.2.7-.7.7Zm-5 5.7c0-1.2.8-2 2.1-2s2.1.8 2.1 1.8c0 .7-.3 1.2-1.4 2.2l-1.1 1v.2h2.6v1H8.6v-.9l2-1.9c.8-.8 1-1.1 1-1.5 0-.5-.4-.8-1-.8-.5 0-.9.3-.9.9H8.5Zm6.3 4.3c-.5 0-.7-.3-.7-.7 0-.4.2-.7.7-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7ZM10 34.4v-1h.7c.6 0 1-.3 1-.8 0-.4-.4-.7-1-.7s-1 .3-1 .8H8.6c0-1.1 1-1.8 2.2-1.8 1.3 0 2.1.6 2.1 1.6 0 .7-.4 1.2-1 1.3v.1c.8.1 1.3.7 1.3 1.4 0 1-1 1.9-2.4 1.9-1.3 0-2.2-.8-2.3-2h1.2c0 .6.5 1 1.1 1 .7 0 1-.4 1-1 0-.5-.3-.8-1-.8h-.7Zm4.7 2.7c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .8.3.8.7 0 .4-.3.7-.8.7Z"/></g></svg>',
-    'list-num-lower-alpha-rtl': '<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M8 12h22v4H8zM8 22h22v4H8zM8 32h22v4H8z"/><path d="M36.5 16c-.9 0-1.5-.5-1.5-1.3s.6-1.3 1.8-1.4h1v-.4c0-.4-.2-.6-.7-.6-.4 0-.7.1-.8.4h-1.1c0-.8.8-1.4 2-1.4S39 12 39 13V16h-1.2v-.6c-.3.4-.8.7-1.4.7Zm.4-.8c.6 0 1-.4 1-.9V14h-1c-.5.1-.7.3-.7.6 0 .4.3.6.7.6ZM33.1 16.1c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .8.3.8.7 0 .4-.3.7-.8.7ZM37.7 26c-.7 0-1.2-.2-1.5-.7v.7H35v-6.3h1.2v2.5c.3-.5.8-.9 1.5-.9 1.1 0 1.8 1 1.8 2.4 0 1.5-.7 2.4-1.8 2.4Zm-.5-3.6c-.6 0-1 .5-1 1.3s.4 1.4 1 1.4c.7 0 1-.6 1-1.4 0-.8-.3-1.3-1-1.3ZM33.2 26.1c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .8.3.8.7 0 .4-.3.7-.8.7zm6 7h-1c-.1-.5-.4-.8-1-.8s-1 .5-1 1.4c0 1 .4 1.4 1 1.4.5 0 .9-.2 1-.7h1c0 1-.8 1.7-2 1.7-1.4 0-2.2-.9-2.2-2.4s.8-2.4 2.2-2.4c1.2 0 2 .7 2 1.7zm-6.1 3c-.5 0-.7-.3-.7-.7 0-.4.2-.7.7-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7z"/></g></svg>',
-    'list-num-lower-alpha': '<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/><path d="M10.3 15.2c.5 0 1-.4 1-.9V14h-1c-.5.1-.8.3-.8.6 0 .4.3.6.8.6Zm-.4.9c-1 0-1.5-.6-1.5-1.4 0-.8.6-1.3 1.7-1.4h1.1v-.4c0-.4-.2-.6-.7-.6-.5 0-.8.1-.9.4h-1c0-.8.8-1.4 2-1.4 1.1 0 1.8.6 1.8 1.6V16h-1.1v-.6h-.1c-.2.4-.7.7-1.3.7Zm4.6 0c-.5 0-.7-.3-.7-.7 0-.4.2-.7.7-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7Zm-3.2 10c-.6 0-1.2-.3-1.4-.8v.7H8.5v-6.3H10v2.5c.3-.5.8-.9 1.4-.9 1.2 0 1.9 1 1.9 2.4 0 1.5-.7 2.4-1.9 2.4Zm-.4-3.7c-.7 0-1 .5-1 1.3s.3 1.4 1 1.4c.6 0 1-.6 1-1.4 0-.8-.4-1.3-1-1.3Zm4 3.7c-.5 0-.7-.3-.7-.7 0-.4.2-.7.7-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7Zm-2.2 7h-1.2c0-.5-.4-.8-.9-.8-.6 0-1 .5-1 1.4 0 1 .4 1.4 1 1.4.5 0 .8-.2 1-.7h1c0 1-.8 1.7-2 1.7-1.4 0-2.2-.9-2.2-2.4s.8-2.4 2.2-2.4c1.2 0 2 .7 2 1.7Zm1.8 3c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7Z"/></g></svg>',
-    'list-num-lower-greek-rtl': '<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M8 12h22v4H8zM8 22h22v4H8zM8 32h22v4H8z"/><path d="M37.4 16c-1.2 0-2-.8-2-2.3 0-1.5.8-2.4 2-2.4.6 0 1 .4 1.3 1v-.9H40v3.2c0 .4.1.5.4.5h.2v.9h-.6c-.6 0-1-.2-1-.7h-.2c-.2.4-.7.8-1.3.8Zm.3-1c.6 0 1-.5 1-1.3s-.4-1.3-1-1.3-1 .5-1 1.3.4 1.4 1 1.4ZM33.3 16.1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7ZM36 21.9c0-1.5.8-2.3 2.1-2.3 1.2 0 2 .6 2 1.6 0 .6-.3 1-.9 1.3.9.3 1.3.8 1.3 1.7 0 1.2-.7 1.9-1.8 1.9-.6 0-1.1-.3-1.4-.8v2.2H36V22Zm1.8 1.2v-1h.3c.5 0 .9-.2.9-.7 0-.5-.3-.8-.9-.8-.5 0-.8.3-.8 1v2.2c0 .8.4 1.3 1 1.3s1-.4 1-1-.4-1-1.2-1h-.3ZM33.3 26.1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7ZM37.1 34.6 34.8 30h1.4l1.7 3.5 1.7-3.5h1.1l-2.2 4.6v.1c.5.8.7 1.4.7 1.8 0 .4-.2.8-.4 1-.2.2-.6.3-1 .3-.9 0-1.3-.4-1.3-1.2 0-.5.2-1 .5-1.7l.1-.2Zm.7 1a2 2 0 0 0-.4.9c0 .3.1.4.4.4.3 0 .4-.1.4-.4 0-.2-.1-.6-.4-1ZM33.3 36.1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7Z"/></g></svg>',
-    'list-num-lower-greek': '<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/><path d="M10.5 15c.7 0 1-.5 1-1.3s-.3-1.3-1-1.3c-.5 0-.9.5-.9 1.3s.4 1.4 1 1.4Zm-.3 1c-1.1 0-1.8-.8-1.8-2.3 0-1.5.7-2.4 1.8-2.4.7 0 1.1.4 1.3 1h.1v-.9h1.2v3.2c0 .4.1.5.4.5h.2v.9h-.6c-.6 0-1-.2-1.1-.7h-.1c-.2.4-.7.8-1.4.8Zm5 .1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.7-.7.5 0 .8.3.8.7 0 .4-.3.7-.8.7Zm-4.9 7v-1h.3c.6 0 1-.2 1-.7 0-.5-.4-.8-1-.8-.5 0-.8.3-.8 1v2.2c0 .8.4 1.3 1.1 1.3.6 0 1-.4 1-1s-.5-1-1.3-1h-.3ZM8.6 22c0-1.5.7-2.3 2-2.3 1.2 0 2 .6 2 1.6 0 .6-.3 1-.8 1.3.8.3 1.3.8 1.3 1.7 0 1.2-.8 1.9-1.9 1.9-.6 0-1.1-.3-1.3-.8v2.2H8.5V22Zm6.2 4.2c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .7.3.7.7 0 .4-.2.7-.7.7Zm-4.5 8.5L8 30h1.4l1.7 3.5 1.7-3.5h1.1l-2.2 4.6v.1c.5.8.7 1.4.7 1.8 0 .4-.1.8-.4 1-.2.2-.6.3-1 .3-.9 0-1.3-.4-1.3-1.2 0-.5.2-1 .5-1.7l.1-.2Zm.7 1a2 2 0 0 0-.4.9c0 .3.1.4.4.4.3 0 .4-.1.4-.4 0-.2-.1-.6-.4-1Zm4.5.5c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7Z"/></g></svg>',
-    'list-num-lower-roman-rtl': '<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M8 12h22v4H8zM8 22h22v4H8zM8 32h22v4H8z"/><path d="M32.9 16v-1.2h-1.3V16H33Zm0 10v-1.2h-1.3V26H33Zm0 10v-1.2h-1.3V36H33Z"/><path fill-rule="nonzero" d="M36 21h-1.5v5H36zM36 31h-1.5v5H36zM39 21h-1.5v5H39zM39 31h-1.5v5H39zM42 31h-1.5v5H42zM36 11h-1.5v5H36zM36 19h-1.5v1H36zM36 29h-1.5v1H36zM39 19h-1.5v1H39zM39 29h-1.5v1H39zM42 29h-1.5v1H42zM36 9h-1.5v1H36z"/></g></svg>',
-    'list-num-lower-roman': '<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/><path d="M15.1 16v-1.2h1.3V16H15Zm0 10v-1.2h1.3V26H15Zm0 10v-1.2h1.3V36H15Z"/><path fill-rule="nonzero" d="M12 21h1.5v5H12zM12 31h1.5v5H12zM9 21h1.5v5H9zM9 31h1.5v5H9zM6 31h1.5v5H6zM12 11h1.5v5H12zM12 19h1.5v1H12zM12 29h1.5v1H12zM9 19h1.5v1H9zM9 29h1.5v1H9zM6 29h1.5v1H6zM12 9h1.5v1H12z"/></g></svg>',
-    'list-num-upper-alpha-rtl': '<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M8 12h22v4H8zM8 22h22v4H8zM8 32h22v4H8z"/><path d="m39.3 17-.5-1.4h-2l-.5 1.4H35l2-6h1.6l2 6h-1.3Zm-1.6-4.7-.7 2.3h1.6l-.8-2.3ZM33.4 17c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .7.3.7.7 0 .4-.2.7-.7.7Zm4.7 9.9h-2.7v-6H38c1.2 0 1.9.6 1.9 1.5 0 .6-.5 1.2-1 1.3.7.1 1.3.7 1.3 1.5 0 1-.8 1.7-2 1.7Zm-1.4-5v1.5h1c.6 0 1-.3 1-.8 0-.4-.4-.7-1-.7h-1Zm0 4h1.1c.7 0 1.1-.3 1.1-.8 0-.6-.4-.9-1.1-.9h-1.1V26ZM33 27.1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7Zm4.9 10c-1.8 0-2.8-1.1-2.8-3.1s1-3.1 2.8-3.1c1.4 0 2.5.9 2.6 2.2h-1.3c0-.7-.6-1.1-1.3-1.1-1 0-1.6.7-1.6 2s.6 2 1.6 2c.7 0 1.2-.4 1.4-1h1.2c-.1 1.3-1.2 2.2-2.6 2.2Zm-4.5 0c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7Z"/></g></svg>',
-    'list-num-upper-alpha': '<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/><path d="m12.6 17-.5-1.4h-2L9.5 17H8.3l2-6H12l2 6h-1.3ZM11 12.3l-.7 2.3h1.6l-.8-2.3Zm4.7 4.8c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7.5 0 .7.3.7.7 0 .4-.2.7-.7.7ZM11.4 27H8.7v-6h2.6c1.2 0 1.9.6 1.9 1.5 0 .6-.5 1.2-1 1.3.7.1 1.3.7 1.3 1.5 0 1-.8 1.7-2 1.7ZM10 22v1.5h1c.6 0 1-.3 1-.8 0-.4-.4-.7-1-.7h-1Zm0 4H11c.7 0 1.1-.3 1.1-.8 0-.6-.4-.9-1.1-.9H10V26Zm5.4 1.1c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7Zm-4.1 10c-1.8 0-2.8-1.1-2.8-3.1s1-3.1 2.8-3.1c1.4 0 2.5.9 2.6 2.2h-1.3c0-.7-.6-1.1-1.3-1.1-1 0-1.6.7-1.6 2s.6 2 1.6 2c.7 0 1.2-.4 1.4-1h1.2c-.1 1.3-1.2 2.2-2.6 2.2Zm4.5 0c-.5 0-.8-.3-.8-.7 0-.4.3-.7.8-.7.4 0 .7.3.7.7 0 .4-.3.7-.7.7Z"/></g></svg>',
-    'list-num-upper-roman-rtl': '<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M8 12h22v4H8zM8 22h22v4H8zM8 32h22v4H8z"/><path d="M31.6 17v-1.2H33V17h-1.3Zm0 10v-1.2H33V27h-1.3Zm0 10v-1.2H33V37h-1.3Z"/><path fill-rule="nonzero" d="M34.5 20H36v7h-1.5zM34.5 30H36v7h-1.5zM37.5 20H39v7h-1.5zM37.5 30H39v7h-1.5zM40.5 30H42v7h-1.5zM34.5 10H36v7h-1.5z"/></g></svg>',
-    'list-num-upper-roman': '<svg width="48" height="48"><g fill-rule="evenodd"><path opacity=".2" d="M18 12h22v4H18zM18 22h22v4H18zM18 32h22v4H18z"/><path d="M15.1 17v-1.2h1.3V17H15Zm0 10v-1.2h1.3V27H15Zm0 10v-1.2h1.3V37H15Z"/><path fill-rule="nonzero" d="M12 20h1.5v7H12zM12 30h1.5v7H12zM9 20h1.5v7H9zM9 30h1.5v7H9zM6 30h1.5v7H6zM12 10h1.5v7H12z"/></g></svg>',
-    'lock': '<svg width="24" height="24"><path d="M16.3 11c.2 0 .3 0 .5.2l.2.6v7.4c0 .3 0 .4-.2.6l-.6.2H7.8c-.3 0-.4 0-.6-.2a.7.7 0 0 1-.2-.6v-7.4c0-.3 0-.4.2-.6l.5-.2H8V8c0-.8.3-1.5.9-2.1.6-.6 1.3-.9 2.1-.9h2c.8 0 1.5.3 2.1.9.6.6.9 1.3.9 2.1v3h.3ZM10 8v3h4V8a1 1 0 0 0-.3-.7A1 1 0 0 0 13 7h-2a1 1 0 0 0-.7.3 1 1 0 0 0-.3.7Z" fill-rule="evenodd"/></svg>',
-    'ltr': '<svg width="24" height="24"><path d="M11 5h7a1 1 0 0 1 0 2h-1v11a1 1 0 0 1-2 0V7h-2v11a1 1 0 0 1-2 0v-6c-.5 0-1 0-1.4-.3A3.4 3.4 0 0 1 7.8 10a3.3 3.3 0 0 1 0-2.8 3.4 3.4 0 0 1 1.8-1.8L11 5ZM4.4 16.2 6.2 15l-1.8-1.2a1 1 0 0 1 1.2-1.6l3 2a1 1 0 0 1 0 1.6l-3 2a1 1 0 1 1-1.2-1.6Z" fill-rule="evenodd"/></svg>',
-    'math-equation': '<svg width="24" height="24"><path fill-rule="evenodd" clip-rule="evenodd" d="M9 4.8c.1-.5.5-.8 1-.8h10a1 1 0 1 1 0 2h-9.2L8.3 19.2a1 1 0 0 1-1.7.4l-3.4-4.2a1 1 0 0 1 1.6-1.2l2 2.5L9 4.8Zm9.7 5.5c.4.4.4 1 0 1.4L17 13.5l1.8 1.8a1 1 0 1 1-1.4 1.4L15.5 15l-1.8 1.8a1 1 0 0 1-1.4-1.4l1.8-1.8-1.8-1.8a1 1 0 0 1 1.4-1.4l1.8 1.8 1.8-1.8a1 1 0 0 1 1.4 0Z"/></svg>',
-    'mentions': '<svg height="24" width="24"><path d="M12 21a8.8 8.8 0 0 1-3.5-.7 9 9 0 0 1-2.9-2 9 9 0 0 1-1.9-2.8A8.8 8.8 0 0 1 3 12c0-1.3.2-2.4.7-3.5a9 9 0 0 1 4.8-4.8A8.8 8.8 0 0 1 12 3c1.3 0 2.4.2 3.5.7a9.1 9.1 0 0 1 4.8 4.8A8.7 8.7 0 0 1 21 12v1.4a3 3 0 0 1-.9 2.2 3 3 0 0 1-2.2.9c-.5 0-1-.1-1.5-.4a3.8 3.8 0 0 1-1.1-1 4.8 4.8 0 0 1-1.5 1 4.3 4.3 0 0 1-1.8.4c-1.2 0-2.3-.4-3.2-1.3-.9-.9-1.3-2-1.3-3.2s.4-2.3 1.3-3.2c.9-.9 2-1.3 3.2-1.3s2.3.4 3.2 1.3c.9.9 1.3 2 1.3 3.2v1.4c0 .4.1.7.4 1 .3.3.6.4 1 .4s.7-.1 1-.4c.3-.3.4-.6.4-1V12c0-2-.7-3.8-2.1-5.2S14 4.7 12 4.7s-3.8.7-5.2 2.1S4.7 10 4.7 12s.7 3.8 2.1 5.2 3.2 2.1 5.2 2.1h4.5V21zm0-6.2c.8 0 1.4-.3 2-.8a2.7 2.7 0 0 0 .8-2c0-.8-.3-1.4-.8-2a2.7 2.7 0 0 0-2-.8c-.8 0-1.4.3-2 .8a2.7 2.7 0 0 0-.8 2c0 .8.3 1.4.8 2a2.7 2.7 0 0 0 2 .8z"/></svg>',
-    'minus': '<svg width="24" height="24"><path d="M19 11a1 1 0 0 1 .1 2H5a1 1 0 0 1-.1-2H19Z"/></svg>',
-    'more-drawer': '<svg width="24" height="24"><path d="M6 10a2 2 0 0 0-2 2c0 1.1.9 2 2 2a2 2 0 0 0 2-2 2 2 0 0 0-2-2Zm12 0a2 2 0 0 0-2 2c0 1.1.9 2 2 2a2 2 0 0 0 2-2 2 2 0 0 0-2-2Zm-6 0a2 2 0 0 0-2 2c0 1.1.9 2 2 2a2 2 0 0 0 2-2 2 2 0 0 0-2-2Z" fill-rule="nonzero"/></svg>',
-    'new-document': '<svg width="24" height="24"><path d="M14.4 3H7a2 2 0 0 0-2 2v14c0 1.1.9 2 2 2h10a2 2 0 0 0 2-2V7.6L14.4 3ZM17 19H7V5h6v4h4v10Z" fill-rule="nonzero"/></svg>',
-    'new-tab': '<svg width="24" height="24"><path d="m15 13 2-2v8H5V7h8l-2 2H7v8h8v-4Zm4-8v5.5l-2-2-5.6 5.5H10v-1.4L15.5 7l-2-2H19Z" fill-rule="evenodd"/></svg>',
-    'non-breaking': '<svg width="24" height="24"><path d="M11 11H8a1 1 0 1 1 0-2h3V6c0-.6.4-1 1-1s1 .4 1 1v3h3c.6 0 1 .4 1 1s-.4 1-1 1h-3v3c0 .6-.4 1-1 1a1 1 0 0 1-1-1v-3Zm10 4v5H3v-5c0-.6.4-1 1-1s1 .4 1 1v3h14v-3c0-.6.4-1 1-1s1 .4 1 1Z" fill-rule="evenodd"/></svg>',
-    'notice': '<svg width="24" height="24"><path d="M15.5 4 20 8.5v7L15.5 20h-7L4 15.5v-7L8.5 4h7ZM13 17v-2h-2v2h2Zm0-4V7h-2v6h2Z" fill-rule="evenodd" clip-rule="evenodd"/></svg>',
-    'ordered-list-rtl': '<svg width="24" height="24"><path d="M6 17h8a1 1 0 0 1 0 2H6a1 1 0 0 1 0-2Zm0-6h8a1 1 0 0 1 0 2H6a1 1 0 0 1 0-2Zm0-6h8a1 1 0 0 1 0 2H6a1 1 0 1 1 0-2Zm13-1v3.5a.5.5 0 1 1-1 0V5h-.5a.5.5 0 1 1 0-1H19Zm-1 8.8.2.2h1.3a.5.5 0 1 1 0 1h-1.6a1 1 0 0 1-.9-1V13c0-.4.3-.8.6-1l1.2-.4.2-.3a.2.2 0 0 0-.2-.2h-1.3a.5.5 0 0 1-.5-.5c0-.3.2-.5.5-.5h1.6c.5 0 .9.4.9 1v.1c0 .4-.3.8-.6 1l-1.2.4-.2.3Zm2 4.2v2c0 .6-.4 1-1 1h-1.5a.5.5 0 0 1 0-1h1.2a.3.3 0 1 0 0-.6h-1.3a.4.4 0 1 1 0-.8h1.3a.3.3 0 0 0 0-.6h-1.2a.5.5 0 1 1 0-1H19c.6 0 1 .4 1 1Z" fill-rule="evenodd"/></svg>',
-    'ordered-list': '<svg width="24" height="24"><path d="M10 17h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 0 1 0-2Zm0-6h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 0 1 0-2Zm0-6h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 1 1 0-2ZM6 4v3.5c0 .3-.2.5-.5.5a.5.5 0 0 1-.5-.5V5h-.5a.5.5 0 0 1 0-1H6Zm-1 8.8.2.2h1.3c.3 0 .5.2.5.5s-.2.5-.5.5H4.9a1 1 0 0 1-.9-1V13c0-.4.3-.8.6-1l1.2-.4.2-.3a.2.2 0 0 0-.2-.2H4.5a.5.5 0 0 1-.5-.5c0-.3.2-.5.5-.5h1.6c.5 0 .9.4.9 1v.1c0 .4-.3.8-.6 1l-1.2.4-.2.3ZM7 17v2c0 .6-.4 1-1 1H4.5a.5.5 0 0 1 0-1h1.2c.2 0 .3-.1.3-.3 0-.2-.1-.3-.3-.3H4.4a.4.4 0 1 1 0-.8h1.3c.2 0 .3-.1.3-.3 0-.2-.1-.3-.3-.3H4.5a.5.5 0 1 1 0-1H6c.6 0 1 .4 1 1Z" fill-rule="evenodd"/></svg>',
-    'orientation': '<svg width="24" height="24"><path d="M7.3 6.4 1 13l6.4 6.5 6.5-6.5-6.5-6.5ZM3.7 13l3.6-3.7L11 13l-3.7 3.7-3.6-3.7ZM12 6l2.8 2.7c.3.3.3.8 0 1-.3.4-.9.4-1.2 0L9.2 5.7a.8.8 0 0 1 0-1.2L13.6.2c.3-.3.9-.3 1.2 0 .3.3.3.8 0 1.1L12 4h1a9 9 0 1 1-4.3 16.9l1.5-1.5A7 7 0 1 0 13 6h-1Z" fill-rule="nonzero"/></svg>',
-    'outdent': '<svg width="24" height="24"><path d="M7 5h12c.6 0 1 .4 1 1s-.4 1-1 1H7a1 1 0 1 1 0-2Zm5 4h7c.6 0 1 .4 1 1s-.4 1-1 1h-7a1 1 0 0 1 0-2Zm0 4h7c.6 0 1 .4 1 1s-.4 1-1 1h-7a1 1 0 0 1 0-2Zm-5 4h12a1 1 0 0 1 0 2H7a1 1 0 0 1 0-2Zm1.6-3.8a1 1 0 0 1-1.2 1.6l-3-2a1 1 0 0 1 0-1.6l3-2a1 1 0 0 1 1.2 1.6L6.8 12l1.8 1.2Z" fill-rule="evenodd"/></svg>',
-    'export-pdf': '<svg width="24" height="24"><path fill-rule="evenodd" clip-rule="evenodd" d="M7 3h7.4L19 7.6V17h-2V9h-4V5H7v3H5V5c0-1.1.9-2 2-2Z"/><path d="M2.6 15.2v-1.9h1c.6 0 1-.2 1.4-.5.3-.3.5-.7.5-1.2s-.2-.9-.5-1.2a2 2 0 0 0-1.3-.4H1v5.2h1.6Zm.4-3h-.4v-1.1h.5l.6.1.2.5c0 .1 0 .3-.2.4l-.7.1Zm5.7 3 1-.1c.3 0 .5-.2.7-.4l.5-.8c.2-.3.2-.7.2-1.3v-1l-.5-.8c-.2-.3-.4-.5-.7-.6L8.7 10H6.3v5.2h2.4Zm-.4-1.1H8v-3h.4c.5 0 .8.2 1 .4l.2 1.1-.1 1-.3.3-.8.2Zm5.3 1.2V13h2v-1h-2v-1H16V10h-4v5.2h1.6Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M15 17a1 1 0 1 0-2 0v3.1l-1.4-1a1 1 0 1 0-1.2 1.7l3.6 2.4 3.6-2.4a1 1 0 0 0-1.2-1.6l-1.4 1V17Z"/></svg>',
-    'export-word': '<svg width="24" height="24"><path d="M9.5 7A1.5 1.5 0 0 1 11 8.4v7.1A1.5 1.5 0 0 1 9.6 17H2.5A1.5 1.5 0 0 1 1 15.6V8.5A1.5 1.5 0 0 1 2.4 7h7.1Zm-1 2.8-1 2.6-1-2.5v-.1a.6.6 0 0 0-1 0l-.1.1-.9 2.5-1-2.5v-.1a.6.6 0 0 0-1 .4v.1l1.5 4v.1a.6.6 0 0 0 1 0v-.1l1-2.5.9 2.5v.1a.6.6 0 0 0 1 0H8l1.6-4v-.2a.6.6 0 0 0-1.1-.4Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M7 3h7.4L19 7.6V17h-2V9h-4V5H5c0-1.1.9-2 2-2ZM15 17a1 1 0 1 0-2 0v3.1l-1.4-1a1 1 0 1 0-1.2 1.7l3.6 2.4 3.6-2.4a1 1 0 0 0-1.2-1.6l-1.4 1V17Z"/></svg>',
-    'import-word': '<svg width="24" height="24"><path fill-rule="evenodd" clip-rule="evenodd" d="M7 3h7.4L19 7.6V15h-2V9h-4V5H5c0-1.1.9-2 2-2Z"/><path d="M9.5 7A1.5 1.5 0 0 1 11 8.4v7.1A1.5 1.5 0 0 1 9.6 17H2.5A1.5 1.5 0 0 1 1 15.6V8.5A1.5 1.5 0 0 1 2.4 7h7.1Zm-1 2.8-1 2.6-1-2.5v-.1a.6.6 0 0 0-1 0l-.1.1-.9 2.5-1-2.5v-.1a.6.6 0 0 0-1 .4v.1l1.5 4v.1a.6.6 0 0 0 1 0v-.1l1-2.5.9 2.5v.1a.6.6 0 0 0 1 0H8l1.6-4v-.2a.6.6 0 0 0-1.1-.4Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M11.4 18.2a1 1 0 0 0 1.2 1.6l1.4-1V22a1 1 0 1 0 2 0v-3.1l1.4 1a1 1 0 0 0 1.2-1.7L15 15.8l-3.6 2.4Z"/></svg>',
-    'page-break': '<svg width="24" height="24"><g fill-rule="evenodd"><path d="M5 11c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 0 1 0-2Zm3 0h1c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 0 1 0-2Zm4 0c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 0 1 0-2Zm3 0h1c.6 0 1 .4 1 1s-.4 1-1 1h-1a1 1 0 0 1 0-2Zm4 0c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 0 1 0-2ZM7 3v5h10V3c0-.6.4-1 1-1s1 .4 1 1v7H5V3c0-.6.4-1 1-1s1 .4 1 1ZM6 22a1 1 0 0 1-1-1v-7h14v7c0 .6-.4 1-1 1a1 1 0 0 1-1-1v-5H7v5c0 .6-.4 1-1 1Z"/></g></svg>',
-    'paragraph': '<svg width="24" height="24"><path fill-rule="evenodd" d="M10 5h7a1 1 0 0 1 0 2h-1v11a1 1 0 0 1-2 0V7h-2v11a1 1 0 0 1-2 0v-6c-.5 0-1 0-1.4-.3A3.4 3.4 0 0 1 6.8 10a3.3 3.3 0 0 1 0-2.8 3.4 3.4 0 0 1 1.8-1.8L10 5Z"/></svg>',
-    'paste-column-after': '<svg width="24" height="24"><path fill-rule="evenodd" d="M12 1a3 3 0 0 1 2.8 2H18c1 0 2 .8 2 1.9V7h-2V5h-2v1c0 .6-.4 1-1 1H9a1 1 0 0 1-1-1V5H6v13h7v2H6c-1 0-2-.8-2-1.9V5c0-1 .8-2 1.9-2H9.2A3 3 0 0 1 12 1Zm8 7v12h-6V8h6Zm-1.5 1.5h-3v9h3v-9ZM12 3a1 1 0 1 0 0 2 1 1 0 0 0 0-2Z"/></svg>',
-    'paste-column-before': '<svg width="24" height="24"><path fill-rule="evenodd" d="M12 1a3 3 0 0 1 2.8 2H18c1 0 2 .8 2 1.9V18c0 1-.8 2-1.9 2H11v-2h7V5h-2v1c0 .6-.4 1-1 1H9a1 1 0 0 1-1-1V5H6v2H4V5c0-1 .8-2 1.9-2H9.2A3 3 0 0 1 12 1Zm-2 7v12H4V8h6ZM8.5 9.5h-3v9h3v-9ZM12 3a1 1 0 1 0 0 2 1 1 0 0 0 0-2Z"/></svg>',
-    'paste-row-after': '<svg width="24" height="24"><path fill-rule="evenodd" d="M12 1a3 3 0 0 1 2.8 2H18c1 0 2 .8 2 1.9V11h-2V5h-2v1c0 .6-.4 1-1 1H9a1 1 0 0 1-1-1V5H6v13h14c0 1-.8 2-1.9 2H6c-1 0-2-.8-2-1.9V5c0-1 .8-2 1.9-2H9.2A3 3 0 0 1 12 1Zm10 11v5H8v-5h14Zm-1.5 1.5h-11v2h11v-2ZM12 3a1 1 0 1 0 0 2 1 1 0 0 0 0-2Z"/></svg>',
-    'paste-row-before': '<svg width="24" height="24"><path fill-rule="evenodd" d="M12 1a3 3 0 0 1 2.8 2H18c1 0 2 .8 2 1.9V7h-2V5h-2v1c0 .6-.4 1-1 1H9a1 1 0 0 1-1-1V5H6v13h12v-4h2v4c0 1-.8 2-1.9 2H6c-1 0-2-.8-2-1.9V5c0-1 .8-2 1.9-2H9.2A3 3 0 0 1 12 1Zm10 7v5H8V8h14Zm-1.5 1.5h-11v2h11v-2ZM12 3a1 1 0 1 0 0 2 1 1 0 0 0 0-2Z"/></svg>',
-    'paste-text': '<svg width="24" height="24"><path d="M18 9V5h-2v1c0 .6-.4 1-1 1H9a1 1 0 0 1-1-1V5H6v13h3V9h9ZM9 20H6a2 2 0 0 1-2-2V5c0-1.1.9-2 2-2h3.2A3 3 0 0 1 12 1a3 3 0 0 1 2.8 2H18a2 2 0 0 1 2 2v4h1v12H9v-1Zm1.5-9.5v9h9v-9h-9ZM12 3a1 1 0 0 0-1 1c0 .5.4 1 1 1s1-.5 1-1-.4-1-1-1Zm0 9h6v2h-.5l-.5-1h-1v4h.8v1h-3.6v-1h.8v-4h-1l-.5 1H12v-2Z" fill-rule="nonzero"/></svg>',
-    'paste': '<svg width="24" height="24"><path d="M18 9V5h-2v1c0 .6-.4 1-1 1H9a1 1 0 0 1-1-1V5H6v13h3V9h9ZM9 20H6a2 2 0 0 1-2-2V5c0-1.1.9-2 2-2h3.2A3 3 0 0 1 12 1a3 3 0 0 1 2.8 2H18a2 2 0 0 1 2 2v4h1v12H9v-1Zm1.5-9.5v9h9v-9h-9ZM12 3a1 1 0 0 0-1 1c0 .5.4 1 1 1s1-.5 1-1-.4-1-1-1Z" fill-rule="nonzero"/></svg>',
-    'permanent-pen': '<svg width="24" height="24"><path d="M10.5 17.5 8 20H3v-3l3.5-3.5a2 2 0 0 1 0-3L14 3l1 1-7.3 7.3a1 1 0 0 0 0 1.4l3.6 3.6c.4.4 1 .4 1.4 0L20 9l1 1-7.6 7.6a2 2 0 0 1-2.8 0l-.1-.1Z" fill-rule="nonzero"/></svg>',
-    'plus': '<svg width="24" height="24"><path d="M12 4c.5 0 1 .4 1 .9V11h6a1 1 0 0 1 .1 2H13v6a1 1 0 0 1-2 .1V13H5a1 1 0 0 1-.1-2H11V5c0-.6.4-1 1-1Z"/></svg>',
-    'preferences': '<svg width="24" height="24"><path d="m20.1 13.5-1.9.2a5.8 5.8 0 0 1-.6 1.5l1.2 1.5c.4.4.3 1 0 1.4l-.7.7a1 1 0 0 1-1.4 0l-1.5-1.2a6.2 6.2 0 0 1-1.5.6l-.2 1.9c0 .5-.5.9-1 .9h-1a1 1 0 0 1-1-.9l-.2-1.9a5.8 5.8 0 0 1-1.5-.6l-1.5 1.2a1 1 0 0 1-1.4 0l-.7-.7a1 1 0 0 1 0-1.4l1.2-1.5a6.2 6.2 0 0 1-.6-1.5l-1.9-.2a1 1 0 0 1-.9-1v-1c0-.5.4-1 .9-1l1.9-.2a5.8 5.8 0 0 1 .6-1.5L5.2 7.3a1 1 0 0 1 0-1.4l.7-.7a1 1 0 0 1 1.4 0l1.5 1.2a6.2 6.2 0 0 1 1.5-.6l.2-1.9c0-.5.5-.9 1-.9h1c.5 0 1 .4 1 .9l.2 1.9a5.8 5.8 0 0 1 1.5.6l1.5-1.2a1 1 0 0 1 1.4 0l.7.7c.3.4.4 1 0 1.4l-1.2 1.5a6.2 6.2 0 0 1 .6 1.5l1.9.2c.5 0 .9.5.9 1v1c0 .5-.4 1-.9 1ZM12 15a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z" fill-rule="evenodd"/></svg>',
-    'preview': '<svg width="24" height="24"><path d="M3.5 12.5c.5.8 1.1 1.6 1.8 2.3 2 2 4.2 3.2 6.7 3.2s4.7-1.2 6.7-3.2a16.2 16.2 0 0 0 2.1-2.8 15.7 15.7 0 0 0-2.1-2.8c-2-2-4.2-3.2-6.7-3.2a9.3 9.3 0 0 0-6.7 3.2A16.2 16.2 0 0 0 3.2 12c0 .2.2.3.3.5Zm-2.4-1 .7-1.2L4 7.8C6.2 5.4 8.9 4 12 4c3 0 5.8 1.4 8.1 3.8a18.2 18.2 0 0 1 2.8 3.7v1l-.7 1.2-2.1 2.5c-2.3 2.4-5 3.8-8.1 3.8-3 0-5.8-1.4-8.1-3.8a18.2 18.2 0 0 1-2.8-3.7 1 1 0 0 1 0-1Zm12-3.3a2 2 0 1 0 2.7 2.6 4 4 0 1 1-2.6-2.6Z" fill-rule="nonzero"/></svg>',
-    'print': '<svg width="24" height="24"><path d="M18 8H6a3 3 0 0 0-3 3v6h2v3h14v-3h2v-6a3 3 0 0 0-3-3Zm-1 10H7v-4h10v4Zm.5-5c-.8 0-1.5-.7-1.5-1.5s.7-1.5 1.5-1.5 1.5.7 1.5 1.5-.7 1.5-1.5 1.5Zm.5-8H6v2h12V5Z" fill-rule="nonzero"/></svg>',
-    'quote': '<svg width="24" height="24"><path d="M7.5 17h.9c.4 0 .7-.2.9-.6L11 13V8c0-.6-.4-1-1-1H6a1 1 0 0 0-1 1v4c0 .6.4 1 1 1h2l-1.3 2.7a1 1 0 0 0 .8 1.3Zm8 0h.9c.4 0 .7-.2.9-.6L19 13V8c0-.6-.4-1-1-1h-4a1 1 0 0 0-1 1v4c0 .6.4 1 1 1h2l-1.3 2.7a1 1 0 0 0 .8 1.3Z" fill-rule="nonzero"/></svg>',
-    'redo': '<svg width="24" height="24"><path d="M17.6 10H12c-2.8 0-4.4 1.4-4.9 3.5-.4 2 .3 4 1.4 4.6a1 1 0 1 1-1 1.8c-2-1.2-2.9-4.1-2.3-6.8.6-3 3-5.1 6.8-5.1h5.6l-3.3-3.3a1 1 0 1 1 1.4-1.4l5 5a1 1 0 0 1 0 1.4l-5 5a1 1 0 0 1-1.4-1.4l3.3-3.3Z" fill-rule="nonzero"/></svg>',
-    'reload': '<svg width="24" height="24"><g fill-rule="nonzero"><path d="m5 22.1-1.2-4.7v-.2a1 1 0 0 1 1-1l5 .4a1 1 0 1 1-.2 2l-2.2-.2a7.8 7.8 0 0 0 8.4.2 7.5 7.5 0 0 0 3.5-6.4 1 1 0 1 1 2 0 9.5 9.5 0 0 1-4.5 8 9.9 9.9 0 0 1-10.2 0l.4 1.4a1 1 0 1 1-2 .5ZM13.6 7.4c0-.5.5-1 1-.9l2.8.2a8 8 0 0 0-9.5-1 7.5 7.5 0 0 0-3.6 7 1 1 0 0 1-2 0 9.5 9.5 0 0 1 4.5-8.6 10 10 0 0 1 10.9.3l-.3-1a1 1 0 0 1 2-.5l1.1 4.8a1 1 0 0 1-1 1.2l-5-.4a1 1 0 0 1-.9-1Z"/></g></svg>',
-    'remove-formatting': '<svg width="24" height="24"><path d="M13.2 6a1 1 0 0 1 0 .2l-2.6 10a1 1 0 0 1-1 .8h-.2a.8.8 0 0 1-.8-1l2.6-10H8a1 1 0 1 1 0-2h9a1 1 0 0 1 0 2h-3.8ZM5 18h7a1 1 0 0 1 0 2H5a1 1 0 0 1 0-2Zm13 1.5L16.5 18 15 19.5a.7.7 0 0 1-1-1l1.5-1.5-1.5-1.5a.7.7 0 0 1 1-1l1.5 1.5 1.5-1.5a.7.7 0 0 1 1 1L17.5 17l1.5 1.5a.7.7 0 0 1-1 1Z" fill-rule="evenodd"/></svg>',
-    'remove': '<svg width="24" height="24"><path d="M16 7h3a1 1 0 0 1 0 2h-1v9a3 3 0 0 1-3 3H9a3 3 0 0 1-3-3V9H5a1 1 0 1 1 0-2h3V6a3 3 0 0 1 3-3h2a3 3 0 0 1 3 3v1Zm-2 0V6c0-.6-.4-1-1-1h-2a1 1 0 0 0-1 1v1h4Zm2 2H8v9c0 .6.4 1 1 1h6c.6 0 1-.4 1-1V9Zm-7 3a1 1 0 0 1 2 0v4a1 1 0 0 1-2 0v-4Zm4 0a1 1 0 0 1 2 0v4a1 1 0 0 1-2 0v-4Z" fill-rule="nonzero"/></svg>',
-    'resize-handle': '<svg width="10" height="10"><g fill-rule="nonzero"><path d="M8.1 1.1A.5.5 0 1 1 9 2l-7 7A.5.5 0 1 1 1 8l7-7ZM8.1 5.1A.5.5 0 1 1 9 6l-3 3A.5.5 0 1 1 5 8l3-3Z"/></g></svg>',
-    'resize': '<svg width="24" height="24"><path d="M4 5c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3h6c.3 0 .5.1.7.3.2.2.3.4.3.7 0 .3-.1.5-.3.7a1 1 0 0 1-.7.3H7.4L18 16.6V13c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3.3 0 .5.1.7.3.2.2.3.4.3.7v6c0 .3-.1.5-.3.7a1 1 0 0 1-.7.3h-6a1 1 0 0 1-.7-.3 1 1 0 0 1-.3-.7c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3h3.6L6 7.4V11c0 .3-.1.5-.3.7a1 1 0 0 1-.7.3 1 1 0 0 1-.7-.3A1 1 0 0 1 4 11V5Z" fill-rule="evenodd"/></svg>',
-    'restore-draft': '<svg width="24" height="24"><g fill-rule="evenodd"><path d="M17 13c0 .6-.4 1-1 1h-4V8c0-.6.4-1 1-1s1 .4 1 1v4h2c.6 0 1 .4 1 1Z"/><path d="M4.7 10H9a1 1 0 0 1 0 2H3a1 1 0 0 1-1-1V5a1 1 0 1 1 2 0v3l2.5-2.4a9.2 9.2 0 0 1 10.8-1.5A9 9 0 0 1 13.4 21c-2.4.1-4.7-.7-6.5-2.2a1 1 0 1 1 1.3-1.5 7.2 7.2 0 0 0 11.6-3.7 7 7 0 0 0-3.5-7.7A7.2 7.2 0 0 0 8 7L4.7 10Z" fill-rule="nonzero"/></g></svg>',
-    'revision-history': '<svg width="24" height="24"><g fill-rule="evenodd"><path d="M17 13c0 .6-.4 1-1 1h-4V8c0-.6.4-1 1-1s1 .4 1 1v4h2c.6 0 1 .4 1 1Z"/><path d="M4.7 10H9a1 1 0 0 1 0 2H3a1 1 0 0 1-1-1V5a1 1 0 1 1 2 0v3l2.5-2.4a9.2 9.2 0 0 1 10.8-1.5A9 9 0 0 1 13.4 21c-2.4.1-4.7-.7-6.5-2.2a1 1 0 1 1 1.3-1.5 7.2 7.2 0 0 0 11.6-3.7 7 7 0 0 0-3.5-7.7A7.2 7.2 0 0 0 8 7L4.7 10Z" fill-rule="nonzero"/></g></svg>',
-    'rotate-left': '<svg width="24" height="24"><path d="M4.7 10H9a1 1 0 0 1 0 2H3a1 1 0 0 1-1-1V5a1 1 0 1 1 2 0v3l2.5-2.4a9.2 9.2 0 0 1 10.8-1.5A9 9 0 0 1 13.4 21c-2.4.1-4.7-.7-6.5-2.2a1 1 0 1 1 1.3-1.5 7.2 7.2 0 0 0 11.6-3.7 7 7 0 0 0-3.5-7.7A7.2 7.2 0 0 0 8 7L4.7 10Z" fill-rule="nonzero"/></svg>',
-    'rotate-right': '<svg width="24" height="24"><path d="M20 8V5a1 1 0 0 1 2 0v6c0 .6-.4 1-1 1h-6a1 1 0 0 1 0-2h4.3L16 7A7.2 7.2 0 0 0 7.7 6a7 7 0 0 0 3 13.1c1.9.1 3.7-.5 5-1.7a1 1 0 0 1 1.4 1.5A9.2 9.2 0 0 1 2.2 14c-.9-3.9 1-8 4.5-9.9 3.5-1.9 8-1.3 10.8 1.5L20 8Z" fill-rule="nonzero"/></svg>',
-    'rtl': '<svg width="24" height="24"><path d="M8 5h8v2h-2v12h-2V7h-2v12H8v-7c-.5 0-1 0-1.4-.3A3.4 3.4 0 0 1 4.8 10a3.3 3.3 0 0 1 0-2.8 3.4 3.4 0 0 1 1.8-1.8L8 5Zm12 11.2a1 1 0 1 1-1 1.6l-3-2a1 1 0 0 1 0-1.6l3-2a1 1 0 1 1 1 1.6L18.4 15l1.8 1.2Z" fill-rule="evenodd"/></svg>',
-    'save': '<svg width="24" height="24"><path d="M5 16h14a2 2 0 0 1 2 2v2a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-2c0-1.1.9-2 2-2Zm0 2v2h14v-2H5Zm10 0h2v2h-2v-2Zm-4-6.4L8.7 9.3a1 1 0 1 0-1.4 1.4l4 4c.4.4 1 .4 1.4 0l4-4a1 1 0 1 0-1.4-1.4L13 11.6V4a1 1 0 0 0-2 0v7.6Z" fill-rule="nonzero"/></svg>',
-    'search': '<svg width="24" height="24"><path d="M16 17.3a8 8 0 1 1 1.4-1.4l4.3 4.4a1 1 0 0 1-1.4 1.4l-4.4-4.3Zm-5-.3a6 6 0 1 0 0-12 6 6 0 0 0 0 12Z" fill-rule="nonzero"/></svg>',
-    'select-all': '<svg width="24" height="24"><path d="M3 5h2V3a2 2 0 0 0-2 2Zm0 8h2v-2H3v2Zm4 8h2v-2H7v2ZM3 9h2V7H3v2Zm10-6h-2v2h2V3Zm6 0v2h2a2 2 0 0 0-2-2ZM5 21v-2H3c0 1.1.9 2 2 2Zm-2-4h2v-2H3v2ZM9 3H7v2h2V3Zm2 18h2v-2h-2v2Zm8-8h2v-2h-2v2Zm0 8a2 2 0 0 0 2-2h-2v2Zm0-12h2V7h-2v2Zm0 8h2v-2h-2v2Zm-4 4h2v-2h-2v2Zm0-16h2V3h-2v2ZM7 17h10V7H7v10Zm2-8h6v6H9V9Z" fill-rule="nonzero"/></svg>',
-    'selected': '<svg width="24" height="24"><path fill-rule="nonzero" d="M6 4h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2Zm3.6 10.9L7 12.3a.7.7 0 0 0-1 1L9.6 17 18 8.6a.7.7 0 0 0 0-1 .7.7 0 0 0-1 0l-7.4 7.3Z"/></svg>',
-    'send': '<svg width="24" height="24"><path fill-rule="evenodd" clip-rule="evenodd" d="m13.3 22 7-18.3-18.3 7L9 15l4.3 7ZM18 6.8l-.7-.7L9.4 14l.7.7L18 6.8Z"/></svg>',
-    'settings': '<svg width="24" height="24"><path d="M11 6h8c.6 0 1 .4 1 1s-.4 1-1 1h-8v.3c0 .2 0 .3-.2.5l-.6.2H7.8c-.3 0-.4 0-.6-.2a.7.7 0 0 1-.2-.6V8H5a1 1 0 1 1 0-2h2v-.3c0-.2 0-.3.2-.5l.5-.2h2.5c.3 0 .4 0 .6.2l.2.5V6ZM8 8h2V6H8v2Zm9 2.8v.2h2c.6 0 1 .4 1 1s-.4 1-1 1h-2v.3c0 .2 0 .3-.2.5l-.6.2h-2.4c-.3 0-.4 0-.6-.2a.7.7 0 0 1-.2-.6V13H5a1 1 0 0 1 0-2h8v-.3c0-.2 0-.3.2-.5l.6-.2h2.4c.3 0 .4 0 .6.2l.2.6ZM14 13h2v-2h-2v2Zm-3 2.8v.2h8c.6 0 1 .4 1 1s-.4 1-1 1h-8v.3c0 .2 0 .3-.2.5l-.6.2H7.8c-.3 0-.4 0-.6-.2a.7.7 0 0 1-.2-.6V18H5a1 1 0 0 1 0-2h2v-.3c0-.2 0-.3.2-.5l.5-.2h2.5c.3 0 .4 0 .6.2l.2.6ZM8 18h2v-2H8v2Z" fill-rule="evenodd"/></svg>',
-    'sharpen': '<svg width="24" height="24"><path d="m16 6 4 4-8 9-8-9 4-4h8Zm-4 10.2 5.5-6.2-.1-.1H12v-.3h5.1l-.2-.2H12V9h4.6l-.2-.2H12v-.3h4.1l-.2-.2H12V8h3.6l-.2-.2H8.7L6.5 10l.1.1H12v.3H6.9l.2.2H12v.3H7.3l.2.2H12v.3H7.7l.3.2h4v.3H8.2l.2.2H12v.3H8.6l.3.2H12v.3H9l.3.2H12v.3H9.5l.2.2H12v.3h-2l.2.2H12v.3h-1.6l.2.2H12v.3h-1.1l.2.2h.9v.3h-.7l.2.2h.5v.3h-.3l.3.2Z" fill-rule="evenodd"/></svg>',
-    'sourcecode': '<svg width="24" height="24"><g fill-rule="nonzero"><path d="M9.8 15.7c.3.3.3.8 0 1-.3.4-.9.4-1.2 0l-4.4-4.1a.8.8 0 0 1 0-1.2l4.4-4.2c.3-.3.9-.3 1.2 0 .3.3.3.8 0 1.1L6 12l3.8 3.7ZM14.2 15.7c-.3.3-.3.8 0 1 .4.4.9.4 1.2 0l4.4-4.1c.3-.3.3-.9 0-1.2l-4.4-4.2a.8.8 0 0 0-1.2 0c-.3.3-.3.8 0 1.1L18 12l-3.8 3.7Z"/></g></svg>',
-    'spell-check': '<svg width="24" height="24"><path d="M6 8v3H5V5c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3h2c.3 0 .5.1.7.3.2.2.3.4.3.7v6H8V8H6Zm0-3v2h2V5H6Zm13 0h-3v5h3v1h-3a1 1 0 0 1-.7-.3 1 1 0 0 1-.3-.7V5c0-.3.1-.5.3-.7.2-.2.4-.3.7-.3h3v1Zm-5 1.5-.1.7c-.1.2-.3.3-.6.3.3 0 .5.1.6.3l.1.7V10c0 .3-.1.5-.3.7a1 1 0 0 1-.7.3h-3V4h3c.3 0 .5.1.7.3.2.2.3.4.3.7v1.5ZM13 10V8h-2v2h2Zm0-3V5h-2v2h2Zm3 5 1 1-6.5 7L7 15.5l1.3-1 2.2 2.2L16 12Z" fill-rule="evenodd"/></svg>',
-    'strike-through': '<svg width="24" height="24"><g fill-rule="evenodd"><path d="M15.6 8.5c-.5-.7-1-1.1-1.3-1.3-.6-.4-1.3-.6-2-.6-2.7 0-2.8 1.7-2.8 2.1 0 1.6 1.8 2 3.2 2.3 4.4.9 4.6 2.8 4.6 3.9 0 1.4-.7 4.1-5 4.1A6.2 6.2 0 0 1 7 16.4l1.5-1.1c.4.6 1.6 2 3.7 2 1.6 0 2.5-.4 3-1.2.4-.8.3-2-.8-2.6-.7-.4-1.6-.7-2.9-1-1-.2-3.9-.8-3.9-3.6C7.6 6 10.3 5 12.4 5c2.9 0 4.2 1.6 4.7 2.4l-1.5 1.1Z"/><path d="M5 11h14a1 1 0 0 1 0 2H5a1 1 0 0 1 0-2Z" fill-rule="nonzero"/></g></svg>',
-    'subscript': '<svg width="24" height="24"><path d="m10.4 10 4.6 4.6-1.4 1.4L9 11.4 4.4 16 3 14.6 7.6 10 3 5.4 4.4 4 9 8.6 13.6 4 15 5.4 10.4 10ZM21 19h-5v-1l1-.8 1.7-1.6c.3-.4.5-.8.5-1.2 0-.3 0-.6-.2-.7-.2-.2-.5-.3-.9-.3a2 2 0 0 0-.8.2l-.7.3-.4-1.1 1-.6 1.2-.2c.8 0 1.4.3 1.8.7.4.4.6.9.6 1.5s-.2 1.1-.5 1.6a8 8 0 0 1-1.3 1.3l-.6.6h2.6V19Z" fill-rule="nonzero"/></svg>',
-    'superscript': '<svg width="24" height="24"><path d="M15 9.4 10.4 14l4.6 4.6-1.4 1.4L9 15.4 4.4 20 3 18.6 7.6 14 3 9.4 4.4 8 9 12.6 13.6 8 15 9.4Zm5.9 1.6h-5v-1l1-.8 1.7-1.6c.3-.5.5-.9.5-1.3 0-.3 0-.5-.2-.7-.2-.2-.5-.3-.9-.3l-.8.2-.7.4-.4-1.2c.2-.2.5-.4 1-.5.3-.2.8-.2 1.2-.2.8 0 1.4.2 1.8.6.4.4.6 1 .6 1.6 0 .5-.2 1-.5 1.5l-1.3 1.4-.6.5h2.6V11Z" fill-rule="nonzero"/></svg>',
-    'table-caption': '<svg width="24" height="24"><g fill-rule="nonzero"><rect width="12" height="2" x="3" y="4" rx="1"/><path d="M19 8a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-8c0-1.1.9-2 2-2h14ZM5 15v3h6v-3H5Zm14 0h-6v3h6v-3Zm0-5h-6v3h6v-3ZM5 13h6v-3H5v3Z"/></g></svg>',
-    'table-cell-classes': '<svg width="24" height="24"><g fill-rule="evenodd"><path fill-rule="nonzero" d="M13 4v9H3V6c0-1.1.9-2 2-2h8Zm-2 2H5v5h6V6Z"/><path fill-rule="nonzero" d="M13 4h6a2 2 0 0 1 2 2v7h-8v-2h6V6h-6V4Z" opacity=".2"/><path d="m18 20-2.6 1.6.7-3-2.4-2 3.1-.2 1.2-2.9 1.2 2.9 3.1.2-2.4 2 .7 3z"/><path fill-rule="nonzero" d="M3 13v5c0 1.1.9 2 2 2h8v-7h-2v5H5v-5H3Z" opacity=".2"/></g></svg>',
-    'table-cell-properties': '<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h14Zm-8 9H5v5h6v-5Zm8 0h-6v5h6v-5Zm-8-7H5v5h6V6Z"/></svg>',
-    'table-cell-select-all': '<svg width="24" height="24"><g fill-rule="evenodd"><path fill-rule="nonzero" d="M19 4a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h14Zm0 2H5v12h14V6Z"/><path d="M13 6v5h6v2h-6v5h-2v-5H5v-2h6V6h2Z" opacity=".2"/></g></svg>',
-    'table-cell-select-inner': '<svg width="24" height="24"><g fill-rule="evenodd"><path fill-rule="nonzero" d="M19 4a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h14Zm0 2H5v12h14V6Z" opacity=".2"/><path d="M13 6v5h6v2h-6v5h-2v-5H5v-2h6V6h2Z"/></g></svg>',
-    'table-classes': '<svg width="24" height="24"><g fill-rule="evenodd"><path fill-rule="nonzero" d="M19 4a2 2 0 0 1 2 2v7h-8v7H5a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h14Zm-8 9H5v5h6v-5Zm8-7h-6v5h6V6Zm-8 0H5v5h6V6Z"/><path d="m18 20-2.6 1.6.7-3-2.4-2 3.1-.2 1.2-2.9 1.2 2.9 3.1.2-2.4 2 .7 3z"/></g></svg>',
-    'table-delete-column': '<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h14Zm-4 4h-2V6h-2v2H9V6H5v12h4v-2h2v2h2v-2h2v2h4V6h-4v2Zm.3.5 1 1.2-3 2.3 3 2.3-1 1.2L12 13l-3.3 2.6-1-1.2 3-2.3-3-2.3 1-1.2L12 11l3.3-2.5Z"/></svg>',
-    'table-delete-row': '<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h14Zm0 2H5v3h2.5v2H5v2h2.5v2H5v3h14v-3h-2.5v-2H19v-2h-2.5V9H19V6Zm-4.7 1.8 1.2 1L13 12l2.6 3.3-1.2 1-2.3-3-2.3 3-1.2-1L11 12 8.5 8.7l1.2-1 2.3 3 2.3-3Z"/></svg>',
-    'table-delete-table': '<svg width="24" height="24"><g fill-rule="nonzero"><path d="M19 4a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h14ZM5 6v12h14V6H5Z"/><path d="m14.4 8.6 1.1 1-2.4 2.4 2.4 2.4-1.1 1.1-2.4-2.4-2.4 2.4-1-1.1 2.3-2.4-2.3-2.4 1-1 2.4 2.3z"/></g></svg>',
-    'table-insert-column-after': '<svg width="24" height="24"><path fill-rule="nonzero" d="M20 4c.6 0 1 .4 1 1v2a1 1 0 0 1-2 0V6h-8v12h8v-1a1 1 0 0 1 2 0v2c0 .5-.4 1-.9 1H5a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h15ZM9 13H5v5h4v-5Zm7-5c.5 0 1 .4 1 .9V11h2a1 1 0 0 1 .1 2H17v2a1 1 0 0 1-2 .1V13h-2a1 1 0 0 1-.1-2H15V9c0-.6.4-1 1-1ZM9 6H5v5h4V6Z"/></svg>',
-    'table-insert-column-before': '<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H4a1 1 0 0 1-1-1v-2a1 1 0 0 1 2 0v1h8V6H5v1a1 1 0 1 1-2 0V5c0-.6.4-1 1-1h15Zm0 9h-4v5h4v-5ZM8 8c.5 0 1 .4 1 .9V11h2a1 1 0 0 1 .1 2H9v2a1 1 0 0 1-2 .1V13H5a1 1 0 0 1-.1-2H7V9c0-.6.4-1 1-1Zm11-2h-4v5h4V6Z"/></svg>',
-    'table-insert-row-above': '<svg width="24" height="24"><path fill-rule="nonzero" d="M6 4a1 1 0 1 1 0 2H5v6h14V6h-1a1 1 0 0 1 0-2h2c.6 0 1 .4 1 1v13a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5c0-.6.4-1 1-1h2Zm5 10H5v4h6v-4Zm8 0h-6v4h6v-4ZM12 3c.5 0 1 .4 1 .9V6h2a1 1 0 0 1 0 2h-2v2a1 1 0 0 1-2 .1V8H9a1 1 0 0 1 0-2h2V4c0-.6.4-1 1-1Z"/></svg>',
-    'table-insert-row-after': '<svg width="24" height="24"><path fill-rule="nonzero" d="M12 13c.5 0 1 .4 1 .9V16h2a1 1 0 0 1 .1 2H13v2a1 1 0 0 1-2 .1V18H9a1 1 0 0 1-.1-2H11v-2c0-.6.4-1 1-1Zm6 7a1 1 0 0 1 0-2h1v-6H5v6h1a1 1 0 0 1 0 2H4a1 1 0 0 1-1-1V6c0-1.1.9-2 2-2h14a2 2 0 0 1 2 2v13c0 .5-.4 1-.9 1H18ZM11 6H5v4h6V6Zm8 0h-6v4h6V6Z"/></svg>',
-    'table-left-header': '<svg width="24" height="24"><path d="M19 4a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h14Zm0 9h-4v5h4v-5Zm-6 0H9v5h4v-5Zm0-7H9v5h4V6Zm6 0h-4v5h4V6Z"/></svg>',
-    'table-merge-cells': '<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h14ZM5 15.5V18h3v-2.5H5Zm14-5h-9V18h9v-7.5ZM19 6h-4v2.5h4V6ZM8 6H5v2.5h3V6Zm5 0h-3v2.5h3V6Zm-8 7.5h3v-3H5v3Z"/></svg>',
-    'table-row-numbering-rtl': '<svg width="24" height="24"><path d="M6 4a2 2 0 0 0-2 2v13c0 1.1.9 2 2 2h12a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2H6Zm0 12h8v3H6v-3Zm11 0c.6 0 1 .4 1 1v1a1 1 0 0 1-2 0v-1c0-.6.4-1 1-1ZM6 11h8v3H6v-3Zm11 0c.6 0 1 .4 1 1v1a1 1 0 0 1-2 0v-1c0-.6.4-1 1-1ZM6 6h8v3H6V6Zm11 0c.6 0 1 .4 1 1v1a1 1 0 1 1-2 0V7c0-.6.4-1 1-1Z"/></svg>',
-    'table-row-numbering': '<svg width="24" height="24"><path d="M18 4a2 2 0 0 1 2 2v13a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h12Zm0 12h-8v3h8v-3ZM7 16a1 1 0 0 0-1 1v1a1 1 0 0 0 2 0v-1c0-.6-.4-1-1-1Zm11-5h-8v3h8v-3ZM7 11a1 1 0 0 0-1 1v1a1 1 0 0 0 2 0v-1c0-.6-.4-1-1-1Zm11-5h-8v3h8V6ZM7 6a1 1 0 0 0-1 1v1a1 1 0 1 0 2 0V7c0-.6-.4-1-1-1Z"/></svg>',
-    'table-row-properties': '<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h14ZM5 15v3h6v-3H5Zm14 0h-6v3h6v-3Zm0-9h-6v3h6V6ZM5 9h6V6H5v3Z"/></svg>',
-    'table-split-cells': '<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h14ZM8 15.5H5V18h3v-2.5Zm11-5h-9V18h9v-7.5Zm-2.5 1 1 1-2 2 2 2-1 1-2-2-2 2-1-1 2-2-2-2 1-1 2 2 2-2Zm-8.5-1H5v3h3v-3ZM19 6h-4v2.5h4V6ZM8 6H5v2.5h3V6Zm5 0h-3v2.5h3V6Z"/></svg>',
-    'table-top-header': '<svg width="24" height="24"><path d="M19 4a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h14Zm-8 11H5v3h6v-3Zm8 0h-6v3h6v-3Zm0-5h-6v3h6v-3ZM5 13h6v-3H5v3Z"/></svg>',
-    'table': '<svg width="24" height="24"><path fill-rule="nonzero" d="M19 4a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h14ZM5 14v4h6v-4H5Zm14 0h-6v4h6v-4Zm0-6h-6v4h6V8ZM5 12h6V8H5v4Z"/></svg>',
-    'template-add': '<svg width="24" height="24"><path fill-rule="evenodd" clip-rule="evenodd" d="M9 12v4H5a2 2 0 0 0-2 2v3h9.3a6 6 0 0 1-.3-2H5v-1h7a6 6 0 0 1 .8-2H11v-5l-.8-.6a3 3 0 1 1 3.6 0l-.8.6v4.7a6 6 0 0 1 2-1.9V12a5 5 0 1 0-6 0Z"/><path d="M18 15c.5 0 1 .4 1 .9V18h2a1 1 0 0 1 .1 2H19v2a1 1 0 0 1-2 .1V20h-2a1 1 0 0 1-.1-2H17v-2c0-.6.4-1 1-1Z"/></svg>',
-    'template': '<svg width="24" height="24"><path d="M19 19v-1H5v1h14ZM9 16v-4a5 5 0 1 1 6 0v4h4a2 2 0 0 1 2 2v3H3v-3c0-1.1.9-2 2-2h4Zm4 0v-5l.8-.6a3 3 0 1 0-3.6 0l.8.6v5h2Z" fill-rule="nonzero"/></svg>',
-    'temporary-placeholder': '<svg width="24" height="24"><g fill-rule="evenodd"><path d="M9 7.6V6h2.5V4.5a.5.5 0 1 1 1 0V6H15v1.6a8 8 0 1 1-6 0Zm-2.6 5.3a.5.5 0 0 0 .3.6c.3 0 .6 0 .6-.3l.1-.2a5 5 0 0 1 3.3-2.8c.3-.1.4-.4.4-.6-.1-.3-.4-.5-.6-.4a6 6 0 0 0-4.1 3.7Z"/><circle cx="14" cy="4" r="1"/><circle cx="12" cy="2" r="1"/><circle cx="10" cy="4" r="1"/></g></svg>',
-    'text-color': '<svg width="24" height="24"><g fill-rule="evenodd"><path class="tox-icon-text-color__color" d="M3 18h18v3H3z"/><path d="M8.7 16h-.8a.5.5 0 0 1-.5-.6l2.7-9c.1-.3.3-.4.5-.4h2.8c.2 0 .4.1.5.4l2.7 9a.5.5 0 0 1-.5.6h-.8a.5.5 0 0 1-.4-.4l-.7-2.2c0-.3-.3-.4-.5-.4h-3.4c-.2 0-.4.1-.5.4l-.7 2.2c0 .3-.2.4-.4.4Zm2.6-7.6-.6 2a.5.5 0 0 0 .5.6h1.6a.5.5 0 0 0 .5-.6l-.6-2c0-.3-.3-.4-.5-.4h-.4c-.2 0-.4.1-.5.4Z"/></g></svg>',
-    'text-size-decrease': '<svg width="24" height="24"><path fill-rule="evenodd" clip-rule="evenodd" d="M14 5a1 1 0 1 1 0 2h-4v11a1 1 0 1 1-2 0V7H4a1 1 0 0 1 0-2h10ZM14 12a1 1 0 1 0 0 2h6a1 1 0 1 0 0-2h-6Z"/></svg>',
-    'text-size-increase': '<svg width="24" height="24"><path fill-rule="evenodd" clip-rule="evenodd" d="M14 5a1 1 0 1 1 0 2h-4v11a1 1 0 1 1-2 0V7H4a1 1 0 0 1 0-2h10ZM17 9a1 1 0 0 0-1 1v2h-2a1 1 0 1 0 0 2h2v2a1 1 0 1 0 2 0v-2h2a1 1 0 1 0 0-2h-2v-2c0-.6-.4-1-1-1Z"/></svg>',
-    'toc': '<svg width="24" height="24"><path d="M5 5c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 1 1 0-2Zm3 0h11c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 1 1 0-2Zm-3 8c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 0 1 0-2Zm3 0h11c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 0 1 0-2Zm0-4c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 1 1 0-2Zm3 0h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 0 1 0-2Zm-3 8c.6 0 1 .4 1 1s-.4 1-1 1a1 1 0 0 1 0-2Zm3 0h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 0 1 0-2Z" fill-rule="evenodd"/></svg>',
-    'translate': '<svg width="24" height="24"><path d="m12.7 14.3-.3.7-.4.7-2.2-2.2-3.1 3c-.3.4-.8.4-1 0a.7.7 0 0 1 0-1l3.1-3A12.4 12.4 0 0 1 6.7 9H8a10.1 10.1 0 0 0 1.7 2.4c.5-.5 1-1.1 1.4-1.8l.9-2H4.7a.7.7 0 1 1 0-1.5h4.4v-.7c0-.4.3-.8.7-.8.4 0 .7.4.7.8v.7H15c.4 0 .8.3.8.7 0 .4-.4.8-.8.8h-1.4a12.3 12.3 0 0 1-1 2.4 13.5 13.5 0 0 1-1.7 2.3l1.9 1.8Zm4.3-3 2.7 7.3a.5.5 0 0 1-.4.7 1 1 0 0 1-1-.7l-.6-1.5h-3.4l-.6 1.5a1 1 0 0 1-1 .7.5.5 0 0 1-.4-.7l2.7-7.4a1 1 0 0 1 2 0Zm-2.2 4.4h2.4L16 12.5l-1.2 3.2Z" fill-rule="evenodd"/></svg>',
-    'typography': '<svg width="24" height="24"><path fill-rule="evenodd" clip-rule="evenodd" d="M17 5a1 1 0 1 1 0 2h-4v11a1 1 0 1 1-2 0V7H7a1 1 0 0 1 0-2h10Z"/><path d="m17.5 14 .8-1.7 1.7-.8-1.7-.8-.8-1.7-.8 1.7-1.7.8 1.7.8.8 1.7ZM7 14l1 2 2 1-2 1-1 2-1-2-2-1 2-1 1-2Z"/></svg>',
-    'underline': '<svg width="24" height="24"><path d="M16 5c.6 0 1 .4 1 1v5.5a4 4 0 0 1-.4 1.8l-1 1.4a5.3 5.3 0 0 1-5.5 1 5 5 0 0 1-1.6-1c-.5-.4-.8-.9-1.1-1.4a4 4 0 0 1-.4-1.8V6c0-.6.4-1 1-1s1 .4 1 1v5.5c0 .3 0 .6.2 1l.6.7a3.3 3.3 0 0 0 2.2.8 3.4 3.4 0 0 0 2.2-.8c.3-.2.4-.5.6-.8l.2-.9V6c0-.6.4-1 1-1ZM8 17h8c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 0 1 0-2Z" fill-rule="evenodd"/></svg>',
-    'undo': '<svg width="24" height="24"><path d="M6.4 8H12c3.7 0 6.2 2 6.8 5.1.6 2.7-.4 5.6-2.3 6.8a1 1 0 0 1-1-1.8c1.1-.6 1.8-2.7 1.4-4.6-.5-2.1-2.1-3.5-4.9-3.5H6.4l3.3 3.3a1 1 0 1 1-1.4 1.4l-5-5a1 1 0 0 1 0-1.4l5-5a1 1 0 0 1 1.4 1.4L6.4 8Z" fill-rule="nonzero"/></svg>',
-    'unlink': '<svg width="24" height="24"><path d="M6.2 12.3a1 1 0 0 1 1.4 1.4l-2 2a2 2 0 1 0 2.6 2.8l4.8-4.8a1 1 0 0 0 0-1.4 1 1 0 1 1 1.4-1.3 2.9 2.9 0 0 1 0 4L9.6 20a3.9 3.9 0 0 1-5.5-5.5l2-2Zm11.6-.6a1 1 0 0 1-1.4-1.4l2.1-2a2 2 0 1 0-2.7-2.8L11 10.3a1 1 0 0 0 0 1.4A1 1 0 1 1 9.6 13a2.9 2.9 0 0 1 0-4L14.4 4a3.9 3.9 0 0 1 5.5 5.5l-2 2ZM7.6 6.3a.8.8 0 0 1-1 1.1L3.3 4.2a.7.7 0 1 1 1-1l3.2 3.1ZM5.1 8.6a.8.8 0 0 1 0 1.5H3a.8.8 0 0 1 0-1.5H5Zm5-3.5a.8.8 0 0 1-1.5 0V3a.8.8 0 0 1 1.5 0V5Zm6 11.8a.8.8 0 0 1 1-1l3.2 3.2a.8.8 0 0 1-1 1L16 17Zm-2.2 2a.8.8 0 0 1 1.5 0V21a.8.8 0 0 1-1.5 0V19Zm5-3.5a.7.7 0 1 1 0-1.5H21a.8.8 0 0 1 0 1.5H19Z" fill-rule="nonzero"/></svg>',
-    'unlock': '<svg width="24" height="24"><path d="M16 5c.8 0 1.5.3 2.1.9.6.6.9 1.3.9 2.1v3h-2V8a1 1 0 0 0-.3-.7A1 1 0 0 0 16 7h-2a1 1 0 0 0-.7.3 1 1 0 0 0-.3.7v3h.3c.2 0 .3 0 .5.2l.2.6v7.4c0 .3 0 .4-.2.6l-.6.2H4.8c-.3 0-.4 0-.6-.2a.7.7 0 0 1-.2-.6v-7.4c0-.3 0-.4.2-.6l.5-.2H11V8c0-.8.3-1.5.9-2.1.6-.6 1.3-.9 2.1-.9h2Z" fill-rule="evenodd"/></svg>',
-    'unordered-list': '<svg width="24" height="24"><path d="M11 5h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 0 1 0-2Zm0 6h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 0 1 0-2Zm0 6h8c.6 0 1 .4 1 1s-.4 1-1 1h-8a1 1 0 0 1 0-2ZM4.5 6c0-.4.1-.8.4-1 .3-.4.7-.5 1.1-.5.4 0 .8.1 1 .4.4.3.5.7.5 1.1 0 .4-.1.8-.4 1-.3.4-.7.5-1.1.5-.4 0-.8-.1-1-.4-.4-.3-.5-.7-.5-1.1Zm0 6c0-.4.1-.8.4-1 .3-.4.7-.5 1.1-.5.4 0 .8.1 1 .4.4.3.5.7.5 1.1 0 .4-.1.8-.4 1-.3.4-.7.5-1.1.5-.4 0-.8-.1-1-.4-.4-.3-.5-.7-.5-1.1Zm0 6c0-.4.1-.8.4-1 .3-.4.7-.5 1.1-.5.4 0 .8.1 1 .4.4.3.5.7.5 1.1 0 .4-.1.8-.4 1-.3.4-.7.5-1.1.5-.4 0-.8-.1-1-.4-.4-.3-.5-.7-.5-1.1Z" fill-rule="evenodd"/></svg>',
-    'unselected': '<svg width="24" height="24"><path fill-rule="nonzero" d="M6 4h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2Zm0 1a1 1 0 0 0-1 1v12c0 .6.4 1 1 1h12c.6 0 1-.4 1-1V6c0-.6-.4-1-1-1H6Z"/></svg>',
-    'upload': '<svg width="24" height="24"><path d="M18 19v-2a1 1 0 0 1 2 0v3c0 .6-.4 1-1 1H5a1 1 0 0 1-1-1v-3a1 1 0 0 1 2 0v2h12ZM11 6.4 8.7 8.7a1 1 0 0 1-1.4-1.4l4-4a1 1 0 0 1 1.4 0l4 4a1 1 0 1 1-1.4 1.4L13 6.4V16a1 1 0 0 1-2 0V6.4Z" fill-rule="nonzero"/></svg>',
-    'add-file': '<svg height="24" width="24"><path d="M2 7h2V4h3V2H4a2 2 0 0 0-2 2zm20 0h-2V4h-3V2h3a2 2 0 0 1 2 2zm0 2h-2v6h2zm0 8h-2v3h-3v2h3a2 2 0 0 0 2-2zM2 9h2v6H2zm0 8h2v3h3v2H4a2 2 0 0 1-2-2zm7 5v-2h6v2zm6-20v2H9V2zM6 17h12l-4-5-3 3.8-2-2.6z"/><path d="M2 7h2V4h3V2H4a2 2 0 0 0-2 2zm20 0h-2V4h-3V2h3a2 2 0 0 1 2 2zm0 2h-2v6h2zm0 8h-2v3h-3v2h3a2 2 0 0 0 2-2zM2 9h2v6H2zm0 8h2v3h3v2H4a2 2 0 0 1-2-2zm7 5v-2h6v2zm6-20v2H9V2zM6 17h12l-4-5-3 3.8-2-2.6z"/><path d="M6 17h12l-4-5-3 3.8-2-2.6z"/><path d="M6 17h12l-4-5-3 3.8-2-2.6z"/><path d="M6 17h12l-4-5-3 3.8-2-2.6z"/><path d="M6 17h12l-4-5-3 3.8-2-2.6z"/></svg>',
-    'adjustments': '<svg width="24" height="24"><path d="M16 11a3 3 0 1 1 2.8-4H21v2h-2.2a3 3 0 0 1-2.8 2Zm0-2a1 1 0 1 1 0-2 1 1 0 0 1 0 2ZM3 9h8V7H3v2Zm5 10a3 3 0 1 0-2.8-4H3v2h2.2A3 3 0 0 0 8 19Zm0-2a1 1 0 1 0 0-2 1 1 0 0 0 0 2Zm13 0h-8v-2h8v2Z"/></svg>',
-    'alt-text': '<svg width="24" height="24"><path d="M3 20a2 2 0 0 1-1.4-.6A2 2 0 0 1 1 18V6c0-.6.2-1 .6-1.4A2 2 0 0 1 3 4h18c.6 0 1 .2 1.4.6.4.4.6.9.6 1.4v12c0 .6-.2 1-.6 1.4a2 2 0 0 1-1.4.6H3Zm0-2h18V6H3v12Zm1.5-3H6v-1.5h1.5V15H9v-5a1 1 0 0 0-.3-.7A1 1 0 0 0 8 9H5.5a1 1 0 0 0-.7.3 1 1 0 0 0-.3.7v5ZM6 12v-1.5h1.5V12H6Z"/><path d="M11 15V9h1.3v4.5h2V15H11Zm5.8-4.5V15h1.4v-4.5h1.3V9h-4v1.5h1.3Z"/></svg>',
-    'blur': '<svg width="24" height="24"><path d="M19.3 9.3a1 1 0 0 0-.3.7c0 .3.1.5.3.7.2.2.4.3.7.3s.5-.1.7-.3a1 1 0 0 0 .3-.7 1 1 0 0 0-.3-.7A1 1 0 0 0 20 9a1 1 0 0 0-.7.3Zm-16 0a1 1 0 0 0-.3.7c0 .3.1.5.3.7.2.2.4.3.7.3s.5-.1.7-.3A1 1 0 0 0 5 10a1 1 0 0 0-.3-.7A1 1 0 0 0 4 9a1 1 0 0 0-.7.3Zm16 6a1 1 0 0 0-.3.7c0 .3.1.5.3.7.2.2.4.3.7.3s.5-.1.7-.3a1 1 0 0 0 .3-.7 1 1 0 0 0-.3-.7 1 1 0 0 0-.7-.3 1 1 0 0 0-.7.3Zm-16 0a1 1 0 0 0-.3.7c0 .3.1.5.3.7.2.2.4.3.7.3s.5-.1.7-.3A1 1 0 0 0 5 16a1 1 0 0 0-.3-.7A1 1 0 0 0 4 15a1 1 0 0 0-.7.3Zm5-11A1 1 0 0 0 8 5a1 1 0 0 0 1 1c.3 0 .5-.1.7-.3A1 1 0 0 0 10 5a1 1 0 0 0-.3-.7A1 1 0 0 0 9 4a1 1 0 0 0-.7.3Zm6 0a1 1 0 0 0-.3.7 1 1 0 0 0 1 1c.3 0 .5-.1.7-.3A1 1 0 0 0 16 5a1 1 0 0 0-.3-.7A1 1 0 0 0 15 4a1 1 0 0 0-.7.3Zm-6 16a1 1 0 0 0-.3.7c0 .3.1.5.3.7.2.2.4.3.7.3s.5-.1.7-.3a1 1 0 0 0 .3-.7 1 1 0 0 0-.3-.7A1 1 0 0 0 9 20a1 1 0 0 0-.7.3Zm6 0a1 1 0 0 0-.3.7c0 .3.1.5.3.7.2.2.4.3.7.3s.5-.1.7-.3a1 1 0 0 0 .3-.7 1 1 0 0 0-.3-.7 1 1 0 0 0-.7-.3 1 1 0 0 0-.7.3ZM7.6 8.6A2 2 0 0 0 7 10c0 .6.2 1 .6 1.4.4.4.8.6 1.4.6s1-.2 1.4-.6c.4-.4.6-.8.6-1.4s-.2-1-.6-1.4A2 2 0 0 0 9 8a2 2 0 0 0-1.4.6Zm0 6A2 2 0 0 0 7 16c0 .6.2 1 .6 1.4.4.4.8.6 1.4.6s1-.2 1.4-.6c.4-.4.6-.8.6-1.4s-.2-1-.6-1.4A2 2 0 0 0 9 14a2 2 0 0 0-1.4.6Zm6-6A2 2 0 0 0 13 10c0 .6.2 1 .6 1.4.4.4.8.6 1.4.6s1-.2 1.4-.6c.4-.4.6-.8.6-1.4s-.2-1-.6-1.4A2 2 0 0 0 15 8a2 2 0 0 0-1.4.6Zm0 6A2 2 0 0 0 13 16c0 .6.2 1 .6 1.4.4.4.8.6 1.4.6s1-.2 1.4-.6c.4-.4.6-.8.6-1.4s-.2-1-.6-1.4A2 2 0 0 0 15 14a2 2 0 0 0-1.4.6Z"/></svg>',
-    'box': '<svg width="24" height="24"><path d="M3.8 7a1 1 0 0 0-.7.6l-.1 3V13.8a3.5 3.5 0 0 0 4 2.7c.8-.2 1.4-.5 2-1l.3-.3.3.2c.7.7 1.4 1 2.4 1.1 1.2 0 2.4-.6 3-1.6.9-1.2.8-2.8 0-4a3.7 3.7 0 0 0-2-1.2c-.4-.1-1.2-.1-1.6 0a3.4 3.4 0 0 0-1.7 1l-.3.2-.2-.1c-.4-.5-1.2-1-2-1.1-.6-.2-1.5 0-2 .2H5V9c0-1.3 0-1.3-.3-1.6a1 1 0 0 0-1-.3Zm12 2.6c-.3.2-.5.4-.6.8v.6l.9 1 .7 1v.1l-.8 1-.7 1a1 1 0 0 0 0 .7 1 1 0 0 0 1.3.6c.2 0 .3-.2 1-1l.5-.7.6.8.7.8c.4.3 1 .3 1.3 0l.2-.3a1 1 0 0 0 0-.8l-.8-1.2-.7-1a26 26 0 0 0 1.5-2 .8.8 0 0 0 .1-.4c0-.4-.1-.7-.5-.9H20c-.4 0-.5 0-1.2.8l-.7.8-.6-.7-.7-.9a1 1 0 0 0-1 0Zm-9 2 .4.1c.3.1.6.5.7.8l.1.6v.6c-.6 1-2 1.2-2.7.3-.3-.3-.3-.5-.3-1v-.5c.3-.5.7-.8 1.1-1a1.5 1.5 0 0 1 .7 0Zm5.7 0c.4 0 .8.4 1 .8l.2.6-.1.7c-.5.9-1.6 1.1-2.4.6a1.4 1.4 0 0 1-.6-1.1 1.4 1.4 0 0 1 .5-1.2 1.5 1.5 0 0 1 1.4-.4Z"/></svg>',
-    'camera': '<svg height="24" width="24"><g clip-rule="evenodd" fill-rule="evenodd"><path d="M10 5.4a1 1 0 0 1 .8-.4h4.4a1 1 0 0 1 .8.4l1.2 1.8h2.3A2.5 2.5 0 0 1 22 9.6v8a2.5 2.5 0 0 1-2.5 2.5h-13A2.5 2.5 0 0 1 4 17.6v-8a2.5 2.5 0 0 1 2.5-2.4h2.3zM11.4 7l-1.2 1.7a1 1 0 0 1-.8.5h-3a.5.5 0 0 0-.4.4v8a.5.5 0 0 0 .5.5h13a.5.5 0 0 0 .5-.5v-8a.5.5 0 0 0-.5-.4h-2.9a1 1 0 0 1-.8-.5L14.6 7z"/><path d="M13 11.4a2 2 0 1 0 0 3.8 2 2 0 0 0 0-3.8zm-4 1.9a4 4 0 1 1 8 0 4 4 0 0 1-8 0z"/></g></svg>',
-    'caption': '<svg height="24" width="24"><path d="M6 16h8v-2H6zm10 0h2v-2h-2zM4 20a2 2 0 0 1-1.5-.6A2 2 0 0 1 2 18V6c0-.6.2-1 .6-1.4A2 2 0 0 1 4 4h16c.6 0 1 .2 1.4.6.4.4.6.9.6 1.4v12c0 .6-.2 1-.6 1.4a2 2 0 0 1-1.4.6zm0-2h16V6H4z"/></svg>',
-    'dropbox': '<svg height="24" width="24"><path clip-rule="evenodd" d="m6.4 9.3-3-2a1 1 0 0 1 0-1.6l4-2.5a1 1 0 0 1 1 0L12 5.5l3.6-2.3a1 1 0 0 1 1 0l4 2.5a1 1 0 0 1 0 1.7l-3 1.9 3 1.9a1 1 0 0 1 0 1.6l-2.9 1.9V16c0 .3-.1.6-.4.8l-4.5 3a1 1 0 0 1-1.2 0l-4.4-3a1 1 0 0 1-.5-.9v-1l-3.2-2.2a1 1 0 0 1 0-1.6zm3 0L12 7.5l2.6 1.8L12 11zM8.9 15v.4l3.3 2.3 3.4-2.3v-.2L12 13l-3.1 2zm-1-10-2 1.4 2 1.3 2-1.3zm8.2 0-2 1.4 2 1.3 2-1.3zm-2 6.9 2-1.3 2 1.3-2 1.3-2-1.3zm-8.3 0 2-1.3L10 12l-2 1.3-2-1.3z" fill-rule="evenodd"/></svg>',
-    'evernote': '<svg width="24" height="24"><path fill-rule="evenodd" d="m9.5 3-.3.1-2.6 2.6C3.8 8.5 4 8.2 4 8.7c0 1.3.3 3 .6 4.3.5 2 1.1 3.2 2 3.7l1.2.3c1 .2 1.5.2 2.2.2 1.3 0 1.7 0 2.2-.4.3-.2.3-.4.4-1a38.4 38.4 0 0 1 .3-.4l.3.1 1.8.1h1.6v-1.8H14l-.1-.2a6.8 6.8 0 0 1-.5-1c-.2-.4-.3-.6-.5-.7a.8.8 0 0 0-.5-.1.9.9 0 0 0-.8.5l-.4 1.6-.3 1.5H9.4l-2-.3a1 1 0 0 1-.1-.2A10.1 10.1 0 0 1 6 9.7v-.2h4l.5-.5V5H12c.4.2.7.7.8 1.1a1 1 0 0 0 .2.6c.2.2.3.2 1 .3 1.2 0 2 .2 2.5.6.4.2.8.7 1 1.2.3 1.2.5 4 .3 6.4 0 1.8-.4 3.4-.8 4h-.7a8 8 0 0 1-.8 0c-.2 0-.3-.3-.2-.5a.5.5 0 0 1 .4-.3h.9v-1.8H16c-.7 0-.9 0-1.2.2-.9.4-1.4 1.2-1.4 2.1l.1.4.1.2a1 1 0 0 1 .1.2c.3.7.8 1.2 1.4 1.3l1.2.1h1.2a2 2 0 0 0 1-.8 9 9 0 0 0 1.1-4.3c.2-3 0-6.3-.4-7.7A4.3 4.3 0 0 0 16 5.3a7 7 0 0 0-1.3-.2 7.2 7.2 0 0 1-.4 0 5.5 5.5 0 0 1 0-.3c-.2-.5-.6-1-1.2-1.4a3 3 0 0 0-.5-.2c-.4-.2-.5-.2-1.8-.2a26.5 26.5 0 0 0-1.3 0Zm-.8 4v.7H7.2l.7-.8.8-.7v.7Zm7 3.5c-.4 0-.7.5-.9 1v.7h.3c.7 0 1.1.2 1.5.6l.3.2.3-.6V11a1 1 0 0 0-.6-.4 2 2 0 0 0-.8 0Z" clip-rule="evenodd"/></svg>',
-    'exposure': '<svg width="24" height="24"><path d="M5 21a2 2 0 0 1-1.4-.6A2 2 0 0 1 3 19V5c0-.6.2-1 .6-1.4A2 2 0 0 1 5 3h14c.6 0 1 .2 1.4.6.4.4.6.8.6 1.4v14c0 .6-.2 1-.6 1.4a2 2 0 0 1-1.4.6H5Zm0-2h14V5L5 19Zm9.5-1v-2h-2v-1.5h2v-2H16v2h2V16h-2v2h-1.5ZM6 8.5h5V7H6v1.5Z"/></svg>',
-    'fb': '<svg width="24" height="24"><path fill-rule="evenodd" d="M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-11 6.7V14H8.1v-2.5h2v-1C10 8.2 11.5 7 12.8 7H16v2.5h-2.4c-.8 0-1 .7-1 1.3v.7h3.2l-1 2.5h-2v5a7 7 0 1 0-2.8-.2Z" clip-rule="evenodd"/></svg>',
-    'flickr': '<svg width="24" height="24"><path d="M8.2 15.3c1.7 0 3.1-1.4 3.1-3.1A3.2 3.2 0 0 0 8.1 9 3.2 3.2 0 0 0 5 12.2c0 1.7 1.4 3 3.2 3Zm7.6 0c1.7 0 3.2-1.4 3.2-3.1a3.2 3.2 0 0 0-6.3 0c0 1.7 1.4 3 3.1 3Z"/></svg>',
-    'folder': '<svg width="24" height="24"><path fill-rule="evenodd" d="M5.6 6a.6.6 0 0 0-.6.6v11.2a.6.6 0 0 0 .6.6h12.8a.6.6 0 0 0 .6-.6V9a.6.6 0 0 0-.6-.6h-7.2a1 1 0 0 1-.8-.4L9 6H5.6ZM3.8 4.8A2.6 2.6 0 0 1 5.6 4h4a1 1 0 0 1 .8.4l1.3 2h6.7A2.6 2.6 0 0 1 21 9v8.8a2.6 2.6 0 0 1-2.6 2.6H5.6A2.6 2.6 0 0 1 3 17.8V6.6c0-.7.3-1.4.8-1.8Z" clip-rule="evenodd"/></svg>',
-    'google-drive': '<svg height="24" width="24"><path clip-rule="evenodd" d="M8.7 4.5a1 1 0 0 1 .9-.5h4.8a1 1 0 0 1 .9.5l5.6 9.7a1 1 0 0 1 0 1l-2.4 4.2a1 1 0 0 1-.9.5H6.4a1 1 0 0 1-.9-.5l-2.4-4.2a1 1 0 0 1 0-1zM10.2 6l-4.5 7.7h2.5L12.7 6h-2.5zm4.2 1 4.4 7.7-1.2 2.2-4.4-7.7zM12 11.2l-1.5 2.5h3zm2.6 4.5H5.7L7 17.9h8.9l-1.3-2.2z" fill-rule="evenodd"/></svg>',
-    'google-photos': '<svg width="24" height="24"><path fill-rule="evenodd" d="M12.4 3c-.8 0-1.4.7-1.4 1.4v3.2a5 5 0 0 0-8 4c0 .8.6 1.4 1.4 1.4h3.2a5 5 0 0 0-1 3 5 5 0 0 0 5 5c.8 0 1.4-.6 1.4-1.4v-3.2a5 5 0 0 0 8-4c0-.8-.7-1.4-1.4-1.4h-3.2a5 5 0 0 0-4-8Zm.6 8V5a3 3 0 0 1 2.4 3 3 3 0 0 1-2.4 3Zm-2 0H5a3 3 0 0 1 3-2.4 3 3 0 0 1 3 2.4Zm2 2a3 3 0 0 0 3 2.4 3 3 0 0 0 3-2.4h-6Zm-4.4 3a3 3 0 0 1 2.4-3v6a3 3 0 0 1-2.4-3Z" clip-rule="evenodd"/></svg>',
-    'grayscale': '<svg height="24" width="24"><g clip-rule="evenodd" fill-rule="evenodd"><path d="M12 15v2a5 5 0 0 0 0-10v2a3 3 0 1 0 0 6zm0 0a3 3 0 1 0 0-6z"/><path d="M5 21a2 2 0 0 1-1.4-.6A2 2 0 0 1 3 19V5c0-.6.2-1 .6-1.4A2 2 0 0 1 5 3h14c.6 0 1 .2 1.4.6.4.4.6.8.6 1.4v14c0 .6-.2 1-.6 1.4a2 2 0 0 1-1.4.6zm7-2h7V5h-7v2a5 5 0 0 0 0 10z"/></g></svg>',
-    'huddle': '<svg height="24" width="24"><path d="M10.3 5.6V8h.8v-2l3.5 2 4.3-2.5L14.6 3l-4.3 2.6zM14.6 8v5.2l4.3-2.6V5.6L14.6 8zM6 13.3v2.5h.9v-2l3.4 2 4.3-2.5-4.3-2.6zm4.3 2.6V21l4.3-2.6v-5.1l-4.3 2.6z"/></svg>',
-    'image-decorative': '<svg width="24" height="24"><path d="M12 10c.3 0 .5-.1.7-.3A1 1 0 0 0 13 9a1 1 0 0 0-.3-.7A1 1 0 0 0 12 8a1 1 0 0 0-.7.3 1 1 0 0 0-.3.7 1 1 0 0 0 1 1Zm0 6a3 3 0 0 1-1.8-.5A3 3 0 0 1 9.1 14a2 2 0 0 0-.2 0 3 3 0 0 1-2.5-1 3 3 0 0 1-.9-2.2A3 3 0 0 1 6.2 9a3.4 3.4 0 0 1-.5-1 3 3 0 0 1-.2-1 3 3 0 0 1 1-2.2A3 3 0 0 1 8.8 4H9a3 3 0 0 1 1.1-1.4A3 3 0 0 1 12 2a3 3 0 0 1 1.8.5c.5.4.9.9 1.1 1.5h.2a3 3 0 0 1 2.5.8 3 3 0 0 1 .9 2.3c0 .3 0 .7-.2 1a2.8 2.8 0 0 1-.5.9l.5 1 .2 1a3 3 0 0 1-1 2.2 3 3 0 0 1-2.4.9 1.8 1.8 0 0 0-.2 0 3 3 0 0 1-1.1 1.4 3 3 0 0 1-1.8.5Zm0 7a8.7 8.7 0 0 1 .7-3.5 9.2 9.2 0 0 1 2-2.8 9.2 9.2 0 0 1 2.8-2A8.6 8.6 0 0 1 21 14a8.6 8.6 0 0 1-.7 3.5 9.2 9.2 0 0 1-2 2.8 9.2 9.2 0 0 1-2.8 2 8.6 8.6 0 0 1-3.5.7Zm2.5-2.5a6.8 6.8 0 0 0 2.4-1.5 6.8 6.8 0 0 0 1.7-2.6c-1 .4-1.8 1-2.6 1.7a6.8 6.8 0 0 0-1.5 2.4ZM12 23a8.6 8.6 0 0 0-.7-3.5 9.2 9.2 0 0 0-2-2.9 9.2 9.2 0 0 0-2.8-1.9A8.6 8.6 0 0 0 3 14a8.7 8.7 0 0 0 .7 3.5 9.2 9.2 0 0 0 2 2.9 9.2 9.2 0 0 0 2.8 1.9 8.6 8.6 0 0 0 3.5.7Zm-2.5-2.5A6.8 6.8 0 0 1 7.2 19a6.8 6.8 0 0 1-1.6-2.6c.9.4 1.7 1 2.5 1.7a6.8 6.8 0 0 1 1.6 2.4Zm5.9-8.4c.3 0 .5-.1.8-.4.2-.2.3-.5.3-.8 0-.2 0-.4-.2-.6a1.3 1.3 0 0 0-.5-.4l-.8-.4a3 3 0 0 1-.2.5 3.8 3.8 0 0 1-.2.5 2.5 2.5 0 0 1-.3.4 4 4 0 0 1-.4.4l.8.6a.8.8 0 0 0 .3.1h.4ZM15 8.5l.8-.4.5-.4.2-.6a1.1 1.1 0 0 0-.3-.8 1 1 0 0 0-.8-.4 1.1 1.1 0 0 0-.7.2l-.8.6.4.4.3.4a3.9 3.9 0 0 1 .4 1Zm-4-2.3a2.7 2.7 0 0 1 1-.2 2.7 2.7 0 0 1 1 .2l.2-1.1c0-.3-.1-.6-.4-.8A1.2 1.2 0 0 0 12 4c-.3 0-.6.1-.8.3-.3.2-.4.5-.3.8v1.1Zm1 7.8c.3 0 .6-.1.8-.3.3-.2.4-.5.3-.8v-1.1a2.7 2.7 0 0 1-1.1.2 2.7 2.7 0 0 1-1-.2l-.2 1.1c0 .3.1.6.4.8.2.2.5.3.8.3ZM9 8.5a3 3 0 0 1 .4-1l.3-.4.4-.4-.8-.6A.9.9 0 0 0 9 6a1.2 1.2 0 0 0-.3 0c-.4 0-.6 0-.9.3a1.1 1.1 0 0 0-.3.8c0 .2 0 .4.2.6l.5.4.9.4Zm-.3 3.6H9l.3-.2.8-.6a5.5 5.5 0 0 1-.4-.4 2.1 2.1 0 0 1-.3-.4 3.8 3.8 0 0 1-.2-.5 3 3 0 0 1-.1-.5l-1 .4-.4.4a1.1 1.1 0 0 0-.2.6c0 .3.2.6.4.8.2.2.4.4.7.4Z"/></svg>',
-    'image-enhancements': '<svg height="24" width="24"><path d="M5.3 21a2 2 0 0 1-1.5-.6 2 2 0 0 1-.6-1.4V5c0-.6.2-1 .6-1.4A2 2 0 0 1 5.2 3H13v2H5.2v14h14v-8h2v8c0 .6-.1 1-.5 1.4a2 2 0 0 1-1.4.6z"/><path d="M11 9a4 4 0 0 0 4 4 4 4 0 0 0-4 4 4 4 0 0 0-4-4 4 4 0 0 0 4-4zm5.5-6c.2 2.1 2.2 4.1 4.5 4.5-2.3.4-4.3 2.4-4.5 4.5A5.2 5.2 0 0 0 12 7.5 5.2 5.2 0 0 0 16.5 3z"/></svg>',
-    'instagram': '<svg height="24" width="24"><path clip-rule="evenodd" d="M10.1 9a4 4 0 1 1 4.4 6.6A4 4 0 0 1 10.1 9zm2.2 1.3a2 2 0 1 0 0 4 2 2 0 0 0 0-4z" fill-rule="evenodd"/><path d="M16 9.3a1.3 1.3 0 1 0 0-2.6 1.3 1.3 0 0 0 0 2.6z"/><path clip-rule="evenodd" d="M3 6a3 3 0 0 1 3-3h12a3 3 0 0 1 3 3v12a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3zm3-1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1z" fill-rule="evenodd"/></svg>',
-    'onedrive': '<svg height="24" width="24"><path d="M4 13.7h1zm16 .7h-1zm-11.7-4A4.4 4.4 0 0 1 12.1 8V6a6.4 6.4 0 0 0-5.6 3.4l1.8 1zM12.1 8c2 0 3.6 1.4 4 2.8l2-.5A6.3 6.3 0 0 0 12 6v2zm8.1 6.8-9.8-5.5-1 1.8 9.8 5.5 1-1.8zm-9.8-5.5A5 5 0 0 0 3 13.7h2A3 3 0 0 1 9.5 11l1-1.8zM3 13.7a5 5 0 0 0 1 2.8l1.5-1.1a3 3 0 0 1-.5-1.7zm15.8 1.6a2.3 2.3 0 0 1-2 1.4v2a4.3 4.3 0 0 0 3.9-2.6zm-2 1.4H8v2h8.7zm-8.8 0a3 3 0 0 1-2.5-1.3L4 16.5a5 5 0 0 0 4 2.2v-2zm12.7-.6c.2-.6.3-1.1.3-1.7h-2c0 .3 0 .6-.2.9zm.3-1.7c0-3-3.1-5.1-6-4l.8 1.9a2.3 2.3 0 0 1 3.2 2h2zm-6-4L4.4 15l.8 1.9 10.7-4.6-.7-1.8z"/></svg>',
-    'revert-changes': '<svg height="24" width="24"><path d="m8.9 18.8.4 3.2H13v-2h-2v-2.6a4.6 4.6 0 0 1-1.6-.6 5.9 5.9 0 0 1-1.3-1l-2.5 1-1-1.7 2.2-1.6a4 4 0 0 1-.2-.7 5.9 5.9 0 0 1 0-.8v-.8l.2-.8-2.2-1.6 1-1.7 2.5 1a6 6 0 0 1 1.2-.9l1.4-.6.4-2.6h2l.3 2.6A5.6 5.6 0 0 1 16 8.2l2.5-1 1 1.6-2.2 1.7.2.7v.8a5 5 0 0 1 0 1h2a2.6 2.6 0 0 0 0-.5V11.3l2.6-2-2.8-4.7-3 1.3a8.2 8.2 0 0 0-.5-.4 3.8 3.8 0 0 0-.6-.3L14.8 2H9.3l-.4 3.2a5 5 0 0 0-1.2.7l-3-1.3L2 9.4l2.6 2V12.6l-2.6 2 2.7 4.7 3-1.3a8 8 0 0 0 1.2.7z"/><path d="m14.5 20.3 2.1-2-2.1-2.2 1.4-1.4 2.1 2.1 2.1-2 1.4 1.3-2 2.1 2 2.1-1.4 1.4-2.1-2-2.1 2zM12 14a2 2 0 1 0 0-4 2 2 0 0 0 0 4z"/></svg>',
-    'saturation': '<svg width="24" height="24"><path fill-rule="evenodd" d="M12 20.5a6 6 0 1 1-5.9-10.2 6 6 0 1 1 11.8 0A6 6 0 1 1 12 20.5Zm-1.1-7.7a6 6 0 0 0-.2.3 4.3 4.3 0 0 1-2-1.3c.9.1 1.6.5 2.2 1Zm2.4.3a6 6 0 0 0-.2-.3 4.3 4.3 0 0 1 2.2-1 4.3 4.3 0 0 1-2 1.3ZM12.2 15a6.3 6.3 0 0 1-.4 0 4.3 4.3 0 0 0 .2 2.5 4.3 4.3 0 0 0 .2-2.5Zm.9 4.2a6 6 0 0 0 .8-4.5 6 6 0 0 0 3.4-2.8 4.3 4.3 0 0 1-1.3 8.4 4.3 4.3 0 0 1-2.9-1.1Zm-2.2 0a4.3 4.3 0 1 1-4.2-7.3 6 6 0 0 0 3.4 2.8 6 6 0 0 0 .8 4.5Zm-3-9.2a4.3 4.3 0 1 1 8.3 0 6 6 0 0 0-4.2 1.5A6 6 0 0 0 7.8 10Z" clip-rule="evenodd"/></svg>',
-    'transform-image': '<svg height="24" width="24"><path d="M3 21v-6h2V9H3V3h6v2h6V3h6v6h-2v6h2v6h-6v-2H9v2zm6-4h6v-2h2V9h-2V7H9v2H7v6h2zM5 7h2V5H5zm12 0h2V5h-2zm0 12h2v-2h-2zM5 19h2v-2H5z"/></svg>',
-    'vibrance': '<svg height="24" width="24"><path clip-rule="evenodd" d="M12 20 22 4H2zm2.6-8 1.3-2H8l1.3 2h5.2zm-1.2 2h-2.8l1.4 2.2zm5-8L17 8H7L5.6 6h12.8z" fill-rule="evenodd"/></svg>',
-    'vk': '<svg width="24" height="24"><path fill-rule="evenodd" d="M14.8 17.4a2 2 0 0 1-1.3.7 8 8 0 0 1-7.7-3.6c-1.4-2-2.2-4.4-2.6-5.7L3 8.6A2 2 0 0 1 5 6h2.5c.4 0 .8.1 1.2.4A2 2 0 0 1 9.8 6h3.5a2 2 0 0 1 1.4.6 2 2 0 0 1 1.5-.6h2.4a2 2 0 0 1 2 2.5c-.5 1.5-1.2 2.6-1.8 3.6a12.5 12.5 0 0 1 2 3.2A2 2 0 0 1 19 18h-2.6a2 2 0 0 1-1.3-.5 6.9 6.9 0 0 1-.3-.2Zm.5-2.5-1.2-1a3 3 0 0 0-.8-.2v2.4h-1.7a5.6 5.6 0 0 1-.3 0c-3-.7-4.7-3.7-5.6-6.1A38.1 38.1 0 0 1 5 8.1V8h2.5a80.5 80.5 0 0 1 1.2 2.5c.6 1.2 1.2 2 2 2.1V9l-.9-1h3.5v4.1a5 5 0 0 0 .4-.3c.7-.7 1.2-1.4 1.6-2.2l.2-.3.7-1.3h2.4a8.5 8.5 0 0 1-.8 2l-1.3 2-.3.3a10.5 10.5 0 0 1 2.8 3.8h-2.6l-.8-.9a20.6 20.6 0 0 0-.3-.3Z" clip-rule="evenodd"/></svg>',
-    'warmth': '<svg height="24" width="24"><path d="M12 21.1c-1.4 0-2.6-.5-3.6-1.5s-1.5-2.1-1.5-3.5c0-.8.2-1.6.6-2.2A5 5 0 0 1 8.9 12v-6c0-.8.3-1.5 1-2.1a2.9 2.9 0 0 1 2-.9c.9 0 1.6.3 2.2.9.5.6.8 1.3.8 2.1v6a5 5 0 0 1 1.5 1.8A4.9 4.9 0 0 1 17 16c0 1.4-.5 2.6-1.4 3.5s-2.2 1.5-3.6 1.5zm-3-5h6c0-.5-.2-1-.4-1.4a3 3 0 0 0-.9-1l-.8-.6v-7a1 1 0 0 0-.3-.7A1 1 0 0 0 12 5a1 1 0 0 0-.7.3 1 1 0 0 0-.3.7v7l-.8.6a2.9 2.9 0 0 0-.9 1 3 3 0 0 0-.3 1.4z"/></svg>',
-    'user': '<svg width="24" height="24"><path d="M12 24a12 12 0 1 1 0-24 12 12 0 0 1 0 24Zm-8.7-5.3a11 11 0 0 0 17.4 0C19.4 16.3 14.6 15 12 15c-2.6 0-7.4 1.3-8.7 3.7ZM12 13c2.2 0 4-2 4-4.5S14.2 4 12 4 8 6 8 8.5 9.8 13 12 13Z" fill-rule="nonzero"/></svg>',
-    'vertical-align': '<svg width="24" height="24"><g fill-rule="nonzero"><rect width="18" height="2" x="3" y="11" rx="1"/><path d="M12 2c.6 0 1 .4 1 1v4l2-1.3a1 1 0 0 1 1.2 1.5l-.1.1-4.1 3-4-3a1 1 0 0 1 1-1.7l2 1.5V3c0-.6.4-1 1-1zm0 11.8 4 2.9a1 1 0 0 1-1 1.7l-2-1.5V21c0 .5-.4 1-.9 1H12a1 1 0 0 1-1-1v-4l-2 1.3a1 1 0 0 1-1.2-.1l-.1-.1a1 1 0 0 1 .1-1.3l.1-.1 4.1-3z"/></g></svg>',
-    'visualblocks': '<svg width="24" height="24"><path d="M9 19v2H7v-2h2Zm-4 0v2a2 2 0 0 1-2-2h2Zm8 0v2h-2v-2h2Zm8 0a2 2 0 0 1-2 2v-2h2Zm-4 0v2h-2v-2h2ZM15 7a1 1 0 0 1 0 2v7a1 1 0 0 1-2 0V9h-1v7a1 1 0 0 1-2 0v-4a2.5 2.5 0 0 1-.2-5H15ZM5 15v2H3v-2h2Zm16 0v2h-2v-2h2ZM5 11v2H3v-2h2Zm16 0v2h-2v-2h2ZM5 7v2H3V7h2Zm16 0v2h-2V7h2ZM5 3v2H3c0-1.1.9-2 2-2Zm8 0v2h-2V3h2Zm6 0a2 2 0 0 1 2 2h-2V3ZM9 3v2H7V3h2Zm8 0v2h-2V3h2Z" fill-rule="evenodd"/></svg>',
-    'visualchars': '<svg width="24" height="24"><path d="M10 5h7a1 1 0 0 1 0 2h-1v11a1 1 0 0 1-2 0V7h-2v11a1 1 0 0 1-2 0v-6c-.5 0-1 0-1.4-.3A3.4 3.4 0 0 1 6.8 10a3.3 3.3 0 0 1 0-2.8 3.4 3.4 0 0 1 1.8-1.8L10 5Z" fill-rule="evenodd"/></svg>',
-    'warning': '<svg width="24" height="24"><path d="M19.8 18.3c.2.5.3.9 0 1.2-.1.3-.5.5-1 .5H5.2c-.5 0-.9-.2-1-.5-.3-.3-.2-.7 0-1.2L11 4.7l.5-.5.5-.2c.2 0 .3 0 .5.2.2 0 .3.3.5.5l6.8 13.6ZM12 18c.3 0 .5-.1.7-.3.2-.2.3-.4.3-.7a1 1 0 0 0-.3-.7 1 1 0 0 0-.7-.3 1 1 0 0 0-.7.3 1 1 0 0 0-.3.7c0 .3.1.5.3.7.2.2.4.3.7.3Zm.7-3 .3-4a1 1 0 0 0-.3-.7 1 1 0 0 0-.7-.3 1 1 0 0 0-.7.3 1 1 0 0 0-.3.7l.3 4h1.4Z" fill-rule="evenodd"/></svg>',
-    'zoom-in': '<svg width="24" height="24"><path d="M16 17.3a8 8 0 1 1 1.4-1.4l4.3 4.4a1 1 0 0 1-1.4 1.4l-4.4-4.3Zm-5-.3a6 6 0 1 0 0-12 6 6 0 0 0 0 12Zm-1-9a1 1 0 0 1 2 0v6a1 1 0 0 1-2 0V8Zm-2 4a1 1 0 0 1 0-2h6a1 1 0 0 1 0 2H8Z" fill-rule="nonzero"/></svg>',
-    'zoom-out': '<svg width="24" height="24"><path d="M16 17.3a8 8 0 1 1 1.4-1.4l4.3 4.4a1 1 0 0 1-1.4 1.4l-4.4-4.3Zm-5-.3a6 6 0 1 0 0-12 6 6 0 0 0 0 12Zm-3-5a1 1 0 0 1 0-2h6a1 1 0 0 1 0 2H8Z" fill-rule="nonzero"/></svg>',
-  }
-});

static/tinymce/icons/default/index.js

@@ -1,7 +0,0 @@
-// Exports the "default" icons for usage with module loaders
-// Usage:
-//   CommonJS:
-//     require('tinymce/icons/default')
-//   ES2015:
-//     import 'tinymce/icons/default'
-require('./icons.js');

static/tinymce/models/dom/index.js

@@ -1,7 +0,0 @@
-// Exports the "dom" model for usage with module loaders
-// Usage:
-//   CommonJS:
-//     require('tinymce/models/dom')
-//   ES2015:
-//     import 'tinymce/models/dom'
-require('./model.js');

static/tinymce/plugins/accordion/index.js

@@ -1,7 +0,0 @@
-// Exports the "accordion" plugin for usage with module loaders
-// Usage:
-//   CommonJS:
-//     require('tinymce/plugins/accordion')
-//   ES2015:
-//     import 'tinymce/plugins/accordion'
-require('./plugin.js');