From 22cd6da835ab2e7870b224ed3eb895e88f6031f7 Mon Sep 17 00:00:00 2001 From: zouzhibing Date: Sun, 4 Dec 2022 22:09:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=F0=9F=92=A5=20=E6=96=B0=E5=A2=9Ets?= =?UTF-8?q?config=20path=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tsconfig.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 00d0ae7..31ebbd2 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,8 +12,18 @@ "esModuleInterop": true, "lib": ["ESNext", "DOM"], // 跳过库检查,解决打包失败 - "skipLibCheck": true + "skipLibCheck": true, + // 解析非相对模块名的基准目录 + "baseUrl": "./", + // 模块名到基于 baseUrl 的路径映射的列表。 + "paths": { + "@": ["src"], + "@/*": ["src/*"] + } }, "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"], - "references": [{ "path": "./tsconfig.node.json" }] + "references": [ + { "path": "./tsconfig.node.json" } + ], + "exclude": ["node_modules","dist","**/*.js"] } From 1caf9733e248690420035d40b4b8486952b42c1c Mon Sep 17 00:00:00 2001 From: zouzhibing Date: Mon, 5 Dec 2022 09:10:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=F0=9F=92=A5=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=A4=9A=E8=A1=A8=E5=8D=95=E9=AA=8C=E8=AF=81=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 - src/components/PageWrapLayout/index.scss | 18 ++++++ src/components/PageWrapLayout/index.vue | 13 +++++ src/layout/components/Header/ToolRight.vue | 6 +- src/layout/index.vue | 1 - src/main.ts | 19 ++----- src/plugins/ElIcons.ts | 16 ++++++ src/routers/modules/form.ts | 6 ++ src/styles/common.scss | 1 + src/views/echarts/simple/index.vue | 4 +- src/views/excel/uploadExcel/index.vue | 4 +- .../form/moreForm/components/FormOne.vue | 48 ++++++++++++++++ .../form/moreForm/components/FormThree.vue | 42 ++++++++++++++ .../form/moreForm/components/FormTwo.vue | 44 ++++++++++++++ src/views/form/moreForm/index.scss | 12 ++++ src/views/form/moreForm/index.vue | 57 +++++++++++++++++++ src/views/form/validateForm/index.vue | 4 +- src/views/other/iconfont/index.vue | 4 +- src/views/other/markDown/index.vue | 30 ++++------ src/views/other/print/index.vue | 4 +- src/views/other/qrcode/index.vue | 4 +- src/views/other/rightMenu/index.vue | 4 +- src/views/other/svgIcon/index.vue | 4 +- src/views/table/EditableProTable/index.vue | 4 +- 24 files changed, 295 insertions(+), 55 deletions(-) create mode 100644 src/components/PageWrapLayout/index.scss create mode 100644 src/components/PageWrapLayout/index.vue create mode 100644 src/plugins/ElIcons.ts create mode 100644 src/views/form/moreForm/components/FormOne.vue create mode 100644 src/views/form/moreForm/components/FormThree.vue create mode 100644 src/views/form/moreForm/components/FormTwo.vue create mode 100644 src/views/form/moreForm/index.scss create mode 100644 src/views/form/moreForm/index.vue diff --git a/package.json b/package.json index 3b5bd9f..3db9c89 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "core-js": "^3.6.5", "dayjs": "^1.11.4", "echarts": "^5.3.1", - "echarts-liquidfill": "^3.1.0", "element-plus": "^2.2.21", "exceljs": "^4.3.0", "file-saver": "^2.0.5", diff --git a/src/components/PageWrapLayout/index.scss b/src/components/PageWrapLayout/index.scss new file mode 100644 index 0000000..95810a3 --- /dev/null +++ b/src/components/PageWrapLayout/index.scss @@ -0,0 +1,18 @@ +.m-container-layout { + width: 100%; + height: 100%; + display: flex; + padding: 10px 12px; + box-sizing: border-box; + .m-container-layout-inner { + flex: 1; + display: flex; + flex-direction: column; + box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); + background: white; + padding: 20px; + width: 100%; + height: 100%; + box-sizing: border-box; + } +} diff --git a/src/components/PageWrapLayout/index.vue b/src/components/PageWrapLayout/index.vue new file mode 100644 index 0000000..eb8f256 --- /dev/null +++ b/src/components/PageWrapLayout/index.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/layout/components/Header/ToolRight.vue b/src/layout/components/Header/ToolRight.vue index a0c5497..78234a3 100644 --- a/src/layout/components/Header/ToolRight.vue +++ b/src/layout/components/Header/ToolRight.vue @@ -11,11 +11,11 @@ diff --git a/src/views/form/validateForm/index.vue b/src/views/form/validateForm/index.vue index 4974ba5..654a938 100644 --- a/src/views/form/validateForm/index.vue +++ b/src/views/form/validateForm/index.vue @@ -1,6 +1,6 @@