Merge branch 'main' into gitee

build/optimize.ts

@@ -37,6 +37,7 @@ const include = [
   "@pureadmin/utils",
   "@wangeditor/editor",
   "responsive-storage",
+  "plus-pro-components",
   "@howdyjs/mouse-menu",
   "@logicflow/extension",
   "vue-virtual-scroller",

locales/en.yaml

@@ -67,6 +67,7 @@ menus:
   hsCollapse: Collapse
   hsProgress: Progress
   hsUpload: File Upload
+  hsCheckCard: CheckCard
   hsmenus: MultiLevel Menu
   hsmenu1: Menu1
   hsmenu1-1: Menu1-1

locales/zh-CN.yaml

@@ -67,6 +67,7 @@ menus:
   hsCollapse: 折叠面板
   hsProgress: 进度条
   hsUpload: 文件上传
+  hsCheckCard: 多选卡片
   hsmenus: 多级菜单
   hsmenu1: 菜单1
   hsmenu1-1: 菜单1-1

package.json

@@ -78,6 +78,7 @@
     "path": "^0.12.7",
     "pinia": "^2.1.7",
     "pinyin-pro": "^3.19.6",
+    "plus-pro-components": "^0.0.1",
     "qrcode": "^1.5.3",
     "qs": "^6.11.2",
     "responsive-storage": "^2.2.0",

pnpm-lock.yaml

@@ -95,6 +95,9 @@ dependencies:
   pinyin-pro:
     specifier: ^3.19.6
     version: 3.19.6
+  plus-pro-components:
+    specifier: ^0.0.1
+    version: 0.0.1(element-plus@2.5.6)(vue@3.4.14)
   qrcode:
     specifier: ^1.5.3
     version: 1.5.3
@@ -6709,6 +6712,19 @@ packages:
       mlly: 1.6.1
       pathe: 1.1.2
 
+  /plus-pro-components@0.0.1(element-plus@2.5.6)(vue@3.4.14):
+    resolution: {integrity: sha512-S4qvM6MF12y/G6ueqvgavVw8hVCIjVeO/Qol9uCiMpEJmxH60CfnfMVrx1mmea0jWquPWXFSk5U/Y1I2ua0BEQ==}
+    peerDependencies:
+      element-plus: ^2.3.4
+      vue: ^3.2.0
+    dependencies:
+      '@element-plus/icons-vue': 2.3.1(vue@3.4.14)
+      element-plus: 2.5.6(vue@3.4.14)
+      lodash-es: 4.17.21
+      sortablejs: 1.15.2
+      vue: 3.4.14(typescript@5.3.3)
+    dev: false
+
   /pngjs@5.0.0:
     resolution: {integrity: sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==}
     engines: {node: '>=10.13.0'}

src/components/ReIcon/src/offlineIcon.ts

@@ -1,55 +1,54 @@
+// 这里存放本地图标，在 src/layout/index.vue 文件中加载，避免在首启动加载
 import { addIcon } from "@iconify/vue/dist/offline";
 
-/**
+// 本地菜单图标，后端在路由的 icon 中返回对应的图标字符串并且前端在此处使用 addIcon 添加即可渲染菜单图标
- * 这里存放本地图标，在 src/layout/index.vue 文件中加载，避免在首启动加载
+// @iconify-icons/ep
- */
-
-// 本地菜单图标，后端在路由的icon中返回对应的图标字符串并且前端在此处使用addIcon添加即可渲染菜单图标
-import UbuntuFill from "@iconify-icons/ri/ubuntu-fill";
 import Menu from "@iconify-icons/ep/menu";
 import Edit from "@iconify-icons/ep/edit";
-import InformationLine from "@iconify-icons/ri/information-line";
 import SetUp from "@iconify-icons/ep/set-up";
-import TerminalWindowLine from "@iconify-icons/ri/terminal-window-line";
 import Guide from "@iconify-icons/ep/guide";
-import HomeFilled from "@iconify-icons/ep/home-filled";
-import Card from "@iconify-icons/ri/bank-card-line";
-import ListCheck from "@iconify-icons/ri/list-check";
-import Histogram from "@iconify-icons/ep/histogram";
-import Ppt from "@iconify-icons/ri/file-ppt-2-line";
-import CheckboxCircleLine from "@iconify-icons/ri/checkbox-circle-line";
-import FlUser from "@iconify-icons/ri/admin-line";
-import Role from "@iconify-icons/ri/admin-fill";
-import Setting from "@iconify-icons/ri/settings-3-line";
-import Dept from "@iconify-icons/ri/git-branch-line";
-import Search from "@iconify-icons/ri/search-line";
-import Lollipop from "@iconify-icons/ep/lollipop";
 import Monitor from "@iconify-icons/ep/monitor";
-import Tag from "@iconify-icons/ri/bookmark-2-line";
+import Lollipop from "@iconify-icons/ep/lollipop";
-import Table from "@iconify-icons/ri/table-line";
+import Histogram from "@iconify-icons/ep/histogram";
-import Info from "@iconify-icons/ri/file-info-line";
+import HomeFilled from "@iconify-icons/ep/home-filled";
-import Artboard from "@iconify-icons/ri/artboard-line";
-addIcon("ubuntuFill", UbuntuFill);
 addIcon("ep:menu", Menu);
-addIcon("edit", Edit);
+addIcon("ep:edit", Edit);
-addIcon("informationLine", InformationLine);
+addIcon("ep:set-up", SetUp);
-addIcon("setUp", SetUp);
+addIcon("ep:guide", Guide);
-addIcon("terminalWindowLine", TerminalWindowLine);
-addIcon("guide", Guide);
-addIcon("homeFilled", HomeFilled);
-addIcon("card", Card);
-addIcon("listCheck", ListCheck);
-addIcon("histogram", Histogram);
-addIcon("ppt", Ppt);
-addIcon("checkboxCircleLine", CheckboxCircleLine);
-addIcon("ri:admin-line", FlUser);
-addIcon("ri:admin-fill", Role);
-addIcon("ri:settings-3-line", Setting);
-addIcon("ri:git-branch-line", Dept);
-addIcon("search", Search);
-addIcon("ep:lollipop", Lollipop);
 addIcon("ep:monitor", Monitor);
+addIcon("ep:lollipop", Lollipop);
+addIcon("ep:histogram", Histogram);
+addIcon("ep:home-filled", HomeFilled);
+// @iconify-icons/ri
+import Tag from "@iconify-icons/ri/bookmark-2-line";
+import Ppt from "@iconify-icons/ri/file-ppt-2-line";
+import Card from "@iconify-icons/ri/bank-card-line";
+import Role from "@iconify-icons/ri/admin-fill";
+import Info from "@iconify-icons/ri/file-info-line";
+import Dept from "@iconify-icons/ri/git-branch-line";
+import Table from "@iconify-icons/ri/table-line";
+import Search from "@iconify-icons/ri/search-line";
+import FlUser from "@iconify-icons/ri/admin-line";
+import Setting from "@iconify-icons/ri/settings-3-line";
+import Artboard from "@iconify-icons/ri/artboard-line";
+import ListCheck from "@iconify-icons/ri/list-check";
+import UbuntuFill from "@iconify-icons/ri/ubuntu-fill";
+import InformationLine from "@iconify-icons/ri/information-line";
+import TerminalWindowLine from "@iconify-icons/ri/terminal-window-line";
+import CheckboxCircleLine from "@iconify-icons/ri/checkbox-circle-line";
 addIcon("ri:bookmark-2-line", Tag);
-addIcon("table", Table);
+addIcon("ri:file-ppt-2-line", Ppt);
-addIcon("info", Info);
+addIcon("ri:bank-card-line", Card);
-addIcon("artboard", Artboard);
+addIcon("ri:admin-fill", Role);
+addIcon("ri:file-info-line", Info);
+addIcon("ri:git-branch-line", Dept);
+addIcon("ri:table-line", Table);
+addIcon("ri:search-line", Search);
+addIcon("ri:admin-line", FlUser);
+addIcon("ri:settings-3-line", Setting);
+addIcon("ri:artboard-line", Artboard);
+addIcon("ri:list-check", ListCheck);
+addIcon("ri:ubuntu-fill", UbuntuFill);
+addIcon("ri:information-line", InformationLine);
+addIcon("ri:terminal-window-line", TerminalWindowLine);
+addIcon("ri:checkbox-circle-line", CheckboxCircleLine);

src/layout/components/search/index.vue

@@ -14,7 +14,7 @@ function handleSearch() {
       class="search-container w-[40px] h-[48px] flex-c cursor-pointer navbar-bg-hover"
       @click="handleSearch"
     >
-      <IconifyIconOffline icon="search" />
+      <IconifyIconOffline icon="ri:search-line" />
     </div>
     <SearchModal v-model:value="show" />
   </div>

src/layout/types.ts

@@ -8,7 +8,7 @@ export const routerArrays: Array<RouteConfigs> =
           path: "/welcome",
           meta: {
             title: "menus.hshome",
-            icon: "homeFilled"
+            icon: "ep:home-filled"
           }
         }
       ]

src/router/modules/able.ts

@@ -5,7 +5,7 @@ export default {
   path: "/able",
   redirect: "/able/watermark",
   meta: {
-    icon: "ubuntuFill",
+    icon: "ri:ubuntu-fill",
     title: $t("menus.hsAble"),
     rank: able
   },

src/router/modules/about.ts

@@ -5,7 +5,7 @@ export default {
   path: "/about",
   redirect: "/about/index",
   meta: {
-    icon: "info",
+    icon: "ri:file-info-line",
     title: $t("menus.hsAbout"),
     rank: about
   },

src/router/modules/board.ts

@@ -6,7 +6,7 @@ export default {
   path: "/board",
   redirect: "/board/index",
   meta: {
-    icon: "artboard",
+    icon: "ri:artboard-line",
     title: $t("menus.hsboard"),
     rank: board
   },

src/router/modules/components.ts

@@ -31,7 +31,15 @@ export default {
       name: "PureUpload",
       component: () => import("@/views/components/upload/index.vue"),
       meta: {
-        title: $t("menus.hsUpload"),
+        title: $t("menus.hsUpload")
+      }
+    },
+    {
+      path: "/components/check-card",
+      name: "CheckCard",
+      component: () => import("@/views/components/check-card.vue"),
+      meta: {
+        title: $t("menus.hsCheckCard"),
         extraIcon: "IF-pure-iconfont-new svg"
       }
     },

src/router/modules/editor.ts

@@ -5,7 +5,7 @@ export default {
   path: "/editor",
   redirect: "/editor/index",
   meta: {
-    icon: "edit",
+    icon: "ep:edit",
     title: $t("menus.hseditor"),
     rank: editor
   },

src/router/modules/error.ts

@@ -5,7 +5,7 @@ export default {
   path: "/error",
   redirect: "/error/403",
   meta: {
-    icon: "informationLine",
+    icon: "ri:information-line",
     // showLink: false,
     title: $t("menus.hsabnormal"),
     rank: error

src/router/modules/flowchart.ts

@@ -5,7 +5,7 @@ export default {
   path: "/flow-chart",
   redirect: "/flow-chart/index",
   meta: {
-    icon: "setUp",
+    icon: "ep:set-up",
     title: $t("menus.hsflowChart"),
     rank: flowchart
   },

src/router/modules/formdesign.ts

@@ -6,7 +6,7 @@ export default {
   path: "/form-design",
   redirect: "/form-design/index",
   meta: {
-    icon: "terminalWindowLine",
+    icon: "ri:terminal-window-line",
     title: $t("menus.hsFormDesign"),
     rank: formdesign
   },

src/router/modules/guide.ts

@@ -5,7 +5,7 @@ export default {
   path: "/guide",
   redirect: "/guide/index",
   meta: {
-    icon: "guide",
+    icon: "ep:guide",
     title: $t("menus.hsguide"),
     rank: guide
   },

src/router/modules/home.ts

@@ -9,7 +9,7 @@ export default {
   component: Layout,
   redirect: "/welcome",
   meta: {
-    icon: "homeFilled",
+    icon: "ep:home-filled",
     title: $t("menus.hshome"),
     rank: home
   },

src/router/modules/list.ts

@@ -5,7 +5,7 @@ export default {
   path: "/list",
   redirect: "/list/card",
   meta: {
-    icon: "listCheck",
+    icon: "ri:list-check",
     title: $t("menus.hsList"),
     rank: list
   },
@@ -15,7 +15,7 @@ export default {
       name: "ListCard",
       component: () => import("@/views/list/card/index.vue"),
       meta: {
-        icon: "card",
+        icon: "ri:bank-card-line",
         title: $t("menus.hsListCard"),
         showParent: true
       }

src/router/modules/nested.ts

@@ -6,7 +6,7 @@ export default {
   redirect: "/nested/menu1/menu1-1",
   meta: {
     title: $t("menus.hsmenus"),
-    icon: "histogram",
+    icon: "ep:histogram",
     rank: nested
   },
   children: [

src/router/modules/ppt.ts

@@ -5,7 +5,7 @@ export default {
   path: "/ppt",
   redirect: "/ppt/index",
   meta: {
-    icon: "ppt",
+    icon: "ri:file-ppt-2-line",
     title: "PPT",
     rank: ppt
   },

src/router/modules/result.ts

@@ -5,7 +5,7 @@ export default {
   path: "/result",
   redirect: "/result/success",
   meta: {
-    icon: "checkboxCircleLine",
+    icon: "ri:checkbox-circle-line",
     title: $t("menus.hsResult"),
     rank: result
   },

src/router/modules/table.ts

@@ -5,7 +5,7 @@ export default {
   path: "/pure-table",
   redirect: "/pure-table/index",
   meta: {
-    icon: "table",
+    icon: "ri:table-line",
     title: "pure-admin-table",
     rank: table
   },

src/style/login.css

@@ -10,6 +10,7 @@
 .login-container {
   width: 100vw;
   height: 100vh;
+  max-width: 100%;
   display: grid;
   grid-template-columns: repeat(2, 1fr);
   grid-gap: 18rem;

src/views/components/check-card.vue

@@ -0,0 +1,82 @@
+<script setup lang="ts">
+import { ref, watch } from "vue";
+// https://plus-pro-components.com/components/check-card-group.html
+import { PlusCheckCardGroup } from "plus-pro-components";
+import "plus-pro-components/es/components/check-card-group/style/css";
+
+defineOptions({
+  name: "CheckCard"
+});
+
+const size = ref("default");
+const dynamicSize = ref();
+const list = ref("0");
+const list1 = ref([]);
+
+const options = [
+  {
+    title: "标题一",
+    value: "0",
+    description: "坚持梦想，成就不凡的自己",
+    avatar:
+      "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
+  },
+  {
+    title: "标题二",
+    value: "1",
+    description: "每一次努力，都是成长的契机",
+    avatar:
+      "https://fuss10.elemecdn.com/1/34/19aa98b1fcb2781c4fba33d850549jpeg.jpeg"
+  }
+];
+
+watch(size, val =>
+  val === "disabled"
+    ? (dynamicSize.value = "default")
+    : (dynamicSize.value = size.value)
+);
+</script>
+
+<template>
+  <el-card shadow="never">
+    <template #header>
+      <div class="card-header">
+        <el-space wrap :size="40">
+          <el-link
+            v-tippy="{
+              content: '点击查看详细文档'
+            }"
+            href="https://plus-pro-components.com/components/check-card-group.html"
+            target="_blank"
+            style="font-size: 16px; font-weight: 800"
+          >
+            多选卡片组
+          </el-link>
+          <el-radio-group v-model="size" size="small">
+            <el-radio label="large">大尺寸</el-radio>
+            <el-radio label="default">默认尺寸</el-radio>
+            <el-radio label="small">小尺寸</el-radio>
+            <el-radio label="disabled">禁用</el-radio>
+          </el-radio-group>
+        </el-space>
+      </div>
+    </template>
+
+    <p class="mb-2 mt-4">单选</p>
+    <PlusCheckCardGroup
+      v-model="list"
+      :options="options"
+      :size="dynamicSize"
+      :disabled="size === 'disabled'"
+    />
+
+    <p class="mb-2 mt-4">多选</p>
+    <PlusCheckCardGroup
+      v-model="list1"
+      :options="options"
+      :size="dynamicSize"
+      :disabled="size === 'disabled'"
+      multiple
+    />
+  </el-card>
+</template>

src/views/components/segmented.vue

@@ -86,7 +86,7 @@ const optionsIcon: Array<OptionsType> = [
   },
   {
     label: "周三",
-    icon: "terminalWindowLine"
+    icon: "ri:terminal-window-line"
   },
   {
     label: "周四"
@@ -103,7 +103,7 @@ const optionsOnlyIcon: Array<OptionsType> = [
     icon: HomeFilled
   },
   {
-    icon: "terminalWindowLine"
+    icon: "ri:terminal-window-line"
   },
   {
     icon: "streamline-emojis:cow-face"
@@ -131,7 +131,7 @@ const optionsLabel: Array<OptionsType> = [
   {
     label: () => (
       <div>
-        {h(useRenderIcon("terminalWindowLine"), {
+        {h(useRenderIcon("ri:terminal-window-line"), {
           class: "m-auto mt-1 w-[18px] h-[18px]"
         })}
         <p>周二</p>

src/views/list/card/index.vue

@@ -110,7 +110,7 @@ const handleManageProduct = product => {
           <el-icon class="el-input__icon">
             <IconifyIconOffline
               v-show="searchValue.length === 0"
-              icon="search"
+              icon="ri:search-line"
             />
           </el-icon>
         </template>

src/views/system/dept/index.vue

@@ -58,7 +58,7 @@ const {
       <el-form-item>
         <el-button
           type="primary"
-          :icon="useRenderIcon('search')"
+          :icon="useRenderIcon('ri:search-line')"
           :loading="loading"
           @click="onSearch"
         >

src/views/system/menu/index.vue

@@ -48,7 +48,7 @@ const {
       <el-form-item>
         <el-button
           type="primary"
-          :icon="useRenderIcon('search')"
+          :icon="useRenderIcon('ri:search-line')"
           :loading="loading"
           @click="onSearch"
         >

src/views/system/role/index.vue

@@ -74,7 +74,7 @@ const {
       <el-form-item>
         <el-button
           type="primary"
-          :icon="useRenderIcon('search')"
+          :icon="useRenderIcon('ri:search-line')"
           :loading="loading"
           @click="onSearch"
         >

src/views/system/user/index.vue

@@ -95,7 +95,7 @@ const {
         <el-form-item>
           <el-button
             type="primary"
-            :icon="useRenderIcon('search')"
+            :icon="useRenderIcon('ri:search-line')"
             :loading="loading"
             @click="onSearch"
           >

src/views/system/user/tree.vue

@@ -110,7 +110,7 @@ defineExpose({ onTreeReset });
           <el-icon class="el-input__icon">
             <IconifyIconOffline
               v-show="searchValue.length === 0"
-              icon="search"
+              icon="ri:search-line"
             />
           </el-icon>
         </template>

src/views/welcome/components/table/index.vue

@@ -36,7 +36,7 @@ const { loading, columns, dataList, pagination, Empty, onCurrentChange } =
         circle
         size="small"
         :title="`查看序号为${row.id}的详情`"
-        :icon="useRenderIcon('search')"
+        :icon="useRenderIcon('ri:search-line')"
       />
     </template>
   </pure-table>