From a4edee2868fad06026dc1f4e2e526d922b5ae398 Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Fri, 12 Jan 2024 09:01:05 +0800 Subject: [PATCH 01/10] =?UTF-8?q?style:=20=E6=90=9C=E7=B4=A2=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD=E7=9A=84`placeholder`=E6=9B=B4?= =?UTF-8?q?=E5=A5=BD=E7=9A=84=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/style/element-plus.scss | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/style/element-plus.scss b/src/style/element-plus.scss index 4a07d680c..a55b664aa 100644 --- a/src/style/element-plus.scss +++ b/src/style/element-plus.scss @@ -156,6 +156,18 @@ /* 自定义菜单搜索样式 */ .pure-search-dialog { + @media screen and (width > 760px) and (width <= 940px) { + .el-input__inner { + font-size: 12px; + } + } + + @media screen and (width <= 470px) { + .el-input__inner { + font-size: 12px; + } + } + .el-dialog__header { display: none; } From 2c2a7284f9038fa9a842e484a74abffa50544b3d Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Fri, 12 Jan 2024 09:33:07 +0800 Subject: [PATCH 02/10] =?UTF-8?q?perf:=20=E9=99=8D=E4=BD=8E=E6=95=B4?= =?UTF-8?q?=E4=BD=93=E9=A1=B5=E9=9D=A2=E6=8C=81=E7=BB=AD=E6=8B=96=E6=8B=89?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=80=A7=E8=83=BD=E6=8D=9F=E8=80=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ReCropper/src/index.tsx | 13 ++++++++----- .../components/search/components/SearchResult.vue | 6 ++---- src/layout/components/tag/index.vue | 9 +++------ src/layout/index.vue | 10 +++++++--- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/components/ReCropper/src/index.tsx b/src/components/ReCropper/src/index.tsx index bd57e142c..5f03f7081 100644 --- a/src/components/ReCropper/src/index.tsx +++ b/src/components/ReCropper/src/index.tsx @@ -3,9 +3,7 @@ import Cropper from "cropperjs"; import { useTippy } from "vue-tippy"; import { ElUpload } from "element-plus"; import type { CSSProperties } from "vue"; -import { useResizeObserver } from "@vueuse/core"; import { longpress } from "@/directives/longpress"; -import { delay, debounce, isArray, downloadByBase64 } from "@pureadmin/utils"; import { ref, unref, @@ -15,6 +13,13 @@ import { onUnmounted, defineComponent } from "vue"; +import { + delay, + debounce, + isArray, + downloadByBase64, + useResizeObserver +} from "@pureadmin/utils"; import { Reload, Upload, @@ -126,9 +131,7 @@ export default defineComponent({ cropper.value?.destroy(); }); - useResizeObserver(tippyElRef, () => { - handCropper("reset"); - }); + useResizeObserver(tippyElRef, () => handCropper("reset")); async function init() { const imgEl = unref(imgElRef); diff --git a/src/layout/components/search/components/SearchResult.vue b/src/layout/components/search/components/SearchResult.vue index 22d0d76a7..fd63c1a9c 100644 --- a/src/layout/components/search/components/SearchResult.vue +++ b/src/layout/components/search/components/SearchResult.vue @@ -1,6 +1,6 @@ diff --git a/src/layout/components/sidebar/horizontal.vue b/src/layout/components/sidebar/horizontal.vue index 58836d497..072e0c12e 100644 --- a/src/layout/components/sidebar/horizontal.vue +++ b/src/layout/components/sidebar/horizontal.vue @@ -64,7 +64,7 @@ nextTick(() => {
- + diff --git a/src/layout/components/sidebar/mixNav.vue b/src/layout/components/sidebar/mixNav.vue index 21eb38d1a..17086b684 100644 --- a/src/layout/components/sidebar/mixNav.vue +++ b/src/layout/components/sidebar/mixNav.vue @@ -97,7 +97,7 @@ watch(
- + diff --git a/src/router/enums.ts b/src/router/enums.ts index c324f0805..1f9ac894c 100644 --- a/src/router/enums.ts +++ b/src/router/enums.ts @@ -13,10 +13,10 @@ const home = 0, // 平台规定只有 home 路由的 rank 才能为 0 ，所以 system = 10, tabs = 11, about = 12, - formdesign = 13, + editor = 13, flowchart = 14, - ppt = 15, - editor = 16, + formdesign = 15, + ppt = 16, guide = 17, menuoverflow = 18; diff --git a/src/views/able/watermark.vue b/src/views/able/watermark.vue index 66a5fc663..5d2e8072b 100644 --- a/src/views/able/watermark.vue +++ b/src/views/able/watermark.vue @@ -36,7 +36,7 @@ onBeforeUnmount(() => { diff --git a/src/views/components/waterfall/index.vue b/src/views/components/waterfall/index.vue index b072536a7..5a4c5e692 100644 --- a/src/views/components/waterfall/index.vue +++ b/src/views/components/waterfall/index.vue @@ -92,7 +92,7 @@ onMounted(() => { diff --git a/src/views/permission/button/index.vue b/src/views/permission/button/index.vue index bbdc19361..5b7ca259f 100644 --- a/src/views/permission/button/index.vue +++ b/src/views/permission/button/index.vue @@ -16,17 +16,17 @@ defineOptions({ - + 拥有code：'btn_add' 权限可见 - + 拥有code：['btn_edit'] 权限可见 - + 拥有code：['btn_add', 'btn_edit', 'btn_delete'] 权限可见 @@ -38,16 +38,15 @@ defineOptions({
函数方式判断权限
- + 拥有code：'btn_add' 权限可见 - + 拥有code：['btn_edit'] 权限可见 拥有code：['btn_add', 'btn_edit', 'btn_delete'] 权限可见 @@ -62,16 +61,15 @@ defineOptions({
- + 拥有code：'btn_add' 权限可见 - + 拥有code：['btn_edit'] 权限可见 拥有code：['btn_add', 'btn_edit', 'btn_delete'] 权限可见 From 61c6ec230af3892d75a09a92f5d3af00d5f1aabb Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Sun, 14 Jan 2024 12:42:30 +0800 Subject: [PATCH 10/10] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=89=BA?= =?UTF-8?q?=E6=9C=AF=E7=94=BB=E6=9D=BF=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=AF=94?= =?UTF-8?q?=E5=A6=82=E5=8F=AF=E4=BB=A5=E7=94=A8=E6=9D=A5=E7=BB=98=E5=88=B6?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E8=AE=BE=E8=AE=A1=E6=80=9D=E6=83=B3=E6=9E=B6?= =?UTF-8?q?=E6=9E=84=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/en.yaml | 1 + locales/zh-CN.yaml | 1 + src/components/ReIcon/src/offlineIcon.ts | 2 ++ src/router/enums.ts | 14 +++++++------ src/router/modules/board.ts | 25 ++++++++++++++++++++++++ src/router/modules/formdesign.ts | 3 ++- 6 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 src/router/modules/board.ts diff --git a/locales/en.yaml b/locales/en.yaml index bc1bbe45c..a3846101e 100644 --- a/locales/en.yaml +++ b/locales/en.yaml @@ -111,6 +111,7 @@ menus: hsPureTableBase: Base Usage hsPureTableHigh: High Usage hsTree: Big Data Tree + hsboard: Paint Board hsMenuoverflow: Menu Overflow Show Tooltip Text hsChildMenuoverflow: Child Menu Overflow Show Tooltip Text status: diff --git a/locales/zh-CN.yaml b/locales/zh-CN.yaml index 21364443e..e0d5fb1c3 100644 --- a/locales/zh-CN.yaml +++ b/locales/zh-CN.yaml @@ -111,6 +111,7 @@ menus: hsPureTableBase: 基础用法（23个示例） hsPureTableHigh: 高级用法（11个示例） hsTree: 大数据树业务组件 + hsboard: 艺术画板 hsMenuoverflow: 目录超出显示 Tooltip 文字提示 hsChildMenuoverflow: 菜单超出显示 Tooltip 文字提示 status: diff --git a/src/components/ReIcon/src/offlineIcon.ts b/src/components/ReIcon/src/offlineIcon.ts index 830e9002e..9e3cf1ffe 100644 --- a/src/components/ReIcon/src/offlineIcon.ts +++ b/src/components/ReIcon/src/offlineIcon.ts @@ -28,6 +28,7 @@ import Monitor from "@iconify-icons/ep/monitor"; import Tag from "@iconify-icons/ri/bookmark-2-line"; import Table from "@iconify-icons/ri/table-line"; import Info from "@iconify-icons/ri/file-info-line"; +import Artboard from "@iconify-icons/ri/artboard-line"; addIcon("ubuntuFill", UbuntuFill); addIcon("menu", Menu); addIcon("edit", Edit); @@ -51,3 +52,4 @@ addIcon("monitor", Monitor); addIcon("tag", Tag); addIcon("table", Table); addIcon("info", Info); +addIcon("artboard", Artboard); diff --git a/src/router/enums.ts b/src/router/enums.ts index 1f9ac894c..17def4030 100644 --- a/src/router/enums.ts +++ b/src/router/enums.ts @@ -16,9 +16,10 @@ const home = 0, // 平台规定只有 home 路由的 rank 才能为 0 ，所以 editor = 13, flowchart = 14, formdesign = 15, - ppt = 16, - guide = 17, - menuoverflow = 18; + board = 16, + ppt = 17, + guide = 18, + menuoverflow = 19; export { home, @@ -34,10 +35,11 @@ export { system, tabs, about, - formdesign, - flowchart, - ppt, editor, + flowchart, + formdesign, + board, + ppt, guide, menuoverflow }; diff --git a/src/router/modules/board.ts b/src/router/modules/board.ts new file mode 100644 index 000000000..6e9378e6b --- /dev/null +++ b/src/router/modules/board.ts @@ -0,0 +1,25 @@ +import { $t } from "@/plugins/i18n"; +import { board } from "@/router/enums"; +const IFrame = () => import("@/layout/frameView.vue"); + +export default { + path: "/board", + redirect: "/board/index", + meta: { + icon: "artboard", + title: $t("menus.hsboard"), + rank: board + }, + children: [ + { + path: "/board/index", + name: "FrameBoard", + component: IFrame, + meta: { + title: $t("menus.hsboard"), + frameSrc: "https://songlh.top/paint-board/", + extraIcon: "IF-pure-iconfont-new svg" + } + } + ] +} satisfies RouteConfigsTable; diff --git a/src/router/modules/formdesign.ts b/src/router/modules/formdesign.ts index f814eac8f..1aaf7f90b 100644 --- a/src/router/modules/formdesign.ts +++ b/src/router/modules/formdesign.ts @@ -18,7 +18,8 @@ export default { meta: { title: $t("menus.hsFormDesign"), frameSrc: - "https://haixin-fang.github.io/vue-form-design/playground/index.html" + "https://haixin-fang.github.io/vue-form-design/playground/index.html", + frameLoading: false } } ]